diff -Nru bandwidthd-2.0.1+cvs20090917.old/debian/README.Debian bandwidthd-2.0.1+cvs20090917/debian/README.Debian
--- bandwidthd-2.0.1+cvs20090917.old/debian/README.Debian	2010-04-27 22:06:37.000000000 +0200
+++ bandwidthd-2.0.1+cvs20090917/debian/README.Debian	2010-05-06 09:10:58.000000000 +0200
@@ -29,7 +29,7 @@
 wrong?
 
 Having some defunct processes is perfectly normal. They are finished grapher
-childs which hasn't been reaped yet. They will be reaped right before the
+children which hasn't been reaped yet. They will be reaped right before the
 next grahing run, which will produce new defunct bandwidthd processes once they
 are done graphing. This is used to detect if the previous graphing run is
 finished when a new one is started (if there aren't any children to reap,
diff -Nru bandwidthd-2.0.1+cvs20090917.old/debian/bandwidthd.init bandwidthd-2.0.1+cvs20090917/debian/bandwidthd.init
--- bandwidthd-2.0.1+cvs20090917.old/debian/bandwidthd.init	2010-04-27 22:06:37.000000000 +0200
+++ bandwidthd-2.0.1+cvs20090917/debian/bandwidthd.init	2010-05-06 09:12:34.000000000 +0200
@@ -5,8 +5,8 @@
 #
 ### BEGIN INIT INFO
 # Provides:          bandwidthd
-# Required-Start:    $syslog
-# Required-Stop:     $syslog
+# Required-Start:    $syslog $remote_fs
+# Required-Stop:     $syslog $remote_fs
 # Should-Start:      $local_fs
 # Should-Stop:       $local_fs
 # Default-Start:     2 3 4 5
diff -Nru bandwidthd-2.0.1+cvs20090917.old/debian/changelog bandwidthd-2.0.1+cvs20090917/debian/changelog
--- bandwidthd-2.0.1+cvs20090917.old/debian/changelog	2010-04-27 22:06:37.000000000 +0200
+++ bandwidthd-2.0.1+cvs20090917/debian/changelog	2010-05-06 09:14:02.000000000 +0200
@@ -1,3 +1,16 @@
+bandwidthd (2.0.1+cvs20090917-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Explicitly point to GPL-2 document in debian/copyright
+  * Explicitly use 1.0 source format
+  * Fix spelling in README.Debian ("childs"->"children")
+  * Add $remote_fs to Required-Start and Required-Stop in init script
+  * Fix pending l10n issues. Debconf translations:
+    - Japanese (Hideki Yamane (Debian-JP)).  Closes: #555547
+    - Danish (Joe Hansen).  Closes: #580122
+
+ -- Christian Perrier <bubulle@debian.org>  Thu, 06 May 2010 08:55:57 +0200
+
 bandwidthd (2.0.1+cvs20090917-3) unstable; urgency=low
 
   * Oops, move debian/ru.po to debian/po/ru.po (Closes: #543192)
diff -Nru bandwidthd-2.0.1+cvs20090917.old/debian/copyright bandwidthd-2.0.1+cvs20090917/debian/copyright
--- bandwidthd-2.0.1+cvs20090917.old/debian/copyright	2010-04-27 22:06:37.000000000 +0200
+++ bandwidthd-2.0.1+cvs20090917/debian/copyright	2010-05-06 08:56:25.000000000 +0200
@@ -17,5 +17,5 @@
 License:
 
  This software is distributed under the GNU General Public License,
- which can be found at /usr/share/common-licenses/GPL.
+ which can be found at /usr/share/common-licenses/GPL-2.
 
diff -Nru bandwidthd-2.0.1+cvs20090917.old/debian/po/da.po bandwidthd-2.0.1+cvs20090917/debian/po/da.po
--- bandwidthd-2.0.1+cvs20090917.old/debian/po/da.po	1970-01-01 01:00:00.000000000 +0100
+++ bandwidthd-2.0.1+cvs20090917/debian/po/da.po	2010-05-03 22:40:00.000000000 +0200
@@ -0,0 +1,171 @@
+# Danish translation Bandwidthd.
+# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the Bandwidthd package.
+# Joe Hansen <joedalton2@yahoo.dk>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Bandwidthd\n"
+"Report-Msgid-Bugs-To: andreas@fatal.se\n"
+"POT-Creation-Date: 2007-03-23 10:46+0100\n"
+"PO-Revision-Date: 2010-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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Description
+#: ../templates:1001
+msgid "Interface to listen on:"
+msgstr "Gr??nseflade der skal lyttes p??:"
+
+#. Type: select
+#. Description
+#: ../templates:1001
+msgid ""
+"Bandwidthd needs to know which interface it should listen for traffic on. "
+"Only a single interface can be specified. If you want to listen on all "
+"interfaces you should specify the metainterface \"any\". Running "
+"\"bandwidthd -l\" will list available interfaces."
+msgstr ""
+"Bandwidthd har brug for at vide hvilken gr??nseflade den skal lytte efter "
+"trafik p??. Kun en gr??nseflade kan angives. Hvis du ??nsker at lytte p?? "
+"alle gr??nsefalder b??r du angive metagr??nsefladen ??any??. K??rsel af ??"
+"bandwidthd -l?? vil vise alle tilg??ngelige gr??nseflader."
+
+#. Type: string
+#. Description
+#: ../templates:2001
+msgid "Subnets to log details about:"
+msgstr "Undernet der skal logges detaljer omkring:"
+
+#. Type: string
+#. Description
+#: ../templates:2001
+msgid ""
+"Bandwidthd can create graphs for one or several ip-subnets. Subnets are "
+"specified either in dotted-quad format (192.168.0.0 255.255.0.0) or in CIDR "
+"format (192.168.0.0/16) and separated by a comma. Example: 192.168.0.0/16, "
+"10.0.0.0 255.0.0.0, 172.16.1.0/24. If you don't know what to specify then "
+"you can use 0.0.0.0/0 but it is strongly discouraged."
+msgstr ""
+"Bandwidthd kan oprette grafer for en eller flere ip-undernet. Undernet er "
+"angivet enten i formatet dotted-quad (192.168.0.0 255.255.0.0) eller i CIDR-"
+"format (192.168.0.0/16) og adskilt af et komma. Eksempel: 192.168.0.0/16, "
+"10.0.0.0.255.0.0.0, 172.16.1.0/24. Hvis du ikke ved hvad der skal angives "
+"s?? kan du bruge 0.0.0.0/0 men det frar??des st??rkt."
+
+#. Type: boolean
+#. Description
+#: ../templates:3001
+msgid "Output CDF data logs?"
+msgstr "Vis CDF-datalogge?"
+
+#. Type: boolean
+#. Description
+#: ../templates:3001
+msgid ""
+"Bandwidthd can log captured traffic information to Common Data File (CDF) "
+"logs. These logs are required if you want to keep old information stored "
+"between restarts of the bandwidthd daemon. Also see the recovercdf "
+"configuration option."
+msgstr ""
+"Bandwidthd kan logge optaget trafikinformation til logge for Common Data "
+"File (CDF). Disse logge kr??ves, hvis du ??nsker at holde gammel information "
+"gemt mellem opstart af bandwidthd-d??monen. Se ogs?? "
+"konfigurationsindstillingen til recovercdf."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid "Recover old data from logs on restart?"
+msgstr "Gendan gamle data fra logge ved genstart?"
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"If old data is going to be outputed in the graphs, it needs to be read when "
+"BandwidthD is restarted. Parsing the CDF logs can take quite some time on a "
+"slow machine so you might want to disable it, but then you'll lose the "
+"information in the graphs after a reboot and similar.... Also make sure the "
+"output_cdf config option is enabled."
+msgstr ""
+"Hvis gamle data skal vises i graferne, s?? skal de l??ses n??r BandwidthD "
+"genstartes. Fortolkning af CDF-logge kan tage noget tid p?? en sl??v maskine "
+"s?? du vil m??ske ??nske at sl?? det fra, men s?? mister du informationen i "
+"graferne efter en genstart og lignende.... Du skal ogs?? sikre dig, at "
+"konfigurationstilvalget output_cdf er sl??et til."
+
+#. Type: string
+#. Description
+#: ../templates:5001
+msgid "Graph webpage autorefresh delay (seconds):"
+msgstr "Automatisk opdateringsforsinkelse for grafinternetside (sekunder):"
+
+#. Type: string
+#. Description
+#: ../templates:5001
+msgid ""
+"With this option you can tweak the delay used in the html as \"META REFRESH"
+"\" value. The default is 150 seconds (2.5 minutes). To disable automatic "
+"reloads of the webpage enter 0. This way the visitor will have to manually "
+"push refresh in his browser to get updated graphs."
+msgstr ""
+"Med dette tilvalg kan du indstille forsinkelsen brugt i html'en under ??META "
+"REFRESH??. Standarden er 150 sekunder (2,5 minutter). For at deaktivere "
+"automatisk genindl??sning af internetsiden indtastes 0. P?? den m??de vil "
+"den bes??gende manuelt skulle trykke p?? opdater i sin browser for at hente "
+"opdaterede grafer."
+
+#. Type: boolean
+#. Description
+#: ../templates:6001
+msgid "Put interface in PROMISC mode?"
+msgstr "S??t gr??nsefalde i PROMISC-tilstand?"
+
+#. Type: boolean
+#. Description
+#: ../templates:6001
+msgid ""
+"If this option is enabled, all interfaces used to capture traffic "
+"information will be put in promiscuous mode. This way traffic thats not "
+"routed via the machine running bandwidthd might be trackable anyway. "
+"Enabling promiscuous mode will probably not be able to capture any more "
+"traffic in a normal switched network. Also rootkit detectors might warn "
+"about bandwidthd being a virus if using promiscuous mode. You should "
+"probably leave this option disabled."
+msgstr ""
+"Hvis denne indstilling er aktiveret, vil alle gr??nseflader brugt til at "
+"registrere trafikinformation blive sat i omflakkende tilstand. P?? denne m??"
+"de vil trafik som ikke sendes via maskinen der k??rer bandwidthd stadig "
+"kunne v??re sporbart. Aktivering af omflakkende tilstand vil sandsynligvis "
+"ikke v??re i stand til at registrere mere trafik i et normalt omstillet "
+"netv??rk. Rootkit-detektiver vil m??ske ogs?? advare om at bandwidthd er en "
+"virus hvis den bruger omflakkende tilstand. Du skal h??jst sandsynligt lade "
+"denne indstilling v??re deaktiveret."
+
+#. Type: string
+#. Description
+#: ../templates:7001
+msgid "This sensors identification string:"
+msgstr "Denne sensors identifikationsstreng:"
+
+#. Type: string
+#. Description
+#: ../templates:7001
+msgid ""
+"Each sensor should have an identification string to be able to tell from "
+"where the traffic in the PostgreSQL-database was detected on. This option is "
+"usually set to the fully qualified hostname of the machine running the "
+"bandwidthd sensor. This needs to be a unique string which no other "
+"bandwidthd sensor that reports to the same database uses."
+msgstr ""
+"Hver sensor skal have en identifikationsstreng for at v??re i stand til at "
+"fort??lle hvor trafikken i PostgreSQL-databasen blev registreret. Denne "
+"indstilling er normalt angivet som v??rende det fuldt kvalificeret v??"
+"rtsnavn p?? maskinen som k??rer bandwidthd-sensoren. Denne skal v??re en "
+"unik streng forskellig fra alle andre bandwidthd-sensorer som rapporterer "
+"til den samme database."
diff -Nru bandwidthd-2.0.1+cvs20090917.old/debian/po/ja.po bandwidthd-2.0.1+cvs20090917/debian/po/ja.po
--- bandwidthd-2.0.1+cvs20090917.old/debian/po/ja.po	1970-01-01 01:00:00.000000000 +0100
+++ bandwidthd-2.0.1+cvs20090917/debian/po/ja.po	2010-04-29 08:16:03.000000000 +0200
@@ -0,0 +1,167 @@
+# Copyright (C) 2009 Andreas Henriksson <andreas@fatal.se>
+# This file is distributed under the same license as bandwidthd package.
+# Hideki Yamane <henrich@debian.or.jp>, 2009
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: bandwidthd 2.0.1+cvs20090917-3\n"
+"Report-Msgid-Bugs-To: andreas@fatal.se\n"
+"POT-Creation-Date: 2007-03-23 10:46+0100\n"
+"PO-Revision-Date: 2009-10-25 06:52+0900\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
+#. Description
+#: ../templates:1001
+msgid "Interface to listen on:"
+msgstr "listen するインターフェイス:"
+
+#. Type: select
+#. Description
+#: ../templates:1001
+msgid ""
+"Bandwidthd needs to know which interface it should listen for traffic on. "
+"Only a single interface can be specified. If you want to listen on all "
+"interfaces you should specify the metainterface \"any\". Running "
+"\"bandwidthd -l\" will list available interfaces."
+msgstr ""
+"bandwidthd はどのインターフェイスがトラフィックを listen するのかを知っている"
+"必要があります。インターフェイスは一つだけ指定できます。全てのインターフェイ"
+"スで listen したい場合は擬似インターフェイス「any」を指定してください。"
+"「bandwidthd -l」を実行すると利用可能なインターフェイスの一覧を出力します。"
+
+#. Type: string
+#. Description
+#: ../templates:2001
+msgid "Subnets to log details about:"
+msgstr "詳細を記録するサブネット:"
+
+#. Type: string
+#. Description
+#: ../templates:2001
+msgid ""
+"Bandwidthd can create graphs for one or several ip-subnets. Subnets are "
+"specified either in dotted-quad format (192.168.0.0 255.255.0.0) or in CIDR "
+"format (192.168.0.0/16) and separated by a comma. Example: 192.168.0.0/16, "
+"10.0.0.0 255.0.0.0, 172.16.1.0/24. If you don't know what to specify then "
+"you can use 0.0.0.0/0 but it is strongly discouraged."
+msgstr ""
+"bandwidthd は 1 つ、あるいは複数の IP サブネットについてグラフを作成できま"
+"す。サブネットは 4 つの数字をドットで区切った形式 (192.168.0.0 255.255.0.0) "
+"か CIDR 形式 (192.168.0.0/16) で指定され、コンマで区切られます。例: "
+"192.168.0.0/16, 10.0.0.0 255.0.0.0, 172.16.1.0/24 となります。何を指定すれば"
+"良いのか分からない場合は 0.0.0.0/0 を利用できますが、これは全くお勧めしませ"
+"ん。"
+
+#. Type: boolean
+#. Description
+#: ../templates:3001
+msgid "Output CDF data logs?"
+msgstr "CDF データログを出力しますか?"
+
+#. Type: boolean
+#. Description
+#: ../templates:3001
+msgid ""
+"Bandwidthd can log captured traffic information to Common Data File (CDF) "
+"logs. These logs are required if you want to keep old information stored "
+"between restarts of the bandwidthd daemon. Also see the recovercdf "
+"configuration option."
+msgstr ""
+"bandwidthd は、取得したトラフィック情報を Common Data File (CDF) ログに記録で"
+"きます。このログは bandwidthd デーモンを再起動する間に以前の情報を保存してお"
+"きたい場合に必要です。recovercdf 設定オプションも参照してください。"
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid "Recover old data from logs on restart?"
+msgstr "再起動時に古いデータをログから復元しますか?"
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"If old data is going to be outputed in the graphs, it needs to be read when "
+"BandwidthD is restarted. Parsing the CDF logs can take quite some time on a "
+"slow machine so you might want to disable it, but then you'll lose the "
+"information in the graphs after a reboot and similar.... Also make sure the "
+"output_cdf config option is enabled."
+msgstr ""
+"古いデータをグラフに出力し続ける場合、BandwidthD が再起動される時に読み込む必"
+"要があります。遅いマシンで CDF ログを処理するのは少々時間がかかるので無効にす"
+"ると良いですが、その場合は再起動した場合などにグラフ情報を失います。"
+"output_cdf 設定オプションが有効なのも確認してください。"
+
+#. Type: string
+#. Description
+#: ../templates:5001
+msgid "Graph webpage autorefresh delay (seconds):"
+msgstr "グラフウェブページの自動更新間隔 (秒):"
+
+#. Type: string
+#. Description
+#: ../templates:5001
+msgid ""
+"With this option you can tweak the delay used in the html as \"META REFRESH"
+"\" value. The default is 150 seconds (2.5 minutes). To disable automatic "
+"reloads of the webpage enter 0. This way the visitor will have to manually "
+"push refresh in his browser to get updated graphs."
+msgstr ""
+"このオプションで html の「META REFRESH」値で使われる間隔を調整できます。デ"
+"フォルトは 150 秒 (2.5 分) です。ウェブページの自動リロードを無効にするには "
+"0 を入力してください。こうすると、来訪者が更新されたグラフを見るには手動でブ"
+"ラウザを更新する必要が出てきます。"
+
+#. Type: boolean
+#. Description
+#: ../templates:6001
+msgid "Put interface in PROMISC mode?"
+msgstr "インターフェイスを PROMISC モードにしますか?"
+
+#. Type: boolean
+#. Description
+#: ../templates:6001
+msgid ""
+"If this option is enabled, all interfaces used to capture traffic "
+"information will be put in promiscuous mode. This way traffic thats not "
+"routed via the machine running bandwidthd might be trackable anyway. "
+"Enabling promiscuous mode will probably not be able to capture any more "
+"traffic in a normal switched network. Also rootkit detectors might warn "
+"about bandwidthd being a virus if using promiscuous mode. You should "
+"probably leave this option disabled."
+msgstr ""
+"このオプションを有効にすると、トラフィック情報をキャプチャするのに使われてい"
+"る全てのインターフェイスは promiscuous モードにされます。こうすると、"
+"bandwidthd が動作しているマシンを経由しないトラフィックも同様に追跡が可能にな"
+"ります。通常のスイッチハブが入っているネットワークでは、promiscous モードを有"
+"効にしても、さらにトラフィックをキャプチャすることはおそらく不可能でしょう。"
+"また、promiscous モードを使っていると、rootkit 検出ソフトが bandwidthd をウィ"
+"ルスとして警告するかもしれません。大抵は、このオプションを無効にしておいた方"
+"が良いでしょう。"
+
+#. Type: string
+#. Description
+#: ../templates:7001
+msgid "This sensors identification string:"
+msgstr "このセンサーを識別する文字列:"
+
+#. Type: string
+#. Description
+#: ../templates:7001
+msgid ""
+"Each sensor should have an identification string to be able to tell from "
+"where the traffic in the PostgreSQL-database was detected on. This option is "
+"usually set to the fully qualified hostname of the machine running the "
+"bandwidthd sensor. This needs to be a unique string which no other "
+"bandwidthd sensor that reports to the same database uses."
+msgstr ""
+"各センサーは、検出したトラフィックをどこからのものなのかを識別できる文字列を "
+"PostgreSQL データベースで持つ必要があります。このオプションは通常 bandwidthd "
+"センサーが動作しているマシンの完全修飾ホスト名に設定されます。これは、同じ"
+"データベースにレポートをしている別の bandwidthd センサーが使っていない一意な"
+"文字列である必要があります。"
diff -Nru bandwidthd-2.0.1+cvs20090917.old/debian/source/format bandwidthd-2.0.1+cvs20090917/debian/source/format
--- bandwidthd-2.0.1+cvs20090917.old/debian/source/format	1970-01-01 01:00:00.000000000 +0100
+++ bandwidthd-2.0.1+cvs20090917/debian/source/format	2010-05-06 08:57:14.000000000 +0200
@@ -0,0 +1 @@
+1.0
