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.

diff --git a/debian/changelog b/debian/changelog
index 31e8cb77a5b6ea0f6451c116179327330076be8d..bc2f621570ecbfcfe23824a9e2b5105c75e762ce 100644 (file)
--- 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 ef4f57c5d80bf2ef73610e7ca078147b3f1b6a16..6677eab3aefdfc7df4f99b4c85bae8c44a8d59b9 100644 (file)
--- 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 4d459f0f6ab1cb18a6bd9aeea07a843a21cc5516..564ba0aafa56ab4c97eb451141d35b1915632de0 100644 (file)
--- 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"
@@ -59,15 +59,9 @@ msgstr ""
 "- 'no', no s'instal·laran els nous certificats de les CA.\n"
 "- '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 "
@@ -84,15 +78,9 @@ msgstr ""
 "En aquesta actualització s'han afegit aquests certificats nous. Confieu en "
 "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 be0b6e90af1acadd2ca636c148c2b18b63c297fe..69879e3f3da18d086b8b058520df7f9c6a8c981b 100644 (file)
--- 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"
@@ -59,21 +59,15 @@ msgstr ""
 " - ne:  nové certifikáty nebudou implicitně instalovány.\n"
 " - 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."
@@ -81,21 +75,15 @@ msgstr ""
 "Během aktualizace budou přidány nové certifikáty. Vyberte prosím ty, kterým "
 "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 143ffd502dcab1b5222f56820689f532b66b49e3..ebc8cacb056230faaf5b99aebc039ebcd64d80c0 100644 (file)
--- 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"
@@ -75,15 +75,9 @@ msgstr ""
 " - \"spørg\", spørger om du vil stole på hvert enkelt nyt CA-certifikat "
 "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
 
 #. Type: multiselect
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 #, fuzzy
 #| msgid ""
 #| "During the upgrade, these new certificates will be added. Do you trust "
@@ -103,15 +97,9 @@ msgstr ""
 "Disse nye certifikater bliver tilføjet under opgraderingen. Stoler du på "
 "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
 
 #. 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 3585c2476fd1c8a38eeb6b19941c65ee70c84d87..21f46fcebb6573f6acc56f6b5461e617d761391f 100644 (file)
--- 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"
@@ -54,21 +54,15 @@ msgstr ""
 " - Nein  : neue CA-Zertifikate werden standardmäßig nicht installiert;\n"
 " - 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."
@@ -76,21 +70,15 @@ msgstr ""
 "Während Upgrades werden neue Zertifikate hinzugefügt. Bitte wählen Sie "
 "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 03fd5559cd201e7342e5413f08d031be678eb4cd..c25d9ba8bc445239ccc5adfe725b25118382edcf 100644 (file)
--- 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"
@@ -78,21 +78,15 @@ msgstr ""
 " - no: los nuevos certificados de CA no se instalarán por omisión.\n"
 " - 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."
@@ -100,21 +94,15 @@ msgstr ""
 "Se añadirán estos certificados durante la actualización. Escoja de la lista "
 "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 b126021aaa4f3972a28096d664df11a6d77b9de6..4def0379622a56ac0f692daed378f2cb9a632a4a 100644 (file)
--- 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"
@@ -52,21 +52,15 @@ msgstr ""
 " - ez: lehenespen bezala ZA berrietako ziurtagiriak ez dira instalatuko\n"
 " - 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."
@@ -74,21 +68,15 @@ msgstr ""
 "Bertsio berritzeetan, ziurtagiri berriak gehituko dira, Mesedez hautatu "
 "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 599f8e731a51a6efa23c13b3fe95bdc3df4fb592..c96fda0f0ae486c1b439eab95fdbb941258fcbe2 100644 (file)
--- 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"
@@ -48,42 +48,30 @@ msgstr ""
 " - ei:    uusia CA-varmenteita ei oletuksena asenneta\n"
 " - 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."
 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 afae516ade141b3634bbbb62a89889ed2420ab93..80f1de2465d9ce05dc3fdc5970f463dbec480a08 100644 (file)
--- 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"
@@ -52,21 +52,15 @@ msgstr ""
 "- Demander : l'agrément de chacun des nouveaux certificats vous sera\n"
 "             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."
@@ -74,21 +68,15 @@ msgstr ""
 "Lors de cette mise à jour, de nouveaux certificats ont été ajoutés. Veuillez "
 "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 816cac09a390f2fcc55b941c8c5014afb118a2bb..9d4c7b209c16b306451fae190fcca880f4fc68d2 100644 (file)
--- 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"
@@ -50,21 +50,15 @@ msgstr ""
 " - non      : non se han instalar por defecto os novos certificados de CA.\n"
 " - 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."
@@ -72,21 +66,15 @@ msgstr ""
 "Durante as actualizacións hanse engadir novos certificados. Indique os "
 "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 85e12e94eca03a0aec20cf3784f34e74ad736edf..762f0eb082c0320fee89c49aa7bf407fd318ff21 100644 (file)
--- 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"
@@ -51,21 +51,15 @@ msgstr ""
 " - no    : i certificati delle nuove CA non vengono installati;\n"
 " - 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."
@@ -73,21 +67,15 @@ msgstr ""
 "Con l'aggiornamento, vengono aggiunti dei nuovi certificati. Selezionare "
 "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 91948803eec4eb3635b16c1013cae09fbc63817a..a6f8a792147e870890077e92f9863c5e05cbd0fa 100644 (file)
--- 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"
@@ -58,21 +58,15 @@ msgstr ""
 " - `いいえ': 新しい CA 証明書をデフォルトではインストールしません。\n"
 " - `質問する': 新しい 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."
@@ -80,21 +74,15 @@ 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 ecab8bfd0fe9ba40160ff170de64292720002837..d05b876684a1fae8d966385f941bac1dc671eaa3 100644 (file)
--- 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"
@@ -62,21 +62,15 @@ msgstr ""
 " - nee: nieuwe CA certificaten niet standaard installeren;\n"
 " - 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."
@@ -84,21 +78,15 @@ msgstr ""
 "Bij deze opwaardering worden nieuwe certificaten toegevoegd. Selecteer de "
 "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 41f79ed935ea3004f70f9a228d77a6f4a211c6e3..306e8a2524ef32a017ac19432e12793eea6147ad 100644 (file)
--- 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"
@@ -52,21 +52,15 @@ msgstr ""
 " - não      : novos certificados CA não serão instalados por omissão;\n"
 " - 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."
@@ -74,21 +68,15 @@ msgstr ""
 "Durante a actualização, serão adicionadoss novos certificados. Por favor "
 "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 f14b30b8fe08b1de54675546ba51179717a0ae35..dbd27417abb5dc58c43401781062019c62968b59 100644 (file)
--- 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"
@@ -72,15 +72,9 @@ msgstr ""
 " - 'não', novos certificados de CAs nao serão instalados por padrão.\n"
 " - '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 "
@@ -100,15 +94,9 @@ msgstr ""
 "Durante a atualização, estes novos certificados serão adicionados. Você "
 "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 dca7c42721d07635ddbfd7e8430dbc4212339bc9..3faf9aefcac8569eece0b6623844e37cd7cf692f 100644 (file)
--- 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"
@@ -52,21 +52,15 @@ msgstr ""
 " - нет: по умолчанию не устанавливать новые корневые сертификаты.\n"
 " - спрашивать: спрашивать, стоит ли доверять каждому из новых сертифкатов 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."
@@ -74,21 +68,15 @@ 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 26f73bfe723503ed55dc743d45fd2c06d5df3b07..55f8880643bade6a12fdebdfa04d09c941aff841 100644 (file)
--- 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"
@@ -58,21 +58,15 @@ msgstr ""
 " - nej: nya CA-certifikat kommer inte att installeras som standard;\n"
 " - 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."
@@ -80,21 +74,15 @@ msgstr ""
 "Under uppgraderingar kommer nya certifikat att läggas till. Välj de som du "
 "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 1fb878891d0d2bfb8839a6df9034eae50797e727..20a84c0027f4b04e9cb9a2752daf40aae45c08fb 100644 (file)
--- 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"
@@ -46,41 +46,29 @@ msgid ""
 " - ask: prompt for each new CA certificate."
 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 02fe4dc427cb6f41c7cd538a0f702be1bf4014e5..036f6fcd6b3e5471e78ee22409380ea463c95370 100644 (file)
--- 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 fa80455249d5d6bba186f3d12c826eabcf6961b8..dbd20e6717be07df96d8d133aef8a5f273c8bcfd 100644 (file)
--- 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 170eda641f67e6f3f737b4f7059708978a2c49e1..eb19690dc3a9fa594b4de38e85490e7c67b98884 100644 (file)
--- 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.