Import Debian version 20111022debian/20111022

24 files changed, 590 insertions, 190 deletions

diff --git a/debian/changelog b/debian/changelog
index 552c50e..ab517b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,30 @@
+ca-certificates (20111022) unstable; urgency=low
+
+  * QA upload.
+  * Fix pending l10n issues. Debconf translations:
+    - German (Helge Kreutzmann).  Closes: #634000
+    - French (Christian Perrier).  Closes: #634092
+    - Russian (Yuri Kozlov).  Closes: #635146
+    - Swedish (Martin Bagge / brother).  Closes: #640622
+    - Slovak (Slavko).  Closes: #641987
+    - Spanish; (Javier Fernández-Sanguino).  Closes: #642359
+    - Japanese (Kenshi Muto).  Closes: #644828
+    - Czech (Miroslav Kure).  Closes: #644843
+    - Danish (Joe Hansen).  Closes: #644854
+    - Italian (Luca Monducci).  Closes: #645004
+    - Dutch; (Jeroen Schot).  Closes: #645090
+    - Portuguese (Miguel Figueiredo).  Closes: #645126
+    - Galician (Jorge Barreiro).  Closes: #645138
+    - Catalan; (Jordi Mallach).  Closes: #645182
+    - Brazilian Portuguese (Adriano Rafael Gomes).  Closes: #645526
+  * Split Choices in debconf templates
+  * Add build-arch and build-indep build targets
+  * Bump debhelper compatibility level to 8
+  * Bump Standards to 3.9.2 (checked)
+  * Replace "dh_clean -k" by dh_prep
+
+ -- Christian Perrier <bubulle@debian.org>  Sat, 22 Oct 2011 14:24:00 +0200
+
 ca-certificates (20110502+nmu1) unstable; urgency=high
 
   * Non-maintainer upload by the Security Team.
diff --git a/debian/compat b/debian/compat
index b8626c4..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+8
diff --git a/debian/control b/debian/control
index dc5757e..b284a75 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: ca-certificates
 Section: misc
 Priority: optional
 Maintainer: Debian QA Group <packages@qa.debian.org>
-Build-Depends: debhelper (>> 4.1.16), po-debconf
+Build-Depends: debhelper (>= 8), po-debconf
 Build-Depends-Indep: python
-Standards-Version: 3.8.2
+Standards-Version: 3.9.2
 
 Package: ca-certificates
 Architecture: all
diff --git a/debian/po/ca.po b/debian/po/ca.po
index 908e29e..4470118 100644
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -1,14 +1,15 @@
 # Catalan translation of ca-certificates debconf templates.
-# Copyright (c) 2004, 2010 Software in the Public Interest, Inc.
+# Copyright (c) 2004, 2010, 2011 Software in the Public Interest, Inc.
 # This file is distributed under the same license as the ca-certificates package.
 # Josep Monés i Teixidor <jmones@puntbarra.com>, 2004.
-# Jordi Mallach <jordi@debian.org>, 2010.
+# Jordi Mallach <jordi@debian.org>, 2010, 2011.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: ca-certificates 20090814+nmu2\n"
 "Report-Msgid-Bugs-To: ca-certificates@packages.debian.org\n"
-"POT-Creation-Date: 2011-05-02 19:31+0200\n"
-"PO-Revision-Date: 2010-10-23 12:12+0200\n"
+"POT-Creation-Date: 2011-10-22 14:41+0200\n"
+"PO-Revision-Date: 2011-10-13 12:47+0200\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
 "Language: ca\n"
@@ -20,13 +21,25 @@ msgstr ""
 #. Description
 #: ../templates:2001
 msgid "ca-certificates configuration"
-msgstr ""
+msgstr "Configuració de ca-certificates"
+
+#. Type: select
+#. Choices
+#: ../templates:3001
+msgid "yes"
+msgstr "sí"
 
 #. Type: select
 #. Choices
 #: ../templates:3001
-msgid "yes, no, ask"
-msgstr "sí, no, demana"
+msgid "no"
+msgstr "no"
+
+#. Type: select
+#. Choices
+#: ../templates:3001
+msgid "ask"
+msgstr "demana"
 
 #. Type: select
 #. Description
@@ -104,6 +117,9 @@ msgstr ""
 "s'instaŀlen els seus certificats a /etc/ssl/certs. Aquests es compilaran en "
 "un sol fitxer /etc/ssl/certs/ca-certificates.crt."
 
+#~ msgid "yes, no, ask"
+#~ msgstr "sí, no, demana"
+
 #~ msgid "${new_crts}"
 #~ msgstr "${new_crts}"
 
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 07aaa67..8f7c295 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ca-certificates\n"
 "Report-Msgid-Bugs-To: ca-certificates@packages.debian.org\n"
-"POT-Creation-Date: 2011-05-02 19:31+0200\n"
-"PO-Revision-Date: 2007-07-29 11:13+0200\n"
+"POT-Creation-Date: 2011-10-22 14:41+0200\n"
+"PO-Revision-Date: 2011-10-09 19:01+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
 "Language: cs\n"
@@ -28,13 +28,25 @@ msgstr ""
 #. Description
 #: ../templates:2001
 msgid "ca-certificates configuration"
-msgstr ""
+msgstr "Nastavení ca-certificates"
+
+#. Type: select
+#. Choices
+#: ../templates:3001
+msgid "yes"
+msgstr "ano"
 
 #. Type: select
 #. Choices
 #: ../templates:3001
-msgid "yes, no, ask"
-msgstr "ano, ne, zeptat se"
+msgid "no"
+msgstr "ne"
+
+#. Type: select
+#. Choices
+#: ../templates:3001
+msgid "ask"
+msgstr "zeptat se"
 
 #. Type: select
 #. Description
@@ -106,12 +118,9 @@ msgid ""
 "certificates are installed into /etc/ssl/certs. They will be compiled into a "
 "single /etc/ssl/certs/ca-certificates.crt file."
 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 "
+"Vyberte prosím certifikační autority, kterým věříte a jejichž certifikáty se "
+"mají 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}"
+#~ msgid "yes, no, ask"
+#~ msgstr "ano, ne, zeptat se"
diff --git a/debian/po/da.po b/debian/po/da.po
index 03f05a1..a808e9b 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -1,15 +1,15 @@
 # Danish translation ca-certificates.
-# Copyright (C) 2010 ca-certificates & nedenstående oversættere.
+# Copyright (C) 2011 ca-certificates & nedenstående oversættere.
 # This file is distributed under the same license as the ca-certificates package.
 # Claus Hindsgaul <claus.hindsgaul@gmail.com>, 2004, 2006.
-# Joe Hansen <joedalton2@yahoo.dk>, 2010.
+# Joe Hansen <joedalton2@yahoo.dk>, 2010, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: ca-certificates_20031007_templates\n"
 "Report-Msgid-Bugs-To: ca-certificates@packages.debian.org\n"
-"POT-Creation-Date: 2011-05-02 19:31+0200\n"
-"PO-Revision-Date: 2010-10-23 19:21+0100\n"
+"POT-Creation-Date: 2011-10-22 14:41+0200\n"
+"PO-Revision-Date: 2011-10-09 19:21+0100\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
 "Language: \n"
@@ -21,13 +21,25 @@ msgstr ""
 #. Description
 #: ../templates:2001
 msgid "ca-certificates configuration"
-msgstr ""
+msgstr "konfiguration af ca-certificates"
+
+#. Type: select
+#. Choices
+#: ../templates:3001
+msgid "yes"
+msgstr "ja"
 
 #. Type: select
 #. Choices
 #: ../templates:3001
-msgid "yes, no, ask"
-msgstr "ja, nej, spørg"
+msgid "no"
+msgstr "nej"
+
+#. Type: select
+#. Choices
+#: ../templates:3001
+msgid "ask"
+msgstr "spørg"
 
 #. Type: select
 #. Description
@@ -102,3 +114,6 @@ msgstr ""
 "Vælg venligst de certifikatautoriteter du stoler på, så deres certifikater "
 "installeres i /etc/ssl/certs. De vil blive kompileret til en enkelt fil /etc/"
 "ssl/certs/ca-certificates.crt."
+
+#~ msgid "yes, no, ask"
+#~ msgstr "ja, nej, spørg"
diff --git a/debian/po/de.po b/debian/po/de.po
index 9578b71..8e81eec 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -1,14 +1,14 @@
 # German translation of ca-certificates templates
 # Erik Schanze <eriks@debian.org>, 2004-2006.
-# Helge Kreutzmann <debian@helgefjell.de>, 2007.
+# Helge Kreutzmann <debian@helgefjell.de>, 2007, 2011.
 # This file is distributed under the same license as the ca-certificates package.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ca-certificates 20070304\n"
+"Project-Id-Version: ca-certificates 20110502\n"
 "Report-Msgid-Bugs-To: ca-certificates@packages.debian.org\n"
-"POT-Creation-Date: 2011-05-02 19:31+0200\n"
-"PO-Revision-Date: 2007-07-27 20:21+0200\n"
+"POT-Creation-Date: 2011-10-22 14:41+0200\n"
+"PO-Revision-Date: 2011-07-15 21:45+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "Language: de\n"
@@ -22,13 +22,25 @@ msgstr ""
 #. Description
 #: ../templates:2001
 msgid "ca-certificates configuration"
-msgstr ""
+msgstr "ca-certificates-Konfiguration"
+
+#. Type: select
+#. Choices
+#: ../templates:3001
+msgid "yes"
+msgstr "Ja"
 
 #. Type: select
 #. Choices
 #: ../templates:3001
-msgid "yes, no, ask"
-msgstr "Ja, Nein, Fragen"
+msgid "no"
+msgstr "Nein"
+
+#. Type: select
+#. Choices
+#: ../templates:3001
+msgid "ask"
+msgstr "Fragen"
 
 #. Type: select
 #. Description
@@ -105,6 +117,9 @@ msgstr ""
 "deren Zertifikate in /etc/ssl/certs installiert werden. Sie werden in eine "
 "einzige Datei /etc/ssl/certs/ca-certificates.crt zusammengestellt."
 
+#~ msgid "yes, no, ask"
+#~ msgstr "Ja, Nein, Fragen"
+
 #~ msgid "${new_crts}"
 #~ msgstr "${new_crts}"
 
diff --git a/debian/po/es.po b/debian/po/es.po
index 0e802b4..da44903 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -6,7 +6,7 @@
 #  - Initial translation
 #         César Gómez Martín <cesar.gomez@gmail.com>
 #  - Update
-#         Javier Fernández-Sanguino <jfs@debian.org>, 2006-2007
+#         Javier Fernández-Sanguino <jfs@debian.org>, 2006-2011
 #
 #   Traductores, si no conoce el formato PO, merece la pena leer la
 #   documentación de gettext, especialmente las secciones dedicadas a este
@@ -29,8 +29,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ca-certificates\n"
 "Report-Msgid-Bugs-To: ca-certificates@packages.debian.org\n"
-"POT-Creation-Date: 2011-05-02 19:31+0200\n"
-"PO-Revision-Date: 2007-07-27 19:01+0200\n"
+"POT-Creation-Date: 2011-10-22 14:41+0200\n"
+"PO-Revision-Date: 2011-09-21 23:37+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian l10n spanish <debian-l10n-spanish@lists.debian.org>\n"
 "Language: \n"
@@ -45,13 +45,25 @@ msgstr ""
 #. Description
 #: ../templates:2001
 msgid "ca-certificates configuration"
-msgstr ""
+msgstr "Configuración de ca-certificates"
+
+#. Type: select
+#. Choices
+#: ../templates:3001
+msgid "yes"
+msgstr "sí"
 
 #. Type: select
 #. Choices
 #: ../templates:3001
-msgid "yes, no, ask"
-msgstr "sí, no, preguntar"
+msgid "no"
+msgstr "no"
+
+#. Type: select
+#. Choices
+#: ../templates:3001
+msgid "ask"
+msgstr "preguntar"
 
 #. Type: select
 #. Description
@@ -129,6 +141,9 @@ msgstr ""
 "en «/etc/ssl/certs». Se incluirán todas en un único archivo «/etc/ssl/certs/"
 "ca-certificates.crt»."
 
+#~ msgid "yes, no, ask"
+#~ msgstr "sí, no, preguntar"
+
 #~ msgid "${new_crts}"
 #~ msgstr "${new_crts}"
 
diff --git a/debian/po/eu.po b/debian/po/eu.po
index 721f2a4..02fc1e8 100644
--- a/debian/po/eu.po
+++ b/debian/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: ca-certificates@packages.debian.org\n"
-"POT-Creation-Date: 2011-05-02 19:31+0200\n"
+"POT-Creation-Date: 2011-10-22 14:41+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"
@@ -26,8 +26,20 @@ msgstr ""
 #. Type: select
 #. Choices
 #: ../templates:3001
-msgid "yes, no, ask"
-msgstr "bai, ez, galdetu"
+msgid "yes"
+msgstr "bai"
+
+#. Type: select
+#. Choices
+#: ../templates:3001
+msgid "no"
+msgstr "ez"
+
+#. Type: select
+#. Choices
+#: ../templates:3001
+msgid "ask"
+msgstr "galdetu"
 
 #. Type: select
 #. Description
@@ -103,6 +115,9 @@ msgstr ""
 "en instala daitezen. /etc/ssl/certs/ca-certificates fitxategi soilean "
 "konpilatuko dira."
 
+#~ msgid "yes, no, ask"
+#~ msgstr "bai, ez, galdetu"
+
 #~ msgid "${new_crts}"
 #~ msgstr "${new_crts}"
 
diff --git a/debian/po/fi.po b/debian/po/fi.po
index 4c3c660..ed02faf 100644
--- a/debian/po/fi.po
+++ b/debian/po/fi.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ca-certificates\n"
 "Report-Msgid-Bugs-To: ca-certificates@packages.debian.org\n"
-"POT-Creation-Date: 2011-05-02 19:31+0200\n"
+"POT-Creation-Date: 2011-10-22 14:41+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"
@@ -22,8 +22,20 @@ msgstr ""
 #. Type: select
 #. Choices
 #: ../templates:3001
-msgid "yes, no, ask"
-msgstr "kyllä, ei, kysy"
+msgid "yes"
+msgstr "kyllä"
+
+#. Type: select
+#. Choices
+#: ../templates:3001
+msgid "no"
+msgstr "ei"
+
+#. Type: select
+#. Choices
+#: ../templates:3001
+msgid "ask"
+msgstr "kysy"
 
 #. Type: select
 #. Description
@@ -98,6 +110,9 @@ msgstr ""
 "hakemistoon /etc/ssl/certs. Ne kootaan yhteen tiedostoon /etc/ssl/certs/ca-"
 "certificates.crt."
 
+#~ msgid "yes, no, ask"
+#~ msgstr "kyllä, ei, kysy"
+
 #~ msgid "${new_crts}"
 #~ msgstr "${new_crts}"
 
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 102575c..3a61825 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -2,33 +2,46 @@
 # Copyright (C) 2006, 2007 Debian French l10n team <debian-l10n-french@lists.debian.org>
 # This file is distributed under the same license as the gdebi package.
 #
-# Christian Perrier <bubulle@debian.org>, 2006, 2007.
 # This file is licensed under the same license as the ca-certificates package
+# Christian Perrier <bubulle@debian.org>, 2006, 2007, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: ca-certificates@packages.debian.org\n"
-"POT-Creation-Date: 2011-05-02 19:31+0200\n"
-"PO-Revision-Date: 2007-07-27 08:40+0200\n"
+"POT-Creation-Date: 2011-10-22 14:41+0200\n"
+"PO-Revision-Date: 2011-07-16 21:04+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. Type: title
 #. Description
 #: ../templates:2001
 msgid "ca-certificates configuration"
-msgstr ""
+msgstr "Configuration de ca-certificates"
+
+#. Type: select
+#. Choices
+#: ../templates:3001
+msgid "yes"
+msgstr "Oui"
 
 #. Type: select
 #. Choices
 #: ../templates:3001
-msgid "yes, no, ask"
-msgstr "Oui, Non, Demander"
+msgid "no"
+msgstr "Non"
+
+#. Type: select
+#. Choices
+#: ../templates:3001
+msgid "ask"
+msgstr "Demander"
 
 #. Type: select
 #. Description
@@ -105,6 +118,9 @@ msgstr ""
 "certificats soient installés dans /etc/ssl/certs. Ils seront rassemblés dans "
 "un seul fichier nommé /etc/ssl/certs/ca-certificates.crt."
 
+#~ msgid "yes, no, ask"
+#~ msgstr "Oui, Non, Demander"
+
 #~ msgid "${new_crts}"
 #~ msgstr "${new_crts}"
 
diff --git a/debian/po/gl.po b/debian/po/gl.po
index a51bb1b..c32961d 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -1,37 +1,52 @@
 # Galician translation of ca-certificates's debconf templates
 # This file is distributed under the same license as the ca-certificates package.
-# Jacobo Tarrio <jtarrio@debian.org>, 2007.
 #
+# Jacobo Tarrio <jtarrio@debian.org>, 2007.
+# Jorge Barreiro <yortx.barry@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ca-certificates\n"
 "Report-Msgid-Bugs-To: ca-certificates@packages.debian.org\n"
-"POT-Creation-Date: 2011-05-02 19:31+0200\n"
-"PO-Revision-Date: 2007-07-31 09:52+0100\n"
-"Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
+"POT-Creation-Date: 2011-10-22 14:41+0200\n"
+"PO-Revision-Date: 2011-10-02 14:02+0200\n"
+"Last-Translator: Jorge Barreiro <yortx.barry@gmail.com>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
 "Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. Type: title
 #. Description
 #: ../templates:2001
 msgid "ca-certificates configuration"
-msgstr ""
+msgstr "Configuración dos certificados das entidades de acreditación (EA)"
+
+#. Type: select
+#. Choices
+#: ../templates:3001
+msgid "yes"
+msgstr "si"
 
 #. Type: select
 #. Choices
 #: ../templates:3001
-msgid "yes, no, ask"
-msgstr "si, non, preguntar"
+msgid "no"
+msgstr "non"
+
+#. Type: select
+#. Choices
+#: ../templates:3001
+msgid "ask"
+msgstr "preguntar"
 
 #. Type: select
 #. Description
 #: ../templates:3002
 msgid "Trust new certificates from certificate authorities?"
-msgstr "¿Confiar nos novos certificados das autoridades certificadoras?"
+msgstr "Confiar nos novos certificados das entidades de acreditación?"
 
 #. Type: select
 #. Description
@@ -41,9 +56,9 @@ msgid ""
 "upgrading. You may want to check such new CA certificates and select only "
 "certificates that you trust."
 msgstr ""
-"Este paquete pode instalar novos certificados de CA (autoridade "
-"certificadora) ao actualizar. Pode querer comprobar eses novos certificados "
-"de CA e escoller só os certificados nos que confíe."
+"Este paquete pode instalar novos certificados de entidades de acreditación "
+"(EA) ao actualizar. Pode querer comprobar eses novos certificados e escoller "
+"só nos que confíe."
 
 #. Type: select
 #. Description
@@ -53,9 +68,12 @@ msgid ""
 " - no : new CA certificates will not be installed by default;\n"
 " - ask: prompt for each new CA certificate."
 msgstr ""
-" - si       : hase confiar e instalar os novos certificados de CA.\n"
-" - non      : non se han instalar por defecto os novos certificados de CA.\n"
-" - preguntar: preguntar por cada novo certificado de CA."
+" - si       : hase confiar e instalar os novos certificados de entidades de "
+"acreditación.\n"
+" - non      : non se han instalar por defecto os novos certificados de "
+"entidades de acreditación.\n"
+" - preguntar: preguntar por cada novo certificado dunha entidade de "
+"acreditación."
 
 #. Type: multiselect
 #. Description
@@ -70,7 +88,7 @@ msgid ""
 "During upgrades, new certificates will be added. Please choose those you "
 "trust."
 msgstr ""
-"Durante as actualizacións hanse engadir novos certificados. Indique os "
+"Durante as anovacións engadiranse novos certificados. Indique os "
 "certificados nos que confía."
 
 #. Type: multiselect
@@ -86,8 +104,8 @@ msgid ""
 "This package installs common CA (Certificate Authority) certificates in /usr/"
 "share/ca-certificates."
 msgstr ""
-"Este paquete instala certificados de CA (autoridade certificadora) en /usr/"
-"share/ca-certificates."
+"Este paquete instala certificados de entidades de acreditación comúns en /"
+"usr/share/ca-certificates."
 
 #. Type: multiselect
 #. Description
@@ -97,10 +115,13 @@ msgid ""
 "certificates are installed into /etc/ssl/certs. They will be compiled into a "
 "single /etc/ssl/certs/ca-certificates.crt file."
 msgstr ""
-"Escolla as autoridades certificadoras nas que confía para instalar os seus "
+"Escolla as entidades de acreditación 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 "yes, no, ask"
+#~ msgstr "si, non, preguntar"
+
 #~ msgid "${new_crts}"
 #~ msgstr "${new_crts}"
 
diff --git a/debian/po/it.po b/debian/po/it.po
index ab2b4a2..5730e7a 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -1,14 +1,13 @@
 # Italian (it) translation of debconf templates for ca-certificates
-# Copyright (C) 2007 Free Software Foundation, Inc.
 # This file is distributed under the same license as the ca-certificates package.
-# Luca Monducci <luca.mo@tiscali.it>, 2007.
+# Luca Monducci <luca.mo@tiscali.it>, 2007-2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ca-certificates italian debconf templates\n"
+"Project-Id-Version: ca-certificates 20110502 italian debconf templates\n"
 "Report-Msgid-Bugs-To: ca-certificates@packages.debian.org\n"
-"POT-Creation-Date: 2011-05-02 19:31+0200\n"
-"PO-Revision-Date: 2007-07-28 20:50+0200\n"
+"POT-Creation-Date: 2011-10-22 14:41+0200\n"
+"PO-Revision-Date: 2011-10-11 18:50+0200\n"
 "Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
 "Language: it\n"
@@ -20,13 +19,25 @@ msgstr ""
 #. Description
 #: ../templates:2001
 msgid "ca-certificates configuration"
-msgstr ""
+msgstr "Configurazione di ca-certificates"
+
+#. Type: select
+#. Choices
+#: ../templates:3001
+msgid "yes"
+msgstr "sì"
 
 #. Type: select
 #. Choices
 #: ../templates:3001
-msgid "yes, no, ask"
-msgstr "sì, no, chiedi"
+msgid "no"
+msgstr "no"
+
+#. Type: select
+#. Choices
+#: ../templates:3001
+msgid "ask"
+msgstr "chiedi"
 
 #. Type: select
 #. Description
@@ -102,6 +113,9 @@ msgstr ""
 "relativi certificati in /etc/ssl/certs. Questi vengono compilati in un unico "
 "file /etc/ssl/certs/ca-certificates.crt."
 
+#~ msgid "yes, no, ask"
+#~ msgstr "sì, no, chiedi"
+
 #~ msgid "${new_crts}"
 #~ msgstr "${new_crts}"
 
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 41a4e3a..d3f1487 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ca-certificates\n"
 "Report-Msgid-Bugs-To: ca-certificates@packages.debian.org\n"
-"POT-Creation-Date: 2011-05-02 19:31+0200\n"
-"PO-Revision-Date: 2007-07-30 14:08+0900\n"
+"POT-Creation-Date: 2011-10-22 14:41+0200\n"
+"PO-Revision-Date: 2011-10-09 22:57+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
 "Language: ja\n"
@@ -28,13 +28,25 @@ msgstr ""
 #. Description
 #: ../templates:2001
 msgid "ca-certificates configuration"
-msgstr ""
+msgstr "ca-certificates の設定"
+
+#. Type: select
+#. Choices
+#: ../templates:3001
+msgid "yes"
+msgstr "はい"
 
 #. Type: select
 #. Choices
 #: ../templates:3001
-msgid "yes, no, ask"
-msgstr "はい, いいえ, 質問する"
+msgid "no"
+msgstr "いいえ"
+
+#. Type: select
+#. Choices
+#: ../templates:3001
+msgid "ask"
+msgstr "質問する"
 
 #. Type: select
 #. Description
@@ -109,8 +121,5 @@ msgstr ""
 "い。これらは、単一のファイル /etc/ssl/certs/ca-certificates.crt にコンパイル"
 "されます。"
 
-#~ msgid "${new_crts}"
-#~ msgstr "${new_crts}"
-
-#~ msgid "${enable_crts}"
-#~ msgstr "${enable_crts}"
+#~ msgid "yes, no, ask"
+#~ msgstr "はい, いいえ, 質問する"
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 32a60ed..9332a1a 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -1,42 +1,46 @@
-# translation of ca-certificates_20070304_nl.po to Dutch
-#
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans#
-#    Developers do not need to manually edit POT or PO files.
-#
+# Dutch translation of ca-certificates debconf templates.
+# Copyright (C) 2011 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the ca-certificates package.
 # Frans Pop <aragorn@tiscali.nl>, 2004, 2006.
 # Frans Pop <elendil@planet.nl>, 2007.
+# Jeroen Schot <schot@a-eskwadraat.nl>, 2011.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: ca-certificates_20060816_nl\n"
+"Project-Id-Version: ca-certificates 20110502+nmu1\n"
 "Report-Msgid-Bugs-To: ca-certificates@packages.debian.org\n"
-"POT-Creation-Date: 2011-05-02 19:31+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"
+"POT-Creation-Date: 2011-10-22 14:41+0200\n"
+"PO-Revision-Date: 2011-10-10 09:58+0200\n"
+"Last-Translator: Jeroen Schot <schot@a-eskwadraat.nl>\n"
+"Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
 
 #. Type: title
 #. Description
 #: ../templates:2001
 msgid "ca-certificates configuration"
-msgstr ""
+msgstr "ca-certificates configuratie"
 
 #. Type: select
 #. Choices
 #: ../templates:3001
-msgid "yes, no, ask"
-msgstr "ja, nee, selectie"
+msgid "yes"
+msgstr "ja"
+
+#. Type: select
+#. Choices
+#: ../templates:3001
+msgid "no"
+msgstr "nee"
+
+#. Type: select
+#. Choices
+#: ../templates:3001
+msgid "ask"
+msgstr "selectie"
 
 #. Type: select
 #. Description
@@ -113,8 +117,5 @@ msgstr ""
 "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}"
+#~ msgid "yes, no, ask"
+#~ msgstr "ja, nee, selectie"
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 7b88248..2034bac 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -2,14 +2,14 @@
 # Copyright (C) 2007 Carlos Lisboa <carloslisboa@gmail.com>
 # This file is distributed under the same license as the ca-certificates package.
 # Carlos Lisboa <carloslisboa@gmail.com>, 2007.
-# Miguel Figueiredo <elmig@debianpt.org>, 2007.
+# Miguel Figueiredo <elmig@debianpt.org>, 2007-2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: ca-certificates\n"
 "Report-Msgid-Bugs-To: ca-certificates@packages.debian.org\n"
-"POT-Creation-Date: 2011-05-02 19:31+0200\n"
-"PO-Revision-Date: 2007-08-01 08:34+0100\n"
+"POT-Creation-Date: 2011-10-22 14:41+0200\n"
+"PO-Revision-Date: 2011-10-12 21:04+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
 "Language: pt\n"
@@ -21,13 +21,25 @@ msgstr ""
 #. Description
 #: ../templates:2001
 msgid "ca-certificates configuration"
-msgstr ""
+msgstr "configuração de ca-certificates"
+
+#. Type: select
+#. Choices
+#: ../templates:3001
+msgid "yes"
+msgstr "sim"
 
 #. Type: select
 #. Choices
 #: ../templates:3001
-msgid "yes, no, ask"
-msgstr "sim, não, perguntar"
+msgid "no"
+msgstr "não"
+
+#. Type: select
+#. Choices
+#: ../templates:3001
+msgid "ask"
+msgstr "perguntar"
 
 #. Type: select
 #. Description
@@ -57,7 +69,7 @@ msgid ""
 msgstr ""
 " - sim      : novos certificados CA serão confiados e instalados;\n"
 " - 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."
+" - perguntar: perguntar para cada novo certificado CA."
 
 #. Type: multiselect
 #. Description
@@ -72,14 +84,14 @@ msgid ""
 "During upgrades, new certificates will be added. Please choose those you "
 "trust."
 msgstr ""
-"Durante a actualização, serão adicionadoss novos certificados. Por favor "
+"Durante a actualização, serão adicionados novos certificados. Por favor "
 "escolha os que confia."
 
 #. Type: multiselect
 #. Description
 #: ../templates:5001
 msgid "Certificates to activate:"
-msgstr "Xertificados para activar:"
+msgstr "Certificados para activar:"
 
 #. Type: multiselect
 #. Description
@@ -103,6 +115,9 @@ msgstr ""
 "seus certificados sejam instalados em /etc/ssl/certs. Serão compilados num "
 "único ficheiro /etc/ssl/cets/ca-certificates.crt."
 
+#~ msgid "yes, no, ask"
+#~ msgstr "sim, não, perguntar"
+
 #~ msgid "${new_crts}"
 #~ msgstr "${new_crts}"
 
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index b524376..0b3e095 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ca-certificates 20090814+nmu2\n"
 "Report-Msgid-Bugs-To: ca-certificates@packages.debian.org\n"
-"POT-Creation-Date: 2011-05-02 19:31+0200\n"
-"PO-Revision-Date: 2011-03-15 16:20-0300\n"
+"POT-Creation-Date: 2011-10-22 14:41+0200\n"
+"PO-Revision-Date: 2011-10-09 13:22-0300\n"
 "Last-Translator: Adriano Rafael Gomes <adrianorg@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
 "org>\n"
@@ -22,13 +22,25 @@ msgstr ""
 #. Description
 #: ../templates:2001
 msgid "ca-certificates configuration"
-msgstr ""
+msgstr "Configuração do ca-certificates"
+
+#. Type: select
+#. Choices
+#: ../templates:3001
+msgid "yes"
+msgstr "sim"
 
 #. Type: select
 #. Choices
 #: ../templates:3001
-msgid "yes, no, ask"
-msgstr "sim, não, perguntar"
+msgid "no"
+msgstr "não"
+
+#. Type: select
+#. Choices
+#: ../templates:3001
+msgid "ask"
+msgstr "perguntar"
 
 #. Type: select
 #. Description
@@ -105,6 +117,9 @@ msgstr ""
 "que seus certificados sejam instalados em /etc/ssl/certs. Eles serão "
 "compilados em um único arquivo /etc/ssl/certs/ca-certificates.crt."
 
+#~ msgid "yes, no, ask"
+#~ msgstr "sim, não, perguntar"
+
 #~ msgid "${new_crts}"
 #~ msgstr "${new_certs}"
 
diff --git a/debian/po/ru.po b/debian/po/ru.po
index d2a6807..34967f2 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -5,36 +5,52 @@
 #
 # Copyright (C) 2003 Ilgiz Kalmetev <translator@ilgiz.pp.ru>
 # Copyright (C) 2007 Mikhail Gusarov <dottedmag@dottedmag.net>
+# Yuri Kozlov <yuray@komyakino.ru>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: ca-certificates_20061027\n"
+"Project-Id-Version: ca-certificates 20110502\n"
 "Report-Msgid-Bugs-To: ca-certificates@packages.debian.org\n"
-"POT-Creation-Date: 2011-05-02 19:31+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"
+"POT-Creation-Date: 2011-10-22 14:41+0200\n"
+"PO-Revision-Date: 2011-07-23 09:13+0400\n"
+"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
+"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Type: title
 #. Description
 #: ../templates:2001
 msgid "ca-certificates configuration"
-msgstr ""
+msgstr "Настройка ca-certificates"
+
+#. Type: select
+#. Choices
+#: ../templates:3001
+msgid "yes"
+msgstr "да"
 
 #. Type: select
 #. Choices
 #: ../templates:3001
-msgid "yes, no, ask"
-msgstr "да, нет, спрашивать"
+msgid "no"
+msgstr "нет"
+
+#. Type: select
+#. Choices
+#: ../templates:3001
+msgid "ask"
+msgstr "спрашивать"
 
 #. Type: select
 #. Description
 #: ../templates:3002
 msgid "Trust new certificates from certificate authorities?"
-msgstr "Доверять новым корневым сертификатам?"
+msgstr "Доверять новым сертификатам удостоверяющих центров?"
 
 #. Type: select
 #. Description
@@ -44,8 +60,8 @@ msgid ""
 "upgrading. You may want to check such new CA certificates and select only "
 "certificates that you trust."
 msgstr ""
-"При обновлении этот пакет может установить новые корневые сертификаты. Вы "
-"можете проверить их и выбрать только те, которым доверяете."
+"При обновлении этот пакет может установить новые сертификаты удостоверяющих "
+"центров (CA). Вы можете проверить их и выбрать только те, которым доверяете."
 
 #. Type: select
 #. Description
@@ -55,15 +71,15 @@ msgid ""
 " - no : new CA certificates will not be installed by default;\n"
 " - ask: prompt for each new CA certificate."
 msgstr ""
-" - да: доверять новым корневым сертификатам и установить их.\n"
-" - нет: по умолчанию не устанавливать новые корневые сертификаты.\n"
-" - спрашивать: спрашивать, стоит ли доверять каждому из новых сертифкатов CA."
+" - да: доверять новым сертификатам CA и установить их.\n"
+" - нет: по умолчанию не устанавливать новые сертификаты CA.\n"
+" - спрашивать: подтверждать каждый новый сертификат CA."
 
 #. Type: multiselect
 #. Description
 #: ../templates:4001
 msgid "New certificates to activate:"
-msgstr "Сертификаты для активации:"
+msgstr "Новые сертификаты для активации:"
 
 #. Type: multiselect
 #. Description
@@ -88,8 +104,8 @@ msgid ""
 "This package installs common CA (Certificate Authority) certificates in /usr/"
 "share/ca-certificates."
 msgstr ""
-"Этот пакет устанавливает новые корневые сертификаты в каталог /usr/share/ca-"
-"certificates."
+"Этот пакет устанавливает сертификаты удостоверяющих центров (CA) в каталог /"
+"usr/share/ca-certificates."
 
 #. Type: multiselect
 #. Description
@@ -99,9 +115,12 @@ msgid ""
 "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."
+"Выберите удостоверяющие центры, которым вы доверяете; их сертификаты будут "
+"установлены в каталог /etc/ssl/certs (скомпонованы в файл /etc/ssl/certs/ca-"
+"certificates.crt)."
+
+#~ msgid "yes, no, ask"
+#~ msgstr "да, нет, спрашивать"
 
 #~ msgid "${new_crts}"
 #~ msgstr "${new_crts}"
diff --git a/debian/po/sk.po b/debian/po/sk.po
new file mode 100644
index 0000000..65b129d
--- /dev/null
+++ b/debian/po/sk.po
@@ -0,0 +1,121 @@
+# Slovak translations for ca-certificates package
+# Slovenské preklady pre balík ca-certificates.
+# Copyright (C) 2011 THE ca-certificates'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the ca-certificates package.
+# Automatically generated, 2011.
+# Slavko <linux@slavino.sk>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ca-certificates 20110502+nmu1\n"
+"Report-Msgid-Bugs-To: ca-certificates@packages.debian.org\n"
+"POT-Creation-Date: 2011-10-22 14:41+0200\n"
+"PO-Revision-Date: 2011-09-18 13:43+0200\n"
+"Last-Translator: Slavko <linux@slavino.sk>\n"
+"Language-Team: Slovak <debian-l10n-slovak@lists.debian.org>\n"
+"Language: sk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#. Type: title
+#. Description
+#: ../templates:2001
+msgid "ca-certificates configuration"
+msgstr "Nastavenie ca-certificates"
+
+#. Type: select
+#. Choices
+#: ../templates:3001
+msgid "yes"
+msgstr "áno"
+
+#. Type: select
+#. Choices
+#: ../templates:3001
+msgid "no"
+msgstr "nie"
+
+#. Type: select
+#. Choices
+#: ../templates:3001
+msgid "ask"
+msgstr "pýtať sa"
+
+#. Type: select
+#. Description
+#: ../templates:3002
+msgid "Trust new certificates from certificate authorities?"
+msgstr "Dôverovať novým certifikátom certifikačných autorít?"
+
+#. Type: select
+#. Description
+#: ../templates:3002
+msgid ""
+"This package may install new CA (Certificate Authority) certificates when "
+"upgrading. You may want to check such new CA certificates and select only "
+"certificates that you trust."
+msgstr ""
+"Tento balík môže pri aktualizácii inštalovať nové certifikáty certifikačných "
+"autorít (CA). Môžete chcieť  tieto nové certifikáty CA skontrolovať a zvoliť "
+"len certifikáty, ktorým dôverujete."
+
+#. Type: select
+#. Description
+#: ../templates:3002
+msgid ""
+" - yes: new CA certificates will be trusted and installed;\n"
+" - no : new CA certificates will not be installed by default;\n"
+" - ask: prompt for each new CA certificate."
+msgstr ""
+" - áno     : nové certifikáty CA budú dôveryhodné a nainštalované;\n"
+" - nie     : nové certifikáty CA nebudú predvolene nainštalované;\n"
+" - pýtať sa: pýtať sa na každý nový certifikát CA."
+
+#. Type: multiselect
+#. Description
+#: ../templates:4001
+msgid "New certificates to activate:"
+msgstr "Nové certifikáty, ktoré majú byť aktivované:"
+
+#. Type: multiselect
+#. Description
+#: ../templates:4001
+msgid ""
+"During upgrades, new certificates will be added. Please choose those you "
+"trust."
+msgstr ""
+"Počas aktualizácie boli pridané nové certifikáty. Prosím, vyberte tie, "
+"ktorým dôverujete."
+
+#. Type: multiselect
+#. Description
+#: ../templates:5001
+msgid "Certificates to activate:"
+msgstr "Certifikáty, ktoré majú byť aktivované:"
+
+#. Type: multiselect
+#. Description
+#: ../templates:5001
+msgid ""
+"This package installs common CA (Certificate Authority) certificates in /usr/"
+"share/ca-certificates."
+msgstr ""
+"Tento balík inštaluje bežné certifikáty certifikačných autorít (CA) do /usr/"
+"share/ca-certificates."
+
+#. Type: multiselect
+#. Description
+#: ../templates:5001
+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 ""
+"Prosím, vyberte certifikačné autority, ktorým dôverujete a ktorých "
+"certifikáty budú inštalované do /etc/ssl/certs. Tieto budú zlúčené do "
+"jedného súboru /etc/ssl/certs/ca-certificates.crt."
+
+#~ msgid "yes, no, ask"
+#~ msgstr "áno, nie, pýtať sa"
diff --git a/debian/po/sv.po b/debian/po/sv.po
index bfe28b1..e823e1c 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -1,45 +1,53 @@
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-# Developers do not need to manually edit POT or PO files.
-# , fuzzy
-#
+# Translation of ca-certificates debconf template to Swedish
+# Copyright (C) 2011 Martin Bagge <brother@bsnet.se>
+# This file is distributed under the same license as the ca-certificates package.
 #
+# Daniel Nylander <po@danielnylander.se>, 2007
+# Martin Bagge <brother@bsnet.se>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: ca-certificates 20050804\n"
 "Report-Msgid-Bugs-To: ca-certificates@packages.debian.org\n"
-"POT-Creation-Date: 2011-05-02 19:31+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"
+"POT-Creation-Date: 2011-10-22 14:41+0200\n"
+"PO-Revision-Date: 2011-09-05 23:40+0100\n"
+"Last-Translator: Martin Bagge / brother <brother@bsnet.se>\n"
+"Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Swedish\n"
+"X-Poedit-Country: Sweden\n"
 
 #. Type: title
 #. Description
 #: ../templates:2001
 msgid "ca-certificates configuration"
-msgstr ""
+msgstr "Inställningar för ca-certificates"
+
+#. Type: select
+#. Choices
+#: ../templates:3001
+msgid "yes"
+msgstr "ja"
 
 #. Type: select
 #. Choices
 #: ../templates:3001
-msgid "yes, no, ask"
-msgstr "ja, nej, fr�ga"
+msgid "no"
+msgstr "nej"
+
+#. Type: select
+#. Choices
+#: ../templates:3001
+msgid "ask"
+msgstr "fråga"
 
 #. Type: select
 #. Description
 #: ../templates:3002
 msgid "Trust new certificates from certificate authorities?"
-msgstr "Lita p� nya certifikat fr�n certifikatutf�rdare?"
+msgstr "Lita på nya certifikat från certifikatutfärdare?"
 
 #. Type: select
 #. Description
@@ -51,7 +59,7 @@ msgid ""
 msgstr ""
 "Detta paket kan installera nya CA-certifikat (Certificate Authority) vid "
 "uppgradering.  Du kanske vill kontrollera de nya CA-certifikaten och endast "
-"v�lja de certifikat som du litar p�."
+"välja de certifikat som du litar på."
 
 #. Type: select
 #. Description
@@ -61,9 +69,9 @@ msgid ""
 " - no : new CA certificates will not be installed by default;\n"
 " - ask: prompt for each new CA certificate."
 msgstr ""
-" - ja: nya CA-certifikat kommer att litas p� och installeras;\n"
+" - ja: nya CA-certifikat kommer att litas på och installeras;\n"
 " - nej: nya CA-certifikat kommer inte att installeras som standard;\n"
-" - fr�ga: fr�ga f�r varje nytt CA-certifikat."
+" - fråga: fråga för varje nytt CA-certifikat."
 
 #. Type: multiselect
 #. Description
@@ -78,8 +86,8 @@ msgid ""
 "During upgrades, new certificates will be added. Please choose those you "
 "trust."
 msgstr ""
-"Under uppgraderingar kommer nya certifikat att l�ggas till. V�lj de som du "
-"litar p�."
+"Under uppgraderingar kommer nya certifikat att läggas till. Välj de som du "
+"litar på."
 
 #. Type: multiselect
 #. Description
@@ -105,10 +113,13 @@ msgid ""
 "certificates are installed into /etc/ssl/certs. They will be compiled into a "
 "single /etc/ssl/certs/ca-certificates.crt file."
 msgstr ""
-"V�lj de certifikatutf�rdare som du litar p� s� att deras certifikat "
+"Välj de certifikatutfärdare som du litar på så att deras certifikat "
 "installeras i /etc/ssl/certs. De kommer att kompileras till en enda fil, /"
 "etc/ssl/certs/ca-certificates.crt."
 
+#~ msgid "yes, no, ask"
+#~ msgstr "ja, nej, fråga"
+
 #~ msgid "${new_crts}"
 #~ msgstr "${new_crts}"
 
@@ -116,7 +127,7 @@ msgstr ""
 #~ msgstr "${enable_crts}"
 
 #~ msgid "Select new certificates to activate:"
-#~ msgstr "V�lj ett nytt certifikat som ska aktiveras:"
+#~ msgstr "Välj ett nytt certifikat som ska aktiveras:"
 
 #~ msgid ""
 #~ "This package installs common CA (Certificate Authority) certificates in /"
@@ -125,8 +136,8 @@ msgstr ""
 #~ "symlinks and generate a single file of all your selected certs, /etc/ssl/"
 #~ "certs/ca-certificates.crt."
 #~ msgstr ""
-#~ "Detta paket installerar allm�nna CA (Certificate Authority)-certifikat i /"
-#~ "usr/share/ca-certificates. Du kan v�lja certifikat bland dessa "
-#~ "tillg�ngliga certifikat f�r att installeras till /etc/ssl/certs. Detta "
-#~ "paket kommer att g�ra symboliska l�nkar och generera en enda fil av alla "
+#~ "Detta paket installerar allmänna CA (Certificate Authority)-certifikat i /"
+#~ "usr/share/ca-certificates. Du kan välja certifikat bland dessa "
+#~ "tillgängliga certifikat för att installeras till /etc/ssl/certs. Detta "
+#~ "paket kommer att göra symboliska länkar och generera en enda fil av alla "
 #~ "dina valda certifikat, /etc/ssl/certs/ca-certificates.crt."
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 705b4a5..ef0887c 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: ca-certificates@packages.debian.org\n"
-"POT-Creation-Date: 2011-05-02 19:31+0200\n"
+"POT-Creation-Date: 2011-10-22 14:41+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"
@@ -26,7 +26,19 @@ msgstr ""
 #. Type: select
 #. Choices
 #: ../templates:3001
-msgid "yes, no, ask"
+msgid "yes"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../templates:3001
+msgid "no"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../templates:3001
+msgid "ask"
 msgstr ""
 
 #. Type: select
diff --git a/debian/po/vi.po b/debian/po/vi.po
index 04505ea..6f09216 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ca-certificates 20070304\n"
 "Report-Msgid-Bugs-To: ca-certificates@packages.debian.org\n"
-"POT-Creation-Date: 2011-05-02 19:31+0200\n"
+"POT-Creation-Date: 2011-10-22 14:41+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"
@@ -26,8 +26,20 @@ msgstr ""
 #. Type: select
 #. Choices
 #: ../templates:3001
-msgid "yes, no, ask"
-msgstr "có, không, hỏi"
+msgid "yes"
+msgstr "có"
+
+#. Type: select
+#. Choices
+#: ../templates:3001
+msgid "no"
+msgstr "không"
+
+#. Type: select
+#. Choices
+#: ../templates:3001
+msgid "ask"
+msgstr "hỏi"
 
 #. Type: select
 #. Description
@@ -103,6 +115,9 @@ msgstr ""
 "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ẻ."
 
+#~ msgid "yes, no, ask"
+#~ msgstr "có, không, hỏi"
+
 # Variable: do not translate/ biến: đừng dịch
 #~ msgid "${new_crts}"
 #~ msgstr "${new_crts}"
diff --git a/debian/rules b/debian/rules
index c84cdc2..129ac90 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,11 @@ configure-stamp:
 	# Add here commands to configure the package.
 	touch configure-stamp
 
-build: build-stamp
+build: build-arch build-indep
+
+build-arch: build-stamp
+
+build-indep: build-stamp
 
 build-stamp: configure-stamp 
 	dh_testdir
@@ -36,7 +40,7 @@ clean:
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 	# Add here commands to install the package into debian/ca-certificates.
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/ca-certificates
diff --git a/debian/templates b/debian/templates
index 91a55a2..87f037f 100644
--- a/debian/templates
+++ b/debian/templates
@@ -13,7 +13,7 @@ _Description: ca-certificates configuration
 
 Template: ca-certificates/trust_new_crts
 Type: select
-_Choices: yes, no, ask
+__Choices: yes, no, ask
 Default: yes
 _Description: Trust new certificates from certificate authorities?
  This package may install new CA (Certificate Authority) certificates when