diff -Nru cacti-0.8.7g.old/debian/changelog cacti-0.8.7g/debian/changelog
--- cacti-0.8.7g.old/debian/changelog	2011-06-13 09:15:27.661149621 +0200
+++ cacti-0.8.7g/debian/changelog	2011-06-29 06:58:07.399513340 +0200
@@ -1,3 +1,22 @@
+cacti (0.8.7g-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix pending l10n issues. Debconf translations:
+    - French (Christian Perrier).  Closes: #614903
+    - German (Chris Leick).  Closes: #619663
+    - Russian (Yuri Kozlov).  Closes: #623795
+    - Indonesian (Mahyuddin Susanto).  Closes: #623886
+    - Japanese (Hideki Yamane).  Closes: #624821
+    - Danish (Joe Hansen).  Closes: #625482
+    - Dutch; (Luk Claes).  Closes: #625529
+    - Spanish; (Francisco Javier Cuadrado).  Closes: #627032
+    - Swedish (Martin Bagge / brother).  Closes: #628928
+    - Czech (Miroslav Kure).  Closes: #631596
+    - Basque (Ander Goñi).  Closes: #631900
+    - Portuguese (Rui Branco).  Closes: #631982
+
+ -- Christian Perrier <bubulle@debian.org>  Wed, 29 Jun 2011 06:57:56 +0200
+
 cacti (0.8.7g-2) unstable; urgency=low
 
   * import 2 new "official" upstream patches
diff -Nru cacti-0.8.7g.old/debian/po/cs.po cacti-0.8.7g/debian/po/cs.po
--- cacti-0.8.7g.old/debian/po/cs.po	2011-06-13 09:15:27.661149621 +0200
+++ cacti-0.8.7g/debian/po/cs.po	2011-06-25 10:44:22.000000000 +0200
@@ -16,7 +16,7 @@
 "Project-Id-Version: cacti 0.8.6f-1\n"
 "Report-Msgid-Bugs-To: cacti@packages.debian.org\n"
 "POT-Creation-Date: 2011-02-16 06:33+0000\n"
-"PO-Revision-Date: 2005-07-06 16:30+0200\n"
+"PO-Revision-Date: 2011-06-25 10:11+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,13 @@
 #. Choices
 #: ../cacti.templates:1001
 msgid "Apache2"
-msgstr ""
+msgstr "Apache2"
 
 #. Type: select
 #. Choices
 #: ../cacti.templates:1001
 msgid "None"
-msgstr ""
+msgstr "Žádný"
 
 #. Type: select
 #. Description
@@ -49,12 +49,13 @@
 "Please select the webserver type for which cacti should be automatically "
 "configured."
 msgstr ""
+"Vyberte webový server, který se má automaticky nastavit pro použití s cacti."
 
 #. Type: select
 #. Description
 #: ../cacti.templates:1002
 msgid "Select \"None\" if you would like to configure your webserver by hand."
-msgstr "Pokud chcete nastavit webový server ručně, vyberte \"Žádný\"."
+msgstr "Pokud chcete nastavit webový server ručně, vyberte „Žádný“."
 
 #~ msgid "Which kind of web server should be used by cacti?"
 #~ msgstr "Jaký typ webového serveru použít pro cacti?"
diff -Nru cacti-0.8.7g.old/debian/po/da.po cacti-0.8.7g/debian/po/da.po
--- cacti-0.8.7g.old/debian/po/da.po	1970-01-01 01:00:00.000000000 +0100
+++ cacti-0.8.7g/debian/po/da.po	2011-06-15 07:00:56.000000000 +0200
@@ -0,0 +1,52 @@
+# Danish translation cacti.
+# Copyright (C) 2011 cacti & nedenstående oversættere.
+# This file is distributed under the same license as the cacti package.
+# Joe Hansen <joedalton2@yahoo.dk>, 2011.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: cacti\n"
+"Report-Msgid-Bugs-To: cacti@packages.debian.org\n"
+"POT-Creation-Date: 2011-02-16 06:33+0000\n"
+"PO-Revision-Date: 2011-05-03 17:30+01:00\n"
+"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
+"Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
+"Language: da\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Choices
+#: ../cacti.templates:1001
+msgid "Apache2"
+msgstr "Apache2"
+
+#. Type: select
+#. Choices
+#: ../cacti.templates:1001
+msgid "None"
+msgstr "Ingen"
+
+#. Type: select
+#. Description
+#: ../cacti.templates:1002
+msgid "Webserver type"
+msgstr "Type af internetserver"
+
+#. Type: select
+#. Description
+#: ../cacti.templates:1002
+msgid ""
+"Please select the webserver type for which cacti should be automatically "
+"configured."
+msgstr ""
+"Vælg venligst typen af internetserver (webserver) som cacti skal "
+"konfigureres til automatisk."
+
+#. Type: select
+#. Description
+#: ../cacti.templates:1002
+msgid "Select \"None\" if you would like to configure your webserver by hand."
+msgstr ""
+"Vælg »Ingen« hvis du selv ønsker at konfigurere din internetserver manuelt."
diff -Nru cacti-0.8.7g.old/debian/po/de.po cacti-0.8.7g/debian/po/de.po
--- cacti-0.8.7g.old/debian/po/de.po	2011-06-13 09:15:27.661149621 +0200
+++ cacti-0.8.7g/debian/po/de.po	2011-06-15 06:59:19.000000000 +0200
@@ -1,36 +1,32 @@
-# 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.
+# German debconf translation of cacti.
+# This file is distributed under the same license as the cacti package.
+# Copyright (C) 2005 Mathias Klein <ma_klein@gmx.de>,
+#               2011 Chris Leick <c.leick@vollbio.de>.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: cacti 0.8.6g\n"
+"Project-Id-Version: cacti 0.8.7g-2\n"
 "Report-Msgid-Bugs-To: cacti@packages.debian.org\n"
 "POT-Creation-Date: 2011-02-16 06:33+0000\n"
-"PO-Revision-Date: 2005-12-29 14:02+0100\n"
-"Last-Translator: Mathias Klein <ma_klein@gmx.de>\n"
-"Language-Team: Deutsch <debian-l10n-german@lists.debian.org>\n"
-"Language: \n"
+"PO-Revision-Date: 2011-03-18 20:02+0100\n"
+"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
+"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Type: select
 #. Choices
 #: ../cacti.templates:1001
 msgid "Apache2"
-msgstr ""
+msgstr "Apache2"
 
 #. Type: select
 #. Choices
 #: ../cacti.templates:1001
 msgid "None"
-msgstr ""
+msgstr "keiner"
 
 #. Type: select
 #. Description
@@ -45,16 +41,12 @@
 "Please select the webserver type for which cacti should be automatically "
 "configured."
 msgstr ""
+"Bitte wählen Sie den Webserver aus, für den Cacti automatisch eingerichtet "
+"werden soll."
 
 #. Type: select
 #. Description
 #: ../cacti.templates:1002
 msgid "Select \"None\" if you would like to configure your webserver by hand."
 msgstr ""
-"Wählen Sie »keiner«, wenn Sie den Webserver von Hand konfigurieren wollen."
-
-#~ msgid "Which kind of web server should be used by cacti?"
-#~ msgstr "Welche Art von Webserver soll von Cacti verwendet werden?"
-
-#~ msgid "Apache, Apache-SSL, Apache2, All, None"
-#~ msgstr "Apache, Apache-SSL, Apache2, alle, keiner"
+"Wählen Sie »keiner«, falls Sie den Webserver manuell einrichten wollen."
diff -Nru cacti-0.8.7g.old/debian/po/es.po cacti-0.8.7g/debian/po/es.po
--- cacti-0.8.7g.old/debian/po/es.po	2011-06-13 09:15:27.661149621 +0200
+++ cacti-0.8.7g/debian/po/es.po	2011-06-15 07:01:50.000000000 +0200
@@ -1,16 +1,20 @@
 # cacti po-debconf translation to Spanish
-# Copyright (C) 2005 Software in the Public Interest
+# Copyright (C) 2005, 2011 Software in the Public Interest
 # This file is distributed under the same license as the cacti package.
 #
 # Changes:
-#  - Initial translation
-#         César Gómez Martín <cesar.gomez@gmail.com>
+#   - Initial translation
+#       César Gómez Martín <cesar.gomez@gmail.com>
 #
-#   Traductores, si no conoce el formato PO, merece la pena leer la
-#   documentación de gettext, especialmente las secciones dedicadas a este
-#   formato, por ejemplo ejecutando:
+#   - Updates
+#       Francisco Javier Cuadrado <fcocuadrado@gmail.com>, 2011
+#
+# Traductores, si no conocen el formato PO, merece la pena leer la
+# documentación de gettext, especialmente las secciones dedicadas a este
+# formato, por ejemplo ejecutando:
 #          info -n '(gettext)PO Files'
 #          info -n '(gettext)Header Entry'
+#
 # Equipo de traducción al español, por favor, lean antes de traducir
 # los siguientes documentos:
 #
@@ -25,31 +29,28 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: cacti\n"
+"Project-Id-Version: cacti 0.8.7g-3\n"
 "Report-Msgid-Bugs-To: cacti@packages.debian.org\n"
 "POT-Creation-Date: 2011-02-16 06:33+0000\n"
-"PO-Revision-Date: 2005-08-29 18:36+0100\n"
-"Last-Translator: César Gómez Martín <cesar.gomez@gmail.com>\n"
-"Language-Team: Debian l10n spanish <debian-l10n-spanish@lists.debian.org>\n"
-"Language: \n"
+"PO-Revision-Date: 2011-05-04 12:50+0100\n"
+"Last-Translator: Francisco Javier Cuadrado <fcocuadrado@gmail.com>\n"
+"Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Spanish\n"
-"X-Poedit-Country: SPAIN\n"
-"X-Poedit-SourceCharset: utf-8\n"
 
 #. Type: select
 #. Choices
 #: ../cacti.templates:1001
 msgid "Apache2"
-msgstr ""
+msgstr "Apache2"
 
 #. Type: select
 #. Choices
 #: ../cacti.templates:1001
 msgid "None"
-msgstr ""
+msgstr "Ninguno"
 
 #. Type: select
 #. Description
@@ -64,12 +65,14 @@
 "Please select the webserver type for which cacti should be automatically "
 "configured."
 msgstr ""
+"Escoja el tipo de servidor web para el que cacti se debería configurar "
+"automáticamente."
 
 #. Type: select
 #. Description
 #: ../cacti.templates:1002
 msgid "Select \"None\" if you would like to configure your webserver by hand."
-msgstr "Seleccione «Ninguno» si quiere configurar su servidor web manualmente."
+msgstr "Escoja «Ninguno» si quiere configurar su servidor web manualmente."
 
 #~ msgid "Which kind of web server should be used by cacti?"
 #~ msgstr "¿Qué tipo de servidor web quiere usar con cacti?"
diff -Nru cacti-0.8.7g.old/debian/po/eu.po cacti-0.8.7g/debian/po/eu.po
--- cacti-0.8.7g.old/debian/po/eu.po	2011-06-13 09:15:27.661149621 +0200
+++ cacti-0.8.7g/debian/po/eu.po	2011-06-28 18:39:25.000000000 +0200
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Piarres Beobide <pi@beobide.net>, 2009.
+# Ander Goñi <agoni@danobatgroup.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: templates\n"
 "Report-Msgid-Bugs-To: cacti@packages.debian.org\n"
 "POT-Creation-Date: 2011-02-16 06:33+0000\n"
-"PO-Revision-Date: 2009-07-03 23:58+0200\n"
-"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
+"PO-Revision-Date: 2011-06-20 12:52+0100\n"
+"Last-Translator: Ander Goñi <agoni@danobatgroup.com>\n"
 "Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
@@ -21,13 +22,13 @@
 #. Choices
 #: ../cacti.templates:1001
 msgid "Apache2"
-msgstr ""
+msgstr "Apache2"
 
 #. Type: select
 #. Choices
 #: ../cacti.templates:1001
 msgid "None"
-msgstr ""
+msgstr "Bat ere ez"
 
 #. Type: select
 #. Description
@@ -42,12 +43,13 @@
 "Please select the webserver type for which cacti should be automatically "
 "configured."
 msgstr ""
+"Hautatu cacti zein web-zerbitzari motarentzat automatikoki konfiguratuko den."
 
 #. Type: select
 #. Description
 #: ../cacti.templates:1002
 msgid "Select \"None\" if you would like to configure your webserver by hand."
-msgstr "\"Bat ere ez\" hautatu web zerbitzaria eskuz konfiguratu nahi baduzu."
+msgstr "\"Bat ere ez\" hautatu web-zerbitzaria eskuz konfiguratu nahi baduzu."
 
 #~ msgid "Which kind of web server should be used by cacti?"
 #~ msgstr "Zein web-zerbitzari mota erabili behar du cactik?"
diff -Nru cacti-0.8.7g.old/debian/po/fr.po cacti-0.8.7g/debian/po/fr.po
--- cacti-0.8.7g.old/debian/po/fr.po	2011-06-13 09:15:27.661149621 +0200
+++ cacti-0.8.7g/debian/po/fr.po	2011-06-15 06:58:56.000000000 +0200
@@ -1,50 +1,41 @@
-# translation of fr.po to French
-#
-#    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.
-# Christian Perrier <bubulle@debian.org>, 2004.
+# Translation of cacti debconf templates to French
+# Copyright (C) 2004-2011 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the cacti package.
 #
+# Translators:
+# Christian Perrier <bubulle@debian.org>, 2004, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: cacti 0.6.8a-13\n"
 "Report-Msgid-Bugs-To: cacti@packages.debian.org\n"
 "POT-Creation-Date: 2011-02-16 06:33+0000\n"
-"PO-Revision-Date: 2005-03-07 08:06+0100\n"
+"PO-Revision-Date: 2011-02-24 07:56+0100\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=ISO-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
+"X-Generator: Lokalize 1.0\n"
 "Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n"
 
 #. Type: select
 #. Choices
 #: ../cacti.templates:1001
 msgid "Apache2"
-msgstr ""
+msgstr "Apache 2"
 
 #. Type: select
 #. Choices
 #: ../cacti.templates:1001
 msgid "None"
-msgstr ""
+msgstr "Aucun"
 
 #. Type: select
 #. Description
 #: ../cacti.templates:1002
 msgid "Webserver type"
-msgstr "Type de serveur web�:"
+msgstr "Type de serveur web :"
 
 #. Type: select
 #. Description
@@ -53,13 +44,15 @@
 "Please select the webserver type for which cacti should be automatically "
 "configured."
 msgstr ""
+"Veuillez choisir le serveur web à reconfigurer automatiquement pour exécuter "
+"Cacti."
 
 #. Type: select
 #. Description
 #: ../cacti.templates:1002
 msgid "Select \"None\" if you would like to configure your webserver by hand."
 msgstr ""
-"Choisissez ��Aucun�� si vous pr�f�rez configurer vous-m�me votre serveur web."
+"Choisissez « Aucun » si vous préférez configurer vous-même votre serveur web."
 
 #~ msgid "Which kind of web server should be used by cacti?"
 #~ msgstr "Veuillez choisir le type de serveur web qu'utilisera Cacti."
@@ -69,7 +62,7 @@
 
 #~ msgid "MySQL installs and upgrades must be performed manually!"
 #~ msgstr ""
-#~ "Pas d'installations ou mises � jour automatis�es pour les bases MySQL de "
+#~ "Pas d'installations ou mises à jour automatisées pour les bases MySQL de "
 #~ "Cacti"
 
 #~ msgid ""
@@ -78,22 +71,22 @@
 #~ "need to do for either installing or upgrading cacti in /usr/share/doc/"
 #~ "cacti/README.Debian.gz."
 #~ msgstr ""
-#~ "� l'heure actuelle, la gestion des mises � jour automatis�es de la base "
-#~ "de donn�es MySQL de Cacti a �t� d�sactiv�e. Veuillez consulter les "
+#~ "À l'heure actuelle, la gestion des mises à jour automatisées de la base "
+#~ "de données MySQL de Cacti a été désactivée. Veuillez consulter les "
 #~ "justifications de ce choix et les instructions d'installation ou de mise "
-#~ "� jour de Cacti dans le fichier /usr/share/doc/cacti/README.Debian.gz."
+#~ "à jour de Cacti dans le fichier /usr/share/doc/cacti/README.Debian.gz."
 
 #~ msgid ""
 #~ "Note that you will still be prompted for the relevant information, which "
 #~ "will be used to generate the appropriate configuration files."
 #~ msgstr ""
-#~ "Veuillez noter que certaines informations vous seront malgr� tout "
-#~ "demand�es parce qu'elles sont requises lors de la cr�ation des fichiers "
+#~ "Veuillez noter que certaines informations vous seront malgré tout "
+#~ "demandées parce qu'elles sont requises lors de la création des fichiers "
 #~ "de configuration."
 
 #~ msgid "Database structure changes in cacti configuration"
 #~ msgstr ""
-#~ "Changement de la structure de base de donn�es dans la configuration de "
+#~ "Changement de la structure de base de données dans la configuration de "
 #~ "Cacti"
 
 #~ msgid ""
@@ -101,81 +94,81 @@
 #~ "database will not work with the latest version of cacti.  Please see /usr/"
 #~ "share/doc/cacti/README.Debian.gz to see what your options are."
 #~ msgstr ""
-#~ "Vous mettez actuellement Cacti � niveau depuis une version ant�rieure � "
-#~ "0.8.x. Malheureusement, l'ancienne base de donn�es ne fonctionnera pas "
+#~ "Vous mettez actuellement Cacti à niveau depuis une version antérieure à "
+#~ "0.8.x. Malheureusement, l'ancienne base de données ne fonctionnera pas "
 #~ "avec la nouvelle version de Cacti. Veuillez consulter le fichier /usr/"
-#~ "share/doc/cacti/README.Debian pour conna�tre les possibilit�s qui "
-#~ "s'offrent � vous."
+#~ "share/doc/cacti/README.Debian pour connaître les possibilités qui "
+#~ "s'offrent à vous."
 
 #~ msgid "MySQL server host name"
-#~ msgstr "Serveur MySQL�:"
+#~ msgstr "Serveur MySQL :"
 
 #~ msgid "Please enter the name of the machine hosting the cacti database."
 #~ msgstr ""
-#~ "Veuillez indiquer le nom d'h�te du serveur qui accueillera la base de "
-#~ "donn�es de Cacti."
+#~ "Veuillez indiquer le nom d'hôte du serveur qui accueillera la base de "
+#~ "données de Cacti."
 
 #~ msgid "Database name for cacti"
-#~ msgstr "Nom de la base de donn�es de Cacti�:"
+#~ msgstr "Nom de la base de données de Cacti :"
 
 #~ msgid ""
 #~ "Please enter the cacti database name. Cacti will store and fetch data "
 #~ "there."
 #~ msgstr ""
-#~ "Veuillez indiquer le nom de la base de donn�es o� Cacti conservera ses "
+#~ "Veuillez indiquer le nom de la base de données où Cacti conservera ses "
 #~ "informations."
 
 #~ msgid "MySQL administrator username"
-#~ msgstr "Nom de l'administrateur de MySQL�:"
+#~ msgstr "Nom de l'administrateur de MySQL :"
 
 #~ msgid ""
 #~ "Please enter the MySQL administrator name (needed for cacti database "
 #~ "creation)."
 #~ msgstr ""
-#~ "Veuillez indiquer le nom de l'administrateur de MySQL. Il sera utilis� "
-#~ "pour la cr�ation de la base de donn�es de Cacti."
+#~ "Veuillez indiquer le nom de l'administrateur de MySQL. Il sera utilisé "
+#~ "pour la création de la base de données de Cacti."
 
 #~ msgid "MySQL administrator password"
-#~ msgstr "Mot de passe de l'administrateur de MySQL�:"
+#~ msgstr "Mot de passe de l'administrateur de MySQL :"
 
 #~ msgid "Enter \"none\" if there is no password for MySQL administration."
 #~ msgstr ""
-#~ "Indiquez ��none�� s'il n'y a pas de mot de passe pour l'administration de "
+#~ "Indiquez « none » s'il n'y a pas de mot de passe pour l'administration de "
 #~ "MySQL."
 
 #~ msgid "Cacti database username"
-#~ msgstr "Utilisateur de la base de donn�es de Cacti�:"
+#~ msgstr "Utilisateur de la base de données de Cacti :"
 
 #~ msgid ""
 #~ "Please enter the name which will be used for connecting to the cacti "
 #~ "database."
 #~ msgstr ""
-#~ "Veuillez indiquer l'identifiant qui servira pour la connexion � la base "
-#~ "de donn�es de Cacti."
+#~ "Veuillez indiquer l'identifiant qui servira pour la connexion à la base "
+#~ "de données de Cacti."
 
 #~ msgid "Cacti user password"
-#~ msgstr "Mot de passe de l'utilisateur Cacti�:"
+#~ msgstr "Mot de passe de l'utilisateur Cacti :"
 
 #~ msgid ""
 #~ "Please enter a password for the Cacti database user (default is \"cacti"
 #~ "\")."
 #~ msgstr ""
-#~ "Veuillez donner un mot de passe pour l'utilisateur de la base de donn�es "
-#~ "de Cacti (la valeur par d�faut est ��cacti��)."
+#~ "Veuillez donner un mot de passe pour l'utilisateur de la base de données "
+#~ "de Cacti (la valeur par défaut est « cacti »)."
 
 #~ msgid "Do you want to purge the database when purging the package?"
-#~ msgstr "Faut-il supprimer la base de donn�es � la purge du paquet�?"
+#~ msgstr "Faut-il supprimer la base de données à la purge du paquet ?"
 
 #~ msgid ""
 #~ "Accept here if you want to drop the database and the corresponding user "
 #~ "when purging the package."
 #~ msgstr ""
-#~ "Choisissez cette option si vous souhaitez que la base de donn�es et "
-#~ "l'utilisateur associ� soient supprim�s lorsque le paquet est enti�rement "
-#~ "supprim� (��purge�� du paquet)."
+#~ "Choisissez cette option si vous souhaitez que la base de données et "
+#~ "l'utilisateur associé soient supprimés lorsque le paquet est entièrement "
+#~ "supprimé (« purge » du paquet)."
 
 #~ msgid "MySQL administrator password confirmation"
-#~ msgstr "Confirmation du mot de passe de l'administrateur de MySQL�:"
+#~ msgstr "Confirmation du mot de passe de l'administrateur de MySQL :"
 
 #~ msgid "Please confirm the password for the MySQL administrator."
 #~ msgstr "Veuillez confirmer le mot de passe de l'administrateur de MySQL."
@@ -187,62 +180,62 @@
 #~ "The password and its confirmation do not match. Please re-enter the "
 #~ "password!"
 #~ msgstr ""
-#~ "Le mot de passe et sa confirmation sont diff�rents. Veuillez indiquer � "
+#~ "Le mot de passe et sa confirmation sont différents. Veuillez indiquer à "
 #~ "nouveau le mot de passe."
 
 #~ msgid "Store the MySQL admin password"
-#~ msgstr "Faut-il conserver le mot de passe de l'administrateur de MySQL�?"
+#~ msgstr "Faut-il conserver le mot de passe de l'administrateur de MySQL ?"
 
 #~ msgid ""
 #~ "To update the cacti database automaticlly during a package upgrade the "
 #~ "MySQL admin password must be safed in the debconf database. This is a "
 #~ "security risk!!!"
 #~ msgstr ""
-#~ "Afin de permettre la mise � jour automatique de la base de donn�es de "
-#~ "Cacti lors des mises � niveau, le mot de passe de l'administrateur de "
-#~ "MySQL doit �tre conserv� dans la base de donn�es de debconf. Cela "
-#~ "comporte un risque pour la s�curit� du syst�me."
+#~ "Afin de permettre la mise à jour automatique de la base de données de "
+#~ "Cacti lors des mises à niveau, le mot de passe de l'administrateur de "
+#~ "MySQL doit être conservé dans la base de données de debconf. Cela "
+#~ "comporte un risque pour la sécurité du système."
 
 #~ msgid ""
 #~ "If the password is not stored in the database it will asked everytime!"
 #~ msgstr ""
-#~ "Si le mot de passe n'est pas conserv� dans la base de donn�es, il vous "
-#~ "sera demand� � chaque fois."
+#~ "Si le mot de passe n'est pas conservé dans la base de données, il vous "
+#~ "sera demandé à chaque fois."
 
 #~ msgid "MySQL server not found"
-#~ msgstr "Aucun serveur MySQL trouv�"
+#~ msgstr "Aucun serveur MySQL trouvé"
 
 #~ msgid ""
 #~ "You entered \"localhost\" as MySQL server but I can't find any server "
 #~ "installed on localhost. Either install the mysql-server package or run "
 #~ "\"dpkg-reconfigure cacti\" in order to change the MySQL server host."
 #~ msgstr ""
-#~ "Vous avez indiqu� ��localhost�� pour le serveur de bases de donn�es MySQL "
-#~ "mais je n'ai pas trouv� de serveur sur l'h�te local. Vous pouvez "
-#~ "installer le paquet mysql-server ou lancer ��dpkg-reconfigure cacti�� "
+#~ "Vous avez indiqué « localhost » pour le serveur de bases de données MySQL "
+#~ "mais je n'ai pas trouvé de serveur sur l'hôte local. Vous pouvez "
+#~ "installer le paquet mysql-server ou lancer « dpkg-reconfigure cacti » "
 #~ "afin de modifier l'emplacement du serveur MySQL."
 
 #~ msgid "No MySQL server on localhost"
-#~ msgstr "Pas de serveur MySQL sur l'h�te local"
+#~ msgstr "Pas de serveur MySQL sur l'hôte local"
 
 #~ msgid "No MySQL server has been found on localhost."
-#~ msgstr "Aucun serveur MySQL n'a �t� trouv� sur l'h�te local."
+#~ msgstr "Aucun serveur MySQL n'a été trouvé sur l'hôte local."
 
 #~ msgid "/var/cache/cacti/dumps"
 #~ msgstr "/var/cache/cacti/dumps"
 
 #~ msgid "Where should the existing database be saved during an upgrade?"
 #~ msgstr ""
-#~ "Emplacement de sauvegarde de la base de donn�es lors des mises � jour�:"
+#~ "Emplacement de sauvegarde de la base de données lors des mises à jour :"
 
 #~ msgid ""
 #~ "During a database upgrade, the existing database will first be copied to "
 #~ "a separate directory location so that you are able to go back to the "
 #~ "previous version of Cacti in case of upgrade problems."
 #~ msgstr ""
-#~ "Pendant les mises � jour, la base de donn�es existante sera pr�alablement "
-#~ "copi�e dans un autre r�pertoire afin de vous permettre de revenir � la "
-#~ "version pr�c�dente de Cacti si des difficult�s de mise � jour "
+#~ "Pendant les mises à jour, la base de données existante sera préalablement "
+#~ "copiée dans un autre répertoire afin de vous permettre de revenir à la "
+#~ "version précédente de Cacti si des difficultés de mise à jour "
 #~ "apparaissaient."
 
 #~ msgid ""
@@ -250,49 +243,49 @@
 #~ "to receive this dump file. The dump will be created in that directory as "
 #~ "a file called cacti-${DATE}.dump."
 #~ msgstr ""
-#~ "Veuillez indiquer le r�pertoire qui disposera de la place suffisante pour "
-#~ "h�berger le fichier d'export. Ce fichier (��dump��) sera cr�� dans ce "
-#~ "r�pertoire avec le nom cacti-${DATE}.dump."
+#~ "Veuillez indiquer le répertoire qui disposera de la place suffisante pour "
+#~ "héberger le fichier d'export. Ce fichier (« dump ») sera créé dans ce "
+#~ "répertoire avec le nom cacti-${DATE}.dump."
 
 #~ msgid "Select the desired default poller."
-#~ msgstr "Programme de r�cup�ration (��poller��) par d�faut�:"
+#~ msgstr "Programme de récupération (« poller ») par défaut :"
 
 #~ msgid ""
 #~ "A poller is a program that collect all datas for the cacti database and "
 #~ "graphics."
 #~ msgstr ""
-#~ "Un programme de r�cup�ration (��poller��) permet de r�cup�rer toutes les "
-#~ "donn�es destin�es � la base de donn�es de Cacti et aux graphiques."
+#~ "Un programme de récupération (« poller ») permet de récupérer toutes les "
+#~ "données destinées à la base de données de Cacti et aux graphiques."
 
 #~ msgid ""
 #~ "Only on poller can collect informations, but multiple poller packages are "
 #~ "installed. Please select which poller should run by default."
 #~ msgstr ""
-#~ "Un seul programme de r�cup�ration peut r�cup�rer des informations, mais "
-#~ "plusieurs tels programmes sont install�s. Veuillez choisir celui qui sera "
-#~ "utilis� par d�faut."
+#~ "Un seul programme de récupération peut récupérer des informations, mais "
+#~ "plusieurs tels programmes sont installés. Veuillez choisir celui qui sera "
+#~ "utilisé par défaut."
 
 #~ msgid ""
 #~ "You are upgrading from a pre 0.8.x version. You must backup your current "
 #~ "cacti database, and replace it with the new database structure. Please "
 #~ "read the available documentation and change your database accordingly."
 #~ msgstr ""
-#~ "Vous mettez � niveau une version ant�rieure � 0.8.x. Vous devez "
-#~ "sauvegarder votre base de donn�es actuelle puis la remplacer avec la "
-#~ "nouvelle structure de base de donn�es. Veuillez consulter la "
-#~ "documentation disponible et modifier votre base de donn�es."
+#~ "Vous mettez à niveau une version antérieure à 0.8.x. Vous devez "
+#~ "sauvegarder votre base de données actuelle puis la remplacer avec la "
+#~ "nouvelle structure de base de données. Veuillez consulter la "
+#~ "documentation disponible et modifier votre base de données."
 
 #~ msgid ""
 #~ "Automatically converting your setup is unfortunately impossible. You will "
 #~ "have to do it yourself."
 #~ msgstr ""
 #~ "Il est malheureusement impossible de convertir automatiquement votre "
-#~ "configuration. Vous devrez le faire vous-m�me."
+#~ "configuration. Vous devrez le faire vous-même."
 
 #~ msgid ""
 #~ "Cacti will probably be unable to use the existing database and restart "
 #~ "collecting your systems."
 #~ msgstr ""
-#~ "ll est �galement possible que Cacti ne puisse pas utiliser la base de "
-#~ "donn�es actuelle et qu'il ne relance pas la collecte automatique de vos "
-#~ "syst�mes."
+#~ "ll est également possible que Cacti ne puisse pas utiliser la base de "
+#~ "données actuelle et qu'il ne relance pas la collecte automatique de vos "
+#~ "systèmes."
diff -Nru cacti-0.8.7g.old/debian/po/id.po cacti-0.8.7g/debian/po/id.po
--- cacti-0.8.7g.old/debian/po/id.po	1970-01-01 01:00:00.000000000 +0100
+++ cacti-0.8.7g/debian/po/id.po	2011-06-15 07:00:09.000000000 +0200
@@ -0,0 +1,57 @@
+# Translation of cacti debconf templates to Indonesian
+# Copyright (C) 2011 Debian Indonesia Translator <debian-l10n-indonesian@lists.debian.org>
+# This file is distributed under the same license as the cacti package.
+#
+# Translators:
+# Mahyuddin Susanto <udienz@ubuntu.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: cacti 0.8.7g-2\n"
+"Report-Msgid-Bugs-To: cacti@packages.debian.org\n"
+"POT-Creation-Date: 2011-02-16 06:33+0000\n"
+"PO-Revision-Date: 2011-04-24 13:08+0700\n"
+"Last-Translator: Mahyuddin Susanto <udienz@ubuntu.com>\n"
+"Language-Team: Debian Indonesia Translator <debian-l10n-indonesian@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-Poedit-Language: Indonesian\n"
+"X-Poedit-Country: INDONESIA\n"
+
+#. Type: select
+#. Choices
+#: ../cacti.templates:1001
+msgid "Apache2"
+msgstr "Apache2"
+
+#. Type: select
+#. Choices
+#: ../cacti.templates:1001
+msgid "None"
+msgstr "Tidak ada"
+
+#. Type: select
+#. Description
+#: ../cacti.templates:1002
+msgid "Webserver type"
+msgstr "Jenis server web"
+
+#. Type: select
+#. Description
+#: ../cacti.templates:1002
+msgid ""
+"Please select the webserver type for which cacti should be automatically "
+"configured."
+msgstr ""
+"Silakan pilih jenis server web yang digunakan oleh cacti untuk pengaturan "
+"otomatis"
+
+#. Type: select
+#. Description
+#: ../cacti.templates:1002
+msgid "Select \"None\" if you would like to configure your webserver by hand."
+msgstr ""
+"Pilih \"Tidak ada\" jika anda menginginkan mengatur pengaturan server web "
+"sendiri"
diff -Nru cacti-0.8.7g.old/debian/po/ja.po cacti-0.8.7g/debian/po/ja.po
--- cacti-0.8.7g.old/debian/po/ja.po	2011-06-13 09:15:27.661149621 +0200
+++ cacti-0.8.7g/debian/po/ja.po	2011-06-15 07:00:32.000000000 +0200
@@ -1,15 +1,15 @@
-# Copyright (C) 2008 Sean Finney <seanius@debian.org>
-# as cacti Debian package's copyright holder. 
-# This file is distributed under the same license as the cacti package.
-# Hideki Yamane (Debian-JP) <henrich@debian.or.jp>, 2008.
-# 
+# Copyright (C) 2008-2011 Sean Finney <seanius@debian.org>
+# as cacti Debian package's copyright holder. 
+# This file is distributed under the same license as the cacti package.
+# Hideki Yamane <henrich@debian.org>, 2008-2011.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: cacti 0.8.7b-2\n"
+"Project-Id-Version: cacti 0.8.7g-2\n"
 "Report-Msgid-Bugs-To: cacti@packages.debian.org\n"
 "POT-Creation-Date: 2011-02-16 06:33+0000\n"
-"PO-Revision-Date: 2008-07-31 11:21+0200\n"
-"Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
+"PO-Revision-Date: 2011-05-01 07:26+0900\n"
+"Last-Translator: Hideki Yamane <henrich@debian.org>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
@@ -20,13 +20,13 @@
 #. Choices
 #: ../cacti.templates:1001
 msgid "Apache2"
-msgstr ""
+msgstr "Apache2"
 
 #. Type: select
 #. Choices
 #: ../cacti.templates:1001
 msgid "None"
-msgstr ""
+msgstr "どれでもない"
 
 #. Type: select
 #. Description
@@ -40,7 +40,7 @@
 msgid ""
 "Please select the webserver type for which cacti should be automatically "
 "configured."
-msgstr ""
+msgstr "cacti が自動的に設定するウェブサーバの種類を選んでください。"
 
 #. Type: select
 #. Description
diff -Nru cacti-0.8.7g.old/debian/po/nl.po cacti-0.8.7g/debian/po/nl.po
--- cacti-0.8.7g.old/debian/po/nl.po	2011-06-13 09:15:27.661149621 +0200
+++ cacti-0.8.7g/debian/po/nl.po	2011-06-15 07:01:29.000000000 +0200
@@ -1,40 +1,33 @@
-#
-#    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 cacti debconf templates.
+# Copyright (C) 2004-2011 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the cacti package.
+# Luk Claes <luk.claes@ugent.be>, 2004.
+# Jeroen Schot <schot@a-eskwadraat.nl>, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: cacti 0.8.4-2\n"
+"Project-Id-Version: cacti_0.8.7g-3\n"
 "Report-Msgid-Bugs-To: cacti@packages.debian.org\n"
 "POT-Creation-Date: 2011-02-16 06:33+0000\n"
-"PO-Revision-Date: 2004-09-09 11:57+0100\n"
+"PO-Revision-Date: 2011-05-04 08:54+0200\n"
 "Last-Translator: Luk Claes <luk.claes@ugent.be>\n"
 "Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
-"Language: \n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Type: select
 #. Choices
 #: ../cacti.templates:1001
 msgid "Apache2"
-msgstr ""
+msgstr "Apache2"
 
 #. Type: select
 #. Choices
 #: ../cacti.templates:1001
 msgid "None"
-msgstr ""
+msgstr "Geen"
 
 #. Type: select
 #. Description
@@ -49,196 +42,11 @@
 "Please select the webserver type for which cacti should be automatically "
 "configured."
 msgstr ""
+"Geef alstublieft aan voor welk type webserver cacti automatisch "
+"geconfigureerd moet worden."
 
 #. Type: select
 #. Description
 #: ../cacti.templates:1002
 msgid "Select \"None\" if you would like to configure your webserver by hand."
 msgstr "Selecteer \"Geen\" als u uw webserver handmatig wilt configureren."
-
-#~ msgid "Which kind of web server should be used by cacti?"
-#~ msgstr "Welk soort webserver moet door cacti worden gebruikt?"
-
-#~ msgid "Apache, Apache-SSL, Apache2, All, None"
-#~ msgstr "Apache, Apache-SSL, Apache2, Allemaal, Geen"
-
-#~ msgid "Database structure changes in cacti configuration"
-#~ msgstr "Wijzigingen in de databankstructuur van de cacti-configuratie"
-
-#~ msgid "MySQL server host name"
-#~ msgstr "De computernaam van de MySQL-server"
-
-#~ msgid "Please enter the name of the machine hosting the cacti database."
-#~ msgstr "Geef de naam van de machine die de cacti-databank aanbiedt."
-
-#~ msgid "Database name for cacti"
-#~ msgstr "De naam van de cacti-databank"
-
-#~ msgid ""
-#~ "Please enter the cacti database name. Cacti will store and fetch data "
-#~ "there."
-#~ msgstr ""
-#~ "Geef de naam van de cacti-databank. Cacti zal daar zijn data bewaren en "
-#~ "ophalen."
-
-#~ msgid "MySQL administrator username"
-#~ msgstr "De gebruikersnaam van de MySQL-beheerder"
-
-#~ msgid ""
-#~ "Please enter the MySQL administrator name (needed for cacti database "
-#~ "creation)."
-#~ msgstr ""
-#~ "Geef de gebruikersnaam van de MySQL-beheerder (nodig voor de aanmaak van "
-#~ "de cacti-databank)"
-
-#~ msgid "MySQL administrator password"
-#~ msgstr "Het wachtwoord van de MySQL-beheerder"
-
-#~ msgid "Enter \"none\" if there is no password for MySQL administration."
-#~ msgstr "Voer \"none\" in als er geen wachtwoord is voor het MySQL-beheer."
-
-#~ msgid "Cacti database username"
-#~ msgstr "De gebruikersnaam van de cacti-databank"
-
-#~ msgid ""
-#~ "Please enter the name which will be used for connecting to the cacti "
-#~ "database."
-#~ msgstr ""
-#~ "Geef de gebruikersnaam die gebruikt wordt om verbinding te maken met de "
-#~ "cacti-databank."
-
-#~ msgid "Cacti user password"
-#~ msgstr "Wachtwoord van de cacti-gebruiker"
-
-#~ msgid ""
-#~ "Please enter a password for the Cacti database user (default is \"cacti"
-#~ "\")."
-#~ msgstr ""
-#~ "Geef het wachtwoord voor de cacti-databankgebruiker (standaard is dit "
-#~ "\"cacti\")."
-
-#~ msgid "Do you want to purge the database when purging the package?"
-#~ msgstr "Wilt u de databank wissen als het pakket wordt gewist (purged)?"
-
-#~ msgid ""
-#~ "Accept here if you want to drop the database and the corresponding user "
-#~ "when purging the package."
-#~ msgstr ""
-#~ "Aanvaard dit als u de databank en de corresponderende gebruikersnaam wilt "
-#~ "verwijderen bij het wissen (purge) van het pakket."
-
-#~ msgid "MySQL administrator password confirmation"
-#~ msgstr "Bevestiging van het wachtwoord van de MySQL-beheerder"
-
-#~ msgid "Please confirm the password for the MySQL administrator."
-#~ msgstr "Geef het wachtwoord van de MySQL-beheerder opnieuw in ter controle"
-
-#~ msgid "Error"
-#~ msgstr "Fout"
-
-#~ msgid ""
-#~ "The password and its confirmation do not match. Please re-enter the "
-#~ "password!"
-#~ msgstr "Het wachtwoord is niet hetzelfde. Geef het wachtwoord nog eens in!"
-
-#~ msgid "Store the MySQL admin password"
-#~ msgstr "Bewaar het wachtwoord van de MySQL-beheerder"
-
-#~ msgid ""
-#~ "To update the cacti database automaticlly during a package upgrade the "
-#~ "MySQL admin password must be safed in the debconf database. This is a "
-#~ "security risk!!!"
-#~ msgstr ""
-#~ "Om de cacti-databank automatisch bij te werken bij een pakketopwaardering "
-#~ "moet het MySQL-adminwachtwoord bewaard worden in de debconf-databank. Dit "
-#~ "is een veiligheidsrisico!!!"
-
-#~ msgid ""
-#~ "If the password is not stored in the database it will asked everytime!"
-#~ msgstr ""
-#~ "Als het wachtwoord niet wordt bewaard in de databank zal het telkens "
-#~ "opnieuw gevraagd worden!"
-
-#~ msgid "MySQL server not found"
-#~ msgstr "De MySQL-server is niet gevonden"
-
-#~ msgid ""
-#~ "You entered \"localhost\" as MySQL server but I can't find any server "
-#~ "installed on localhost. Either install the mysql-server package or run "
-#~ "\"dpkg-reconfigure cacti\" in order to change the MySQL server host."
-#~ msgstr ""
-#~ "U voerde \"localhost\" in als MySQL-server maar ik kan geen lokale server "
-#~ "vinden. Ofwel installeer het mysql-server-pakket ofwel voer \"dpkg-"
-#~ "reconfigure cacti\" uit om de MySQL-server te wijzigen."
-
-#~ msgid "No MySQL server on localhost"
-#~ msgstr "Er is geen lokale (localhost) MySQL-server"
-
-#~ msgid "No MySQL server has been found on localhost."
-#~ msgstr "Er is geen lokale (localhost) MySQL-server gevonden."
-
-#~ msgid "/var/cache/cacti/dumps"
-#~ msgstr "/var/cache/cacti/dumps"
-
-#~ msgid "Where should the existing database be saved during an upgrade?"
-#~ msgstr ""
-#~ "Waar moet de bestaande databank worden bewaard tijdens een opwaardering?"
-
-#~ msgid ""
-#~ "During a database upgrade, the existing database will first be copied to "
-#~ "a separate directory location so that you are able to go back to the "
-#~ "previous version of Cacti in case of upgrade problems."
-#~ msgstr ""
-#~ "Tijdens een databankopwaardering zal de bestaande databank eerst worden "
-#~ "gekopieerd naar een afzonderlijke map zodat u kunt terugkeren naar de "
-#~ "vorige versie van Cacti in geval van opwaarderingsproblemen."
-
-#~ msgid ""
-#~ "You must specify the pathname of a directory which will have the capacity "
-#~ "to receive this dump file. The dump will be created in that directory as "
-#~ "a file called cacti-${DATE}.dump."
-#~ msgstr ""
-#~ "U moet het padnaam of een map aangeven die de capaciteit zal hebben om "
-#~ "dit dump-bestand te ontvangen. De dump zal in deze map worden aangemaakt "
-#~ "als een bestand met de naam cacti-${DATE}.dump."
-
-#~ msgid "Select the desired default poller."
-#~ msgstr "Selecteer de gewenste standaard poller."
-
-#~ msgid ""
-#~ "A poller is a program that collect all datas for the cacti database and "
-#~ "graphics."
-#~ msgstr ""
-#~ "Een poller is een programma dat alle data voor de cacti-databank en "
-#~ "grafieken verzamelt."
-
-#~ msgid ""
-#~ "Only on poller can collect informations, but multiple poller packages are "
-#~ "installed. Please select which poller should run by default."
-#~ msgstr ""
-#~ "Er kan maar ��n poller informatie verzamelen, maar er zijn meer poller-"
-#~ "pakketten ge�nstalleerd. Selecteer welke poller standaard moet draaien."
-
-#~ msgid ""
-#~ "You are upgrading from a pre 0.8.x version. You must backup your current "
-#~ "cacti database, and replace it with the new database structure. Please "
-#~ "read the available documentation and change your database accordingly."
-#~ msgstr ""
-#~ "U ben aan het opwaarderen van een versie voor 0.8.X. U moet een "
-#~ "veiligheidskopie nemen van uw huidige cacti-databank, en vervangen door "
-#~ "de nieuwe databankstructuur. Kijk in de aanwezige documentatie en wijzig "
-#~ "uw databank zonodig."
-
-#~ msgid ""
-#~ "Automatically converting your setup is unfortunately impossible. You will "
-#~ "have to do it yourself."
-#~ msgstr ""
-#~ "Uw configuratie automatisch converteren is helaas onmogelijk. U zult dit "
-#~ "zelf moeten doen."
-
-#~ msgid ""
-#~ "Cacti will probably be unable to use the existing database and restart "
-#~ "collecting your systems."
-#~ msgstr ""
-#~ "Cacti zal waarschijnlijk de bestaande databank niet kunnen gebruiken en "
-#~ "opnieuw starten met het verzamelen van uw systemen."
diff -Nru cacti-0.8.7g.old/debian/po/pt.po cacti-0.8.7g/debian/po/pt.po
--- cacti-0.8.7g.old/debian/po/pt.po	2011-06-13 09:15:27.661149621 +0200
+++ cacti-0.8.7g/debian/po/pt.po	2011-06-29 06:48:45.000000000 +0200
@@ -1,32 +1,32 @@
 # Portuguese translation of cacti's debconf messages.
-# 2005, Luís Ferreira <anarka@gmail.com>
-#
 # 01-11-2005 - Luís Ferreira <anarka@gmail.com>- Initial translation
+# Rui Branco <ruipb@debianpt.org>, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: cacti 0.8.6g-2\n"
+"Project-Id-Version: cacti 0.8.7g-2.1\n"
 "Report-Msgid-Bugs-To: cacti@packages.debian.org\n"
 "POT-Creation-Date: 2011-02-16 06:33+0000\n"
-"PO-Revision-Date: 2005-11-01 12:08+0100\n"
-"Last-Translator: Luís Ferreira <anarka@anarka.org>\n"
+"PO-Revision-Date: 2011-06-28 22:01+0100\n"
+"Last-Translator: Rui Branco <ruipb@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. Type: select
 #. Choices
 #: ../cacti.templates:1001
 msgid "Apache2"
-msgstr ""
+msgstr "Apache2"
 
 #. Type: select
 #. Choices
 #: ../cacti.templates:1001
 msgid "None"
-msgstr ""
+msgstr "Nenhum"
 
 #. Type: select
 #. Description
@@ -41,12 +41,15 @@
 "Please select the webserver type for which cacti should be automatically "
 "configured."
 msgstr ""
+"Por favor seleccione o tipo de servidor web para o qual o cacti deve ser "
+"automaticamente configurado."
 
 #. Type: select
 #. Description
 #: ../cacti.templates:1002
 msgid "Select \"None\" if you would like to configure your webserver by hand."
-msgstr "Selecione \"Nenhum\" se desejar configurar o seu servidor web á mão."
+msgstr ""
+"Seleccione \"Nenhum\" se desejar configurar o seu servidor web manualmente."
 
 #~ msgid "Which kind of web server should be used by cacti?"
 #~ msgstr "Que tipo de servidor web deve o cacti usar?"
diff -Nru cacti-0.8.7g.old/debian/po/ru.po cacti-0.8.7g/debian/po/ru.po
--- cacti-0.8.7g.old/debian/po/ru.po	2011-06-13 09:15:27.661149621 +0200
+++ cacti-0.8.7g/debian/po/ru.po	2011-06-15 06:59:45.000000000 +0200
@@ -1,21 +1,21 @@
 # translation of ru.po to Russian
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the cacti package.
 #
-# Yuri Kozlov <yuray@komyakino.ru>, 2009.
+# Yuri Kozlov <yuray@komyakino.ru>, 2009, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: cacti 0.8.7d-1\n"
+"Project-Id-Version: cacti 0.8.7g-2\n"
 "Report-Msgid-Bugs-To: cacti@packages.debian.org\n"
 "POT-Creation-Date: 2011-02-16 06:33+0000\n"
-"PO-Revision-Date: 2009-06-30 21:10+0400\n"
+"PO-Revision-Date: 2011-04-23 08:45+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
 "Language: ru\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.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"
 
@@ -23,19 +23,19 @@
 #. Choices
 #: ../cacti.templates:1001
 msgid "Apache2"
-msgstr ""
+msgstr "Apache2"
 
 #. Type: select
 #. Choices
 #: ../cacti.templates:1001
 msgid "None"
-msgstr ""
+msgstr "не настраивать"
 
 #. Type: select
 #. Description
 #: ../cacti.templates:1002
 msgid "Webserver type"
-msgstr "Тип веб-сервера:"
+msgstr "Веб-сервер:"
 
 #. Type: select
 #. Description
@@ -43,13 +43,13 @@
 msgid ""
 "Please select the webserver type for which cacti should be automatically "
 "configured."
-msgstr ""
+msgstr "Выберите веб-сервер, который нужно автоматически настроить под cacti."
 
 #. Type: select
 #. Description
 #: ../cacti.templates:1002
 msgid "Select \"None\" if you would like to configure your webserver by hand."
-msgstr "Выберите \"ни одного\", если хотите настроить веб-сервер вручную."
+msgstr "Выберите «не настраивать», если хотите настроить веб-сервер вручную."
 
 #~ msgid "Which kind of web server should be used by cacti?"
 #~ msgstr "Тип используемого cacti веб-сервера"
diff -Nru cacti-0.8.7g.old/debian/po/sv.po cacti-0.8.7g/debian/po/sv.po
--- cacti-0.8.7g.old/debian/po/sv.po	2011-06-13 09:15:27.661149621 +0200
+++ cacti-0.8.7g/debian/po/sv.po	2011-06-15 07:02:06.000000000 +0200
@@ -1,48 +1,41 @@
+# Translation of cacti debconf template to Swedish
+# Copyright (C) 2011 Martin Bagge <brother@bsnet.se>
+# This file is distributed under the same license as the cacti package.
 #
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-#    Developers do not need to manually edit POT or PO files.
-#
+# Daniel Nylander <po@danielnylander.se>, 2005
+# Martin Bagge <brother@bsnet.se>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: cacti 0.8.6g-1\n"
 "Report-Msgid-Bugs-To: cacti@packages.debian.org\n"
 "POT-Creation-Date: 2011-02-16 06:33+0000\n"
-"PO-Revision-Date: 2005-11-12 00:07+0100\n"
-"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
-"Language-Team: Swedish <sv@li.org>\n"
+"PO-Revision-Date: 2011-06-02 14:41+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=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: swe\n"
-"X-Poedit-Country: swe\n"
+"X-Poedit-Language: Swedish\n"
+"X-Poedit-Country: Sweden\n"
 
 #. Type: select
 #. Choices
 #: ../cacti.templates:1001
 msgid "Apache2"
-msgstr ""
+msgstr "Apache2"
 
 #. Type: select
 #. Choices
 #: ../cacti.templates:1001
 msgid "None"
-msgstr ""
+msgstr "Ingen"
 
 #. Type: select
 #. Description
 #: ../cacti.templates:1002
 msgid "Webserver type"
-msgstr "Webbserver-typ"
+msgstr "Webbservertyp"
 
 #. Type: select
 #. Description
@@ -51,125 +44,10 @@
 "Please select the webserver type for which cacti should be automatically "
 "configured."
 msgstr ""
+"Välj den webbservertyp som automatiska inställningar för cacti ska aktiveras."
 
 #. Type: select
 #. Description
 #: ../cacti.templates:1002
 msgid "Select \"None\" if you would like to configure your webserver by hand."
 msgstr "Välj \"Ingen\" om du vill konfigurera din webbserver på egen hand."
-
-#~ msgid "Which kind of web server should be used by cacti?"
-#~ msgstr "Vilken typ av webbserver ska användas för cacti?"
-
-#~ msgid "Apache, Apache-SSL, Apache2, All, None"
-#~ msgstr "Apache, Apache-SSL, Apache2, Alla, Ingen"
-
-#~ msgid "MySQL installs and upgrades must be performed manually!"
-#~ msgstr "MySQL-installationer och uppgraderingar måste göras manuellt!"
-
-#~ msgid ""
-#~ "For the time being, support for automatic upgrading of the cacti mysql "
-#~ "database has been disabled.  Please see the rationale and what you will "
-#~ "need to do for either installing or upgrading cacti in /usr/share/doc/"
-#~ "cacti/README.Debian.gz."
-#~ msgstr ""
-#~ "För närvarande är stöd för automatisk uppgradering av cactis MySQL-"
-#~ "databas avstängd. Vänligen se rationale och vad du behöver göra för att "
-#~ "antingen installera eller uppgradera cacti i /usr/share/doc/cacti/README."
-#~ "Debian.gz."
-
-#~ msgid ""
-#~ "Note that you will still be prompted for the relevant information, which "
-#~ "will be used to generate the appropriate configuration files."
-#~ msgstr ""
-#~ "Notera att du kommer fortfarande att frågas efter relevant information "
-#~ "som kommer att användas för att generera passande konfigurationsfiler."
-
-#~ msgid "Database structure changes in cacti configuration"
-#~ msgstr "Ändringar i databasstrukturen i cacti-konfigurationen"
-
-#~ msgid ""
-#~ "You are upgrading from a pre 0.8.x version.  Unfortunately, your old "
-#~ "database will not work with the latest version of cacti.  Please see /usr/"
-#~ "share/doc/cacti/README.Debian.gz to see what your options are."
-#~ msgstr ""
-#~ "Du uppgraderar från en version före 0.8.x. Tyvärr kommer din gamla "
-#~ "databas inte att fungera med den senaste versionen av cacti. Vänligen se /"
-#~ "usr/share/doc/cacti/README.Debian.gz för information vad du kan göra."
-
-#~ msgid "MySQL server host name"
-#~ msgstr "Värdnamnet för MySQL-servern"
-
-#~ msgid "Please enter the name of the machine hosting the cacti database."
-#~ msgstr "Ange namnet på den maskin som är värd för cacti-databasen."
-
-#~ msgid "Database name for cacti"
-#~ msgstr "Databasnamn för cacti"
-
-#~ msgid ""
-#~ "Please enter the cacti database name. Cacti will store and fetch data "
-#~ "there."
-#~ msgstr ""
-#~ "Ange namnet för cacti-databasen. Cacti kommer att lagra och hämta data "
-#~ "där."
-
-#~ msgid "MySQL administrator username"
-#~ msgstr "MySQL-administratörens användarnamn"
-
-#~ msgid ""
-#~ "Please enter the MySQL administrator name (needed for cacti database "
-#~ "creation)."
-#~ msgstr ""
-#~ "Ange MySQL-administratörens namn (behövs för att skapa cacti-databasen)."
-
-#~ msgid "MySQL administrator password"
-#~ msgstr "MySQL-administratörens lösenord"
-
-#~ msgid "Enter \"none\" if there is no password for MySQL administration."
-#~ msgstr ""
-#~ "Ange \"none\" om det inte finns något lösenord för MySQL-administration."
-
-#~ msgid "Cacti database username"
-#~ msgstr "Användarnamn för Cacti-databasen"
-
-#~ msgid ""
-#~ "Please enter the name which will be used for connecting to the cacti "
-#~ "database."
-#~ msgstr ""
-#~ "Vänligen ange namnet som ska användas för att ansluta till cacti-"
-#~ "databasen."
-
-#~ msgid "Cacti user password"
-#~ msgstr "Lösenord för Cacti-användaren"
-
-#~ msgid ""
-#~ "Please enter a password for the Cacti database user (default is \"cacti"
-#~ "\")."
-#~ msgstr ""
-#~ "Ange ett lösenord för databasanvändaren för Cacti (standard är \"cacti\")."
-
-#~ msgid "Do you want to purge the database when purging the package?"
-#~ msgstr "Vill du rensa databasen när paketet rensas (avinstalleras)?"
-
-#~ msgid ""
-#~ "Accept here if you want to drop the database and the corresponding user "
-#~ "when purging the package."
-#~ msgstr ""
-#~ "Acceptera här om du vill tömma databasen och dess respektive användare "
-#~ "när paketet rensas."
-
-#~ msgid "MySQL administrator password confirmation"
-#~ msgstr "Bekräfta MySQL-administratörens lösenord"
-
-#~ msgid "Please confirm the password for the MySQL administrator."
-#~ msgstr "Vänligen bekräfta lösenordet för MySQL-administratören."
-
-#~ msgid "Error"
-#~ msgstr "Fel"
-
-#~ msgid ""
-#~ "The password and its confirmation do not match. Please re-enter the "
-#~ "password!"
-#~ msgstr ""
-#~ "Lösenordet och dess bekräftelse stämde inte överens. Vänligen ange "
-#~ "lösenordet igen!"
