Fix installation on pt_BR locales. (Closes: #472507)

The problem was caused by the .templates choices strings being marked
for translation, with pt_BR being the only language which actually
translated them.  Thanks to Ubuntu for the fix, which needs to be around
until Lenny is released or six months have passed, whichever is later.

22 files changed, 317 insertions, 359 deletions

diff --git a/debian/changelog b/debian/changelog
index 31e8cb7..bc2f621 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ca-certificates (20080616) UNRELEASED; urgency=low
+
+  * Fix installation on pt_BR locales.  The problem was caused by the
+    .templates choices strings being marked for translation, with pt_BR
+    being the only language which actually translated them.  Thanks to
+    Ubuntu for the fix, which needs to be around until Lenny is released
+    or six months have passed, whichever is later.  (Closes: #472507)
+
+ -- Philipp Kern <pkern@debian.org>  Mon, 16 Jun 2008 16:57:29 +0200
+
 ca-certificates (20080514) unstable; urgency=medium
 
   * Added the new SPI CA certificate, created in response to the latest
diff --git a/debian/config.in b/debian/config.in
index ef4f57c..6677eab 100644
--- a/debian/config.in
+++ b/debian/config.in
@@ -6,6 +6,7 @@ set -e
 action="$1"
 cur_version="$2"
 this_version='#VERSION#'
+pt_BR_fixed_version="20080616"
 
 if test -f /etc/ca-certificates.conf; then
   CERTSCONF=/etc/ca-certificates.conf
@@ -158,12 +159,67 @@ fi
 # mark seen true, so that dont ask again while postinst 
 db_fset ca-certificates/new_crts seen true
 
-db_set ca-certificates/enable_crts "$CERTS_ENABLED"
-db_subst ca-certificates/enable_crts enable_crts "$CERTS_AVAILABLE"
-if test "$seen" != true; then
- db_fset ca-certificates/enable_crts seen false
+# Ideally, we would be able to ask debconf for the language it's using, or
+# at least have a shell binding for setlocale(). Since we don't, we have to
+# do it all by hand.
+is_pt_BR () {
+  current_lc_messages="$(eval `locale`; echo "$LC_MESSAGES")"
+  case "$LANGUAGE" in
+    pt_BR*)
+      return 0
+      ;;
+    *)
+      case "$current_lc_messages" in
+        pt_BR*)
+          return 0
+          ;;
+      esac
+  esac
+  return 1
+}
+
+PRIO=low
+set_values=true
+
+if dpkg --compare-versions "$cur_version" lt-nl "$pt_BR_fixed_version"; then
+  asked="false"
+  if db_fget ca-certificates/enable_crts asked_pt_br_question; then
+    asked="$RET"
+  fi
+  if [ "$asked" != "true" ]; then
+    if [ -e "/etc/ssl/certs/ca-certificates.crt" ] && [ ! -s "/etc/ssl/certs/ca-certificates.crt" ]; then
+      pt_seen="false"
+      if db_fget ca-certificates/enable_crts seen; then
+        pt_seen="$RET"
+      fi
+      if [ "$pt_seen" = "false" ]; then
+        CERTS_ENABLED="$CERTS_AVAILABLE"
+      elif is_pt_BR; then
+        PRIO=critical
+        CERTS_ENABLED="$CERTS_AVAILABLE"
+        seen=false
+      else
+        seen=true
+      fi
+    fi
+  else
+    set_values=false
+  fi
 fi
-db_title "ca-certificates configuration"
-db_input low ca-certificates/enable_crts || true
-db_go
+
+if [ "$set_values" = "true" ]; then
+  db_set ca-certificates/enable_crts "$CERTS_ENABLED"
+  db_subst ca-certificates/enable_crts enable_crts "$CERTS_AVAILABLE"
+  if test "$seen" != true; then
+   db_fset ca-certificates/enable_crts seen false
+  fi
+  db_title "ca-certificates configuration"
+  db_input $PRIO ca-certificates/enable_crts || true
+  db_go
+
+  if [ "$PRIO" = "critical" ]; then
+    db_fset ca-certificates/enable_crts asked_pt_br_question true
+  fi
+fi
+
 exit 0
diff --git a/debian/po/ca.po b/debian/po/ca.po
index 4d459f0..564ba0a 100644
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ca-certificates 20031007\n"
-"Report-Msgid-Bugs-To: ukai@debian.or.jp\n"
-"POT-Creation-Date: 2007-07-27 11:03+0200\n"
+"Report-Msgid-Bugs-To: ca-certificates@packages.debian.org\n"
+"POT-Creation-Date: 2008-06-16 17:02+0200\n"
 "PO-Revision-Date: 2004-03-05 01:14+0100\n"
 "Last-Translator: Josep Monés i Teixidor <jmones@puntbarra.com>\n"
 "Language-Team: Catalan <debian-l10n-catalanLL@lists.debian.org>\n"
@@ -60,14 +60,8 @@ msgstr ""
 "- 'demana', se us demanarà si confieu o no en cada nou certificat de les CA."
 
 #. Type: multiselect
-#. Choices
-#: ../templates:3001
-msgid "${new_crts}"
-msgstr "${new_crts}"
-
-#. Type: multiselect
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 #, fuzzy
 #| msgid "Select certificates to activate:"
 msgid "New certificates to activate:"
@@ -75,7 +69,7 @@ msgstr "Seleccioneu els certificats que s'activaran:"
 
 #. Type: multiselect
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 #, fuzzy
 msgid ""
 "During upgrades, new certificates will be added. Please choose those you "
@@ -85,14 +79,8 @@ msgstr ""
 "aquests certificats i voleu que s'instal·lin a /etc/ssl/certs?"
 
 #. Type: multiselect
-#. Choices
-#: ../templates:4001
-msgid "${enable_crts}"
-msgstr "${enable_crts}"
-
-#. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 #, fuzzy
 #| msgid "Select certificates to activate:"
 msgid "Certificates to activate:"
@@ -100,7 +88,7 @@ msgstr "Seleccioneu els certificats que s'activaran:"
 
 #. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 #, fuzzy
 #| msgid ""
 #| "This package may install new CA (Certificate Authority) certificates when "
@@ -117,13 +105,19 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid ""
 "Please select the certificate authorities you trust so that their "
 "certificates are installed into /etc/ssl/certs. They will be compiled into a "
 "single /etc/ssl/certs/ca-certificates.crt file."
 msgstr ""
 
+#~ msgid "${new_crts}"
+#~ msgstr "${new_crts}"
+
+#~ msgid "${enable_crts}"
+#~ msgstr "${enable_crts}"
+
 #~ msgid "Select new certificates to activate:"
 #~ msgstr "Seleccioneu quins certificats nous voleu activar:"
 
diff --git a/debian/po/cs.po b/debian/po/cs.po
index be0b6e9..69879e3 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ca-certificates\n"
-"Report-Msgid-Bugs-To: ukai@debian.or.jp\n"
-"POT-Creation-Date: 2007-07-27 11:03+0200\n"
+"Report-Msgid-Bugs-To: ca-certificates@packages.debian.org\n"
+"POT-Creation-Date: 2008-06-16 17:02+0200\n"
 "PO-Revision-Date: 2007-07-29 11:13+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -60,20 +60,14 @@ msgstr ""
 " - zeptat se: zeptá se na každý nový certifikát individuálně."
 
 #. Type: multiselect
-#. Choices
-#: ../templates:3001
-msgid "${new_crts}"
-msgstr "${new_crts}"
-
-#. Type: multiselect
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid "New certificates to activate:"
 msgstr "Nové certifikáty, které se mají aktivovat:"
 
 #. Type: multiselect
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid ""
 "During upgrades, new certificates will be added. Please choose those you "
 "trust."
@@ -82,20 +76,14 @@ msgstr ""
 "důvěřujete."
 
 #. Type: multiselect
-#. Choices
-#: ../templates:4001
-msgid "${enable_crts}"
-msgstr "${enable_crts}"
-
-#. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid "Certificates to activate:"
 msgstr "Certifikáty, které se mají aktivovat:"
 
 #. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid ""
 "This package installs common CA (Certificate Authority) certificates in /usr/"
 "share/ca-certificates."
@@ -105,7 +93,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid ""
 "Please select the certificate authorities you trust so that their "
 "certificates are installed into /etc/ssl/certs. They will be compiled into a "
@@ -114,3 +102,9 @@ msgstr ""
 "Vyberte prosím certifikační autority, kterým věříte a jejichž certifikáty "
 "nainstalovat do /etc/ssl/certs. Vybrané certifikáty budou sloučeny do "
 "jediného souboru /etc/ssl/certs/ca-certificates.crt."
+
+#~ msgid "${new_crts}"
+#~ msgstr "${new_crts}"
+
+#~ msgid "${enable_crts}"
+#~ msgstr "${enable_crts}"
diff --git a/debian/po/da.po b/debian/po/da.po
index 143ffd5..ebc8cac 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -15,8 +15,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ca-certificates_20031007_templates\n"
-"Report-Msgid-Bugs-To: ukai@debian.or.jp\n"
-"POT-Creation-Date: 2007-07-27 11:03+0200\n"
+"Report-Msgid-Bugs-To: ca-certificates@packages.debian.org\n"
+"POT-Creation-Date: 2008-06-16 17:02+0200\n"
 "PO-Revision-Date: 2006-09-18 08:00+0200\n"
 "Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n"
 "Language-Team: Danish\n"
@@ -76,14 +76,8 @@ msgstr ""
 "eller ej."
 
 #. Type: multiselect
-#. Choices
-#: ../templates:3001
-msgid "${new_crts}"
-msgstr "${new_crts}"
-
-#. Type: multiselect
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 #, fuzzy
 #| msgid "Select certificates to activate:"
 msgid "New certificates to activate:"
@@ -91,7 +85,7 @@ msgstr "V�lg certifikater at aktivere:"
 
 #. Type: multiselect
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 #, fuzzy
 #| msgid ""
 #| "During the upgrade, these new certificates will be added. Do you trust "
@@ -104,14 +98,8 @@ msgstr ""
 "dem, og vil du have dem installeret i /etc/ssl/certs?"
 
 #. Type: multiselect
-#. Choices
-#: ../templates:4001
-msgid "${enable_crts}"
-msgstr "${enable_crts}"
-
-#. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 #, fuzzy
 #| msgid "Select certificates to activate:"
 msgid "Certificates to activate:"
@@ -119,7 +107,7 @@ msgstr "V�lg certifikater at aktivere:"
 
 #. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 #, fuzzy
 #| msgid ""
 #| "This package may install new CA (Certificate Authority) certificates when "
@@ -135,13 +123,19 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid ""
 "Please select the certificate authorities you trust so that their "
 "certificates are installed into /etc/ssl/certs. They will be compiled into a "
 "single /etc/ssl/certs/ca-certificates.crt file."
 msgstr ""
 
+#~ msgid "${new_crts}"
+#~ msgstr "${new_crts}"
+
+#~ msgid "${enable_crts}"
+#~ msgstr "${enable_crts}"
+
 #~ msgid "Select new certificates to activate:"
 #~ msgstr "V�lg nyt certifikat at aktivere:"
 
diff --git a/debian/po/de.po b/debian/po/de.po
index 3585c24..21f46fc 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ca-certificates 20070304\n"
-"Report-Msgid-Bugs-To: ukai@debian.or.jp\n"
-"POT-Creation-Date: 2007-07-27 11:03+0200\n"
+"Report-Msgid-Bugs-To: ca-certificates@packages.debian.org\n"
+"POT-Creation-Date: 2008-06-16 17:02+0200\n"
 "PO-Revision-Date: 2007-07-27 20:21+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -55,20 +55,14 @@ msgstr ""
 " - Fragen: fragt bei jedem neuen CA-Zertifikat nach."
 
 #. Type: multiselect
-#. Choices
-#: ../templates:3001
-msgid "${new_crts}"
-msgstr "${new_crts}"
-
-#. Type: multiselect
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid "New certificates to activate:"
 msgstr "Zu aktivierende neue Zertifikate:"
 
 #. Type: multiselect
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid ""
 "During upgrades, new certificates will be added. Please choose those you "
 "trust."
@@ -77,20 +71,14 @@ msgstr ""
 "diejenigen aus, denen Sie vertrauen."
 
 #. Type: multiselect
-#. Choices
-#: ../templates:4001
-msgid "${enable_crts}"
-msgstr "${enable_crts}"
-
-#. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid "Certificates to activate:"
 msgstr "Zu aktivierende Zertifikate:"
 
 #. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid ""
 "This package installs common CA (Certificate Authority) certificates in /usr/"
 "share/ca-certificates."
@@ -100,7 +88,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid ""
 "Please select the certificate authorities you trust so that their "
 "certificates are installed into /etc/ssl/certs. They will be compiled into a "
@@ -110,6 +98,12 @@ msgstr ""
 "deren Zertifikate in /etc/ssl/certs installiert werden. Sie werden in eine "
 "einzige Datei /etc/ssl/certs/ca-certificates.crt zusammengestellt."
 
+#~ msgid "${new_crts}"
+#~ msgstr "${new_crts}"
+
+#~ msgid "${enable_crts}"
+#~ msgstr "${enable_crts}"
+
 #~ msgid "Select new certificates to activate:"
 #~ msgstr "Neue Zertifikate zum Aktivieren auswählen:"
 
diff --git a/debian/po/es.po b/debian/po/es.po
index 03fd555..c25d9ba 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -28,8 +28,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ca-certificates\n"
-"Report-Msgid-Bugs-To: ukai@debian.or.jp\n"
-"POT-Creation-Date: 2007-07-27 11:03+0200\n"
+"Report-Msgid-Bugs-To: ca-certificates@packages.debian.org\n"
+"POT-Creation-Date: 2008-06-16 17:02+0200\n"
 "PO-Revision-Date: 2007-07-27 19:01+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian l10n spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -79,20 +79,14 @@ msgstr ""
 " - preguntar: se hará la pregunta para cada nuevo certificado de CA."
 
 #. Type: multiselect
-#. Choices
-#: ../templates:3001
-msgid "${new_crts}"
-msgstr "${new_crts}"
-
-#. Type: multiselect
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid "New certificates to activate:"
 msgstr "Nuevos certificados a activar:"
 
 #. Type: multiselect
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid ""
 "During upgrades, new certificates will be added. Please choose those you "
 "trust."
@@ -101,20 +95,14 @@ msgstr ""
 "aquellos en los que confía."
 
 #. Type: multiselect
-#. Choices
-#: ../templates:4001
-msgid "${enable_crts}"
-msgstr "${enable_crts}"
-
-#. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid "Certificates to activate:"
 msgstr "Certificados a activar:"
 
 #. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid ""
 "This package installs common CA (Certificate Authority) certificates in /usr/"
 "share/ca-certificates."
@@ -124,15 +112,21 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid ""
 "Please select the certificate authorities you trust so that their "
 "certificates are installed into /etc/ssl/certs. They will be compiled into a "
 "single /etc/ssl/certs/ca-certificates.crt file."
 msgstr ""
 "Escoja las autoridades de certificación en las que confía para instalarlas "
-"en «/etc/ssl/certs». Se incluirán todas en un único archivo «/etc/ssl/certs/"
-"ca-certificates.crt»."
+"en «/etc/ssl/certs». Se incluirán todas en un único archivo «/etc/ssl/certs/ca-"
+"certificates.crt»."
+
+#~ msgid "${new_crts}"
+#~ msgstr "${new_crts}"
+
+#~ msgid "${enable_crts}"
+#~ msgstr "${enable_crts}"
 
 #~ msgid "Select new certificates to activate:"
 #~ msgstr "Seleccione los nuevos certificados que quiere activar:"
diff --git a/debian/po/eu.po b/debian/po/eu.po
index b126021..4def037 100644
--- a/debian/po/eu.po
+++ b/debian/po/eu.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
-"Report-Msgid-Bugs-To: ukai@debian.or.jp\n"
-"POT-Creation-Date: 2007-07-27 11:03+0200\n"
+"Report-Msgid-Bugs-To: ca-certificates@packages.debian.org\n"
+"POT-Creation-Date: 2008-06-16 17:02+0200\n"
 "PO-Revision-Date: 2007-07-27 11:55+0200\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Euskara <Librezale@librezale.org>\n"
@@ -53,20 +53,14 @@ msgstr ""
 " - galdetu: ZA berrietako ziuratgiri bakoitzean galdetu."
 
 #. Type: multiselect
-#. Choices
-#: ../templates:3001
-msgid "${new_crts}"
-msgstr "${new_crts}"
-
-#. Type: multiselect
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid "New certificates to activate:"
 msgstr "Gaitzeko ziurtagiri berriak:"
 
 #. Type: multiselect
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid ""
 "During upgrades, new certificates will be added. Please choose those you "
 "trust."
@@ -75,20 +69,14 @@ msgstr ""
 "zeinetaz fidatzen zaren."
 
 #. Type: multiselect
-#. Choices
-#: ../templates:4001
-msgid "${enable_crts}"
-msgstr "${enable_crts}"
-
-#. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid "Certificates to activate:"
 msgstr "Gaitzeko Ziurtagiriak:"
 
 #. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid ""
 "This package installs common CA (Certificate Authority) certificates in /usr/"
 "share/ca-certificates."
@@ -98,7 +86,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid ""
 "Please select the certificate authorities you trust so that their "
 "certificates are installed into /etc/ssl/certs. They will be compiled into a "
@@ -107,3 +95,9 @@ msgstr ""
 "Mesedez hautatu fidagarri zaizkizun ziurtagiri autoritateak /etc/ssl/certs-"
 "en instala daitezen. /etc/ssl/certs/ca-certificates fitxategi soilean "
 "konpilatuko dira."
+
+#~ msgid "${new_crts}"
+#~ msgstr "${new_crts}"
+
+#~ msgid "${enable_crts}"
+#~ msgstr "${enable_crts}"
diff --git a/debian/po/fi.po b/debian/po/fi.po
index 599f8e7..c96fda0 100644
--- a/debian/po/fi.po
+++ b/debian/po/fi.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ca-certificates\n"
-"Report-Msgid-Bugs-To: ukai@debian.or.jp\n"
-"POT-Creation-Date: 2007-07-27 11:03+0200\n"
+"Report-Msgid-Bugs-To: ca-certificates@packages.debian.org\n"
+"POT-Creation-Date: 2008-06-16 17:02+0200\n"
 "PO-Revision-Date: 2007-11-01 11:21+0200\n"
 "Last-Translator: Esko Arajärvi <edu@iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -49,20 +49,14 @@ msgstr ""
 " - kysy:  kunkin uuden CA-varmenteen kohdalla kysytään erikseen"
 
 #. Type: multiselect
-#. Choices
-#: ../templates:3001
-msgid "${new_crts}"
-msgstr "${new_crts}"
-
-#. Type: multiselect
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid "New certificates to activate:"
 msgstr "Uudet aktivoitavat varmenteet:"
 
 #. Type: multiselect
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid ""
 "During upgrades, new certificates will be added. Please choose those you "
 "trust."
@@ -70,20 +64,14 @@ msgstr ""
 "Päivitysten yhteydessä lisätään uusia varmenteita. Valitse ne, joihin luotat."
 
 #. Type: multiselect
-#. Choices
-#: ../templates:4001
-msgid "${enable_crts}"
-msgstr "${enable_crts}"
-
-#. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid "Certificates to activate:"
 msgstr "Aktivoitavat varmenteet:"
 
 #. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid ""
 "This package installs common CA (Certificate Authority) certificates in /usr/"
 "share/ca-certificates."
@@ -93,7 +81,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid ""
 "Please select the certificate authorities you trust so that their "
 "certificates are installed into /etc/ssl/certs. They will be compiled into a "
@@ -103,6 +91,12 @@ msgstr ""
 "hakemistoon /etc/ssl/certs. Ne kootaan yhteen tiedostoon /etc/ssl/certs/ca-"
 "certificates.crt."
 
+#~ msgid "${new_crts}"
+#~ msgstr "${new_crts}"
+
+#~ msgid "${enable_crts}"
+#~ msgstr "${enable_crts}"
+
 #~ msgid "Select new certificates to activate:"
 #~ msgstr "Valitse uudet aktivoitavat varmenteet:"
 
diff --git a/debian/po/fr.po b/debian/po/fr.po
index afae516..80f1de2 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: ukai@debian.or.jp\n"
-"POT-Creation-Date: 2007-07-27 11:03+0200\n"
+"Report-Msgid-Bugs-To: ca-certificates@packages.debian.org\n"
+"POT-Creation-Date: 2008-06-16 17:02+0200\n"
 "PO-Revision-Date: 2007-07-27 08:40+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -53,20 +53,14 @@ msgstr ""
 "             demandé."
 
 #. Type: multiselect
-#. Choices
-#: ../templates:3001
-msgid "${new_crts}"
-msgstr "${new_crts}"
-
-#. Type: multiselect
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid "New certificates to activate:"
 msgstr "Nouveaux certificats à accepter :"
 
 #. Type: multiselect
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid ""
 "During upgrades, new certificates will be added. Please choose those you "
 "trust."
@@ -75,20 +69,14 @@ msgstr ""
 "choisir si vous les acceptez."
 
 #. Type: multiselect
-#. Choices
-#: ../templates:4001
-msgid "${enable_crts}"
-msgstr "${enable_crts}"
-
-#. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid "Certificates to activate:"
 msgstr "Certificats à accepter :"
 
 #. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid ""
 "This package installs common CA (Certificate Authority) certificates in /usr/"
 "share/ca-certificates."
@@ -98,7 +86,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid ""
 "Please select the certificate authorities you trust so that their "
 "certificates are installed into /etc/ssl/certs. They will be compiled into a "
@@ -107,3 +95,9 @@ msgstr ""
 "Veuillez choisir les tiers de confiance que vous agréez afin que leurs "
 "certificats soient installés dans /etc/ssl/certs. Ils seront rassemblés dans "
 "un seul fichier nommé /etc/ssl/certs/ca-certificates.crt."
+
+#~ msgid "${new_crts}"
+#~ msgstr "${new_crts}"
+
+#~ msgid "${enable_crts}"
+#~ msgstr "${enable_crts}"
diff --git a/debian/po/gl.po b/debian/po/gl.po
index 816cac0..9d4c7b2 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ca-certificates\n"
-"Report-Msgid-Bugs-To: ukai@debian.or.jp\n"
-"POT-Creation-Date: 2007-07-27 11:03+0200\n"
+"Report-Msgid-Bugs-To: ca-certificates@packages.debian.org\n"
+"POT-Creation-Date: 2008-06-16 17:02+0200\n"
 "PO-Revision-Date: 2007-07-31 09:52+0100\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -51,20 +51,14 @@ msgstr ""
 " - preguntar: preguntar por cada novo certificado de CA."
 
 #. Type: multiselect
-#. Choices
-#: ../templates:3001
-msgid "${new_crts}"
-msgstr "${new_crts}"
-
-#. Type: multiselect
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid "New certificates to activate:"
 msgstr "Novos certificados a activar:"
 
 #. Type: multiselect
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid ""
 "During upgrades, new certificates will be added. Please choose those you "
 "trust."
@@ -73,20 +67,14 @@ msgstr ""
 "certificados nos que confía."
 
 #. Type: multiselect
-#. Choices
-#: ../templates:4001
-msgid "${enable_crts}"
-msgstr "${enable_crts}"
-
-#. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid "Certificates to activate:"
 msgstr "Certificados a activar:"
 
 #. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid ""
 "This package installs common CA (Certificate Authority) certificates in /usr/"
 "share/ca-certificates."
@@ -96,7 +84,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid ""
 "Please select the certificate authorities you trust so that their "
 "certificates are installed into /etc/ssl/certs. They will be compiled into a "
@@ -105,3 +93,9 @@ msgstr ""
 "Escolla as autoridades certificadoras nas que confía para instalar os seus "
 "certificados en /etc/ssl/certs. Hanse reunir todos nun só ficheiro /etc/ssl/"
 "certs/ca-certificates.crt."
+
+#~ msgid "${new_crts}"
+#~ msgstr "${new_crts}"
+
+#~ msgid "${enable_crts}"
+#~ msgstr "${enable_crts}"
diff --git a/debian/po/it.po b/debian/po/it.po
index 85e12e9..762f0eb 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ca-certificates italian debconf templates\n"
-"Report-Msgid-Bugs-To: ukai@debian.or.jp\n"
-"POT-Creation-Date: 2007-07-27 11:03+0200\n"
+"Report-Msgid-Bugs-To: ca-certificates@packages.debian.org\n"
+"POT-Creation-Date: 2008-06-16 17:02+0200\n"
 "PO-Revision-Date: 2007-07-28 20:50+0200\n"
 "Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -52,20 +52,14 @@ msgstr ""
 " - chiedi: per ogni certificato delle nuove CA viene chiesto cosa fare."
 
 #. Type: multiselect
-#. Choices
-#: ../templates:3001
-msgid "${new_crts}"
-msgstr "${new_crts}"
-
-#. Type: multiselect
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid "New certificates to activate:"
 msgstr "Nuovi certificati da attivare:"
 
 #. Type: multiselect
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid ""
 "During upgrades, new certificates will be added. Please choose those you "
 "trust."
@@ -74,20 +68,14 @@ msgstr ""
 "quelli fidati."
 
 #. Type: multiselect
-#. Choices
-#: ../templates:4001
-msgid "${enable_crts}"
-msgstr "${enable_crts}"
-
-#. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid "Certificates to activate:"
 msgstr "Certificati da attivare:"
 
 #. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid ""
 "This package installs common CA (Certificate Authority) certificates in /usr/"
 "share/ca-certificates."
@@ -97,7 +85,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid ""
 "Please select the certificate authorities you trust so that their "
 "certificates are installed into /etc/ssl/certs. They will be compiled into a "
@@ -106,3 +94,9 @@ msgstr ""
 "Selezionare le autorità di certificazione fidate così da installare i "
 "relativi certificati in /etc/ssl/certs. Questi vengono compilati in un unico "
 "file /etc/ssl/certs/ca-certificates.crt."
+
+#~ msgid "${new_crts}"
+#~ msgstr "${new_crts}"
+
+#~ msgid "${enable_crts}"
+#~ msgstr "${enable_crts}"
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 9194880..a6f8a79 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ca-certificates\n"
-"Report-Msgid-Bugs-To: ukai@debian.or.jp\n"
-"POT-Creation-Date: 2007-07-27 11:03+0200\n"
+"Report-Msgid-Bugs-To: ca-certificates@packages.debian.org\n"
+"POT-Creation-Date: 2008-06-16 17:02+0200\n"
 "PO-Revision-Date: 2007-07-30 14:08+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -59,20 +59,14 @@ msgstr ""
 " - `質問する': 新しい CA 証明書についてそれぞれ尋ねます。"
 
 #. Type: multiselect
-#. Choices
-#: ../templates:3001
-msgid "${new_crts}"
-msgstr "${new_crts}"
-
-#. Type: multiselect
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid "New certificates to activate:"
 msgstr "活性化する新しい証明書:"
 
 #. Type: multiselect
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid ""
 "During upgrades, new certificates will be added. Please choose those you "
 "trust."
@@ -81,20 +75,14 @@ msgstr ""
 "か選んでください。"
 
 #. Type: multiselect
-#. Choices
-#: ../templates:4001
-msgid "${enable_crts}"
-msgstr "${enable_crts}"
-
-#. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid "Certificates to activate:"
 msgstr "活性化する証明書:"
 
 #. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid ""
 "This package installs common CA (Certificate Authority) certificates in /usr/"
 "share/ca-certificates."
@@ -104,7 +92,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid ""
 "Please select the certificate authorities you trust so that their "
 "certificates are installed into /etc/ssl/certs. They will be compiled into a "
@@ -113,3 +101,9 @@ msgstr ""
 "/etc/ssl/certs にインストールされる、信用する証明機関の証明書を選択してくださ"
 "い。これらは、単一のファイル /etc/ssl/certs/ca-certificates.crt にコンパイル"
 "されます。"
+
+#~ msgid "${new_crts}"
+#~ msgstr "${new_crts}"
+
+#~ msgid "${enable_crts}"
+#~ msgstr "${enable_crts}"
diff --git a/debian/po/nl.po b/debian/po/nl.po
index ecab8bf..d05b876 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -15,8 +15,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ca-certificates_20060816_nl\n"
-"Report-Msgid-Bugs-To: ukai@debian.or.jp\n"
-"POT-Creation-Date: 2007-07-27 11:03+0200\n"
+"Report-Msgid-Bugs-To: ca-certificates@packages.debian.org\n"
+"POT-Creation-Date: 2008-06-16 17:02+0200\n"
 "PO-Revision-Date: 2007-07-27 09:44+0200\n"
 "Last-Translator: Frans Pop <elendil@planet.nl>\n"
 "Language-Team: Dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -63,20 +63,14 @@ msgstr ""
 " - selectie: CA certificaten handmatig selecteren."
 
 #. Type: multiselect
-#. Choices
-#: ../templates:3001
-msgid "${new_crts}"
-msgstr "${new_crts}"
-
-#. Type: multiselect
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid "New certificates to activate:"
 msgstr "Te activeren nieuwe certificaten:"
 
 #. Type: multiselect
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid ""
 "During upgrades, new certificates will be added. Please choose those you "
 "trust."
@@ -85,20 +79,14 @@ msgstr ""
 "certificaten die u vertrouwt."
 
 #. Type: multiselect
-#. Choices
-#: ../templates:4001
-msgid "${enable_crts}"
-msgstr "${enable_crts}"
-
-#. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid "Certificates to activate:"
 msgstr "Te activeren certificaten:"
 
 #. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid ""
 "This package installs common CA (Certificate Authority) certificates in /usr/"
 "share/ca-certificates."
@@ -108,7 +96,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid ""
 "Please select the certificate authorities you trust so that their "
 "certificates are installed into /etc/ssl/certs. They will be compiled into a "
@@ -117,3 +105,9 @@ msgstr ""
 "Selecteer de certificaatautoriteiten die u vertrouwt. Hun certificaten "
 "zullen worden opgenomen in '/etc/ssl/certs' en worden gebundeld in het "
 "bestand '/etc/ssl/certs/ca-certificates.crt'."
+
+#~ msgid "${new_crts}"
+#~ msgstr "${new_crts}"
+
+#~ msgid "${enable_crts}"
+#~ msgstr "${enable_crts}"
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 41f79ed..306e8a2 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ca-certificates\n"
-"Report-Msgid-Bugs-To: ukai@debian.or.jp\n"
-"POT-Creation-Date: 2007-07-27 11:03+0200\n"
+"Report-Msgid-Bugs-To: ca-certificates@packages.debian.org\n"
+"POT-Creation-Date: 2008-06-16 17:02+0200\n"
 "PO-Revision-Date: 2007-08-01 08:34+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -53,20 +53,14 @@ msgstr ""
 " - perguntar: perguntar se confia ou não em cada novo certificado CA."
 
 #. Type: multiselect
-#. Choices
-#: ../templates:3001
-msgid "${new_crts}"
-msgstr "${new_crts}"
-
-#. Type: multiselect
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid "New certificates to activate:"
 msgstr "Novos certificados para activar:"
 
 #. Type: multiselect
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid ""
 "During upgrades, new certificates will be added. Please choose those you "
 "trust."
@@ -75,20 +69,14 @@ msgstr ""
 "escolha os que confia."
 
 #. Type: multiselect
-#. Choices
-#: ../templates:4001
-msgid "${enable_crts}"
-msgstr "${enable_crts}"
-
-#. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid "Certificates to activate:"
 msgstr "Xertificados para activar:"
 
 #. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid ""
 "This package installs common CA (Certificate Authority) certificates in /usr/"
 "share/ca-certificates."
@@ -98,7 +86,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid ""
 "Please select the certificate authorities you trust so that their "
 "certificates are installed into /etc/ssl/certs. They will be compiled into a "
@@ -108,6 +96,12 @@ msgstr ""
 "seus certificados sejam instalados em /etc/ssl/certs. Serão compilados num "
 "único ficheiro /etc/ssl/cets/ca-certificates.crt."
 
+#~ msgid "${new_crts}"
+#~ msgstr "${new_crts}"
+
+#~ msgid "${enable_crts}"
+#~ msgstr "${enable_crts}"
+
 #~ msgid "Select new certificates to activate:"
 #~ msgstr "Seleccione novos certificados para activar:"
 
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index f14b30b..dbd2741 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ca-certificates\n"
-"Report-Msgid-Bugs-To: ukai@debian.or.jp\n"
-"POT-Creation-Date: 2007-07-27 11:03+0200\n"
+"Report-Msgid-Bugs-To: ca-certificates@packages.debian.org\n"
+"POT-Creation-Date: 2008-06-16 17:02+0200\n"
 "PO-Revision-Date: 2006-12-19 21:01-0200\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@@ -73,14 +73,8 @@ msgstr ""
 " - 'perguntar', Pergunta se você confia em cada novo certificados de CA."
 
 #. Type: multiselect
-#. Choices
-#: ../templates:3001
-msgid "${new_crts}"
-msgstr "${new_certs}"
-
-#. Type: multiselect
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 #, fuzzy
 #| msgid "Select certificates to activate:"
 msgid "New certificates to activate:"
@@ -88,7 +82,7 @@ msgstr "Selecione os certificados a serem ativados:"
 
 #. Type: multiselect
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 #, fuzzy
 #| msgid ""
 #| "During the upgrade, these new certificates will be added. Do you trust "
@@ -101,14 +95,8 @@ msgstr ""
 "confia neles e quer que os mesmos sejam instalados em /etc/ssl/certs ?"
 
 #. Type: multiselect
-#. Choices
-#: ../templates:4001
-msgid "${enable_crts}"
-msgstr "${enable_certs}"
-
-#. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 #, fuzzy
 #| msgid "Select certificates to activate:"
 msgid "Certificates to activate:"
@@ -116,7 +104,7 @@ msgstr "Selecione os certificados a serem ativados:"
 
 #. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 #, fuzzy
 #| msgid ""
 #| "This package may install new CA (Certificate Authority) certificates when "
@@ -133,13 +121,19 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid ""
 "Please select the certificate authorities you trust so that their "
 "certificates are installed into /etc/ssl/certs. They will be compiled into a "
 "single /etc/ssl/certs/ca-certificates.crt file."
 msgstr ""
 
+#~ msgid "${new_crts}"
+#~ msgstr "${new_certs}"
+
+#~ msgid "${enable_crts}"
+#~ msgstr "${enable_certs}"
+
 #~ msgid "Select new certificates to activate:"
 #~ msgstr "Selecione os novos certificados a serem ativados:"
 
diff --git a/debian/po/ru.po b/debian/po/ru.po
index dca7c42..3faf9ae 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ca-certificates_20061027\n"
-"Report-Msgid-Bugs-To: ukai@debian.or.jp\n"
-"POT-Creation-Date: 2007-07-27 11:03+0200\n"
+"Report-Msgid-Bugs-To: ca-certificates@packages.debian.org\n"
+"POT-Creation-Date: 2008-06-16 17:02+0200\n"
 "PO-Revision-Date: 2007-07-27 17:45+0700\n"
 "Last-Translator: Mikhail Gusarov <dottedmag@dottedmag.net>\n"
 "Language-Team: Russian l10n Team <debian-l10n-russian@lists.debian.org>\n"
@@ -53,20 +53,14 @@ msgstr ""
 " - спрашивать: спрашивать, стоит ли доверять каждому из новых сертифкатов CA."
 
 #. Type: multiselect
-#. Choices
-#: ../templates:3001
-msgid "${new_crts}"
-msgstr "${new_crts}"
-
-#. Type: multiselect
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid "New certificates to activate:"
 msgstr "Сертификаты для активации:"
 
 #. Type: multiselect
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid ""
 "During upgrades, new certificates will be added. Please choose those you "
 "trust."
@@ -75,20 +69,14 @@ msgstr ""
 "вы доверяете."
 
 #. Type: multiselect
-#. Choices
-#: ../templates:4001
-msgid "${enable_crts}"
-msgstr "${enable_crts}"
-
-#. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid "Certificates to activate:"
 msgstr "Сертификаты для активации:"
 
 #. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid ""
 "This package installs common CA (Certificate Authority) certificates in /usr/"
 "share/ca-certificates."
@@ -98,9 +86,18 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid ""
 "Please select the certificate authorities you trust so that their "
 "certificates are installed into /etc/ssl/certs. They will be compiled into a "
 "single /etc/ssl/certs/ca-certificates.crt file."
-msgstr "Выберите корневые сертификаты, которым вы доверяете, для установки в каталог /etc/ssl/certs. Эти сертификаты будут скомпонованы в файл /etc/ssl/certs/ca-certificates.crt."
+msgstr ""
+"Выберите корневые сертификаты, которым вы доверяете, для установки в "
+"каталог /etc/ssl/certs. Эти сертификаты будут скомпонованы в файл /etc/ssl/"
+"certs/ca-certificates.crt."
+
+#~ msgid "${new_crts}"
+#~ msgstr "${new_crts}"
+
+#~ msgid "${enable_crts}"
+#~ msgstr "${enable_crts}"
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 26f73bf..55f8880 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -13,8 +13,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ca-certificates 20050804\n"
-"Report-Msgid-Bugs-To: ukai@debian.or.jp\n"
-"POT-Creation-Date: 2007-07-27 11:03+0200\n"
+"Report-Msgid-Bugs-To: ca-certificates@packages.debian.org\n"
+"POT-Creation-Date: 2008-06-16 17:02+0200\n"
 "PO-Revision-Date: 2007-07-27 11:47+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -59,20 +59,14 @@ msgstr ""
 " - fr�ga: fr�ga f�r varje nytt CA-certifikat."
 
 #. Type: multiselect
-#. Choices
-#: ../templates:3001
-msgid "${new_crts}"
-msgstr "${new_crts}"
-
-#. Type: multiselect
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid "New certificates to activate:"
 msgstr "Nya certfikat att aktivera:"
 
 #. Type: multiselect
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid ""
 "During upgrades, new certificates will be added. Please choose those you "
 "trust."
@@ -81,20 +75,14 @@ msgstr ""
 "litar p�."
 
 #. Type: multiselect
-#. Choices
-#: ../templates:4001
-msgid "${enable_crts}"
-msgstr "${enable_crts}"
-
-#. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid "Certificates to activate:"
 msgstr "Certfikat att aktivera:"
 
 #. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid ""
 "This package installs common CA (Certificate Authority) certificates in /usr/"
 "share/ca-certificates."
@@ -104,7 +92,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid ""
 "Please select the certificate authorities you trust so that their "
 "certificates are installed into /etc/ssl/certs. They will be compiled into a "
@@ -114,6 +102,12 @@ msgstr ""
 "installeras i /etc/ssl/certs. De kommer att kompileras till en enda fil, /"
 "etc/ssl/certs/ca-certificates.crt."
 
+#~ msgid "${new_crts}"
+#~ msgstr "${new_crts}"
+
+#~ msgid "${enable_crts}"
+#~ msgstr "${enable_crts}"
+
 #~ msgid "Select new certificates to activate:"
 #~ msgstr "V�lj ett nytt certifikat som ska aktiveras:"
 
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 1fb8788..20a84c0 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: ukai@debian.or.jp\n"
-"POT-Creation-Date: 2007-07-27 11:03+0200\n"
+"Report-Msgid-Bugs-To: ca-certificates@packages.debian.org\n"
+"POT-Creation-Date: 2008-06-16 17:02+0200\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"
@@ -47,40 +47,28 @@ msgid ""
 msgstr ""
 
 #. Type: multiselect
-#. Choices
-#: ../templates:3001
-msgid "${new_crts}"
-msgstr ""
-
-#. Type: multiselect
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid "New certificates to activate:"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid ""
 "During upgrades, new certificates will be added. Please choose those you "
 "trust."
 msgstr ""
 
 #. Type: multiselect
-#. Choices
-#: ../templates:4001
-msgid "${enable_crts}"
-msgstr ""
-
-#. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid "Certificates to activate:"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid ""
 "This package installs common CA (Certificate Authority) certificates in /usr/"
 "share/ca-certificates."
@@ -88,7 +76,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid ""
 "Please select the certificate authorities you trust so that their "
 "certificates are installed into /etc/ssl/certs. They will be compiled into a "
diff --git a/debian/po/vi.po b/debian/po/vi.po
index 02fe4dc..036f6fc 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -1,12 +1,12 @@
 # Vietnamese Translation for ca-certificates.
 # Copyright © 2007 Free Software Foundation, Inc.
 # Clytie Siddall <clytie@riverland.net.au>, 2005-2007.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: ca-certificates 20070304\n"
-"Report-Msgid-Bugs-To: ukai@debian.or.jp\n"
-"POT-Creation-Date: 2007-07-27 11:03+0200\n"
+"Report-Msgid-Bugs-To: ca-certificates@packages.debian.org\n"
+"POT-Creation-Date: 2008-06-16 17:02+0200\n"
 "PO-Revision-Date: 2007-07-30 18:25+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-bugs@googlegroups.com>\n"
@@ -52,22 +52,15 @@ msgstr ""
 " • không\t\tmặc định là không cài đặt chứng nhận CA mới.\n"
 " • hỏi\t\tnhắc với mỗi chứng nhận CA mới"
 
-# Variable: do not translate/ biến: đừng dịch
-#. Type: multiselect
-#. Choices
-#: ../templates:3001
-msgid "${new_crts}"
-msgstr "${new_crts}"
-
 #. Type: multiselect
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid "New certificates to activate:"
 msgstr "Các chứng nhận mới cần kích hoạt:"
 
 #. Type: multiselect
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid ""
 "During upgrades, new certificates will be added. Please choose those you "
 "trust."
@@ -75,32 +68,25 @@ msgstr ""
 "Trong khi nâng cấp, chứng nhận mới sẽ được thêm. Hãy chọn những chứng nhận "
 "bạn tin vậy."
 
-# Variable: do not translate/ biến: đừng dịch
-#. Type: multiselect
-#. Choices
-#: ../templates:4001
-msgid "${enable_crts}"
-msgstr "${enable_crts}"
-
 #. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid "Certificates to activate:"
 msgstr "Các chứng nhận cần kích hoạt:"
 
 #. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid ""
 "This package installs common CA (Certificate Authority) certificates in /usr/"
 "share/ca-certificates."
 msgstr ""
-"Gói này sẽ tạo các chứng nhận CA (nhà cầm quyền chứng nhận) vào «  /usr/"
-"share/ca-certificates »."
+"Gói này sẽ tạo các chứng nhận CA (nhà cầm quyền chứng nhận) vào «  /usr/share/"
+"ca-certificates »."
 
 #. Type: multiselect
 #. Description
-#: ../templates:4002
+#: ../templates:4001
 msgid ""
 "Please select the certificate authorities you trust so that their "
 "certificates are installed into /etc/ssl/certs. They will be compiled into a "
@@ -109,3 +95,11 @@ msgstr ""
 "Hãy chọn những nhà cầm quyền chứng nhận bạn tin cậy để cài đặt các chứng "
 "nhận của chúng vào « /etc/ssl/certs ». Chúng sẽ được biên dịch vào một tập "
 "tin « /etc/ssl/certs/ca-certificates.crt » riêng lẻ."
+
+# Variable: do not translate/ biến: đừng dịch
+#~ msgid "${new_crts}"
+#~ msgstr "${new_crts}"
+
+# Variable: do not translate/ biến: đừng dịch
+#~ msgid "${enable_crts}"
+#~ msgstr "${enable_crts}"
diff --git a/debian/postinst b/debian/postinst
index fa80455..dbd20e6 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -51,6 +51,9 @@ case "$1" in
 	CERTS_ENABLED="$RET"
 	# XXX unmark seen for next configuration
 	db_fset ca-certificates/new_crts seen false
+	# We should clean up this value now, as everyone will have
+	# upgraded to a fixed version.
+	db_fset ca-certificates/enable_crts asked_pt_br_question false
 	db_stop || true
 	if test -f /etc/ca-certificates.conf; then
 	  # XXX: while in subshell?
diff --git a/debian/templates b/debian/templates
index 170eda6..eb19690 100644
--- a/debian/templates
+++ b/debian/templates
@@ -22,14 +22,14 @@ _Description: Trust new certificates from certificate authorities?
 
 Template: ca-certificates/new_crts
 Type: multiselect
-_Choices: ${new_crts}
+Choices: ${new_crts}
 _Description: New certificates to activate:
  During upgrades, new certificates will be added. Please choose
  those you trust.
 
 Template: ca-certificates/enable_crts
 Type: multiselect
-_Choices: ${enable_crts}
+Choices: ${enable_crts}
 _Description: Certificates to activate:
  This package installs common CA (Certificate Authority) certificates in
  /usr/share/ca-certificates.