Imported Debian patch 0.28-8

26 files changed, 464 insertions, 199 deletions

diff --git a/debian/changelog b/debian/changelog
index 1ff0804..003f052 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+ifplugd (0.28-8) unstable; urgency=low
+
+  * Add DM-Upload-Allowed: yes
+  * Patch 04_up_down_beep_options to implement --no-beep-up and --no-beep-down
+    options (Closes: #264917)
+  * Thanks for updated debconf translations
+    + Japanese: TANAKA Atushi <atanaka@hotcake.halfmoon.jp>
+    + Finnish: Esko Arajärvi <edu@iki.fi> (Closes: #474304)
+    + Galician: Jacobo Tarrio <jtarrio@trasno.net> (Closes: #474340)
+    + German: Holger Wansing <linux@wansing-online.de> <Closes: #474347)
+    + Portuguese: Rui Branco <traduz@debianpt.org> (Closes: #474380)
+    + Spanish: Javier Fernandez-Sanguino <jfs@debian.org> (Closes: #474472)
+  * Patch 05_396895_HOTPLUG_conf_man to explain HOTPLUG_INTERFACES in the
+    ifplugd.conf(5) manpage (Closes: #396895)
+  * Don't let udev shutdown interfaces that it did not start.  Thanks John M
+    Flinchbaugh <john@hjsoft.com> for the patch (Closes: #375785)
+  * Call run-parts with --exit-on-error for ifplugd action.d scripts per Kel
+    Modderman's request :) (Closes: #474746)
+
+ -- Y Giridhar Appaji Nag <giridhar@appaji.net>  Wed, 09 Apr 2008 12:38:17 +0530
+
 ifplugd (0.28-7) unstable; urgency=low
 
   * Thanks for updated debconf translations
diff --git a/debian/control b/debian/control
index 75c5261..c2d100a 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Standards-Version: 3.7.3
 Homepage: http://0pointer.de/lennart/projects/ifplugd/
 Vcs-Svn: svn://svn.debian.org/svn/collab-maint/ext-maint/ifplugd/unstable
 Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/ext-maint/ifplugd/unstable/?op=log
+DM-Upload-Allowed: yes
 
 Package: ifplugd
 Architecture: any
diff --git a/debian/ifplugd.action b/debian/ifplugd.action
index 3619237..44e7f5f 100644
--- a/debian/ifplugd.action
+++ b/debian/ifplugd.action
@@ -21,7 +21,7 @@ set -e
 
 case "$2" in
 up|down)
-	run-parts --arg="$1" --arg="$2" /etc/ifplugd/action.d/
+	run-parts --exit-on-error --arg="$1" --arg="$2" /etc/ifplugd/action.d/
 	;;
 *)
 	echo "ifplugd.action: Incorrect action argument" >&2
diff --git a/debian/ifplugd.templates b/debian/ifplugd.templates
index b1fb86f..1b1312c 100644
--- a/debian/ifplugd.templates
+++ b/debian/ifplugd.templates
@@ -30,17 +30,17 @@ Default: -q -f -u0 -d10 -w -I
 _Description: arguments to ifplugd:
  You can give arguments to the ifplug daemon here.  Relevant options are:
  .
- -q Don't run script on daemon quit
+  -q Don't run script on daemon quit
   -f Ignore detection failure and retry
   -u Specify delay for configuring interface
   -d Specify delay for deconfiguring interface
   -w Wait until daemon fork finished
   -I Don't exit on nonzero return value of program executed
  .
- -a Do not enable interface automatically
+  -a Do not enable interface automatically
   -s Use stderr instead of syslog for debugging
-  -b Do not beep
-  -t Specify poll time in seconds
+  -b Do not beep (-U/-D Do not beep on interface up/down)
+  -t Specify poll time in seconds (default: 1)
   -p Don't run script on daemon startup
   -l Run "down" script on startup if no cable is detected
   -W Wait until the daemon died when running daemon is killed
diff --git a/debian/ifplugd.udev.agent b/debian/ifplugd.udev.agent
index 5c4671a..d632bff 100644
--- a/debian/ifplugd.udev.agent
+++ b/debian/ifplugd.udev.agent
@@ -19,18 +19,18 @@ DEBUG=yes export DEBUG
 [ -f $CFG ] || { mesg No $DAEMON_NAME configuration file ; exit 1 ; }
 . $CFG
 
-case $ACTION in
-add|register)
-	for IF in $HOTPLUG_INTERFACES ; do
-		if [ "$INTERFACE" = "$IF" -o "$IF" = "all" ] ; then
-			debug_mesg Invoking $DAEMON_NAME for $INTERFACE
-			exec /etc/init.d/$DAEMON_NAME start $INTERFACE&
-			break
-		fi
-	done
-	;;
-remove|unregister)
-	debug_mesg Stopping $DAEMON_NAME for $INTERFACE
-	exec /etc/init.d/$DAEMON_NAME stop $INTERFACE&
-	;;
-esac
+for IF in $HOTPLUG_INTERFACES ; do
+    if [ "$INTERFACE" = "$IF" -o "$IF" = "all" ] ; then
+        case $ACTION in
+        add|register)
+            debug_mesg Invoking $DAEMON_NAME for $INTERFACE
+            exec /etc/init.d/$DAEMON_NAME start $INTERFACE&
+            ;;
+        remove|unregister)
+            debug_mesg Stopping $DAEMON_NAME for $INTERFACE
+            exec /etc/init.d/$DAEMON_NAME stop $INTERFACE&
+            ;;
+        esac
+        break
+    fi
+done
diff --git a/debian/patches/00list b/debian/patches/00list
index 876c832..8265bd5 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,5 @@
 01_loff_t_dev_t_conflict
 02_manpage_paths_and_typos
 03_split_README_ChangeLog_FAQ
+04_up_down_beep_options
+05_396895_HOTPLUG_conf_man
diff --git a/debian/patches/04_up_down_beep_options.dpatch b/debian/patches/04_up_down_beep_options.dpatch
new file mode 100644
index 0000000..8ddcf88
--- /dev/null
+++ b/debian/patches/04_up_down_beep_options.dpatch
@@ -0,0 +1,180 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_up_down_beep_options.dpatch by Y Giridhar Appaji Nag <giridhar@appaji.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Implement --no-beep-up and --no-beep-down options
+
+@DPATCH@
+diff -urNad ifplugd-0.28~/man/ifplugd.8 ifplugd-0.28/man/ifplugd.8
+--- ifplugd-0.28~/man/ifplugd.8	2008-04-04 16:30:15.000000000 +0530
++++ ifplugd-0.28/man/ifplugd.8	2008-04-04 16:30:53.000000000 +0530
+@@ -22,7 +22,13 @@
+ Do not use syslog, use stdout instead (for debugging) (default: off). 
+ .TP
+ \fB\-b | \-\-no-beep\f1
+-Do not beep (off) 
++Do not beep (off), overrides \fB\-\-no-beep-up\f1 and \fB\-\-no-beep-down\f1.
++.TP
++\fB\-U | \-\-no-beep-up\f1
++Do not beep on interface up (off)
++.TP
++\fB\-D | \-\-no-beep-down\f1
++Do not beep on interface down (off)
+ .TP
+ \fB\-f | \-\-ignore-fail\f1
+ Ignore detection failure, retry instead. Failure is treated as "no link". (default: off) 
+diff -urNad ifplugd-0.28~/man/ifplugd.8.xml.in ifplugd-0.28/man/ifplugd.8.xml.in
+--- ifplugd-0.28~/man/ifplugd.8.xml.in	2008-04-04 16:30:15.000000000 +0530
++++ ifplugd-0.28/man/ifplugd.8.xml.in	2008-04-04 16:30:15.000000000 +0530
+@@ -73,7 +73,21 @@
+ 	  <option>
+ 		<p><opt>-b | --no-beep</opt></p>
+ 		<optdesc><p>
+-			Do not beep (off)
++			Do not beep (off), overrides <opt>--no-beep-up</opt> and <opt>--no-beep-down</opt>.
++		  </p></optdesc>
++	  </option>
++	  
++	  <option>
++		<p><opt>-U | --no-beep-up</opt></p>
++		<optdesc><p>
++			Do not beep on interface up (off)
++		  </p></optdesc>
++	  </option>
++	  
++	  <option>
++		<p><opt>-D | --no-beep-down</opt></p>
++		<optdesc><p>
++			Do not beep on interface down (off)
+ 		  </p></optdesc>
+ 	  </option>
+ 	  
+diff -urNad ifplugd-0.28~/src/ifplugd.c ifplugd-0.28/src/ifplugd.c
+--- ifplugd-0.28~/src/ifplugd.c	2008-04-04 16:28:48.000000000 +0530
++++ ifplugd-0.28/src/ifplugd.c	2008-04-04 16:30:15.000000000 +0530
+@@ -73,6 +73,8 @@
+ 
+ int daemonize = 1,
+     use_beep = 1,
++    beep_on_up = 1,
++    beep_on_down = 1,
+     no_startup_script = 0,
+     no_shutdown_script = 0,
+     wait_on_fork = 0,
+@@ -126,6 +128,18 @@
+     return;
+ }
+ 
++static void beep_up(int b) {
++	if(!beep_on_up)
++		return;
++	beep(b);
++}
++
++static void beep_down(int b) {
++	if(!beep_on_down)
++		return;
++	beep(b);
++}
++
+ const char *pid_file_proc() {
+     static char fn[PATH_MAX];
+     snprintf(fn, sizeof(fn), "%s/ifplugd.%s.pid", VARRUN, interface);
+@@ -237,13 +251,13 @@
+ 
+     if (!WIFEXITED(r) || WEXITSTATUS(r) != 0) {
+         if (status == IFSTATUS_UP)
+-            beep(2);
++            beep_up(2);
+         daemon_log(LOG_ERR, "Program execution failed, return value is %i.", WEXITSTATUS(r));
+ 
+         return ignore_retval ? 0 : -1;
+     } else {
+         if (status == IFSTATUS_UP)
+-            beep(0);
++            beep_up(0);
+ 
+         daemon_log(LOG_INFO, "Program executed successfully.");
+         return 0;
+@@ -440,7 +454,10 @@
+         goto finish;
+     
+     daemon_log(LOG_INFO, "Initialization complete, link beat %sdetected%s.", status == IFSTATUS_UP ? "" : "not ", use_ifmonitor ? (disabled ? ", interface disabled" : ", interface enabled") : "");
+-    beep(status == IFSTATUS_UP ? 0 : 1);
++    if(status == IFSTATUS_UP)
++        beep_up(0);
++    else
++        beep_down(1);
+ 
+     if ((!no_startup_script && status == IFSTATUS_UP) || initial_down)
+         if (action(status) < 0)
+@@ -513,7 +530,10 @@
+ 
+         if (status != s) {
+             daemon_log(LOG_INFO, "Link beat %s.", status == IFSTATUS_DOWN ? "lost" : "detected");
+-            beep(status == IFSTATUS_UP ? 0 : 1);
++            if(status == IFSTATUS_UP)
++                beep_up(0);
++            else
++                beep_down(1);
+             
+             if (t)
+                 t = 0;
+@@ -586,7 +606,7 @@
+         setenv(IFPLUGD_ENV_PREVIOUS, strstatus(status), 1);
+         setenv(IFPLUGD_ENV_CURRENT, strstatus(-1), 1);
+         action(IFSTATUS_DOWN);
+-        beep(1);
++        beep_down(1);
+     }
+     
+ finish:
+@@ -628,6 +648,8 @@
+            "   -n --no-daemon            Do not daemonize (for debugging) (%s)\n"
+            "   -s --no-syslog            Do not use syslog, use stderr instead (for debugging) (%s)\n"
+            "   -b --no-beep              Do not beep (%s)\n"
++           "   -U --no-beep-up           Do not beep on interface up (%s)\n"
++           "   -D --no-beep-down         Do not beep on interface down (%s)\n"
+            "   -f --ignore-fail          Ignore detection failure, retry instead (failure is treated as DOWN) (%s)\n"
+            "   -F --ignore-fail-positive Ignore detection failure, retry instead (failure is treated as UP) (%s)\n"
+            "   -i --iface=IFACE          Specify ethernet interface (%s)\n"
+@@ -656,6 +678,8 @@
+            !daemonize ? "on" : "off",
+            !use_syslog ? "on" : "off",
+            !use_beep ? "on" : "off",
++           !beep_on_up ? "on" : "off",
++           !beep_on_down ? "on" : "off",
+            failure_status == IFSTATUS_DOWN ? "on" : "off",
+            failure_status == IFSTATUS_UP ? "on" : "off",
+            interface,
+@@ -679,6 +703,8 @@
+         {"no-daemon",            no_argument, 0, 'n'},
+         {"no-syslog",            no_argument, 0, 's'},
+         {"no-beep",              no_argument, 0, 'b'},
++        {"no-beep-up",           no_argument, 0, 'U'},
++        {"no-beep-down",         no_argument, 0, 'D'},
+         {"ignore-fail",          no_argument, 0, 'f'},
+         {"ignore-fail-positive", no_argument, 0, 'F'},
+         {"ignore-retval",        no_argument, 0, 'I'},
+@@ -710,7 +736,7 @@
+     for (;;) {
+         int c;
+         
+-        if ((c = getopt_long(argc, argv, "asni:r:t:u:d:hkbfFvm:pqwx:cISRzlMW", long_options, &option_index)) < 0)
++        if ((c = getopt_long(argc, argv, "asni:r:t:u:d:hkbUDfFvm:pqwx:cISRzlMW", long_options, &option_index)) < 0)
+             break;
+ 
+         switch (c) {
+@@ -759,6 +785,12 @@
+             case 'b':
+                 use_beep = !use_beep;
+                 break;
++            case 'U':
++                beep_on_up = !beep_on_up;
++                break;
++            case 'D':
++                beep_on_down = !beep_on_down;
++                break;
+             case 'f':
+                 failure_status = IFSTATUS_DOWN;
+                 break;
diff --git a/debian/patches/05_396895_HOTPLUG_conf_man.dpatch b/debian/patches/05_396895_HOTPLUG_conf_man.dpatch
new file mode 100644
index 0000000..84f15d5
--- /dev/null
+++ b/debian/patches/05_396895_HOTPLUG_conf_man.dpatch
@@ -0,0 +1,44 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_396895_HOTPLUG_conf_man.dpatch by Y Giridhar Appaji Nag <giridhar@appaji.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Explain HOTPLUG_INTERFACES in the ifplugd.conf(5) manpage.
+
+@DPATCH@
+diff -urNad ifplugd-0.28~/man/ifplugd.conf.5 ifplugd-0.28/man/ifplugd.conf.5
+--- ifplugd-0.28~/man/ifplugd.conf.5	2008-04-05 08:52:20.000000000 +0530
++++ ifplugd-0.28/man/ifplugd.conf.5	2008-04-05 10:47:24.000000000 +0530
+@@ -11,6 +11,9 @@
+ \fBINTERFACES\f1
+ Specifies the ethernet interfaces to monitor. It has to contain a space seperated list of network interfaces names. Most users will probably use "eth0" here, however you may add additional interfaces for monitoring more than one device. A special value is supported as well: "auto" will enable a more or less working auto detection of available network devices. This won't make you happy when using network module auto loading, since it cannot detect currently unloaded network devices.
+ .TP
++\fBHOTPLUG_INTERFACES\f1
++Specifies the interfaces that can be hotplugged (like interfaces on PCMCIA, USB or WLAN adapters).  "all" can be used to make the udev script start an ifplugd process for any hotplugged interfaces.
++.TP
+ \fBARGS\f1
+ Additional command line arguments for ifplugd invocation. See \fBifplugd(8)\f1 for further information.
+ .TP
+diff -urNad ifplugd-0.28~/man/ifplugd.conf.5.xml.in ifplugd-0.28/man/ifplugd.conf.5.xml.in
+--- ifplugd-0.28~/man/ifplugd.conf.5.xml.in	2003-12-11 23:28:45.000000000 +0530
++++ ifplugd-0.28/man/ifplugd.conf.5.xml.in	2008-04-05 10:46:23.000000000 +0530
+@@ -51,12 +51,19 @@
+ 	  </option>
+ 
+ 	  <option>
++		<p><opt>HOTPLUG_INTERFACES</opt></p> <optdesc><p>Specifies the
++		interfaces that can be hotplugged (like interfaces on PCMCIA,
++		USB or WLAN adapters).  "all" can be used to make the udev
++		script start an ifplugd process for any hotplugged interfaces.
++		</p></optdesc>
++	  </option>
++
++	  <option>
+ 		<p><opt>ARGS</opt></p> <optdesc><p>Additional command line
+ 		arguments for ifplugd invocation. See <manref name="ifplugd"
+ 		section="8"/> for further information.</p></optdesc>
+ 	  </option>
+ 
+-
+ 	  <option>
+ 	       <p><opt>ARGS_</opt><arg>iface</arg></p>
+                   
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 0321afb..1de1cae 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ifplugd\n"
 "Report-Msgid-Bugs-To: ifplugd@packages.debian.org\n"
-"POT-Creation-Date: 2008-03-26 14:14+0530\n"
+"POT-Creation-Date: 2008-04-05 01:15+0530\n"
 "PO-Revision-Date: 2006-06-04 17:41+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -115,7 +115,7 @@ msgstr ""
 #. Description
 #: ../ifplugd.templates:3001
 msgid ""
-"-q Don't run script on daemon quit\n"
+" -q Don't run script on daemon quit\n"
 " -f Ignore detection failure and retry\n"
 " -u Specify delay for configuring interface\n"
 " -d Specify delay for deconfiguring interface\n"
@@ -127,10 +127,10 @@ msgstr ""
 #. Description
 #: ../ifplugd.templates:3001
 msgid ""
-"-a Do not enable interface automatically\n"
+" -a Do not enable interface automatically\n"
 " -s Use stderr instead of syslog for debugging\n"
-" -b Do not beep\n"
-" -t Specify poll time in seconds\n"
+" -b Do not beep (-U/-D Do not beep on interface up/down)\n"
+" -t Specify poll time in seconds (default: 1)\n"
 " -p Don't run script on daemon startup\n"
 " -l Run \"down\" script on startup if no cable is detected\n"
 " -W Wait until the daemon died when running daemon is killed\n"
diff --git a/debian/po/da.po b/debian/po/da.po
index 7c33cbf..2b1b714 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ifplugd debconf\n"
 "Report-Msgid-Bugs-To: ifplugd@packages.debian.org\n"
-"POT-Creation-Date: 2008-03-26 14:14+0530\n"
+"POT-Creation-Date: 2008-04-05 01:15+0530\n"
 "PO-Revision-Date: 2007-02-03 15:46+0100\n"
 "Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n"
 "Language-Team: Danish\n"
@@ -114,7 +114,7 @@ msgstr ""
 #. Description
 #: ../ifplugd.templates:3001
 msgid ""
-"-q Don't run script on daemon quit\n"
+" -q Don't run script on daemon quit\n"
 " -f Ignore detection failure and retry\n"
 " -u Specify delay for configuring interface\n"
 " -d Specify delay for deconfiguring interface\n"
@@ -126,10 +126,10 @@ msgstr ""
 #. Description
 #: ../ifplugd.templates:3001
 msgid ""
-"-a Do not enable interface automatically\n"
+" -a Do not enable interface automatically\n"
 " -s Use stderr instead of syslog for debugging\n"
-" -b Do not beep\n"
-" -t Specify poll time in seconds\n"
+" -b Do not beep (-U/-D Do not beep on interface up/down)\n"
+" -t Specify poll time in seconds (default: 1)\n"
 " -p Don't run script on daemon startup\n"
 " -l Run \"down\" script on startup if no cable is detected\n"
 " -W Wait until the daemon died when running daemon is killed\n"
diff --git a/debian/po/de.po b/debian/po/de.po
index 77a90a9..175d5df 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -1,4 +1,4 @@
-# translation of ifplugd_0.26-5_templates.po to German
+# translation of ifplugd_0.28-8_templates.po to German
 #
 #    Translators, if you are not familiar with the PO format, gettext
 #    documentation is worth reading, especially sections dedicated to
@@ -11,13 +11,13 @@
 #    Developers do not need to manually edit POT or PO files.
 # Jens Nachtigall <nachtigall@web.de>, 2005.
 # Holger Wansing <linux@wansing-online.de>, 2006, 2008.
-#
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: ifplugd 0.28-5\n"
+"Project-Id-Version: ifplugd 0.28-8\n"
 "Report-Msgid-Bugs-To: ifplugd@packages.debian.org\n"
-"POT-Creation-Date: 2008-03-26 14:14+0530\n"
-"PO-Revision-Date: 2008-03-16 13:32+0100\n"
+"POT-Creation-Date: 2008-04-04 16:43+0530\n"
+"PO-Revision-Date: 2008-04-04 21:38+0100\n"
 "Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -115,56 +115,45 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../ifplugd.templates:3001
-#, fuzzy
-#| msgid ""
-#| "-q Don't run script on daemon quit, -f Ignore detection failure and "
-#| "retry, -u Specify delay for configuring interface, -d Specify delay for "
-#| "deconfiguring interface, -w Wait until daemon fork finished, -I Don't "
-#| "exit on nonzero return value of program executed,"
 msgid ""
-"-q Don't run script on daemon quit\n"
+" -q Don't run script on daemon quit\n"
 " -f Ignore detection failure and retry\n"
 " -u Specify delay for configuring interface\n"
 " -d Specify delay for deconfiguring interface\n"
 " -w Wait until daemon fork finished\n"
 " -I Don't exit on nonzero return value of program executed"
 msgstr ""
-"-q  Kein Skript ausführen bei Beenden des Daemons\n"
-"-f  Fehler bei der Erkennung ignorieren und erneut versuchen\n"
-"-u  Verzögerung festlegen zur Konfiguration der Schnittstellen\n"
-"-d  Verzögerung festlegen zur Dekonfiguration der Schnittstellen\n"
-"-w  Warten auf den Abschluß des Daemon-Forks (Aufspaltung)\n"
-"-I  Nicht beenden, wenn Rückgabewerte von ausgeführten Programmen\n"
-"    nicht Null sind"
+" -q  Kein Skript ausführen bei Beenden des Daemons\n"
+" -f  Fehler bei der Erkennung ignorieren und erneut versuchen\n"
+" -u  Verzögerung festlegen zur Konfiguration der Schnittstellen\n"
+" -d  Verzögerung festlegen zur Dekonfiguration der Schnittstellen\n"
+" -w  Warten auf den Abschluß des Daemon-Forks (Aufspaltung)\n"
+" -I  Nicht beenden, wenn Rückgabewerte von ausgeführten Programmen\n"
+"     nicht Null sind"
 
 #. Type: string
 #. Description
 #: ../ifplugd.templates:3001
-#, fuzzy
-#| msgid ""
-#| "-a Do not enable interface automatically,  -s Use stderr instead of "
-#| "syslog for debugging, -b Do not beep, -t Specify poll time in seconds, -p "
-#| "Don't run script on daemon startup, -l Run \"down\" script on startup if "
-#| "no cable is detected, -W Wait until the daemon died when running daemon "
-#| "is killed, -M Use interface monitoring,"
 msgid ""
-"-a Do not enable interface automatically\n"
+" -a Do not enable interface automatically\n"
 " -s Use stderr instead of syslog for debugging\n"
-" -b Do not beep\n"
-" -t Specify poll time in seconds\n"
+" -b Do not beep (-U/-D Do not beep on interface up/down)\n"
+" -t Specify poll time in seconds (default: 1)\n"
 " -p Don't run script on daemon startup\n"
 " -l Run \"down\" script on startup if no cable is detected\n"
 " -W Wait until the daemon died when running daemon is killed\n"
 " -M Use interface monitoring"
 msgstr ""
-"-a  Schnittstelle nicht automatisch aktivieren\n"
-"-s  Nutze stderr statt syslog für Fehlersuche\n"
-"-b  Keine Systemklänge\n"
-"-t  Abfragetakt in Sekunden festlegen\n"
-"-p  Kein Skript ausführen bei Starten des Daemons\n"
-"-l  »down«-Skript bei Start ausführen, wenn kein Kabel eingesteckt ist\n"
-"-W  Warten bis der Daemon beendet ist, wenn laufender Daemon beendet wird\n"
-"-M  Benutze Schnittstellenüberwachung"
+" -a  Schnittstelle nicht automatisch aktivieren\n"
+" -s  Nutze stderr statt syslog für Fehlersuche\n"
+" -b  Keine Systemklänge (-U/-D: Kein Systemklang beim Aktivieren (Up)/\n"
+"     Deaktivieren (Down) der Schnittstelle\n"
+" -t  Abfragetakt in Sekunden festlegen (Vorgabe: 1)\n"
+" -p  Kein Skript ausführen bei Starten des Daemons\n"
+" -l  down-Skript beim Start ausführen, wenn kein Kabel eingesteckt ist\n"
+" -W  Bei Beendigung des laufenden Daemon-Prozesses warten, bis der\n"
+"     Prozess wirklich beendet ist\n"
+" -M  Benutze Schnittstellenüberwachung"
 
 #. Type: select
 #. Choices
diff --git a/debian/po/es.po b/debian/po/es.po
index 94cc896..e5ef040 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -32,8 +32,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ifplugd\n"
 "Report-Msgid-Bugs-To: ifplugd@packages.debian.org\n"
-"POT-Creation-Date: 2008-03-26 14:14+0530\n"
-"PO-Revision-Date: 2008-03-30 23:55+0200\n"
+"POT-Creation-Date: 2008-04-04 16:43+0530\n"
+"PO-Revision-Date: 2008-04-06 00:45+0200\n"
 "Last-Translator: Javier Fernandez-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -127,52 +127,42 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../ifplugd.templates:3001
-#, fuzzy
-#| msgid ""
-#| "-q Don't run script on daemon quit, -f Ignore detection failure and "
-#| "retry, -u Specify delay for configuring interface, -d Specify delay for "
-#| "deconfiguring interface, -w Wait until daemon fork finished, -I Don't "
-#| "exit on nonzero return value of program executed,"
 msgid ""
-"-q Don't run script on daemon quit\n"
+" -q Don't run script on daemon quit\n"
 " -f Ignore detection failure and retry\n"
 " -u Specify delay for configuring interface\n"
 " -d Specify delay for deconfiguring interface\n"
 " -w Wait until daemon fork finished\n"
 " -I Don't exit on nonzero return value of program executed"
 msgstr ""
-"-q No ejecutar el programa al terminar el servicio, -f Ignorar el fallo de "
-"detección y reintentar, -u Indicar el tiempo de espera para configurar una "
-"interfaz, -d Especifiar el tiempo de espera para desconfigurar una interfaz, "
-"-w Esperar a que se lance el servicio en segundo plano, -I No salir al "
-"obtener un valor de retorno que no sea cero al ejecutar un programa,"
+" -q No ejecutar el programa al terminar el servicio\n"
+" -f Ignorar el fallo de detección y reintentar\n"
+" -u Indicar el tiempo de espera para configurar una interfaz\n"
+" -d Especifiar el tiempo de espera para desconfigurar una interfaz\n"
+" -w Esperar a que se lance el servicio en segundo plano\n"
+" -I No salir al obtener un valor de retorno que no sea cero al ejecutar un programa"
 
 #. Type: string
 #. Description
 #: ../ifplugd.templates:3001
-#, fuzzy
-#| msgid ""
-#| "-a Do not enable interface automatically,  -s Use stderr instead of "
-#| "syslog for debugging, -b Do not beep, -t Specify poll time in seconds, -p "
-#| "Don't run script on daemon startup, -l Run \"down\" script on startup if "
-#| "no cable is detected, -W Wait until the daemon died when running daemon "
-#| "is killed, -M Use interface monitoring,"
 msgid ""
-"-a Do not enable interface automatically\n"
+" -a Do not enable interface automatically\n"
 " -s Use stderr instead of syslog for debugging\n"
-" -b Do not beep\n"
-" -t Specify poll time in seconds\n"
+" -b Do not beep (-U/-D Do not beep on interface up/down)\n"
+" -t Specify poll time in seconds (default: 1)\n"
 " -p Don't run script on daemon startup\n"
 " -l Run \"down\" script on startup if no cable is detected\n"
 " -W Wait until the daemon died when running daemon is killed\n"
 " -M Use interface monitoring"
 msgstr ""
-"-a No activar la interfaz automáticamente, -s Utilizar la salida de error "
-"estándar en lugar de syslog para depurar, -b No emitir sonido, -t "
-"Especificar el tiempo de sondeo en segundos, -p No ejecutar el programa al "
-"arrancar el servicio, -l Ejecutar programa «down» al arrancar si no se "
-"detecta un cable, -W Esperar a que el servicio se pare al interrumpir al "
-"servicio en ejecución, -M Utilizar monitorización de interfaz,"
+" -a No activar la interfaz automáticamente\n"
+" -s Utilizar la salida de error estándar en lugar de syslog para depurar\n"
+" -b No emitir sonido (-U/-D Para no emitirlo al bajar/subir una interfaz)\n"
+" -t Especificar el tiempo de sondeo en segundos (por omisión: 1)\n"
+" -p No ejecutar el programa al arrancar el servicio\n"
+" -l Ejecutar programa «down» al arrancar si no se detecta un cable\n"
+" -W Esperar a que el servicio se pare al interrumpir al servicio en ejecución\n"
+" -M Utilizar monitorización de interfaz"
 
 #. Type: select
 #. Choices
diff --git a/debian/po/eu.po b/debian/po/eu.po
index 2874acf..da8f877 100644
--- a/debian/po/eu.po
+++ b/debian/po/eu.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ifplugd-eu\n"
 "Report-Msgid-Bugs-To: ifplugd@packages.debian.org\n"
-"POT-Creation-Date: 2008-03-26 14:14+0530\n"
+"POT-Creation-Date: 2008-04-05 01:15+0530\n"
 "PO-Revision-Date: 2007-12-26 12:09+0100\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Euskara <Librezale@librezale.org>\n"
@@ -118,7 +118,7 @@ msgstr ""
 #. Description
 #: ../ifplugd.templates:3001
 msgid ""
-"-q Don't run script on daemon quit\n"
+" -q Don't run script on daemon quit\n"
 " -f Ignore detection failure and retry\n"
 " -u Specify delay for configuring interface\n"
 " -d Specify delay for deconfiguring interface\n"
@@ -130,10 +130,10 @@ msgstr ""
 #. Description
 #: ../ifplugd.templates:3001
 msgid ""
-"-a Do not enable interface automatically\n"
+" -a Do not enable interface automatically\n"
 " -s Use stderr instead of syslog for debugging\n"
-" -b Do not beep\n"
-" -t Specify poll time in seconds\n"
+" -b Do not beep (-U/-D Do not beep on interface up/down)\n"
+" -t Specify poll time in seconds (default: 1)\n"
 " -p Don't run script on daemon startup\n"
 " -l Run \"down\" script on startup if no cable is detected\n"
 " -W Wait until the daemon died when running daemon is killed\n"
diff --git a/debian/po/fi.po b/debian/po/fi.po
index 5440a1b..b4f6e52 100644
--- a/debian/po/fi.po
+++ b/debian/po/fi.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ifplugd\n"
 "Report-Msgid-Bugs-To: ifplugd@packages.debian.org\n"
-"POT-Creation-Date: 2008-03-26 14:14+0530\n"
-"PO-Revision-Date: 2008-01-11 23:50+0200\n"
+"POT-Creation-Date: 2008-04-05 01:15+0530\n"
+"PO-Revision-Date: 2008-04-05 00:36+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"
@@ -85,41 +85,49 @@ msgstr "Ifplugdin argumentit:"
 #. Type: string
 #. Description
 #: ../ifplugd.templates:3001
-#, fuzzy
-#| msgid ""
-#| "You can give arguments to the ifplug daemon here. See the man page for a "
-#| "description or call ifplugd -h."
 msgid ""
 "You can give arguments to the ifplug daemon here.  Relevant options are:"
-msgstr ""
-"Tässä voit antaa ifplug-taustaohjelmalle argumentteja. Katso kuvaus man-"
-"ohjesivulta tai aja komento ”ifplugd -h”."
+msgstr "Tässä voit antaa ifplug-taustaohjelmalle valitsimia. Olennaisia ovat:"
 
 #. Type: string
 #. Description
 #: ../ifplugd.templates:3001
 msgid ""
-"-q Don't run script on daemon quit\n"
+" -q Don't run script on daemon quit\n"
 " -f Ignore detection failure and retry\n"
 " -u Specify delay for configuring interface\n"
 " -d Specify delay for deconfiguring interface\n"
 " -w Wait until daemon fork finished\n"
 " -I Don't exit on nonzero return value of program executed"
 msgstr ""
+" -q Älä aja komentosarjaa lopetettaessa taustaohjelma\n"
+" -f Jätä huomiotta epäonnistunut etsintä ja yritä uudelleen\n"
+" -u Määritä liitännän käynnistyksen viive\n"
+" -d Määritä liitännän sammuttamisen viive\n"
+" -w Odota, että taustaohjelman haarautuminen on valmis\n"
+" -I Älä lopeta, jos ajetun ohjelman palautusarvo ei ole nolla"
 
 #. Type: string
 #. Description
 #: ../ifplugd.templates:3001
 msgid ""
-"-a Do not enable interface automatically\n"
+" -a Do not enable interface automatically\n"
 " -s Use stderr instead of syslog for debugging\n"
-" -b Do not beep\n"
-" -t Specify poll time in seconds\n"
+" -b Do not beep (-U/-D Do not beep on interface up/down)\n"
+" -t Specify poll time in seconds (default: 1)\n"
 " -p Don't run script on daemon startup\n"
 " -l Run \"down\" script on startup if no cable is detected\n"
 " -W Wait until the daemon died when running daemon is killed\n"
 " -M Use interface monitoring"
 msgstr ""
+" -a Älä käynnistä liitäntää automaattisesti\n"
+" -s Käytä oletusvirhetulostetta syslogin sijaan virheidenjäljitystilassa\n"
+" -b Älä piippaa (-U/-D älä piippaa muutettassa liitännän tilaa)\n"
+" -t Määritä tarkistusväli sekunneissa (oletus: 1)\n"
+" -p Älä aja komentosarjaa käynnistettäessä komentosarja\n"
+" -l Aja sammutuskomentosarja käynnistettäessä, jos kaapelia ei löydy\n"
+" -W Odota kunnes taustaohjelma kuolee, kun se tapetaan\n"
+" -M Käytä liitäntöjenseurantaa"
 
 #. Type: select
 #. Choices
diff --git a/debian/po/fr.po b/debian/po/fr.po
index a3b1293..f884b42 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ifplugd\n"
 "Report-Msgid-Bugs-To: ifplugd@packages.debian.org\n"
-"POT-Creation-Date: 2008-03-26 14:14+0530\n"
+"POT-Creation-Date: 2008-04-05 01:15+0530\n"
 "PO-Revision-Date: 2008-03-16 11:26+0100\n"
 "Last-Translator: Jean-Luc Coulon (f5ibh) <jean-luc.coulon@wanadoo.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -113,7 +113,7 @@ msgstr ""
 #| "deconfiguring interface, -w Wait until daemon fork finished, -I Don't "
 #| "exit on nonzero return value of program executed,"
 msgid ""
-"-q Don't run script on daemon quit\n"
+" -q Don't run script on daemon quit\n"
 " -f Ignore detection failure and retry\n"
 " -u Specify delay for configuring interface\n"
 " -d Specify delay for deconfiguring interface\n"
@@ -137,10 +137,10 @@ msgstr ""
 #| "no cable is detected, -W Wait until the daemon died when running daemon "
 #| "is killed, -M Use interface monitoring,"
 msgid ""
-"-a Do not enable interface automatically\n"
+" -a Do not enable interface automatically\n"
 " -s Use stderr instead of syslog for debugging\n"
-" -b Do not beep\n"
-" -t Specify poll time in seconds\n"
+" -b Do not beep (-U/-D Do not beep on interface up/down)\n"
+" -t Specify poll time in seconds (default: 1)\n"
 " -p Don't run script on daemon startup\n"
 " -l Run \"down\" script on startup if no cable is detected\n"
 " -W Wait until the daemon died when running daemon is killed\n"
diff --git a/debian/po/gl.po b/debian/po/gl.po
index 5678067..f107ffd 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -1,13 +1,13 @@
 # Galician translation of ifplugd's debconf templates
 # This file is distributed under the same license as the ifplugd package.
-# Jacobo Tarrio <jtarrio@debian.org>, 2007.
+# Jacobo Tarrio <jtarrio@debian.org>, 2007, 2008.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: ifplugd\n"
 "Report-Msgid-Bugs-To: ifplugd@packages.debian.org\n"
-"POT-Creation-Date: 2008-03-26 14:14+0530\n"
-"PO-Revision-Date: 2007-02-24 20:07+0100\n"
+"POT-Creation-Date: 2008-04-05 01:15+0530\n"
+"PO-Revision-Date: 2008-04-05 03:53+0100\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
 "MIME-Version: 1.0\n"
@@ -93,41 +93,50 @@ msgstr "Argumentos para ifplugd:"
 #. Type: string
 #. Description
 #: ../ifplugd.templates:3001
-#, fuzzy
-#| msgid ""
-#| "You can give arguments to the ifplug daemon here. See the man page for a "
-#| "description or call ifplugd -h."
 msgid ""
 "You can give arguments to the ifplug daemon here.  Relevant options are:"
 msgstr ""
-"Pode fornecer aquí argumentos ao servizo ifplugd. Consulte a páxina man para "
-"unha descrición ou execute ifplugd -h."
+"Pode fornecer aquí argumentos ao servizo ifplugd. As opcións relevantes son:"
 
 #. Type: string
 #. Description
 #: ../ifplugd.templates:3001
 msgid ""
-"-q Don't run script on daemon quit\n"
+" -q Don't run script on daemon quit\n"
 " -f Ignore detection failure and retry\n"
 " -u Specify delay for configuring interface\n"
 " -d Specify delay for deconfiguring interface\n"
 " -w Wait until daemon fork finished\n"
 " -I Don't exit on nonzero return value of program executed"
 msgstr ""
+" -q Non executar o script ao saír do servizo\n"
+" -f Ignorar o fallo de detección e volve tentalo\n"
+" -u Especificar o retardo para a configuración da interface\n"
+" -d Especificar o retardo para a desconfiguración da interface\n"
+" -w Esperar ata que remate a subdivisión do servizo\n"
+" -I Non saír se o programa executado devolve un valor distinto de cero"
 
 #. Type: string
 #. Description
 #: ../ifplugd.templates:3001
 msgid ""
-"-a Do not enable interface automatically\n"
+" -a Do not enable interface automatically\n"
 " -s Use stderr instead of syslog for debugging\n"
-" -b Do not beep\n"
-" -t Specify poll time in seconds\n"
+" -b Do not beep (-U/-D Do not beep on interface up/down)\n"
+" -t Specify poll time in seconds (default: 1)\n"
 " -p Don't run script on daemon startup\n"
 " -l Run \"down\" script on startup if no cable is detected\n"
 " -W Wait until the daemon died when running daemon is killed\n"
 " -M Use interface monitoring"
 msgstr ""
+" -a Non activar a interface automaticamente\n"
+" -s Empregar a saída estándar no canto do rexistro do sistema para depurar\n"
+" -b Non producir pitidos (-U/-D non pitar ao erguer/baixar unha interface)\n"
+" -t Especificar o periodo entre consultas, en segundos (1 por defecto)\n"
+" -p Non executar o script ao iniciar o servizo\n"
+" -l Executar o script \"down\" no inicio se non se detecta un cable\n"
+" -W Esperar a que o servizo morra ao matar o servizo en execución\n"
+" -M Empregar monitorización de interfaces"
 
 #. Type: select
 #. Choices
diff --git a/debian/po/it.po b/debian/po/it.po
index dfabde5..40fb5c6 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ifplugd 0.28 debconf templates\n"
 "Report-Msgid-Bugs-To: ifplugd@packages.debian.org\n"
-"POT-Creation-Date: 2008-03-26 14:14+0530\n"
+"POT-Creation-Date: 2008-04-05 01:15+0530\n"
 "PO-Revision-Date: 2007-12-29 13:27+0100\n"
 "Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -108,7 +108,7 @@ msgstr ""
 #. Description
 #: ../ifplugd.templates:3001
 msgid ""
-"-q Don't run script on daemon quit\n"
+" -q Don't run script on daemon quit\n"
 " -f Ignore detection failure and retry\n"
 " -u Specify delay for configuring interface\n"
 " -d Specify delay for deconfiguring interface\n"
@@ -120,10 +120,10 @@ msgstr ""
 #. Description
 #: ../ifplugd.templates:3001
 msgid ""
-"-a Do not enable interface automatically\n"
+" -a Do not enable interface automatically\n"
 " -s Use stderr instead of syslog for debugging\n"
-" -b Do not beep\n"
-" -t Specify poll time in seconds\n"
+" -b Do not beep (-U/-D Do not beep on interface up/down)\n"
+" -t Specify poll time in seconds (default: 1)\n"
 " -p Don't run script on daemon startup\n"
 " -l Run \"down\" script on startup if no cable is detected\n"
 " -W Wait until the daemon died when running daemon is killed\n"
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 9b094bf..bac94a8 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ifplugd 0.28-2.3\n"
 "Report-Msgid-Bugs-To: ifplugd@packages.debian.org\n"
-"POT-Creation-Date: 2008-03-26 14:14+0530\n"
+"POT-Creation-Date: 2008-04-05 01:15+0530\n"
 "PO-Revision-Date: 2007-03-04 13:00+0900\n"
 "Last-Translator:  TANAKA, Atushi <atanaka@hotcake.halfmoon.jp>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -97,41 +97,51 @@ msgstr "ifplugd への引数:"
 #. Type: string
 #. Description
 #: ../ifplugd.templates:3001
-#, fuzzy
-#| msgid ""
-#| "You can give arguments to the ifplug daemon here. See the man page for a "
-#| "description or call ifplugd -h."
 msgid ""
 "You can give arguments to the ifplug daemon here.  Relevant options are:"
 msgstr ""
-"ここで ifplugd デーモンへの引数を与えることができます。詳細は man を見るか、"
-"ifplugd -h で調べてください。"
+"ここで ifplug デーモンへの引数を与えることができます。関係のあるオプションは"
+"以下です:"
 
 #. Type: string
 #. Description
 #: ../ifplugd.templates:3001
 msgid ""
-"-q Don't run script on daemon quit\n"
+" -q Don't run script on daemon quit\n"
 " -f Ignore detection failure and retry\n"
 " -u Specify delay for configuring interface\n"
 " -d Specify delay for deconfiguring interface\n"
 " -w Wait until daemon fork finished\n"
 " -I Don't exit on nonzero return value of program executed"
 msgstr ""
+" -q デーモン終了時にスクリプトを走らせない\n"
+" -f 検出失敗は無視し再試行させる\n"
+" -u インターフェースの設定の遅れを指定する\n"
+" -d インターフェースの設定解除の遅れを指定する\n"
+" -w デーモンがフォークを終えるまで待つ\n"
+" -I プログラム実行の帰り値が非零でも終了しない"
 
 #. Type: string
 #. Description
 #: ../ifplugd.templates:3001
 msgid ""
-"-a Do not enable interface automatically\n"
+" -a Do not enable interface automatically\n"
 " -s Use stderr instead of syslog for debugging\n"
-" -b Do not beep\n"
-" -t Specify poll time in seconds\n"
+" -b Do not beep (-U/-D Do not beep on interface up/down)\n"
+" -t Specify poll time in seconds (default: 1)\n"
 " -p Don't run script on daemon startup\n"
 " -l Run \"down\" script on startup if no cable is detected\n"
 " -W Wait until the daemon died when running daemon is killed\n"
 " -M Use interface monitoring"
 msgstr ""
+" -a 自動的にインターフェースを作動させない\n"
+" -s デバッグのため標準エラー出力の代わりに syslog を使う\n"
+" -b ビープさせない (-U/-D インターフェースの起動/切断でビープさせない)\n"
+" -t ポーリングの時間を秒で指定する (デフォルト: 1)\n"
+" -p デーモンの起動時にスクリプトを走らせない\n"
+" -l 起動時にケーブルを検知しない場合に \"down\" スクリプトを走らせる\n"
+" -W 稼働中のデーモンが kill された時にデーモンが亡くなるまで待つ\n"
+" -M インターフェースの監視を利用する"
 
 #. Type: select
 #. Choices
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 1842cb6..5075468 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ifplugd\n"
 "Report-Msgid-Bugs-To: ifplugd@packages.debian.org\n"
-"POT-Creation-Date: 2008-03-26 14:14+0530\n"
+"POT-Creation-Date: 2008-04-05 01:15+0530\n"
 "PO-Revision-Date: 2008-01-02 21:59+0100\n"
 "Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -112,7 +112,7 @@ msgstr ""
 #. Description
 #: ../ifplugd.templates:3001
 msgid ""
-"-q Don't run script on daemon quit\n"
+" -q Don't run script on daemon quit\n"
 " -f Ignore detection failure and retry\n"
 " -u Specify delay for configuring interface\n"
 " -d Specify delay for deconfiguring interface\n"
@@ -124,10 +124,10 @@ msgstr ""
 #. Description
 #: ../ifplugd.templates:3001
 msgid ""
-"-a Do not enable interface automatically\n"
+" -a Do not enable interface automatically\n"
 " -s Use stderr instead of syslog for debugging\n"
-" -b Do not beep\n"
-" -t Specify poll time in seconds\n"
+" -b Do not beep (-U/-D Do not beep on interface up/down)\n"
+" -t Specify poll time in seconds (default: 1)\n"
 " -p Don't run script on daemon startup\n"
 " -l Run \"down\" script on startup if no cable is detected\n"
 " -W Wait until the daemon died when running daemon is killed\n"
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 7d2eeb1..06ccbe0 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -1,13 +1,13 @@
 # Portuguese translation for ifplugd's debconf messages
-# Rui Branco <ruipb@debianpt.org>, 2006.
-# 2006-12-02 - Rui Branco - Initial translation
+# Rui Branco <ruipb@debianpt.org>, 2008.
+#
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ifplugd\n"
+"Project-Id-Version: ifplugd 0.28-8\n"
 "Report-Msgid-Bugs-To: ifplugd@packages.debian.org\n"
-"POT-Creation-Date: 2008-03-26 14:14+0530\n"
-"PO-Revision-Date: 2006-12-02 09:13+0000\n"
+"POT-Creation-Date: 2008-04-05 01:15+0530\n"
+"PO-Revision-Date: 2008-04-05 12:39+0100\n"
 "Last-Translator: Rui Branco <ruipb@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
 "MIME-Version: 1.0\n"
@@ -93,41 +93,52 @@ msgstr "Argumentos para o ifplugd:"
 #. Type: string
 #. Description
 #: ../ifplugd.templates:3001
-#, fuzzy
-#| msgid ""
-#| "You can give arguments to the ifplug daemon here. See the man page for a "
-#| "description or call ifplugd -h."
 msgid ""
 "You can give arguments to the ifplug daemon here.  Relevant options are:"
 msgstr ""
-"Pode dar argumentos aqui para o ifplugd 'daemon'. Veja a página man para uma "
-"descrição ou faça ifplugd -h."
+"Pode dar aqui argumentos para o ifplugd 'daemon'.  Opções relevantes são:"
 
 #. Type: string
 #. Description
 #: ../ifplugd.templates:3001
 msgid ""
-"-q Don't run script on daemon quit\n"
+" -q Don't run script on daemon quit\n"
 " -f Ignore detection failure and retry\n"
 " -u Specify delay for configuring interface\n"
 " -d Specify delay for deconfiguring interface\n"
 " -w Wait until daemon fork finished\n"
 " -I Don't exit on nonzero return value of program executed"
 msgstr ""
+" -q Não correr 'script' como 'daemon' abortar\n"
+" -f Ignorar detecção de erros e voltar a tentar\n"
+" -u Especificar tempo de espera para configurar a interface\n"
+" -d Especificar tempo de espera para apagar configuração da interface\n"
+" -w Esperar até que o fork 'daemon' termine\n"
+" -I Não sair em caso de retorno de valor não-zero do programa executado"
 
 #. Type: string
 #. Description
 #: ../ifplugd.templates:3001
 msgid ""
-"-a Do not enable interface automatically\n"
+" -a Do not enable interface automatically\n"
 " -s Use stderr instead of syslog for debugging\n"
-" -b Do not beep\n"
-" -t Specify poll time in seconds\n"
+" -b Do not beep (-U/-D Do not beep on interface up/down)\n"
+" -t Specify poll time in seconds (default: 1)\n"
 " -p Don't run script on daemon startup\n"
 " -l Run \"down\" script on startup if no cable is detected\n"
 " -W Wait until the daemon died when running daemon is killed\n"
 " -M Use interface monitoring"
 msgstr ""
+" -a Não activar a interface automaticamente\n"
+" -s Utilizar o stderr em vez do syslog para 'debugging'\n"
+" -b Não produzir som (beep) (-U/-D Não produzir som no caso de interface up/"
+"down)\n"
+" -t Especificar o tempo de 'poll' em segundos (por omissão: 1)\n"
+" -p Não correr o 'script' no arranque do 'daemon'\n"
+" -l Correr o 'script' \"down\" durante o arranque se o cabo não for "
+"detectado\n"
+" -W esperar até que o 'daemon' termine quando o 'daemon' é terminado\n"
+" -M Utilizar a monitorização da interface"
 
 #. Type: select
 #. Choices
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 5db9af3..f06a8e5 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ifplugd 0.26\n"
 "Report-Msgid-Bugs-To: ifplugd@packages.debian.org\n"
-"POT-Creation-Date: 2008-03-26 14:14+0530\n"
+"POT-Creation-Date: 2008-04-05 01:15+0530\n"
 "PO-Revision-Date: 2005-03-13 22:13-0300\n"
 "Last-Translator: Felipe Augusto van de Wiel (faw) <felipe@cathedrallabs."
 "org>\n"
@@ -116,7 +116,7 @@ msgstr ""
 #. Description
 #: ../ifplugd.templates:3001
 msgid ""
-"-q Don't run script on daemon quit\n"
+" -q Don't run script on daemon quit\n"
 " -f Ignore detection failure and retry\n"
 " -u Specify delay for configuring interface\n"
 " -d Specify delay for deconfiguring interface\n"
@@ -128,10 +128,10 @@ msgstr ""
 #. Description
 #: ../ifplugd.templates:3001
 msgid ""
-"-a Do not enable interface automatically\n"
+" -a Do not enable interface automatically\n"
 " -s Use stderr instead of syslog for debugging\n"
-" -b Do not beep\n"
-" -t Specify poll time in seconds\n"
+" -b Do not beep (-U/-D Do not beep on interface up/down)\n"
+" -t Specify poll time in seconds (default: 1)\n"
 " -p Don't run script on daemon startup\n"
 " -l Run \"down\" script on startup if no cable is detected\n"
 " -W Wait until the daemon died when running daemon is killed\n"
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 45ad0f3..b3e762b 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ifplugd 0.28-5\n"
 "Report-Msgid-Bugs-To: ifplugd@packages.debian.org\n"
-"POT-Creation-Date: 2008-03-26 14:14+0530\n"
+"POT-Creation-Date: 2008-04-05 01:15+0530\n"
 "PO-Revision-Date: 2008-03-16 14:33+0300\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -114,7 +114,7 @@ msgstr "Вы можете указать параметры для демона
 #| "deconfiguring interface, -w Wait until daemon fork finished, -I Don't "
 #| "exit on nonzero return value of program executed,"
 msgid ""
-"-q Don't run script on daemon quit\n"
+" -q Don't run script on daemon quit\n"
 " -f Ignore detection failure and retry\n"
 " -u Specify delay for configuring interface\n"
 " -d Specify delay for deconfiguring interface\n"
@@ -138,10 +138,10 @@ msgstr ""
 #| "no cable is detected, -W Wait until the daemon died when running daemon "
 #| "is killed, -M Use interface monitoring,"
 msgid ""
-"-a Do not enable interface automatically\n"
+" -a Do not enable interface automatically\n"
 " -s Use stderr instead of syslog for debugging\n"
-" -b Do not beep\n"
-" -t Specify poll time in seconds\n"
+" -b Do not beep (-U/-D Do not beep on interface up/down)\n"
+" -t Specify poll time in seconds (default: 1)\n"
 " -p Don't run script on daemon startup\n"
 " -l Run \"down\" script on startup if no cable is detected\n"
 " -W Wait until the daemon died when running daemon is killed\n"
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 237ac5c..1f575b9 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ifplugd 0.26-2\n"
 "Report-Msgid-Bugs-To: ifplugd@packages.debian.org\n"
-"POT-Creation-Date: 2008-03-26 14:14+0530\n"
+"POT-Creation-Date: 2008-04-05 01:15+0530\n"
 "PO-Revision-Date: 2006-12-01 22:23+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -117,7 +117,7 @@ msgstr ""
 #. Description
 #: ../ifplugd.templates:3001
 msgid ""
-"-q Don't run script on daemon quit\n"
+" -q Don't run script on daemon quit\n"
 " -f Ignore detection failure and retry\n"
 " -u Specify delay for configuring interface\n"
 " -d Specify delay for deconfiguring interface\n"
@@ -129,10 +129,10 @@ msgstr ""
 #. Description
 #: ../ifplugd.templates:3001
 msgid ""
-"-a Do not enable interface automatically\n"
+" -a Do not enable interface automatically\n"
 " -s Use stderr instead of syslog for debugging\n"
-" -b Do not beep\n"
-" -t Specify poll time in seconds\n"
+" -b Do not beep (-U/-D Do not beep on interface up/down)\n"
+" -t Specify poll time in seconds (default: 1)\n"
 " -p Don't run script on daemon startup\n"
 " -l Run \"down\" script on startup if no cable is detected\n"
 " -W Wait until the daemon died when running daemon is killed\n"
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 4811d0b..21d0211 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: ifplugd@packages.debian.org\n"
-"POT-Creation-Date: 2008-03-26 14:14+0530\n"
+"POT-Creation-Date: 2008-04-05 01:15+0530\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"
@@ -87,7 +87,7 @@ msgstr ""
 #. Description
 #: ../ifplugd.templates:3001
 msgid ""
-"-q Don't run script on daemon quit\n"
+" -q Don't run script on daemon quit\n"
 " -f Ignore detection failure and retry\n"
 " -u Specify delay for configuring interface\n"
 " -d Specify delay for deconfiguring interface\n"
@@ -99,10 +99,10 @@ msgstr ""
 #. Description
 #: ../ifplugd.templates:3001
 msgid ""
-"-a Do not enable interface automatically\n"
+" -a Do not enable interface automatically\n"
 " -s Use stderr instead of syslog for debugging\n"
-" -b Do not beep\n"
-" -t Specify poll time in seconds\n"
+" -b Do not beep (-U/-D Do not beep on interface up/down)\n"
+" -t Specify poll time in seconds (default: 1)\n"
 " -p Don't run script on daemon startup\n"
 " -l Run \"down\" script on startup if no cable is detected\n"
 " -W Wait until the daemon died when running daemon is killed\n"
diff --git a/debian/po/vi.po b/debian/po/vi.po
index b601770..f139a4c 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ifplugd 0.26-2\n"
 "Report-Msgid-Bugs-To: ifplugd@packages.debian.org\n"
-"POT-Creation-Date: 2008-03-26 14:14+0530\n"
+"POT-Creation-Date: 2008-04-05 01:15+0530\n"
 "PO-Revision-Date: 2006-12-03 18:21+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -110,7 +110,7 @@ msgstr ""
 #. Description
 #: ../ifplugd.templates:3001
 msgid ""
-"-q Don't run script on daemon quit\n"
+" -q Don't run script on daemon quit\n"
 " -f Ignore detection failure and retry\n"
 " -u Specify delay for configuring interface\n"
 " -d Specify delay for deconfiguring interface\n"
@@ -122,10 +122,10 @@ msgstr ""
 #. Description
 #: ../ifplugd.templates:3001
 msgid ""
-"-a Do not enable interface automatically\n"
+" -a Do not enable interface automatically\n"
 " -s Use stderr instead of syslog for debugging\n"
-" -b Do not beep\n"
-" -t Specify poll time in seconds\n"
+" -b Do not beep (-U/-D Do not beep on interface up/down)\n"
+" -t Specify poll time in seconds (default: 1)\n"
 " -p Don't run script on daemon startup\n"
 " -l Run \"down\" script on startup if no cable is detected\n"
 " -W Wait until the daemon died when running daemon is killed\n"
diff --git a/debian/po/zh_TW.po b/debian/po/zh_TW.po
index 102b25c..6a00a26 100644
--- a/debian/po/zh_TW.po
+++ b/debian/po/zh_TW.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ifplugd\n"
 "Report-Msgid-Bugs-To: ifplugd@packages.debian.org\n"
-"POT-Creation-Date: 2008-03-26 14:14+0530\n"
+"POT-Creation-Date: 2008-04-05 01:15+0530\n"
 "PO-Revision-Date: 2005-03-15 16:49+0800\n"
 "Last-Translator: Asho Yeh <asho@debian.org.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -107,7 +107,7 @@ msgstr "輸入 ifplugd daemon 的參數。參閱說明文件的敘述或執行 i
 #. Description
 #: ../ifplugd.templates:3001
 msgid ""
-"-q Don't run script on daemon quit\n"
+" -q Don't run script on daemon quit\n"
 " -f Ignore detection failure and retry\n"
 " -u Specify delay for configuring interface\n"
 " -d Specify delay for deconfiguring interface\n"
@@ -119,10 +119,10 @@ msgstr ""
 #. Description
 #: ../ifplugd.templates:3001
 msgid ""
-"-a Do not enable interface automatically\n"
+" -a Do not enable interface automatically\n"
 " -s Use stderr instead of syslog for debugging\n"
-" -b Do not beep\n"
-" -t Specify poll time in seconds\n"
+" -b Do not beep (-U/-D Do not beep on interface up/down)\n"
+" -t Specify poll time in seconds (default: 1)\n"
 " -p Don't run script on daemon startup\n"
 " -l Run \"down\" script on startup if no cable is detected\n"
 " -W Wait until the daemon died when running daemon is killed\n"