Imported Debian patch 0.28-2.1

19 files changed, 714 insertions, 365 deletions

diff --git a/config.guess b/config.guess
index c38553d..396482d 100644
--- a/config.guess
+++ b/config.guess
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
 
-timestamp='2006-02-23'
+timestamp='2006-07-02'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -210,7 +211,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
 	exit ;;
     macppc:MirBSD:*:*)
-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
@@ -770,6 +771,8 @@ EOF
 	case ${UNAME_MACHINE} in
 	    pc98)
 		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    *)
 		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	esac
@@ -780,9 +783,6 @@ EOF
     i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
-    i*:MSYS_NT-*:*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
     i*:windows32*:*)
     	# uname -m includes "-pc" on this system.
     	echo ${UNAME_MACHINE}-mingw32
@@ -790,10 +790,10 @@ EOF
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    x86:Interix*:[345]*)
+    x86:Interix*:[3456]*)
 	echo i586-pc-interix${UNAME_RELEASE}
 	exit ;;
-    EM64T:Interix*:[345]*)
+    EM64T:Interix*:[3456]*)
 	echo x86_64-unknown-interix${UNAME_RELEASE}
 	exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
@@ -831,6 +831,9 @@ EOF
     arm*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    avr32*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     cris:Linux:*:*)
 	echo cris-axis-linux-gnu
 	exit ;;
@@ -989,7 +992,7 @@ EOF
 	LIBC=gnulibc1
 	# endif
 	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
 	LIBC=gnu
 	#else
 	LIBC=gnuaout
diff --git a/config.sub b/config.sub
index ad9f395..fab0aa3 100644
--- a/config.sub
+++ b/config.sub
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
 
-timestamp='2006-02-23'
+timestamp='2006-09-20'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -240,7 +241,7 @@ case $basic_machine in
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
@@ -248,7 +249,8 @@ case $basic_machine in
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -274,21 +276,19 @@ case $basic_machine in
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b \
-	| strongarm \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu | strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
-	m32c)
-		basic_machine=$basic_machine-unknown
-		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
@@ -318,7 +318,7 @@ case $basic_machine in
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* \
+	| avr-* | avr32-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 	| clipper-* | craynv-* | cydra-* \
@@ -329,7 +329,7 @@ case $basic_machine in
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
-	| m32r-* | m32rle-* \
+	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | maxq-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
@@ -358,23 +358,21 @@ case $basic_machine in
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
 	| xstormy16-* | xtensa-* \
 	| ymp-* \
 	| z8k-*)
 		;;
-	m32c-*)
-		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@@ -912,6 +910,10 @@ case $basic_machine in
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
 	sei)
 		basic_machine=mips-sei
 		os=-seiux
@@ -1128,7 +1130,7 @@ case $basic_machine in
 	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b)
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
 		basic_machine=sparc-sun
 		;;
 	cydra)
@@ -1217,7 +1219,7 @@ case $os in
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos*)
+	      | -skyos* | -haiku* | -rdos* | -toppers*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1369,6 +1371,12 @@ else
 # system, and we'll never get to this point.
 
 case $basic_machine in
+        score-*)
+		os=-elf
+		;;
+        spu-*)
+		os=-elf
+		;;
 	*-acorn)
 		os=-riscix1.2
 		;;
@@ -1378,9 +1386,9 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
+        c4x-* | tic4x-*)
+        	os=-coff
+		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
diff --git a/debian/changelog b/debian/changelog
index 10939ee..0d356a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+ifplugd (0.28-2.1) unstable; urgency=low
+
+  * Non-maintainer upload to fix longstanding l10n issues
+  * Mark Choices as translatable. Closes: #362625
+  * Remove bashisms in debian/rules and use a debian/ifplugd.docs
+    file to list documentation files. Closes: #375480
+  * Debconf templates translations:
+    - French updated. Closes: #362625
+    - Swedish updated. Sent during the call for updates of the NMU campaign.
+    - German updated. Closes: #399383
+    - Vietnamese updated. Sent during the call for updates of the NMU campaign.
+    - Russian added. Sent during the call for updates of the NMU campaign.
+  * Lintian fixes: 
+    - List po-debconf in build dependencies
+    - Do not install /etc/udev/ifplugd.rules as executable
+    - Do not invoke init script directly in the config script but
+      use invoke-rc.d if available
+
+ -- Christian Perrier <bubulle@debian.org>  Fri, 24 Nov 2006 07:24:02 +0100
+
 ifplugd (0.28-2) unstable; urgency=low
 
   * include /etc/udev/rules.d/ (closes: #359936)
diff --git a/debian/control b/debian/control
index a5ab6a9..052faea 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: ifplugd
 Section: net
 Priority: optional
 Maintainer: Oliver Kurth <oku@debian.org>
-Build-Depends: debhelper (>> 4.1.16), libdaemon-dev (>= 0.7), lynx | lynx-ssl, pkg-config
+Build-Depends: debhelper (>> 4.1.16), libdaemon-dev (>= 0.7), lynx | lynx-ssl, pkg-config, po-debconf
 Standards-Version: 3.6.1
 
 Package: ifplugd
diff --git a/debian/ifplugd.config b/debian/ifplugd.config
index 08962d1..ab7f46a 100644
--- a/debian/ifplugd.config
+++ b/debian/ifplugd.config
@@ -64,7 +64,11 @@ DH_VERSION=`dpkg -l debconf | awk ' /^ii/ { print $3 }'`
 if dpkg --compare-versions $DH_VERSION lt "1.2.9" ; then
     if [ x"$1" = x"reconfigure" ] ; then
 	if [ -x "/etc/init.d/ifplugd" ]; then
-	    /etc/init.d/ifplugd stop || true
+		if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+			invoke-rc.d ifplugd stop || exit $?
+		else
+			/etc/init.d/ifplugd stop || exit $?
+		fi
 	fi
     fi
 fi
diff --git a/debian/ifplugd.docs b/debian/ifplugd.docs
new file mode 100644
index 0000000..a7fe20e
--- /dev/null
+++ b/debian/ifplugd.docs
@@ -0,0 +1,6 @@
+doc/NEWS
+doc/README
+doc/README.html
+doc/style.css
+doc/SUPPORTED_DRIVERS
+patches
diff --git a/debian/ifplugd.templates b/debian/ifplugd.templates
index 321ca47..0cf766a 100644
--- a/debian/ifplugd.templates
+++ b/debian/ifplugd.templates
@@ -33,7 +33,7 @@ _Description: arguments to ifplugd:
 
 Template: ifplugd/suspend_action
 Type: select
-Choices: none, suspend, stop
+__Choices: none, suspend, stop
 Default: stop
 _Description: suspend behaviour:
  When you put your notebook into suspend mode, you can choose between three
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 312c91d..21e0ff1 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ifplugd\n"
-"Report-Msgid-Bugs-To: oku@debian.org\n"
-"POT-Creation-Date: 2006-03-27 10:45-0800\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-11-24 07:23+0100\n"
 "PO-Revision-Date: 2005-03-09 18:07+0100\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@debian.org>\n"
@@ -25,13 +25,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:4
+#: ../ifplugd.templates:1001
 msgid "static interfaces to be watched by ifplugd:"
 msgstr "Statick� rozhran�, kter� m� ifplugd sledovat"
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:4
+#: ../ifplugd.templates:1001
 msgid ""
 "Specify the interfaces to control here, separated by spaces. Ifplugd "
 "processes will be started for each of these interfaces when the ifplugd "
@@ -51,7 +51,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:4
+#: ../ifplugd.templates:1001
 msgid ""
 "You should not add interfaces that are hotplugged (USB or PCMCIA) here, you "
 "will be asked for those in the next question."
@@ -61,13 +61,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:19
+#: ../ifplugd.templates:2001
 msgid "hotplugged interfaces to be watched by ifplugd:"
 msgstr "Dynamicky p�ipojiteln� za��zen�, kter� m� ifplugd sledovat"
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:19
+#: ../ifplugd.templates:2001
 msgid "Specify the hotplugged interfaces to control here, separated by spaces."
 msgstr ""
 "Zadejte mezerami odd�len� seznam sledovan�ch dynamicky p�ipojiteln�ch "
@@ -75,7 +75,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:19
+#: ../ifplugd.templates:2001
 msgid ""
 "You may use the magic string \"all\" to make the hotplug script start an "
 "ifplugd process for any hotplugged interface."
@@ -85,7 +85,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:19
+#: ../ifplugd.templates:2001
 msgid ""
 "Hotplugged interfaces are usually interfaces on PCMCIA or WLAN adapters."
 msgstr ""
@@ -94,13 +94,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:30
+#: ../ifplugd.templates:3001
 msgid "arguments to ifplugd:"
 msgstr "Parametry pro daemon ifplugd"
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:30
+#: ../ifplugd.templates:3001
 msgid ""
 "You can give arguments to the ifplug daemon here. See the man page for a "
 "description or call ifplugd -h."
@@ -109,14 +109,32 @@ msgstr ""
 "manu�lov� str�nce, nebo ve zkr�cen� podob� p��kazem ifplugd -h."
 
 #. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "none"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "suspend"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "stop"
+msgstr ""
+
+#. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 msgid "suspend behaviour:"
 msgstr "Chov�n� p�i usp�n�"
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 msgid ""
 "When you put your notebook into suspend mode, you can choose between three "
 "actions:"
@@ -126,13 +144,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 msgid "none: no action"
 msgstr "nic: nic se nestane"
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 msgid ""
 "suspend: this puts ifplugd into suspend mode. In this mode, ifplugd does not "
 "check the link status. This is necessary for some broken network drivers."
@@ -142,7 +160,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 #, fuzzy
 msgid ""
 "stop: this stops ifplugd. If the -q option is not given, ifplugd will stop "
diff --git a/debian/po/da.po b/debian/po/da.po
index 4897971..0050d4b 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ifplugd debconf\n"
-"Report-Msgid-Bugs-To: oku@debian.org\n"
-"POT-Creation-Date: 2006-03-27 10:45-0800\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-11-24 07:23+0100\n"
 "PO-Revision-Date: 2006-03-30 08:15+0200\n"
 "Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n"
 "Language-Team: Danish\n"
@@ -26,13 +26,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:4
+#: ../ifplugd.templates:1001
 msgid "static interfaces to be watched by ifplugd:"
 msgstr "faste netkort, der skal overv�ges af ifplugd"
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:4
+#: ../ifplugd.templates:1001
 msgid ""
 "Specify the interfaces to control here, separated by spaces. Ifplugd "
 "processes will be started for each of these interfaces when the ifplugd "
@@ -52,7 +52,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:4
+#: ../ifplugd.templates:1001
 msgid ""
 "You should not add interfaces that are hotplugged (USB or PCMCIA) here, you "
 "will be asked for those in the next question."
@@ -62,13 +62,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:19
+#: ../ifplugd.templates:2001
 msgid "hotplugged interfaces to be watched by ifplugd:"
 msgstr "l�se netkort, der skal overv�ges af ifplugd"
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:19
+#: ../ifplugd.templates:2001
 msgid "Specify the hotplugged interfaces to control here, separated by spaces."
 msgstr ""
 "Angiv de netkort, der kan s�ttes i under k�rslen, som skal overv�ges adskilt "
@@ -76,7 +76,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:19
+#: ../ifplugd.templates:2001
 msgid ""
 "You may use the magic string \"all\" to make the hotplug script start an "
 "ifplugd process for any hotplugged interface."
@@ -86,19 +86,20 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:19
-msgid "Hotplugged interfaces are usually interfaces on PCMCIA or WLAN adapters."
+#: ../ifplugd.templates:2001
+msgid ""
+"Hotplugged interfaces are usually interfaces on PCMCIA or WLAN adapters."
 msgstr "L�se netkort forbindes normalt via PCMCIA eller WLAN."
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:30
+#: ../ifplugd.templates:3001
 msgid "arguments to ifplugd:"
 msgstr "parametre til ifplugd"
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:30
+#: ../ifplugd.templates:3001
 msgid ""
 "You can give arguments to the ifplug daemon here. See the man page for a "
 "description or call ifplugd -h."
@@ -107,14 +108,32 @@ msgstr ""
 "beskrivelse eller kald 'ifplugd -h'."
 
 #. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "none"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "suspend"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "stop"
+msgstr ""
+
+#. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 msgid "suspend behaviour:"
 msgstr "opf�rsel ved dvale"
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 msgid ""
 "When you put your notebook into suspend mode, you can choose between three "
 "actions:"
@@ -124,13 +143,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 msgid "none: no action"
 msgstr "ingen, ingen handling"
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 msgid ""
 "suspend: this puts ifplugd into suspend mode. In this mode, ifplugd does not "
 "check the link status. This is necessary for some broken network drivers."
@@ -141,7 +160,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 msgid ""
 "stop: this stops ifplugd. If the -q option is not given, ifplugd will stop "
 "the interface. After resume, it will be restarted. This makes sense if you "
@@ -156,4 +175,3 @@ msgstr ""
 
 #~ msgid "none, suspend, stop"
 #~ msgstr "ingen, dvale, stop"
-
diff --git a/debian/po/de.po b/debian/po/de.po
index f5de7ca..4f1fb2b 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -10,29 +10,29 @@
 #         or http://www.debian.org/intl/l10n/po-debconf/README-trans#
 #    Developers do not need to manually edit POT or PO files.
 # Jens Nachtigall <nachtigall@web.de>, 2005.
+# Holger Wansing <linux@wansing-online.de>, 2006.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ifplugd_0.26-2_templates\n"
-"Report-Msgid-Bugs-To: oku@debian.org\n"
-"POT-Creation-Date: 2006-03-27 10:45-0800\n"
-"PO-Revision-Date: 2005-10-12 11:55+0200\n"
-"Last-Translator: Jens Nachtigall <nachtigall@web.de>\n"
+"Project-Id-Version: ifplugd 0.28-2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-11-24 07:23+0100\n"
+"PO-Revision-Date: 2006-12-02 13:05+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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:4
+#: ../ifplugd.templates:1001
 msgid "static interfaces to be watched by ifplugd:"
-msgstr "zu überwachende Schnittstellen, die immer (statisch) vorhanden sind:"
+msgstr "Zu überwachende Schnittstellen, die immer (statisch) vorhanden sind:"
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:4
+#: ../ifplugd.templates:1001
 msgid ""
 "Specify the interfaces to control here, separated by spaces. Ifplugd "
 "processes will be started for each of these interfaces when the ifplugd "
@@ -53,109 +53,129 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:4
+#: ../ifplugd.templates:1001
 msgid ""
 "You should not add interfaces that are hotplugged (USB or PCMCIA) here, you "
 "will be asked for those in the next question."
 msgstr ""
-"Sie sollten hier keine Schnittstellen angeben, welche über hotplug (USB oder "
-"PCMCIA) eingebunden werden. Diese Schnittstellen werden in der nächsten "
-"Frage behandelt."
+"Sie sollten hier keine Schnittstellen angeben, die von hotplug gesteuert "
+"werden (USB oder PCMCIA). Um diese Schnittstellen geht es in der nächsten "
+"Frage."
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:19
+#: ../ifplugd.templates:2001
 msgid "hotplugged interfaces to be watched by ifplugd:"
-msgstr "zu überwachende Schnittstellen, die über hotplug eingebunden werden:"
+msgstr ""
+"Durch hotplug gesteuerte Schnittstellen, die von ifplugd überwacht werden "
+"sollen:"
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:19
+#: ../ifplugd.templates:2001
 msgid "Specify the hotplugged interfaces to control here, separated by spaces."
 msgstr ""
-"Geben Sie hier, durch Leerzeichen getrennt, die zu überwachenden "
-"Schnittstellen ein, welche über hotplug eingebunden werden."
+"Bitte geben Sie hier die Schnittstellen an, die durch hotplug gesteuert "
+"werden und die Sie mit ifplugd überwachen möchten."
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:19
+#: ../ifplugd.templates:2001
 msgid ""
 "You may use the magic string \"all\" to make the hotplug script start an "
 "ifplugd process for any hotplugged interface."
 msgstr ""
-"Sie können das magische Wort »all« verwenden, damit das hotplug-Skript für "
-"jede über hotplug eingebundene Schnittstelle einen ifplugd-Prozess startet."
+"Sie können den speziellen Wert »all« benutzen, damit das hotplug-Skript für "
+"alle von ihm gesteuerten Schnittstellen einen ifplugd-Prozess startet."
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:19
+#: ../ifplugd.templates:2001
 msgid ""
 "Hotplugged interfaces are usually interfaces on PCMCIA or WLAN adapters."
 msgstr ""
-"Bei über hotplug eingebundenen Schnittstellen handelt es sich meistens um "
-"PCMCIA- oder WLAN-Adapter."
+"Schnittstellen auf PCMCIA- oder USB-Adaptern werden für gewöhnlich durch "
+"hotplug gesteuert."
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:30
+#: ../ifplugd.templates:3001
 msgid "arguments to ifplugd:"
 msgstr "Argumente für ifplugd:"
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:30
+#: ../ifplugd.templates:3001
 msgid ""
 "You can give arguments to the ifplug daemon here. See the man page for a "
 "description or call ifplugd -h."
 msgstr ""
-"Sie können hier Argumente für den ifplugd-Daemon angeben. Lesen Sie die Man-"
-"Page für eine Beschreibung oder rufen Sie »ifplugd -h« auf."
+"Sie können hier Argumente für den ifplugd-Daemon angeben. Eine Beschreibung "
+"dieser Argumente finden Sie auf der Handbuchseite von ifplugd oder rufen Sie "
+"»ifplugd -h« auf."
+
+#. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "none"
+msgstr "nichts"
+
+#. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "suspend"
+msgstr "Suspend"
+
+#. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "stop"
+msgstr "Stop"
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 msgid "suspend behaviour:"
 msgstr "Suspend-Verhalten:"
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 msgid ""
 "When you put your notebook into suspend mode, you can choose between three "
 "actions:"
 msgstr ""
-"Wenn ihr Notebook in den Suspend-Modus geht, kann eine dieser 3 Aktionen "
-"ausgelöst werden:"
+"Wenn Ihr Notebook in den Suspend-Modus (Tiefschlaf) wechselt, kann eine "
+"dieser drei Aktionen ausgelöst werden:"
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 msgid "none: no action"
-msgstr "none: nichts"
+msgstr "nichts: tue garnichts"
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 msgid ""
 "suspend: this puts ifplugd into suspend mode. In this mode, ifplugd does not "
 "check the link status. This is necessary for some broken network drivers."
 msgstr ""
-"suspend: Dies setzt ifplugd in den Suspend-Modus. In diesem Modus überwacht "
-"ifplugd nicht den Verbindungs-Status. Das ist für einige kaputte Netzwerk-"
+"Suspend: versetzt ifplugd in den Suspend-Modus. In diesem Modus überwacht "
+"ifplugd nicht den Verbindungsstatus. Dies ist für einige kaputte Netzwerk-"
 "Treiber notwendig."
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
-#, fuzzy
+#: ../ifplugd.templates:4002
 msgid ""
 "stop: this stops ifplugd. If the -q option is not given, ifplugd will stop "
 "the interface. After resume, it will be restarted. This makes sense if you "
 "use some mechanism (eg. guessnet or whereami) to detect your network "
 "environment, which may have changed while suspending."
 msgstr ""
-"stop: Dies stoppt ifplugd. Wenn die »-q«-Option nicht angegeben wurde, dann "
-"wird ifplugd die Schnittstelle stoppen. Nach dem Aufwachen wird ifplugd neu "
-"gestartet. Das ist sinnvoll, wenn Sie einen Mechanismus (z.B. mittels "
-"guessnet oder whereami) verwenden, um Ihre Netzwerk-Umgebung automatisch zu "
-"finden, welche sich während des Suspends verändert haben könnte."
+"Stop: stoppt ifplugd. Wenn die Option »-q« nicht angegeben wurde, wird "
+"ifplugd die Schnittstelle stoppen. Nach dem Aufwachen wird sie neu "
+"gestartet. Dies ist sinnvoll, wenn Sie einen Mechanismus (z.B. guessnet oder "
+"whereami) verwenden, um Ihre Netzwerkumgebung automatisch zu erkennen, "
+"welche sich während des Tiefschlafs verändert haben könnte."
diff --git a/debian/po/es.po b/debian/po/es.po
index 9cdcb08..98dded8 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -29,8 +29,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ifplugd\n"
-"Report-Msgid-Bugs-To: oku@debian.org\n"
-"POT-Creation-Date: 2006-03-27 10:45-0800\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-11-24 07:23+0100\n"
 "PO-Revision-Date: 2005-03-13 03:34-0500\n"
 "Last-Translator: Lucas Wall <lwall@debian.org>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -40,13 +40,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:4
+#: ../ifplugd.templates:1001
 msgid "static interfaces to be watched by ifplugd:"
 msgstr "interfaces est�ticas que ser�n supervisadas por ifplugd"
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:4
+#: ../ifplugd.templates:1001
 msgid ""
 "Specify the interfaces to control here, separated by spaces. Ifplugd "
 "processes will be started for each of these interfaces when the ifplugd "
@@ -66,7 +66,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:4
+#: ../ifplugd.templates:1001
 msgid ""
 "You should not add interfaces that are hotplugged (USB or PCMCIA) here, you "
 "will be asked for those in the next question."
@@ -74,13 +74,13 @@ msgstr "No debe ingresar interfaces �hotplug� (USB o PCMCIA) aqu�."
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:19
+#: ../ifplugd.templates:2001
 msgid "hotplugged interfaces to be watched by ifplugd:"
 msgstr "interfaces �hotplug� que ser�n supervisadas por ifplugd"
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:19
+#: ../ifplugd.templates:2001
 msgid "Specify the hotplugged interfaces to control here, separated by spaces."
 msgstr ""
 "Ingrese la lista de interfaces �hotplug� que deben ser supervisadas por "
@@ -88,7 +88,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:19
+#: ../ifplugd.templates:2001
 msgid ""
 "You may use the magic string \"all\" to make the hotplug script start an "
 "ifplugd process for any hotplugged interface."
@@ -98,7 +98,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:19
+#: ../ifplugd.templates:2001
 msgid ""
 "Hotplugged interfaces are usually interfaces on PCMCIA or WLAN adapters."
 msgstr ""
@@ -107,13 +107,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:30
+#: ../ifplugd.templates:3001
 msgid "arguments to ifplugd:"
 msgstr "par�metros para ifplugd"
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:30
+#: ../ifplugd.templates:3001
 msgid ""
 "You can give arguments to the ifplug daemon here. See the man page for a "
 "description or call ifplugd -h."
@@ -123,14 +123,32 @@ msgstr ""
 "�ifplugd -h�."
 
 #. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "none"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "suspend"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "stop"
+msgstr ""
+
+#. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 msgid "suspend behaviour:"
 msgstr "acci�n al suspender"
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 msgid ""
 "When you put your notebook into suspend mode, you can choose between three "
 "actions:"
@@ -139,13 +157,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 msgid "none: no action"
 msgstr "ninguna: sin acci�n"
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 msgid ""
 "suspend: this puts ifplugd into suspend mode. In this mode, ifplugd does not "
 "check the link status. This is necessary for some broken network drivers."
@@ -156,7 +174,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 #, fuzzy
 msgid ""
 "stop: this stops ifplugd. If the -q option is not given, ifplugd will stop "
diff --git a/debian/po/fr.po b/debian/po/fr.po
index f29b173..9548461 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -7,14 +7,14 @@
 # /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.
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: ifplugd\n"
-"Report-Msgid-Bugs-To: oku@debian.org\n"
-"POT-Creation-Date: 2006-03-27 10:45-0800\n"
-"PO-Revision-Date: 2005-03-06 14:48+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-11-24 07:23+0100\n"
+"PO-Revision-Date: 2006-04-10 19:05+0200\n"
 "Last-Translator: Jean-Luc Coulon (f5ibh) <jean-luc.coulon@wanadoo.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -23,13 +23,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:4
+#: ../ifplugd.templates:1001
 msgid "static interfaces to be watched by ifplugd:"
 msgstr "Interfaces statiques qu'ifplugd doit surveiller�:"
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:4
+#: ../ifplugd.templates:1001
 msgid ""
 "Specify the interfaces to control here, separated by spaces. Ifplugd "
 "processes will be started for each of these interfaces when the ifplugd "
@@ -41,8 +41,8 @@ msgid ""
 msgstr ""
 "Veuillez pr�ciser la liste des interfaces � contr�ler, s�par�es par des "
 "espaces. Des processus ifplugd seront lanc�s pour chacune de ces interfaces "
-"lorsque le script de lancement d'ifplugd sera appel� avec l'argument "
-"��start��. Vous pouvez utiliser l'argument ��auto�� de fa�on � ce que le "
+"lorsque le script de lancement d'ifplugd sera appel� avec le param�tre "
+"��start��. Vous pouvez utiliser le param�tre ��auto�� de fa�on � ce que le "
 "script de lancement d�marre ou arr�te des processus ifplugd pour TOUTES les "
 "interface eth et wlan disponibles dans /proc/net/dev. Veuillez noter que "
 "cette liste d'interfaces dans /proc/net/dev peut d�pendre des modules du "
@@ -50,7 +50,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:4
+#: ../ifplugd.templates:1001
 msgid ""
 "You should not add interfaces that are hotplugged (USB or PCMCIA) here, you "
 "will be asked for those in the next question."
@@ -60,14 +60,14 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:19
+#: ../ifplugd.templates:2001
 msgid "hotplugged interfaces to be watched by ifplugd:"
 msgstr ""
 "Interfaces connect�es � chaud (��hotplugged��) qu'ifplugd doit surveiller�:"
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:19
+#: ../ifplugd.templates:2001
 msgid "Specify the hotplugged interfaces to control here, separated by spaces."
 msgstr ""
 "Veuillez indiquer la liste des interfaces connect�es � chaud, s�par�es par "
@@ -75,7 +75,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:19
+#: ../ifplugd.templates:2001
 msgid ""
 "You may use the magic string \"all\" to make the hotplug script start an "
 "ifplugd process for any hotplugged interface."
@@ -85,7 +85,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:19
+#: ../ifplugd.templates:2001
 msgid ""
 "Hotplugged interfaces are usually interfaces on PCMCIA or WLAN adapters."
 msgstr ""
@@ -94,69 +94,83 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:30
+#: ../ifplugd.templates:3001
 msgid "arguments to ifplugd:"
-msgstr "Arguments � passer � ifplugd�:"
+msgstr "Param�tres � passer � ifplugd�:"
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:30
+#: ../ifplugd.templates:3001
 msgid ""
 "You can give arguments to the ifplug daemon here. See the man page for a "
 "description or call ifplugd -h."
 msgstr ""
-"Veuillez indiquer ici des arguments � passer au d�mon ifplugd. Veuillez "
+"Veuillez indiquer ici des param�tres � passer au d�mon ifplugd. Veuillez "
 "consulter la page de manuel pour en obtenir une description d�taill�e ou "
 "passez la commande ��ifplugd -h��."
 
 #. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "none"
+msgstr "Aucune"
+
+#. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "suspend"
+msgstr "Suspendre"
+
+#. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "stop"
+msgstr "Arr�ter"
+
+#. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 msgid "suspend behaviour:"
-msgstr "Action du mode ��suspend���:"
+msgstr "Action du mode veille�:"
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 msgid ""
 "When you put your notebook into suspend mode, you can choose between three "
 "actions:"
 msgstr ""
-"Lorsque vous mettez votre ordinateur portable en suspension, vous avez le "
-"choix entre trois actions�:"
+"Lorsque vous mettez votre ordinateur portable en veille, vous avez le choix "
+"entre trois actions�:"
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 msgid "none: no action"
-msgstr "-�aucune�: aucune action�;"
+msgstr "-�Aucune�: aucune action�;"
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 msgid ""
 "suspend: this puts ifplugd into suspend mode. In this mode, ifplugd does not "
 "check the link status. This is necessary for some broken network drivers."
 msgstr ""
-"-�suspendre�: ceci met ifplugd en mode suspension. Dans ce mode, il ne "
-"v�rifie pas l'�tat de la ligne. Cela est n�cessaire pour certains pilotes de "
-"r�seau d�fectueux�;"
+"-�Suspendre�: ceci met ifplugd en mode veille. Dans ce mode, il ne v�rifie "
+"pas l'�tat de la ligne. Cela est n�cessaire pour certains pilotes de r�seau "
+"d�fectueux�;"
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
-#, fuzzy
+#: ../ifplugd.templates:4002
 msgid ""
 "stop: this stops ifplugd. If the -q option is not given, ifplugd will stop "
 "the interface. After resume, it will be restarted. This makes sense if you "
 "use some mechanism (eg. guessnet or whereami) to detect your network "
 "environment, which may have changed while suspending."
 msgstr ""
-"-�arr�ter�: cette action arr�te ifplugd. Si l'option -q n'est pas pr�sente, "
+"-�Arr�ter�: cette action arr�te ifplugd. Si l'option -q n'est pas pr�sente, "
 "ifplugd va arr�ter l'interface. � la reprise, elle sera red�marr�e. Cela � "
 "un int�r�t si vous utilisez un m�canisme tel que guessnet ou whereami pour "
 "d�tecter votre environnement de r�seau qui peut avoir �t� modifi� pendant la "
-"dur�e de la suspension."
-
-#~ msgid "none, suspend, stop"
-#~ msgstr "aucune, suspendre, arr�ter"
+"dur�e de la mise en veille."
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index be60e13..ad09207 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -13,8 +13,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ifplugd 0.26\n"
-"Report-Msgid-Bugs-To: oku@debian.org\n"
-"POT-Creation-Date: 2006-03-27 10:45-0800\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-11-24 07:23+0100\n"
 "PO-Revision-Date: 2005-03-13 22:13-0300\n"
 "Last-Translator: Felipe Augusto van de Wiel (faw) <felipe@cathedrallabs."
 "org>\n"
@@ -26,13 +26,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:4
+#: ../ifplugd.templates:1001
 msgid "static interfaces to be watched by ifplugd:"
 msgstr "interfaces estáticas para serem monitoradas pelo ifplugd"
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:4
+#: ../ifplugd.templates:1001
 msgid ""
 "Specify the interfaces to control here, separated by spaces. Ifplugd "
 "processes will be started for each of these interfaces when the ifplugd "
@@ -53,7 +53,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:4
+#: ../ifplugd.templates:1001
 msgid ""
 "You should not add interfaces that are hotplugged (USB or PCMCIA) here, you "
 "will be asked for those in the next question."
@@ -63,13 +63,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:19
+#: ../ifplugd.templates:2001
 msgid "hotplugged interfaces to be watched by ifplugd:"
 msgstr "interfaces \"hotplug\" para serem monitoradas pelo ifplugd"
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:19
+#: ../ifplugd.templates:2001
 msgid "Specify the hotplugged interfaces to control here, separated by spaces."
 msgstr ""
 "Especifique aqui as interfaces \"hotplug\" que serão controladas, separado "
@@ -77,7 +77,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:19
+#: ../ifplugd.templates:2001
 msgid ""
 "You may use the magic string \"all\" to make the hotplug script start an "
 "ifplugd process for any hotplugged interface."
@@ -87,7 +87,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:19
+#: ../ifplugd.templates:2001
 msgid ""
 "Hotplugged interfaces are usually interfaces on PCMCIA or WLAN adapters."
 msgstr ""
@@ -95,13 +95,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:30
+#: ../ifplugd.templates:3001
 msgid "arguments to ifplugd:"
 msgstr "argumentos para o ifplugd"
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:30
+#: ../ifplugd.templates:3001
 msgid ""
 "You can give arguments to the ifplug daemon here. See the man page for a "
 "description or call ifplugd -h."
@@ -110,14 +110,32 @@ msgstr ""
 "uma descrição ou execute ifplugd -h."
 
 #. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "none"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "suspend"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "stop"
+msgstr ""
+
+#. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 msgid "suspend behaviour:"
 msgstr "comportamento \"suspend\""
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 msgid ""
 "When you put your notebook into suspend mode, you can choose between three "
 "actions:"
@@ -127,13 +145,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 msgid "none: no action"
 msgstr "nenhum: sem ação"
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 msgid ""
 "suspend: this puts ifplugd into suspend mode. In this mode, ifplugd does not "
 "check the link status. This is necessary for some broken network drivers."
@@ -144,7 +162,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 #, fuzzy
 msgid ""
 "stop: this stops ifplugd. If the -q option is not given, ifplugd will stop "
diff --git a/debian/po/ru.po b/debian/po/ru.po
new file mode 100644
index 0000000..388ac4f
--- /dev/null
+++ b/debian/po/ru.po
@@ -0,0 +1,174 @@
+# translation of ifplugd_debconf_ru.po to Russian
+#
+#    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.
+#
+# Yuri Kozlov <kozlov.y@gmail.com>, 2006.
+msgid ""
+msgstr ""
+"Project-Id-Version: 0.28-2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-11-24 07:23+0100\n"
+"PO-Revision-Date: 2006-12-05 23:34+0300\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: string
+#. Description
+#: ../ifplugd.templates:1001
+msgid "static interfaces to be watched by ifplugd:"
+msgstr "Статические интерфейсы, которые будет обслуживать ifplugd:"
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:1001
+msgid ""
+"Specify the interfaces to control here, separated by spaces. Ifplugd "
+"processes will be started for each of these interfaces when the ifplugd "
+"initscript is called with the \"start\" argument. You may use the magic "
+"string \"auto\" to make the initscript start or stop ifplugd processes for "
+"ALL eth and wlan interfaces that are available according to /proc/net/dev.  "
+"Note that the list of interfaces appearing in /proc/net/dev may depend on "
+"which kernel modules you have loaded."
+msgstr ""
+"Укажите интерфейсы для управления, разделяя их пробелами. "
+"При вызове init-сценария ifplugd с параметром \"start\" для "
+"каждого из этих интерфейсов будет запущен процесс ifplugd. "
+"Можно указать слово \"auto\" и тогда init-сценарий будет запускать и "
+"останавливать процессы ifplugd для ВСЕХ имеющихся, "
+"согласно proc/net/dev, eth и wlan интерфейсах. Заметим, что список "
+"интерфейсов в /proc/net/dev зависит от загруженных модулей ядра."
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:1001
+msgid ""
+"You should not add interfaces that are hotplugged (USB or PCMCIA) here, you "
+"will be asked for those in the next question."
+msgstr ""
+"Вам не нужно здесь указывать оперативно заменяемые интерфейсы (hotplugged) "
+"(USB или PCMCIA), про них будет следующий вопрос."
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:2001
+msgid "hotplugged interfaces to be watched by ifplugd:"
+msgstr "Оперативно заменяемые интерфейсы, которые будет обслуживать ifplugd:"
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:2001
+msgid "Specify the hotplugged interfaces to control here, separated by spaces."
+msgstr "Укажите через пробел оперативно заменяемые (hotplugged) интерфейсы."
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:2001
+msgid ""
+"You may use the magic string \"all\" to make the hotplug script start an "
+"ifplugd process for any hotplugged interface."
+msgstr ""
+"Можно указать слово \"all\" и тогда сценарий hotplug будет запускать "
+"процесс ifplugd для любого оперативно заменяемого интерфейса."
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:2001
+msgid "Hotplugged interfaces are usually interfaces on PCMCIA or WLAN adapters."
+msgstr "Обычно оперативно заменяемые интерфейсы имеются у адаптеров PCMCIA или WLAN."
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid "arguments to ifplugd:"
+msgstr "Параметры ifplugd:"
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid ""
+"You can give arguments to the ifplug daemon here. See the man page for a "
+"description or call ifplugd -h."
+msgstr ""
+"Вы можете указать параметры для демона ifplug. Подробней смотрите на "
+"странице руководства или запустите ifplugd -h."
+
+#. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "none"
+msgstr "ничего не делать"
+
+#. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "suspend"
+msgstr "приостановить"
+
+#. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "stop"
+msgstr "остановить"
+
+#. Type: select
+#. Description
+#: ../ifplugd.templates:4002
+msgid "suspend behaviour:"
+msgstr "Поведение при приостановке:"
+
+#. Type: select
+#. Description
+#: ../ifplugd.templates:4002
+msgid ""
+"When you put your notebook into suspend mode, you can choose between three "
+"actions:"
+msgstr ""
+"При переводе ноутбука в режим приостановки (suspend), можно "
+"выполнить одно из следующих трёх действий:"
+
+#. Type: select
+#. Description
+#: ../ifplugd.templates:4002
+msgid "none: no action"
+msgstr "ничего не делать: ничего не делать"
+
+#. Type: select
+#. Description
+#: ../ifplugd.templates:4002
+msgid ""
+"suspend: this puts ifplugd into suspend mode. In this mode, ifplugd does not "
+"check the link status. This is necessary for some broken network drivers."
+msgstr ""
+"приостановить: перевести ifplugd в режим приостановки. В этом режиме "
+"ifplugd не проверяет состояние подключения к сети. Такое поведение "
+"требуется для некоторых некорректно работающих сетевых драйверов."
+
+#. Type: select
+#. Description
+#: ../ifplugd.templates:4002
+msgid ""
+"stop: this stops ifplugd. If the -q option is not given, ifplugd will stop "
+"the interface. After resume, it will be restarted. This makes sense if you "
+"use some mechanism (eg. guessnet or whereami) to detect your network "
+"environment, which may have changed while suspending."
+msgstr ""
+"остановить: остановить ifplugd. Если не указан параметр -q, ifplugd "
+"остановит интерфейс. После возобновления работы, он будет перезапущен. "
+"Это нужно, если есть какой-то механизм "
+"(например, guessnet или whereami) для определения сетевых настроек, "
+"которые могут измениться, пока компьютер находился в режиме "
+"приостановки."
+
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 3c3d977..9833919 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -14,9 +14,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ifplugd 0.26-2\n"
-"Report-Msgid-Bugs-To: oku@debian.org\n"
-"POT-Creation-Date: 2006-03-27 10:45-0800\n"
-"PO-Revision-Date: 2005-11-13 23:26+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-11-24 07:23+0100\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"
 "MIME-Version: 1.0\n"
@@ -27,134 +27,103 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:4
+#: ../ifplugd.templates:1001
 msgid "static interfaces to be watched by ifplugd:"
-msgstr "statiska gr�nssnitt som ska kontrolleras av ifplugd:"
+msgstr "statiska gr�nssnitt som ska �vervakas av ifplugd:"
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:4
-msgid ""
-"Specify the interfaces to control here, separated by spaces. Ifplugd "
-"processes will be started for each of these interfaces when the ifplugd "
-"initscript is called with the \"start\" argument. You may use the magic "
-"string \"auto\" to make the initscript start or stop ifplugd processes for "
-"ALL eth and wlan interfaces that are available according to /proc/net/dev.  "
-"Note that the list of interfaces appearing in /proc/net/dev may depend on "
-"which kernel modules you have loaded."
-msgstr ""
-"Specificera n�tverksgr�nssnitten som ska kontrolleras h�r, separerade med "
-"mellanslag. Ifplugd-processerna kommer att startas upp f�r varje av dessa "
-"gr�nssnitt n�r ifplugds init-skript kallas upp med argumentet \"start\". Du "
-"kan anv�nda den magiska str�ngen \"auto\" f�r att init-skriptet ska starta "
-"eller stoppa ifplugd-processerna f�r ALLA eth och wlan-gr�nssnitt som �r "
-"tillg�ngliga enligt /proc/net/dev.  Notera att listan av gr�nssnitt som "
-"visas i /proc/net/dev kan bero p� vilka k�rnmoduler du har laddat in."
+#: ../ifplugd.templates:1001
+msgid "Specify the interfaces to control here, separated by spaces. Ifplugd processes will be started for each of these interfaces when the ifplugd initscript is called with the \"start\" argument. You may use the magic string \"auto\" to make the initscript start or stop ifplugd processes for ALL eth and wlan interfaces that are available according to /proc/net/dev.  Note that the list of interfaces appearing in /proc/net/dev may depend on which kernel modules you have loaded."
+msgstr "Ange de n�tverksgr�nssnitt som ska kontrolleras h�r, separerade med blanksteg. Ifplugd-processerna kommer att startas upp f�r varje av dessa gr�nssnitt n�r ifplugds init-skript kallas upp med argumentet \"start\". Du kan anv�nda den magiska str�ngen \"auto\" f�r att init-skriptet ska starta eller stoppa ifplugd-processerna f�r ALLA eth och wlan-gr�nssnitt som �r tillg�ngliga enligt /proc/net/dev.  Observera att listan �ver gr�nssnitt som visas i /proc/net/dev �r beroende av vilka k�rnmoduler du har l�st in."
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:4
-msgid ""
-"You should not add interfaces that are hotplugged (USB or PCMCIA) here, you "
-"will be asked for those in the next question."
-msgstr ""
-"Du b�r inte l�gga till gr�nssnitt som har st�d f�r hotplug (USB eller "
-"PCMCIA) h�r, du kommer att bli fr�gad efter dessa i n�sta fr�ga."
+#: ../ifplugd.templates:1001
+msgid "You should not add interfaces that are hotplugged (USB or PCMCIA) here, you will be asked for those in the next question."
+msgstr "Du b�r inte l�gga till gr�nssnitt som har st�d f�r hotplug (USB eller PCMCIA) h�r, du kommer att bli tillfr�gad efter dessa i n�sta fr�ga."
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:19
+#: ../ifplugd.templates:2001
 msgid "hotplugged interfaces to be watched by ifplugd:"
-msgstr "gr�nssnitt med st�d f�r hotplug som ska kontrolleras av ifplugd:"
+msgstr "gr�nssnitt med st�d f�r hotplug som ska �vervakas av ifplugd:"
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:19
+#: ../ifplugd.templates:2001
 msgid "Specify the hotplugged interfaces to control here, separated by spaces."
-msgstr ""
-"Ange de gr�nssnitt med st�d f�r hotplug som ska kontrolleras h�r, separerade "
-"med mellanslag."
+msgstr "Ange de gr�nssnitt med st�d f�r hotplug och som ska kontrolleras h�r, separerade med blanksteg."
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:19
-msgid ""
-"You may use the magic string \"all\" to make the hotplug script start an "
-"ifplugd process for any hotplugged interface."
-msgstr ""
-"Du kan anv�nda den magiska str�ngen \"all\" f�r att hotplugskriptet ska "
-"starta en ifplugd-process f�r n�got gr�nssnitt som st�der hotplug."
+#: ../ifplugd.templates:2001
+msgid "You may use the magic string \"all\" to make the hotplug script start an ifplugd process for any hotplugged interface."
+msgstr "Du kan anv�nda den magiska str�ngen \"all\" f�r att hotplug-skriptet ska starta en ifplugd-process f�r de gr�nssnitt som har st�d f�r hotplug."
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:19
-msgid ""
-"Hotplugged interfaces are usually interfaces on PCMCIA or WLAN adapters."
-msgstr ""
-"Gr�nssnitt som har st�d f�r hotplug �r normalt sett gr�nssnitt p� PCMCIA "
-"eller WLAN-adaptrar."
+#: ../ifplugd.templates:2001
+msgid "Hotplugged interfaces are usually interfaces on PCMCIA or WLAN adapters."
+msgstr "Gr�nssnitt som har st�d f�r hotplug �r normalt sett gr�nssnitt p� PCMCIA eller WLAN-adaptrar."
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:30
+#: ../ifplugd.templates:3001
 msgid "arguments to ifplugd:"
 msgstr "argument till ifplugd:"
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:30
-msgid ""
-"You can give arguments to the ifplug daemon here. See the man page for a "
-"description or call ifplugd -h."
-msgstr ""
-"Du kan ange argument till ifplugd-demonen h�r. Se manualsidan f�r en "
-"beskrivning eller starta ifplugd med flaggan -h."
+#: ../ifplugd.templates:3001
+msgid "You can give arguments to the ifplug daemon here. See the man page for a description or call ifplugd -h."
+msgstr "Du kan ange argument till ifplugd-demonen h�r. Se manualsidan f�r en beskrivning eller starta ifplugd med flaggan -h."
+
+#. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "none"
+msgstr "ingen"
+
+#. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "suspend"
+msgstr "v�ntel�ge"
+
+#. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "stop"
+msgstr "stopp"
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 msgid "suspend behaviour:"
-msgstr "beteende f�r vilol�ge:"
+msgstr "beteende f�r v�ntel�ge:"
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
-msgid ""
-"When you put your notebook into suspend mode, you can choose between three "
-"actions:"
-msgstr ""
-"N�r du f�rs�tter din b�rbara dator i vilol�ge kan du v�lja mellan tre "
-"�tg�rder:"
+#: ../ifplugd.templates:4002
+msgid "When you put your notebook into suspend mode, you can choose between three actions:"
+msgstr "N�r du f�rs�tter din b�rbara dator i v�ntel�ge kan du v�lja mellan tre �tg�rder:"
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 msgid "none: no action"
 msgstr "ingen: ingen �tg�rd"
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
-msgid ""
-"suspend: this puts ifplugd into suspend mode. In this mode, ifplugd does not "
-"check the link status. This is necessary for some broken network drivers."
-msgstr ""
-"vilol�ge: detta f�rs�tter ifplugd i vilol�ge. I detta l�ge kommer ifplugd "
-"inte att kontrollera l�nkstatusen. Detta �r n�dv�ndigt f�r vissa brutna "
-"n�tverksdrivare."
+#: ../ifplugd.templates:4002
+msgid "suspend: this puts ifplugd into suspend mode. In this mode, ifplugd does not check the link status. This is necessary for some broken network drivers."
+msgstr "v�ntel�ge: detta f�rs�tter ifplugd i v�ntel�ge. I detta l�ge kommer ifplugd inte att kontrollera l�nkstatusen. Detta �r n�dv�ndigt f�r vissa trasiga n�tverksdrivrutiner."
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
-#, fuzzy
-msgid ""
-"stop: this stops ifplugd. If the -q option is not given, ifplugd will stop "
-"the interface. After resume, it will be restarted. This makes sense if you "
-"use some mechanism (eg. guessnet or whereami) to detect your network "
-"environment, which may have changed while suspending."
-msgstr ""
-"stopp: detta stoppar ifplugd. Om flaggan -q inte angivits kommer ifplugd "
-"stoppa gr�nssnittet. Efter �terupptagning kommer den att startas om. Detta "
-"har betydelse om du anv�ndra n�gon mekanism (exempelvis gueesnet eller "
-"whereami) f�r att detektera din n�tverksmilj�, som kan ha �ndrats under "
-"�terupptagningen."
+#: ../ifplugd.templates:4002
+msgid "stop: this stops ifplugd. If the -q option is not given, ifplugd will stop the interface. After resume, it will be restarted. This makes sense if you use some mechanism (eg. guessnet or whereami) to detect your network environment, which may have changed while suspending."
+msgstr "stopp: detta stoppar ifplugd. Om flaggan -q inte angivits kommer ifplugd stoppa gr�nssnittet. Efter �terupptagning kommer den att startas om. Detta har betydelse om du anv�nder n�gon mekanism (exempelvis guessnet eller whereami) f�r att detektera din n�tverksmilj�, som kan ha �ndrats under v�ntel�get."
+
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 00b25d0..b270db6 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -1,14 +1,22 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: oku@debian.org\n"
-"POT-Creation-Date: 2006-03-27 10:45-0800\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-11-24 07:23+0100\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"
@@ -18,13 +26,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:4
+#: ../ifplugd.templates:1001
 msgid "static interfaces to be watched by ifplugd:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:4
+#: ../ifplugd.templates:1001
 msgid ""
 "Specify the interfaces to control here, separated by spaces. Ifplugd "
 "processes will be started for each of these interfaces when the ifplugd "
@@ -37,7 +45,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:4
+#: ../ifplugd.templates:1001
 msgid ""
 "You should not add interfaces that are hotplugged (USB or PCMCIA) here, you "
 "will be asked for those in the next question."
@@ -45,19 +53,19 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:19
+#: ../ifplugd.templates:2001
 msgid "hotplugged interfaces to be watched by ifplugd:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:19
+#: ../ifplugd.templates:2001
 msgid "Specify the hotplugged interfaces to control here, separated by spaces."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:19
+#: ../ifplugd.templates:2001
 msgid ""
 "You may use the magic string \"all\" to make the hotplug script start an "
 "ifplugd process for any hotplugged interface."
@@ -65,34 +73,52 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:19
+#: ../ifplugd.templates:2001
 msgid ""
 "Hotplugged interfaces are usually interfaces on PCMCIA or WLAN adapters."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:30
+#: ../ifplugd.templates:3001
 msgid "arguments to ifplugd:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:30
+#: ../ifplugd.templates:3001
 msgid ""
 "You can give arguments to the ifplug daemon here. See the man page for a "
 "description or call ifplugd -h."
 msgstr ""
 
 #. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "none"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "suspend"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "stop"
+msgstr ""
+
+#. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 msgid "suspend behaviour:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 msgid ""
 "When you put your notebook into suspend mode, you can choose between three "
 "actions:"
@@ -100,13 +126,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 msgid "none: no action"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 msgid ""
 "suspend: this puts ifplugd into suspend mode. In this mode, ifplugd does not "
 "check the link status. This is necessary for some broken network drivers."
@@ -114,7 +140,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 msgid ""
 "stop: this stops ifplugd. If the -q option is not given, ifplugd will stop "
 "the interface. After resume, it will be restarted. This makes sense if you "
diff --git a/debian/po/vi.po b/debian/po/vi.po
index a2d3d89..fad0e7b 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -1,29 +1,30 @@
 # Vietnamese Translation for ifplugd.
-# Copyright © 2005 Free Software Foundation, Inc.
-# Clytie Siddall <clytie@riverland.net.au>, 2005.
+# Copyright © 2006 Free Software Foundation, Inc.
+# Clytie Siddall <clytie@riverland.net.au>, 2005-2006.
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: ifplugd 0.26-2\n"
-"Report-Msgid-Bugs-To: oku@debian.org\n"
-"POT-Creation-Date: 2006-03-27 10:45-0800\n"
-"PO-Revision-Date: 2005-06-04 20:43+0930\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-11-24 07:23+0100\n"
+"PO-Revision-Date: 2006-12-03 18:21+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
-"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Mac PO Editor 1.0a10\n"
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:4
+#: ../ifplugd.templates:1001
 msgid "static interfaces to be watched by ifplugd:"
 msgstr "giao diện tĩnh mà trình ifplugd cần theo dõi:"
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:4
+#: ../ifplugd.templates:1001
 msgid ""
 "Specify the interfaces to control here, separated by spaces. Ifplugd "
 "processes will be started for each of these interfaces when the ifplugd "
@@ -33,122 +34,136 @@ msgid ""
 "Note that the list of interfaces appearing in /proc/net/dev may depend on "
 "which kernel modules you have loaded."
 msgstr ""
-"Hãy ghi rõ vào đây những giao diện cần điều khiển, định giới hai điều bằng "
-"một dấu cách. Sẽ khởi chạy tiến trình ifplugd cho mỗi giao diện trong những "
-"điều ấy, khi tập lệnh khởi động (initscript) được gọi với đối số "
-"«start» (bắt đầu). Bạn có thể sử dụng chuỗi đặc biệt «auto» (tự động) để làm "
-"cho tập lệnh khởi động bắt đầu hay ngừng tiến trình ifplugd cho MỌI giao "
-"diện Ethernet hay giao diện mạng địa phương vô tuyến sẵn sàng tùy theo «/"
-"proc/net/dev». Hãy ghi chú rằng danh sách các giao diện mà xuất hiện trong «/"
-"proc/net/dev» có lẽ phụ thuộc vào mô-đun hạt nhân nào bạn đã tải rồi."
+"Ở đây hãy ghi rõ các giao diện cần điều khiển, định giới bằng dấu cách. Tiến "
+"trình ifplugd sẽ được khởi chạy cho mỗi giao diện khi văn lệnh khởi tạo "
+"ifplugd được gọi với đối số « start » (bắt đầu). Bạn cũng có thể sử dụng "
+"chuỗi ma thuật « auto » (tự động) để làm cho văn lệnh khởi tạo khởi chạy hay "
+"dừng chạy tiến trình ifplugd cho TẤT CẢ các giao diện kiểu eth và wlan có "
+"sẵn tùy theo « /proc/net/dev ». Ghi chú rằng danh sách các giao diện được "
+"hiển thị bằng « /proc/net/dev » có thể phụ thuộc vào những mô-đun hạt nhân "
+"nào bạn đã nạp."
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:4
+#: ../ifplugd.templates:1001
 msgid ""
 "You should not add interfaces that are hotplugged (USB or PCMCIA) here, you "
 "will be asked for those in the next question."
 msgstr ""
-"Đừng thêm vào đây giao diện cầm phít nóng (USB hay PCMCIA): câu hỏi kế tiếp "
-"sẽ hỏi về giao diện loại ấy."
+"Ở đây bạn không nên thêm giao diện được cắm nóng (USB hay PCMCIA); câu hỏi "
+"kế tiếp sẽ yêu cầu chúng."
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:19
+#: ../ifplugd.templates:2001
 msgid "hotplugged interfaces to be watched by ifplugd:"
-msgstr "giao diện cầm phít nóng mà trình ifplugd cần theo dõi:"
+msgstr "giao diện được cắm nóng mà trình ifplugd cần theo dõi:"
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:19
+#: ../ifplugd.templates:2001
 msgid "Specify the hotplugged interfaces to control here, separated by spaces."
 msgstr ""
-"Hãy ghi rõ vào đây những giao diện cầm phít nóng cần điều khiển, định giới "
-"hai điều bằng một dấu cách."
+"Ở đây hãy ghi rõ những giao diện được cắm nóng cần điều khiển, định giới "
+"bằng dấu cách."
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:19
+#: ../ifplugd.templates:2001
 msgid ""
 "You may use the magic string \"all\" to make the hotplug script start an "
 "ifplugd process for any hotplugged interface."
 msgstr ""
-"Bạn có thể sử dụng chuỗi đặc biệt «all» (tất cả) để làm cho tập lệnh cầm "
-"phít nóng bắt đầu một tiến trình ifplugd cho bất cứ giao diện cầm phít nóng "
-"nào."
+"Bạn cũng có khả năng sử dụng chuỗi ma thuật « all » (tất cả) để lam cho văn "
+"lệnh khởi tạo cắm nóng thì khởi chạy một tiến trình ifplugd cho bất cứ giao "
+"diện được cắm nóng nào."
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:19
+#: ../ifplugd.templates:2001
 msgid ""
 "Hotplugged interfaces are usually interfaces on PCMCIA or WLAN adapters."
 msgstr ""
-"Giao diện cầm phít nóng thường là giao diện trên bộ tiếp hợp loại PCMCIA hay "
-"loại mạng địa phương vô tuyến (WLAN)."
+"Giao diện được cắm nóng thường là giao diện nằm trên bộ tiếp hợp kiểu PCMCIA "
+"hay WLAN."
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:30
+#: ../ifplugd.templates:3001
 msgid "arguments to ifplugd:"
-msgstr "đối số cho ifplugd:"
+msgstr "các đối số cho ifplugd:"
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:30
+#: ../ifplugd.templates:3001
 msgid ""
 "You can give arguments to the ifplug daemon here. See the man page for a "
 "description or call ifplugd -h."
 msgstr ""
-"Ở đây thì bạn có thể gán một số đối số cho trình nền (dæmon) ifplugd. Hãy "
-"xem trang hướng dẫn (man) để tìm một mô tả, hay gọi «ifplugd -h» (tùy chọn «-"
-"h» thường có nghĩa là «trợ giúp», tiếng Anh là «help» thì dùng chữ ban đầu "
-"«h»)."
+"Ở đây bạn có thể gán các đối số cho trình nền ifplugd. Xem trang hướng dẫn "
+"(man) để tìm mô tả, hoặc chạy lệnh « ifplugd -h »."
+
+#. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "none"
+msgstr "không có"
+
+#. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "suspend"
+msgstr "ngưng"
+
+#. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "stop"
+msgstr "dừng"
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 msgid "suspend behaviour:"
-msgstr "hành vi tạm dừng hoạt động:"
+msgstr "ứng xử ngưng:"
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 msgid ""
 "When you put your notebook into suspend mode, you can choose between three "
 "actions:"
 msgstr ""
-"Khi bạn chọn chế độ tạm dừng hoạt động trong máy tính xách tay thì có thể "
-"chọn trong hai hành động này:"
+"Khi bạn đặt máy tính xách tay vào chế độ ngưng, bạn có khả năng chọn trong "
+"ba hành động khác nhau :"
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 msgid "none: no action"
-msgstr "không có: không có hành động nào"
+msgstr "không có : không có hành động nào"
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 msgid ""
 "suspend: this puts ifplugd into suspend mode. In this mode, ifplugd does not "
 "check the link status. This is necessary for some broken network drivers."
 msgstr ""
-"tạm dừng hoạt động: nó làm cho trình ifplugd tạm dừng hoạt động. Trong chế "
-"độ này, trình ifplugd không kiểm tra trạng thái liên kết. Làm như thế cần "
-"thiết cho một số trình hỗ trợ thiết bị mạng bị hỏng."
+"ngưng: đặt ifplugd vào chế độ ngưng. Trong chế độ này, ifplugd không kiểm "
+"tra trạng thái của liên kết, mà cần thiết cho một số trình điều khiển mạng "
+"bị hỏng."
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
-#, fuzzy
+#: ../ifplugd.templates:4002
 msgid ""
 "stop: this stops ifplugd. If the -q option is not given, ifplugd will stop "
 "the interface. After resume, it will be restarted. This makes sense if you "
 "use some mechanism (eg. guessnet or whereami) to detect your network "
 "environment, which may have changed while suspending."
 msgstr ""
-"ngừng: nó ngừng trình ifplugd. Nếu không nhận tùy chọn «-q» thì trình "
-"ifplugd sẽ ngừng giao diện ấy. Sau khi tiếp tục, giao diện sẽ khởi động lại. "
-"Nó hữu ích nếu bạn sử dụng một chế độ nào đó (v.d. «guessnet» hay "
-"«whereami») để phát hiện môi trường mạng mình, mà có lẽ đã thay đổi trong "
-"khi tạm dừng hoạt động."
+"dừng: dừng chạy ifplugd. Nếu tùy chọn « -q » không được đưa ra, ifplugd sẽ "
+"dừng chạy giao diện đó. Sau khi tiếp tục lại, nó sẽ được khởi chạy lại. Có "
+"ích nếu bạn sử dụng cơ chế nào (v.d. guessnet hay whereami) để phát hiện môi "
+"trường mạng của bạn, mà có thể đã thay đổi trong khi ngưng."
diff --git a/debian/po/zh_TW.po b/debian/po/zh_TW.po
index 6fbf972..bc42bca 100644
--- a/debian/po/zh_TW.po
+++ b/debian/po/zh_TW.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ifplugd\n"
-"Report-Msgid-Bugs-To: oku@debian.org\n"
-"POT-Creation-Date: 2006-03-27 10:45-0800\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-11-24 07:23+0100\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"
@@ -27,13 +27,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:4
+#: ../ifplugd.templates:1001
 msgid "static interfaces to be watched by ifplugd:"
 msgstr "由 ifpluged 監控的固定裝置"
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:4
+#: ../ifplugd.templates:1001
 msgid ""
 "Specify the interfaces to control here, separated by spaces. Ifplugd "
 "processes will be started for each of these interfaces when the ifplugd "
@@ -50,7 +50,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:4
+#: ../ifplugd.templates:1001
 msgid ""
 "You should not add interfaces that are hotplugged (USB or PCMCIA) here, you "
 "will be asked for those in the next question."
@@ -59,19 +59,19 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:19
+#: ../ifplugd.templates:2001
 msgid "hotplugged interfaces to be watched by ifplugd:"
 msgstr "由 ifplugd 監控的熱插拔裝置"
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:19
+#: ../ifplugd.templates:2001
 msgid "Specify the hotplugged interfaces to control here, separated by spaces."
 msgstr "輸入要控制的熱插拔裝置，以空白區格。"
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:19
+#: ../ifplugd.templates:2001
 msgid ""
 "You may use the magic string \"all\" to make the hotplug script start an "
 "ifplugd process for any hotplugged interface."
@@ -81,34 +81,52 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:19
+#: ../ifplugd.templates:2001
 msgid ""
 "Hotplugged interfaces are usually interfaces on PCMCIA or WLAN adapters."
 msgstr "熱插拔裝置通常是 PCMCIA 或 WLAN 介面卡。"
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:30
+#: ../ifplugd.templates:3001
 msgid "arguments to ifplugd:"
 msgstr "ifplugd 參數"
 
 #. Type: string
 #. Description
-#: ../ifplugd.templates:30
+#: ../ifplugd.templates:3001
 msgid ""
 "You can give arguments to the ifplug daemon here. See the man page for a "
 "description or call ifplugd -h."
 msgstr "輸入 ifplugd daemon 的參數。參閱說明文件的敘述或執行 ifplugd -h。"
 
 #. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "none"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "suspend"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "stop"
+msgstr ""
+
+#. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 msgid "suspend behaviour:"
 msgstr "suspend behaviour"
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 msgid ""
 "When you put your notebook into suspend mode, you can choose between three "
 "actions:"
@@ -116,13 +134,13 @@ msgstr "當您的筆記型電腦進入休眠時，您可以選擇三種行為"
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 msgid "none: no action"
 msgstr "none：無動作"
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 msgid ""
 "suspend: this puts ifplugd into suspend mode. In this mode, ifplugd does not "
 "check the link status. This is necessary for some broken network drivers."
@@ -132,7 +150,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../ifplugd.templates:38
+#: ../ifplugd.templates:4002
 #, fuzzy
 msgid ""
 "stop: this stops ifplugd. If the -q option is not given, ifplugd will stop "
diff --git a/debian/rules b/debian/rules
index a4866eb..f66c68b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -68,7 +68,7 @@ install: build
 	# now handled by debconf:
 	rm -f $(CURDIR)/debian/ifplugd/etc/ifplugd/ifplugd.conf
 	install -m 755 debian/ifplugd.udev.agent $(CURDIR)/debian/ifplugd/lib/udev/ifplugd.agent
-	install -m 755 debian/ifplugd.udev.rules $(CURDIR)/debian/ifplugd/etc/udev/ifplugd.rules
+	install -m 644 debian/ifplugd.udev.rules $(CURDIR)/debian/ifplugd/etc/udev/ifplugd.rules
 	mkdir -p $(CURDIR)/debian/ifplugd/etc/ifplugd/action.d/
 	install -m 755 debian/ifplugd.action $(CURDIR)/debian/ifplugd/etc/ifplugd/
 	install -m 755 debian/ifupdown.action $(CURDIR)/debian/ifplugd/etc/ifplugd/action.d/ifupdown
@@ -81,7 +81,7 @@ binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs 
-	dh_installdocs doc/{NEWS,README,README.html,style.css,SUPPORTED_DRIVERS} patches
+	dh_installdocs
 	dh_installdebconf -- debian/ifplugd.templates
 	dh_installinit
 	dh_installman man/*.5 man/*.8