diff -Nru cacti-0.8.7b.old/debian/changelog cacti-0.8.7b/debian/changelog
--- cacti-0.8.7b.old/debian/changelog	2008-07-18 02:13:50.367899450 -0300
+++ cacti-0.8.7b/debian/changelog	2008-08-08 22:41:23.948082421 -0300
@@ -1,3 +1,18 @@
+cacti (0.8.7b-2.1) unstable; urgency=low
+
+  * Non-maintainer upload to fix pending l10n issues.
+  * Debconf translations:
+    - Basque. Closes: #479538
+    - Turkish. Closes: #491497
+    - Finnish. Closes: #492395
+    - Russian. Closes: #492550
+    - Galician. Closes: #493306
+    - Japanese. Closes: #493346
+  * [Lintian] Properly spell MySQL in package description
+  * [Lintian] Wrap the debian/copyright file to 80 characters
+
+ -- Christian Perrier <bubulle@debian.org>  Fri, 18 Jul 2008 19:28:34 +0200
+
 cacti (0.8.7b-2) unstable; urgency=low
 
   * ack previous NMU, thanks Andreas.
diff -Nru cacti-0.8.7b.old/debian/control cacti-0.8.7b/debian/control
--- cacti-0.8.7b.old/debian/control	2008-07-18 02:13:50.367899450 -0300
+++ cacti-0.8.7b/debian/control	2008-08-08 22:35:22.308085859 -0300
@@ -19,7 +19,7 @@
  database, cacti handles the data gathering also.  There is also SNMP
  support for those used to creating traffic graphs with MRTG.
  .
- This package requires a functional mysql database server on either the
+ This package requires a functional MySQL database server on either the
  installation host or remotely accessible system.  If you do not already
  have a database server available, you should also install mysql-server.
  
diff -Nru cacti-0.8.7b.old/debian/copyright cacti-0.8.7b/debian/copyright
--- cacti-0.8.7b.old/debian/copyright	2008-07-18 02:13:50.367899450 -0300
+++ cacti-0.8.7b/debian/copyright	2008-08-08 22:37:26.924084012 -0300
@@ -35,29 +35,32 @@
 Copyright (c) 2000, 2001, 2002, 2003, 2004 John Lim
 All rights reserved.
 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list 
-of conditions and the following disclaimer. 
-
-Redistributions in binary form must reproduce the above copyright notice, this list 
-of conditions and the following disclaimer in the documentation and/or other materials 
-provided with the distribution. 
-
-Neither the name of the John Lim nor the names of its contributors may be used to 
-endorse or promote products derived from this software without specific prior written 
-permission. 
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+Neither the name of the John Lim nor the names of its contributors may
+be used to endorse or promote products derived from this software
+without specific prior written permission.
 
 DISCLAIMER:
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL 
-JOHN LIM OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JOHN LIM OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 alternatively the contents of the LGPL v2.1 can be found in 
diff -Nru cacti-0.8.7b.old/debian/po/eu.po cacti-0.8.7b/debian/po/eu.po
--- cacti-0.8.7b.old/debian/po/eu.po	1969-12-31 21:00:00.000000000 -0300
+++ cacti-0.8.7b/debian/po/eu.po	2008-07-18 14:29:11.271898000 -0300
@@ -0,0 +1,41 @@
+# translation of cacti-eu.po to Euskara
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Piarres Beobide <pi@beobide.net>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: cacti-eu\n"
+"Report-Msgid-Bugs-To: seanius@debian.org\n"
+"POT-Creation-Date: 2007-10-09 20:13+0200\n"
+"PO-Revision-Date: 2008-05-05 13:43+0200\n"
+"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
+"Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\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: select
+#. Choices
+#: ../cacti.templates:1001
+msgid "Apache, Apache-SSL, Apache2, All, None"
+msgstr "Apache, Apache-SSL, Apache2, Denak, Batez"
+
+#. Type: select
+#. Description
+#: ../cacti.templates:1002
+msgid "Webserver type"
+msgstr "Webzerbitzari mota"
+
+#. Type: select
+#. Description
+#: ../cacti.templates:1002
+msgid "Which kind of web server should be used by cacti?"
+msgstr "Zein web zerbitzari mota erabili behar du cactik?"
+
+#. Type: select
+#. Description
+#: ../cacti.templates:1002
+msgid "Select \"None\" if you would like to configure your webserver by hand."
+msgstr "\"Batez\" hautatu web zerbitzaria eskuz konfiguratu nahi baduzu."
diff -Nru cacti-0.8.7b.old/debian/po/fi.po cacti-0.8.7b/debian/po/fi.po
--- cacti-0.8.7b.old/debian/po/fi.po	1969-12-31 21:00:00.000000000 -0300
+++ cacti-0.8.7b/debian/po/fi.po	2008-07-25 18:05:35.316236000 -0300
@@ -0,0 +1,37 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: cacti\n"
+"Report-Msgid-Bugs-To: seanius@debian.org\n"
+"POT-Creation-Date: 2007-10-09 20:13+0200\n"
+"PO-Revision-Date: 2008-07-25 21:48+0200\n"
+"Last-Translator: Esko Arajärvi <edu@iki.fi>\n"
+"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Finnish\n"
+"X-Poedit-Country: FINLAND\n"
+
+#. Type: select
+#. Choices
+#: ../cacti.templates:1001
+msgid "Apache, Apache-SSL, Apache2, All, None"
+msgstr "Apache, Apache-SSL, Apache2, Kaikki, Muu"
+
+#. Type: select
+#. Description
+#: ../cacti.templates:1002
+msgid "Webserver type"
+msgstr "Verkkopalvelimen tyyppi:"
+
+#. Type: select
+#. Description
+#: ../cacti.templates:1002
+msgid "Which kind of web server should be used by cacti?"
+msgstr "Valitse verkkopalvelin, jota cactin tulisi käyttää."
+
+#. Type: select
+#. Description
+#: ../cacti.templates:1002
+msgid "Select \"None\" if you would like to configure your webserver by hand."
+msgstr "Valitse ”Muu”, jos verkkopalvelimen asetukset halutaan tehdä käsin."
diff -Nru cacti-0.8.7b.old/debian/po/gl.po cacti-0.8.7b/debian/po/gl.po
--- cacti-0.8.7b.old/debian/po/gl.po	1969-12-31 21:00:00.000000000 -0300
+++ cacti-0.8.7b/debian/po/gl.po	2008-08-02 05:08:52.043847000 -0300
@@ -0,0 +1,39 @@
+# Galician translation of cacti's debconf templates
+# This file is distributed under the same license as the cacti package.
+# Jacobo Tarrio <jtarrio@debian.org>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cacti\n"
+"Report-Msgid-Bugs-To: seanius@debian.org\n"
+"POT-Creation-Date: 2007-10-09 20:13+0200\n"
+"PO-Revision-Date: 2008-08-01 23:26+0100\n"
+"Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
+"Language-Team: Galician <proxecto@trasno.net>\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 "Apache, Apache-SSL, Apache2, All, None"
+msgstr "Apache, Apache-SSL, Apache2, Todos, Ningún"
+
+#. Type: select
+#. Description
+#: ../cacti.templates:1002
+msgid "Webserver type"
+msgstr "Tipo de servidor web"
+
+#. Type: select
+#. Description
+#: ../cacti.templates:1002
+msgid "Which kind of web server should be used by cacti?"
+msgstr "¿Que tipo de servidor web debe empregar cacti?"
+
+#. Type: select
+#. Description
+#: ../cacti.templates:1002
+msgid "Select \"None\" if you would like to configure your webserver by hand."
+msgstr "Escolla \"Ningún\" se quere configurar o servidor web á man."
diff -Nru cacti-0.8.7b.old/debian/po/ja.po cacti-0.8.7b/debian/po/ja.po
--- cacti-0.8.7b.old/debian/po/ja.po	1969-12-31 21:00:00.000000000 -0300
+++ cacti-0.8.7b/debian/po/ja.po	2008-08-02 17:05:12.939691000 -0300
@@ -0,0 +1,40 @@
+# 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.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cacti 0.8.7b-2\n"
+"Report-Msgid-Bugs-To: seanius@debian.org\n"
+"POT-Creation-Date: 2007-10-09 20:13+0200\n"
+"PO-Revision-Date: 2008-07-31 11:21+0200\n"
+"Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
+"Language-Team: Japanese <debian-japanese@lists.debian.org>\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 "Apache, Apache-SSL, Apache2, All, None"
+msgstr "Apache, Apache-SSL, Apache2, すべて, どれでもない"
+
+#. Type: select
+#. Description
+#: ../cacti.templates:1002
+msgid "Webserver type"
+msgstr "ウェブサーバの種類"
+
+#. Type: select
+#. Description
+#: ../cacti.templates:1002
+msgid "Which kind of web server should be used by cacti?"
+msgstr "どのウェブサーバで cacti を使いますか?"
+
+#. Type: select
+#. Description
+#: ../cacti.templates:1002
+msgid "Select \"None\" if you would like to configure your webserver by hand."
+msgstr "ウェブサーバを手動で設定したい場合は「どれでもない」を選んでください。"
diff -Nru cacti-0.8.7b.old/debian/po/ru.po cacti-0.8.7b/debian/po/ru.po
--- cacti-0.8.7b.old/debian/po/ru.po	1969-12-31 21:00:00.000000000 -0300
+++ cacti-0.8.7b/debian/po/ru.po	2008-07-29 16:51:38.899300000 -0300
@@ -0,0 +1,43 @@
+# 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.
+#
+# Yuri Kozlov <kozlov.y@gmail.com>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: ru\n"
+"Report-Msgid-Bugs-To: seanius@debian.org\n"
+"POT-Creation-Date: 2007-10-09 20:13+0200\n"
+"PO-Revision-Date: 2008-07-27 10:06+0400\n"
+"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
+"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\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"
+"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: select
+#. Choices
+#: ../cacti.templates:1001
+msgid "Apache, Apache-SSL, Apache2, All, None"
+msgstr "Apache, Apache-SSL, Apache2, все, не нужно"
+
+#. Type: select
+#. Description
+#: ../cacti.templates:1002
+msgid "Webserver type"
+msgstr "Веб-сервер:"
+
+#. Type: select
+#. Description
+#: ../cacti.templates:1002
+msgid "Which kind of web server should be used by cacti?"
+msgstr "Какой веб-сервер нужно использовать для cacti?"
+
+#. Type: select
+#. Description
+#: ../cacti.templates:1002
+msgid "Select \"None\" if you would like to configure your webserver by hand."
+msgstr "Выберите \"не нужно\", если хотите настроить веб-сервер вручную."
diff -Nru cacti-0.8.7b.old/debian/po/tr.po cacti-0.8.7b/debian/po/tr.po
--- cacti-0.8.7b.old/debian/po/tr.po	1969-12-31 21:00:00.000000000 -0300
+++ cacti-0.8.7b/debian/po/tr.po	2008-07-20 03:12:40.611898000 -0300
@@ -0,0 +1,41 @@
+# Turkish translation of cacti debconf template.
+# Copyright (C) 2008
+# This file is distributed under the same license as the cacti package.
+# Mert Dirik <mertdirik@gmail.com>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cacti 0.8.7b-2\n"
+"Report-Msgid-Bugs-To: seanius@debian.org\n"
+"POT-Creation-Date: 2007-10-09 20:13+0200\n"
+"PO-Revision-Date: 2008-07-18 23:27+0200\n"
+"Last-Translator: Mert Dirik <mertdirik@gmail.com>\n"
+"Language-Team: Debian L10n Turkish <debian-l10n-turkish@lists.debian.org>\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 "Apache, Apache-SSL, Apache2, All, None"
+msgstr "Apache, Apache-SSL, Apache2, Hepsi, Hiçbiri"
+
+#. Type: select
+#. Description
+#: ../cacti.templates:1002
+msgid "Webserver type"
+msgstr "Web sunucusunun türü"
+
+#. Type: select
+#. Description
+#: ../cacti.templates:1002
+msgid "Which kind of web server should be used by cacti?"
+msgstr "Cacti hangi tür bir web sunucusu kullanmalı?"
+
+#. Type: select
+#. Description
+#: ../cacti.templates:1002
+msgid "Select \"None\" if you would like to configure your webserver by hand."
+msgstr ""
+"Eğer web sunucunuzu elinizle yapılandırmak istiyorsanız \"Hiçbiri\"ni seçin."
