Slackware 14.0slackware-14.0

Wed Sep 26 01:10:42 UTC 2012 Slackware 14.0 x86_64 stable is released! We're perfectionists here at Slackware, so this release has been a long time a-brewing. But we think you'll agree that it was worth the wait. Slackware 14.0 combines modern components, ease of use, and flexible configuration... our "KISS" philosophy demands it. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. Thanks to everyone who helped make this happen. The Slackware team, the upstream developers, and (of course) the awesome Slackware user community. Have fun! :-)
author: Patrick J Volkerding <volkerdi@slackware.com> 2012-09-26 01:10:42 +0000
committer: Eric Hameleers <alien@slackware.com> 2018-05-31 22:51:55 +0200
commit: 9664bee729d487bcc0a0bc35859f8e13d5421c75 (patch)
tree: b428a16618e36ed864a8d76ea3435e19a452bf90 /source/n
parent: 75a4a592e5ccda30715f93563d741b83e0dcf39e (diff)
download: current-9664bee729d487bcc0a0bc35859f8e13d5421c75.tar.gz
current-9664bee729d487bcc0a0bc35859f8e13d5421c75.tar.xz
203 files changed, 3728 insertions, 36930 deletions
diff --git a/source/n/ModemManager/ModemManager.SlackBuild b/source/n/ModemManager/ModemManager.SlackBuild
new file mode 100755
index 000000000..5089e02d8
--- /dev/null
+++ b/source/n/ModemManager/ModemManager.SlackBuild
@@ -0,0 +1,105 @@
+#!/bin/sh
+
+# Slackware build script for ModemManager
+
+# Copyright 2010, 2011  Robby Workman, Northport, Alabama, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Modified by Eric Hameleers, Eindhoven, NL
+
+PKGNAM=ModemManager
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
+BUILD=${BUILD:-1}
+TAG=${TAG:-}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z*
+cd $PKGNAM-$VERSION
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --with-pppd-plugin-dir=/usr/lib${LIBDIRSUFFIX}/pppd/2.4.5 \
+  --build=$ARCH-slackware-linux
+
+make $NUMJOBS
+make install DESTDIR=$PKG
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING ChangeLog INSTALL NEWS README \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+cat $CWD/$PKGNAM.SlackBuild > $PKG/usr/doc/$PKGNAM-$VERSION/$PKGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PKGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz}
+
diff --git a/source/n/ModemManager/slack-desc b/source/n/ModemManager/slack-desc
new file mode 100644
index 000000000..2455ad8ef
--- /dev/null
+++ b/source/n/ModemManager/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+            |-----handy-ruler------------------------------------------------------|
+ModemManager: ModemManager (mobile broadband modem API)
+ModemManager:
+ModemManager: ModemManager provides a unified high level API for communicating with
+ModemManager: mobile broadband modems. 
+ModemManager:
+ModemManager:
+ModemManager:
+ModemManager:
+ModemManager: For more info, see:
+ModemManager:   http://cgit.freedesktop.org/ModemManager/ModemManager/
+ModemManager:
diff --git a/source/n/NetworkManager/11-initialize-nm-remote-settings.patch b/source/n/NetworkManager/11-initialize-nm-remote-settings.patch
new file mode 100644
index 000000000..fff4194ba
--- /dev/null
+++ b/source/n/NetworkManager/11-initialize-nm-remote-settings.patch
@@ -0,0 +1,27 @@
+commit dd0460697c4e281fe277b53916d5251332e1aafc
+Author: Jiří Klimeš <jklimes@redhat.com>
+Date:   Tue Mar 27 22:36:55 2012 +0200
+
+    libnm-glib: initialize NMRemoteSettings in nm_remote_settings_new() (rh #806664)
+    
+    The object was not initialized after creation in nm_remote_settings_new(). This
+    was a regression caused by 762df85234e7a042a2a5d31053e6cc273ae3e2ec.
+
+diff --git a/libnm-glib/nm-remote-settings.c b/libnm-glib/nm-remote-settings.c
+index 8f213f9..b6b6c18 100644
+--- a/libnm-glib/nm-remote-settings.c
++++ b/libnm-glib/nm-remote-settings.c
+@@ -728,7 +728,12 @@ properties_changed_cb (DBusGProxy *proxy,
+ NMRemoteSettings *
+ nm_remote_settings_new (DBusGConnection *bus)
+ {
+-	return g_object_new (NM_TYPE_REMOTE_SETTINGS, NM_REMOTE_SETTINGS_BUS, bus, NULL);
++	NMRemoteSettings *settings;
++
++	settings = g_object_new (NM_TYPE_REMOTE_SETTINGS, NM_REMOTE_SETTINGS_BUS, bus, NULL);
++
++	_nm_remote_settings_ensure_inited (settings);
++	return settings;
+ }
+ 
+ static void
diff --git a/source/n/NetworkManager/55NetworkManager b/source/n/NetworkManager/55NetworkManager
new file mode 100644
index 000000000..f3c6df5e5
--- /dev/null
+++ b/source/n/NetworkManager/55NetworkManager
@@ -0,0 +1,42 @@
+#!/bin/sh
+# If we are running NetworkManager, tell it we are going to sleep.
+# TODO: Make NetworkManager smarter about how to handle sleep/resume
+#       If we are asleep for less time than it takes for TCP to reset a
+#       connection, and we are assigned the same IP on resume, we should
+#       not break established connections.  Apple can do this, and it is
+#       rather nifty.
+
+. "${PM_FUNCTIONS}"
+
+suspend_nm()
+{
+	# Tell NetworkManager to shut down networking
+        printf "Having NetworkManager put all interaces to sleep..."
+	dbus_send --system                         \
+		--dest=org.freedesktop.NetworkManager  \
+		/org/freedesktop/NetworkManager        \
+		org.freedesktop.NetworkManager.sleep && \
+	    echo Done. || echo Failed.
+}
+
+resume_nm()
+{
+	# Wake up NetworkManager and make it do a new connection
+	printf "Having NetworkManager wake interfaces back up..."
+        dbus_send --system                        \
+		--dest=org.freedesktop.NetworkManager \
+		/org/freedesktop/NetworkManager       \
+		org.freedesktop.NetworkManager.wake && \
+	    echo Done. || echo Failed.
+}
+
+case "$1" in
+	hibernate|suspend)
+		suspend_nm
+		;;
+	thaw|resume)
+		resume_nm
+		;;
+	*) exit $NA
+		;;
+esac
diff --git a/source/n/NetworkManager/NetworkManager.SlackBuild b/source/n/NetworkManager/NetworkManager.SlackBuild
new file mode 100755
index 000000000..d7e9d1f8b
--- /dev/null
+++ b/source/n/NetworkManager/NetworkManager.SlackBuild
@@ -0,0 +1,154 @@
+#!/bin/sh
+
+# Slackware build script for NetworkManager
+
+# Copyright 2010,2011  Robby Workman, Northport, Alabama, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Modified 2011, 2012  by Eric Hameleers, Eindhoven, NL
+
+PKGNAM=NetworkManager
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-2}
+TAG=${TAG:-}
+
+# Automatically determine the architecture we're building on:
+MARCH=$( uname -m )
+if [ -z "$ARCH" ]; then
+  case "$MARCH" in
+    i?86)    export ARCH=i486 ;;
+    armv7hl) export ARCH=$MARCH ;;
+    arm*)    export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+    *)       export ARCH=$MARCH ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "armv7hl" ]; then
+  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
+  LIBDIRSUFFIX=""
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION || exit 1
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+zcat $CWD/11-initialize-nm-remote-settings.patch.gz | patch -p1 --verbose || exit 1
+
+# Find the version off pppd installed or else assume we are on -current:
+PPPD=$( basename $(find /usr/lib${LIBDIRSUFFIX}/pppd -type d -maxdepth 1 -mindepth 1) )
+[ -z "$PPPD" ] && PPPD=2.4.5
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --with-pppd-plugin-dir=/usr/lib${LIBDIRSUFFIX}/pppd/$PPPD \
+  --with-crypto=nss \
+  --enable-more-warnings=no \
+  --without-resolvconf \
+  --with-dhcpcd=/sbin/dhcpcd \
+  --with-dhclient=yes \
+  --build=$TARGET || exit 1
+
+make $NUMJOBS || exit 1
+make install DESTDIR=$PKG || exit 1
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+# Don't run NetworkManager by default just because it got installed.
+# Instead, the init script will have to be made executable first.
+# This should avoid nasty surprises on potentially remotely located machines.
+chmod 644 $PKG/etc/rc.d/rc.networkmanager
+
+# Don't clobber existing rc.networkmanager
+mv $PKG/etc/rc.d/rc.networkmanager $PKG/etc/rc.d/rc.networkmanager.new
+
+# Add a 'starter' NetworkManager.conf file
+# This sets the hostname (during postinstall) to match the system's name
+# and defines dhcpcd as the dhcp client to use
+mkdir -p $PKG/etc/NetworkManager
+cat $CWD/NetworkManager.conf.new > \
+    $PKG/etc/NetworkManager/NetworkManager.conf.new
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS CONTRIBUTING COPYING ChangeLog INSTALL NEWS README TODO \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+# In case someone needs this still:
+cp $CWD/55NetworkManager $PKG/usr/doc/$PKGNAM-$VERSION/
+cat $CWD/$PKGNAM.SlackBuild > $PKG/usr/doc/$PKGNAM-$VERSION/$PKGNAM.SlackBuild
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  cat ChangeLog | head -n 1000 > $PKG/usr/doc/$PKGNAM-$VERSION/ChangeLog
+  touch -r ChangeLog $PKG/usr/doc/$PKGNAM-$VERSION/ChangeLog
+fi
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PKGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz}
+
diff --git a/source/n/NetworkManager/NetworkManager.conf.new b/source/n/NetworkManager/NetworkManager.conf.new
new file mode 100644
index 000000000..71945e907
--- /dev/null
+++ b/source/n/NetworkManager/NetworkManager.conf.new
@@ -0,0 +1,11 @@
+# /etc/NetworkManager/NetworkManager.conf
+#
+# See NetworkManager.conf(5) for more information on this file
+
+[main]
+plugins=keyfile
+dhcp=dhcpcd
+
+[keyfile]
+hostname=yourhostname
+
diff --git a/source/n/NetworkManager/README b/source/n/NetworkManager/README
new file mode 100644
index 000000000..5556f27f8
--- /dev/null
+++ b/source/n/NetworkManager/README
@@ -0,0 +1,15 @@
+NetworkManager attempts to keep an active network connection available at all
+times.  The point of NetworkManager is to make networking configuration and
+setup as painless and automatic as possible.  NetworkManager is intended to
+replace default route, replace other routes, set IP addresses, and in general
+configure networking as NM sees fit (with the possibility of manual override as
+necessary).  In effect, the goal of NetworkManager is to make networking Just
+Work with a minimum of user hassle, but still allow customization and a high
+level of manual network control.
+
+You will probably want to install network-manager-applet (for a configuration
+UI) for sure, along with ModemManager (if you want support for configuring
+broadband modem connections) perhaps one or more of the VPN-related addons.
+
+You will also need to start rc.networkmanager during boot - you can use
+rc.local, or perhaps you'll want to edit rc.M's call to rc.wicd...  :-)
diff --git a/source/n/NetworkManager/doinst.sh b/source/n/NetworkManager/doinst.sh
new file mode 100644
index 000000000..2b419b26b
--- /dev/null
+++ b/source/n/NetworkManager/doinst.sh
@@ -0,0 +1,32 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname ${NEW})/$(basename ${NEW} .new)"
+  if [ -e ${OLD} ]; then
+    cp -a ${OLD} ${NEW}.incoming
+    cat ${NEW} > ${NEW}.incoming
+    mv ${NEW}.incoming ${NEW}
+  fi
+  config ${NEW}
+}
+
+if [ -e etc/HOSTNAME ]; then
+  sed -i "s,yourhostname,$(cat etc/HOSTNAME | cut -f1 -d .)," \
+    etc/NetworkManager/NetworkManager.conf.new
+fi
+
+preserve_perms etc/rc.d/rc.networkmanager.new
+config etc/NetworkManager/NetworkManager.conf.new
+
diff --git a/source/n/NetworkManager/slack-desc b/source/n/NetworkManager/slack-desc
new file mode 100644
index 000000000..2a47aaa38
--- /dev/null
+++ b/source/n/NetworkManager/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+              |-----handy-ruler------------------------------------------------------|
+NetworkManager: NetworkManager (Networking that Just Works)
+NetworkManager:
+NetworkManager: The point of NetworkManager is to make networking configuration and
+NetworkManager: setup as painless and automatic as possible.  NetworkManager sets IP
+NetworkManager: addresses, default routes, associating with wireless access points
+NetworkManager: or wired LANs, and other network configuration settings in a simple,
+NetworkManager: automated fashion (manual overrides are still possible).
+NetworkManager:
+NetworkManager:
+NetworkManager: Home page: http://projects.gnome.org/NetworkManager/
+NetworkManager:
diff --git a/source/n/alpine/alpine.SlackBuild b/source/n/alpine/alpine.SlackBuild
index 1dd64e6a6..07961ff2c 100755
--- a/source/n/alpine/alpine.SlackBuild
+++ b/source/n/alpine/alpine.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,9 @@
 
 
 PKGNAM=alpine
-VERSION=${VERSION:-2.00}
-ALPINEBUILD=${ALPINEBUILD:-3}
-IMAPDBUILD=${IMAPDBUILD:-2}
+VERSION=${VERSION:-2.02}
+ALPINEBUILD=${ALPINEBUILD:-1}
+IMAPDBUILD=${IMAPDBUILD:-1}
 PINEPGP=${PINEPGP:-0.18.0}
 
 # Automatically determine the architecture we're building on:
@@ -37,8 +37,8 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# There are reports that > 1 won't work here:
-NUMJOBS=${NUMJOBS:-" -j1 "}
+# We don't use this below as it breaks the build.
+NUMJOBS=${NUMJOBS:-" -j6 "}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -55,9 +55,9 @@ elif [ "$ARCH" = "x86_64" ]; then
 fi
 
 cd $TMP
-rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
-cd ${PKGNAM}-$VERSION
+rm -rf re-alpine-${VERSION}
+tar xvf $CWD/re-alpine-$VERSION.tar.?z* || exit 1
+cd re-alpine-$VERSION
 
 # Make sure ownerships and permissions are sane:
 chown -R root:root .
@@ -86,17 +86,12 @@ CFLAGS="$SLKCFLAGS" \
   --program-suffix= \
   --build=$ARCH-slackware-linux
 
-# This seems to ignore sysconfdir and libdir, so it's pretty useless to try them.
-# Brute-force it.
-# Eric says: no! Use configure parameters.
-#zcat $CWD/alpine.config.h.diff.gz | patch -p1 --verbose || exit 1
-
 # Correct paths and programs in tech-notes.txt:
 zcat $CWD/alpine.tech-notes.txt.diff.gz | patch -p1 --verbose || exit 1
 
 # Build and install:
 # Since we build non-compliant to RFC3501 we have to answer 'y' half-way:
-echo y | make $NUMJOBS EXTRACFLAGS="-fPIC" SSLTYPE=unix || exit 1
+echo y | make EXTRACFLAGS="-fPIC" SSLTYPE=unix || exit 1
 
 make install SSLTYPE=unix DESTDIR=$PKG || exit 1
 
@@ -171,11 +166,10 @@ PKG2=/tmp/package-imapd
 cd $TMP
 rm -rf $PKG2
 mkdir -p $PKG2
-cd ${PKGNAM}-$VERSION/imap
+cd re-alpine-$VERSION/imap
 mkdir -p $PKG2/usr/doc/imapd-$VERSION
 cp -a \
   CONTENTS LICENSE.txt NOTICE SUPPORT \
-  imap/docs/md5.txt \
   $PKG2/usr/doc/imapd-$VERSION
 cat << EOF > $PKG2/usr/doc/imapd-$VERSION/additional-imap-documentation
 Additional documentation for imapd may be found in the alpine
diff --git a/source/n/alpine/alpine.config.h.diff b/source/n/alpine/alpine.config.h.diff
deleted file mode 100644
index 03064373e..000000000
--- a/source/n/alpine/alpine.config.h.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./include/config.h.orig	2008-08-06 20:59:51.000000000 -0500
-+++ ./include/config.h	2008-08-06 21:00:37.000000000 -0500
-@@ -557,10 +557,10 @@
- #define STDC_HEADERS 1
- 
- /* System pinerc */
--#define SYSTEM_PINERC "/usr/lib/pine.conf"
-+#define SYSTEM_PINERC "/etc/pine.conf"
- 
- /* System fixed pinerc */
--#define SYSTEM_PINERC_FIXED "/usr/lib/pine.conf.fixed"
-+#define SYSTEM_PINERC_FIXED "/etc/pine.conf.fixed"
- 
- /* Pine-Centric Host Specifier */
- #define SYSTYPE "LNX"
diff --git a/source/n/bind/bind.SlackBuild b/source/n/bind/bind.SlackBuild
index dc7014a35..eed6f86a3 100755
--- a/source/n/bind/bind.SlackBuild
+++ b/source/n/bind/bind.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,8 +22,8 @@
 
 
 PKGNAM=bind
-VERSION=${VERSION:-9.7.3}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-9.9.1-P3}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/n/bind/caching-example/named.root b/source/n/bind/caching-example/named.root
index d081faaf5..8fbbb656b 100644
--- a/source/n/bind/caching-example/named.root
+++ b/source/n/bind/caching-example/named.root
@@ -9,8 +9,8 @@
 ;           on server           FTP.INTERNIC.NET
 ;       -OR-                    RS.INTERNIC.NET
 ;
-;       last update:    Jun 17, 2010
-;       related version of root zone:   2010061700
+;       last update:    Jun 8, 2011
+;       related version of root zone:   2011060800
 ;
 ; formerly NS.INTERNIC.NET
 ;
@@ -32,6 +32,7 @@ C.ROOT-SERVERS.NET.      3600000      A     192.33.4.12
 ;
 .                        3600000      NS    D.ROOT-SERVERS.NET.
 D.ROOT-SERVERS.NET.      3600000      A     128.8.10.90
+D.ROOT-SERVERS.NET.	 3600000      AAAA  2001:500:2D::D
 ;
 ; FORMERLY NS.NASA.GOV
 ;
diff --git a/source/n/bluez-hcidump/bluez-hcidump-2.4.tar.sign b/source/n/bluez-hcidump/bluez-hcidump-2.4.tar.sign
new file mode 100644
index 000000000..42ee696a1
--- /dev/null
+++ b/source/n/bluez-hcidump/bluez-hcidump-2.4.tar.sign
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+iQIcBAABAgAGBQJPkb1tAAoJEAbKn10dzyZZFUkP/A2hX9Rjeg16vDfycTRnDJy2
+jrcA2ExrKnb8uYgvCuYlY1cXb+tS5xCGQt1YlFowV9ukx9tt5C0krAIKjfeZ90tJ
+o/nD/us60t0n5sAOK230W1l8XBDuawnIN3zjznLCzntybOyl5lc9Uia5tCCd69rg
+7UOmj6Ahsk0g8GEqIQgYhddM6Q/HQNjKGKqYPzjdInORgJz+C5E/ONpbsbL8MAfG
+t/8S1CfnBuwaRCM8pUdCBLO2bj7oKHLE/vipccorMWDuXEsU1a1rilbbBlONLLFb
+pgfqjkpAdqgICS9+YkdA7e+i/Ha2B0hS1qS7x5PGApSwWXaxNDMiaksMEHkh4B6A
+b1va/nOepb+IlS67tF/SB0S7PyUyuKpBv6Ln8dpdz5gwbyJ2XGDNdmhe/4zTFjiv
+HVrvS3Ms0ULv7NRX9rXiNEK1rmJ61uVzHInMJQUcASr4ZrdYSaCZ53Ejr+bqCDWV
+DogI+ZSHOBgDSCSbY0UMhQtqxOE24vgT8IlJwQJNFMhRXpj550Jz1qbjUGNybnAI
+fNYJ8RxdoLriJUY7+MmniUvcen6vAd/yXI4sp+GF6Akt72gkCA0T0Y41vIL3sQnj
+M26O9Nn+j/GowSYATEj6QCWUCBH/BUxau+9tQfq7axiMOeiYJOAe3yciW6pP1Ysh
+ZVBKF6fOxaegTPiooruJ
+=q5pj
+-----END PGP SIGNATURE-----
diff --git a/source/n/bluez-hcidump/bluez-hcidump.SlackBuild b/source/n/bluez-hcidump/bluez-hcidump.SlackBuild
index e03037ab4..247e67dc4 100755
--- a/source/n/bluez-hcidump/bluez-hcidump.SlackBuild
+++ b/source/n/bluez-hcidump/bluez-hcidump.SlackBuild
@@ -22,7 +22,7 @@
 
 
 PKGNAM=bluez-hcidump
-VERSION=${VERSION:-2.0}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
@@ -76,7 +76,6 @@ CFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --sysconfdir=/etc \
   --mandir=/usr/man \
-  --disable-static \
   --build=$ARCH-slackware-linux
 
 # Build and install:
diff --git a/source/n/bluez/bluez-4.91.tar.sign b/source/n/bluez/bluez-4.91.tar.sign
deleted file mode 100644
index bb9b05b69..000000000
--- a/source/n/bluez/bluez-4.91.tar.sign
+++ /dev/null
@@ -1,8 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-Comment: See http://www.kernel.org/signature.html for info
-
-iD8DBQBNkiAFyGugalF9Dw4RAqa6AJ9bxkhDm2sW6JqVMT8JwSa/5eFZaQCbBuKA
-27f95iFeuRTVrhRkoFiTOto=
-=u4px
------END PGP SIGNATURE-----
diff --git a/source/n/bluez/bluez-4.99.tar.sign b/source/n/bluez/bluez-4.99.tar.sign
new file mode 100644
index 000000000..a9a039be3
--- /dev/null
+++ b/source/n/bluez/bluez-4.99.tar.sign
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+iQIcBAABAgAGBQJPVkejAAoJEAbKn10dzyZZ0rEP/1BvYxUAoYf0cP2pQIqDwzkV
+l9PSVsxKq/n3rNwKEWBufo3heHYxVAG5prlPiY8yHj4Q0tFNiCSPL+zLObG++iDy
+3x+wxmaNaqbYurXQolHOqmH1L4OeMqT3mdzlb7xN48RLHLiS0XwTUMu2VBcM00me
+nd03q+7gV6c1v3bXrDalUJuQQYHeubSLT6YMDKmMj/7PiLfA8hEoOE1uWefcBcas
+B9xi5IBY208Cdq5odL6ae8ybvvG/PTDSFAOZNCzqIjJMYEwBosh1TbPN1AvUu1z2
+bzbgAa3oaRXnGZNDJ07pwa+2A+jAAtDRNO2R6z5lovpT568nwY6bmDIvbcIHuMHj
+xhrhbUvPnhIcn+no+WkAtYjNe8ydcdH8BkeA7o1oauRAYJlGoTIVugobu2a608NN
+7bGChWnhTPaKty8p0NGuE5gFvMwwLeE3W3d50+JH6icNBZbZOYK+88q1OI9hTHSW
+fUm/tydzqRwPDuqgt6CiYxT49AuwQ+MjfED0fwvlfta8A+tYUDkgaOkpUcJvq8v/
+Bnd0mUkT7l2fiymw7hfzJEh9EXBWmXJBs77zkYPBmzv/YDSCpMWZuEHI7gvcBu4j
+BN/+pJfYwo/kPRS0nXc/Xt438H806SUdvD926MmRwmg5jYmBRVJSemYtPHfkC03L
+MO/geWyy5aH5w/+THCgN
+=BIdO
+-----END PGP SIGNATURE-----
diff --git a/source/n/bluez/bluez.SlackBuild b/source/n/bluez/bluez.SlackBuild
index 0403c932b..d77c15149 100755
--- a/source/n/bluez/bluez.SlackBuild
+++ b/source/n/bluez/bluez.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for bluez - http://www.bluez.org
 
-# Copyright 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2009, 2010, 2011, 2012  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PKGNAM=bluez
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -70,16 +70,8 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-# Fixup the dbus config file for our usage:
-zcat $CWD/patches/bluez-dbus-config.patch.gz | patch -p1 --verbose || exit 1
-
-# Use a wrapper to check rc.bluetooth mode before starting bluetoothd
-zcat $CWD/patches/bluez-run_udev_helper.patch.gz | patch -p1 --verbose || exit 1
-
-# Unbreak a Dell USB mouse
-# https://bugzilla.novell.com/show_bug.cgi?id=522287
-# https://bugzilla.redhat.com/show_bug.cgi?id=517088
-zcat $CWD/patches/bluez-unbreak_dell_mouse.patch.gz | patch -p1 --verbose || exit 1
+# Enable the audio socket in audio.conf:
+zcat $CWD/bluez.enable.audio.socket.diff.gz | patch -p1 --verbose || exit 1
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -89,10 +81,13 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --mandir=/usr/man \
   --localstatedir=/var \
+  --enable-datafiles \
+  --enable-audio \
   --enable-gstreamer \
   --enable-alsa \
   --enable-usb \
   --enable-tools\
+  --enable-input \
   --enable-bccmd \
   --enable-hid2hci \
   --enable-dfutool \
@@ -101,38 +96,30 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-dund \
   --enable-cups \
   --enable-service \
-  --enable-udevrules \
-  --enable-configfiles \
+  --enable-network \
+  --enable-serial \
+  --enable-health \
+  --enable-pnat \
+  --enable-maemo6 \
+  --enable-wiimote \
+  --enable-test \
+  --enable-dbusoob \
+  --with-ouifile=/usr/share/hwdata/oui.txt \
   --disable-silent-rules \
   --build=$ARCH-slackware-linux
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
-# I'm don't think we need this, but I'll leave it commented just in case:
-# http://bugs.archlinux.org/task/4930
-# The dbus-1 and bluetooth linkages are obvious, but I had to get the rt and
-# pthread ones from the old bluez-utils (VERSION=3.36) tests/Makefile
-#gcc $SLKCFLAGS $(pkg-config --cflags dbus-1) -DVERSION=3.36 \
-#  -L$(pwd)/lib/.libs -ldbus-1 -lbluetooth -lpthread -lrt \
-#  $CWD/passkey-agent.c -o $PKG/usr/bin/passkey-agent || exit 1
-
+cp scripts/bluetooth-serial.rules $PKG/lib/udev/rules.d/97-bluetooth-serial.rules || exit 1
 cp -a scripts/bluetooth_serial $PKG/lib/udev/bluetooth_serial || exit 1
 chmod 0755 $PKG/lib/udev/bluetooth_serial
 
-cat $CWD/config/bluetooth.sh > $PKG/lib/udev/bluetooth.sh
-chmod 0755 $PKG/lib/udev/bluetooth.sh
-
-# SuSE says this is safe... :-)
-mkdir -p $PKG/etc/modprobe.d
-cat $CWD/config/bluetooth.modprobe > $PKG/etc/modprobe.d/bluetooth.conf
-
 mkdir -p $PKG/etc/bluetooth
 cp -a audio/audio.conf $PKG/etc/bluetooth
 cp -a input/input.conf $PKG/etc/bluetooth
 cp -a network/network.conf $PKG/etc/bluetooth
 cp -a serial/serial.conf $PKG/etc/bluetooth
-cp -a tools/rfcomm.conf $PKG/etc/bluetooth
 chmod 644 $PKG/etc/bluetooth/*.conf
 
 mkdir -p $PKG/etc/alsa
diff --git a/source/n/bluez/bluez.enable.audio.socket.diff b/source/n/bluez/bluez.enable.audio.socket.diff
new file mode 100644
index 000000000..52b9d0c6b
--- /dev/null
+++ b/source/n/bluez/bluez.enable.audio.socket.diff
@@ -0,0 +1,12 @@
+--- ./audio/audio.conf.orig	2010-08-25 00:10:02.000000000 -0500
++++ ./audio/audio.conf	2012-09-09 12:36:31.766492102 -0500
+@@ -4,6 +4,9 @@
+ # particular interface
+ [General]
+ 
++# Enable the audio socket
++Enable=Socket
++
+ # Switch to master role for incoming connections (defaults to true)
+ #Master=true
+ 
diff --git a/source/n/bluez/config/bluetooth.sh b/source/n/bluez/config/bluetooth.sh
deleted file mode 100644
index 22034551c..000000000
--- a/source/n/bluez/config/bluetooth.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# Check whether /etc/rc.d/rc.bluetooth is executable before starting
-# the bluetooth subsystem for hotplugged bluetooth devices
-[ -x /etc/rc.d/rc.bluetooth ] && exec /usr/sbin/bluetoothd --udev
-exit 0
-
diff --git a/source/n/bluez/config/rc.bluetooth b/source/n/bluez/config/rc.bluetooth
index 12540d833..296c45422 100644
--- a/source/n/bluez/config/rc.bluetooth
+++ b/source/n/bluez/config/rc.bluetooth
@@ -1,12 +1,11 @@
 #!/bin/sh
 
 bluez_start() {
-  # bluetoothd requires dbus, but dbus isn't started early enough during
-  # system boot, so we have to re-trigger the events now
-  udevadm trigger --subsystem-match=bluetooth --action=add
+  /usr/sbin/bluetoothd
 }
 
 bluez_stop() {
+  udevadm trigger --subsystem-match=bluetooth --action=remove
   pkill -TERM bluetoothd 1>/dev/null 2>/dev/null
 }
 
diff --git a/source/n/bluez/doinst.sh b/source/n/bluez/doinst.sh
index 0d4dde1da..fe68ad7f4 100644
--- a/source/n/bluez/doinst.sh
+++ b/source/n/bluez/doinst.sh
@@ -25,5 +25,4 @@ config etc/bluetooth/main.conf.new
 config etc/bluetooth/network.conf.new
 config etc/bluetooth/serial.conf.new
 config etc/bluetooth/rfcomm.conf.new
-config etc/modprobe.d/bluetooth.conf.new
 
diff --git a/source/n/bluez/passkey-agent.c b/source/n/bluez/passkey-agent.c
deleted file mode 100644
index 8ac91d27d..000000000
--- a/source/n/bluez/passkey-agent.c
+++ /dev/null
@@ -1,418 +0,0 @@
-/*
- *
- *  BlueZ - Bluetooth protocol stack for Linux
- *
- *  Copyright (C) 2004-2008  Marcel Holtmann <marcel@holtmann.org>
- *
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <getopt.h>
-#include <string.h>
-
-#include <dbus/dbus.h>
-
-#define INTERFACE "org.bluez.Security"
-
-static char *passkey = NULL;
-static char *address = NULL;
-
-static int do_reject = 0;
-
-static volatile sig_atomic_t __io_canceled = 0;
-static volatile sig_atomic_t __io_terminated = 0;
-
-static void sig_term(int sig)
-{
-	__io_canceled = 1;
-}
-
-static DBusHandlerResult agent_filter(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	const char *name, *old, *new;
-
-	if (!dbus_message_is_signal(msg, DBUS_INTERFACE_DBUS, "NameOwnerChanged"))
-		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-
-	if (!dbus_message_get_args(msg, NULL,
-			DBUS_TYPE_STRING, &name, DBUS_TYPE_STRING, &old,
-				DBUS_TYPE_STRING, &new, DBUS_TYPE_INVALID)) {
-		fprintf(stderr, "Invalid arguments for NameOwnerChanged signal");
-		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-	}
-
-	if (!strcmp(name, "org.bluez") && *new == '\0') {
-		fprintf(stderr, "Passkey service has been terminated\n");
-		__io_terminated = 1;
-	}
-
-	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-}
-
-static DBusHandlerResult request_message(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	DBusMessage *reply;
-	const char *path, *address;
-	dbus_bool_t numeric;
-
-	if (!passkey)
-		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-
-	if (!dbus_message_get_args(msg, NULL,
-			DBUS_TYPE_STRING, &path, DBUS_TYPE_STRING, &address,
-			DBUS_TYPE_BOOLEAN, &numeric, DBUS_TYPE_INVALID)) {
-		fprintf(stderr, "Invalid arguments for passkey Request method");
-		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-	}
-
-	if (do_reject) {
-		reply = dbus_message_new_error(msg,
-					"org.bluez.Error.Rejected", "");
-		goto send;
-	}
-
-	reply = dbus_message_new_method_return(msg);
-	if (!reply) {
-		fprintf(stderr, "Can't create reply message\n");
-		return DBUS_HANDLER_RESULT_NEED_MEMORY;
-	}
-
-	printf("Passkey request for device %s\n", address);
-
-	dbus_message_append_args(reply, DBUS_TYPE_STRING, &passkey,
-					DBUS_TYPE_INVALID);
-
-send:
-	dbus_connection_send(conn, reply, NULL);
-
-	dbus_connection_flush(conn);
-
-	dbus_message_unref(reply);
-
-	return DBUS_HANDLER_RESULT_HANDLED;
-}
-
-static DBusHandlerResult cancel_message(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	DBusMessage *reply;
-	const char *path, *address;
-
-	if (!dbus_message_get_args(msg, NULL,
-			DBUS_TYPE_STRING, &path, DBUS_TYPE_STRING, &address,
-							DBUS_TYPE_INVALID)) {
-		fprintf(stderr, "Invalid arguments for passkey Confirm method");
-		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-	}
-
-	printf("Request canceled for device %s\n", address);
-
-	reply = dbus_message_new_method_return(msg);
-	if (!reply) {
-		fprintf(stderr, "Can't create reply message\n");
-		return DBUS_HANDLER_RESULT_NEED_MEMORY;
-	}
-
-	dbus_connection_send(conn, reply, NULL);
-
-	dbus_connection_flush(conn);
-
-	dbus_message_unref(reply);
-
-	return DBUS_HANDLER_RESULT_HANDLED;
-}
-
-static DBusHandlerResult release_message(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	DBusMessage *reply;
-
-	if (!dbus_message_get_args(msg, NULL, DBUS_TYPE_INVALID)) {
-		fprintf(stderr, "Invalid arguments for passkey Release method");
-		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-	}
-
-	if (!__io_canceled)
-		fprintf(stderr, "Passkey service has been released\n");
-
-	__io_terminated = 1;
-
-	reply = dbus_message_new_method_return(msg);
-	if (!reply) {
-		fprintf(stderr, "Can't create reply message\n");
-		return DBUS_HANDLER_RESULT_NEED_MEMORY;
-	}
-
-	dbus_connection_send(conn, reply, NULL);
-
-	dbus_connection_flush(conn);
-
-	dbus_message_unref(reply);
-
-	return DBUS_HANDLER_RESULT_HANDLED;
-}
-
-static DBusHandlerResult agent_message(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	if (dbus_message_is_method_call(msg, "org.bluez.PasskeyAgent", "Request"))
-		return request_message(conn, msg, data);
-
-	if (dbus_message_is_method_call(msg, "org.bluez.PasskeyAgent", "Cancel"))
-		return cancel_message(conn, msg, data);
-
-	if (dbus_message_is_method_call(msg, "org.bluez.PasskeyAgent", "Release"))
-		return release_message(conn, msg, data);
-
-	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-}
-
-static const DBusObjectPathVTable agent_table = {
-	.message_function = agent_message,
-};
-
-static int register_agent(DBusConnection *conn, const char *agent_path,
-				const char *remote_address, int use_default)
-{
-	DBusMessage *msg, *reply;
-	DBusError err;
-	const char *path, *method, *address = remote_address;
-
-	if (!dbus_connection_register_object_path(conn, agent_path,
-							&agent_table, NULL)) {
-		fprintf(stderr, "Can't register object path for agent\n");
-		return -1;
-	}
-
-	if (use_default) {
-		path = "/org/bluez";
-		method = "RegisterDefaultPasskeyAgent";
-	} else {
-		path = "/org/bluez/hci0";
-		method = "RegisterPasskeyAgent";
-	}
-
-	msg = dbus_message_new_method_call("org.bluez", path, INTERFACE, method);
-	if (!msg) {
-		fprintf(stderr, "Can't allocate new method call\n");
-		return -1;
-	}
-
-	if (use_default)
-		dbus_message_append_args(msg, DBUS_TYPE_STRING, &agent_path,
-							DBUS_TYPE_INVALID);
-	else
-		dbus_message_append_args(msg, DBUS_TYPE_STRING, &agent_path,
-				DBUS_TYPE_STRING, &address, DBUS_TYPE_INVALID);
-
-	dbus_error_init(&err);
-
-	reply = dbus_connection_send_with_reply_and_block(conn, msg, -1, &err);
-
-	dbus_message_unref(msg);
-
-	if (!reply) {
-		fprintf(stderr, "Can't register passkey agent\n");
-		if (dbus_error_is_set(&err)) {
-			fprintf(stderr, "%s\n", err.message);
-			dbus_error_free(&err);
-		}
-		return -1;
-	}
-
-	dbus_message_unref(reply);
-
-	dbus_connection_flush(conn);
-
-	return 0;
-}
-
-static int unregister_agent(DBusConnection *conn, const char *agent_path,
-				const char *remote_address, int use_default)
-{
-	DBusMessage *msg, *reply;
-	DBusError err;
-	const char *path, *method, *address = remote_address;
-
-	if (use_default) {
-		path = "/org/bluez";
-		method = "UnregisterDefaultPasskeyAgent";
-	} else {
-		path = "/org/bluez/hci0";
-		method = "UnregisterPasskeyAgent";
-	}
-
-	msg = dbus_message_new_method_call("org.bluez", path, INTERFACE, method);
-	if (!msg) {
-		fprintf(stderr, "Can't allocate new method call\n");
-		dbus_connection_unref(conn);
-		exit(1);
-	}
-
-	if (use_default)
-		dbus_message_append_args(msg, DBUS_TYPE_STRING, &agent_path,
-							DBUS_TYPE_INVALID);
-	else
-		dbus_message_append_args(msg, DBUS_TYPE_STRING, &agent_path,
-				DBUS_TYPE_STRING, &address, DBUS_TYPE_INVALID);
-
-	dbus_error_init(&err);
-
-	reply = dbus_connection_send_with_reply_and_block(conn, msg, -1, &err);
-
-	dbus_message_unref(msg);
-
-	if (!reply) {
-		fprintf(stderr, "Can't unregister passkey agent\n");
-		if (dbus_error_is_set(&err)) {
-			fprintf(stderr, "%s\n", err.message);
-			dbus_error_free(&err);
-		}
-		return -1;
-	}
-
-	dbus_message_unref(reply);
-
-	dbus_connection_flush(conn);
-
-	dbus_connection_unregister_object_path(conn, agent_path);
-
-	return 0;
-}
-
-static void usage(void)
-{
-	printf("Bluetooth passkey agent ver %s\n\n", VERSION);
-
-	printf("Usage:\n"
-		"\tpasskey-agent [--default] [--path agent-path] <passkey> [address]\n"
-		"\n");
-}
-
-static struct option main_options[] = {
-	{ "default",	0, 0, 'd' },
-	{ "reject",	0, 0, 'r' },
-	{ "path",	1, 0, 'p' },
-	{ "help",	0, 0, 'h' },
-	{ 0, 0, 0, 0 }
-};
-
-int main(int argc, char *argv[])
-{
-	struct sigaction sa;
-	DBusConnection *conn;
-	char match_string[128], default_path[128], *agent_path = NULL;
-	int opt, use_default = 0;
-
-	snprintf(default_path, sizeof(default_path),
-				"/org/bluez/passkey_agent_%d", getpid());
-
-	while ((opt = getopt_long(argc, argv, "+dp:h", main_options, NULL)) != EOF) {
-		switch(opt) {
-		case 'd':
-			use_default = 1;
-			break;
-		case 'r':
-			do_reject = 1;
-			break;
-		case 'p':
-			if (optarg[0] != '/') {
-				fprintf(stderr, "Invalid path\n");
-				exit(1);
-			}
-			agent_path = strdup(optarg);
-			break;
-		case 'h':
-			usage();
-			exit(0);
-		default:
-			exit(1);
-		}
-	}
-
-	argc -= optind;
-	argv += optind;
-	optind = 0;
-
-	if (argc < 1) {
-		usage();
-		exit(1);
-	}
-
-	passkey = strdup(argv[0]);
-	address = (argc > 1) ? strdup(argv[1]) : NULL;
-
-	if (!use_default && !address) {
-		usage();
-		exit(1);
-	}
-
-	if (!agent_path)
-		agent_path = strdup(default_path);
-
-	conn = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
-	if (!conn) {
-		fprintf(stderr, "Can't get on system bus");
-		exit(1);
-	}
-
-	if (register_agent(conn, agent_path, address, use_default) < 0) {
-		dbus_connection_unref(conn);
-		exit(1);
-	}
-
-	if (!dbus_connection_add_filter(conn, agent_filter, NULL, NULL))
-		fprintf(stderr, "Can't add signal filter");
-
-	snprintf(match_string, sizeof(match_string),
-			"interface=%s,member=NameOwnerChanged,arg0=%s",
-					DBUS_INTERFACE_DBUS, "org.bluez");
-
-	dbus_bus_add_match(conn, match_string, NULL);
-
-	memset(&sa, 0, sizeof(sa));
-	sa.sa_flags   = SA_NOCLDSTOP;
-	sa.sa_handler = sig_term;
-	sigaction(SIGTERM, &sa, NULL);
-	sigaction(SIGINT,  &sa, NULL);
-
-	while (!__io_canceled && !__io_terminated) {
-		if (dbus_connection_read_write_dispatch(conn, 500) != TRUE)
-			break;
-	}
-
-	if (!__io_terminated)
-		unregister_agent(conn, agent_path, address, use_default);
-
-	if (passkey)
-		free(passkey);
-
-	dbus_connection_unref(conn);
-
-	return 0;
-}
diff --git a/source/n/bluez/patches/bluez-dbus-config.patch b/source/n/bluez/patches/bluez-dbus-config.patch
deleted file mode 100644
index 0d0fb4620..000000000
--- a/source/n/bluez/patches/bluez-dbus-config.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./src/bluetooth.conf.orig	2010-10-04 06:41:01.000000000 -0500
-+++ ./src/bluetooth.conf	2010-11-07 19:50:47.229999322 -0600
-@@ -11,13 +11,18 @@
-     <allow own="org.bluez"/>
-     <allow send_destination="org.bluez"/>
-     <allow send_interface="org.bluez.Agent"/>
-+    <allow send_interface="org.bluez.Adapter"/>
-     <allow send_interface="org.bluez.HandsfreeAgent"/>
-     <allow send_interface="org.bluez.MediaEndpoint"/>
-     <allow send_interface="org.bluez.Watcher"/>
-   </policy>
- 
--  <policy at_console="true">
-+  <policy group="plugdev">
-     <allow send_destination="org.bluez"/>
-+    <allow send_interface="org.bluez.Agent"/>
-+    <allow send_interface="org.bluez.Adapter"/>
-+    <allow send_destination="org.bluez"
-+           send_interface="org.freedesktop.DBus.Introspectable"/>
-   </policy>
- 
-   <!-- allow users of lp group (printing subsystem) to 
diff --git a/source/n/bluez/patches/bluez-run_udev_helper.patch b/source/n/bluez/patches/bluez-run_udev_helper.patch
deleted file mode 100644
index 188607453..000000000
--- a/source/n/bluez/patches/bluez-run_udev_helper.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Instead of automatically starting the bluetooth subsystem when devices
-  are added, let's invoke a wrapper script in /lib/udev and have that
-  wrapper check whether /etc/rc.d/rc.bluetooth is executable first.
-
-diff -Nur bluez-4.59.orig/scripts/bluetooth.rules.in bluez-4.59/scripts/bluetooth.rules.in
---- bluez-4.59.orig/scripts/bluetooth.rules.in	2009-07-06 15:21:40.000000000 -0500
-+++ bluez-4.59/scripts/bluetooth.rules.in	2009-12-30 11:50:37.069164823 -0600
-@@ -1,3 +1,3 @@
- # Run helper every time a Bluetooth device appears
- # On remove actions, bluetoothd should go away by itself
--ACTION=="add", SUBSYSTEM=="bluetooth", RUN+="@prefix@/sbin/bluetoothd --udev"
-+ACTION=="add", SUBSYSTEM=="bluetooth", RUN+="/lib/udev/bluetooth.sh"
diff --git a/source/n/bluez/patches/bluez-unbreak_dell_mouse.patch b/source/n/bluez/patches/bluez-unbreak_dell_mouse.patch
deleted file mode 100644
index ec0b4a96b..000000000
--- a/source/n/bluez/patches/bluez-unbreak_dell_mouse.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-One of the Dell USB mice gets broken by this rule, so we'll unbreak it.
-
-diff -Nur bluez-4.59.orig/scripts/bluetooth-hid2hci.rules bluez-4.59/scripts/bluetooth-hid2hci.rules
---- bluez-4.59.orig/scripts/bluetooth-hid2hci.rules	2009-05-19 04:04:10.000000000 -0500
-+++ bluez-4.59/scripts/bluetooth-hid2hci.rules	2009-12-30 12:34:14.165164370 -0600
-@@ -8,7 +8,7 @@
- #   413c:8154
- #   413c:8158
- #   413c:8162
--ACTION=="add", ENV{ID_VENDOR}=="413c", ENV{ID_CLASS}=="mouse", ATTRS{bmAttributes}=="e0", KERNEL=="mouse*", RUN+="/usr/sbin/hid2hci --method dell -v $env{ID_VENDOR} -p $env{ID_MODEL} --mode hci"
-+# ACTION=="add", ENV{ID_VENDOR}=="413c", ENV{ID_CLASS}=="mouse", ATTRS{bmAttributes}=="e0", KERNEL=="mouse*", RUN+="/usr/sbin/hid2hci --method dell -v $env{ID_VENDOR} -p $env{ID_MODEL} --mode hci"
- 
- # Logitech devices
- ACTION=="add", ENV{ID_VENDOR}=="046d", ENV{ID_MODEL}=="c703" RUN+="/usr/sbin/hid2hci --method logitech -v $env{ID_VENDOR} -p $env{ID_MODEL} --mode hci"
diff --git a/source/n/ca-certificates/ca-certificates.SlackBuild b/source/n/ca-certificates/ca-certificates.SlackBuild
index fc455b14e..b3efd180d 100755
--- a/source/n/ca-certificates/ca-certificates.SlackBuild
+++ b/source/n/ca-certificates/ca-certificates.SlackBuild
@@ -2,7 +2,8 @@
 
 # Slackware build script for ca-certificates
 
-# Copyright 2009  Robby Workman  Northport, AL, USA
+# Copyright 2009,2011  Robby Workman  Northport, AL, USA
+# Copyright 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,9 +24,9 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ca-certificates
-VERSION=${VERSION:-20090814}
+VERSION=${VERSION:-20120623}
 ARCH=noarch
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -44,9 +45,9 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-zcat $CWD/cacerts-$VERSION-remove_debconf.diff.gz | patch -p1 || exit 1
-zcat $CWD/cacerts-$VERSION-fixup_DESTDIR.diff.gz | patch -p1 || exit 1
-zcat $CWD/cacerts-$VERSION-fixup_update-ca-certificates.diff.gz | patch -p1 || exit 1
+zcat $CWD/patches/remove_debconf.diff.gz | patch -p1 || exit 1
+zcat $CWD/patches/fixup_DESTDIR.diff.gz | patch -p1 || exit 1
+zcat $CWD/patches/fixup_update-ca-certificates.diff.gz | patch -p1 || exit 1
 
 make || exit 1
 make install DESTDIR=$PKG || exit 1
@@ -65,7 +66,10 @@ gzip -9c sbin/update-ca-certificates.8 > \
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 mv debian/NEWS debian/NEWS.Debian
 cp -a debian/NEWS.Debian debian/README.Debian $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/var/log/setup
+cat $CWD/setup.11.cacerts > $PKG/var/log/setup/setup.11.cacerts
+chmod 755 $PKG/var/log/setup/setup.11.cacerts
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/n/ca-certificates/cacerts-20090814-fixup_DESTDIR.diff b/source/n/ca-certificates/cacerts-20090814-fixup_DESTDIR.diff
deleted file mode 100644
index b70ca654b..000000000
--- a/source/n/ca-certificates/cacerts-20090814-fixup_DESTDIR.diff
+++ /dev/null
@@ -1,94 +0,0 @@
-diff -Nur ca-certificates-20090814.orig/Makefile ca-certificates-20090814/Makefile
---- ca-certificates-20090814.orig/Makefile	2009-07-08 16:18:57.000000000 -0500
-+++ ca-certificates-20090814/Makefile	2009-12-17 00:48:14.499550845 -0600
-@@ -17,7 +17,7 @@
- 
- install:
- 	for dir in $(SUBDIRS); do \
--	  mkdir $(DESTDIR)/$(CERTSDIR)/$$dir; \
-+	  mkdir -p $(DESTDIR)/$(CERTSDIR)/$$dir; \
- 	  $(MAKE) -C $$dir install CERTSDIR=$(DESTDIR)/$(CERTSDIR)/$$dir; \
- 	done
- 	for dir in sbin; do \
-diff -Nur ca-certificates-20090814.orig/brasil.gov.br/Makefile ca-certificates-20090814/brasil.gov.br/Makefile
---- ca-certificates-20090814.orig/brasil.gov.br/Makefile	2007-02-02 00:23:19.000000000 -0600
-+++ ca-certificates-20090814/brasil.gov.br/Makefile	2009-12-17 00:48:14.499550845 -0600
-@@ -8,5 +8,6 @@
- 
- install:
- 	for p in *.crt; do \
-+	 mkdir -p $(CERTSDIR) ; \
- 	 install -m 644 $$p $(CERTSDIR)/$$p ; \
- 	done
-diff -Nur ca-certificates-20090814.orig/cacert.org/Makefile ca-certificates-20090814/cacert.org/Makefile
---- ca-certificates-20090814.orig/cacert.org/Makefile	2009-07-08 16:19:37.000000000 -0500
-+++ ca-certificates-20090814/cacert.org/Makefile	2009-12-17 00:48:14.499550845 -0600
-@@ -9,5 +9,6 @@
- 
- install:
- 	cat root.crt class3.crt > cacert.org.crt
-+	mkdir -p $(CERTSDIR)
- 	install -m 644 cacert.org.crt $(CERTSDIR)/cacert.org.crt
- 
-diff -Nur ca-certificates-20090814.orig/gouv.fr/Makefile ca-certificates-20090814/gouv.fr/Makefile
---- ca-certificates-20090814.orig/gouv.fr/Makefile	2008-06-23 13:57:45.000000000 -0500
-+++ ca-certificates-20090814/gouv.fr/Makefile	2009-12-17 00:48:14.500550426 -0600
-@@ -8,6 +8,7 @@
- 
- install:
- 	for p in *.crt; do \
-+	 mkdir -p $(CERTSDIR) ; \
- 	 install -m 644 $$p $(CERTSDIR)/$$p ; \
- 	done
- 
-diff -Nur ca-certificates-20090814.orig/mozilla/Makefile ca-certificates-20090814/mozilla/Makefile
---- ca-certificates-20090814.orig/mozilla/Makefile	2009-06-24 05:56:54.000000000 -0500
-+++ ca-certificates-20090814/mozilla/Makefile	2009-12-17 00:48:14.500550426 -0600
-@@ -10,5 +10,6 @@
- 
- install:
- 	for p in *.crt; do \
-+	 mkdir -p $(CERTSDIR) ; \
- 	 install -m 644 $$p $(CERTSDIR)/$$p ; \
- 	done
-diff -Nur ca-certificates-20090814.orig/sbin/Makefile ca-certificates-20090814/sbin/Makefile
---- ca-certificates-20090814.orig/sbin/Makefile	2007-02-02 00:23:19.000000000 -0600
-+++ ca-certificates-20090814/sbin/Makefile	2009-12-17 00:49:05.976571309 -0600
-@@ -8,4 +8,5 @@
- clean:
- 
- install:
-+	mkdir -p $(DESTDIR)/usr/sbin
- 	install -m755 update-ca-certificates $(DESTDIR)/usr/sbin/
-diff -Nur ca-certificates-20090814.orig/signet.pl/Makefile ca-certificates-20090814/signet.pl/Makefile
---- ca-certificates-20090814.orig/signet.pl/Makefile	2007-02-02 00:23:19.000000000 -0600
-+++ ca-certificates-20090814/signet.pl/Makefile	2009-12-17 00:48:14.501550915 -0600
-@@ -8,5 +8,6 @@
- 
- install:
- 	for p in *.crt; do \
-+	 mkdir -p $(CERTSDIR) ; \
- 	 install -m 644 $$p $(CERTSDIR)/$$p ; \
- 	done
-diff -Nur ca-certificates-20090814.orig/spi-inc.org/Makefile ca-certificates-20090814/spi-inc.org/Makefile
---- ca-certificates-20090814.orig/spi-inc.org/Makefile	2007-02-02 00:23:19.000000000 -0600
-+++ ca-certificates-20090814/spi-inc.org/Makefile	2009-12-17 00:48:14.501550915 -0600
-@@ -8,6 +8,7 @@
- 
- install:
- 	for p in *.crt; do \
-+	 mkdir -p $(CERTSDIR) ; \
- 	 install -m 644 $$p $(CERTSDIR)/$$p ; \
- 	done
- 
-diff -Nur ca-certificates-20090814.orig/telesec.de/Makefile ca-certificates-20090814/telesec.de/Makefile
---- ca-certificates-20090814.orig/telesec.de/Makefile	2008-03-19 09:03:09.000000000 -0500
-+++ ca-certificates-20090814/telesec.de/Makefile	2009-12-17 00:48:14.566586954 -0600
-@@ -8,6 +8,7 @@
- 
- install:
- 	for p in *.crt; do \
-+	 mkdir -p $(CERTSDIR) ; \
- 	 install -m 644 $$p $(CERTSDIR)/$$p ; \
- 	done
- 
diff --git a/source/n/ca-certificates/cacerts-20090814-remove_debconf.diff b/source/n/ca-certificates/cacerts-20090814-remove_debconf.diff
deleted file mode 100644
index c99aa2fa2..000000000
--- a/source/n/ca-certificates/cacerts-20090814-remove_debconf.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur ca-certificates-20090814.orig/Makefile ca-certificates-20090814/Makefile
---- ca-certificates-20090814.orig/Makefile	2009-07-08 16:18:57.000000000 -0500
-+++ ca-certificates-20090814/Makefile	2009-12-17 00:44:30.540551055 -0600
-@@ -3,7 +3,7 @@
- #
- 
- CERTSDIR = /usr/share/ca-certificates
--SUBDIRS = spi-inc.org debconf.org mozilla cacert.org brasil.gov.br signet.pl telesec.de gouv.fr
-+SUBDIRS = spi-inc.org mozilla cacert.org brasil.gov.br signet.pl telesec.de gouv.fr
- 
- all:
- 	for dir in $(SUBDIRS); do \
diff --git a/source/n/ca-certificates/doinst.sh b/source/n/ca-certificates/doinst.sh
index e8cd8cced..cfd7d795e 100644
--- a/source/n/ca-certificates/doinst.sh
+++ b/source/n/ca-certificates/doinst.sh
@@ -13,5 +13,7 @@ config() {
 
 config etc/ca-certificates.conf.new
 
-chroot . usr/sbin/update-ca-certificates --fresh 1>/dev/null 2>/dev/null
+if [ -x /usr/sbin/update-ca-certificates ]; then
+  /usr/sbin/update-ca-certificates --fresh 1> /dev/null 2> /dev/null
+fi
 
diff --git a/source/n/ca-certificates/patches/fixup_DESTDIR.diff b/source/n/ca-certificates/patches/fixup_DESTDIR.diff
new file mode 100644
index 000000000..291848f69
--- /dev/null
+++ b/source/n/ca-certificates/patches/fixup_DESTDIR.diff
@@ -0,0 +1,64 @@
+diff -Nur ca-certificates-20111211.orig/Makefile ca-certificates-20111211/Makefile
+--- ca-certificates-20111211.orig/Makefile	2011-12-11 13:54:02.000000000 -0600
++++ ca-certificates-20111211/Makefile	2011-12-17 23:05:37.590951594 -0600
+@@ -17,7 +17,7 @@
+ 
+ install:
+ 	for dir in $(SUBDIRS); do \
+-	  mkdir $(DESTDIR)/$(CERTSDIR)/$$dir; \
++	  mkdir -p $(DESTDIR)/$(CERTSDIR)/$$dir; \
+ 	  $(MAKE) -C $$dir install CERTSDIR=$(DESTDIR)/$(CERTSDIR)/$$dir; \
+ 	done
+ 	for dir in sbin; do \
+diff -Nur ca-certificates-20111211.orig/cacert.org/Makefile ca-certificates-20111211/cacert.org/Makefile
+--- ca-certificates-20111211.orig/cacert.org/Makefile	2011-12-11 13:54:02.000000000 -0600
++++ ca-certificates-20111211/cacert.org/Makefile	2011-12-17 23:06:16.927521153 -0600
+@@ -9,5 +9,6 @@
+ 
+ install:
+ 	cat root.crt class3.crt > cacert.org.crt
++	mkdir -p $(CERTSDIR)
+ 	install -m 644 cacert.org.crt $(CERTSDIR)/cacert.org.crt
+ 
+diff -Nur ca-certificates-20111211.orig/debconf.org/Makefile ca-certificates-20111211/debconf.org/Makefile
+--- ca-certificates-20111211.orig/debconf.org/Makefile	2011-12-11 13:54:02.000000000 -0600
++++ ca-certificates-20111211/debconf.org/Makefile	2011-12-17 23:06:27.118409644 -0600
+@@ -7,6 +7,7 @@
+ clean:
+ 
+ install:
++	mkdir -p $(CERTSDIR)
+ 	for p in *.crt; do \
+ 	 install -m 644 $$p $(CERTSDIR)/$$p ; \
+ 	done
+diff -Nur ca-certificates-20111211.orig/mozilla/Makefile ca-certificates-20111211/mozilla/Makefile
+--- ca-certificates-20111211.orig/mozilla/Makefile	2011-12-11 13:54:02.000000000 -0600
++++ ca-certificates-20111211/mozilla/Makefile	2011-12-17 23:06:34.556328253 -0600
+@@ -9,6 +9,7 @@
+ 	-rm -f *.crt
+ 
+ install:
++	mkdir -p $(CERTSDIR)
+ 	for p in *.crt; do \
+ 	 install -m 644 $$p $(CERTSDIR)/$$p ; \
+ 	done
+diff -Nur ca-certificates-20111211.orig/sbin/Makefile ca-certificates-20111211/sbin/Makefile
+--- ca-certificates-20111211.orig/sbin/Makefile	2011-12-11 13:54:02.000000000 -0600
++++ ca-certificates-20111211/sbin/Makefile	2011-12-17 23:07:03.841007810 -0600
+@@ -8,4 +8,5 @@
+ clean:
+ 
+ install:
++	mkdir -p $(DESTDIR)/usr/sbin
+ 	install -m755 update-ca-certificates $(DESTDIR)/usr/sbin/
+diff -Nur ca-certificates-20111211.orig/spi-inc.org/Makefile ca-certificates-20111211/spi-inc.org/Makefile
+--- ca-certificates-20111211.orig/spi-inc.org/Makefile	2011-12-11 13:54:02.000000000 -0600
++++ ca-certificates-20111211/spi-inc.org/Makefile	2011-12-17 23:08:18.499190893 -0600
+@@ -7,6 +7,7 @@
+ clean:
+ 
+ install:
++	mkdir -p $PKG/$(CERTSDIR)
+ 	for p in *.crt; do \
+ 	 install -m 644 $$p $(CERTSDIR)/$$p ; \
+ 	done
diff --git a/source/n/ca-certificates/cacerts-20090814-fixup_update-ca-certificates.diff b/source/n/ca-certificates/patches/fixup_update-ca-certificates.diff
index 3c9e08b41..8b0435b38 100644
--- a/source/n/ca-certificates/cacerts-20090814-fixup_update-ca-certificates.diff
+++ b/source/n/ca-certificates/patches/fixup_update-ca-certificates.diff
@@ -1,6 +1,6 @@
-diff -Nur ca-certificates-20090814.orig/sbin/update-ca-certificates ca-certificates-20090814/sbin/update-ca-certificates
---- ca-certificates-20090814.orig/sbin/update-ca-certificates	2009-07-08 16:23:12.000000000 -0500
-+++ ca-certificates-20090814/sbin/update-ca-certificates	2009-12-17 00:42:41.760550636 -0600
+diff -Nur ca-certificates-20110502.orig//sbin/update-ca-certificates ca-certificates-20110502/sbin/update-ca-certificates
+--- ca-certificates-20110502.orig//sbin/update-ca-certificates	2009-07-08 16:23:12.000000000 -0500
++++ ca-certificates-20110502/sbin/update-ca-certificates	2011-07-05 17:37:01.842932741 -0500
 @@ -148,9 +148,7 @@
  
  HOOKSDIR=/etc/ca-certificates/update.d
diff --git a/source/n/ca-certificates/patches/remove_debconf.diff b/source/n/ca-certificates/patches/remove_debconf.diff
new file mode 100644
index 000000000..58fce4226
--- /dev/null
+++ b/source/n/ca-certificates/patches/remove_debconf.diff
@@ -0,0 +1,12 @@
+diff -Nur ca-certificates-20111211.orig/Makefile ca-certificates-20111211/Makefile
+--- ca-certificates-20111211.orig/Makefile	2011-12-17 23:10:21.709842750 -0600
++++ ca-certificates-20111211/Makefile	2011-12-17 23:10:10.096969815 -0600
+@@ -3,7 +3,7 @@
+ #
+ 
+ CERTSDIR = /usr/share/ca-certificates
+-SUBDIRS = mozilla cacert.org debconf.org spi-inc.org
++SUBDIRS = mozilla cacert.org spi-inc.org
+ 
+ all:
+ 	for dir in $(SUBDIRS); do \
diff --git a/source/n/ca-certificates/setup.11.cacerts b/source/n/ca-certificates/setup.11.cacerts
new file mode 100644
index 000000000..328b61c0f
--- /dev/null
+++ b/source/n/ca-certificates/setup.11.cacerts
@@ -0,0 +1,3 @@
+#!/bin/sh
+#BLURB="Rebuild SSL certificate database."
+chroot . usr/sbin/update-ca-certificates --fresh 1> /dev/null 2> /dev/null
diff --git a/source/n/cifs-utils/cifs-utils.SlackBuild b/source/n/cifs-utils/cifs-utils.SlackBuild
new file mode 100755
index 000000000..ef91a5419
--- /dev/null
+++ b/source/n/cifs-utils/cifs-utils.SlackBuild
@@ -0,0 +1,150 @@
+#!/bin/sh
+
+# Copyright 2012  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+PKGNAM=cifs-utils
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-2}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$(uname -m)" in
+    i?86) ARCH=i486 ;;
+    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+    *) ARCH=$(uname -m) ;;
+  esac
+  export ARCH
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ "$ARCH" = "i386" ]; then
+  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "armv7hl" ]; then
+  SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
+  LIBDIRSUFFIX=""
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION
+
+zcat $CWD/mount.cifs-set-rc-to-0-in-libcap-toggle_dac_capabili.patch.gz | patch -p1 --verbose || exit 1
+
+chown -R root:root .
+find . \
+  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+  -exec chmod 755 {} \; -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --sysconfdir=/etc \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Strip binaries:
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  AUTHORS COPYING* INSTALL NEWS README* THANKS TODO \
+  doc/linux-cifs-client-guide.odt \
+  $PKG/usr/doc/${PKGNAM}-$VERSION
+
+# Compress and if needed symlink the man pages:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+# Compress info files, if any:
+if [ -d $PKG/usr/info ]; then
+  ( cd $PKG/usr/info
+    rm -f dir
+    gzip -9 *
+  )
+fi
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/n/cifs-utils/mount.cifs-set-rc-to-0-in-libcap-toggle_dac_capabili.patch b/source/n/cifs-utils/mount.cifs-set-rc-to-0-in-libcap-toggle_dac_capabili.patch
new file mode 100644
index 000000000..a8dd96c46
--- /dev/null
+++ b/source/n/cifs-utils/mount.cifs-set-rc-to-0-in-libcap-toggle_dac_capabili.patch
@@ -0,0 +1,38 @@
+From 0eb3daa4b17ee64b464594f1a5d413ecb364957c Mon Sep 17 00:00:00 2001
+From: Jeff Layton <jlayton@samba.org>
+Date: Thu, 14 Jun 2012 10:59:18 -0400
+Subject: [PATCH] mount.cifs: set rc to 0 in libcap toggle_dac_capability
+
+Thus spake Jochen:
+
+The mount.cifs program from the cifs-utils package 5.5 did not work on
+my Linux system. It just exited without an error message and did not
+mount anything.
+
+[...]
+
+I think, when this variable rc is now used in this function, it has also
+to be properly initialized there.
+
+Reported-by: Jochen Roderburg <roderburg@uni-koeln.de>
+Signed-off-by: Jeff Layton <jlayton@samba.org>
+---
+ mount.cifs.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mount.cifs.c b/mount.cifs.c
+index a1b0454..6f3f382 100644
+--- a/mount.cifs.c
++++ b/mount.cifs.c
+@@ -495,7 +495,7 @@ free_caps:
+ static int
+ toggle_dac_capability(int writable, int enable)
+ {
+-	int rc;
++	int rc = 0;
+ 	cap_t caps;
+ 	cap_value_t capability = writable ? CAP_DAC_OVERRIDE : CAP_DAC_READ_SEARCH;
+ 
+-- 
+1.7.11
+
diff --git a/source/n/cifs-utils/slack-desc b/source/n/cifs-utils/slack-desc
new file mode 100644
index 000000000..ff9ba3e82
--- /dev/null
+++ b/source/n/cifs-utils/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+          |-----handy-ruler------------------------------------------------------|
+cifs-utils: cifs-utils (CIFS filesystem utilities)
+cifs-utils:
+cifs-utils: This is the release version of cifs-utils, a package of utilities for
+cifs-utils: doing and managing mounts of the Linux CIFS filesystem.  The in-kernel
+cifs-utils: CIFS filesystem is generally the preferred method for mounting
+cifs-utils: SMB/CIFS shares on Linux.  This filesystem relies on a set of
+cifs-utils: user-space tools that were originally part of Samba, but have now been
+cifs-utils: split off into this separate package.
+cifs-utils:
+cifs-utils: Home page:  http://wiki.samba.org/index.php/LinuxCIFS_utils
+cifs-utils:
diff --git a/source/n/curl/cacert-fetch.sh b/source/n/curl/cacert-fetch.sh
new file mode 100755
index 000000000..d0f156e2d
--- /dev/null
+++ b/source/n/curl/cacert-fetch.sh
@@ -0,0 +1 @@
+lftpget http://curl.haxx.se/ca/cacert.pem && rm cacert.pem.bz2 && bzip2 -9 cacert.pem
diff --git a/source/n/curl/cacert.pem b/source/n/curl/cacert.pem
index af135450d..1fccb3ddc 100644
--- a/source/n/curl/cacert.pem
+++ b/source/n/curl/cacert.pem
@@ -1,12 +1,12 @@
 ##
-## lib/ca-bundle.crt -- Bundle of CA Root Certificates
+## ca-bundle.crt -- Bundle of CA Root Certificates
 ##
-## Converted at: Tue Mar 29 19:30:29 2011 UTC
+## Certificate data from Mozilla as of: Wed Apr 25 15:02:13 2012
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates
 ## file (certdata.txt).  This file can be found in the mozilla source tree:
-## '/mozilla/security/nss/lib/ckfw/builtins/certdata.txt'
+## http://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1
 ##
 ## It contains the certificates in PEM format and therefore
 ## can be directly used with curl / libcurl / php_curl, or with
@@ -14,42 +14,7 @@
 ## Just configure this file as the SSLCACertificateFile.
 ##
 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape security libraries.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1994-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-# @(#) $RCSfile: certdata.txt,v $ $Revision: 1.70 $ $Date: 2010/12/02 23:26:19 $
+# @(#) $RCSfile: certdata.txt,v $ $Revision: 1.83 $ $Date: 2012/04/25 14:49:29 $
 
 GTE CyberTrust Global Root
 ==========================
@@ -67,26 +32,6 @@ M4ETCJ57NE7fQMh017l93PR2VX2bY1QY6fDq81yx2YtCHrnAlU66+tXifPVoYb+O7AWXX1uw16OF
 NMQkpw0PlZPvy5TYnh+dXIVtx6quTx8itc2VrbqnzPmrC3p/
 -----END CERTIFICATE-----
 
-Thawte Personal Freemail CA
-===========================
------BEGIN CERTIFICATE-----
-MIIDLTCCApagAwIBAgIBADANBgkqhkiG9w0BAQQFADCB0TELMAkGA1UEBhMCWkExFTATBgNVBAgT
-DFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMRowGAYDVQQKExFUaGF3dGUgQ29uc3Vs
-dGluZzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEkMCIGA1UEAxMb
-VGhhd3RlIFBlcnNvbmFsIEZyZWVtYWlsIENBMSswKQYJKoZIhvcNAQkBFhxwZXJzb25hbC1mcmVl
-bWFpbEB0aGF3dGUuY29tMB4XDTk2MDEwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgdExCzAJBgNV
-BAYTAlpBMRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEaMBgGA1UE
-ChMRVGhhd3RlIENvbnN1bHRpbmcxKDAmBgNVBAsTH0NlcnRpZmljYXRpb24gU2VydmljZXMgRGl2
-aXNpb24xJDAiBgNVBAMTG1RoYXd0ZSBQZXJzb25hbCBGcmVlbWFpbCBDQTErMCkGCSqGSIb3DQEJ
-ARYccGVyc29uYWwtZnJlZW1haWxAdGhhd3RlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkC
-gYEA1GnX1LCUZFtx6UfYDFG26nKRsIRefS0Nj3sS34UldSh0OkIsYyeflXtL734Zhx2G6qPduc6W
-ZBrCFG5ErHzmj+hND3EfQDimAKOHePb5lIZererAXnbr2RSjXW56fAylS1V/Bhkpf56aJtVquzgk
-CGqYx7Hao5iR/Xnb5VrEHLkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQQF
-AAOBgQDH7JJ+Tvj1lqVnYiqk8E0RYNBvjWBYYawmu1I1XAjPMPuoSpaKH2JCI4wXD/S6ZJwXrEcp
-352YXtJsYHFcoqzceePnbgBHH7UNKOgCneSa/RP0ptl8sfjcXyMmCZGAc9AUG95DqYMl8uacLxXK
-/qarigd1iwzdUYRr5PjRzneigQ==
------END CERTIFICATE-----
-
 Thawte Server CA
 ================
 -----BEGIN CERTIFICATE-----
@@ -186,38 +131,6 @@ up/1902lMXucKS1M/mQ+7LZT/uqb7YLbdHVLB3luHtgZg3Pe9T7Qtd7nS2h9Qy4qIOF+oHhEngj1
 mPnHfxsb1gYgAlihw6ID
 -----END CERTIFICATE-----
 
-Verisign Class 1 Public Primary Certification Authority
-=======================================================
------BEGIN CERTIFICATE-----
-MIICPTCCAaYCEQDNun9W8N/kvFT+IqyzcqpVMA0GCSqGSIb3DQEBAgUAMF8xCzAJBgNVBAYTAlVT
-MRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE3MDUGA1UECxMuQ2xhc3MgMSBQdWJsaWMgUHJpbWFy
-eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05NjAxMjkwMDAwMDBaFw0yODA4MDEyMzU5NTla
-MF8xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE3MDUGA1UECxMuQ2xhc3Mg
-MSBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCBnzANBgkqhkiG9w0BAQEF
-AAOBjQAwgYkCgYEA5Rm/baNWYS2ZSHH2Z965jeu3noaACpEO+jglr0aIguVzqKCbJF0NH8xlbgyw
-0FaEGIeaBpsQoXPftFg5a27B9hXVqKg/qhIGjTGsf7A01480Z4gJzRQR4k5FVmkfeAKA2txHkSm7
-NsljXMXg1y2He6G3MrB7MLoqLzGq7qNn2tsCAwEAATANBgkqhkiG9w0BAQIFAAOBgQBMP7iLxmjf
-7kMzDl3ppssHhE16M/+SG/Q2rdiVIjZoEWx8QszznC7EBz8UsA9P/5CSdvnivErpj82ggAr3xSnx
-giJduLHdgSOjeyUVRjB5FvjqBUuUfx3CHMjjt/QQQDwTw18fU+hI5Ia0e6E1sHslurjTjqs/OJ0A
-NACY89FxlA==
------END CERTIFICATE-----
-
-Verisign Class 2 Public Primary Certification Authority
-=======================================================
------BEGIN CERTIFICATE-----
-MIICPDCCAaUCEC0b/EoXjaOR6+f/9YtFvgswDQYJKoZIhvcNAQECBQAwXzELMAkGA1UEBhMCVVMx
-FzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAyIFB1YmxpYyBQcmltYXJ5
-IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2MDEyOTAwMDAwMFoXDTI4MDgwMTIzNTk1OVow
-XzELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAy
-IFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUA
-A4GNADCBiQKBgQC2WoujDWojg4BrzzmH9CETMwZMJaLtVRKXxaeAufqDwSCg+i8VDXyhYGt+eSz6
-Bg86rvYbb7HS/y8oUl+DfUvEerf4Zh+AVPy3wo5ZShRXRtGak75BkQO7FYCTXOvnzAhsPz6zSvz/
-S2wj1VCCJkQZjiPDceoZJEcEnnW/yKYAHwIDAQABMA0GCSqGSIb3DQEBAgUAA4GBAIobK/o5wXTX
-XtgZZKJYSi034DNHD6zt96rbHuSLBlxgJ8pFUs4W7z8GZOeUaHxgMxURaa+dYo2jA1Rrpr7l7gUY
-YAS/QoD90KioHgE796Ncr6Pc5iaAIzy4RHT3Cq5Ji2F4zCS/iIqnDupzGUH9TQPwiNHleI2lKk/2
-lw0Xd8rY
------END CERTIFICATE-----
-
 Verisign Class 3 Public Primary Certification Authority
 =======================================================
 -----BEGIN CERTIFICATE-----
@@ -234,44 +147,6 @@ WM1pF+NEHJwZRDmJXNycAA9WjQKZ7aKQRUzkuxCkPfAyAw7xzvjoyVGM5mKf5p/AfbdynMk2Omuf
 Tqj/ZA1k
 -----END CERTIFICATE-----
 
-Verisign Class 1 Public Primary Certification Authority - G2
-============================================================
------BEGIN CERTIFICATE-----
-MIIDAjCCAmsCEEzH6qqYPnHTkxD4PTqJkZIwDQYJKoZIhvcNAQEFBQAwgcExCzAJBgNVBAYTAlVT
-MRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMSBQdWJsaWMgUHJpbWFy
-eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2ln
-biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVz
-dCBOZXR3b3JrMB4XDTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVT
-MRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMSBQdWJsaWMgUHJpbWFy
-eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2ln
-biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVz
-dCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq0Lq+Fi24g9TK0g+8djHKlNgd
-k4xWArzZbxpvUjZudVYKVdPfQ4chEWWKfo+9Id5rMj8bhDSVBZ1BNeuS65bdqlk/AVNtmU/t5eIq
-WpDBucSmFc/IReumXY6cPvBkJHalzasab7bYe1FhbqZ/h8jit+U03EGI6glAvnOSPWvndQIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4GBAKlPww3HZ74sy9mozS11534Vnjty637rXC0Jh9ZrbWB85a7FkCMM
-XErQr7Fd88e2CtvgFZMN3QO8x3aKtd1Pw5sTdbgBwObJW2uluIncrKTdcu1OofdPvAbT6shkdHvC
-lUGcZXNY8ZCaPGqxmMnEh7zPRW1F4m4iP/68DzFc6PLZ
------END CERTIFICATE-----
-
-Verisign Class 2 Public Primary Certification Authority - G2
-============================================================
------BEGIN CERTIFICATE-----
-MIIDAzCCAmwCEQC5L2DMiJ+hekYJuFtwbIqvMA0GCSqGSIb3DQEBBQUAMIHBMQswCQYDVQQGEwJV
-UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xPDA6BgNVBAsTM0NsYXNzIDIgUHVibGljIFByaW1h
-cnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjE6MDgGA1UECxMxKGMpIDE5OTggVmVyaVNp
-Z24sIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1
-c3QgTmV0d29yazAeFw05ODA1MTgwMDAwMDBaFw0yODA4MDEyMzU5NTlaMIHBMQswCQYDVQQGEwJV
-UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xPDA6BgNVBAsTM0NsYXNzIDIgUHVibGljIFByaW1h
-cnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjE6MDgGA1UECxMxKGMpIDE5OTggVmVyaVNp
-Z24sIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1
-c3QgTmV0d29yazCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAp4gBIXQs5xoD8JjhlzwPIQjx
-nNuX6Zr8wgQGE75fUsjMHiwSViy4AWkszJkfrbCWrnkE8hM5wXuYuggs6MKEEyyqaekJ9MepAqRC
-wiNPStjwDqL7MWzJ5m+ZJwf15vRMeJ5t60aG+rmGyVTyssSv1EYcWskVMP8NbPUtDm3Of3cCAwEA
-ATANBgkqhkiG9w0BAQUFAAOBgQByLvl/0fFx+8Se9sVeUYpAmLho+Jscg9jinb3/7aHmZuovCfTK
-1+qlK5X2JGCGTUQug6XELaDTrnhpb3LabK4I8GOSN+a7xDAXrXfMSTWqz9iP0b63GJZHc2pUIjRk
-LbYWm1lbtFFZOrMLFPQS32eg9K0yZF6xRnInjBJ7xUS0rg==
------END CERTIFICATE-----
-
 Verisign Class 3 Public Primary Certification Authority - G2
 ============================================================
 -----BEGIN CERTIFICATE-----
@@ -291,25 +166,6 @@ MA0GCSqGSIb3DQEBBQUAA4GBAFFNzb5cy5gZnBWyATl4Lk0PZ3BwmcYQWpSkU01UbSuvDV1Ai2TT
 Oaxxp5EJb+RxBrO6WVcmeQD2+A2iMzAo1KpYoJ2daZH9
 -----END CERTIFICATE-----
 
-Verisign Class 4 Public Primary Certification Authority - G2
-============================================================
------BEGIN CERTIFICATE-----
-MIIDAjCCAmsCEDKIjprS9esTR/h/xCA3JfgwDQYJKoZIhvcNAQEFBQAwgcExCzAJBgNVBAYTAlVT
-MRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgNCBQdWJsaWMgUHJpbWFy
-eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2ln
-biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVz
-dCBOZXR3b3JrMB4XDTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVT
-MRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgNCBQdWJsaWMgUHJpbWFy
-eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2ln
-biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVz
-dCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC68OTP+cSuhVS5B1f5j8V/aBH4
-xBewRNzjMHPVKmIquNDMHO0oW369atyzkSTKQWI8/AIBvxwWMZQFl3Zuoq29YRdsTjCG8FE3KlDH
-qGKB3FtKqsGgtG7rL+VXxbErQHDbWk2hjh+9Ax/YA9SPTJlxvOKCzFjomDqG04Y48wApHwIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4GBAIWMEsGnuVAVess+rLhDityq3RS6iYF+ATwjcSGIL4LcY/oCRaxF
-WdcqWERbt5+BO5JoPeI3JPV7bI92NZYJqFmduc4jq3TWg/0ycyfYaT5DdPauxYma51N86Xv2S/PB
-ZYPejYqcPIiNOVn8qj8ijaHBZlCBckztImRPT8qAkbYp
------END CERTIFICATE-----
-
 GlobalSign Root CA
 ==================
 -----BEGIN CERTIFICATE-----
@@ -410,54 +266,6 @@ V9+vqDWzf4mH6eglkrh/hXqu1rweN1gqZ8mRzyqBPu3GOd/APhmcGcwTTYJBtYze4D1gCCAPRX5r
 on+jjBXu
 -----END CERTIFICATE-----
 
-Verisign Class 1 Public Primary Certification Authority - G3
-============================================================
------BEGIN CERTIFICATE-----
-MIIEGjCCAwICEQCLW3VWhFSFCwDPrzhIzrGkMA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJV
-UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
-cmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
-IG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDEgUHVibGljIFByaW1hcnkgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQsw
-CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy
-dXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhv
-cml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDEgUHVibGljIFByaW1hcnkg
-Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAN2E1Lm0+afY8wR4nN493GwTFtl63SRRZsDHJlkNrAYIwpTRMx/wgzUfbhvI3qpuFU5UJ+/E
-bRrsC+MO8ESlV8dAWB6jRx9x7GD2bZTIGDnt/kIYVt/kTEkQeE4BdjVjEjbdZrwBBDajVWjVojYJ
-rKshJlQGrT/KFOCsyq0GHZXi+J3x4GD/wn91K0zM2v6HmSHquv4+VNfSWXjbPG7PoBMAGrgnoeS+
-Z5bKoMWznN3JdZ7rMJpfo83ZrngZPyPpXNspva1VyBtUjGP26KbqxzcSXKMpHgLZ2x87tNcPVkeB
-FQRKr4Mn0cVYiMHd9qqnoxjaaKptEVHhv2Vrn5Z20T0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-q2aN17O6x5q25lXQBfGfMY1aqtmqRiYPce2lrVNWYgFHKkTp/j90CxObufRNG7LRX7K20ohcs5/N
-y9Sn2WCVhDr4wTcdYcrnsMXlkdpUpqwxga6X3s0IrLjAl4B/bnKk52kTlWUfxJM8/XmPBNQ+T+r3
-ns7NZ3xPZQL/kYVUc8f/NveGLezQXk//EZ9yBta4GvFMDSZl4kSAHsef493oCtrspSCAaWihT37h
-a88HQfqDjrw43bAuEbFrskLMmrz5SCJ5ShkPshw+IHTZasO+8ih4E1Z5T21Q6huwtVexN2ZYI/Pc
-D98Kh8TvhgXVOBRgmaNL3gaWcSzy27YfpO8/7g==
------END CERTIFICATE-----
-
-Verisign Class 2 Public Primary Certification Authority - G3
-============================================================
------BEGIN CERTIFICATE-----
-MIIEGTCCAwECEGFwy0mMX5hFKeewptlQW3owDQYJKoZIhvcNAQEFBQAwgcoxCzAJBgNVBAYTAlVT
-MRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29y
-azE6MDgGA1UECxMxKGMpIDE5OTkgVmVyaVNpZ24sIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ug
-b25seTFFMEMGA1UEAxM8VmVyaVNpZ24gQ2xhc3MgMiBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0
-aW9uIEF1dGhvcml0eSAtIEczMB4XDTk5MTAwMTAwMDAwMFoXDTM2MDcxNjIzNTk1OVowgcoxCzAJ
-BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1
-c3QgTmV0d29yazE6MDgGA1UECxMxKGMpIDE5OTkgVmVyaVNpZ24sIEluYy4gLSBGb3IgYXV0aG9y
-aXplZCB1c2Ugb25seTFFMEMGA1UEAxM8VmVyaVNpZ24gQ2xhc3MgMiBQdWJsaWMgUHJpbWFyeSBD
-ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEczMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEArwoNwtUs22e5LeWUJ92lvuCwTY+zYVY81nzD9M0+hsuiiOLh2KRpxbXiv8GmR1BeRjmL1Za6
-tW8UvxDOJxOeBUebMXoT2B/Z0wI3i60sR/COgQanDTAM6/c8DyAd3HJG7qUCyFvDyVZpTMUYwZF7
-C9UTAJu878NIPkZgIIUq1ZC2zYugzDLdt/1AVbJQHFauzI13TccgTacxdu9okoqQHgiBVrKtaaNS
-0MscxCM9H5n+TOgWY47GCI72MfbS+uV23bUckqNJzc0BzWjNqWm6o+sdDZykIKbBoMXRRkwXbdKs
-Zj+WjOCE1Db/IlnF+RFgqF8EffIa9iVCYQ/ESrg+iQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQA0
-JhU8wI1NQ0kdvekhktdmnLfexbjQ5F1fdiLAJvmEOjr5jLX77GDx6M4EsMjdpwOPMPOY36TmpDHf
-0xwLRtxyID+u7gU8pDM/CzmscHhzS5kr3zDCVLCoO1Wh/hYozUK9dG6A2ydEp85EXdQbkJgNHkKU
-sQAsBNB0owIFImNjzYO1+8FtYmtpdf1dcEG59b98377BMnMiIYtYgXsVkXq642RIsH/7NiXaldDx
-JBQX3RiAa0YjOVT1jmIJBB2UkKab5iXiQkWquJCtvgiPqQtCGJTPcjnhsUPgKM+351psE2tJs//j
-GHyJizNdrDPXp/naOlXJWBD5qu9ats9LS98q
------END CERTIFICATE-----
-
 Verisign Class 3 Public Primary Certification Authority - G3
 ============================================================
 -----BEGIN CERTIFICATE-----
@@ -533,34 +341,6 @@ Ewr75Ji174z4xRAN95K+8cPV1ZVqBLssziY2ZcgxxufuP+NXdYR6Ee9GTxj005i7qIcyunL2POI9
 n9cd2cNgQ4xYDiKWL2KjLB+6rQXvqzJ4h6BUcxm1XAX5Uj5tLUUL9wqT6u0G+bI=
 -----END CERTIFICATE-----
 
-Entrust.net Secure Personal CA
-==============================
------BEGIN CERTIFICATE-----
-MIIE7TCCBFagAwIBAgIEOAOR7jANBgkqhkiG9w0BAQQFADCByTELMAkGA1UEBhMCVVMxFDASBgNV
-BAoTC0VudHJ1c3QubmV0MUgwRgYDVQQLFD93d3cuZW50cnVzdC5uZXQvQ2xpZW50X0NBX0luZm8v
-Q1BTIGluY29ycC4gYnkgcmVmLiBsaW1pdHMgbGlhYi4xJTAjBgNVBAsTHChjKSAxOTk5IEVudHJ1
-c3QubmV0IExpbWl0ZWQxMzAxBgNVBAMTKkVudHJ1c3QubmV0IENsaWVudCBDZXJ0aWZpY2F0aW9u
-IEF1dGhvcml0eTAeFw05OTEwMTIxOTI0MzBaFw0xOTEwMTIxOTU0MzBaMIHJMQswCQYDVQQGEwJV
-UzEUMBIGA1UEChMLRW50cnVzdC5uZXQxSDBGBgNVBAsUP3d3dy5lbnRydXN0Lm5ldC9DbGllbnRf
-Q0FfSW5mby9DUFMgaW5jb3JwLiBieSByZWYuIGxpbWl0cyBsaWFiLjElMCMGA1UECxMcKGMpIDE5
-OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMqRW50cnVzdC5uZXQgQ2xpZW50IENlcnRp
-ZmljYXRpb24gQXV0aG9yaXR5MIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQDIOpleMRffrCdv
-kHvkGf9FozTC28GoT/Bo6oT9n3V5z8GKUZSvx1cDR2SerYIbWtp/N3hHuzeYEpbOxhN979IMMFGp
-OZ5V+Pux5zDeg7K6PvHViTs7hbqqdCz+PzFur5GVbgbUB01LLFZHGARS2g4Qk79jkJvh34zmAqTm
-T173iwIBA6OCAeAwggHcMBEGCWCGSAGG+EIBAQQEAwIABzCCASIGA1UdHwSCARkwggEVMIHkoIHh
-oIHepIHbMIHYMQswCQYDVQQGEwJVUzEUMBIGA1UEChMLRW50cnVzdC5uZXQxSDBGBgNVBAsUP3d3
-dy5lbnRydXN0Lm5ldC9DbGllbnRfQ0FfSW5mby9DUFMgaW5jb3JwLiBieSByZWYuIGxpbWl0cyBs
-aWFiLjElMCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMqRW50
-cnVzdC5uZXQgQ2xpZW50IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMCyg
-KqAohiZodHRwOi8vd3d3LmVudHJ1c3QubmV0L0NSTC9DbGllbnQxLmNybDArBgNVHRAEJDAigA8x
-OTk5MTAxMjE5MjQzMFqBDzIwMTkxMDEyMTkyNDMwWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAU
-xPucKXuXzUyW/O5bs8qZdIuV6kwwHQYDVR0OBBYEFMT7nCl7l81MlvzuW7PKmXSLlepMMAwGA1Ud
-EwQFMAMBAf8wGQYJKoZIhvZ9B0EABAwwChsEVjQuMAMCBJAwDQYJKoZIhvcNAQEEBQADgYEAP66K
-8ddmAwWePvrqHEa7pFuPeJoSSJn59DXeDDYHAmsQOokUgZwxpnyyQbJq5wcBoUv5nyU7lsqZwz6h
-URzzwy5E97BnRqqS5TvaHBkUODDV4qIxJS7x7EU47fgGWANzYrAQMY9Av2TgXD7FTx/aEkP/TOYG
-JqibGapEPHayXOw=
------END CERTIFICATE-----
-
 Entrust.net Premium 2048 Secure Server CA
 =========================================
 -----BEGIN CERTIFICATE-----
@@ -757,75 +537,6 @@ RXEwMn8bLgn5v1Kh7sKAPgZcLlVAwRv1cEWw3F369nJad9Jjzc9YiQBCYz95OdBEsIJuQRno3eDB
 iFrRHnGTHyQwdOUeqN48Jzd/g66ed8/wMLH/S5noxqE=
 -----END CERTIFICATE-----
 
-Thawte Time Stamping CA
-=======================
------BEGIN CERTIFICATE-----
-MIICoTCCAgqgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBizELMAkGA1UEBhMCWkExFTATBgNVBAgT
-DFdlc3Rlcm4gQ2FwZTEUMBIGA1UEBxMLRHVyYmFudmlsbGUxDzANBgNVBAoTBlRoYXd0ZTEdMBsG
-A1UECxMUVGhhd3RlIENlcnRpZmljYXRpb24xHzAdBgNVBAMTFlRoYXd0ZSBUaW1lc3RhbXBpbmcg
-Q0EwHhcNOTcwMTAxMDAwMDAwWhcNMjAxMjMxMjM1OTU5WjCBizELMAkGA1UEBhMCWkExFTATBgNV
-BAgTDFdlc3Rlcm4gQ2FwZTEUMBIGA1UEBxMLRHVyYmFudmlsbGUxDzANBgNVBAoTBlRoYXd0ZTEd
-MBsGA1UECxMUVGhhd3RlIENlcnRpZmljYXRpb24xHzAdBgNVBAMTFlRoYXd0ZSBUaW1lc3RhbXBp
-bmcgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANYrWHhhRYZT6jR7UZztsOYuGA7+4F+o
-J9O0yeB8WU4WDnNUYMF/9p8u6TqFJBU820cEY8OexJQaWt9MevPZQx08EHp5JduQ/vBR5zDWQQD9
-nyjfeb6Uu522FOMjhdepQeBMpHmwKxqL8vg7ij5FrHGSALSQQZj7X+36ty6K+Ig3AgMBAAGjEzAR
-MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAZ9viwuaHPUCDhjc1fR/OmsMMZiCo
-uqoEiYbC9RAIDb/LogWK0E02PvTX72nGXuSwlG9KuefeW4i2e9vjJ+V2w/A1wcu1J5szedyQpgCe
-d/r8zSeUQhac0xxo7L9c3eWpexAKMnRUEzGLhQOEkbdYATAUOK8oyvyxUBkZCayJSdM=
------END CERTIFICATE-----
-
-Entrust.net Global Secure Server CA
-===================================
------BEGIN CERTIFICATE-----
-MIIElTCCA/6gAwIBAgIEOJsRPDANBgkqhkiG9w0BAQQFADCBujEUMBIGA1UEChMLRW50cnVzdC5u
-ZXQxPzA9BgNVBAsUNnd3dy5lbnRydXN0Lm5ldC9TU0xfQ1BTIGluY29ycC4gYnkgcmVmLiAobGlt
-aXRzIGxpYWIuKTElMCMGA1UECxMcKGMpIDIwMDAgRW50cnVzdC5uZXQgTGltaXRlZDE6MDgGA1UE
-AxMxRW50cnVzdC5uZXQgU2VjdXJlIFNlcnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0w
-MDAyMDQxNzIwMDBaFw0yMDAyMDQxNzUwMDBaMIG6MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDE/MD0G
-A1UECxQ2d3d3LmVudHJ1c3QubmV0L1NTTF9DUFMgaW5jb3JwLiBieSByZWYuIChsaW1pdHMgbGlh
-Yi4pMSUwIwYDVQQLExwoYykgMjAwMCBFbnRydXN0Lm5ldCBMaW1pdGVkMTowOAYDVQQDEzFFbnRy
-dXN0Lm5ldCBTZWN1cmUgU2VydmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3
-DQEBAQUAA4GNADCBiQKBgQDHwV9OcfHO8GCGD9JYf9Mzly0XonUwtZZkJi9ow0SrqHXmAGc0V55l
-xyKbc+bT3QgON1WqJUaBbL3+qPZ1V1eMkGxKwz6LS0MKyRFWmponIpnPVZ5h2QLifLZ8OAfc439P
-mrkDQYC2dWcTC5/oVzbIXQA23mYU2m52H083jIITiQIDAQABo4IBpDCCAaAwEQYJYIZIAYb4QgEB
-BAQDAgAHMIHjBgNVHR8EgdswgdgwgdWggdKggc+kgcwwgckxFDASBgNVBAoTC0VudHJ1c3QubmV0
-MT8wPQYDVQQLFDZ3d3cuZW50cnVzdC5uZXQvU1NMX0NQUyBpbmNvcnAuIGJ5IHJlZi4gKGxpbWl0
-cyBsaWFiLikxJTAjBgNVBAsTHChjKSAyMDAwIEVudHJ1c3QubmV0IExpbWl0ZWQxOjA4BgNVBAMT
-MUVudHJ1c3QubmV0IFNlY3VyZSBTZXJ2ZXIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxDTALBgNV
-BAMTBENSTDEwKwYDVR0QBCQwIoAPMjAwMDAyMDQxNzIwMDBagQ8yMDIwMDIwNDE3NTAwMFowCwYD
-VR0PBAQDAgEGMB8GA1UdIwQYMBaAFMtswGvjuz7L/CKc/vuLkpyw8m4iMB0GA1UdDgQWBBTLbMBr
-47s+y/winP77i5KcsPJuIjAMBgNVHRMEBTADAQH/MB0GCSqGSIb2fQdBAAQQMA4bCFY1LjA6NC4w
-AwIEkDANBgkqhkiG9w0BAQQFAAOBgQBi24GRzsiad0Iv7L0no1MPUBvqTpLwqa+poLpIYcvvyQbv
-H9X07t9WLebKahlzqlO+krNQAraFJnJj2HVQYnUUt7NQGj/KEQALhUVpbbalrlHhStyCP2yMNLJ3
-a9kC9n8O6mUE8c1UyrrJzOCE98g+EZfTYAkYvAX/bIkz8OwVDw==
------END CERTIFICATE-----
-
-Entrust.net Global Secure Personal CA
-=====================================
------BEGIN CERTIFICATE-----
-MIIEgzCCA+ygAwIBAgIEOJ725DANBgkqhkiG9w0BAQQFADCBtDEUMBIGA1UEChMLRW50cnVzdC5u
-ZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9HQ0NBX0NQUyBpbmNvcnAuIGJ5IHJlZi4gKGxp
-bWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAyMDAwIEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNV
-BAMTKkVudHJ1c3QubmV0IENsaWVudCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMDAyMDcx
-NjE2NDBaFw0yMDAyMDcxNjQ2NDBaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3
-d3d3LmVudHJ1c3QubmV0L0dDQ0FfQ1BTIGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTEl
-MCMGA1UECxMcKGMpIDIwMDAgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMqRW50cnVzdC5u
-ZXQgQ2xpZW50IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB
-iQKBgQCTdLS25MVL1qFof2LV7PdRV7NySpj10InJrWPNTTVRaoTUrcloeW+46xHbh65cJFET8VQl
-hK8pK5/jgOLZy93GRUk0iJBeAZfv6lOm3fzB3ksqJeTpNfpVBQbliXrqpBFXO/x8PTbNZzVtpKkl
-Wb1m9fkn5JVn1j+SgF7yNH0rhQIDAQABo4IBnjCCAZowEQYJYIZIAYb4QgEBBAQDAgAHMIHdBgNV
-HR8EgdUwgdIwgc+ggcyggcmkgcYwgcMxFDASBgNVBAoTC0VudHJ1c3QubmV0MUAwPgYDVQQLFDd3
-d3cuZW50cnVzdC5uZXQvR0NDQV9DUFMgaW5jb3JwLiBieSByZWYuIChsaW1pdHMgbGlhYi4pMSUw
-IwYDVQQLExwoYykgMjAwMCBFbnRydXN0Lm5ldCBMaW1pdGVkMTMwMQYDVQQDEypFbnRydXN0Lm5l
-dCBDbGllbnQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxDTALBgNVBAMTBENSTDEwKwYDVR0QBCQw
-IoAPMjAwMDAyMDcxNjE2NDBagQ8yMDIwMDIwNzE2NDY0MFowCwYDVR0PBAQDAgEGMB8GA1UdIwQY
-MBaAFISLdP3FjcD/J20gN0V8/i3OutN9MB0GA1UdDgQWBBSEi3T9xY3A/ydtIDdFfP4tzrrTfTAM
-BgNVHRMEBTADAQH/MB0GCSqGSIb2fQdBAAQQMA4bCFY1LjA6NC4wAwIEkDANBgkqhkiG9w0BAQQF
-AAOBgQBObzWAO9GK9Q6nIMstZVXQkvTnhLUGJoMShAusO7JE7r3PQNsgDrpuFOow4DtifH+La3xK
-p9U1PL6oXOpLu5OOgGarDyn9TS2/GpsKkMWr2tGzhtQvJFJcem3G8v7lTRowjJDyutdKPkN+1MhQ
-Gof4T4HHdguEOnKdzmVml64mXg==
------END CERTIFICATE-----
-
 Entrust Root Certification Authority
 ====================================
 -----BEGIN CERTIFICATE-----
@@ -852,61 +563,6 @@ W3iDVuycNsMm4hH2Z0kdkquM++v/eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0
 tHuu2guQOHXvgR1m0vdXcDazv/wor3ElhVsT/h5/WrQ8
 -----END CERTIFICATE-----
 
-AOL Time Warner Root Certification Authority 1
-==============================================
------BEGIN CERTIFICATE-----
-MIID5jCCAs6gAwIBAgIBATANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UEBhMCVVMxHTAbBgNVBAoT
-FEFPTCBUaW1lIFdhcm5lciBJbmMuMRwwGgYDVQQLExNBbWVyaWNhIE9ubGluZSBJbmMuMTcwNQYD
-VQQDEy5BT0wgVGltZSBXYXJuZXIgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAxMB4XDTAy
-MDUyOTA2MDAwMFoXDTM3MTEyMDE1MDMwMFowgYMxCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRBT0wg
-VGltZSBXYXJuZXIgSW5jLjEcMBoGA1UECxMTQW1lcmljYSBPbmxpbmUgSW5jLjE3MDUGA1UEAxMu
-QU9MIFRpbWUgV2FybmVyIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAJnej8Mlo2k06AX3dLm/WpcZuS+U0pPlLYnKhHw/EEMbjIt8
-hFj4JHxIzyr9wBXZGH6EGhfT257XyuTZ16pYUYfw8ItITuLCxFlpMGK2MKKMCxGZYTVtfu/FsRkG
-IBKOQuHfD5YQUqjPnF+VFNivO3ULMSAfRC+iYkGzuxgh28pxPIzstrkNn+9R7017EvILDOGsQI93
-f7DKeHEMXRZxcKLXwjqFzQ6axOAAsNUl6twr5JQtOJyJQVdkKGUZHLZEtMgxa44Be3ZZJX8VHIQI
-fHNlIAqhBC4aMqiaILGcLCFZ5/vP7nAtCMpjPiybkxlqpMKX/7eGV4iFbJ4VFitNLLMCAwEAAaNj
-MGEwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUoTYwFsuGkABFgFOxj8jYPXy+XxIwHwYDVR0j
-BBgwFoAUoTYwFsuGkABFgFOxj8jYPXy+XxIwDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBBQUA
-A4IBAQCKIBilvrMvtKaEAEAwKfq0FHNMeUWn9nDg6H5kHgqVfGphwu9OH77/yZkfB2FK4V1Mza3u
-0FIy2VkyvNp5ctZ7CegCgTXTCt8RHcl5oIBN/lrXVtbtDyqvpxh1MwzqwWEFT2qaifKNuZ8u77Bf
-WgDrvq2g+EQFZ7zLBO+eZMXpyD8Fv8YvBxzDNnGGyjhmSs3WuEvGbKeXO/oTLW4jYYehY0KswsuX
-n2Fozy1MBJ3XJU8KDk2QixhWqJNIV9xvrr2eZ1d3iVCzvhGbRWeDhhmH05i9CBoWH1iCC+GWaQVL
-juyDUTEH1dSf/1l7qG6Fz9NLqUmwX7A5KGgOc90lmt4S
------END CERTIFICATE-----
-
-AOL Time Warner Root Certification Authority 2
-==============================================
------BEGIN CERTIFICATE-----
-MIIF5jCCA86gAwIBAgIBATANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UEBhMCVVMxHTAbBgNVBAoT
-FEFPTCBUaW1lIFdhcm5lciBJbmMuMRwwGgYDVQQLExNBbWVyaWNhIE9ubGluZSBJbmMuMTcwNQYD
-VQQDEy5BT0wgVGltZSBXYXJuZXIgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAyMB4XDTAy
-MDUyOTA2MDAwMFoXDTM3MDkyODIzNDMwMFowgYMxCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRBT0wg
-VGltZSBXYXJuZXIgSW5jLjEcMBoGA1UECxMTQW1lcmljYSBPbmxpbmUgSW5jLjE3MDUGA1UEAxMu
-QU9MIFRpbWUgV2FybmVyIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMjCCAiIwDQYJKoZI
-hvcNAQEBBQADggIPADCCAgoCggIBALQ3WggWmRToVbEbJGv8x4vmh6mJ7ouZzU9AhqS2TcnZsdw8
-TQ2FTBVsRotSeJ/4I/1n9SQ6aF3Q92RhQVSji6UI0ilbm2BPJoPRYxJWSXakFsKlnUWsi4SVqBax
-7J/qJBrvuVdcmiQhLE0OcR+mrF1FdAOYxFSMFkpBd4aVdQxHAWZg/BXxD+r1FHjHDtdugRxev17n
-OirYlxcwfACtCJ0zr7iZYYCLqJV+FNwSbKTQ2O9ASQI2+W6p1h2WVgSysy0WVoaP2SBXgM1nEG2w
-TPDaRrbqJS5Gr42whTg0ixQmgiusrpkLjhTXUr2eacOGAgvqdnUxCc4zGSGFQ+aJLZ8lN2fxI2rS
-AG2X+Z/nKcrdH9cG6rjJuQkhn8g/BsXS6RJGAE57COtCPStIbp1n3UsC5ETzkxmlJ85per5n0/xQ
-pCyrw2u544BMzwVhSyvcG7mm0tCq9Stz+86QNZ8MUhy/XCFhEVsVS6kkUfykXPcXnbDS+gfpj1bk
-GoxoigTTfFrjnqKhynFbotSg5ymFXQNoKk/SBtc9+cMDLz9l+WceR0DTYw/j1Y75hauXTLPXJuuW
-CpTehTacyH+BCQJJKg71ZDIMgtG6aoIbs0t0EfOMd9afv9w3pKdVBC/UMejTRrkDfNoSTllkt1Ex
-MVCgyhwn2RAurda9EGYrw7AiShJbAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
-FE9pbQN+nZ8HGEO8txBO1b+pxCAoMB8GA1UdIwQYMBaAFE9pbQN+nZ8HGEO8txBO1b+pxCAoMA4G
-A1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAgEAO/Ouyuguh4X7ZVnnrREUpVe8WJ8kEle7
-+z802u6teio0cnAxa8cZmIDJgt43d15Ui47y6mdPyXSEkVYJ1eV6moG2gcKtNuTxVBFT8zRFASbI
-5Rq8NEQh3q0l/HYWdyGQgJhXnU7q7C+qPBR7V8F+GBRn7iTGvboVsNIYvbdVgaxTwOjdaRITQrcC
-tQVBynlQboIOcXKTRuidDV29rs4prWPVVRaAMCf/drr3uNZK49m1+VLQTkCpx+XCMseqdiThawVQ
-68W/ClTluUI8JPu3B5wwn3la5uBAUhX0/Kr0VvlEl4ftDmVyXr4m+02kLQgH3thcoNyBM5kYJRF3
-p+v9WAksmWsbivNSPxpNSGDxoPYzAlOL7SUJuA0t7Zdz7NeWH45gDtoQmy8YJPamTQr5O8t1wswv
-ziRpyQoijlmn94IM19drNZxDAGrElWe6nEXLuA4399xOAU++CrYD062KRffaJ00psUjf5BHklka9
-bAI+1lHIlRcBFanyqqryvy9lG2/QuRqT9Y41xICHPpQvZuTpqP9BnHAqTyo5GJUefvthATxRCC4o
-GKQWDzH9OmwjkyB24f0HhdFbP9IcczLd+rn4jM8Ch3qaluTtT4mNU0OrDhPAARW0eTjb/G49nlG2
-uBOLZ8/5fNkiHfZdxRwBL5joeiQYvITX+txyW/fBOmg=
------END CERTIFICATE-----
-
 RSA Security 2048 v3
 ====================
 -----BEGIN CERTIFICATE-----
@@ -1030,31 +686,6 @@ gn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwXQMAJKOSLakhT2+zNVVXxxvjpoixMptEm
 X36vWkzaH6byHCx+rgIW0lbQL1dTR+iS
 -----END CERTIFICATE-----
 
-UTN-USER First-Network Applications
-===================================
------BEGIN CERTIFICATE-----
-MIIEZDCCA0ygAwIBAgIQRL4Mi1AAJLQR0zYwS8AzdzANBgkqhkiG9w0BAQUFADCBozELMAkGA1UE
-BhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhl
-IFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xKzAp
-BgNVBAMTIlVUTi1VU0VSRmlyc3QtTmV0d29yayBBcHBsaWNhdGlvbnMwHhcNOTkwNzA5MTg0ODM5
-WhcNMTkwNzA5MTg1NzQ5WjCBozELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5T
-YWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho
-dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xKzApBgNVBAMTIlVUTi1VU0VSRmlyc3QtTmV0d29yayBB
-cHBsaWNhdGlvbnMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCz+5Gh5DZVhawGNFug
-mliy+LUPBXeDrjKxdpJo7CNKyXY/45y2N3kDuatpjQclthln5LAbGHNhSuh+zdMvZOOmfAz6F4Cj
-DUeJT1FxL+78P/m4FoCHiZMlIJpDgmkkdihZNaEdwH+DBmQWICzTSaSFtMBhf1EI+GgVkYDLpdXu
-Ozr0hAReYFmnjDRy7rh4xdE7EkpvfmUnuaRVxblvQ6TFHSyZwFKkeEwVs0CYCGtDxgGwenv1axwi
-P8vv/6jQOkt2FZ7S0cYu49tXGzKiuG/ohqY/cKvlcJKrRB5AUPuco2LkbG6gyN7igEL66S/ozjIE
-j3yNtxyjNTwV3Z7DrpelAgMBAAGjgZEwgY4wCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8w
-HQYDVR0OBBYEFPqGydvguul49Uuo1hXf8NPhahQ8ME8GA1UdHwRIMEYwRKBCoECGPmh0dHA6Ly9j
-cmwudXNlcnRydXN0LmNvbS9VVE4tVVNFUkZpcnN0LU5ldHdvcmtBcHBsaWNhdGlvbnMuY3JsMA0G
-CSqGSIb3DQEBBQUAA4IBAQCk8yXM0dSRgyLQzDKrm5ZONJFUICU0YV8qAhXhi6r/fWRRzwr/vH3Y
-IWp4yy9Rb/hCHTO967V7lMPDqaAt39EpHx3+jz+7qEUqf9FuVSTiuwL7MT++6LzsQCv4AdRWOOTK
-RIK1YSAhZ2X28AvnNPilwpyjXEAfhZOVBt5P1CeptqX8Fs1zMT+4ZSfP1FMa8Kxun08FDAOBp4Qp
-xFq9ZFdyrTvPNximmMatBrTcCKME1SmklpoSZ0qMYEWd8SOasACcaLWYUNPvji6SZbFIPiG+FTAq
-DbUMo2s/rn9X9R+WfN9v3YIwLGUbQErNaLly7HF27FSOH4UMAWr6pjisH8SE
------END CERTIFICATE-----
-
 America Online Root Certification Authority 1
 =============================================
 -----BEGIN CERTIFICATE-----
@@ -1130,48 +761,6 @@ YQa7FkKMcPcw++DbZqMAAb3mLNqRX6BGi01qnD093QVG/na/oAo85ADmJ7f/hC3euiInlhBx6yLt
 398znM/jra6O1I7mT1GvFpLgXPYHDw==
 -----END CERTIFICATE-----
 
-TC TrustCenter, Germany, Class 2 CA
-===================================
------BEGIN CERTIFICATE-----
-MIIDXDCCAsWgAwIBAgICA+owDQYJKoZIhvcNAQEEBQAwgbwxCzAJBgNVBAYTAkRFMRAwDgYDVQQI
-EwdIYW1idXJnMRAwDgYDVQQHEwdIYW1idXJnMTowOAYDVQQKEzFUQyBUcnVzdENlbnRlciBmb3Ig
-U2VjdXJpdHkgaW4gRGF0YSBOZXR3b3JrcyBHbWJIMSIwIAYDVQQLExlUQyBUcnVzdENlbnRlciBD
-bGFzcyAyIENBMSkwJwYJKoZIhvcNAQkBFhpjZXJ0aWZpY2F0ZUB0cnVzdGNlbnRlci5kZTAeFw05
-ODAzMDkxMTU5NTlaFw0xMTAxMDExMTU5NTlaMIG8MQswCQYDVQQGEwJERTEQMA4GA1UECBMHSGFt
-YnVyZzEQMA4GA1UEBxMHSGFtYnVyZzE6MDgGA1UEChMxVEMgVHJ1c3RDZW50ZXIgZm9yIFNlY3Vy
-aXR5IGluIERhdGEgTmV0d29ya3MgR21iSDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3Mg
-MiBDQTEpMCcGCSqGSIb3DQEJARYaY2VydGlmaWNhdGVAdHJ1c3RjZW50ZXIuZGUwgZ8wDQYJKoZI
-hvcNAQEBBQADgY0AMIGJAoGBANo46O0yAClxgwENv4wB3NrGrTmkqYov1YtcaF9QxmL1Zr3KkSLs
-qh1R1z2zUbKDTl3LSbDwTFXlay3HhQswHJJOgtTKAu33b77c4OMUuAVT8pr0VotanoWT0bSCVq5N
-u6hLVxa8/vhYnvgpjbB7zXjJT6yLZwzxnPv8V5tXXE8NAgMBAAGjazBpMA8GA1UdEwEB/wQFMAMB
-Af8wDgYDVR0PAQH/BAQDAgGGMDMGCWCGSAGG+EIBCAQmFiRodHRwOi8vd3d3LnRydXN0Y2VudGVy
-LmRlL2d1aWRlbGluZXMwEQYJYIZIAYb4QgEBBAQDAgAHMA0GCSqGSIb3DQEBBAUAA4GBAIRS+yjf
-/x91AbwBvgRWl2p0QiQxg/lGsQaKic+WLDO/jLVfenKhhQbOhvgFjuj5Jcrag4wGrOs2bYWRNAQ2
-9ELw+HkuCkhcq8xRT3h2oNmsGb0q0WkEKJHKNhAngFdb0lz1wlurZIFjdFH0l7/NEij3TWZ/p/Ac
-ASZ4smZHcFFk
------END CERTIFICATE-----
-
-TC TrustCenter, Germany, Class 3 CA
-===================================
------BEGIN CERTIFICATE-----
-MIIDXDCCAsWgAwIBAgICA+swDQYJKoZIhvcNAQEEBQAwgbwxCzAJBgNVBAYTAkRFMRAwDgYDVQQI
-EwdIYW1idXJnMRAwDgYDVQQHEwdIYW1idXJnMTowOAYDVQQKEzFUQyBUcnVzdENlbnRlciBmb3Ig
-U2VjdXJpdHkgaW4gRGF0YSBOZXR3b3JrcyBHbWJIMSIwIAYDVQQLExlUQyBUcnVzdENlbnRlciBD
-bGFzcyAzIENBMSkwJwYJKoZIhvcNAQkBFhpjZXJ0aWZpY2F0ZUB0cnVzdGNlbnRlci5kZTAeFw05
-ODAzMDkxMTU5NTlaFw0xMTAxMDExMTU5NTlaMIG8MQswCQYDVQQGEwJERTEQMA4GA1UECBMHSGFt
-YnVyZzEQMA4GA1UEBxMHSGFtYnVyZzE6MDgGA1UEChMxVEMgVHJ1c3RDZW50ZXIgZm9yIFNlY3Vy
-aXR5IGluIERhdGEgTmV0d29ya3MgR21iSDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3Mg
-MyBDQTEpMCcGCSqGSIb3DQEJARYaY2VydGlmaWNhdGVAdHJ1c3RjZW50ZXIuZGUwgZ8wDQYJKoZI
-hvcNAQEBBQADgY0AMIGJAoGBALa0wTUFLg2N7KBAahwOJ6ZQkmtQGwfeLud2zODa/ISoXoxjaitN
-2U4CdhHBC/KNecoAtvGwDtf7pBc9r6tpepYnv68zoZoqWarEtTcI8hKlMbZD9TKWcSgoq40oht+7
-7uMMfTDWw1Krj10nnGvAo+cFa1dJRLNu6mTP0o56UHd3AgMBAAGjazBpMA8GA1UdEwEB/wQFMAMB
-Af8wDgYDVR0PAQH/BAQDAgGGMDMGCWCGSAGG+EIBCAQmFiRodHRwOi8vd3d3LnRydXN0Y2VudGVy
-LmRlL2d1aWRlbGluZXMwEQYJYIZIAYb4QgEBBAQDAgAHMA0GCSqGSIb3DQEBBAUAA4GBABY9xs3B
-u4VxhUafPiCPUSiZ7C1FIWMjWwS7TJC4iJIETb19AaM/9uzO8d7+feXhPrvGq14L3T2WxMup1Pkm
-5gZOngylerpuw3yCGdHHsbHD2w2Om0B8NwvxXej9H5CIpQ5ON2QhqE6NtJ/x3kit1VYYUimLRzQS
-CdS7kjXvD9s0
------END CERTIFICATE-----
-
 Certum Root CA
 ==============
 -----BEGIN CERTIFICATE-----
@@ -1265,253 +854,6 @@ R+4viMi14QVFwL4Ucd56/Y57fU0IlqUSc/AtyjcndBInTMu2l+nZrghtWjlA3QVHdWpaIbOjGM9O
 9y5Xt5hwXsjEeLBi
 -----END CERTIFICATE-----
 
-IPS Chained CAs root
-====================
------BEGIN CERTIFICATE-----
-MIIH9zCCB2CgAwIBAgIBADANBgkqhkiG9w0BAQUFADCCARwxCzAJBgNVBAYTAkVTMRIwEAYDVQQI
-EwlCYXJjZWxvbmExEjAQBgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UEChMlSVBTIEludGVybmV0IHB1
-Ymxpc2hpbmcgU2VydmljZXMgcy5sLjErMCkGA1UEChQiaXBzQG1haWwuaXBzLmVzIEMuSS5GLiAg
-Qi02MDkyOTQ1MjEzMDEGA1UECxMqSVBTIENBIENoYWluZWQgQ0FzIENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5MTMwMQYDVQQDEypJUFMgQ0EgQ2hhaW5lZCBDQXMgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
-dHkxHjAcBgkqhkiG9w0BCQEWD2lwc0BtYWlsLmlwcy5lczAeFw0wMTEyMjkwMDUzNThaFw0yNTEy
-MjcwMDUzNThaMIIBHDELMAkGA1UEBhMCRVMxEjAQBgNVBAgTCUJhcmNlbG9uYTESMBAGA1UEBxMJ
-QmFyY2Vsb25hMS4wLAYDVQQKEyVJUFMgSW50ZXJuZXQgcHVibGlzaGluZyBTZXJ2aWNlcyBzLmwu
-MSswKQYDVQQKFCJpcHNAbWFpbC5pcHMuZXMgQy5JLkYuICBCLTYwOTI5NDUyMTMwMQYDVQQLEypJ
-UFMgQ0EgQ2hhaW5lZCBDQXMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxMzAxBgNVBAMTKklQUyBD
-QSBDaGFpbmVkIENBcyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEeMBwGCSqGSIb3DQEJARYPaXBz
-QG1haWwuaXBzLmVzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDcVpJJspQgvJhPUOtopKdJ
-C7/SMejHT8KGC/po/UNaivNgkjWZOLtNA1IhW/A3mTXhQSCBhYEFcYGdtJUZqV92NC5jNzVXjrQf
-Qj8VXOF6wV8TGDIxya2+o8eDZh65nAQTy2nBBt4wBrszo7Uf8I9vzv+W6FS+ZoCua9tBhDaiPQID
-AQABo4IEQzCCBD8wHQYDVR0OBBYEFKGtMbH5PuEXpsirNPxShwkeYlJBMIIBTgYDVR0jBIIBRTCC
-AUGAFKGtMbH5PuEXpsirNPxShwkeYlJBoYIBJKSCASAwggEcMQswCQYDVQQGEwJFUzESMBAGA1UE
-CBMJQmFyY2Vsb25hMRIwEAYDVQQHEwlCYXJjZWxvbmExLjAsBgNVBAoTJUlQUyBJbnRlcm5ldCBw
-dWJsaXNoaW5nIFNlcnZpY2VzIHMubC4xKzApBgNVBAoUImlwc0BtYWlsLmlwcy5lcyBDLkkuRi4g
-IEItNjA5Mjk0NTIxMzAxBgNVBAsTKklQUyBDQSBDaGFpbmVkIENBcyBDZXJ0aWZpY2F0aW9uIEF1
-dGhvcml0eTEzMDEGA1UEAxMqSVBTIENBIENoYWluZWQgQ0FzIENlcnRpZmljYXRpb24gQXV0aG9y
-aXR5MR4wHAYJKoZIhvcNAQkBFg9pcHNAbWFpbC5pcHMuZXOCAQAwDAYDVR0TBAUwAwEB/zAMBgNV
-HQ8EBQMDB/+AMGsGA1UdJQRkMGIGCCsGAQUFBwMBBggrBgEFBQcDAgYIKwYBBQUHAwMGCCsGAQUF
-BwMEBggrBgEFBQcDCAYKKwYBBAGCNwIBFQYKKwYBBAGCNwIBFgYKKwYBBAGCNwoDAQYKKwYBBAGC
-NwoDBDARBglghkgBhvhCAQEEBAMCAAcwGgYDVR0RBBMwEYEPaXBzQG1haWwuaXBzLmVzMBoGA1Ud
-EgQTMBGBD2lwc0BtYWlsLmlwcy5lczBCBglghkgBhvhCAQ0ENRYzQ2hhaW5lZCBDQSBDZXJ0aWZp
-Y2F0ZSBpc3N1ZWQgYnkgaHR0cDovL3d3dy5pcHMuZXMvMCkGCWCGSAGG+EIBAgQcFhpodHRwOi8v
-d3d3Lmlwcy5lcy9pcHMyMDAyLzA3BglghkgBhvhCAQQEKhYoaHR0cDovL3d3dy5pcHMuZXMvaXBz
-MjAwMi9pcHMyMDAyQ0FDLmNybDA8BglghkgBhvhCAQMELxYtaHR0cDovL3d3dy5pcHMuZXMvaXBz
-MjAwMi9yZXZvY2F0aW9uQ0FDLmh0bWw/MDkGCWCGSAGG+EIBBwQsFipodHRwOi8vd3d3Lmlwcy5l
-cy9pcHMyMDAyL3JlbmV3YWxDQUMuaHRtbD8wNwYJYIZIAYb4QgEIBCoWKGh0dHA6Ly93d3cuaXBz
-LmVzL2lwczIwMDIvcG9saWN5Q0FDLmh0bWwwbQYDVR0fBGYwZDAuoCygKoYoaHR0cDovL3d3dy5p
-cHMuZXMvaXBzMjAwMi9pcHMyMDAyQ0FDLmNybDAyoDCgLoYsaHR0cDovL3d3d2JhY2suaXBzLmVz
-L2lwczIwMDIvaXBzMjAwMkNBQy5jcmwwLwYIKwYBBQUHAQEEIzAhMB8GCCsGAQUFBzABhhNodHRw
-Oi8vb2NzcC5pcHMuZXMvMA0GCSqGSIb3DQEBBQUAA4GBAERyMJ1WWKJBGyi3leGmGpVfp3hAK+/b
-lkr8THFj2XOVvQLiogbHvpcqk4A0hgP63Ng9HgfNHnNDJGD1HWHc3JagvPsd4+cSACczAsDAK1M9
-2GsDgaPb1pOVIO/Tln4mkImcJpvNb2ar7QMiRDjMWb2f2/YHogF/JsRj9SVCXmK9
------END CERTIFICATE-----
-
-IPS CLASE1 root
-===============
------BEGIN CERTIFICATE-----
-MIIH6jCCB1OgAwIBAgIBADANBgkqhkiG9w0BAQUFADCCARIxCzAJBgNVBAYTAkVTMRIwEAYDVQQI
-EwlCYXJjZWxvbmExEjAQBgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UEChMlSVBTIEludGVybmV0IHB1
-Ymxpc2hpbmcgU2VydmljZXMgcy5sLjErMCkGA1UEChQiaXBzQG1haWwuaXBzLmVzIEMuSS5GLiAg
-Qi02MDkyOTQ1MjEuMCwGA1UECxMlSVBTIENBIENMQVNFMSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
-eTEuMCwGA1UEAxMlSVBTIENBIENMQVNFMSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEeMBwGCSqG
-SIb3DQEJARYPaXBzQG1haWwuaXBzLmVzMB4XDTAxMTIyOTAwNTkzOFoXDTI1MTIyNzAwNTkzOFow
-ggESMQswCQYDVQQGEwJFUzESMBAGA1UECBMJQmFyY2Vsb25hMRIwEAYDVQQHEwlCYXJjZWxvbmEx
-LjAsBgNVBAoTJUlQUyBJbnRlcm5ldCBwdWJsaXNoaW5nIFNlcnZpY2VzIHMubC4xKzApBgNVBAoU
-Imlwc0BtYWlsLmlwcy5lcyBDLkkuRi4gIEItNjA5Mjk0NTIxLjAsBgNVBAsTJUlQUyBDQSBDTEFT
-RTEgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxLjAsBgNVBAMTJUlQUyBDQSBDTEFTRTEgQ2VydGlm
-aWNhdGlvbiBBdXRob3JpdHkxHjAcBgkqhkiG9w0BCQEWD2lwc0BtYWlsLmlwcy5lczCBnzANBgkq
-hkiG9w0BAQEFAAOBjQAwgYkCgYEA4FEnpwvdr9G5Q1uCN0VWcu+atsIS7ywSzHb5BlmvXSHU0lq4
-oNTzav3KaY1mSPd05u42veiWkXWmcSjK5yISMmmwPh5r9FBSYmL9Yzt9fuzuOOpi9GyocY3h6YvJ
-P8a1zZRCb92CRTzo3wno7wpVqVZHYUxJZHMQKD/Kvwn/xi8CAwEAAaOCBEowggRGMB0GA1UdDgQW
-BBTrsxl588GlHKzcuh9morKbadB4CDCCAUQGA1UdIwSCATswggE3gBTrsxl588GlHKzcuh9morKb
-adB4CKGCARqkggEWMIIBEjELMAkGA1UEBhMCRVMxEjAQBgNVBAgTCUJhcmNlbG9uYTESMBAGA1UE
-BxMJQmFyY2Vsb25hMS4wLAYDVQQKEyVJUFMgSW50ZXJuZXQgcHVibGlzaGluZyBTZXJ2aWNlcyBz
-LmwuMSswKQYDVQQKFCJpcHNAbWFpbC5pcHMuZXMgQy5JLkYuICBCLTYwOTI5NDUyMS4wLAYDVQQL
-EyVJUFMgQ0EgQ0xBU0UxIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQDEyVJUFMgQ0Eg
-Q0xBU0UxIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MR4wHAYJKoZIhvcNAQkBFg9pcHNAbWFpbC5p
-cHMuZXOCAQAwDAYDVR0TBAUwAwEB/zAMBgNVHQ8EBQMDB/+AMGsGA1UdJQRkMGIGCCsGAQUFBwMB
-BggrBgEFBQcDAgYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEFBQcDCAYKKwYBBAGCNwIBFQYKKwYB
-BAGCNwIBFgYKKwYBBAGCNwoDAQYKKwYBBAGCNwoDBDARBglghkgBhvhCAQEEBAMCAAcwGgYDVR0R
-BBMwEYEPaXBzQG1haWwuaXBzLmVzMBoGA1UdEgQTMBGBD2lwc0BtYWlsLmlwcy5lczBBBglghkgB
-hvhCAQ0ENBYyQ0xBU0UxIENBIENlcnRpZmljYXRlIGlzc3VlZCBieSBodHRwOi8vd3d3Lmlwcy5l
-cy8wKQYJYIZIAYb4QgECBBwWGmh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvMDoGCWCGSAGG+EIB
-BAQtFitodHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyL2lwczIwMDJDTEFTRTEuY3JsMD8GCWCGSAGG
-+EIBAwQyFjBodHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyL3Jldm9jYXRpb25DTEFTRTEuaHRtbD8w
-PAYJYIZIAYb4QgEHBC8WLWh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvcmVuZXdhbENMQVNFMS5o
-dG1sPzA6BglghkgBhvhCAQgELRYraHR0cDovL3d3dy5pcHMuZXMvaXBzMjAwMi9wb2xpY3lDTEFT
-RTEuaHRtbDBzBgNVHR8EbDBqMDGgL6AthitodHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyL2lwczIw
-MDJDTEFTRTEuY3JsMDWgM6Axhi9odHRwOi8vd3d3YmFjay5pcHMuZXMvaXBzMjAwMi9pcHMyMDAy
-Q0xBU0UxLmNybDAvBggrBgEFBQcBAQQjMCEwHwYIKwYBBQUHMAGGE2h0dHA6Ly9vY3NwLmlwcy5l
-cy8wDQYJKoZIhvcNAQEFBQADgYEAK9Dr/drIyllq2tPMMi7JVBuKYn4VLenZMdMu9Ccj/1urxUq2
-ckCuU3T0vAW0xtnIyXf7t/k0f3gA+Nak5FI/LEpjV4F1Wo7ojPsCwJTGKbqz3Bzosq/SLmJbGqmO
-DszFV0VRFOlOHIilkfSj945RyKm+hjM+5i9Ibq9UkE6tsSU=
------END CERTIFICATE-----
-
-IPS CLASE3 root
-===============
------BEGIN CERTIFICATE-----
-MIIH6jCCB1OgAwIBAgIBADANBgkqhkiG9w0BAQUFADCCARIxCzAJBgNVBAYTAkVTMRIwEAYDVQQI
-EwlCYXJjZWxvbmExEjAQBgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UEChMlSVBTIEludGVybmV0IHB1
-Ymxpc2hpbmcgU2VydmljZXMgcy5sLjErMCkGA1UEChQiaXBzQG1haWwuaXBzLmVzIEMuSS5GLiAg
-Qi02MDkyOTQ1MjEuMCwGA1UECxMlSVBTIENBIENMQVNFMyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
-eTEuMCwGA1UEAxMlSVBTIENBIENMQVNFMyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEeMBwGCSqG
-SIb3DQEJARYPaXBzQG1haWwuaXBzLmVzMB4XDTAxMTIyOTAxMDE0NFoXDTI1MTIyNzAxMDE0NFow
-ggESMQswCQYDVQQGEwJFUzESMBAGA1UECBMJQmFyY2Vsb25hMRIwEAYDVQQHEwlCYXJjZWxvbmEx
-LjAsBgNVBAoTJUlQUyBJbnRlcm5ldCBwdWJsaXNoaW5nIFNlcnZpY2VzIHMubC4xKzApBgNVBAoU
-Imlwc0BtYWlsLmlwcy5lcyBDLkkuRi4gIEItNjA5Mjk0NTIxLjAsBgNVBAsTJUlQUyBDQSBDTEFT
-RTMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxLjAsBgNVBAMTJUlQUyBDQSBDTEFTRTMgQ2VydGlm
-aWNhdGlvbiBBdXRob3JpdHkxHjAcBgkqhkiG9w0BCQEWD2lwc0BtYWlsLmlwcy5lczCBnzANBgkq
-hkiG9w0BAQEFAAOBjQAwgYkCgYEAqxf+DrDGaBtT8FK+n/ra+osTBLsBjzLZH49NzjaY2uQARIwo
-2BNEKqRrThckQpzTiKRBgtYj+4vJhuW5qYIF3PHeH+AMmVWY8jjsbJ0gA8DvqqPGZARRLXgNo9Ko
-OtYkTOmWehisEyMiG3zoMRGzXwmqMHBxRiVrSXGAK5UBsh8CAwEAAaOCBEowggRGMB0GA1UdDgQW
-BBS4k/8uy9wsjqLnev42USGjmFsMNDCCAUQGA1UdIwSCATswggE3gBS4k/8uy9wsjqLnev42USGj
-mFsMNKGCARqkggEWMIIBEjELMAkGA1UEBhMCRVMxEjAQBgNVBAgTCUJhcmNlbG9uYTESMBAGA1UE
-BxMJQmFyY2Vsb25hMS4wLAYDVQQKEyVJUFMgSW50ZXJuZXQgcHVibGlzaGluZyBTZXJ2aWNlcyBz
-LmwuMSswKQYDVQQKFCJpcHNAbWFpbC5pcHMuZXMgQy5JLkYuICBCLTYwOTI5NDUyMS4wLAYDVQQL
-EyVJUFMgQ0EgQ0xBU0UzIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQDEyVJUFMgQ0Eg
-Q0xBU0UzIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MR4wHAYJKoZIhvcNAQkBFg9pcHNAbWFpbC5p
-cHMuZXOCAQAwDAYDVR0TBAUwAwEB/zAMBgNVHQ8EBQMDB/+AMGsGA1UdJQRkMGIGCCsGAQUFBwMB
-BggrBgEFBQcDAgYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEFBQcDCAYKKwYBBAGCNwIBFQYKKwYB
-BAGCNwIBFgYKKwYBBAGCNwoDAQYKKwYBBAGCNwoDBDARBglghkgBhvhCAQEEBAMCAAcwGgYDVR0R
-BBMwEYEPaXBzQG1haWwuaXBzLmVzMBoGA1UdEgQTMBGBD2lwc0BtYWlsLmlwcy5lczBBBglghkgB
-hvhCAQ0ENBYyQ0xBU0UzIENBIENlcnRpZmljYXRlIGlzc3VlZCBieSBodHRwOi8vd3d3Lmlwcy5l
-cy8wKQYJYIZIAYb4QgECBBwWGmh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvMDoGCWCGSAGG+EIB
-BAQtFitodHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyL2lwczIwMDJDTEFTRTMuY3JsMD8GCWCGSAGG
-+EIBAwQyFjBodHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyL3Jldm9jYXRpb25DTEFTRTMuaHRtbD8w
-PAYJYIZIAYb4QgEHBC8WLWh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvcmVuZXdhbENMQVNFMy5o
-dG1sPzA6BglghkgBhvhCAQgELRYraHR0cDovL3d3dy5pcHMuZXMvaXBzMjAwMi9wb2xpY3lDTEFT
-RTMuaHRtbDBzBgNVHR8EbDBqMDGgL6AthitodHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyL2lwczIw
-MDJDTEFTRTMuY3JsMDWgM6Axhi9odHRwOi8vd3d3YmFjay5pcHMuZXMvaXBzMjAwMi9pcHMyMDAy
-Q0xBU0UzLmNybDAvBggrBgEFBQcBAQQjMCEwHwYIKwYBBQUHMAGGE2h0dHA6Ly9vY3NwLmlwcy5l
-cy8wDQYJKoZIhvcNAQEFBQADgYEAF2VcmZVDAyevJuXr0LMXI/dDqsfwfewPxqmurpYPdikc4gYt
-fibFPPqhwYHOU7BC0ZdXGhd+pFFhxu7pXu8Fuuu9D6eSb9ijBmgpjnn1/7/5p6/ksc7C0YBCJwUE
-NPjDfxZ4IwwHJPJGR607VNCv1TGyr33I6unUVtkOE7LFRVA=
------END CERTIFICATE-----
-
-IPS CLASEA1 root
-================
------BEGIN CERTIFICATE-----
-MIIH9zCCB2CgAwIBAgIBADANBgkqhkiG9w0BAQUFADCCARQxCzAJBgNVBAYTAkVTMRIwEAYDVQQI
-EwlCYXJjZWxvbmExEjAQBgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UEChMlSVBTIEludGVybmV0IHB1
-Ymxpc2hpbmcgU2VydmljZXMgcy5sLjErMCkGA1UEChQiaXBzQG1haWwuaXBzLmVzIEMuSS5GLiAg
-Qi02MDkyOTQ1MjEvMC0GA1UECxMmSVBTIENBIENMQVNFQTEgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
-dHkxLzAtBgNVBAMTJklQUyBDQSBDTEFTRUExIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MR4wHAYJ
-KoZIhvcNAQkBFg9pcHNAbWFpbC5pcHMuZXMwHhcNMDExMjI5MDEwNTMyWhcNMjUxMjI3MDEwNTMy
-WjCCARQxCzAJBgNVBAYTAkVTMRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQBgNVBAcTCUJhcmNlbG9u
-YTEuMCwGA1UEChMlSVBTIEludGVybmV0IHB1Ymxpc2hpbmcgU2VydmljZXMgcy5sLjErMCkGA1UE
-ChQiaXBzQG1haWwuaXBzLmVzIEMuSS5GLiAgQi02MDkyOTQ1MjEvMC0GA1UECxMmSVBTIENBIENM
-QVNFQTEgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxLzAtBgNVBAMTJklQUyBDQSBDTEFTRUExIENl
-cnRpZmljYXRpb24gQXV0aG9yaXR5MR4wHAYJKoZIhvcNAQkBFg9pcHNAbWFpbC5pcHMuZXMwgZ8w
-DQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALsw19zQVL01Tp/FTILq0VA8R5j8m2mdd81u4D/u6zJf
-X5/S0HnllXNEITLgCtud186Nq1KLK3jgm1t99P1tCeWu4WwdByOgF9H5fahGRpEiqLJpxq339fWU
-oTCUvQDMRH/uxJ7JweaPCjbB/SQ9AaD1e+J8eGZDi09Z8pvZ+kmzAgMBAAGjggRTMIIETzAdBgNV
-HQ4EFgQUZyaW56G/2LUDnf473P7yiuYV3TAwggFGBgNVHSMEggE9MIIBOYAUZyaW56G/2LUDnf47
-3P7yiuYV3TChggEcpIIBGDCCARQxCzAJBgNVBAYTAkVTMRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQ
-BgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UEChMlSVBTIEludGVybmV0IHB1Ymxpc2hpbmcgU2Vydmlj
-ZXMgcy5sLjErMCkGA1UEChQiaXBzQG1haWwuaXBzLmVzIEMuSS5GLiAgQi02MDkyOTQ1MjEvMC0G
-A1UECxMmSVBTIENBIENMQVNFQTEgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxLzAtBgNVBAMTJklQ
-UyBDQSBDTEFTRUExIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MR4wHAYJKoZIhvcNAQkBFg9pcHNA
-bWFpbC5pcHMuZXOCAQAwDAYDVR0TBAUwAwEB/zAMBgNVHQ8EBQMDB/+AMGsGA1UdJQRkMGIGCCsG
-AQUFBwMBBggrBgEFBQcDAgYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEFBQcDCAYKKwYBBAGCNwIB
-FQYKKwYBBAGCNwIBFgYKKwYBBAGCNwoDAQYKKwYBBAGCNwoDBDARBglghkgBhvhCAQEEBAMCAAcw
-GgYDVR0RBBMwEYEPaXBzQG1haWwuaXBzLmVzMBoGA1UdEgQTMBGBD2lwc0BtYWlsLmlwcy5lczBC
-BglghkgBhvhCAQ0ENRYzQ0xBU0VBMSBDQSBDZXJ0aWZpY2F0ZSBpc3N1ZWQgYnkgaHR0cDovL3d3
-dy5pcHMuZXMvMCkGCWCGSAGG+EIBAgQcFhpodHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyLzA7Bglg
-hkgBhvhCAQQELhYsaHR0cDovL3d3dy5pcHMuZXMvaXBzMjAwMi9pcHMyMDAyQ0xBU0VBMS5jcmww
-QAYJYIZIAYb4QgEDBDMWMWh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvcmV2b2NhdGlvbkNMQVNF
-QTEuaHRtbD8wPQYJYIZIAYb4QgEHBDAWLmh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvcmVuZXdh
-bENMQVNFQTEuaHRtbD8wOwYJYIZIAYb4QgEIBC4WLGh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIv
-cG9saWN5Q0xBU0VBMS5odG1sMHUGA1UdHwRuMGwwMqAwoC6GLGh0dHA6Ly93d3cuaXBzLmVzL2lw
-czIwMDIvaXBzMjAwMkNMQVNFQTEuY3JsMDagNKAyhjBodHRwOi8vd3d3YmFjay5pcHMuZXMvaXBz
-MjAwMi9pcHMyMDAyQ0xBU0VBMS5jcmwwLwYIKwYBBQUHAQEEIzAhMB8GCCsGAQUFBzABhhNodHRw
-Oi8vb2NzcC5pcHMuZXMvMA0GCSqGSIb3DQEBBQUAA4GBAH66iqyAAIQVCtWYUQxkxZwCWINmyq0e
-B81+atqAB98DNEock8RLWCA1NnHtogo1EqWmZaeFaQoO42Hu6r4okzPV7Oi+xNtff6j5YzHIa5bi
-KcJboOeXNp13XjFr/tOn2yrb25aLH2betgPAK7N41lUH5Y85UN4HI3LmvSAUS7SG
------END CERTIFICATE-----
-
-IPS CLASEA3 root
-================
------BEGIN CERTIFICATE-----
-MIIH9zCCB2CgAwIBAgIBADANBgkqhkiG9w0BAQUFADCCARQxCzAJBgNVBAYTAkVTMRIwEAYDVQQI
-EwlCYXJjZWxvbmExEjAQBgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UEChMlSVBTIEludGVybmV0IHB1
-Ymxpc2hpbmcgU2VydmljZXMgcy5sLjErMCkGA1UEChQiaXBzQG1haWwuaXBzLmVzIEMuSS5GLiAg
-Qi02MDkyOTQ1MjEvMC0GA1UECxMmSVBTIENBIENMQVNFQTMgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
-dHkxLzAtBgNVBAMTJklQUyBDQSBDTEFTRUEzIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MR4wHAYJ
-KoZIhvcNAQkBFg9pcHNAbWFpbC5pcHMuZXMwHhcNMDExMjI5MDEwNzUwWhcNMjUxMjI3MDEwNzUw
-WjCCARQxCzAJBgNVBAYTAkVTMRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQBgNVBAcTCUJhcmNlbG9u
-YTEuMCwGA1UEChMlSVBTIEludGVybmV0IHB1Ymxpc2hpbmcgU2VydmljZXMgcy5sLjErMCkGA1UE
-ChQiaXBzQG1haWwuaXBzLmVzIEMuSS5GLiAgQi02MDkyOTQ1MjEvMC0GA1UECxMmSVBTIENBIENM
-QVNFQTMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxLzAtBgNVBAMTJklQUyBDQSBDTEFTRUEzIENl
-cnRpZmljYXRpb24gQXV0aG9yaXR5MR4wHAYJKoZIhvcNAQkBFg9pcHNAbWFpbC5pcHMuZXMwgZ8w
-DQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAO6AAPYaZC6tasiDsYun7o/ZttvNG7uGBiJ2MwwSbUhW
-YdLcgiViL5/SaTBlA0IjWLxH3GvWdV0XPOH/8lhneaDBgbHUVqLyjRGZ/fZ98cfEXgIqmuJKtROK
-AP2Md4bm15T1IHUuDky/dMQ/gT6DtKM4Ninn6Cr1jIhBqoCm42zvAgMBAAGjggRTMIIETzAdBgNV
-HQ4EFgQUHp9XUEe2YZM50yz82l09BXW3mQIwggFGBgNVHSMEggE9MIIBOYAUHp9XUEe2YZM50yz8
-2l09BXW3mQKhggEcpIIBGDCCARQxCzAJBgNVBAYTAkVTMRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQ
-BgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UEChMlSVBTIEludGVybmV0IHB1Ymxpc2hpbmcgU2Vydmlj
-ZXMgcy5sLjErMCkGA1UEChQiaXBzQG1haWwuaXBzLmVzIEMuSS5GLiAgQi02MDkyOTQ1MjEvMC0G
-A1UECxMmSVBTIENBIENMQVNFQTMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxLzAtBgNVBAMTJklQ
-UyBDQSBDTEFTRUEzIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MR4wHAYJKoZIhvcNAQkBFg9pcHNA
-bWFpbC5pcHMuZXOCAQAwDAYDVR0TBAUwAwEB/zAMBgNVHQ8EBQMDB/+AMGsGA1UdJQRkMGIGCCsG
-AQUFBwMBBggrBgEFBQcDAgYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEFBQcDCAYKKwYBBAGCNwIB
-FQYKKwYBBAGCNwIBFgYKKwYBBAGCNwoDAQYKKwYBBAGCNwoDBDARBglghkgBhvhCAQEEBAMCAAcw
-GgYDVR0RBBMwEYEPaXBzQG1haWwuaXBzLmVzMBoGA1UdEgQTMBGBD2lwc0BtYWlsLmlwcy5lczBC
-BglghkgBhvhCAQ0ENRYzQ0xBU0VBMyBDQSBDZXJ0aWZpY2F0ZSBpc3N1ZWQgYnkgaHR0cDovL3d3
-dy5pcHMuZXMvMCkGCWCGSAGG+EIBAgQcFhpodHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyLzA7Bglg
-hkgBhvhCAQQELhYsaHR0cDovL3d3dy5pcHMuZXMvaXBzMjAwMi9pcHMyMDAyQ0xBU0VBMy5jcmww
-QAYJYIZIAYb4QgEDBDMWMWh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvcmV2b2NhdGlvbkNMQVNF
-QTMuaHRtbD8wPQYJYIZIAYb4QgEHBDAWLmh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvcmVuZXdh
-bENMQVNFQTMuaHRtbD8wOwYJYIZIAYb4QgEIBC4WLGh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIv
-cG9saWN5Q0xBU0VBMy5odG1sMHUGA1UdHwRuMGwwMqAwoC6GLGh0dHA6Ly93d3cuaXBzLmVzL2lw
-czIwMDIvaXBzMjAwMkNMQVNFQTMuY3JsMDagNKAyhjBodHRwOi8vd3d3YmFjay5pcHMuZXMvaXBz
-MjAwMi9pcHMyMDAyQ0xBU0VBMy5jcmwwLwYIKwYBBQUHAQEEIzAhMB8GCCsGAQUFBzABhhNodHRw
-Oi8vb2NzcC5pcHMuZXMvMA0GCSqGSIb3DQEBBQUAA4GBAEo9IEca2on0eisxeewBwMwB9dbB/MjD
-81ACUZBYKp/nNQlbMAqBACVHr9QPDp5gJqiVp4MI3y2s6Q73nMify5NF8bpqxmdRSmlPa/59Cy9S
-KcJQrSRE7SOzSMtEQMEDlQwKeAYSAfWRMS1Jjbs/RU4s4OjNtckUFQzjB4ObJnXv
------END CERTIFICATE-----
-
-IPS Timestamping root
-=====================
------BEGIN CERTIFICATE-----
-MIIIODCCB6GgAwIBAgIBADANBgkqhkiG9w0BAQUFADCCAR4xCzAJBgNVBAYTAkVTMRIwEAYDVQQI
-EwlCYXJjZWxvbmExEjAQBgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UEChMlSVBTIEludGVybmV0IHB1
-Ymxpc2hpbmcgU2VydmljZXMgcy5sLjErMCkGA1UEChQiaXBzQG1haWwuaXBzLmVzIEMuSS5GLiAg
-Qi02MDkyOTQ1MjE0MDIGA1UECxMrSVBTIENBIFRpbWVzdGFtcGluZyBDZXJ0aWZpY2F0aW9uIEF1
-dGhvcml0eTE0MDIGA1UEAxMrSVBTIENBIFRpbWVzdGFtcGluZyBDZXJ0aWZpY2F0aW9uIEF1dGhv
-cml0eTEeMBwGCSqGSIb3DQEJARYPaXBzQG1haWwuaXBzLmVzMB4XDTAxMTIyOTAxMTAxOFoXDTI1
-MTIyNzAxMTAxOFowggEeMQswCQYDVQQGEwJFUzESMBAGA1UECBMJQmFyY2Vsb25hMRIwEAYDVQQH
-EwlCYXJjZWxvbmExLjAsBgNVBAoTJUlQUyBJbnRlcm5ldCBwdWJsaXNoaW5nIFNlcnZpY2VzIHMu
-bC4xKzApBgNVBAoUImlwc0BtYWlsLmlwcy5lcyBDLkkuRi4gIEItNjA5Mjk0NTIxNDAyBgNVBAsT
-K0lQUyBDQSBUaW1lc3RhbXBpbmcgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxNDAyBgNVBAMTK0lQ
-UyBDQSBUaW1lc3RhbXBpbmcgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxHjAcBgkqhkiG9w0BCQEW
-D2lwc0BtYWlsLmlwcy5lczCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAvLjuVqWajOY2ycJi
-oGaBjRrVetJznw6EZLqVtJCneK/K/lRhW86yIFcBrkSSQxA4Efdo/BdApWgnMjvEp+ZCccWZ73b/
-K5Uk9UmSGGjKALWkWi9uy9YbLA1UZ2t6KaFYq6JaANZbuxjC3/YeE1Z2m6Vo4pjOxgOKNNtMg0Gm
-qaMCAwEAAaOCBIAwggR8MB0GA1UdDgQWBBSL0BBQCYHynQnVDmB4AyKiP8jKZjCCAVAGA1UdIwSC
-AUcwggFDgBSL0BBQCYHynQnVDmB4AyKiP8jKZqGCASakggEiMIIBHjELMAkGA1UEBhMCRVMxEjAQ
-BgNVBAgTCUJhcmNlbG9uYTESMBAGA1UEBxMJQmFyY2Vsb25hMS4wLAYDVQQKEyVJUFMgSW50ZXJu
-ZXQgcHVibGlzaGluZyBTZXJ2aWNlcyBzLmwuMSswKQYDVQQKFCJpcHNAbWFpbC5pcHMuZXMgQy5J
-LkYuICBCLTYwOTI5NDUyMTQwMgYDVQQLEytJUFMgQ0EgVGltZXN0YW1waW5nIENlcnRpZmljYXRp
-b24gQXV0aG9yaXR5MTQwMgYDVQQDEytJUFMgQ0EgVGltZXN0YW1waW5nIENlcnRpZmljYXRpb24g
-QXV0aG9yaXR5MR4wHAYJKoZIhvcNAQkBFg9pcHNAbWFpbC5pcHMuZXOCAQAwDAYDVR0TBAUwAwEB
-/zAMBgNVHQ8EBQMDB/+AMGsGA1UdJQRkMGIGCCsGAQUFBwMBBggrBgEFBQcDAgYIKwYBBQUHAwMG
-CCsGAQUFBwMEBggrBgEFBQcDCAYKKwYBBAGCNwIBFQYKKwYBBAGCNwIBFgYKKwYBBAGCNwoDAQYK
-KwYBBAGCNwoDBDARBglghkgBhvhCAQEEBAMCAAcwGgYDVR0RBBMwEYEPaXBzQG1haWwuaXBzLmVz
-MBoGA1UdEgQTMBGBD2lwc0BtYWlsLmlwcy5lczBHBglghkgBhvhCAQ0EOhY4VGltZXN0YW1waW5n
-IENBIENlcnRpZmljYXRlIGlzc3VlZCBieSBodHRwOi8vd3d3Lmlwcy5lcy8wKQYJYIZIAYb4QgEC
-BBwWGmh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvMEAGCWCGSAGG+EIBBAQzFjFodHRwOi8vd3d3
-Lmlwcy5lcy9pcHMyMDAyL2lwczIwMDJUaW1lc3RhbXBpbmcuY3JsMEUGCWCGSAGG+EIBAwQ4FjZo
-dHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyL3Jldm9jYXRpb25UaW1lc3RhbXBpbmcuaHRtbD8wQgYJ
-YIZIAYb4QgEHBDUWM2h0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvcmVuZXdhbFRpbWVzdGFtcGlu
-Zy5odG1sPzBABglghkgBhvhCAQgEMxYxaHR0cDovL3d3dy5pcHMuZXMvaXBzMjAwMi9wb2xpY3lU
-aW1lc3RhbXBpbmcuaHRtbDB/BgNVHR8EeDB2MDegNaAzhjFodHRwOi8vd3d3Lmlwcy5lcy9pcHMy
-MDAyL2lwczIwMDJUaW1lc3RhbXBpbmcuY3JsMDugOaA3hjVodHRwOi8vd3d3YmFjay5pcHMuZXMv
-aXBzMjAwMi9pcHMyMDAyVGltZXN0YW1waW5nLmNybDAvBggrBgEFBQcBAQQjMCEwHwYIKwYBBQUH
-MAGGE2h0dHA6Ly9vY3NwLmlwcy5lcy8wDQYJKoZIhvcNAQEFBQADgYEAZbrBzAAalZHK6Ww6vzoe
-FAh8+4Pua2JR0zORtWB5fgTYXXk36MNbsMRnLWhasl8OCvrNPzpFoeo2zyYepxEoxZSPhExTCMWT
-s/zif/WN87GphV+I3pGW7hdbrqXqcGV4LCFkAZXOzkw+UPS2Wctjjba9GNSHSl/c7+lW8AoM6HU=
------END CERTIFICATE-----
-
 QuoVadis Root CA
 ================
 -----BEGIN CERTIFICATE-----
@@ -1631,26 +973,6 @@ s58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJUJRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ
 FL39vmwLAw==
 -----END CERTIFICATE-----
 
-Sonera Class 1 Root CA
-======================
------BEGIN CERTIFICATE-----
-MIIDIDCCAgigAwIBAgIBJDANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEPMA0GA1UEChMG
-U29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MxIENBMB4XDTAxMDQwNjEwNDkxM1oXDTIxMDQw
-NjEwNDkxM1owOTELMAkGA1UEBhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJh
-IENsYXNzMSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALWJHytPZwp5/8Ue+H88
-7dF+2rDNbS82rDTG29lkFwhjMDMiikzujrsPDUJVyZ0upe/3p4zDq7mXy47vPxVnqIJyY1MPQYx9
-EJUkoVqlBvqSV536pQHydekfvFYmUk54GWVYVQNYwBSujHxVX3BbdyMGNpfzJLWaRpXk3w0LBUXl
-0fIdgrvGE+D+qnr9aTCU89JFhfzyMlsy3uhsXR/LpCJ0sICOXZT3BgBLqdReLjVQCfOAl/QMF645
-2F/NM8EcyonCIvdFEu1eEpOdY6uCLrnrQkFEy0oaAIINnvmLVz5MxxftLItyM19yejhW1ebZrgUa
-HXVFsculJRwSVzb9IjcCAwEAAaMzMDEwDwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQIR+IMi/ZT
-iFIwCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQCLGrLJXWG04bkruVPRsoWdd44W7hE9
-28Jj2VuXZfsSZ9gqXLar5V7DtxYvyOirHYr9qxp81V9jz9yw3Xe5qObSIjiHBxTZ/75Wtf0HDjxV
-yhbMp6Z3N/vbXB9OWQaHowND9Rart4S9Tu+fMTfwRvFAttEMpWT4Y14h21VOTzF2nBBhjrZTOqMR
-vq9tfB69ri3iDGnHhVNoomG6xT60eVR4ngrHAr5i0RGCS2UvkVrCqIexVmiUefkl98HVrhq4uz2P
-qYo4Ffdz0Fpg0YCw8NzVUM1O7pJIae2yIx4wzMiUyLb1O4Z/P6Yun/Y+LLWSlj7fLJOK/4GMDw9Z
-IRlXvVWa
------END CERTIFICATE-----
-
 Sonera Class 2 Root CA
 ======================
 -----BEGIN CERTIFICATE-----
@@ -1770,32 +1092,6 @@ EZ4du5A/EkdOjtd+D2JzHVImOBwYSf0wdJrE5SIv2MCN7ZF6TACPcn9d2t0bi0Vr591pl6jFVkwP
 DPafepE39peC4N1xaf92P2BNPM/3mfnGV/TJVTl4uix5yaaIK/QI
 -----END CERTIFICATE-----
 
-UTN USERFirst Email Root CA
-===========================
------BEGIN CERTIFICATE-----
-MIIEojCCA4qgAwIBAgIQRL4Mi1AAJLQR0zYlJWfJiTANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
-BhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhl
-IFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xNjA0
-BgNVBAMTLVVUTi1VU0VSRmlyc3QtQ2xpZW50IEF1dGhlbnRpY2F0aW9uIGFuZCBFbWFpbDAeFw05
-OTA3MDkxNzI4NTBaFw0xOTA3MDkxNzM2NThaMIGuMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVVQx
-FzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsx
-ITAfBgNVBAsTGGh0dHA6Ly93d3cudXNlcnRydXN0LmNvbTE2MDQGA1UEAxMtVVROLVVTRVJGaXJz
-dC1DbGllbnQgQXV0aGVudGljYXRpb24gYW5kIEVtYWlsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAsjmFpPJ9q0E7YkY3rs3BYHW8OWX5ShpHornMSMxqmNVNNRm5pELlzkniii8efNIx
-B8dOtINknS4p1aJkxIW9hVE1eaROaJB7HHqkkqgX8pgV8pPMyaQylbsMTzC9mKALi+VuG6JG+ni8
-om+rWV6lL8/K2m2qL+usobNqqrcuZzWLeeEeaYji5kbNoKXqvgvOdjp6Dpvq/NonWz1zHyLmSGHG
-TPNpsaguG7bUMSAsvIKKjqQOpdeJQ/wWWq8dcdcRWdq6hw2v+vPhwvCkxWeM1tZUOt4KpLoDd7Nl
-yP0e03RiqhjKaJMeoYV+9Udly/hNVyh00jT/MLbu9mIwFIws6wIDAQABo4G5MIG2MAsGA1UdDwQE
-AwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSJgmd9xJ0mcABLtFBIfN49rgRufTBYBgNV
-HR8EUTBPME2gS6BJhkdodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVVROLVVTRVJGaXJzdC1DbGll
-bnRBdXRoZW50aWNhdGlvbmFuZEVtYWlsLmNybDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
-AwQwDQYJKoZIhvcNAQEFBQADggEBALFtYV2mGn98q0rkMPxTbyUkxsrt4jFcKw7u7mFVbwQ+zzne
-xRtJlOTrIEy05p5QLnLZjfWqo7NK2lYcYJeA3IKirUq9iiv/Cwm0xtcgBEXkzYABurorbs6q15L+
-5K/r9CYdFip/bDCVNy8zEqx/3cfREYxRmLLQo5HQrfafnoOTHh1CuEava2bwm3/q4wMC5QJRwarV
-NZ1yQAOJujEdxRBoUp7fooXFXAimeOZTT7Hot9MUnpOmw2TjrH5xzbyf6QMbzPvprDHBr3wVdAKZ
-w7JHpsIyYdfHb0gkUSeh1YdV8nuPmD0Wnu51tvjQjvLzxq4oW6fw8zYX/MMF08oDSlQ=
------END CERTIFICATE-----
-
 UTN USERFirst Hardware Root CA
 ==============================
 -----BEGIN CERTIFICATE-----
@@ -1822,31 +1118,6 @@ iCrVWFCVH/A7HFe7fRQ5YiuayZSSKqMiDP+JJn1fIytH1xUdqWqeUQ0qUZ6B+dQ7XnASfxAynB67
 nfhmqA==
 -----END CERTIFICATE-----
 
-UTN USERFirst Object Root CA
-============================
------BEGIN CERTIFICATE-----
-MIIEZjCCA06gAwIBAgIQRL4Mi1AAJLQR0zYt4LNfGzANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UE
-BhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhl
-IFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHTAb
-BgNVBAMTFFVUTi1VU0VSRmlyc3QtT2JqZWN0MB4XDTk5MDcwOTE4MzEyMFoXDTE5MDcwOTE4NDAz
-NlowgZUxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJVVDEXMBUGA1UEBxMOU2FsdCBMYWtlIENpdHkx
-HjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazEhMB8GA1UECxMYaHR0cDovL3d3dy51c2Vy
-dHJ1c3QuY29tMR0wGwYDVQQDExRVVE4tVVNFUkZpcnN0LU9iamVjdDCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAM6qgT+jo2F4qjEAVZURnicPHxzfOpuCaDDASmEd8S8O+r5596Uj71VR
-loTN2+O5bj4x2AogZ8f02b+U60cEPgLOKqJdhwQJ9jCdGIqXsqoc/EHSoTbL+z2RuufZcDX65OeQ
-w5ujm9M89RKZd7G3CeBo5hy485RjiGpq/gt2yb70IuRnuasaXnfBhQfdDWy/7gbHd2pBnqcP1/vu
-lBe3/IW+pKvEHDHd17bR5PDv3xaPslKT16HUiaEHLr/hARJCHhrh2JU022R5KP+6LhHC5ehbkkj7
-RwvCbNqtMoNB86XlQXD9ZZBt+vpRxPm9lisZBCzTbafc8H9vg2XiaquHhnUCAwEAAaOBrzCBrDAL
-BgNVHQ8EBAMCAcYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU2u1kdBScFDyr3ZmpvVsoTYs8
-ydgwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybC51c2VydHJ1c3QuY29tL1VUTi1VU0VSRmly
-c3QtT2JqZWN0LmNybDApBgNVHSUEIjAgBggrBgEFBQcDAwYIKwYBBQUHAwgGCisGAQQBgjcKAwQw
-DQYJKoZIhvcNAQEFBQADggEBAAgfUrE3RHjb/c652pWWmKpVZIC1WkDdIaXFwfNfLEzIR1pp6ujw
-NTX00CXzyKakh0q9G7FzCL3Uw8q2NbtZhncxzaeAFK4T7/yxSPlrJSUtUbYsbUXBmMiKVl0+7kNO
-PmsnjtA6S4ULX9Ptaqd1y9Fahy85dRNacrACgZ++8A+EVCBibGnU4U3GDZlDAQ0Slox4nb9QorFE
-qmrPF3rPbw/U+CRVX/A0FklmPlBGyWNxODFiuGK581OtbLUrohKqGU8J2l7nk8aOFAj+8DCAGKCG
-hU3IfdeLA/5u1fedFqySLKAj5ZyRUh+U3xeUc8OzwcFxBSAAeL0TUh2oPs0AH8g=
------END CERTIFICATE-----
-
 Camerfirma Chambers of Commerce Root
 ====================================
 -----BEGIN CERTIFICATE-----
@@ -1901,42 +1172,6 @@ IBHNfTIzSJRUTN3cecQwn+uOuFW114hcxWokPbLTBQNRxgfvzBRydD1ucs4YKIxKoHflCStFREes
 t2d/AYoFWpO+ocH/+OcOZ6RHSXZddZAa9SaP8A==
 -----END CERTIFICATE-----
 
-NetLock Qualified (Class QA) Root
-=================================
------BEGIN CERTIFICATE-----
-MIIG0TCCBbmgAwIBAgIBezANBgkqhkiG9w0BAQUFADCByTELMAkGA1UEBhMCSFUxETAPBgNVBAcT
-CEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0b25zYWdpIEtmdC4xGjAYBgNV
-BAsTEVRhbnVzaXR2YW55a2lhZG9rMUIwQAYDVQQDEzlOZXRMb2NrIE1pbm9zaXRldHQgS296amVn
-eXpvaSAoQ2xhc3MgUUEpIFRhbnVzaXR2YW55a2lhZG8xHjAcBgkqhkiG9w0BCQEWD2luZm9AbmV0
-bG9jay5odTAeFw0wMzAzMzAwMTQ3MTFaFw0yMjEyMTUwMTQ3MTFaMIHJMQswCQYDVQQGEwJIVTER
-MA8GA1UEBxMIQnVkYXBlc3QxJzAlBgNVBAoTHk5ldExvY2sgSGFsb3phdGJpenRvbnNhZ2kgS2Z0
-LjEaMBgGA1UECxMRVGFudXNpdHZhbnlraWFkb2sxQjBABgNVBAMTOU5ldExvY2sgTWlub3NpdGV0
-dCBLb3pqZWd5em9pIChDbGFzcyBRQSkgVGFudXNpdHZhbnlraWFkbzEeMBwGCSqGSIb3DQEJARYP
-aW5mb0BuZXRsb2NrLmh1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx1Ilstg91IRV
-CacbvWy5FPSKAtt2/GoqeKvld/Bu4IwjZ9ulZJm53QE+b+8tmjwi8F3JV6BVQX/yQ15YglMxZc4e
-8ia6AFQer7C8HORSjKAyr7c3sVNnaHRnUPYtLmTeriZ539+Zhqurf4XsoPuAzPS4DB6TRWO53Lhb
-m+1bOdRfYrCnjnxmOCyqsQhjF2d9zL2z8cM/z1A57dEZgxXbhxInlrfa6uWdvLrqOU+L73Sa58XQ
-0uqGURzk/mQIKAR5BevKxXEOC++r6uwSEaEYBTJp0QwsGj0lmT+1fMptsK6ZmfoIYOcZwvK9UdPM
-0wKswREMgM6r3JSda6M5UzrWhQIDAMV9o4ICwDCCArwwEgYDVR0TAQH/BAgwBgEB/wIBBDAOBgNV
-HQ8BAf8EBAMCAQYwggJ1BglghkgBhvhCAQ0EggJmFoICYkZJR1lFTEVNISBFemVuIHRhbnVzaXR2
-YW55IGEgTmV0TG9jayBLZnQuIE1pbm9zaXRldHQgU3pvbGdhbHRhdGFzaSBTemFiYWx5emF0YWJh
-biBsZWlydCBlbGphcmFzb2sgYWxhcGphbiBrZXN6dWx0LiBBIG1pbm9zaXRldHQgZWxla3Ryb25p
-a3VzIGFsYWlyYXMgam9naGF0YXMgZXJ2ZW55ZXN1bGVzZW5laywgdmFsYW1pbnQgZWxmb2dhZGFz
-YW5hayBmZWx0ZXRlbGUgYSBNaW5vc2l0ZXR0IFN6b2xnYWx0YXRhc2kgU3phYmFseXphdGJhbiwg
-YXogQWx0YWxhbm9zIFN6ZXJ6b2Rlc2kgRmVsdGV0ZWxla2JlbiBlbG9pcnQgZWxsZW5vcnplc2kg
-ZWxqYXJhcyBtZWd0ZXRlbGUuIEEgZG9rdW1lbnR1bW9rIG1lZ3RhbGFsaGF0b2sgYSBodHRwczov
-L3d3dy5uZXRsb2NrLmh1L2RvY3MvIGNpbWVuIHZhZ3kga2VyaGV0b2sgYXogaW5mb0BuZXRsb2Nr
-Lm5ldCBlLW1haWwgY2ltZW4uIFdBUk5JTkchIFRoZSBpc3N1YW5jZSBhbmQgdGhlIHVzZSBvZiB0
-aGlzIGNlcnRpZmljYXRlIGFyZSBzdWJqZWN0IHRvIHRoZSBOZXRMb2NrIFF1YWxpZmllZCBDUFMg
-YXZhaWxhYmxlIGF0IGh0dHBzOi8vd3d3Lm5ldGxvY2suaHUvZG9jcy8gb3IgYnkgZS1tYWlsIGF0
-IGluZm9AbmV0bG9jay5uZXQwHQYDVR0OBBYEFAlqYhaSsFq7VQ7LdTI6MuWyIckoMA0GCSqGSIb3
-DQEBBQUAA4IBAQCRalCc23iBmz+LQuM7/KbD7kPgz/PigDVJRXYC4uMvBcXxKufAQTPGtpvQMznN
-wNuhrWw3AkxYQTvyl5LGSKjN5Yo5iWH5Upfpvfb5lHTocQ68d4bDBsxafEp+NFAwLvt/MpqNPfMg
-W/hqyobzMUwsWYACff44yTB1HLdV47yfuqhthCgFdbOLDcCRVCHnpgu0mfVRQdzNo0ci2ccBgcTc
-R08m6h/t280NmPSjnLRzMkqWmf68f8glWPhY83ZmiVSkpj7EUFy6iRiCdUgh0k8T6GB+B3bbELVR
-5qq5aKrN9p2QdRLqOBrKROi3macqaJVmlaut74nLYKkGEsaUR+ko
------END CERTIFICATE-----
-
 NetLock Notary (Class A) Root
 =============================
 -----BEGIN CERTIFICATE-----
@@ -2433,37 +1668,6 @@ hGIAF728JRhX8tepb1mIvDS3LoV4nZbcFMMsilKbloxSZj2GFotHuFEJjOp9zYhys2AzsfAKRO8P
 UrbnBEI=
 -----END CERTIFICATE-----
 
-SwissSign Platinum CA - G2
-==========================
------BEGIN CERTIFICATE-----
-MIIFwTCCA6mgAwIBAgIITrIAZwwDXU8wDQYJKoZIhvcNAQEFBQAwSTELMAkGA1UEBhMCQ0gxFTAT
-BgNVBAoTDFN3aXNzU2lnbiBBRzEjMCEGA1UEAxMaU3dpc3NTaWduIFBsYXRpbnVtIENBIC0gRzIw
-HhcNMDYxMDI1MDgzNjAwWhcNMzYxMDI1MDgzNjAwWjBJMQswCQYDVQQGEwJDSDEVMBMGA1UEChMM
-U3dpc3NTaWduIEFHMSMwIQYDVQQDExpTd2lzc1NpZ24gUGxhdGludW0gQ0EgLSBHMjCCAiIwDQYJ
-KoZIhvcNAQEBBQADggIPADCCAgoCggIBAMrfogLi2vj8Bxax3mCq3pZcZB/HL37PZ/pEQtZ2Y5Wu
-669yIIpFR4ZieIbWIDkm9K6j/SPnpZy1IiEZtzeTIsBQnIJ71NUERFzLtMKfkr4k2HtnIuJpX+UF
-eNSH2XFwMyVTtIc7KZAoNppVRDBopIOXfw0enHb/FZ1glwCNioUD7IC+6ixuEFGSzH7VozPY1kne
-WCqv9hbrS3uQMpe5up1Y8fhXSQQeol0GcN1x2/ndi5objM89o03Oy3z2u5yg+gnOI2Ky6Q0f4nIo
-j5+saCB9bzuohTEJfwvH6GXp43gOCWcwizSC+13gzJ2BbWLuCB4ELE6b7P6pT1/9aXjvCR+htL/6
-8++QHkwFix7qepF6w9fl+zC8bBsQWJj3Gl/QKTIDE0ZNYWqFTFJ0LwYfexHihJfGmfNtf9dng34T
-aNhxKFrYzt3oEBSa/m0jh26OWnA81Y0JAKeqvLAxN23IhBQeW71FYyBrS3SMvds6DsHPWhaPpZjy
-domyExI7C3d3rLvlPClKknLKYRorXkzig3R3+jVIeoVNjZpTxN94ypeRSCtFKwH3HBqi7Ri6Cr2D
-+m+8jVeTO9TUps4e8aCxzqv9KyiaTxvXw3LbpMS/XUz13XuWae5ogObnmLo2t/5u7Su9IPhlGdpV
-CX4l3P5hYnL5fhgC72O00Puv5TtjjGePAgMBAAGjgawwgakwDgYDVR0PAQH/BAQDAgEGMA8GA1Ud
-EwEB/wQFMAMBAf8wHQYDVR0OBBYEFFCvzAeHFUdvOMW0ZdHelarp35zMMB8GA1UdIwQYMBaAFFCv
-zAeHFUdvOMW0ZdHelarp35zMMEYGA1UdIAQ/MD0wOwYJYIV0AVkBAQEBMC4wLAYIKwYBBQUHAgEW
-IGh0dHA6Ly9yZXBvc2l0b3J5LnN3aXNzc2lnbi5jb20vMA0GCSqGSIb3DQEBBQUAA4ICAQAIhab1
-Fgz8RBrBY+D5VUYI/HAcQiiWjrfFwUF1TglxeeVtlspLpYhg0DB0uMoI3LQwnkAHFmtllXcBrqS3
-NQuB2nEVqXQXOHtYyvkv+8Bldo1bAbl93oI9ZLi+FHSjClTTLJUYFzX1UWs/j6KWYTl4a0vlpqD4
-U99REJNi54Av4tHgvI42Rncz7Lj7jposiU0xEQ8mngS7twSNC/K5/FqdOxa3L8iYq/6KUFkuozv8
-KV2LwUvJ4ooTHbG/u0IdUt1O2BReEMYxB+9xJ/cbOQncguqLs5WGXv312l0xpuAxtpTmREl0xRbl
-9x8DYSjFyMsSoEJL+WuICI20MhjzdZ/EfwBPBZWcoxcCw7NTm6ogOSkrZvqdr16zktK1puEa+S1B
-aYEUtLS17Yk9zvupnTVCRLEcFHOBzyoBNZox1S2PbYTfgE1X4z/FhHXaicYwu+uPyyIIoK6q8QNs
-OktNCaUOcsZWayFCTiMlFGiudgp8DAdwZPmaL/YFOSbGDI8Zf0NebvRbFS/bYV3mZy8/CJT5YLSY
-Mdp08YSTcU1f+2BY0fvEwW2JorsgH51xkcsymxM9Pn2SUjWskpSi0xjCfMfqr3YFFt1nJ8J+HAci
-IfNAChs0B0QTwoRqjt8ZWr9/6x3iGjjRXK9HkmuAtTClyY3YqzGBH9/CZjfTk6mFhnll0g==
------END CERTIFICATE-----
-
 SwissSign Gold CA - G2
 ======================
 -----BEGIN CERTIFICATE-----
@@ -2666,36 +1870,6 @@ IGfE7vmLV2H0knZ9P4SNVbfo5azV8fUZVqZa+5Acr5Pr5RzUZ5ddBA6+C4OmF4O5MBKgxTMVBbkN
 +8cFduPYSo38NBejxiEovjBFMR7HeL5YYTisO+IBZQ==
 -----END CERTIFICATE-----
 
-DigiNotar Root CA
-=================
------BEGIN CERTIFICATE-----
-MIIFijCCA3KgAwIBAgIQDHbanJEMTiye/hXQWJM8TDANBgkqhkiG9w0BAQUFADBfMQswCQYDVQQG
-EwJOTDESMBAGA1UEChMJRGlnaU5vdGFyMRowGAYDVQQDExFEaWdpTm90YXIgUm9vdCBDQTEgMB4G
-CSqGSIb3DQEJARYRaW5mb0BkaWdpbm90YXIubmwwHhcNMDcwNTE2MTcxOTM2WhcNMjUwMzMxMTgx
-OTIxWjBfMQswCQYDVQQGEwJOTDESMBAGA1UEChMJRGlnaU5vdGFyMRowGAYDVQQDExFEaWdpTm90
-YXIgUm9vdCBDQTEgMB4GCSqGSIb3DQEJARYRaW5mb0BkaWdpbm90YXIubmwwggIiMA0GCSqGSIb3
-DQEBAQUAA4ICDwAwggIKAoICAQCssFjBAL3YIQgLK5r+blYwBZ8bd5AQQVzDDYcRd46B8cp86Yxq
-7Th0Nbva3/m7wAk3tJZzgX0zGpg595NvlX89ubF1h7pRSOiLcD6VBMXYtsMW2YiwsYcdcNqGtA8U
-i3rPENF0NqISe3eGSnnme98CEWilToauNFibJBN4ViIlHgGLS1Fx+4LMWZZpiFpoU8W5DQI3y0u8
-ZkqQfioLBQftFl9VkHXYRskbg+IIvvEjzJkd1ioPgyAVWCeCLvriIsJJsbkBgWqdbZ1Ad2h2TiEq
-bYRAhU52mXyC8/O3AlnUJgEbjt+tUwbRrhjd4rI6y9eIOI6sWym5GdOY+RgDz0iChmYLG2kPyes4
-iHomGgVMktck1JbyrFIto0fVUvY//s6EBnCmqj6i8rZWNBhXouSBbefK8GrTx5FrAoNBfBXva5pk
-XuPQPOWx63tdhvvL5ndJzaNl3Pe5nLjkC1+Tz8wwGjIczhxjlaX56uF0i57pK6kwe6AYHw4YC+Vb
-qdPRbB4HZ4+RS6mKvNJmqpMBiLKR+jFc1abBUggJzQpjotMipuih2TkGl/VujQKQjBR7P4DNG5y6
-xFhyI6+2Vp/GekIzKQc/gsnmHwUNzUwoNovTyD4cxojvXu6JZOkd69qJfjKmadHdzIif0dDJZiHc
-BmfFlHqabWJMfczgZICynkeOowIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE
-AwIBBjAdBgNVHQ4EFgQUiGi/4I41xDs4a2L3KDuEgcgM100wDQYJKoZIhvcNAQEFBQADggIBADsC
-jcs8MOhuoK3yc7NfniUTBAXT9uOLuwt5zlPe5JbF0a9zvNXD0EBVfEB/zRtfCdXyfJ9oHbtdzno5
-wozWmHvFg1Wo1X1AyuAe94leY12hE8JdiraKfADzI8PthV9xdvBoY6pFITlIYXg23PFDk9Qlx/KA
-ZeFTAnVR/Ho67zerhChXDNjU1JlWbOOi/lmEtDHoM/hklJRRl6s5xUvt2t2AC298KQ3EjopyDedT
-FLJgQT2EkTFoPSdE2+Xe9PpjRchMPpj1P0G6Tss3DbpmmPHdy59c91Q2gmssvBNhl0L4eLvMyKKf
-yvBovWsdst+Nbwed2o5nx0ceyrm/KkKRt2NTZvFCo+H0Wk1Ya7XkpDOtXHAd3ODy63MUkZoDweoA
-ZbwH/M8SESIsrqC9OuCiKthZ6SnTGDWkrBFfGbW1G/8iSlzGeuQX7yCpp/Q/rYqnmgQlnQ7KN+ZQ
-/YxCKQSa7LnPS3K94gg2ryMvYuXKAdNw23yCIywWMQzGNgeQerEfZ1jEO1hZibCMjFCz2IbLaKPE
-CudpSyDOwR5WS5WpI2jYMNjD67BVUc3l/Su49bsRn1NU9jQZjHkJNsphFyUXC4KYcwx3dMPVDceo
-EkzHp1RxRy4sGn3J4ys7SN4nhKdjNrN9j6BkOSQNPXuHr2ZcdBtLc7LljPCGmbjlxd+Ewbfr
------END CERTIFICATE-----
-
 Network Solutions Certificate Authority
 =======================================
 -----BEGIN CERTIFICATE-----
@@ -2763,30 +1937,6 @@ FAkK+qDmfQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdvGDeA
 U/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY=
 -----END CERTIFICATE-----
 
-MD5 Collisions Forged Rogue CA 25c3
-===================================
------BEGIN CERTIFICATE-----
-MIIEMjCCA5ugAwIBAgIBQjANBgkqhkiG9w0BAQQFADBaMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT
-RXF1aWZheCBTZWN1cmUgSW5jLjEtMCsGA1UEAxMkRXF1aWZheCBTZWN1cmUgR2xvYmFsIGVCdXNp
-bmVzcyBDQS0xMB4XDTA0MDczMTAwMDAwMVoXDTA0MDkwMjAwMDAwMVowPDE6MDgGA1UEAxMxTUQ1
-IENvbGxpc2lvbnMgSW5jLiAoaHR0cDovL3d3dy5waHJlZWRvbS5vcmcvbWQ1KTCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEAuqZZySwo1iqw+O2fRqSkN+4OGWhZ0bMDmVHWFppeN2sV4A5L9YRk
-+KPbQW811ZsVH9vEOFJwgZdej6C193458DKsHq1E0rP6SMPOkZvs9Jx84Vr1yDdrmoPe58oglzFC
-cxWRaPSIr/koKMXpD3OwF0sTTJl10ETmfghsGvJPG0ECAwEAAaOCAiQwggIgMAsGA1UdDwQEAwIB
-xjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSnBGAfq3JDCMV/CJBVVhzWzuY46zAfBgNVHSME
-GDAWgBS+qKB0clBrRLfJI9j7qP+zV2tobDCCAb4GCWCGSAGG+EIBDQSCAa8WggGrMwAAACdeOeCJ
-YQ9Oo8VFCza7AdFTqsMIj2/4Tz6Hh0QR3GDg35JV+bhzG1STxZ/QRsRgtjVizbmvHKhpGslbPJY3
-wO1n77v+wIucUC8pvYMino4I+qwTcKJYf2JiihH3ifbftmdZcxb7YxaKtJE4zi71tr5MpJRJ5GUR
-CkIVycEw4mnVRX2lJru5YexiZPA54ee8aNhQUZ4dYNPRo6cK+AMgoXABF5E2TwJwMYaD3fcP2Acd
-EbMTBKXc8K5QsSgOY2kqDIJvj0cz32yiBpLxT0W+2TA2oyuM1neuNWN/Tkyak0g22Z8CAwEAAaOB
-vTCBujAOBgNVHQ8BAf8EBAMCBPAwHQYDVR0OBBYEFM2mg/qlYDf3ljcXKd5BePGHiVXnMDsGA1Ud
-HwQ0MDIwMKAuoCyGKmh0dHA6Ly9jcmwuZ2VvdHJ1c3QuY29tL2NybHMvZ2xvYmFsY2ExLmNybDAf
-BgNVHSMEGDAWgBS+qKB0clBrRLfJI9j7qP+zV2tobDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
-BQUHAwIwDAYDVR0TAQH/BAIwADANBgkqhkiG9w0BAQQFAAOBgQCnIQKN0Q6igHcl/UNgFY/s75BH
-1IRCFSYRHM3CPBApqbbfq1d1kdrlK7OQRRwwY1Y/itlQ+u1YbMBlrGZX3hzGdjv1AA6ORc5/TJDs
-K8bNs7SPYtD+t8UmckTt9phbrsvRlfXaCL5oRrF1yOwdjx56lPGqU3iiRa5U6tGedMh2Zw==
------END CERTIFICATE-----
-
 IGC/A
 =====
 -----BEGIN CERTIFICATE-----
@@ -2855,32 +2005,6 @@ hNVQA7bihKOmNqoROgHhGEvWRGizPflTdISzRpFGlgC3gCy24eMQ4tui5yiPAZZiFj4A4xylNoEY
 okxSdsARo27mHbrjWr42U8U+dY+GaSlYU7Wcu2+fXMUY7N0v4ZjJ/L7fCg0=
 -----END CERTIFICATE-----
 
-S-TRUST Authentication and Encryption Root CA 2005 PN
-=====================================================
------BEGIN CERTIFICATE-----
-MIIEezCCA2OgAwIBAgIQNxkY5lNUfBq1uMtZWts1tzANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
-BhMCREUxIDAeBgNVBAgTF0JhZGVuLVd1ZXJ0dGVtYmVyZyAoQlcpMRIwEAYDVQQHEwlTdHV0dGdh
-cnQxKTAnBgNVBAoTIERldXRzY2hlciBTcGFya2Fzc2VuIFZlcmxhZyBHbWJIMT4wPAYDVQQDEzVT
-LVRSVVNUIEF1dGhlbnRpY2F0aW9uIGFuZCBFbmNyeXB0aW9uIFJvb3QgQ0EgMjAwNTpQTjAeFw0w
-NTA2MjIwMDAwMDBaFw0zMDA2MjEyMzU5NTlaMIGuMQswCQYDVQQGEwJERTEgMB4GA1UECBMXQmFk
-ZW4tV3VlcnR0ZW1iZXJnIChCVykxEjAQBgNVBAcTCVN0dXR0Z2FydDEpMCcGA1UEChMgRGV1dHNj
-aGVyIFNwYXJrYXNzZW4gVmVybGFnIEdtYkgxPjA8BgNVBAMTNVMtVFJVU1QgQXV0aGVudGljYXRp
-b24gYW5kIEVuY3J5cHRpb24gUm9vdCBDQSAyMDA1OlBOMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEA2bVKwdMz6tNGs9HiTNL1toPQb9UY6ZOvJ44TzbUlNlA0EmQpoVXhOmCTnijJ4/Ob
-4QSwI7+Vio5bG0F/WsPoTUzVJBY+h0jUJ67m91MduwwA7z5hca2/OnpYH5Q9XIHV1W/fuJvS9eXL
-g3KSwlOyggLrra1fFi2SU3bxibYs9cEv4KdKb6AwajLrmnQDaHgTncovmwsdvs91DSaXm8f1Xgqf
-eN+zvOyauu9VjxuapgdjKRdZYgkqeQd3peDRF2npW932kKvimAoA0SVtnteFhy+S8dF2g08LOlk3
-KC8zpxdQ1iALCvQm+Z845y2kuJuJja2tyWp9iRe79n+Ag3rm7QIDAQABo4GSMIGPMBIGA1UdEwEB
-/wQIMAYBAf8CAQAwDgYDVR0PAQH/BAQDAgEGMCkGA1UdEQQiMCCkHjAcMRowGAYDVQQDExFTVFJv
-bmxpbmUxLTIwNDgtNTAdBgNVHQ4EFgQUD8oeXHngovMpttKFswtKtWXsa1IwHwYDVR0jBBgwFoAU
-D8oeXHngovMpttKFswtKtWXsa1IwDQYJKoZIhvcNAQEFBQADggEBAK8B8O0ZPCjoTVy7pWMciDMD
-pwCHpB8gq9Yc4wYfl35UvbfRssnV2oDsF9eK9XvCAPbpEW+EoFolMeKJ+aQAPzFoLtU96G7m1R08
-P7K9n3frndOMusDXtk3sU5wPBG7qNWdX4wple5A64U8+wwCSersFiXOMy6ZNwPv2AtawB6MDwidA
-nwzkhYItr5pCHdDHjfhA7p0GVxzZotiAFP7hYy0yh9WUUpY6RsZxlj33mA6ykaqP2vROJAA5Veit
-F7nTNCtKqUDMFypVZUF0Qn71wK/Ik63yGFs9iQzbRzkk+OBM8h+wPQrKBU6JIRrjKpms/H+h8Q8b
-Hz2eBIPdltkdOpQ=
------END CERTIFICATE-----
-
 Microsec e-Szigno Root CA
 =========================
 -----BEGIN CERTIFICATE-----
@@ -3076,28 +2200,6 @@ dyd1Lx+4ivn+xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU
 Cm26OWMohpLzGITY+9HPBVZkVw==
 -----END CERTIFICATE-----
 
-ComSign CA
-==========
------BEGIN CERTIFICATE-----
-MIIDkzCCAnugAwIBAgIQFBOWgxRVjOp7Y+X8NId3RDANBgkqhkiG9w0BAQUFADA0MRMwEQYDVQQD
-EwpDb21TaWduIENBMRAwDgYDVQQKEwdDb21TaWduMQswCQYDVQQGEwJJTDAeFw0wNDAzMjQxMTMy
-MThaFw0yOTAzMTkxNTAyMThaMDQxEzARBgNVBAMTCkNvbVNpZ24gQ0ExEDAOBgNVBAoTB0NvbVNp
-Z24xCzAJBgNVBAYTAklMMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8ORUaSvTx49q
-ROR+WCf4C9DklBKK8Rs4OC8fMZwG1Cyn3gsqrhqg455qv588x26i+YtkbDqthVVRVKU4VbirgwTy
-P2Q298CNQ0NqZtH3FyrV7zb6MBBC11PN+fozc0yz6YQgitZBJzXkOPqUm7h65HkfM/sb2CEJKHxN
-GGleZIp6GZPKfuzzcuc3B1hZKKxC+cX/zT/npfo4sdAMx9lSGlPWgcxCejVb7Us6eva1jsz/D3zk
-YDaHL63woSV9/9JLEYhwVKZBqGdTUkJe5DSe5L6j7KpiXd3DTKaCQeQzC6zJMw9kglcq/QytNuEM
-rkvF7zuZ2SOzW120V+x0cAwqTwIDAQABo4GgMIGdMAwGA1UdEwQFMAMBAf8wPQYDVR0fBDYwNDAy
-oDCgLoYsaHR0cDovL2ZlZGlyLmNvbXNpZ24uY28uaWwvY3JsL0NvbVNpZ25DQS5jcmwwDgYDVR0P
-AQH/BAQDAgGGMB8GA1UdIwQYMBaAFEsBmz5WGmU2dst7l6qSBe4y5ygxMB0GA1UdDgQWBBRLAZs+
-VhplNnbLe5eqkgXuMucoMTANBgkqhkiG9w0BAQUFAAOCAQEA0Nmlfv4pYEWdfoPPbrxHbvUanlR2
-QnG0PFg/LUAlQvaBnPGJEMgOqnhPOAlXsDzACPw1jvFIUY0McXS6hMTXcpuEfDhOZAYnKuGntewI
-mbQKDdSFc8gS4TXt8QUxHXOZDOuWyt3T5oWq8Ir7dcHyCTxlZWTzTNity4hp8+SDtwy9F1qWF8pb
-/627HOkthIDYIb6FUtnUdLlphbpN7Sgy6/lhSuTENh4Z3G+EER+V9YMoGKgzkkMn3V0TBEVPh9VG
-zT2ouvDzuFYkRes3x+F2T3I5GN9+dHLHcy056mDmrRGiVod7w2ia/viMcKjfZTL0pECMocJEAw6U
-AGegcQCCSA==
------END CERTIFICATE-----
-
 ComSign Secured CA
 ==================
 -----BEGIN CERTIFICATE-----
@@ -3646,22 +2748,6 @@ MCwXEGCSn1WHElkQwg9naRHMTh5+Spqtr0CodaxWkHS4oJyleW/c6RrIaQXpuvoDs3zk4E7Czp3o
 tkYNbn5XOmeUwssfnHdKZ05phkOTOPu220+DkdRgfks+KzgHVZhepA==
 -----END CERTIFICATE-----
 
-Verisign Class 1 Public Primary Certification Authority
-=======================================================
------BEGIN CERTIFICATE-----
-MIICPDCCAaUCED9pHoGc8JpK83P/uUii5N0wDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCVVMx
-FzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAxIFB1YmxpYyBQcmltYXJ5
-IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2MDEyOTAwMDAwMFoXDTI4MDgwMjIzNTk1OVow
-XzELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAx
-IFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUA
-A4GNADCBiQKBgQDlGb9to1ZhLZlIcfZn3rmN67eehoAKkQ76OCWvRoiC5XOooJskXQ0fzGVuDLDQ
-VoQYh5oGmxChc9+0WDlrbsH2FdWoqD+qEgaNMax/sDTXjzRniAnNFBHiTkVWaR94AoDa3EeRKbs2
-yWNcxeDXLYd7obcysHswuiovMaruo2fa2wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFgVKTk8d6Pa
-XCUDfGD67gmZPCcQcMgMCeazh88K4hiWNWLMv5sneYlfycQJ9M61Hd8qveXbhpxoJeUwfLaJFf5n
-0a3hUKw8fGJLj7qE1xIVGx/KXQ/BUpQqEZnae88MNhPVNdwQGVnqlMEAv3WP2fr9dgTbYruQagPZ
-RjXZ+Hxb
------END CERTIFICATE-----
-
 Verisign Class 3 Public Primary Certification Authority
 =======================================================
 -----BEGIN CERTIFICATE-----
@@ -3908,3 +2994,338 @@ P3iZ8ntxPjzxmKfFGBI/5rsoM0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVq
 c5iJWzouE4gev8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z
 09gwzxMNTxXJhLynSC34MCN32EZLeW32jO06f2ARePTpm67VVMB0gNELQp/B
 -----END CERTIFICATE-----
+
+Go Daddy Root Certificate Authority - G2
+========================================
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIBADANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoTEUdvRGFkZHkuY29tLCBJbmMu
+MTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5
+MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgYMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6
+b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjExMC8G
+A1UEAxMoR28gRGFkZHkgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAL9xYgjx+lk09xvJGKP3gElY6SKDE6bFIEMBO4Tx5oVJnyfq
+9oQbTqC023CYxzIBsQU+B07u9PpPL1kwIuerGVZr4oAH/PMWdYA5UXvl+TW2dE6pjYIT5LY/qQOD
++qK+ihVqf94Lw7YZFAXK6sOoBJQ7RnwyDfMAZiLIjWltNowRGLfTshxgtDj6AozO091GB94KPutd
+fMh8+7ArU6SSYmlRJQVhGkSBjCypQ5Yj36w6gZoOKcUcqeldHraenjAKOc7xiID7S13MMuyFYkMl
+NAJWJwGRtDtwKj9useiciAF9n9T521NtYJ2/LOdYq7hfRvzOxBsDPAnrSTFcaUaz4EcCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFDqahQcQZyi27/a9
+BUFuIMGU2g/eMA0GCSqGSIb3DQEBCwUAA4IBAQCZ21151fmXWWcDYfF+OwYxdS2hII5PZYe096ac
+vNjpL9DbWu7PdIxztDhC2gV7+AJ1uP2lsdeu9tfeE8tTEH6KRtGX+rcuKxGrkLAngPnon1rpN5+r
+5N9ss4UXnT3ZJE95kTXWXwTrgIOrmgIttRD02JDHBHNA7XIloKmf7J6raBKZV8aPEjoJpL1E/QYV
+N8Gb5DKj7Tjo2GTzLH4U/ALqn83/B2gX2yKQOC16jdFU8WnjXzPKej17CuPKf1855eJ1usV2GDPO
+LPAvTK33sefOT6jEm0pUBsV/fdUID+Ic/n4XuKxe9tQWskMJDE32p2u0mYRlynqI4uJEvlz36hz1
+-----END CERTIFICATE-----
+
+Starfield Root Certificate Authority - G2
+=========================================
+-----BEGIN CERTIFICATE-----
+MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
+b2dpZXMsIEluYy4xMjAwBgNVBAMTKVN0YXJmaWVsZCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0
+eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgY8xCzAJBgNVBAYTAlVTMRAw
+DgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQg
+VGVjaG5vbG9naWVzLCBJbmMuMTIwMAYDVQQDEylTdGFyZmllbGQgUm9vdCBDZXJ0aWZpY2F0ZSBB
+dXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL3twQP89o/8ArFv
+W59I2Z154qK3A2FWGMNHttfKPTUuiUP3oWmb3ooa/RMgnLRJdzIpVv257IzdIvpy3Cdhl+72WoTs
+bhm5iSzchFvVdPtrX8WJpRBSiUZV9Lh1HOZ/5FSuS/hVclcCGfgXcVnrHigHdMWdSL5stPSksPNk
+N3mSwOxGXn/hbVNMYq/NHwtjuzqd+/x5AJhhdM8mgkBj87JyahkNmcrUDnXMN/uLicFZ8WJ/X7Nf
+ZTD4p7dNdloedl40wOiWVpmKs/B/pM293DIxfJHP4F8R+GuqSVzRmZTRouNjWwl2tVZi4Ut0HZbU
+JtQIBFnQmA4O5t78w+wfkPECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwHQYDVR0OBBYEFHwMMh+n2TB/xH1oo2Kooc6rB1snMA0GCSqGSIb3DQEBCwUAA4IBAQARWfol
+TwNvlJk7mh+ChTnUdgWUXuEok21iXQnCoKjUsHU48TRqneSfioYmUeYs0cYtbpUgSpIB7LiKZ3sx
+4mcujJUDJi5DnUox9g61DLu34jd/IroAow57UvtruzvE03lRTs2Q9GcHGcg8RnoNAX3FWOdt5oUw
+F5okxBDgBPfg8n/Uqgr/Qh037ZTlZFkSIHc40zI+OIF1lnP6aI+xy84fxez6nH7PfrHxBy22/L/K
+pL/QlwVKvOoYKAKQvVR4CSFx09F9HdkWsKlhPdAKACL8x3vLCWRFCztAgfd9fDL1mMpYjn0q7pBZ
+c2T5NnReJaH1ZgUufzkVqSr7UIuOhWn0
+-----END CERTIFICATE-----
+
+Starfield Services Root Certificate Authority - G2
+==================================================
+-----BEGIN CERTIFICATE-----
+MIID7zCCAtegAwIBAgIBADANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
+b2dpZXMsIEluYy4xOzA5BgNVBAMTMlN0YXJmaWVsZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRl
+IEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgZgxCzAJBgNV
+BAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxT
+dGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTswOQYDVQQDEzJTdGFyZmllbGQgU2VydmljZXMg
+Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBANUMOsQq+U7i9b4Zl1+OiFOxHz/Lz58gE20pOsgPfTz3a3Y4Y9k2YKibXlwAgLIvWX/2
+h/klQ4bnaRtSmpDhcePYLQ1Ob/bISdm28xpWriu2dBTrz/sm4xq6HZYuajtYlIlHVv8loJNwU4Pa
+hHQUw2eeBGg6345AWh1KTs9DkTvnVtYAcMtS7nt9rjrnvDH5RfbCYM8TWQIrgMw0R9+53pBlbQLP
+LJGmpufehRhJfGZOozptqbXuNC66DQO4M99H67FrjSXZm86B0UVGMpZwh94CDklDhbZsc7tk6mFB
+rMnUVN+HL8cisibMn1lUaJ/8viovxFUcdUBgF4UCVTmLfwUCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
+AwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJxfAN+qAdcwKziIorhtSpzyEZGDMA0GCSqG
+SIb3DQEBCwUAA4IBAQBLNqaEd2ndOxmfZyMIbw5hyf2E3F/YNoHN2BtBLZ9g3ccaaNnRbobhiCPP
+E95Dz+I0swSdHynVv/heyNXBve6SbzJ08pGCL72CQnqtKrcgfU28elUSwhXqvfdqlS5sdJ/PHLTy
+xQGjhdByPq1zqwubdQxtRbeOlKyWN7Wg0I8VRw7j6IPdj/3vQQF3zCepYoUz8jcI73HPdwbeyBkd
+iEDPfUYd/x7H4c7/I9vG+o1VTqkC50cRRj70/b17KSa7qWFiNyi2LSr2EIZkyXCn0q23KXB56jza
+YyWf/Wi3MOxw+3WKt21gZ7IeyLnp2KhvAotnDU0mV3HaIPzBSlCNsSi6
+-----END CERTIFICATE-----
+
+AffirmTrust Commercial
+======================
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UEBhMCVVMxFDAS
+BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMB4XDTEw
+MDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
+bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6Eqdb
+DuKPHx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yrba0F8PrV
+C8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPALMeIrJmqbTFeurCA+ukV6
+BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1yHp52UKqK39c/s4mT6NmgTWvRLpUHhww
+MmWd5jyTXlBOeuM61G7MGvv50jeuJCqrVwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNV
+HQ4EFgQUnZPGU4teyq8/nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwDQYJKoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYGXUPG
+hi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNjvbz4YYCanrHOQnDi
+qX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivtZ8SOyUOyXGsViQK8YvxO8rUzqrJv
+0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9gN53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0kh
+sUlHRUe072o0EclNmsxZt9YCnlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8=
+-----END CERTIFICATE-----
+
+AffirmTrust Networking
+======================
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UEBhMCVVMxFDAS
+BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMB4XDTEw
+MDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
+bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SE
+Hi3yYJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbuakCNrmreI
+dIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRLQESxG9fhwoXA3hA/Pe24
+/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gb
+h+0t+nvujArjqWaJGctB+d1ENmHP4ndGyH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNV
+HQ4EFgQUBx/S55zawm6iQLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwDQYJKoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfOtDIu
+UFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzuQY0x2+c06lkh1QF6
+12S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZLgo/bNjR9eUJtGxUAArgFU2HdW23
+WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4uolu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9
+/ZFvgrG+CJPbFEfxojfHRZ48x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s=
+-----END CERTIFICATE-----
+
+AffirmTrust Premium
+===================
+-----BEGIN CERTIFICATE-----
+MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UEBhMCVVMxFDAS
+BgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMB4XDTEwMDEy
+OTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRy
+dXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEAxBLfqV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtn
+BKAQJG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ+jjeRFcV
+5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrSs8PhaJyJ+HoAVt70VZVs
++7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmd
+GPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d770O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5R
+p9EixAqnOEhss/n/fauGV+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NI
+S+LI+H+SqHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S5u04
+6uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4IaC1nEWTJ3s7xgaVY5
+/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TXOwF0lkLgAOIua+rF7nKsu7/+6qqo
++Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYEFJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB
+/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByv
+MiPIs0laUZx2KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg
+Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B8OWycvpEgjNC
+6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQMKSOyARiqcTtNd56l+0OOF6S
+L5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK
++4w1IX2COPKpVJEZNZOUbWo6xbLQu4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmV
+BtWVyuEklut89pMFu+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFg
+IxpHYoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8GKa1qF60
+g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaORtGdFNrHF+QFlozEJLUb
+zxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6eKeC2uAloGRwYQw==
+-----END CERTIFICATE-----
+
+AffirmTrust Premium ECC
+=======================
+-----BEGIN CERTIFICATE-----
+MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMCVVMxFDASBgNV
+BAoMC0FmZmlybVRydXN0MSAwHgYDVQQDDBdBZmZpcm1UcnVzdCBQcmVtaXVtIEVDQzAeFw0xMDAx
+MjkxNDIwMjRaFw00MDEyMzExNDIwMjRaMEUxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1U
+cnVzdDEgMB4GA1UEAwwXQWZmaXJtVHJ1c3QgUHJlbWl1bSBFQ0MwdjAQBgcqhkjOPQIBBgUrgQQA
+IgNiAAQNMF4bFZ0D0KF5Nbc6PJJ6yhUczWLznCZcBz3lVPqj1swS6vQUX+iOGasvLkjmrBhDeKzQ
+N8O9ss0s5kfiGuZjuD0uL3jET9v0D6RoTFVya5UdThhClXjMNzyR4ptlKymjQjBAMB0GA1UdDgQW
+BBSaryl6wBE1NSZRMADDav5A1a7WPDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAK
+BggqhkjOPQQDAwNnADBkAjAXCfOHiFBar8jAQr9HX/VsaobgxCd05DhT1wV/GzTjxi+zygk8N53X
+57hG8f2h4nECMEJZh0PUUd+60wkyWs6Iflc9nF9Ca/UHLbXwgpP5WW+uZPpY5Yse42O+tYHNbwKM
+eQ==
+-----END CERTIFICATE-----
+
+Certum Trusted Network CA
+=========================
+-----BEGIN CERTIFICATE-----
+MIIDuzCCAqOgAwIBAgIDBETAMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlBMMSIwIAYDVQQK
+ExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkxIjAgBgNVBAMTGUNlcnR1bSBUcnVzdGVkIE5ldHdvcmsgQ0EwHhcNMDgxMDIy
+MTIwNzM3WhcNMjkxMjMxMTIwNzM3WjB+MQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBU
+ZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+MSIwIAYDVQQDExlDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENBMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA4/t9o3K6wvDJFIf1awFO4W5AB7ptJ11/91sts1rHUV+rpDKmYYe2bg+G0jAC
+l/jXaVehGDldamR5xgFZrDwxSjh80gTSSyjoIF87B6LMTXPb865Px1bVWqeWifrzq2jUI4ZZJ88J
+J7ysbnKDHDBy3+Ci6dLhdHUZvSqeexVUBBvXQzmtVSjF4hq79MDkrjhJM8x2hZ85RdKknvISjFH4
+fOQtf/WsX+sWn7Et0brMkUJ3TCXJkDhv2/DM+44el1k+1WBO5gUo7Ul5E0u6SNsv+XLTOcr+H9g0
+cvW0QM8xAcPs3hEtF10fuFDRXhmnad4HMyjKUJX5p1TLVIZQRan5SQIDAQABo0IwQDAPBgNVHRMB
+Af8EBTADAQH/MB0GA1UdDgQWBBQIds3LB/8k9sXN7buQvOKEN0Z19zAOBgNVHQ8BAf8EBAMCAQYw
+DQYJKoZIhvcNAQEFBQADggEBAKaorSLOAT2mo/9i0Eidi15ysHhE49wcrwn9I0j6vSrEuVUEtRCj
+jSfeC4Jj0O7eDDd5QVsisrCaQVymcODU0HfLI9MA4GxWL+FpDQ3Zqr8hgVDZBqWo/5U30Kr+4rP1
+mS1FhIrlQgnXdAIv94nYmem8J9RHjboNRhx3zxSkHLmkMcScKHQDNP8zGSal6Q10tz6XxnboJ5aj
+Zt3hrvJBW8qYVoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI
+03YnnZotBqbJ7DnSq9ufmgsnAjUpsUCV5/nonFWIGUbWtzT1fs45mtk48VH3Tyw=
+-----END CERTIFICATE-----
+
+Certinomis - Autorité Racine
+=============================
+-----BEGIN CERTIFICATE-----
+MIIFnDCCA4SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjETMBEGA1UEChMK
+Q2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxJjAkBgNVBAMMHUNlcnRpbm9taXMg
+LSBBdXRvcml0w6kgUmFjaW5lMB4XDTA4MDkxNzA4Mjg1OVoXDTI4MDkxNzA4Mjg1OVowYzELMAkG
+A1UEBhMCRlIxEzARBgNVBAoTCkNlcnRpbm9taXMxFzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMSYw
+JAYDVQQDDB1DZXJ0aW5vbWlzIC0gQXV0b3JpdMOpIFJhY2luZTCCAiIwDQYJKoZIhvcNAQEBBQAD
+ggIPADCCAgoCggIBAJ2Fn4bT46/HsmtuM+Cet0I0VZ35gb5j2CN2DpdUzZlMGvE5x4jYF1AMnmHa
+wE5V3udauHpOd4cN5bjr+p5eex7Ezyh0x5P1FMYiKAT5kcOrJ3NqDi5N8y4oH3DfVS9O7cdxbwly
+Lu3VMpfQ8Vh30WC8Tl7bmoT2R2FFK/ZQpn9qcSdIhDWerP5pqZ56XjUl+rSnSTV3lqc2W+HN3yNw
+2F1MpQiD8aYkOBOo7C+ooWfHpi2GR+6K/OybDnT0K0kCe5B1jPyZOQE51kqJ5Z52qz6WKDgmi92N
+jMD2AR5vpTESOH2VwnHu7XSu5DaiQ3XV8QCb4uTXzEIDS3h65X27uK4uIJPT5GHfceF2Z5c/tt9q
+c1pkIuVC28+BA5PY9OMQ4HL2AHCs8MF6DwV/zzRpRbWT5BnbUhYjBYkOjUjkJW+zeL9i9Qf6lSTC
+lrLooyPCXQP8w9PlfMl1I9f09bze5N/NgL+RiH2nE7Q5uiy6vdFrzPOlKO1Enn1So2+WLhl+HPNb
+xxaOu2B9d2ZHVIIAEWBsMsGoOBvrbpgT1u449fCfDu/+MYHB0iSVL1N6aaLwD4ZFjliCK0wi1F6g
+530mJ0jfJUaNSih8hp75mxpZuWW/Bd22Ql095gBIgl4g9xGC3srYn+Y3RyYe63j3YcNBZFgCQfna
+4NH4+ej9Uji29YnfAgMBAAGjWzBZMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0G
+A1UdDgQWBBQNjLZh2kS40RR9w759XkjwzspqsDAXBgNVHSAEEDAOMAwGCiqBegFWAgIAAQEwDQYJ
+KoZIhvcNAQEFBQADggIBACQ+YAZ+He86PtvqrxyaLAEL9MW12Ukx9F1BjYkMTv9sov3/4gbIOZ/x
+WqndIlgVqIrTseYyCYIDbNc/CMf4uboAbbnW/FIyXaR/pDGUu7ZMOH8oMDX/nyNTt7buFHAAQCva
+R6s0fl6nVjBhK4tDrP22iCj1a7Y+YEq6QpA0Z43q619FVDsXrIvkxmUP7tCMXWY5zjKn2BCXwH40
+nJ+U8/aGH88bc62UeYdocMMzpXDn2NU4lG9jeeu/Cg4I58UvD0KgKxRA/yHgBcUn4YQRE7rWhh1B
+CxMjidPJC+iKunqjo3M3NYB9Ergzd0A4wPpeMNLytqOx1qKVl4GbUu1pTP+A5FPbVFsDbVRfsbjv
+JL1vnxHDx2TCDyhihWZeGnuyt++uNckZM6i4J9szVb9o4XVIRFb7zdNIu0eJOqxp9YDG5ERQL1TE
+qkPFMTFYvZbF6nVsmnWxTfj3l/+WFvKXTej28xH5On2KOG4Ey+HTRRWqpdEdnV1j6CTmNhTih60b
+WfVEm/vXd3wfAXBioSAaosUaKPQhA+4u2cGA6rnZgtZbdsLLO7XSAPCjDuGtbkD326C00EauFddE
+wk01+dIL8hf2rGbVJLJP0RyZwG71fet0BLj5TXcJ17TPBzAJ8bgAVtkXFhYKK4bfjwEZGuW7gmP/
+vgt2Fl43N+bYdJeimUV5
+-----END CERTIFICATE-----
+
+Root CA Generalitat Valenciana
+==============================
+-----BEGIN CERTIFICATE-----
+MIIGizCCBXOgAwIBAgIEO0XlaDANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJFUzEfMB0GA1UE
+ChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJR1ZBMScwJQYDVQQDEx5Sb290
+IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwHhcNMDEwNzA2MTYyMjQ3WhcNMjEwNzAxMTUyMjQ3
+WjBoMQswCQYDVQQGEwJFUzEfMB0GA1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UE
+CxMGUEtJR1ZBMScwJQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGKqtXETcvIorKA3Qdyu0togu8M1JAJke+WmmmO3I2
+F0zo37i7L3bhQEZ0ZQKQUgi0/6iMweDHiVYQOTPvaLRfX9ptI6GJXiKjSgbwJ/BXufjpTjJ3Cj9B
+ZPPrZe52/lSqfR0grvPXdMIKX/UIKFIIzFVd0g/bmoGlu6GzwZTNVOAydTGRGmKy3nXiz0+J2ZGQ
+D0EbtFpKd71ng+CT516nDOeB0/RSrFOyA8dEJvt55cs0YFAQexvba9dHq198aMpunUEDEO5rmXte
+JajCq+TA81yc477OMUxkHl6AovWDfgzWyoxVjr7gvkkHD6MkQXpYHYTqWBLI4bft75PelAgxAgMB
+AAGjggM7MIIDNzAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9vY3NwLnBraS5n
+dmEuZXMwEgYDVR0TAQH/BAgwBgEB/wIBAjCCAjQGA1UdIASCAiswggInMIICIwYKKwYBBAG/VQIB
+ADCCAhMwggHoBggrBgEFBQcCAjCCAdoeggHWAEEAdQB0AG8AcgBpAGQAYQBkACAAZABlACAAQwBl
+AHIAdABpAGYAaQBjAGEAYwBpAPMAbgAgAFIAYQDtAHoAIABkAGUAIABsAGEAIABHAGUAbgBlAHIA
+YQBsAGkAdABhAHQAIABWAGEAbABlAG4AYwBpAGEAbgBhAC4ADQAKAEwAYQAgAEQAZQBjAGwAYQBy
+AGEAYwBpAPMAbgAgAGQAZQAgAFAAcgDhAGMAdABpAGMAYQBzACAAZABlACAAQwBlAHIAdABpAGYA
+aQBjAGEAYwBpAPMAbgAgAHEAdQBlACAAcgBpAGcAZQAgAGUAbAAgAGYAdQBuAGMAaQBvAG4AYQBt
+AGkAZQBuAHQAbwAgAGQAZQAgAGwAYQAgAHAAcgBlAHMAZQBuAHQAZQAgAEEAdQB0AG8AcgBpAGQA
+YQBkACAAZABlACAAQwBlAHIAdABpAGYAaQBjAGEAYwBpAPMAbgAgAHMAZQAgAGUAbgBjAHUAZQBu
+AHQAcgBhACAAZQBuACAAbABhACAAZABpAHIAZQBjAGMAaQDzAG4AIAB3AGUAYgAgAGgAdAB0AHAA
+OgAvAC8AdwB3AHcALgBwAGsAaQAuAGcAdgBhAC4AZQBzAC8AYwBwAHMwJQYIKwYBBQUHAgEWGWh0
+dHA6Ly93d3cucGtpLmd2YS5lcy9jcHMwHQYDVR0OBBYEFHs100DSHHgZZu90ECjcPk+yeAT8MIGV
+BgNVHSMEgY0wgYqAFHs100DSHHgZZu90ECjcPk+yeAT8oWykajBoMQswCQYDVQQGEwJFUzEfMB0G
+A1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJR1ZBMScwJQYDVQQDEx5S
+b290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmGCBDtF5WgwDQYJKoZIhvcNAQEFBQADggEBACRh
+TvW1yEICKrNcda3FbcrnlD+laJWIwVTAEGmiEi8YPyVQqHxK6sYJ2fR1xkDar1CdPaUWu20xxsdz
+Ckj+IHLtb8zog2EWRpABlUt9jppSCS/2bxzkoXHPjCpaF3ODR00PNvsETUlR4hTJZGH71BTg9J63
+NI8KJr2XXPR5OkowGcytT6CYirQxlyric21+eLj4iIlPsSKRZEv1UN4D2+XFducTZnV+ZfsBn5OH
+iJ35Rld8TWCvmHMTI6QgkYH60GFmuH3Rr9ZvHmw96RH9qfmCIoaZM3Fa6hlXPZHNqcCjbgcTpsnt
++GijnsNacgmHKNHEc8RzGF9QdRYxn7fofMM=
+-----END CERTIFICATE-----
+
+A-Trust-nQual-03
+================
+-----BEGIN CERTIFICATE-----
+MIIDzzCCAregAwIBAgIDAWweMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYDVQQGEwJBVDFIMEYGA1UE
+Cgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBpbSBlbGVrdHIuIERhdGVudmVy
+a2VociBHbWJIMRkwFwYDVQQLDBBBLVRydXN0LW5RdWFsLTAzMRkwFwYDVQQDDBBBLVRydXN0LW5R
+dWFsLTAzMB4XDTA1MDgxNzIyMDAwMFoXDTE1MDgxNzIyMDAwMFowgY0xCzAJBgNVBAYTAkFUMUgw
+RgYDVQQKDD9BLVRydXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGltIGVsZWt0ci4gRGF0
+ZW52ZXJrZWhyIEdtYkgxGTAXBgNVBAsMEEEtVHJ1c3QtblF1YWwtMDMxGTAXBgNVBAMMEEEtVHJ1
+c3QtblF1YWwtMDMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtPWFuA/OQO8BBC4SA
+zewqo51ru27CQoT3URThoKgtUaNR8t4j8DRE/5TrzAUjlUC5B3ilJfYKvUWG6Nm9wASOhURh73+n
+yfrBJcyFLGM/BWBzSQXgYHiVEEvc+RFZznF/QJuKqiTfC0Li21a8StKlDJu3Qz7dg9MmEALP6iPE
+SU7l0+m0iKsMrmKS1GWH2WrX9IWf5DMiJaXlyDO6w8dB3F/GaswADm0yqLaHNgBid5seHzTLkDx4
+iHQF63n1k3Flyp3HaxgtPVxO59X4PzF9j4fsCiIvI+n+u33J4PTs63zEsMMtYrWacdaxaujs2e3V
+cuy+VwHOBVWf3tFgiBCzAgMBAAGjNjA0MA8GA1UdEwEB/wQFMAMBAf8wEQYDVR0OBAoECERqlWdV
+eRFPMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAVdRU0VlIXLOThaq/Yy/kgM40
+ozRiPvbY7meIMQQDbwvUB/tOdQ/TLtPAF8fGKOwGDREkDg6lXb+MshOWcdzUzg4NCmgybLlBMRmr
+sQd7TZjTXLDR8KdCoLXEjq/+8T/0709GAHbrAvv5ndJAlseIOrifEXnzgGWovR/TeIGgUUw3tKZd
+JXDRZslo+S4RFGjxVJgIrCaSD96JntT6s3kr0qN51OyLrIdTaEJMUVF0HhsnLuP1Hyl0Te2v9+GS
+mYHovjrHF1D2t8b8m7CKa9aIA5GPBnc6hQLdmNVDeD/GMBWsm2vLV7eJUYs66MmEDNuxUCAKGkq6
+ahq97BvIxYSazQ==
+-----END CERTIFICATE-----
+
+TWCA Root Certification Authority
+=================================
+-----BEGIN CERTIFICATE-----
+MIIDezCCAmOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBfMQswCQYDVQQGEwJUVzESMBAGA1UECgwJ
+VEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NBIFJvb3QgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwHhcNMDgwODI4MDcyNDMzWhcNMzAxMjMxMTU1OTU5WjBfMQswCQYDVQQG
+EwJUVzESMBAGA1UECgwJVEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NB
+IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCwfnK4pAOU5qfeCTiRShFAh6d8WWQUe7UREN3+v9XAu1bihSX0NXIP+FPQQeFEAcK0HMMx
+QhZHhTMidrIKbw/lJVBPhYa+v5guEGcevhEFhgWQxFnQfHgQsIBct+HHK3XLfJ+utdGdIzdjp9xC
+oi2SBBtQwXu4PhvJVgSLL1KbralW6cH/ralYhzC2gfeXRfwZVzsrb+RH9JlF/h3x+JejiB03HFyP
+4HYlmlD4oFT/RJB2I9IyxsOrBr/8+7/zrX2SYgJbKdM1o5OaQ2RgXbL6Mv87BK9NQGr5x+PvI/1r
+y+UPizgN7gr8/g+YnzAx3WxSZfmLgb4i4RxYA7qRG4kHAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIB
+BjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqOFsmjd6LWvJPelSDGRjjCDWmujANBgkqhkiG
+9w0BAQUFAAOCAQEAPNV3PdrfibqHDAhUaiBQkr6wQT25JmSDCi/oQMCXKCeCMErJk/9q56YAf4lC
+mtYR5VPOL8zy2gXE/uJQxDqGfczafhAJO5I1KlOy/usrBdlsXebQ79NqZp4VKIV66IIArB6nCWlW
+QtNoURi+VJq/REG6Sb4gumlc7rh3zc5sH62Dlhh9DrUUOYTxKOkto557HnpyWoOzeW/vtPzQCqVY
+T0bf+215WfKEIlKuD8z7fDvnaspHYcN6+NOSBB+4IIThNlQWx0DeO4pz3N/GCUzf7Nr/1FNCocny
+Yh0igzyXxfkZYiesZSLX0zzG5Y6yU8xJzrww/nsOM5D77dIUkR8Hrw==
+-----END CERTIFICATE-----
+
+Security Communication RootCA2
+==============================
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIBADANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJKUDElMCMGA1UEChMc
+U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UECxMeU2VjdXJpdHkgQ29tbXVuaWNh
+dGlvbiBSb290Q0EyMB4XDTA5MDUyOTA1MDAzOVoXDTI5MDUyOTA1MDAzOVowXTELMAkGA1UEBhMC
+SlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xJzAlBgNVBAsTHlNlY3Vy
+aXR5IENvbW11bmljYXRpb24gUm9vdENBMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ANAVOVKxUrO6xVmCxF1SrjpDZYBLx/KWvNs2l9amZIyoXvDjChz335c9S672XewhtUGrzbl+dp++
++T42NKA7wfYxEUV0kz1XgMX5iZnK5atq1LXaQZAQwdbWQonCv/Q4EpVMVAX3NuRFg3sUZdbcDE3R
+3n4MqzvEFb46VqZab3ZpUql6ucjrappdUtAtCms1FgkQhNBqyjoGADdH5H5XTz+L62e4iKrFvlNV
+spHEfbmwhRkGeC7bYRr6hfVKkaHnFtWOojnflLhwHyg/i/xAXmODPIMqGplrz95Zajv8bxbXH/1K
+EOtOghY6rCcMU/Gt1SSwawNQwS08Ft1ENCcadfsCAwEAAaNCMEAwHQYDVR0OBBYEFAqFqXdlBZh8
+QIH4D5csOPEK7DzPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEB
+CwUAA4IBAQBMOqNErLlFsceTfsgLCkLfZOoc7llsCLqJX2rKSpWeeo8HxdpFcoJxDjrSzG+ntKEj
+u/Ykn8sX/oymzsLS28yN/HH8AynBbF0zX2S2ZTuJbxh2ePXcokgfGT+Ok+vx+hfuzU7jBBJV1uXk
+3fs+BXziHV7Gp7yXT2g69ekuCkO2r1dcYmh8t/2jioSgrGK+KwmHNPBqAbubKVY8/gA3zyNs8U6q
+tnRGEmyR7jTV7JqR50S+kDFy1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29
+mvVXIwAHIRc/SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03
+-----END CERTIFICATE-----
+
+EC-ACC
+======
+-----BEGIN CERTIFICATE-----
+MIIFVjCCBD6gAwIBAgIQ7is969Qh3hSoYqwE893EATANBgkqhkiG9w0BAQUFADCB8zELMAkGA1UE
+BhMCRVMxOzA5BgNVBAoTMkFnZW5jaWEgQ2F0YWxhbmEgZGUgQ2VydGlmaWNhY2lvIChOSUYgUS0w
+ODAxMTc2LUkpMSgwJgYDVQQLEx9TZXJ2ZWlzIFB1YmxpY3MgZGUgQ2VydGlmaWNhY2lvMTUwMwYD
+VQQLEyxWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbCAoYykwMzE1MDMGA1UE
+CxMsSmVyYXJxdWlhIEVudGl0YXRzIGRlIENlcnRpZmljYWNpbyBDYXRhbGFuZXMxDzANBgNVBAMT
+BkVDLUFDQzAeFw0wMzAxMDcyMzAwMDBaFw0zMTAxMDcyMjU5NTlaMIHzMQswCQYDVQQGEwJFUzE7
+MDkGA1UEChMyQWdlbmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2FjaW8gKE5JRiBRLTA4MDExNzYt
+SSkxKDAmBgNVBAsTH1NlcnZlaXMgUHVibGljcyBkZSBDZXJ0aWZpY2FjaW8xNTAzBgNVBAsTLFZl
+Z2V1IGh0dHBzOi8vd3d3LmNhdGNlcnQubmV0L3ZlcmFycmVsIChjKTAzMTUwMwYDVQQLEyxKZXJh
+cnF1aWEgRW50aXRhdHMgZGUgQ2VydGlmaWNhY2lvIENhdGFsYW5lczEPMA0GA1UEAxMGRUMtQUND
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsyLHT+KXQpWIR4NA9h0X84NzJB5R85iK
+w5K4/0CQBXCHYMkAqbWUZRkiFRfCQ2xmRJoNBD45b6VLeqpjt4pEndljkYRm4CgPukLjbo73FCeT
+ae6RDqNfDrHrZqJyTxIThmV6PttPB/SnCWDaOkKZx7J/sxaVHMf5NLWUhdWZXqBIoH7nF2W4onW4
+HvPlQn2v7fOKSGRdghST2MDk/7NQcvJ29rNdQlB50JQ+awwAvthrDk4q7D7SzIKiGGUzE3eeml0a
+E9jD2z3Il3rucO2n5nzbcc8tlGLfbdb1OL4/pYUKGbio2Al1QnDE6u/LDsg0qBIimAy4E5S2S+zw
+0JDnJwIDAQABo4HjMIHgMB0GA1UdEQQWMBSBEmVjX2FjY0BjYXRjZXJ0Lm5ldDAPBgNVHRMBAf8E
+BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUoMOLRKo3pUW/l4Ba0fF4opvpXY0wfwYD
+VR0gBHgwdjB0BgsrBgEEAfV4AQMBCjBlMCwGCCsGAQUFBwIBFiBodHRwczovL3d3dy5jYXRjZXJ0
+Lm5ldC92ZXJhcnJlbDA1BggrBgEFBQcCAjApGidWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5l
+dC92ZXJhcnJlbCAwDQYJKoZIhvcNAQEFBQADggEBAKBIW4IB9k1IuDlVNZyAelOZ1Vr/sXE7zDkJ
+lF7W2u++AVtd0x7Y/X1PzaBB4DSTv8vihpw3kpBWHNzrKQXlxJ7HNd+KDM3FIUPpqojlNcAZQmNa
+Al6kSBg6hW/cnbw/nZzBh7h6YQjpdwt/cKt63dmXLGQehb+8dJahw3oS7AwaboMMPOhyRp/7SNVe
+l+axofjk70YllJyJ22k4vuxcDlbHZVHlUIiIv0LVKz3l+bqeLrPK9HOSAgu+TGbrIP65y7WZf+a2
+E/rKS03Z7lNGBjvGTq2TWoF+bCpLagVFjPIhpDGQh2xlnJ2lYJU6Un/10asIbvPuW/mIPX64b24D
+5EI=
+-----END CERTIFICATE-----
diff --git a/source/n/curl/curl-7.27.0_curl-config_syntax_fix.diff b/source/n/curl/curl-7.27.0_curl-config_syntax_fix.diff
new file mode 100644
index 000000000..42509c848
--- /dev/null
+++ b/source/n/curl/curl-7.27.0_curl-config_syntax_fix.diff
@@ -0,0 +1,15 @@
+diff -ru curl-7.27.0.orig/curl-config.in curl-7.27.0/curl-config.in
+--- curl-7.27.0.orig/curl-config.in	2012-05-25 16:56:17.000000000 -0500
++++ curl-7.27.0/curl-config.in	2012-08-17 12:01:44.000000000 -0500
+@@ -135,9 +135,9 @@
+           CPPFLAG_CURL_STATICLIB=""
+         fi
+        	if test "X@includedir@" = "X/usr/include"; then
+-          echo "$(CPPFLAG_CURL_STATICLIB)"
++          echo "${CPPFLAG_CURL_STATICLIB}"
+         else
+-          echo "$(CPPFLAG_CURL_STATICLIB)-I@includedir@"
++          echo "${CPPFLAG_CURL_STATICLIB}-I@includedir@"
+         fi
+        	;;
+ 
diff --git a/source/n/curl/curl.SlackBuild b/source/n/curl/curl.SlackBuild
index 39f632c52..fd67ff4ce 100755
--- a/source/n/curl/curl.SlackBuild
+++ b/source/n/curl/curl.SlackBuild
@@ -22,8 +22,8 @@
 
 
 PKGNAM=curl
-VERSION=${VERSION:-$(echo curl-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-$(echo curl-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -62,9 +62,11 @@ rm -rf $PKG
 mkdir -p $PKG
 cd $TMP
 rm -rf curl-$VERSION
-tar xvf $CWD/curl-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/curl-$VERSION.tar.?z* || exit 1
 cd curl-$VERSION
 
+zcat $CWD/curl-7.27.0_curl-config_syntax_fix.diff.gz | patch -p1 --verbose || exit 1
+
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -92,6 +94,9 @@ cp -a $CWD/cacert.pem.bz2 $PKG/usr/share/curl
   chmod 644 ca-bundle.crt
 )
 
+# We don't ship the related perl script (yet):
+rm -f $PKG/usr/man/man1/mk-ca-bundle.1
+
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
diff --git a/source/n/cyrus-sasl/cyrus-sasl.SlackBuild b/source/n/cyrus-sasl/cyrus-sasl.SlackBuild
index 27512039e..eea8e1905 100755
--- a/source/n/cyrus-sasl/cyrus-sasl.SlackBuild
+++ b/source/n/cyrus-sasl/cyrus-sasl.SlackBuild
@@ -22,7 +22,7 @@
 
 PKGNAM=cyrus-sasl
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-4}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -58,6 +58,10 @@ cd $TMP
 rm -rf cyrus-sasl-$VERSION
 tar xvf $CWD/cyrus-sasl-$VERSION.tar.?z* || exit 1
 cd cyrus-sasl-$VERSION || exit 1
+
+# Fix compiling:
+zcat $CWD/cyrus-sasl.bad_elif.diff.gz | patch -p1 --verbose || exit 1
+
 chown -R root:root .
 find . -perm 777 -exec chmod 755 {} \;
 find . -perm 664 -exec chmod 644 {} \;
@@ -69,6 +73,7 @@ CFLAGS="$SLKCFLAGS" \
   --with-configdir=/etc/sasl2 \
   --sysconfdir=/etc \
   --localstatedir=/var \
+  --mandir=/usr/man \
   --disable-static \
   --enable-login \
   --disable-anon \
@@ -81,6 +86,16 @@ CFLAGS="$SLKCFLAGS" \
 # will look for them in /usr/lib64/sasl2" and advised to create a symlink...
 make sasldir=/usr/lib${LIBDIRSUFFIX}/sasl2 || exit 1
 make sasldir=/usr/lib${LIBDIRSUFFIX}/sasl2 install DESTDIR=$PKG || exit 1
+
+# NOTE:  I'd _like_ to get rid of these, but they are already tangled into
+# other .la files, and then those packages would need to be recompiled.  And
+# likely I'd want to get rid of those .la files, which would lead to more
+# fallout, etc, etc.  So we'll put these back and plan a giant .la eradication
+# effort early in a future development cycle.
+#
+# Don't ship .la files.
+#rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la $PKG/usr/lib${LIBDIRSUFFIX}/sasl2/*.la
+
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
diff --git a/source/n/cyrus-sasl/cyrus-sasl.bad_elif.diff b/source/n/cyrus-sasl/cyrus-sasl.bad_elif.diff
new file mode 100644
index 000000000..a7196b3b1
--- /dev/null
+++ b/source/n/cyrus-sasl/cyrus-sasl.bad_elif.diff
@@ -0,0 +1,22 @@
+Index: cyrus-sasl-2.1.23/plugins/digestmd5.c
+===================================================================
+--- cyrus-sasl-2.1.23.orig/plugins/digestmd5.c
++++ cyrus-sasl-2.1.23/plugins/digestmd5.c
+@@ -2715,7 +2715,7 @@ static sasl_server_plug_t digestmd5_serv
+ 	"DIGEST-MD5",			/* mech_name */
+ #ifdef WITH_RC4
+ 	128,				/* max_ssf */
+-#elif WITH_DES
++#elif defined(WITH_DES)
+ 	112,
+ #else 
+ 	1,
+@@ -4034,7 +4034,7 @@ static sasl_client_plug_t digestmd5_clie
+ 	"DIGEST-MD5",
+ #ifdef WITH_RC4				/* mech_name */
+ 	128,				/* max ssf */
+-#elif WITH_DES
++#elif defined(WITH_DES)
+ 	112,
+ #else
+ 	1,
diff --git a/source/n/dhcp/dhcp.SlackBuild b/source/n/dhcp/dhcp.SlackBuild
index c328b3cba..894a323a4 100755
--- a/source/n/dhcp/dhcp.SlackBuild
+++ b/source/n/dhcp/dhcp.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -77,6 +77,15 @@ find . \
 # Add PATH setting to /sbin/dhclient-script
 zcat $CWD/dhclient-script.PATH.diff.gz | patch -p1 || exit 1
 
+# Fix paths in manual pages
+sed -i \
+    -e "s,ETCDIR,/etc,g" \
+    -e "s,DBDIR,/var/state/dhcp,g" \
+    -e "s,RUNDIR,/var/run,g" \
+    client/*.{5,8} \
+    server/*.{5,8} \
+    doc/*/*.{5,8}
+
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -153,6 +162,14 @@ cp -a \
 mv $PKG/etc/dhcpd.conf $PKG/etc/dhclient.conf \
   $PKG/usr/doc/dhcp-$VERSION/examples
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
diff --git a/source/n/dhcpcd/50-ntp.conf.diff b/source/n/dhcpcd/50-ntp.conf.diff
deleted file mode 100644
index 63fd914b4..000000000
--- a/source/n/dhcpcd/50-ntp.conf.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- ./dhcpcd-hooks/50-ntp.conf.orig	2010-11-19 04:17:14.000000000 -0600
-+++ ./dhcpcd-hooks/50-ntp.conf	2010-12-29 16:07:48.000000000 -0600
-@@ -8,6 +8,26 @@
- #   NTP_CONF=/usr/pkg/etc/ntpd.conf
- # to use openntpd from pkgsrc instead of the system provided ntp.
- 
-+# Detect OpenRC, Debian or BSD rc
-+# Distributions may want to just have their command here instead of this
-+if type rc-service >/dev/null 2>&1 && rc-service --exists ntpd; then
-+        ntpd_restart_cmd="rc-service ntpd -- -Ds restart"
-+elif type invoke-rc.d >/dev/null 2>&1; then
-+        if [ -x /etc/init.d/ntp ]; then
-+                ntpd_restart_cmd="invoke-rc.d ntp try-restart"
-+        fi
-+        # Debian as a seperate file for DHCP config to avoid stamping on
-+        # the master.
-+        [ -e /var/lib/ntp ] || mkdir /var/lib/ntp
-+        : ${NTP_DHCP_CONF:=/var/lib/ntp/ntp.conf.dhcp}
-+elif [ -x /etc/rc.d/ntpd ]; then
-+        ntpd_restart_cmd="/etc/rc.d/ntpd status >/dev/null 2>&1 && /etc/rc.d/ntpd restart"
-+elif [ -x /usr/local/etc/rc.d/ntpd ]; then
-+        ntpd_restart_cmd="/usr/local/etc/rc.d/ntpd status >/dev/null 2>&1 && /usr/local/etc/rc.d/ntpd restart"
-+elif [ -x /etc/rc.d/rc.ntpd ]; then
-+        ntpd_restart_cmd="/etc/rc.d/rc.ntpd status >/dev/null 2>&1 && /etc/rc.d/rc.ntpd restart"
-+fi
-+
- : ${ntpd_restart_cmd:=service_condcommand ntpd restart}
- if type invoke-rc.d >/dev/null 2>&1; then
- 	# Debian has a seperate file for DHCP config to avoid stamping on
diff --git a/source/n/dhcpcd/COPYRIGHT b/source/n/dhcpcd/COPYRIGHT
index 07d9e683b..a75c8ce10 100644
--- a/source/n/dhcpcd/COPYRIGHT
+++ b/source/n/dhcpcd/COPYRIGHT
@@ -1,6 +1,6 @@
 /*
  * dhcpcd - DHCP client daemon
- * Copyright 2006-2008 Roy Marples <roy@marples.name>
+ * Copyright (c) 2006-2012 Roy Marples <roy@marples.name>
  * All rights reserved
 
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/n/dhcpcd/define-SERVICEstuff-for-Slackware.patch b/source/n/dhcpcd/define-SERVICEstuff-for-Slackware.patch
new file mode 100644
index 000000000..ca0273f36
--- /dev/null
+++ b/source/n/dhcpcd/define-SERVICEstuff-for-Slackware.patch
@@ -0,0 +1,32 @@
+From 293f23ad36f2c84cf67c483d944157834f4417a6 Mon Sep 17 00:00:00 2001
+From: Robby Workman <rworkman@slackware.com>
+Date: Wed, 23 May 2012 21:33:30 -0500
+Subject: [PATCH] configure: Define SERVICE* for Slackware
+
+Slackware uses /etc/rc.d/rc.$service instead of just $service,
+so configure doesn't find those.  This patch overrides the
+defaults for SERVICEEXISTS, SERVICECMD, and SERVICESTATUS.
+---
+ configure |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/configure b/configure
+index b334497..e6554ca 100755
+--- a/configure
++++ b/configure
+@@ -413,6 +413,12 @@ if [ -z "$SERVICECMD" ]; then
+ 		fi
+ 	done
+ fi
++if [ -e /etc/slackware-version ]; then
++	echo "Overriding service status check for Slackware Linux"
++	SERVICEEXISTS="[ -x /etc/rc.d/rc.\$1 ]"
++	SERVICECMD="/etc/rc.d/rc.\$1 \$2"
++	SERVICESTATUS="/etc/rc.d/rc.\$1 status 1>/dev/null 2>&1"
++fi
+ if [ -e /etc/arch-release ]; then
+ 	echo "Overriding service status check for Arch Linux"
+ 	SERVICESTATUS="[ -e /var/run/daemons/\$1 ]"
+-- 
+1.7.10.1
+
diff --git a/source/n/dhcpcd/dhcpcd.SlackBuild b/source/n/dhcpcd/dhcpcd.SlackBuild
index c50048ae9..15f14e2fb 100755
--- a/source/n/dhcpcd/dhcpcd.SlackBuild
+++ b/source/n/dhcpcd/dhcpcd.SlackBuild
@@ -72,8 +72,7 @@ find . \
 # /etc/rc.d/rc.S, and /var should not be on a network filesystem.  As such,
 # we'll use the FHS layout instead of putting things in /etc/dhcpc 
 
-# Fixup the 50-ntp.conf hook with our init script location
-zcat $CWD/50-ntp.conf.diff.gz | patch -p1 || exit 1
+zcat $CWD/define-SERVICEstuff-for-Slackware.patch.gz | patch -p1 || exit 1
 
 # Yes, /lib/dhcpcd is correct, even on x86_64.
 CFLAGS="$SLKCFLAGS" \
@@ -85,7 +84,6 @@ CFLAGS="$SLKCFLAGS" \
   --dbdir=/var/lib/dhcpcd \
   --libexecdir=/lib/dhcpcd \
   --mandir=/usr/man \
-  --with-hooks="50-ntp.conf 50-yp.conf" \
   --build=$ARCH-slackware-linux
 
 make $NUMJOBS || make || exit 1
@@ -97,16 +95,33 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \
 # Let's not clobber the config file
 mv $PKG/etc/dhcpcd.conf $PKG/etc/dhcpcd.conf.new
 
-# Compress manpages
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-)
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
 
 mkdir -p $PKG/usr/doc/dhcpcd-$VERSION
 cp -a README* $PKG/usr/doc/dhcpcd-$VERSION
 zcat $CWD/COPYRIGHT.gz > $PKG/usr/doc/dhcpcd-$VERSION/COPYRIGHT
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
diff --git a/source/n/epic5/epic5.SlackBuild b/source/n/epic5/epic5.SlackBuild
index fb7aa1fdd..b3b483af6 100755
--- a/source/n/epic5/epic5.SlackBuild
+++ b/source/n/epic5/epic5.SlackBuild
@@ -20,7 +20,7 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=1.1.2
+VERSION=1.1.3
 EPICVER=5
 HELPFILE=current
 BUILD=${BUILD:-1}
diff --git a/source/n/fetchmail/fetchmail.SlackBuild b/source/n/fetchmail/fetchmail.SlackBuild
index 16cc31230..e7bca0fdd 100755
--- a/source/n/fetchmail/fetchmail.SlackBuild
+++ b/source/n/fetchmail/fetchmail.SlackBuild
@@ -22,7 +22,7 @@
 
 PKGNAM=fetchmail
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/n/fetchmail/fetchmail.url b/source/n/fetchmail/fetchmail.url
new file mode 100644
index 000000000..7c51f8e81
--- /dev/null
+++ b/source/n/fetchmail/fetchmail.url
@@ -0,0 +1,4 @@
+lftpget http://download.berlios.de/fetchmail/fetchmail-6.3.20.tar.xz
+lftpget http://download.berlios.de/fetchmail/fetchmail-6.3.20.tar.xz.asc
+lftpget http://download.berlios.de/fetchmail/fetchmail-6.3.20.tar.bz2
+lftpget http://download.berlios.de/fetchmail/fetchmail-6.3.20.tar.bz2.asc
diff --git a/source/n/gnupg/gnupg.SlackBuild b/source/n/gnupg/gnupg.SlackBuild
index 2a0bce570..073106971 100755
--- a/source/n/gnupg/gnupg.SlackBuild
+++ b/source/n/gnupg/gnupg.SlackBuild
@@ -20,7 +20,7 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=1.4.11
+VERSION=1.4.12
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -54,7 +54,7 @@ mkdir -p $PKG $PKG
 
 cd $TMP
 rm -rf gnupg-$VERSION
-tar xvf $CWD/gnupg-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/gnupg-$VERSION.tar.?z* || exit 1
 cd gnupg-$VERSION
 chown -R root:root .
 find . \
diff --git a/source/n/gnupg2/gnupg2.SlackBuild b/source/n/gnupg2/gnupg2.SlackBuild
index 54cdbb3b2..3c48e3d5e 100755
--- a/source/n/gnupg2/gnupg2.SlackBuild
+++ b/source/n/gnupg2/gnupg2.SlackBuild
@@ -93,17 +93,27 @@ mkdir -p $PKG/etc/gnupg
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-)
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
 
 rm -f $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/*
 
 mkdir -p $PKG/usr/doc/gnupg2-$VERSION
 cp -a \
-  ABOUT-NLS AUTHORS COPYING* INSTALL NEWS README* THANKS TODO VERSION \
+  AUTHORS COPYING* INSTALL NEWS README* THANKS TODO VERSION \
   $PKG/usr/doc/gnupg2-$VERSION
 # Build html docs
 ( cd doc
@@ -131,6 +141,8 @@ mv Agent-GET_005fPASSPHRASE.html Agent-GET_PASSPHRASE.html
 mv option-_002d_002dhomedir.html option-homedir.html
 mv PKCS_002315-Card.html PKCS-15-Card.html
 mv option-_002d_002dexport_002downertrust.html option-export_ownertrust.html
+mv option-_002d_002dlog_002dfile.html option-logfile.html
+mv option-watchgnupg-_002d_002dtcp.html option-watchgnupg-tcp.html
 )
 # Move html doc to the proper location
 mv $PKG/usr/doc/gnupg2-$VERSION/faq.html $PKG/usr/doc/gnupg2-$VERSION/html/
diff --git a/source/n/gnutls/gnutls.SlackBuild b/source/n/gnutls/gnutls.SlackBuild
index 34343b734..c73dc5745 100755
--- a/source/n/gnutls/gnutls.SlackBuild
+++ b/source/n/gnutls/gnutls.SlackBuild
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-# Copyright 2007  Robby Workman  (http://rlworkman.net)
 # Copyright 2007, 2008, 2009, 2010  Patrick Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
@@ -23,7 +22,7 @@
 
 
 PKGNAM=gnutls
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo gnutls-*.tar.?z* | rev | cut -f 4- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -92,6 +91,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --infodir=/usr/info \
   --mandir=/usr/man \
   --enable-static=no \
+  --with-included-libtasn1 \
   --build=$ARCH-slackware-linux \
   --host=$ARCH-slackware-linux
 
@@ -101,10 +101,20 @@ make install DESTDIR=$PKG || exit 1
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $(find . -type l) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
 
 ( cd $PKG/usr/info
   rm -f dir
@@ -113,7 +123,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  ABOUT-NLS AUTHORS COPYING* INSTALL NEWS README* THANKS \
+  AUTHORS COPYING* INSTALL NEWS README* THANKS \
   $PKG/usr/doc/$PKGNAM-$VERSION
 
 # If there's a ChangeLog, installing at least part of the recent history
diff --git a/source/n/gpa/doinst.sh b/source/n/gpa/doinst.sh
index 1b722006a..0fab6897b 100644
--- a/source/n/gpa/doinst.sh
+++ b/source/n/gpa/doinst.sh
@@ -8,6 +8,3 @@ if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database &> /dev/null
 fi
 
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /gtk-update-icon-cache -f -t /usr/share/icons/hicolor &> /dev/null
-fi
diff --git a/source/n/gpa/gpa.SlackBuild b/source/n/gpa/gpa.SlackBuild
index 9c6c0e5f9..8bf3ac003 100755
--- a/source/n/gpa/gpa.SlackBuild
+++ b/source/n/gpa/gpa.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2006-2007  Robby Workman  (http://rlworkman.net) 
-# Copyright 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2007, 2008, 2009, 2010, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -76,6 +76,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
+  --mandir=/usr/man \
   --infodir=/usr/info \
   --build=$ARCH-slackware-linux \
   --host=$ARCH-slackware-linux
@@ -86,11 +87,25 @@ make install DESTDIR=$PKG
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
+# Compress and if needed symlink the man pages:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  ABOUT-NLS AUTHORS COPYING* INSTALL NEWS README* THANKS TODO VERSION \
+  AUTHORS COPYING* NEWS README* THANKS TODO VERSION \
   $PKG/usr/doc/$PKGNAM-$VERSION
-cat $CWD/$PKGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 # If there's a ChangeLog, installing at least part of the recent history
 # is useful, but don't let it get totally out of control:
diff --git a/source/n/gpgme/gpgme.SlackBuild b/source/n/gpgme/gpgme.SlackBuild
index 59b9a047e..b0ff93d68 100755
--- a/source/n/gpgme/gpgme.SlackBuild
+++ b/source/n/gpgme/gpgme.SlackBuild
@@ -22,7 +22,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PKGNAM=gpgme
-VERSION=1.3.0
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
diff --git a/source/n/htdig/htdig.SlackBuild b/source/n/htdig/htdig.SlackBuild
index b915314b2..ae92cfde1 100755
--- a/source/n/htdig/htdig.SlackBuild
+++ b/source/n/htdig/htdig.SlackBuild
@@ -24,7 +24,7 @@
 PKGNAM=htdig
 VERSION=${VERSION:-3.2.0b6}
 NUMJOBS=${NUMJOBS:-" -j7 "}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/n/htdig/slack-desc b/source/n/htdig/slack-desc
index 7436cf167..fea14f60c 100644
--- a/source/n/htdig/slack-desc
+++ b/source/n/htdig/slack-desc
@@ -9,7 +9,7 @@
 htdig: htdig (web indexing and searching system)
 htdig:
 htdig: The ht://Dig system is a complete web indexing and searching system
-htdig: for a small domain or intranet.  This system is not indended to
+htdig: for a small domain or intranet.  This system is not intended to
 htdig: replace the need for outside Internet search engines such as Google,
 htdig: but rather to cover the search needs for a single company, campus, or
 htdig: even a particular sub section of a web site.
diff --git a/source/n/httpd/README b/source/n/httpd/README
deleted file mode 100644
index 796bb29a9..000000000
--- a/source/n/httpd/README
+++ /dev/null
@@ -1,34 +0,0 @@
-WARNING
-
-This script builds a package that conflicts with apache1.  Before
-attempting to install this package, you should uninstall any of
-these packages that you find on your system:
-
-apache
-mod_ssl
-php
-
-Really though, the only points of overlap are in /usr/sbin, so if you
-leave your old packages in place apache2 will still work, but the
-apache1 httpd will have been overwritten (along with other files)
-
-Apache is the most popular web server in the known universe; over half
-the servers on the Internet are running Apache or one of its variants.
-
-By default, we build apache2 with the traditional "apache prefork" multi
-processing module (MPM).  This is somewhat safer for the use of mod_php,
-but can still carry some security risks (all your php scripts run as the
-user configured to run apache2).
-
-For enhanced multi-threaded performance, use "apache worker", but using
-mod_php with "worker" is considered dangerous.  PHP Core is multi-thread
-safe, but many PHP extensions are *NOT*.  To build apache2 with the
-worker MPM, change the option to:  --with-mpm=worker
-
-Please note that this script does not build apache2 with SuEXEC support.
-The Apache group feels SuEXEC should not be part of a default install.
-If you need this functionality, please read the following documentation
-and make the necessary changes to the ./configure options in the script.
-
-  http://httpd.apache.org/docs/2.0/suexec.html
-
diff --git a/source/n/httpd/config.layout.diff b/source/n/httpd/config.layout.diff
deleted file mode 100644
index c302515fe..000000000
--- a/source/n/httpd/config.layout.diff
+++ /dev/null
@@ -1,30 +0,0 @@
---- ./config.layout.orig	2004-11-21 12:50:36.000000000 -0600
-+++ ./config.layout	2007-05-23 13:35:20.000000000 -0500
-@@ -322,3 +322,27 @@
-     installbuilddir: ${prefix}/etc/apache2/build
-     errordir:      ${datadir}/error
- </Layout>
-+
-+# FHS layout
-+<Layout Slackware-FHS>
-+    prefix:          /usr
-+    exec_prefix:     ${prefix}
-+    bindir:          ${prefix}/bin
-+    sbindir:         ${prefix}/sbin
-+    libdir:          ${prefix}/lib/httpd
-+    libexecdir:      ${prefix}/lib/httpd/modules
-+    installbuilddir: ${prefix}/lib/httpd/build
-+    mandir:          ${prefix}/man
-+    sysconfdir:      /etc/httpd
-+    datadir:         /srv/httpd
-+    iconsdir:        ${datadir}/icons
-+    htdocsdir:       ${datadir}/htdocs
-+    manualdir:       ${htdocsdir}/manual
-+    cgidir:          ${datadir}/cgi-bin
-+    errordir:        ${datadir}/error
-+    includedir:      ${prefix}/include/httpd
-+    localstatedir:   /var
-+    runtimedir:      ${localstatedir}/run/httpd
-+    logfiledir:      ${localstatedir}/log/httpd
-+    proxycachedir:   ${localstatedir}/cache/httpd
-+</Layout>
diff --git a/source/n/httpd/doinst.sh b/source/n/httpd/doinst.sh
index 49e5400d8..da256515c 100644
--- a/source/n/httpd/doinst.sh
+++ b/source/n/httpd/doinst.sh
@@ -1,4 +1,29 @@
 #!/bin/sh
+
+config() {
+  NEW="$1"
+  OLD="`dirname $NEW`/`basename $NEW .new`"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname ${NEW})/$(basename ${NEW} .new)"
+  if [ -e ${OLD} ]; then
+    cp -a ${OLD} ${NEW}.incoming
+    cat ${NEW} > ${NEW}.incoming
+    mv ${NEW}.incoming ${NEW}
+  fi
+  # Don't use config() -- we always want to install this, changed or unchanged.
+  #config ${NEW}
+}
+
 if [ ! -e var/log/httpd ]; then
   mkdir -p var/log/httpd
   chmod 755 var/log/httpd
@@ -26,27 +51,19 @@ if [ -r var/www/htdocs/index.html ]; then
   fi
 fi
 
-config() {
-  NEW="$1"
-  OLD="`dirname $NEW`/`basename $NEW .new`"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-# Keep same perms on rc.httpd.new:
-if [ -e etc/rc.d/rc.httpd ]; then
-  cp -a etc/rc.d/rc.httpd etc/rc.d/rc.httpd.new.incoming
-  cat etc/rc.d/rc.httpd.new > etc/rc.d/rc.httpd.new.incoming
-  mv etc/rc.d/rc.httpd.new.incoming etc/rc.d/rc.httpd.new
-fi
-config etc/rc.d/rc.httpd.new
+# Keep same perms when installing rc.httpd.new:
+preserve_perms etc/rc.d/rc.httpd.new
+# Always install the new rc.httpd:
+mv etc/rc.d/rc.httpd.new etc/rc.d/rc.httpd
+
+# Handle config files.  Unless this is a fresh installation, the
+# admin will have to move the .new files into place to complete
+# the package installation, as we don't want to clobber files that
+# may contain local customizations.
 config etc/httpd/httpd.conf.new
 config etc/logrotate.d/httpd.new
 for conf_file in etc/httpd/extra/*.new; do
   config $conf_file
 done
 config var/www/htdocs/index.html.new
+
diff --git a/source/n/httpd/httpd.SlackBuild b/source/n/httpd/httpd.SlackBuild
index a97ccf362..1d043f743 100755
--- a/source/n/httpd/httpd.SlackBuild
+++ b/source/n/httpd/httpd.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@
 
 PKGNAM=httpd
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -73,29 +73,49 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# "prefork" is the default, safe, mpm type.  If you *are not* using PHP, and you
-# like to live on the bleeding edge, you may wish to change the --with-mpm option
-# to "worker", which is the new way of doing things, but is multithreaded and
-# many scripts (especially PHP ones) are not multithread safe.
+# A brief note about mpms:
 #
-# I'd leave this option the way is it on any production box that's keeping up
-# with HTTP requests.  No reason to chance it, IMHO.
+# "prefork" is the legacy forked mpm, used with mod_php. Starting with httpd 
+# 2.4.0, new threaded mpms are available, and previously experimental mpms are
+# now stable
+#
+# Non-threaded mpms are no longer required, since php applications can now be
+# deployed with the help of mod_fcgid, essentially a set of fixed dedicated cgi
+# processes spawned for the whole purpose of executing dynamic applications
+#
+# Threaded mpms, by their very nature, are far more scalable than the
+# traditional preforking solution. They consume less memory for the same
+# workload, when serving the same amount of clients. httpd 2.4 ships with two
+# options, "event" and "worker", where the former is the default mpm used if
+# none is specified at the ./configure line
+#
+# Lastly, the "prefork" mpm can be used with mod_php as of version 5.4.0,
+# which yields a much improved stability, even with most mod_php extensions
+# loaded.
+#
+# The running mpm can be changed by simply loading the module. Here is a sample:
+# LoadModule mpm_event_module lib(64)/httpd/modules/mod_mpm_event.so
+#
+# When upgrading from 2.2, please make sure to stop the deamon first, or your
+# new instance may segfault.
 
-zcat $CWD/config.layout.diff.gz | sed -e "s#lib/httpd#lib${LIBDIRSUFFIX}/httpd#" | patch --verbose -p1 || exit 1
+# Fix config.layout to use lib${LIBDIRSUFFIX}:
+sed -i -e "s#lib/httpd#lib${LIBDIRSUFFIX}/httpd#" config.layout
 
-# Patch to fix aliasing issue exposed by gcc-4.5.1:
-zcat $CWD/httpd.brigade_move.__noinline__.gcc451.diff.gz | patch --verbose -p1 || exit 1
+# If /var/run becomes a tmpfs or a link to /run, subdirectories could be a problem.
+# Just use /var/run rather than /var/run/httpd.
+sed -i -e "s#/run/httpd#/run#" config.layout
 
 # Configure:
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --enable-layout=Slackware-FHS \
-  --with-mpm=prefork \
   --with-apr=/usr \
   --with-apr-util=/usr \
   --enable-mods-shared=all \
   --enable-so \
+  --enable-mpms-shared=all \
   --enable-pie \
   --enable-cgi \
   --with-pcre \
@@ -105,12 +125,10 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-proxy \
   --enable-proxy-http \
   --enable-proxy-ftp \
-  --enable-proxy-balancer \
   --enable-cache \
   --enable-mem-cache \
   --enable-file-cache \
   --enable-disk-cache \
-  --disable-speling \
   --enable-dav \
   --enable-ldap \
   --enable-authnz-ldap \
@@ -126,8 +144,12 @@ rmdir $PKG/usr/bin
 
 # Tweak default apache configuration
 ( cd $PKG
-  zcat $CWD/httpd.nossldefault.diff.gz | sed -e "s#lib/httpd#lib${LIBDIRSUFFIX}/httpd#" | patch -p1 --verbose || exit 1
   zcat $CWD/httpd.runasapache.diff.gz | patch -p1 --verbose || exit 1
+  # mod_proxy_balancer should be commented out, as otherwise httpd
+  # will not start without additional configuration:
+  sed -i "s/^LoadModule proxy_balancer_module/#LoadModule proxy_balancer_module/g" $PKG/etc/httpd/httpd.conf
+  # This module issues a warning unless some non-default modules are loaded:
+  sed -i "s/^LoadModule lbmethod_heartbeat_module/#LoadModule lbmethod_heartbeat_module/g" $PKG/etc/httpd/httpd.conf
   rm -f $PKG/etc/httpd/httpd.conf~ $PKG/etc/httpd/httpd.conf.orig
 ) || exit 1
 # Change config files to .new:
@@ -144,7 +166,7 @@ cat << EOF >> $PKG/etc/httpd/httpd.conf.new
 #
 #Include /etc/httpd/mod_php.conf
 
-# Uncomment the following lines to enable svn support:
+# Uncomment the following lines (and mod_dav above) to enable svn support:
 #
 #LoadModule dav_svn_module lib${LIBDIRSUFFIX}/httpd/modules/mod_dav_svn.so
 #LoadModule authz_svn_module lib${LIBDIRSUFFIX}/httpd/modules/mod_authz_svn.so
diff --git a/source/n/httpd/httpd.brigade_move.__noinline__.gcc451.diff b/source/n/httpd/httpd.brigade_move.__noinline__.gcc451.diff
deleted file mode 100644
index e8915ae43..000000000
--- a/source/n/httpd/httpd.brigade_move.__noinline__.gcc451.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./server/core_filters.c.orig	2010-02-26 03:32:15.000000000 -0600
-+++ ./server/core_filters.c	2011-02-12 13:23:22.000000000 -0600
-@@ -83,6 +83,7 @@
-  *
-  * XXXX: Should this function be added to APR-Util?
-  */
-+__attribute__((__noinline__))
- static void brigade_move(apr_bucket_brigade *b, apr_bucket_brigade *a,
-                          apr_bucket *e)
- {
diff --git a/source/n/httpd/httpd.nossldefault.diff b/source/n/httpd/httpd.nossldefault.diff
deleted file mode 100644
index bcf891f85..000000000
--- a/source/n/httpd/httpd.nossldefault.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./etc/httpd/httpd.conf.orig	2007-05-17 23:40:15.000000000 -0500
-+++ ./etc/httpd/httpd.conf	2007-05-18 15:55:38.000000000 -0500
-@@ -88,7 +88,7 @@
- LoadModule proxy_http_module lib/httpd/modules/mod_proxy_http.so
- LoadModule proxy_ajp_module lib/httpd/modules/mod_proxy_ajp.so
- LoadModule proxy_balancer_module lib/httpd/modules/mod_proxy_balancer.so
--LoadModule ssl_module lib/httpd/modules/mod_ssl.so
-+#LoadModule ssl_module lib/httpd/modules/mod_ssl.so
- LoadModule mime_module lib/httpd/modules/mod_mime.so
- LoadModule dav_module lib/httpd/modules/mod_dav.so
- LoadModule status_module lib/httpd/modules/mod_status.so
diff --git a/source/n/httpd/httpd.url b/source/n/httpd/httpd.url
index 8b8a17686..3fabb916f 100644
--- a/source/n/httpd/httpd.url
+++ b/source/n/httpd/httpd.url
@@ -1,2 +1,2 @@
-http://www.apache.org/dist/httpd/httpd-2.2.17.tar.bz2
-http://www.apache.org/dist/httpd/httpd-2.2.17.tar.bz2.asc
+http://www.apache.org/dist/httpd/httpd-2.4.3.tar.bz2
+http://www.apache.org/dist/httpd/httpd-2.4.3.tar.bz2.asc
diff --git a/source/n/httpd/rc.httpd b/source/n/httpd/rc.httpd
index 064f6ea44..81189098f 100644
--- a/source/n/httpd/rc.httpd
+++ b/source/n/httpd/rc.httpd
@@ -17,7 +17,16 @@ case "$1" in
   'stop')
     /usr/sbin/apachectl -k stop
     killall httpd
-    rm -f /var/run/httpd/*.pid
+    # Remove both old and new .pid locations:
+    rm -f /var/run/httpd.pid /var/run/httpd/httpd.pid
+  ;;
+  'force-restart')
+    # Because sometimes restarting through apachectl just doesn't do the trick...
+    /usr/sbin/apachectl -k stop
+    killall httpd
+    # Remove both old and new .pid locations:
+    rm -f /var/run/httpd.pid /var/run/httpd/httpd.pid
+    /usr/sbin/apachectl -k start
   ;;
   'restart')
     /usr/sbin/apachectl -k restart
diff --git a/source/n/iftop/iftop.SlackBuild b/source/n/iftop/iftop.SlackBuild
new file mode 100755
index 000000000..0361a4756
--- /dev/null
+++ b/source/n/iftop/iftop.SlackBuild
@@ -0,0 +1,126 @@
+#!/bin/sh
+
+# Copyright 2012  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+PKGNAM=iftop
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-${PKGNAM}
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+cd $TMP
+rm -rf ${PKGNAM}-${VERSION}
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
+cd ${PKGNAM}-$VERSION
+
+# Make sure ownerships and permissions are sane:
+chown -R root:root .
+find . \
+  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+  -exec chmod 755 {} \; -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Strip binaries:
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+# Compress and if needed symlink the man pages:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  COPYING* NEWS README* TODO \
+  $PKG/usr/doc/${PKGNAM}-$VERSION
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/n/iftop/slack-desc b/source/n/iftop/slack-desc
new file mode 100644
index 000000000..f7bc5c480
--- /dev/null
+++ b/source/n/iftop/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+     |-----handy-ruler------------------------------------------------------|
+iftop: iftop (Display bandwidth usage on an interface)
+iftop:
+iftop: iftop does for network usage what top(1) does for CPU usage.
+iftop: It listens to network traffic on a named interface and displays a
+iftop: table of current bandwidth usage by pairs of hosts.  Handy for
+iftop: answering the question "why is our link so slow?".
+iftop:
+iftop:
+iftop:
+iftop: Homepage:  http://www.ex-parrot.com/~pdw/iftop/
+iftop:
diff --git a/source/n/iproute2/doinst.sh b/source/n/iproute2/doinst.sh
index 01b82a28e..a283373d2 100644
--- a/source/n/iproute2/doinst.sh
+++ b/source/n/iproute2/doinst.sh
@@ -10,6 +10,7 @@ config() {
   # Otherwise, we leave the .new copy for the admin to consider...
 }
 config etc/iproute2/ematch_map.new
+config etc/iproute2/group.new
 config etc/iproute2/rt_dsfield.new
 config etc/iproute2/rt_protos.new
 config etc/iproute2/rt_realms.new
diff --git a/source/n/iproute2/fixup-for-x86_64.diff b/source/n/iproute2/fixup-for-x86_64.diff
new file mode 100644
index 000000000..3f5e1a239
--- /dev/null
+++ b/source/n/iproute2/fixup-for-x86_64.diff
@@ -0,0 +1,12 @@
+diff -Nur iproute2-3.4.0.orig/configure iproute2-3.4.0/configure
+--- iproute2-3.4.0.orig/configure	2012-05-21 16:12:19.000000000 -0500
++++ iproute2-3.4.0/configure	2012-05-23 19:15:58.548350916 -0500
+@@ -149,7 +149,7 @@
+ check_ipt_lib_dir()
+ {
+ 	IPT_LIB_DIR=""
+-	for dir in /lib /usr/lib /usr/local/lib
++	for dir in /lib64 /usr/lib64 /usr/local/lib64
+ 	do
+ 		for file in $dir/{xtables,iptables}/lib*t_*so ; do
+ 			if [ -f $file ]; then
diff --git a/source/n/iproute2/iproute2.SlackBuild b/source/n/iproute2/iproute2.SlackBuild
index 929aa7b91..9854a2d83 100755
--- a/source/n/iproute2/iproute2.SlackBuild
+++ b/source/n/iproute2/iproute2.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2011  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2005-2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,10 +20,8 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Build this against 2.6.x kernel source and headers...
-
-VERSION=2.6.37
-BUILD=${BUILD:-1}
+VERSION=3.4.0
+BUILD=${BUILD:-2}
 
 #NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -59,7 +57,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf iproute2-$VERSION
-tar xvf $CWD/iproute2-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/iproute2-$VERSION.tar.xz || exit 1
 cd iproute2-$VERSION
 
 chown -R root:root .
@@ -69,24 +67,31 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-# Fix up path to bdb and iptables libs
-zcat $CWD/iproute2.fixup_dbpath_and_iptablespath.diff.gz | sed \
-  -e "s,@LIBDIR@,/usr/lib${LIBDIRSUFFIX},g" \
-  -e "s,@VERSION@,$VERSION,g" | patch -p1 || exit 1
-
-# Use our custom SLKCFLAGS
-sed -i "s/-O2 /-O2 -fPIC /" Makefile
+# Fix up path iptables libs
+zcat $CWD/fixup-for-x86_64.diff.gz | patch -p1 || exit 1
 
 ./configure  # This is okay, really :-)
-make $NUMJOBS || exit 1
+
+make \
+  CCOPTS="$SLKCFLAGS" \
+  LIBDIR=/usr/lib${LIBDIRSUFFIX} \
+  CONFDIR=/etc/iproute2 \
+  DOCDIR=/usr/doc/iproute2-$VERSION \
+  MANDIR=/usr/man \
+  DBM_INCLUDE=/usr/include/db44 \
+  $NUMJOBS || exit 1
+
+make install \
+  LIBDIR=/usr/lib${LIBDIRSUFFIX} \
+  CONFDIR=/etc/iproute2 \
+  DOCDIR=/usr/doc/iproute2-$VERSION \
+  MANDIR=/usr/man \
+  DBM_INCLUDE=/usr/include/db44 \
+  DESTDIR=$PKG || exit 1
 
 mkdir -p $PKG/usr
 make install LIBDIR=/usr/lib${LIBDIRSUFFIX} DESTDIR=$PKG/usr/ || exit 1
 
-# I can't seem to make this go to the right place on x86_64, but all the
-# relevant stuff looks correct :/
-[ "$ARCH" = "x86_64" ] && mv $PKG/usr/lib $PKG/usr/lib${LIBDIRSUFFIX} 
-
 # This stuff has always been installed under /sbin rather than
 # /usr/sbin, as the latter could possibly be network-mounted, and
 # these utilities may be needed to set up that network, so move
@@ -100,7 +105,6 @@ mv $PKG/usr/sbin/* $PKG/sbin
   done
 )
 
-mv $PKG/usr/etc $PKG
 # Don't clobber existing config files
 for file in $PKG/etc/iproute2/* ; do
   mv $file ${file}.new
@@ -109,8 +113,7 @@ done
 # Remove junk:
 [ -d $PKG/usr/usr ] && rm -r $PKG/usr/usr
 [ -d $PKG/usr/var ] && rm -r $PKG/usr/var
-
-mkdir -p $PKG/var/lib/arpd
+[ -d $PKG/usr/etc ] && rm -r $PKG/usr/etc
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
diff --git a/source/n/iproute2/iproute2.fixup_dbpath_and_iptablespath.diff b/source/n/iproute2/iproute2.fixup_dbpath_and_iptablespath.diff
deleted file mode 100644
index fe5b1abc4..000000000
--- a/source/n/iproute2/iproute2.fixup_dbpath_and_iptablespath.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -Nur iproute2-2.6.33.orig//Makefile iproute2-2.6.33/Makefile
---- iproute2-2.6.33.orig//Makefile	2010-02-24 21:56:50.000000000 -0600
-+++ iproute2-2.6.33/Makefile	2010-02-24 23:00:52.614825494 -0600
-@@ -1,14 +1,14 @@
- DESTDIR=/usr/
- ROOTDIR=$(DESTDIR)
--LIBDIR=/usr/lib/
-+LIBDIR=@LIBDIR@
- SBINDIR=/sbin
- CONFDIR=/etc/iproute2
--DOCDIR=/share/doc/iproute2
--MANDIR=/share/man
-+DOCDIR=/doc/iproute2-@VERSION@
-+MANDIR=/man
- ARPDDIR=/var/lib/arpd
- 
- # Path to db_185.h include
--DBM_INCLUDE:=$(ROOTDIR)/usr/include
-+DBM_INCLUDE:=$(ROOTDIR)/usr/include/db44
- 
- SHARED_LIBS = y
- 
-diff -Nur iproute2-2.6.33.orig//include/iptables.h iproute2-2.6.33/include/iptables.h
---- iproute2-2.6.33.orig//include/iptables.h	2010-02-24 21:56:50.000000000 -0600
-+++ iproute2-2.6.33/include/iptables.h	2010-02-24 23:02:21.891841749 -0600
-@@ -5,7 +5,7 @@
- #include "libiptc/libiptc.h"
- 
- #ifndef IPT_LIB_DIR
--#define IPT_LIB_DIR "/usr/local/lib/iptables"
-+#define IPT_LIB_DIR "@LIBDIR@"
- #endif
- 
- #ifndef IPPROTO_SCTP
diff --git a/source/n/iptables/iptables.SlackBuild b/source/n/iptables/iptables.SlackBuild
index 0d191b3c7..26f3d922e 100755
--- a/source/n/iptables/iptables.SlackBuild
+++ b/source/n/iptables/iptables.SlackBuild
@@ -83,14 +83,34 @@ make install DESTDIR=$PKG || exit 1
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-debug 2> /dev/null
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
 
 mkdir -p $PKG/usr/doc/iptables-$VERSION
 cp -a \
   COPYING* INCOMPATIBILITIES INSTALL \
   $PKG/usr/doc/iptables-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/source/n/iputils/iputils.SlackBuild b/source/n/iputils/iputils.SlackBuild
index bc711fb02..2e087afc1 100755
--- a/source/n/iputils/iputils.SlackBuild
+++ b/source/n/iputils/iputils.SlackBuild
@@ -21,7 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=s20101006
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/n/irssi/irssi.SlackBuild b/source/n/irssi/irssi.SlackBuild
index eca06ab34..454f25833 100755
--- a/source/n/irssi/irssi.SlackBuild
+++ b/source/n/irssi/irssi.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,7 +27,7 @@ PKG=$TMP/package-irssi
 
 VERSION=0.8.15
 DIRCD=0.8.15
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-6}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/n/iw/iw.SlackBuild b/source/n/iw/iw.SlackBuild
index bd78d0e0c..10211173c 100755
--- a/source/n/iw/iw.SlackBuild
+++ b/source/n/iw/iw.SlackBuild
@@ -36,6 +36,8 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
@@ -63,11 +65,14 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-make CFLAGS="$SLKCFLAGS"
+make clean
+# Providing external CFLAGS breaks building if libnl > 1 is installed
+#make CFLAGS="$SLKCFLAGS" || exit 1
+make $NUMJOBS || make || exit 1
 make install \
   BINDIR=/usr/sbin \
   MANDIR=/usr/man \
-  DESTDIR=$PKG
+  DESTDIR=$PKG || exit 1
 
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
@@ -81,6 +86,14 @@ cp -a \
   COPYING* README* \
     $PKG/usr/doc/$PKGNAM-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/source/n/iw/iw.info b/source/n/iw/iw.info
index 11c147463..325189b81 100644
--- a/source/n/iw/iw.info
+++ b/source/n/iw/iw.info
@@ -1,2 +1,2 @@
 HOMEPAGE="http://wireless.kernel.org/en/users/Documentation/iw"
-DOWNLOAD="http://wireless.kernel.org/download/iw/iw-0.9.11.tar.bz2"
+DOWNLOAD="http://wireless.kernel.org/download/iw/iw-3.0.tar.bz2"
diff --git a/source/n/iwlwifi-100-ucode/iwlwifi-100-ucode.SlackBuild b/source/n/iwlwifi-100-ucode/iwlwifi-100-ucode.SlackBuild
deleted file mode 100755
index 6ef720e5f..000000000
--- a/source/n/iwlwifi-100-ucode/iwlwifi-100-ucode.SlackBuild
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-
-# Copyright 2006, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PKGNAM=iwlwifi-100-ucode
-#VERSION will be determined automatically, and the package will use the last version found.
-ARCH=${ARCH:-fw}
-BUILD=${BUILD:-1}
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-${PKGNAM}
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
-cd $TMP
-for file in $CWD/${PKGNAM}-*.tar.?z* ; do
-  VERSION=$(echo $file | rev | cut -f 3- -d . | cut -f 1 -d / | rev | cut -f 4- -d - )
-  rm -rf ${PKGNAM}-${VERSION}
-  tar xvf $file || exit 1
-  cd ${PKGNAM}-$VERSION || exit 1
-  # Make sure ownerships and permissions are sane:
-  chown -R root:root .
-  chmod 644 *
-  # install:
-  mkdir -p $PKG/lib/firmware
-  cp -a iwlwifi-*.ucode $PKG/lib/firmware
-  # Add a documentation directory:
-  mkdir -p $PKG/usr/doc/${PKGNAM}-${VERSION}
-  cp -a LICENSE* README* $PKG/usr/doc/${PKGNAM}-${VERSION}
-done
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/n/iwlwifi-100-ucode/slack-desc b/source/n/iwlwifi-100-ucode/slack-desc
deleted file mode 100644
index 3c7b36c0a..000000000
--- a/source/n/iwlwifi-100-ucode/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-                 |-----handy-ruler------------------------------------------------------|
-iwlwifi-100-ucode: iwlwifi-1000-ucode (Intel Centrino N 100 wireless microcode)
-iwlwifi-100-ucode:
-iwlwifi-100-ucode: The microcode provided in this package is required for the Intel
-iwlwifi-100-ucode: Wireless WiFi Link AGN driver for Linux (iwlagn) to operate.
-iwlwifi-100-ucode:
-iwlwifi-100-ucode: Visit Intel's Linux wireless website at this address:
-iwlwifi-100-ucode:   http://intellinuxwireless.org/
-iwlwifi-100-ucode:
-iwlwifi-100-ucode:
-iwlwifi-100-ucode:
-iwlwifi-100-ucode:
diff --git a/source/n/iwlwifi-1000-ucode/iwlwifi-1000-ucode.SlackBuild b/source/n/iwlwifi-1000-ucode/iwlwifi-1000-ucode.SlackBuild
deleted file mode 100755
index 80db4c100..000000000
--- a/source/n/iwlwifi-1000-ucode/iwlwifi-1000-ucode.SlackBuild
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-
-# Copyright 2006, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PKGNAM=iwlwifi-1000-ucode
-#VERSION will be determined automatically, and the package will use the last version found.
-ARCH=${ARCH:-fw}
-BUILD=${BUILD:-1}
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-${PKGNAM}
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
-cd $TMP
-for file in $CWD/${PKGNAM}-*.tar.?z* ; do
-  VERSION=$(echo $file | rev | cut -f 3- -d . | cut -f 1 -d / | rev | cut -f 4- -d - )
-  rm -rf ${PKGNAM}-${VERSION}
-  tar xvf $file || exit 1
-  cd ${PKGNAM}-$VERSION || exit 1
-  # Make sure ownerships and permissions are sane:
-  chown -R root:root .
-  chmod 644 *
-  # install:
-  mkdir -p $PKG/lib/firmware
-  cp -a iwlwifi-*.ucode $PKG/lib/firmware
-  # Add a documentation directory:
-  mkdir -p $PKG/usr/doc/${PKGNAM}-${VERSION}
-  cp -a LICENSE* README* $PKG/usr/doc/${PKGNAM}-${VERSION}
-done
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/n/iwlwifi-1000-ucode/slack-desc b/source/n/iwlwifi-1000-ucode/slack-desc
deleted file mode 100644
index e0c939e8c..000000000
--- a/source/n/iwlwifi-1000-ucode/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-                  |-----handy-ruler------------------------------------------------------|
-iwlwifi-1000-ucode: iwlwifi-1000-ucode (Intel 1000 wireless microcode)
-iwlwifi-1000-ucode:
-iwlwifi-1000-ucode: The microcode provided in this package is required for the Intel
-iwlwifi-1000-ucode: Wireless WiFi Link AGN driver for Linux (iwlagn) to operate.
-iwlwifi-1000-ucode:
-iwlwifi-1000-ucode: Visit Intel's Linux wireless website at this address:
-iwlwifi-1000-ucode:   http://intellinuxwireless.org/
-iwlwifi-1000-ucode:
-iwlwifi-1000-ucode:
-iwlwifi-1000-ucode:
-iwlwifi-1000-ucode:
diff --git a/source/n/iwlwifi-3945-ucode/iwlwifi-3945-ucode.SlackBuild b/source/n/iwlwifi-3945-ucode/iwlwifi-3945-ucode.SlackBuild
deleted file mode 100755
index 87da1472c..000000000
--- a/source/n/iwlwifi-3945-ucode/iwlwifi-3945-ucode.SlackBuild
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-
-# Copyright 2006, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PKGNAM=iwlwifi-3945-ucode
-#VERSION will be determined automatically, and the package will use the last version found.
-ARCH=${ARCH:-fw}
-BUILD=${BUILD:-1}
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-${PKGNAM}
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
-cd $TMP
-for file in $CWD/${PKGNAM}-*.tar.?z* ; do
-  VERSION=$(echo $file | rev | cut -f 3- -d . | cut -f 1 -d / | rev | cut -f 4- -d - )
-  rm -rf ${PKGNAM}-${VERSION}
-  tar xvf $file || exit 1
-  cd ${PKGNAM}-$VERSION || exit 1
-  # Make sure ownerships and permissions are sane:
-  chown -R root:root .
-  chmod 644 *
-  # install:
-  mkdir -p $PKG/lib/firmware
-  cp -a iwlwifi-*.ucode $PKG/lib/firmware
-  # Add a documentation directory:
-  mkdir -p $PKG/usr/doc/${PKGNAM}-${VERSION}
-  cp -a LICENSE* README* $PKG/usr/doc/${PKGNAM}-${VERSION}
-done
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/n/iwlwifi-3945-ucode/slack-desc b/source/n/iwlwifi-3945-ucode/slack-desc
deleted file mode 100644
index 1b1b061bd..000000000
--- a/source/n/iwlwifi-3945-ucode/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-                  |-----handy-ruler------------------------------------------------------|
-iwlwifi-3945-ucode: iwlwifi-3945-ucode (Intel 3945 wireless microcode)
-iwlwifi-3945-ucode:
-iwlwifi-3945-ucode: The microcode provided in this package is required for the Intel
-iwlwifi-3945-ucode: PRO/Wireless 3945ABG/BG Network Connection Adapter driver for Linux
-iwlwifi-3945-ucode: (iwlwifi-3945) to operate.
-iwlwifi-3945-ucode:
-iwlwifi-3945-ucode: Visit Intel's Linux wireless website at this address:
-iwlwifi-3945-ucode:   http://intellinuxwireless.org/
-iwlwifi-3945-ucode:
-iwlwifi-3945-ucode:
-iwlwifi-3945-ucode:
diff --git a/source/n/iwlwifi-4965-ucode/iwlwifi-4965-ucode.SlackBuild b/source/n/iwlwifi-4965-ucode/iwlwifi-4965-ucode.SlackBuild
deleted file mode 100755
index 1f72acf22..000000000
--- a/source/n/iwlwifi-4965-ucode/iwlwifi-4965-ucode.SlackBuild
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-
-# Copyright 2006, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PKGNAM=iwlwifi-4965-ucode
-#VERSION will be determined automatically, and the package will use the last version found.
-ARCH=${ARCH:-fw}
-BUILD=${BUILD:-1}
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-${PKGNAM}
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
-cd $TMP
-for file in $CWD/${PKGNAM}-*.tar.?z* ; do
-  VERSION=$(echo $file | rev | cut -f 3- -d . | cut -f 1 -d / | rev | cut -f 4- -d - )
-  rm -rf ${PKGNAM}-${VERSION}
-  tar xvf $file || exit 1
-  cd ${PKGNAM}-$VERSION || exit 1
-  # Make sure ownerships and permissions are sane:
-  chown -R root:root .
-  chmod 644 *
-  # install:
-  mkdir -p $PKG/lib/firmware
-  cp -a iwlwifi-*.ucode $PKG/lib/firmware
-  # Add a documentation directory:
-  mkdir -p $PKG/usr/doc/${PKGNAM}-${VERSION}
-  cp -a LICENSE* README* $PKG/usr/doc/${PKGNAM}-${VERSION}
-done
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/n/iwlwifi-4965-ucode/slack-desc b/source/n/iwlwifi-4965-ucode/slack-desc
deleted file mode 100644
index 6b84a7d68..000000000
--- a/source/n/iwlwifi-4965-ucode/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-                  |-----handy-ruler------------------------------------------------------|
-iwlwifi-4965-ucode: iwlwifi-4965-ucode (Intel 4965 wireless microcode)
-iwlwifi-4965-ucode:
-iwlwifi-4965-ucode: The microcode provided in this package is required for the Intel
-iwlwifi-4965-ucode: PRO/Wireless 4965ABG/BG Network Connection Adapter driver for Linux
-iwlwifi-4965-ucode: (iwlwifi-4965) to operate.
-iwlwifi-4965-ucode:
-iwlwifi-4965-ucode: Visit Intel's Linux wireless website at this address:
-iwlwifi-4965-ucode:   http://intellinuxwireless.org/
-iwlwifi-4965-ucode:
-iwlwifi-4965-ucode:
-iwlwifi-4965-ucode:
diff --git a/source/n/iwlwifi-5000-ucode/iwlwifi-5000-ucode.SlackBuild b/source/n/iwlwifi-5000-ucode/iwlwifi-5000-ucode.SlackBuild
deleted file mode 100755
index fcd0a5716..000000000
--- a/source/n/iwlwifi-5000-ucode/iwlwifi-5000-ucode.SlackBuild
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-
-# Copyright 2006, 2008  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PKGNAM=iwlwifi-5000-ucode
-#VERSION will be determined automatically, and the package will use the last version found.
-ARCH=${ARCH:-fw}
-BUILD=${BUILD:-1}
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-${PKGNAM}
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
-cd $TMP
-for file in $CWD/${PKGNAM}-*.tar.?z* ; do
-  VERSION=$(echo $file | rev | cut -f 3- -d . | cut -f 1 -d / | rev | cut -f 4- -d - )
-  rm -rf ${PKGNAM}-${VERSION}
-  tar xvf $file || exit 1
-  cd ${PKGNAM}-$VERSION || exit 1
-  # Make sure ownerships and permissions are sane:
-  chown -R root:root .
-  chmod 644 *
-  # install:
-  mkdir -p $PKG/lib/firmware
-  cp -a iwlwifi-*.ucode $PKG/lib/firmware
-  # Add a documentation directory:
-  mkdir -p $PKG/usr/doc/${PKGNAM}-${VERSION}
-  cp -a LICENSE* README* $PKG/usr/doc/${PKGNAM}-${VERSION}
-done
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/n/iwlwifi-5000-ucode/slack-desc b/source/n/iwlwifi-5000-ucode/slack-desc
deleted file mode 100644
index 2b817fcc8..000000000
--- a/source/n/iwlwifi-5000-ucode/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-                  |-----handy-ruler------------------------------------------------------|
-iwlwifi-5000-ucode: iwlwifi-5000-ucode (Intel 5000 wireless microcode)
-iwlwifi-5000-ucode:
-iwlwifi-5000-ucode: The microcode provided in this package is required for the Intel
-iwlwifi-5000-ucode: PRO/Wireless 5000ABG/BG Network Connection Adapter driver for Linux
-iwlwifi-5000-ucode: (iwlagn) to operate.
-iwlwifi-5000-ucode:
-iwlwifi-5000-ucode: Visit Intel's Linux wireless website at this address:
-iwlwifi-5000-ucode:   http://intellinuxwireless.org/
-iwlwifi-5000-ucode:
-iwlwifi-5000-ucode:
-iwlwifi-5000-ucode:
diff --git a/source/n/iwlwifi-5150-ucode/iwlwifi-5150-ucode.SlackBuild b/source/n/iwlwifi-5150-ucode/iwlwifi-5150-ucode.SlackBuild
deleted file mode 100755
index 5c74817a3..000000000
--- a/source/n/iwlwifi-5150-ucode/iwlwifi-5150-ucode.SlackBuild
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-
-# Copyright 2006, 2008  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PKGNAM=iwlwifi-5150-ucode
-#VERSION will be determined automatically, and the package will use the last version found.
-ARCH=${ARCH:-fw}
-BUILD=${BUILD:-1}
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-${PKGNAM}
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
-cd $TMP
-for file in $CWD/${PKGNAM}-*.tar.?z* ; do
-  VERSION=$(echo $file | rev | cut -f 3- -d . | cut -f 1 -d / | rev | cut -f 4- -d - )
-  rm -rf ${PKGNAM}-${VERSION}
-  tar xvf $file || exit 1
-  cd ${PKGNAM}-$VERSION || exit 1
-  # Make sure ownerships and permissions are sane:
-  chown -R root:root .
-  chmod 644 *
-  # install:
-  mkdir -p $PKG/lib/firmware
-  cp -a iwlwifi-*.ucode $PKG/lib/firmware
-  # Add a documentation directory:
-  mkdir -p $PKG/usr/doc/${PKGNAM}-${VERSION}
-  cp -a LICENSE* README* $PKG/usr/doc/${PKGNAM}-${VERSION}
-done
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/n/iwlwifi-5150-ucode/slack-desc b/source/n/iwlwifi-5150-ucode/slack-desc
deleted file mode 100644
index 31c2222e7..000000000
--- a/source/n/iwlwifi-5150-ucode/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-                  |-----handy-ruler------------------------------------------------------|
-iwlwifi-5150-ucode: iwlwifi-5150-ucode (Intel 5150 wireless microcode)
-iwlwifi-5150-ucode:
-iwlwifi-5150-ucode: The microcode provided in this package is required for the Intel
-iwlwifi-5150-ucode: PRO/Wireless 5150AGN Network Connection Adapter driver for Linux
-iwlwifi-5150-ucode: (iwlagn) to operate.
-iwlwifi-5150-ucode:
-iwlwifi-5150-ucode: Visit Intel's Linux wireless website at this address:
-iwlwifi-5150-ucode:   http://intellinuxwireless.org/
-iwlwifi-5150-ucode:
-iwlwifi-5150-ucode:
-iwlwifi-5150-ucode:
diff --git a/source/n/iwlwifi-6000-ucode/iwlwifi-6000-ucode.SlackBuild b/source/n/iwlwifi-6000-ucode/iwlwifi-6000-ucode.SlackBuild
deleted file mode 100755
index 251f7e619..000000000
--- a/source/n/iwlwifi-6000-ucode/iwlwifi-6000-ucode.SlackBuild
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-
-# Copyright 2006, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PKGNAM=iwlwifi-6000-ucode
-#VERSION will be determined automatically, and the package will use the last version found.
-ARCH=${ARCH:-fw}
-BUILD=${BUILD:-1}
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-${PKGNAM}
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
-cd $TMP
-for file in $CWD/${PKGNAM}-*.tar.?z* ; do
-  VERSION=$(echo $file | rev | cut -f 3- -d . | cut -f 1 -d / | rev | cut -f 4- -d - )
-  rm -rf ${PKGNAM}-${VERSION}
-  tar xvf $file || exit 1
-  cd ${PKGNAM}-$VERSION || exit 1
-  # Make sure ownerships and permissions are sane:
-  chown -R root:root .
-  chmod 644 *
-  # install:
-  mkdir -p $PKG/lib/firmware
-  cp -a iwlwifi-*.ucode $PKG/lib/firmware
-  # Add a documentation directory:
-  mkdir -p $PKG/usr/doc/${PKGNAM}-${VERSION}
-  cp -a LICENSE* README* $PKG/usr/doc/${PKGNAM}-${VERSION}
-done
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/n/iwlwifi-6000-ucode/slack-desc b/source/n/iwlwifi-6000-ucode/slack-desc
deleted file mode 100644
index 50d56c38f..000000000
--- a/source/n/iwlwifi-6000-ucode/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-                  |-----handy-ruler------------------------------------------------------|
-iwlwifi-6000-ucode: iwlwifi-6000-ucode (Intel 6000 wireless microcode)
-iwlwifi-6000-ucode:
-iwlwifi-6000-ucode: The microcode provided in this package is required for the Intel
-iwlwifi-6000-ucode: Wireless WiFi Link AGN driver for Linux (iwlagn) to operate.
-iwlwifi-6000-ucode:
-iwlwifi-6000-ucode: Visit Intel's Linux wireless website at this address:
-iwlwifi-6000-ucode:   http://intellinuxwireless.org/
-iwlwifi-6000-ucode:
-iwlwifi-6000-ucode:
-iwlwifi-6000-ucode:
-iwlwifi-6000-ucode:
diff --git a/source/n/iwlwifi-6xxx-ucode/iwlwifi-6xxx-ucode.SlackBuild b/source/n/iwlwifi-6xxx-ucode/iwlwifi-6xxx-ucode.SlackBuild
deleted file mode 100755
index 0002f09d2..000000000
--- a/source/n/iwlwifi-6xxx-ucode/iwlwifi-6xxx-ucode.SlackBuild
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/sh
-
-# Copyright 2006, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PKGNAM=iwlwifi-6xxx-ucode
-#VERSION will be determined automatically, and the package will use the last version found.
-ARCH=${ARCH:-fw}
-BUILD=${BUILD:-1}
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-${PKGNAM}
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
-cd $TMP
-for file in $CWD/iwlwifi-6*-*.tar.?z* ; do
-  VERSION=$(echo $file | rev | cut -f 3- -d . | cut -f 1 -d / | rev | cut -f 4- -d - )
-  SRCNAM=$(echo $file | rev | cut -f 3- -d . | cut -f 1 -d / | rev | cut -f 1-3 -d -)
-  rm -rf ${SRCNAM}-${VERSION}
-  tar xvf $file || exit 1
-  cd $SRCNAM-$VERSION || exit 1
-  # Make sure ownerships and permissions are sane:
-  chown -R root:root .
-  chmod 644 *
-  # install:
-  mkdir -p $PKG/lib/firmware
-  cp -a iwlwifi-*.ucode $PKG/lib/firmware
-  # Add a documentation directory:
-  mkdir -p $PKG/usr/doc/${SRCNAM}-${VERSION}
-  cp -a LICENSE* README* $PKG/usr/doc/${SRCNAM}-${VERSION}
-done
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/n/iwlwifi-6xxx-ucode/slack-desc b/source/n/iwlwifi-6xxx-ucode/slack-desc
deleted file mode 100644
index 0043d6cd4..000000000
--- a/source/n/iwlwifi-6xxx-ucode/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-                  |-----handy-ruler------------------------------------------------------|
-iwlwifi-6xxx-ucode: iwlwifi-6xxx-ucode (Intel 6xxx wireless microcode)
-iwlwifi-6xxx-ucode:
-iwlwifi-6xxx-ucode: The microcode provided in this package is required for the Intel
-iwlwifi-6xxx-ucode: Wireless WiFi Link AGN driver for Linux (iwlagn) to operate.
-iwlwifi-6xxx-ucode:
-iwlwifi-6xxx-ucode: Visit Intel's Linux wireless website at this address:
-iwlwifi-6xxx-ucode:   http://intellinuxwireless.org/
-iwlwifi-6xxx-ucode:
-iwlwifi-6xxx-ucode:
-iwlwifi-6xxx-ucode:
-iwlwifi-6xxx-ucode:
diff --git a/source/n/lftp/lftp.SlackBuild b/source/n/lftp/lftp.SlackBuild
index 9e75153a6..ba7229c4a 100755
--- a/source/n/lftp/lftp.SlackBuild
+++ b/source/n/lftp/lftp.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,7 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=${VERSION:-$(echo lftp-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo lftp-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
@@ -58,7 +58,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf lftp-$VERSION
-tar xvf $CWD/lftp-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/lftp-$VERSION.tar.xz || exit 1
 cd lftp-$VERSION
 
 chown -R root:root .
diff --git a/source/n/libgcrypt/libgcrypt.SlackBuild b/source/n/libgcrypt/libgcrypt.SlackBuild
index d0629eee2..42b1b4190 100755
--- a/source/n/libgcrypt/libgcrypt.SlackBuild
+++ b/source/n/libgcrypt/libgcrypt.SlackBuild
@@ -77,7 +77,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --infodir=/usr/info \
   --docdir=/usr/doc/libgcrypt-$VERSION \
   --enable-shared=yes \
-  --enable-static=yes \
+  --enable-static=no \
   --program-prefix="" \
   --program-suffix="" \
   --build=$ARCH-slackware-linux \
diff --git a/source/n/libgpg-error/libgpg-error.SlackBuild b/source/n/libgpg-error/libgpg-error.SlackBuild
index 58f6cecae..73397d93e 100755
--- a/source/n/libgpg-error/libgpg-error.SlackBuild
+++ b/source/n/libgpg-error/libgpg-error.SlackBuild
@@ -99,7 +99,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \
 
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  ABOUT-NLS AUTHORS COPYING* INSTALL NEWS README* THANKS VERSION \
+  AUTHORS COPYING* INSTALL NEWS README* THANKS VERSION \
   $PKG/usr/doc/$PKGNAM-$VERSION
 
 # If there's a ChangeLog, installing at least part of the recent history
diff --git a/source/n/links/links.SlackBuild b/source/n/links/links.SlackBuild
index c8839ebd0..241cc6627 100755
--- a/source/n/links/links.SlackBuild
+++ b/source/n/links/links.SlackBuild
@@ -20,7 +20,7 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=2.3pre1
+VERSION=2.7
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
diff --git a/source/n/lynx/lynx.SlackBuild b/source/n/lynx/lynx.SlackBuild
index 5a298547d..9c5062c3a 100755
--- a/source/n/lynx/lynx.SlackBuild
+++ b/source/n/lynx/lynx.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2012  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 
 SRCVER=2.8.7
 PKGVER=2.8.7
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -92,6 +92,7 @@ CFLAGS="$SLKCFLAGS" \
   --enable-read-eta \
   --enable-scrollbar \
   --with-ssl \
+  --enable-ipv6 \
   --enable-color-style \
   --enable-prettysrc \
   --enable-source-cache \
diff --git a/source/n/mailx/mailx.SlackBuild b/source/n/mailx/mailx.SlackBuild
index 9d5523668..30c20ea1a 100755
--- a/source/n/mailx/mailx.SlackBuild
+++ b/source/n/mailx/mailx.SlackBuild
@@ -21,7 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=12.4
+VERSION=12.5
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -54,7 +54,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf mailx-$VERSION
-tar xvf $CWD/mailx-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/mailx-$VERSION.tar.?z* || exit 1
 cd mailx-$VERSION || exit 1
 chown -R root:root .
 find . \
@@ -94,7 +94,21 @@ mkdir -p $PKG/bin
 mv $PKG/etc/nail.rc $PKG/etc/nail.rc.new
 strip $PKG/usr/bin/mailx
 
-gzip -9 $PKG/usr/man/man1/*
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
 # Manpage links:
 ( cd $PKG/usr/man/man1
   ln -sf mailx.1.gz mail.1.gz
@@ -104,9 +118,17 @@ gzip -9 $PKG/usr/man/man1/*
 
 mkdir -p $PKG/usr/doc/mailx-$VERSION
 cp -a \
-  AUTHORS COPYING* ChangeLog INSTALL README TODO \
+  AUTHORS COPYING* INSTALL README TODO \
   $PKG/usr/doc/mailx-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/n/mobile-broadband-provider-info/README b/source/n/mobile-broadband-provider-info/README
new file mode 100644
index 000000000..0edda7448
--- /dev/null
+++ b/source/n/mobile-broadband-provider-info/README
@@ -0,0 +1,2 @@
+This package contains mobile broadband settings for different service 
+providers in different countries.
diff --git a/source/n/mobile-broadband-provider-info/mobile-broadband-provider-info.SlackBuild b/source/n/mobile-broadband-provider-info/mobile-broadband-provider-info.SlackBuild
new file mode 100755
index 000000000..63dc5959a
--- /dev/null
+++ b/source/n/mobile-broadband-provider-info/mobile-broadband-provider-info.SlackBuild
@@ -0,0 +1,124 @@
+#!/bin/sh
+
+# Slackware build script for mobile-broadband-provider-info
+
+# Copyright 2010, 2011  Robby Workman, Northport, Alabama, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Modified 2011, 2012  by Eric Hameleers, Eindhoven, NL
+
+PKGNAM=mobile-broadband-provider-info
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+TAG=${TAG:-}
+
+# Automatically determine the architecture we're building on:
+MARCH=$( uname -m )
+if [ -z "$ARCH" ]; then
+  case "$MARCH" in
+    i?86)    export ARCH=i486 ;;
+    armv7hl) export ARCH=$MARCH ;;
+    arm*)    export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+    *)       export ARCH=$MARCH ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "armv7hl" ]; then
+  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
+  LIBDIRSUFFIX=""
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z*
+cd $PKGNAM-$VERSION
+
+# Fix missing @ in .pc file:
+zcat $CWD/mobile-broadband-provider-info.pc.diff.gz | patch -p1 --verbose || exit 1
+
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+[ ! -x configure ] && ./autogen.sh
+
+sed -i -e \
+  's#pkgconfigdir = $(datadir)/pkgconfig#pkgconfigdir = $(libdir)/pkgconfig#' \
+  Makefile.in
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --build=$TARGET
+
+make
+make install DESTDIR=$PKG
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  COPYING ChangeLog NEWS README \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+cat $CWD/$PKGNAM.SlackBuild > $PKG/usr/doc/$PKGNAM-$VERSION/$PKGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PKGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz}
+
diff --git a/source/n/mobile-broadband-provider-info/mobile-broadband-provider-info.pc.diff b/source/n/mobile-broadband-provider-info/mobile-broadband-provider-info.pc.diff
new file mode 100644
index 000000000..fe326518d
--- /dev/null
+++ b/source/n/mobile-broadband-provider-info/mobile-broadband-provider-info.pc.diff
@@ -0,0 +1,10 @@
+--- ./mobile-broadband-provider-info.pc.in.orig	2012-01-22 14:06:15.000000000 -0600
++++ ./mobile-broadband-provider-info.pc.in	2012-04-14 15:24:56.990965523 -0500
+@@ -1,6 +1,6 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir
++libdir=@libdir@
+ datarootdir = @datarootdir@
+ pkgdatadir=${datarootdir}/@PACKAGE@
+ includedir=@includedir@
diff --git a/source/n/mobile-broadband-provider-info/slack-desc b/source/n/mobile-broadband-provider-info/slack-desc
new file mode 100644
index 000000000..100517f8e
--- /dev/null
+++ b/source/n/mobile-broadband-provider-info/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+                              |-----handy-ruler------------------------------------------------------|
+mobile-broadband-provider-info: mobile-broadband-provider-info (service provider settings)
+mobile-broadband-provider-info:
+mobile-broadband-provider-info: This package contains mobile broadband settings for service providers
+mobile-broadband-provider-info: in various countries.
+mobile-broadband-provider-info:
+mobile-broadband-provider-info:
+mobile-broadband-provider-info:
+mobile-broadband-provider-info: For more info, see:
+mobile-broadband-provider-info:
+mobile-broadband-provider-info: http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders
+mobile-broadband-provider-info:
diff --git a/source/n/mtr/mtr.SlackBuild b/source/n/mtr/mtr.SlackBuild
index 4ebea21e1..23a9c707b 100755
--- a/source/n/mtr/mtr.SlackBuild
+++ b/source/n/mtr/mtr.SlackBuild
@@ -72,7 +72,9 @@ CFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --localstatedir=/var \
   --sysconfdir=/etc \
-  --enable-gtk2 \
+  --without-gtk \
+  --without-gtk2 \
+  --without-gtk3 \
   --build=$ARCH-slackware-linux
 
 make $NUMJOBS || make || exit 1
diff --git a/source/n/mutt/mutt.SlackBuild b/source/n/mutt/mutt.SlackBuild
index 3de6e3075..9484bc27a 100755
--- a/source/n/mutt/mutt.SlackBuild
+++ b/source/n/mutt/mutt.SlackBuild
@@ -21,7 +21,7 @@
 
 PKGNAM=mutt
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/n/net-snmp/net-snmp.SlackBuild b/source/n/net-snmp/net-snmp.SlackBuild
index 88ef2d43f..2f2a3ead5 100755
--- a/source/n/net-snmp/net-snmp.SlackBuild
+++ b/source/n/net-snmp/net-snmp.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 
 PKGNAM=net-snmp
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-5}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/n/net-snmp/slack-desc b/source/n/net-snmp/slack-desc
index 7659f7fc8..4c2723861 100644
--- a/source/n/net-snmp/slack-desc
+++ b/source/n/net-snmp/slack-desc
@@ -14,6 +14,6 @@ net-snmp: An extensible agent
 net-snmp: An SNMP library
 net-snmp: Tools to request or set information from SNMP agents
 net-snmp: Tools to generate and handle SNMP traps
-net-snmp: A version of the unix 'netstat' command using SNMP
+net-snmp: A version of the UNIX 'netstat' command using SNMP
 net-snmp: A graphical Perl/Tk/SNMP based mib browser
 net-snmp:
diff --git a/source/n/net-tools/net-tools.SlackBuild b/source/n/net-tools/net-tools.SlackBuild
index 5f11755d0..ce08001da 100755
--- a/source/n/net-tools/net-tools.SlackBuild
+++ b/source/n/net-tools/net-tools.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,8 +22,8 @@
 
 
 PKGNAM=net-tools
-VERSION=${VERSION:-1.60}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-1.60.20120726git}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -54,8 +54,11 @@ else
 fi
 
 cd $TMP
-tar xjvf $CWD/net-tools-1.60.tar.bz2 || exit 1
-cd net-tools-1.60
+rm -rf net-tools-$VERSION
+tar xvf $CWD/net-tools-$VERSION.tar.xz || exit 1
+cd net-tools-$VERSION || exit 1
+
+zcat $CWD/net-tools.config.h.gz > config.h
 
 chown -R root:root .
 find . \
@@ -64,18 +67,12 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-zcat $CWD/net-tools_1.60-23.diff.gz | patch -p1 --backup --verbose || exit 1
-zcat $CWD/net-tools.diff.gz | patch -p1 --backup --verbose || exit 1
-zcat $CWD/net-tools.struct.x25_address.gcc4.diff.gz | patch -p1 --backup --verbose || exit 1
-zcat $CWD/net-tools.switch.default.gcc4.diff.gz | patch -p1 --backup --verbose || exit 1
-zcat $CWD/net-tools.mii-tool.string.diff.gz | patch -p1 --backup --verbose || exit 1
-
-mkdir -p $PKG/usr/doc/net-tools-1.60
-cp -a README README.ipv6 $PKG/usr/doc/net-tools-1.60
-chmod 644 $PKG/usr/doc/net-tools-1.60/*
-chown root:root $PKG/usr/doc/net-tools-1.60/*
-HAVE_IP_TOOLS=1 HAVE_MII=1 make
-HAVE_IP_TOOLS=1 HAVE_MII=1 make hostname
+mkdir -p $PKG/usr/doc/net-tools-$VERSION
+cp -a COPYING* README* $PKG/usr/doc/net-tools-$VERSION
+chmod 644 $PKG/usr/doc/net-tools-$VERSION/*
+chown root:root $PKG/usr/doc/net-tools-$VERSION/*
+HAVE_IP_TOOLS=1 HAVE_MII=1 make || exit 1
+HAVE_IP_TOOLS=1 HAVE_MII=1 make hostname || exit 1
 strip --strip-unneeded ipmaddr iptunnel hostname arp ifconfig nameif rarp route netstat plipconfig slattach mii-tool
 mkdir -p $PKG/sbin $PKG/bin $PKG/usr/sbin
 cat arp > $PKG/sbin/arp
diff --git a/source/n/net-tools/net-tools.config.h b/source/n/net-tools/net-tools.config.h
new file mode 100644
index 000000000..e271f863f
--- /dev/null
+++ b/source/n/net-tools/net-tools.config.h
@@ -0,0 +1,78 @@
+/*
+* config.h	Automatically generated configuration includefile
+*
+* NET-TOOLS	A collection of programs that form the base set of the
+*		NET-3 Networking Distribution for the LINUX operating
+*		system.
+*
+*		DO  NOT  EDIT  DIRECTLY
+*
+*/
+
+/* 
+ * 
+ * Internationalization
+ * 
+ * The net-tools package has currently been translated to French,
+ * German and Brazilian Portugese.  Other translations are, of
+ * course, welcome.  Answer `n' here if you have no support for
+ * internationalization on your system.
+ * 
+ */
+#define I18N 1
+
+/* 
+ * 
+ * Protocol Families.
+ * 
+ */
+#define HAVE_AFUNIX 1
+#define HAVE_AFINET 1
+#define HAVE_AFINET6 1
+#define HAVE_AFIPX 1
+#define HAVE_AFATALK 1
+#define HAVE_AFAX25 1
+#define HAVE_AFNETROM 1
+#define HAVE_AFROSE 0
+#define HAVE_AFX25 1
+#define HAVE_AFECONET 0
+#define HAVE_AFDECnet 0
+#define HAVE_AFASH 0
+#define HAVE_AFBLUETOOTH 1
+
+/* 
+ * 
+ * Device Hardware types.
+ * 
+ */
+#define HAVE_HWETHER 1
+#define HAVE_HWARC 1
+#define HAVE_HWSLIP 1
+#define HAVE_HWPPP 1
+#define HAVE_HWTUNNEL 1
+#define HAVE_HWSTRIP 1
+#define HAVE_HWTR 1
+#define HAVE_HWAX25 1
+#define HAVE_HWROSE 0
+#define HAVE_HWNETROM 1
+#define HAVE_HWX25 1
+#define HAVE_HWFR 1
+#define HAVE_HWSIT 0
+#define HAVE_HWFDDI 1
+#define HAVE_HWHIPPI 1
+#define HAVE_HWASH 0
+#define HAVE_HWHDLCLAPB 0
+#define HAVE_HWIRDA 1
+#define HAVE_HWEC 0
+#define HAVE_HWEUI64 1
+#define HAVE_HWIB 1
+
+/* 
+ * 
+ * Other Features.
+ * 
+ */
+#define HAVE_FW_MASQUERADE 1
+#define HAVE_IP_TOOLS 1
+#define HAVE_MII 1
+#define HAVE_SELINUX 0
diff --git a/source/n/net-tools/net-tools.diff b/source/n/net-tools/net-tools.diff
deleted file mode 100644
index a19af2026..000000000
--- a/source/n/net-tools/net-tools.diff
+++ /dev/null
@@ -1,77 +0,0 @@
---- ./config.h.orig	Wed Mar 21 21:23:31 2001
-+++ ./config.h	Wed Mar 21 21:23:12 2001
-@@ -0,0 +1,74 @@
-+/*
-+* config.h	Automatically generated configuration includefile
-+*
-+* NET-TOOLS	A collection of programs that form the base set of the
-+*		NET-3 Networking Distribution for the LINUX operating
-+*		system.
-+*
-+*		DO  NOT  EDIT  DIRECTLY
-+*
-+*/
-+
-+/* 
-+ * 
-+ * Internationalization
-+ * 
-+ * The net-tools package has currently been translated to French,
-+ * German and Brazilian Portugese.  Other translations are, of
-+ * course, welcome.  Answer `n' here if you have no support for
-+ * internationalization on your system.
-+ * 
-+ */
-+#define I18N 1
-+
-+/* 
-+ * 
-+ * Protocol Families.
-+ * 
-+ */
-+#define HAVE_AFUNIX 1
-+#define HAVE_AFINET 1
-+#define HAVE_AFINET6 1
-+#define HAVE_AFIPX 1
-+#define HAVE_AFATALK 1
-+#define HAVE_AFAX25 1
-+#define HAVE_AFNETROM 1
-+#define HAVE_AFROSE 0
-+#define HAVE_AFX25 1
-+#define HAVE_AFECONET 0
-+#define HAVE_AFDECnet 0
-+#define HAVE_AFASH 0
-+
-+/* 
-+ * 
-+ * Device Hardware types.
-+ * 
-+ */
-+#define HAVE_HWETHER 1
-+#define HAVE_HWARC 1
-+#define HAVE_HWSLIP 1
-+#define HAVE_HWPPP 1
-+#define HAVE_HWTUNNEL 1
-+#define HAVE_HWSTRIP 1
-+#define HAVE_HWTR 1
-+#define HAVE_HWAX25 1
-+#define HAVE_HWROSE 0
-+#define HAVE_HWNETROM 1
-+#define HAVE_HWX25 1
-+#define HAVE_HWFR 1
-+#define HAVE_HWSIT 0
-+#define HAVE_HWFDDI 0
-+#define HAVE_HWHIPPI 0
-+#define HAVE_HWASH 0
-+#define HAVE_HWHDLCLAPB 0
-+#define HAVE_HWIRDA 1
-+#define HAVE_HWEC 0
-+
-+/* 
-+ * 
-+ * Other Features.
-+ * 
-+ */
-+#define HAVE_FW_MASQUERADE 1
-+#define HAVE_IP_TOOLS 1
-+#define HAVE_MII 1
diff --git a/source/n/net-tools/net-tools.mii-tool.string.diff b/source/n/net-tools/net-tools.mii-tool.string.diff
deleted file mode 100644
index aaa5b09e3..000000000
--- a/source/n/net-tools/net-tools.mii-tool.string.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- ./mii-tool.c.orig	2000-05-21 09:31:17.000000000 -0500
-+++ ./mii-tool.c	2010-08-12 12:46:05.063607571 -0500
-@@ -379,16 +379,16 @@
- /*--------------------------------------------------------------------*/
- 
- const char *usage =
--"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]
--       -V, --version               display version information
--       -v, --verbose               more verbose output
--       -R, --reset                 reset MII to poweron state
--       -r, --restart               restart autonegotiation
--       -w, --watch                 monitor for link status changes
--       -l, --log                   with -w, write events to syslog
--       -A, --advertise=media,...   advertise only specified media
--       -F, --force=media           force specified media technology
--media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD,
-+"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...] \n\
-+       -V, --version               display version information \n\
-+       -v, --verbose               more verbose output \n\
-+       -R, --reset                 reset MII to poweron state \n\
-+       -r, --restart               restart autonegotiation \n\
-+       -w, --watch                 monitor for link status changes \n\
-+       -l, --log                   with -w, write events to syslog \n\
-+       -A, --advertise=media,...   advertise only specified media \n\
-+       -F, --force=media           force specified media technology \n\
-+media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD, \n\
-        (to advertise both HD and FD) 100baseTx, 10baseT\n";
- 
- int main(int argc, char **argv)
diff --git a/source/n/net-tools/net-tools.struct.x25_address.gcc4.diff b/source/n/net-tools/net-tools.struct.x25_address.gcc4.diff
deleted file mode 100644
index 25a42ed7a..000000000
--- a/source/n/net-tools/net-tools.struct.x25_address.gcc4.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./lib/x25_sr.c.orig	2000-05-20 08:38:10.000000000 -0500
-+++ ./lib/x25_sr.c	2010-08-12 12:13:35.147112052 -0500
-@@ -77,7 +77,7 @@
-   rt.sigdigits=sigdigits;
- 
-   /* x25_route_struct.address isn't type struct sockaddr_x25, Why? */
--  memcpy(&rt.address, &sx25.sx25_addr, sizeof(x25_address));
-+  memcpy(&rt.address, &sx25.sx25_addr, sizeof(struct x25_address));
- 
-   while (*args) {
- 	if (!strcmp(*args,"device") || !strcmp(*args,"dev")) {
diff --git a/source/n/net-tools/net-tools.switch.default.gcc4.diff b/source/n/net-tools/net-tools.switch.default.gcc4.diff
deleted file mode 100644
index 4d7090e0f..000000000
--- a/source/n/net-tools/net-tools.switch.default.gcc4.diff
+++ /dev/null
@@ -1,42 +0,0 @@
---- ./hostname.c.orig	2001-04-08 12:04:23.000000000 -0500
-+++ ./hostname.c	2010-08-12 12:19:29.181510641 -0500
-@@ -78,6 +78,7 @@
-             fprintf(stderr, _("%s: name too long\n"), program_name);
-             break;
-         default:
-+            break;
-         }
- 	exit(1);
-     }
-@@ -98,6 +99,7 @@
- 	    fprintf(stderr, _("%s: name too long\n"), program_name);
- 	    break;
- 	default:
-+            break;
- 	}
- 	exit(1);
-     };
-@@ -117,6 +119,7 @@
- 	    fprintf(stderr, _("%s: name too long\n"), program_name);
- 	    break;
- 	default:
-+	    break;
- 	}
- 	exit(1);
-     };
-@@ -174,6 +177,7 @@
- 	printf("%s\n", hp->h_name);
- 	break;
-     default:
-+        break;
-     }
- }
- 
-@@ -330,7 +334,6 @@
- 	case 'h':
- 	default:
- 	    usage();
--
- 	};
- 
- 
diff --git a/source/n/net-tools/net-tools.url b/source/n/net-tools/net-tools.url
new file mode 100644
index 000000000..61da371ec
--- /dev/null
+++ b/source/n/net-tools/net-tools.url
@@ -0,0 +1 @@
+# git archive --format=tar --remote=git://net-tools.git.sourceforge.net/gitroot/net-tools/net-tools master > net-tools.tar.xz
diff --git a/source/n/net-tools/net-tools_1.60-23.diff b/source/n/net-tools/net-tools_1.60-23.diff
deleted file mode 100644
index 449d62c30..000000000
--- a/source/n/net-tools/net-tools_1.60-23.diff
+++ /dev/null
@@ -1,33404 +0,0 @@
---- net-tools-1.60.orig/debian/compat
-+++ net-tools-1.60/debian/compat
-@@ -0,0 +1 @@
-+5
---- net-tools-1.60.orig/debian/README.source
-+++ net-tools-1.60/debian/README.source
-@@ -0,0 +1,5 @@
-+This package uses quilt to manage all modifications to the upstream
-+source.  Changes are stored in the source package as diffs in
-+debian/patches and applied during the build.
-+
-+See /usr/share/doc/quilt/README.source for a detailed explanation.
---- net-tools-1.60.orig/debian/rules
-+++ net-tools-1.60/debian/rules
-@@ -0,0 +1,81 @@
-+#!/usr/bin/make -f
-+
-+include /usr/share/quilt/quilt.make
-+
-+# Uncomment this to turn on verbose mode.
-+#export DH_VERBOSE=1
-+
-+# This has to be exported to make some magic below work.
-+export DH_OPTIONS
-+
-+# These are used for cross-compiling and for saving the configure script
-+# from having to guess our platform (since we know it already)
-+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-+
-+configure: configure-stamp
-+configure-stamp: $(QUILT_STAMPFN)
-+	[ ! -f config.make ] || mv config.make debian/config.make.bk
-+	cp -f debian/config.make config.make
-+	[ ! -f config.h ] || mv config.h debian/config.h.bk
-+	cp -f debian/config.h config.h
-+	dh_testdir
-+	touch $@
-+
-+build: build-stamp
-+build-stamp: configure-stamp
-+	dh_testdir
-+	$(MAKE) PROGS="ifconfig arp netstat route rarp slattach plipconfig \
-+		nameif iptunnel ipmaddr mii-tool"
-+	touch $@
-+
-+clean: unpatch
-+	dh_testdir
-+	dh_testroot
-+	rm -f build-stamp configure-stamp
-+	[ ! -f Makefile ] || $(MAKE) clobber
-+	[ ! -f debian/config.h.bk ] || \
-+		mv debian/config.h.bk config.h
-+	[ ! -f debian/config.make.bk ] || \
-+		mv debian/config.make.bk config.make
-+	dh_clean
-+
-+MANPAGES = arp.8 ethers.5 ifconfig.8 mii-tool.8 nameif.8 netstat.8 \
-+	   plipconfig.8 rarp.8 route.8 slattach.8
-+
-+install: build
-+	dh_testdir
-+	dh_testroot
-+	dh_clean -k
-+	dh_installdirs bin sbin usr/sbin
-+	dh_install
-+	$(MAKE) -C po install BASEDIR=$(CURDIR)/debian/net-tools
-+	dh_installman --language=de \
-+		$(wildcard $(addprefix man/de_DE/,$(MANPAGES)))
-+	dh_installman --language=C \
-+		$(wildcard $(addprefix man/en_US/,$(MANPAGES)))
-+	dh_installman --language=fr \
-+		$(wildcard $(addprefix man/fr_FR/,$(MANPAGES)))
-+	dh_installman --language=pt_BR \
-+		$(wildcard $(addprefix man/pt_BR/,$(MANPAGES)))
-+
-+binary-indep: build install
-+
-+binary-arch: build install
-+	dh_testdir
-+	dh_testroot
-+	dh_installchangelogs
-+	dh_installdocs README README.ipv6 TODO
-+	dh_link
-+	dh_strip
-+	dh_compress
-+	dh_fixperms
-+	dh_installdeb
-+	dh_shlibdeps
-+	dh_gencontrol
-+	dh_md5sums
-+	dh_builddeb
-+
-+binary: binary-arch binary-indep
-+.PHONY: build clean binary-indep binary-arch binary install install-indep \
-+	install-arch
---- net-tools-1.60.orig/debian/config.h
-+++ net-tools-1.60/debian/config.h
-@@ -0,0 +1,75 @@
-+/*
-+* config.h	Automatically generated configuration includefile
-+*
-+* NET-TOOLS	A collection of programs that form the base set of the
-+*		NET-3 Networking Distribution for the LINUX operating
-+*		system.
-+*
-+*		DO  NOT  EDIT  DIRECTLY
-+*
-+*/
-+
-+/* 
-+ * 
-+ * Internationalization
-+ * 
-+ * The net-tools package has currently been translated to French,
-+ * German and Brazilian Portugese.  Other translations are, of
-+ * course, welcome.  Answer `n' here if you have no support for
-+ * internationalization on your system.
-+ * 
-+ */
-+#define I18N 1
-+
-+/* 
-+ * 
-+ * Protocol Families.
-+ * 
-+ */
-+#define HAVE_AFUNIX 1
-+#define HAVE_AFINET 1
-+#define HAVE_AFINET6 1
-+#define HAVE_AFIPX 1
-+#define HAVE_AFATALK 1
-+#define HAVE_AFAX25 1
-+#define HAVE_AFNETROM 1
-+#define HAVE_AFROSE 1
-+#define HAVE_AFX25 1
-+#define HAVE_AFECONET 1
-+#define HAVE_AFDECnet 1
-+#define HAVE_AFASH 1
-+
-+/* 
-+ * 
-+ * Device Hardware types.
-+ * 
-+ */
-+#define HAVE_HWETHER 1
-+#define HAVE_HWARC 1
-+#define HAVE_HWSLIP 1
-+#define HAVE_HWPPP 1
-+#define HAVE_HWTUNNEL 1
-+#define HAVE_HWSTRIP 1
-+#define HAVE_HWTR 1
-+#define HAVE_HWAX25 1
-+#define HAVE_HWROSE 1
-+#define HAVE_HWNETROM 1
-+#define HAVE_HWX25 1
-+#define HAVE_HWFR 1
-+#define HAVE_HWSIT 1
-+#define HAVE_HWFDDI 1
-+#define HAVE_HWHIPPI 1
-+#define HAVE_HWASH 1
-+#define HAVE_HWHDLCLAPB 1
-+#define HAVE_HWIRDA 1
-+#define HAVE_HWEC 1
-+#define HAVE_HWEUI64 1
-+
-+/* 
-+ * 
-+ * Other Features.
-+ * 
-+ */
-+#define HAVE_FW_MASQUERADE 1
-+#define HAVE_IP_TOOLS 1
-+#define HAVE_MII 1
---- net-tools-1.60.orig/debian/config.make
-+++ net-tools-1.60/debian/config.make
-@@ -0,0 +1,36 @@
-+I18N=1
-+HAVE_AFUNIX=1
-+HAVE_AFINET=1
-+HAVE_AFINET6=1
-+HAVE_AFIPX=1
-+HAVE_AFATALK=1
-+HAVE_AFAX25=1
-+HAVE_AFNETROM=1
-+HAVE_AFROSE=1
-+HAVE_AFX25=1
-+HAVE_AFECONET=1
-+HAVE_AFDECnet=1
-+HAVE_AFASH=1
-+HAVE_HWETHER=1
-+HAVE_HWARC=1
-+HAVE_HWSLIP=1
-+HAVE_HWPPP=1
-+HAVE_HWTUNNEL=1
-+HAVE_HWSTRIP=1
-+HAVE_HWTR=1
-+HAVE_HWAX25=1
-+HAVE_HWROSE=1
-+HAVE_HWNETROM=1
-+HAVE_HWX25=1
-+HAVE_HWFR=1
-+HAVE_HWSIT=1
-+HAVE_HWFDDI=1
-+HAVE_HWHIPPI=1
-+HAVE_HWASH=1
-+HAVE_HWHDLCLAPB=1
-+HAVE_HWIRDA=1
-+HAVE_HWEC=1
-+HAVE_EUI64=1
-+HAVE_FW_MASQUERADE=1
-+HAVE_IP_TOOLS=1
-+HAVE_MII=1
---- net-tools-1.60.orig/debian/install
-+++ net-tools-1.60/debian/install
-@@ -0,0 +1,11 @@
-+arp		/usr/sbin
-+ifconfig	/sbin
-+nameif		/sbin
-+plipconfig	/sbin
-+rarp		/sbin
-+route		/sbin
-+slattach	/sbin
-+ipmaddr		/sbin
-+iptunnel	/sbin
-+mii-tool	/sbin
-+netstat		/bin
---- net-tools-1.60.orig/debian/control
-+++ net-tools-1.60/debian/control
-@@ -0,0 +1,22 @@
-+Source: net-tools
-+Section: net
-+Priority: important
-+Build-Depends: debhelper (> 5), gettext, quilt
-+Maintainer: net-tools Team <pkg-net-tools-maintainers@lists.alioth.debian.org>
-+Uploaders: Luk Claes <luk@debian.org>, Martín Ferrari <tincho@debian.org>
-+Standards-Version: 3.8.1
-+
-+Package: net-tools
-+Architecture: any
-+Depends: ${shlibs:Depends}
-+Replaces: netbase (<< 4.00), ja-trans (<= 0.8-2)
-+Conflicts: ja-trans (<= 0.8-2)
-+Description: The NET-3 networking toolkit
-+ This package includes the important tools for controlling the network
-+ subsystem of the Linux kernel.  This includes arp, ifconfig, netstat, 
-+ rarp, nameif and route.  Additionally, this package contains utilities
-+ relating to particular network hardware types (plipconfig, slattach, 
-+ mii-tool) and advanced aspects of IP configuration (iptunnel, ipmaddr).
-+ .
-+ In the upstream package 'hostname' and friends are included. Those are
-+ not installed by this package, since there is a special "hostname*.deb".
---- net-tools-1.60.orig/debian/copyright
-+++ net-tools-1.60/debian/copyright
-@@ -0,0 +1,31 @@
-+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=437
-+Upstream-Maintainer: Phil Blundell <philb@gnu.org>, 
-+                     Bernd Eckenfels <net-tools@lina.inka.de>
-+Upstream-Source: https://developer.berlios.de/projects/net-tools/
-+
-+Files: *
-+Copyright: © 1988-1994 MicroWalt Corporation
-+Copyright: © 1995-1996 Bernd Eckenfels
-+Copyright: © 1997-2000 Andi Kleen
-+Copyright: © 1997-2000 Donald Becker
-+License: GPL-2+
-+ The copyright attribution has been derived from individual files' text, but
-+ each file may have different copyright holders, and some may be missing. See
-+ the source code for details.
-+ .
-+ This program is free software; you can redistribute it and/or modify it under
-+ the terms of  the GNU General Public  License as  published by  the  Free
-+ Software Foundation;  either  version 2 of the License, or  (at your option)
-+ any later version.
-+ .
-+ On Debian GNU/Linux systems, the complete text of the GNU General Public
-+ License can be found in `/usr/share/common-licenses/GPL-2'
-+
-+Files: debian/*
-+Copyright: © 2008-2009 Luk Claes, Martín Ferrari
-+Copyright: © 2000-2007 Bernd Eckenfels
-+Copyright: © 2000 Anthony Towns
-+License: GPL-2+
-+ It is assumed that all contributors put their work under the same license
-+ as the module itself.
-+
---- net-tools-1.60.orig/debian/changelog
-+++ net-tools-1.60/debian/changelog
-@@ -0,0 +1,347 @@
-+net-tools (1.60-23) unstable; urgency=low
-+
-+  * debian/patches/Bug#254243-netstat.c-wide-opt.patch: Converted last patch
-+    from Luar Roji to a quilt patch.
-+  * Many changes done in diff.gz that are also present in upstream's CVS:
-+    - debian/patches/CVS-20020730-route.c_opts_64.patch
-+    - debian/patches/CVS-20061011-ipmaddr.c_buffer_overflow.patch
-+    - debian/patches/CVS-20081003-statistics.c_sync.patch
-+    - debian/patches/CVS-20071202-rarp.c_sync.patch
-+    - debian/patches/CVS-20070316-netstat.c_sync.patch
-+    - debian/patches/CVS-20060927-mii-tool.c_sync.patch
-+    - debian/patches/CVS-20051204-arp.c_sync.patch
-+    - debian/patches/CVS-20030911-nameif.c_sync.patch
-+    - debian/patches/CVS-20081002-ifconfig.c_sync.patch
-+    - debian/patches/CVS-20031011-hostname.c_sync.patch
-+    - debian/patches/CVS-20051204-slttach.c_sync.patch
-+    - debian/patches/CVS-20061011-includes_sync.patch
-+    - debian/patches/CVS-lib_sync.patch
-+    - debian/patches/CVS-20081003-config.in_sync.patch
-+    - debian/patches/CVS-20081002-manpages_sync.patch
-+  * Some unsyncable patches converted from diff.gz:
-+    - debian/patches/netstat.c-assorted_changes.patch
-+    - debian/patches/translations.patch
-+    - debian/patches/local-manpages.patch
-+    - debian/patches/lib_local_changes.patch
-+    - debian/patches/netstat.c-local_changes.patch
-+  * Reverted changes to Makefile and README.
-+  * debian/watch: added watchfile.
-+  * debian/control, debian/compat: Added versioned dependency on debhelper (it
-+    was version 1!)
-+  * debian/rules: made from scratch. Closes: #443063.
-+  * Added quilt dependencies and hooks.
-+  * debian/control: updated Standards-Version.
-+  * debian/README.source: added to comply with S-V 3.8.1.
-+  * debian/patches/local-manpages.patch: more manpage fixes.
-+  * debian/patches/translations.patch: fix encoding for .po files.
-+  * debia/rules: supercede Makefile install with custom commands.
-+  * debian/copyright: new format, and attempt to provide a real copyright
-+    file. Still, the attribution is a mess.
-+  * debian/patches/Bug#345331-socket_overflow.patch: patch from Antonio Galea
-+    that solves an issue when the socket number exceeds 2^31. Closes: #345331.
-+
-+ -- Martín Ferrari <tincho@debian.org>  Mon, 16 Mar 2009 01:58:18 -0300
-+
-+net-tools (1.60-22) unstable; urgency=low
-+
-+  * Add new command line option -W/--wide to netstat which prevents 
-+    truncation of IPv6 addresses (Closes: #254243). Thanks Luar Roji.
-+
-+ -- Luk Claes <luk@debian.org>  Sun, 16 Nov 2008 17:53:05 +0100
-+
-+net-tools (1.60-21) unstable; urgency=low
-+
-+  * Update maintainer to net-tools Team.
-+  * Support ipv6 stats in netstat (Closes: #453859).
-+  * Fix closes statements in changelog entry.
-+  * Add hardware support for InfiniBand (Closes: #294252).
-+
-+ -- Luk Claes <luk@debian.org>  Sat, 27 Sep 2008 19:40:40 +0200
-+
-+net-tools (1.60-20) unstable; urgency=low
-+
-+  * New maintainer (Closes: #486004).
-+  * Don't segfault when /proc/net/dev is not available (Closes: #222209).
-+  * Find IPv6 addresses for interfaces with ifindex > 255 (Closes: #433543).
-+  * Skip . and .. in netstat as they are invalid (Closes: #234447).
-+  * Fix hyphenation for manpages (Closes: #288343).
-+
-+ -- Luk Claes <luk@debian.org>  Tue, 16 Sep 2008 15:22:20 +0200
-+
-+net-tools (1.60-19) unstable; urgency=low
-+
-+  * fixed netstat(8) (interfaceS) reported by Liu Xing. (Closes: Bug#435690)
-+  * fixed interface name truncation (Closes: Bug#405521)
-+    Thank you Csaba Szep.
-+  * fixed pt error string (Closes: Bug#403033)
-+  * fixed route samples (Closes: Bug#400844, #368697) Thanks Danny Rathjens.
-+  * fixed ifconfig(8) see also section (Closes: Bug#365916) Dan Jacobs.
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Sun, 02 Dec 2007 06:27:41 +0100
-+
-+net-tools (1.60-18) unstable; urgency=low
-+
-+  * Thanks for the l10n NMU to Kenshi Muto
-+  * fixed hostname compile problems
-+  * better error handling and speedup for proc file reading
-+  * improved mii-tool (more media types)
-+  * fixed string length contraint in ipmaddr
-+  * fixed ipx /proc/net (alternate naming)
-+  * smaller fixed to netstat(8) (de) 2002-02-20 - still incomplete
-+  * expanded arp(8) (en) 2007-12-01
-+  * added -4 and -6 to netstat(8) 02 October 2003
-+  * formatting fixed rarp(8)+slattach(8)  [en]
-+  * formatting fixed arp(8), rarp(8), ifconfig(8), hostname(1) [fr]
-+  * fixed slattach -L to not require HW handshake anymore
-+  * netstat -n: show v4inv6 mapped addressses as v4
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Sun, 02 Dec 2007 03:28:17 +0100
-+
-+net-tools (1.60-17.2) unstable; urgency=low
-+
-+  * l10n NMU
-+  * Set conflict against ja-trans which has obsolete Japanese
-+    translations only for net-tools. (closes: #447327)
-+
-+ -- Kenshi Muto <kmuto@debian.org>  Sat, 20 Oct 2007 18:00:34 +0900
-+
-+net-tools (1.60-17.1) unstable; urgency=low
-+
-+  * l10n NMU
-+  * Updated net-tools.pot.
-+  * Updated Japanese translation (closes: Bug#432338)
-+  * Updated German translation (closes: #313808)
-+
-+ -- Kenshi Muto <kmuto@debian.org>  Thu, 11 Oct 2007 19:44:26 +0900
-+
-+net-tools (1.60-17) unstable; urgency=medium
-+
-+  * arp.c: bus error on sparc64 with latest gcc fixed. (Closes: Bug#340384)
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Sun, 04 Dec 2005 05:47:05 +0100
-+
-+net-tools (1.60-16) unstable; urgency=low
-+
-+  * spelling fix to slattach(8) (Closes: Bug#326124 (patch by A.Costa)
-+  * inet.c: portability fix for 64bit.
-+  * comment cleanups to aliagn with 1.65 cvs
-+    * net-support.h, inet_sr.c, nstrcmp.c, arp.c, ether.h
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Mon, 24 Oct 2005 22:05:38 +0200
-+
-+net-tools (1.60-15) unstable; urgency=low
-+
-+  * minor formating fix to ifconfig(8)
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Thu, 30 Jun 2005 21:49:52 +0200
-+
-+net-tools (1.60-14) unstable; urgency=low
-+
-+  * added iptables(8) in ifconfig(8) (thanks Toralf Förster)
-+  * more usage updates in ifconfig.8 (used upstream HEAD=1.11)
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Thu, 30 Jun 2005 20:51:18 +0200
-+
-+net-tools (1.60-13) unstable; urgency=low
-+
-+  * X25 code compiles with 2.4 and 2.6 kernel headers (Closes: Bug#271678)
-+  * IMPORTANT: make ifconfig show alias interfaces in 2.6 again. 
-+  * resort media type array to match kernel (Closes: Bug#199920)
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Tue, 17 May 2005 01:28:51 +0200
-+
-+net-tools (1.60-12) unstable; urgency=low
-+
-+  * make TR hw address type work for new kernel (Closes: Bug #79462, #203400)
-+  * update-po uses msgmerge, new net-tools.pot (Closes: Bug: 271426)
-+  * de-support dontpub option in arp -? und arp.8 (Closes: Bug #203396)
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Mon, 16 May 2005 06:33:48 +0200
-+
-+net-tools (1.60-11) unstable; urgency=low
-+
-+  * spelling fixes (Closes: Bug #305640, #305638, 305637)
-+  * nameif.c avoid overflow by malicious kernel
-+  * avoid overflow of the TX-OK Column (Closes: Bug #308922)
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Sat, 14 May 2005 01:48:45 +0200
-+
-+net-tools (1.60-10) unstable; urgency=low
-+
-+  * typo fix in po/de.po for german arp command output (Closes: Bug #176151)
-+  * added diagnostics messages to mii-tool.8 (Closes: Bug #239229)
-+  * new version of nstrcmp (Closes: Bug #226503)
-+  * enable EUI64 support
-+  * stadanrds version 3.6.1 (no changes)
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Fri, 23 Apr 2004 00:57:20 +0200
-+
-+net-tools (1.60-9) unstable; urgency=medium
-+
-+  * debian/changelog: fixed in last entry fixed bug from 197925 to 197924
-+  * include linux/sockios.h for SIOCGMIIPHY definition (new style)
-+    which will fix MII reporting on 2.4 kernels. (Closes: Bug #133648)
-+    NOTE: this will now require root to work, it will also not work on
-+    older kernels.
-+  * Rene Engelhard's patch to make AF X25 compile with 2.6 headers (Closes: Bug #223091)
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Mon, 29 Dec 2003 13:42:20 +0100
-+
-+net-tools (1.60-8) unstable; urgency=medium
-+
-+  * lib/interface.c: backed off change which skipped reading ioctl 
-+    interfacelist, if _proc interfacelist was ok, which does not work,
-+    because alias interfaces are only in ioctl list available. It is 
-+    also falling back to the original lib/nstrcml.c because the
-+    comparision if : is present does not work.
-+    (Closes: bug #197924, #197582, #197269)
-+  * bumped standards version (no changes)
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Sat, 28 Jun 2003 02:56:38 +0200
-+
-+net-tools (1.60-7) unstable; urgency=low
-+
-+  * interfaces.c: cvs version fixes Connectiva Bug #5711 (Closes: #149576)
-+    from Eduardo Pereira Habkost
-+  * netstat.c: cvs version adds support for tcp6,udp6,icmp6 protocols
-+  * netstat.c: cvs version adds support for -4 or -6 cmd line shortcut
-+  * netstat.c: cvs version adds fix for inode 
-+    signedness (Closes: #134600, #78932)
-+  * ifconfig: removed -i from usage (Closes: #181528)
-+  * make gcc 3.3 happy: added ull unsigned long long prefix to constant
-+  * lib/ddp_gr.c+pathnames.h: first support for appletalk routing from cvs
-+  * lib/eui64.c+hw.c+Makefile: forst support for new hw type from cvs
-+  * lib/interface.c: cvs fix for column run-into (Closes: #161080)
-+  * lib/irda.c,lib/ipx.c: cvs update
-+  * lib/nstrcmp.c: new, faster version, fixes b-lookups for ifconfig
-+  * hostanme.c: gcc 3.3 fix from cvs (not compiled in net-tools.deb)
-+  * lib/interface: fixed memory globbering
-+    (Closes: #135744, #149579, #185187)
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Thu, 12 Jun 2003 05:44:38 +0200
-+
-+net-tools (1.60-6) unstable; urgency=low
-+
-+  * took route.c from upstream cvs: allow -6 and -4 option
-+  * took statistics.c from upstream cvs: more complete netstat -S
-+  * took README from upstream cvs: fix COPYING file title and removed
-+    the line (Closes: #102139)
-+  * took arp.c from upstream: fixed name "PUB", better not found handling,
-+    implicite proxy arp mac changed from '*' to '<from_interface>',
-+    usage line made shorter
-+  * added mii-tool in control file (Closes: #172473)
-+  * fixed description of binary multiple in man page (Closes: #182487)
-+  * fixed interpunctation in netstat(8) (Closes: #191660)
-+  * fixed compile warning in inet_sr.c by removing empty default: label in
-+    switch
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Wed, 28 May 2003 22:35:12 +0200
-+
-+net-tools (1.60-5) unstable; urgency=low
-+
-+  * thanks Andrew for the 4.1 NMU
-+  * NMU: Apply nameif patch from Matt Domsch. (Closes: #178209)
-+  * Fix FTB bug (string concatenation in gcc 3.3) (Closes: #194995)
-+  * Fix segfault in mii-tool by using cvs version (Closes: #139027)
-+  * fixed plural of authors to make lintian happy (I JOIN YOU :)
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Wed, 28 May 2003 22:04:14 +0200
-+
-+net-tools (1.60-4.1) unstable; urgency=low
-+
-+  * NMU
-+  * Apply nameif patch from Matt Domsch. (Closes: #178209)
-+
-+ -- Andrew Suffield <asuffield@debian.org>  Wed,  9 Apr 2003 21:44:09 +0100
-+
-+net-tools (1.60-4) unstable; urgency=medium
-+
-+  * fixed (upstream) spurious newline in ifconfig
-+    Thanks Jonathen, Closes: Bug #109379
-+  * fixed SI-Units printout in ifconfig (Closes: Bug #110629, #97029, #100167)
-+  * this is done by including lib/interfaces.c from upstream cvs
-+  * also added ifconfig man page from upstream cvs
-+  * fixed (upstream) man page about netstat's --interface opt. (Closes: Bug#120475)
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Sat, 24 Nov 2001 06:26:37 +0100
-+
-+net-tools (1.60-3) unstable; urgency=medium
-+
-+  * fixed upstream error where counters in ifconfig/netstat -i are 0
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Sat, 10 Nov 2001 18:12:13 +0100
-+
-+net-tools (1.60-2) unstable; urgency=low
-+
-+  * Fixed the following bug: (Closes: #117837)
-+  * inserted ifconfig.c from upstream cvs to do this
-+  * bumped debian Standard 3.1.1 -> 3.5.6 and removed -g from linking
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Thu,  1 Nov 2001 02:51:33 +0100
-+
-+net-tools (1.60-1) unstable; urgency=low
-+
-+  * New upstream
-+  * Phil fixed the following Bugs upstream: (Closes: #91919, #93048, #90282)
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Mon, 16 Apr 2001 02:28:12 +0200
-+
-+net-tools (1.59-1) unstable; urgency=low
-+
-+  * added Build Dependencies (closes bug: #89083)
-+  * new upstream version
-+  * removed dh_suidregister and a few comments from rules file
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Sun, 18 Mar 2001 03:00:33 +0100
-+
-+net-tools (1.58-2) unstable; urgency=low
-+
-+  * backported ifconfig change from 1.59 to avoid closing socket too early
-+    on some systems (depending on the protocols installed). 
-+    Closes Bug: #85688, #85743
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Tue, 13 Feb 2001 01:39:59 +0100
-+
-+net-tools (1.58-1) unstable; urgency=low
-+
-+  * new upstream version
-+  * removed local man pages for now (Closes: bug #83894)
-+  * install nameif in /sbin
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Sat, 10 Feb 2001 21:50:30 +0100
-+
-+net-tools (1.57-2) unstable; urgency=high
-+
-+  * rebuild, this is believed to closes: #75825
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Sat, 30 Dec 2000 22:43:01 +0100
-+
-+net-tools (1.57-1) unstable; urgency=low
-+
-+  * new debian maintainer (thanks Anthony for the Work!)
-+  * new upstream version
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Mon, 14 Aug 2000 02:40:13 +0200
-+
-+net-tools (1.54-3) unstable; urgency=low
-+
-+  * Argggh. Don't use that horrible dh_installmanpages hack. (Closes:
-+    Bug#68925, Bug#68879)
-+
-+ -- Anthony Towns <ajt@debian.org>  Sun, 13 Aug 2000 00:12:05 +1000
-+
-+net-tools (1.54-2) unstable; urgency=low
-+
-+  * Reapply slattach patch from netbase 3.16-3.
-+
-+ -- Anthony Towns <ajt@debian.org>  Thu, 10 Aug 2000 11:32:58 +1000
-+
-+net-tools (1.54-1) unstable; urgency=low
-+
-+  * Split from netbase.
-+
-+ -- Anthony Towns <ajt@debian.org>  Mon, 17 Jul 2000 07:34:12 +1000
-+
-+Local variables:
-+mode: debian-changelog
-+End:
---- net-tools-1.60.orig/debian/watch
-+++ net-tools-1.60/debian/watch
-@@ -0,0 +1,3 @@
-+version=3
-+
-+http://download.berlios.de/net-tools/net-tools-(\d.*)\.tar\.(?:bz2|gz)
---- net-tools-1.60.orig/debian/patches/CVS-20081003-config.in_sync.patch
-+++ net-tools-1.60/debian/patches/CVS-20081003-config.in_sync.patch
-@@ -0,0 +1,74 @@
-+Sync with upstream CVS, complete log:
-+
-+Revision 1.24 - Fri Oct 3 02:09:57 2008 UTC by ecki
-+moved H suport for Infiniband to the right section
-+
-+Revision 1.23 - Fri Oct 3 01:55:07 2008 UTC by ecki
-+Add hardware support for InfiniBand (Debian Bug #294252 Tom Duffy from Sun).
-+
-+Revision 1.22 - Fri Jun 4 00:06:50 2004 UTC by ecki
-+default all options which work with recent systems  to on
-+
-+Revision 1.21 - Mon Nov 12 02:12:05 2001 UTC by ecki
-+added EUI64 Hardware Address Family
-+Daniel Stodden <stodden@in.tum.de>
-+
-+Index: net-tools/config.in
-+===================================================================
-+--- net-tools.orig/config.in
-++++ net-tools/config.in
-+@@ -49,16 +49,16 @@ bool 'Does your system support GNU gette
-+ * 
-+ bool 'UNIX protocol family' HAVE_AFUNIX y
-+ bool 'INET (TCP/IP) protocol family' HAVE_AFINET y
-+-bool 'INET6 (IPv6) protocol family' HAVE_AFINET6 n
-++bool 'INET6 (IPv6) protocol family' HAVE_AFINET6 y
-+ bool 'Novell IPX/SPX protocol family' HAVE_AFIPX y
-+ bool 'Appletalk DDP protocol family' HAVE_AFATALK y
-+ bool 'AX25 (packet radio) protocol family' HAVE_AFAX25 y
-+ bool 'NET/ROM (packet radio) protocol family' HAVE_AFNETROM y
-+-bool 'Rose (packet radio) protocol family' HAVE_AFROSE n
-++bool 'Rose (packet radio) protocol family' HAVE_AFROSE y
-+ bool 'X.25 (CCITT) protocol family' HAVE_AFX25 y
-+-bool 'Econet protocol family' HAVE_AFECONET n
-++bool 'Econet protocol family' HAVE_AFECONET y
-+ bool 'DECnet protocol family' HAVE_AFDECnet n
-+-bool 'Ash protocol family' HAVE_AFASH n
-++bool 'Ash protocol family' HAVE_AFASH y
-+ *
-+ *
-+ *            Device Hardware types.
-+@@ -71,21 +71,23 @@ bool 'IPIP Tunnel support' HAVE_HWTUNNEL
-+ bool 'STRIP (Metricom radio) support' HAVE_HWSTRIP y
-+ bool 'Token ring (generic) support' HAVE_HWTR y
-+ bool 'AX25 (packet radio) support' HAVE_HWAX25 y
-+-bool 'Rose (packet radio) support' HAVE_HWROSE n
-++bool 'Rose (packet radio) support' HAVE_HWROSE y
-+ bool 'NET/ROM (packet radio) support' HAVE_HWNETROM y
-+ bool 'X.25 (generic) support' HAVE_HWX25 y
-+ bool 'DLCI/FRAD (frame relay) support' HAVE_HWFR y
-+-bool 'SIT (IPv6-in-IPv4) support' HAVE_HWSIT n
-+-bool 'FDDI (generic) support' HAVE_HWFDDI n
-+-bool 'HIPPI (generic) support' HAVE_HWHIPPI n
-+-bool 'Ash hardware support' HAVE_HWASH n
-+-bool '(Cisco)-HDLC/LAPB support' HAVE_HWHDLCLAPB n
-++bool 'SIT (IPv6-in-IPv4) support' HAVE_HWSIT y
-++bool 'FDDI (generic) support' HAVE_HWFDDI y
-++bool 'HIPPI (generic) support' HAVE_HWHIPPI y
-++bool 'Ash hardware support' HAVE_HWASH y
-++bool '(Cisco)-HDLC/LAPB support' HAVE_HWHDLCLAPB y
-+ bool 'IrDA support' HAVE_HWIRDA y
-+-bool 'Econet hardware support' HAVE_HWEC n
-++bool 'Econet hardware support' HAVE_HWEC y
-++bool 'Generic EUI-64 hardware support' HAVE_HWEUI64 y
-++bool 'InfiniBand hardware support' HAVE_HWIB y
-+ *
-+ *
-+ *           Other Features.
-+ *
-+-bool 'IP Masquerading support' HAVE_FW_MASQUERADE n
-+-bool 'Build iptunnel and ipmaddr' HAVE_IP_TOOLS n
-+-bool 'Build mii-tool' HAVE_MII n
-++bool 'IP Masquerading support' HAVE_FW_MASQUERADE y
-++bool 'Build iptunnel and ipmaddr' HAVE_IP_TOOLS y
-++bool 'Build mii-tool' HAVE_MII y
---- net-tools-1.60.orig/debian/patches/local-manpages.patch
-+++ net-tools-1.60/debian/patches/local-manpages.patch
-@@ -0,0 +1,1759 @@
-+Formatting fixes to manpages, not found upstream.
-+
-+Index: net-tools/man/de_DE/arp.8
-+===================================================================
-+--- net-tools.orig/man/de_DE/arp.8
-++++ net-tools/man/de_DE/arp.8
-+@@ -1,12 +1,12 @@
-+-.TH ARP 8 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
-++.TH ARP 8 "6. M\(:arz 1999" "net\-tools" "Handbuch f\(:ur Linuxprogrammierer"
-+ .SH NAME
-+ arp \- Manipulation des ARP-Caches
-+ .SH SYNOPSIS
-+ .B arp 
-+ .RB [ \-vn ] 
-+ .RB [ "\-H Typ" ] 
-+-.RB [ "-i Schnittstelle" ] 
-+-.B -a 
-++.RB [ "\-i Schnittstelle" ] 
-++.B \-a 
-+ .RB [ Rechnername ]
-+ .PP
-+ .B arp 
-+@@ -19,14 +19,14 @@ arp \- Manipulation des ARP-Caches
-+ .RB [ \-v ] 
-+ .RB [ "\-H Typ" ] 
-+ .RB [ "\-i Schnittstelle" ] 
-+-.B -s Rechnername hw_adr
-++.B \-s Rechnername hw_adr
-+ .RB [ temp ] 
-+ .PP
-+ .B arp 
-+ .RB [ \-v ] 
-+ .RB [ "\-H Typ" ] 
-+ .RB [ "\-i Interface" ] 
-+-.B -s Rechnername hw_adr
-++.B \-s Rechnername hw_adr
-+ .RB [ "netmask nm" ] 
-+ .B pub
-+ .PP
-+@@ -34,15 +34,15 @@ arp \- Manipulation des ARP-Caches
-+ .RB [ \-v ] 
-+ .RB [ "\-H Typ" ] 
-+ .RB [ "\-i Schnittstelle" ] 
-+-.B -Ds Rechnername ifa
-++.B \-Ds Rechnername ifa
-+ .RB [ "netmask nm" ] 
-+ .B pub
-+ .PP
-+ .B arp 
-+ .RB [ \-vnD ]
-+ .RB [ "\-H Typ" ] 
-+-.RB [ "-i Schnittstelle" ]
-+-.B -f [Dateiname]
-++.RB [ "\-i Schnittstelle" ]
-++.B \-f [Dateiname]
-+ 
-+ .SH BESCHREIBUNG
-+ .B Arp
-+@@ -61,7 +61,7 @@ Ausf\(:uhrlichere Ausgaben.
-+ macht numerische Adressausgaben anstatt zu versuche, den symbolischen Rechner-,
-+ Port- oder Benutzernamen zu ermitteln.
-+ .TP
-+-.B "\-H type, \-\-hw-type type"
-++.B "\-H type, \-\-hw\-type type"
-+ Beim Setzen oder Auslesen des ARP-Caches schr\(:ankt diese Option
-+ ein, auf welcher Klasse von Eintr\(:agen 
-+ .B arp
-+@@ -86,7 +86,7 @@ Argument verwendet, so werden alle Eintr
-+ Alle Eintr\(:age f\(:ur den angegebenen Host entfernen.  Dies kann z.B.
-+ benutzt werden, wenn ein System angehalten wird.
-+ .TP
-+-.B "\-D, \-\-use-device"
-++.B "\-D, \-\-use\-device"
-+ Die Hardwareadresse der Netzwerksschnittstelle
-+ .B ifa
-+ verwenden.
-+@@ -180,6 +180,6 @@ Flagge.
-+ ethers(5), rarp(8), route(8), ifconfig(8), netstat(8)
-+ .SH AUTOREN
-+ Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> mit vielen Verbesserungen vom
-+-Verwalter der Net-Tools Bernd Eckenfels <net-tools@lina.inka.de>.
-++Verwalter der Net-Tools Bernd Eckenfels <net\-tools@lina.inka.de>.
-+ .SH \(:Ubersetzung
-+ Ralf B\(:achle <ralf@gnu.org>
-+Index: net-tools/man/de_DE/hostname.1
-+===================================================================
-+--- net-tools.orig/man/de_DE/hostname.1
-++++ net-tools/man/de_DE/hostname.1
-+@@ -3,7 +3,7 @@
-+ .\"
-+ .\" German translation by Ralf Baechle (ralf@gnu.org)
-+ .\"
-+-.TH HOSTNAME 1 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
-++.TH HOSTNAME 1 "6. M\(:arz 1999" "net\-tools" "Handbuch f\(:ur Linuxprogrammierer"
-+ 
-+ .SH NAME
-+ hostname \- den Rechnernamen anzeigen oder setzen.
-+@@ -28,7 +28,7 @@ nodename \- den DECnet-Knotennamen anzei
-+ .RB [ \-f ]
-+ .RB [ \-\-fqdn ]
-+ .RB [ \-i ]
-+-.RB [ \-\-ip-address ]
-++.RB [ \-\-ip\-address ]
-+ .RB [ \-\-long ]
-+ .RB [ \-s ]
-+ .RB [ \-\-short ]
-+@@ -195,7 +195,7 @@ ge\(:andert werden.
-+ .I "\-h, \-\-help"
-+ Kurzanleitung ausdrucken und beenden.
-+ .TP
-+-.I "\-i, \-\-ip-address"
-++.I "\-i, \-\-ip\-address"
-+ Die IP-Adresse(n) des Rechners anzeigen und beenden.
-+ .TP
-+ .I "\-n, \-\-node"
-+@@ -220,9 +220,9 @@ Option gegeben wird, dann kann Root auch
-+ .SH DATEIEN
-+ .B /etc/hosts
-+ .SH AUTOREN
-+-Peter Tobias, <tobias@et-inf.fho-emden.de>
-++Peter Tobias, <tobias@et\-inf.fho\-emden.de>
-+ .br
-+-Bernd Eckenfels, <net-tools@lina.inka.de> (NIS and manpage).
-++Bernd Eckenfels, <net\-tools@lina.inka.de> (NIS and manpage).
-+ .br
-+ Steve Whitehouse, <SteveW@ACM.org> (DECnet support and manpage).
-+ .SH \(:Ubersetzung
-+Index: net-tools/man/de_DE/ifconfig.8
-+===================================================================
-+--- net-tools.orig/man/de_DE/ifconfig.8
-++++ net-tools/man/de_DE/ifconfig.8
-+@@ -1,4 +1,4 @@
-+-.TH IFCONFIG 8 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
-++.TH IFCONFIG 8 "2007-12-02" "net\-tools" "Handbuch f\(:ur Linuxprogrammierer"
-+ .SH NAME
-+ ifconfig \- Konfiguration einer Netzwerkskarte
-+ .SH SYNOPSIS
-+@@ -19,7 +19,7 @@ Wird ein einzelne
-+ .BR Schnittstelle nargument
-+ angegeben, so zeigt es nur den Zustand der angegebenen Netzwerksschnittstelle
-+ an.  Wird ein einzelne
-+-.B -a
-++.B \-a
-+ Option angegeben, zeigt es den Zustand aller Schnittstellen an, selbst wenn
-+ diese inaktiviert sind.  Ansonsten konfiguriert
-+ .B ifconfig
-+@@ -130,13 +130,13 @@ sind
-+ kann benutzt werden, damit der Treiber automatischen den Typ des Mediums
-+ erkennt.  Wiederum unterst\(:utzen dies nicht alle Treiber.
-+ .TP
-+-.B "[-]broadcast [Adr]"
-++.B "[\-]broadcast [Adr]"
-+ Wird das Adressargument gegeben, so wird die Protokolladresse f\(:ur Broadcast
-+ f\(:ur diese Schnittstelle gesetzt.  Ansonsten wird die
-+ .B IFF_BROADCAST
-+ Flagge f\(:ur diese Schnittstelle gesetzt bzw. gel\(:oscht.
-+ .TP
-+-.B "[-]pointopoint [Adr]"
-++.B "[\-]pointopoint [Adr]"
-+ Dieses Schl\(:usselwort aktiviert den
-+ .B Punkt-zu-Punkt
-+ Modus einer Schnittstelle.  Das bedeutet, da\(ss eine Verbindung zwischen zwei
-+@@ -193,7 +193,7 @@ Kommando gemacht werden.
-+ W\(:ahrend AppleTalk DDP und IPX Adressen angezeigt werden, k\(:onnen sie mit
-+ diesem Kommando nicht ge\(:andert werden.
-+ .SH SIEHE AUCH
-+-route(8), netstat(8), arp(8), rarp(8), ipchains(8)
-++route(8), netstat(8), arp(8), rarp(8), ipchains(8), iptables(8), ifup(8), interfaces(5).
-+ .SH AUTOREN
-+ Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
-+ .br
-+Index: net-tools/man/de_DE/netstat.8
-+===================================================================
-+--- net-tools.orig/man/de_DE/netstat.8
-++++ net-tools/man/de_DE/netstat.8
-+@@ -9,7 +9,7 @@
-+ .\" Modified: Tuan Hoang tuan@optimus.mitre.org 
-+ .\"
-+ .\"
-+-.TH NETSTAT 8 "2007-12-02" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
-++.TH NETSTAT 8 "2007-12-02" "net\-tools" "Handbuch f\(:ur Linuxprogrammierer"
-+ 
-+ .SH NAME
-+ netstat \- Anzeige von Netzwerksverbindungen, Routentabellen, Schnittstellenstatistiken, maskierten Verbindungen, Netlink-Nachrichten und Mitgliedschaft in Multicastgruppen
-+@@ -76,17 +76,17 @@ Ohne Optionen zeigt
-+ den Zustand von offenen Sockets an.  Wird keine Adressfamilie angegeben, dann
-+ werden die offenen Sockets aller konfigurierten Adressfamilien gedruckt.
-+ Die Option
-+-.B -e
-++.B \-e
-+ gibt zus\(:atzliche Informationen aus (User ID).  Mit der Option
-+-.B -v
-++.B \-v
-+ gibt
-+ .B netstat
-+ zus\(:atzlich Fehlermeldungen \(:uber von Kernel nicht unterst\(:utzte
-+ Adressfamilien aus.  Die Option
-+-.B -p
-++.B \-p
-+ gibt zus\(:atzlich die PID und den Namen des Programms, das den Socket
-+ ge\(:offnet hat, aus.
-+-.B -a
-++.B \-a
-+ druckt alle Sockets einschlie\(sslich der auf Verbinungen wartenden
-+ Serversockets aus.  Die Adressfamilie
-+ .B inet
-+@@ -96,9 +96,9 @@ zeigt RAW, UDP und TCP Sockets an.
-+ Die
-+ .BR \-r ", " \-\-route
-+ Option gibt die Routentabellen des Kernels im gleichen Format wie
-+-.B "route -e" 
-++.B "route \-e" 
-+ aus.
-+-.B "netstat -er" 
-++.B "netstat \-er" 
-+ benutzt das Ausgabeformat von
-+ .BR route .
-+ Wegen Details siehe
-+@@ -106,18 +106,18 @@ Wegen Details siehe
-+ 
-+ .SS "\-i, \-\-interfaces"
-+ Wird die
-+-.BR -i ", " --interfaces
-++.BR \-i ", " \-\-interfaces
-+ Option verwendet,  so wird eine Tabelle aller Schnittstellen
-+ ausgedruckt.  Die Ausgabe ist im Format von
-+-.B "ifconfig -e"
-++.B "ifconfig \-e"
-+ und wird in
-+ .BR ifconfig (8)
-+ beschrieben.
-+-.B "netstat -ei" 
-++.B "netstat \-ei" 
-+ druckt eine Tabelle f\(:ur Interfaces wie
-+ .BR ifconfig .
-+ Die
-+-.B -a
-++.B \-a
-+ Option schlie\(sst Schnittstellen, die gar nicht konfiguriert sind in die
-+ Ausgabe ein, d.h. die die
-+ .BR U = UP
-+@@ -126,7 +126,7 @@ Flagge nicht gesetzt haben).
-+ .SS "\-M, \-\-masquerade"
-+ 
-+ Eine Liste aller maskierten Sitzungen wird dargestellt.  Der
-+-.B -e 
-++.B \-e 
-+ Schalter schlie\(sst zus\(:atzlich Information \(:uber Sequenznummern und
-+ Deltas, die durch das Umschreiben von FTP-Sitzungen (PORT Kommando) verursacht
-+ werden.  Maskieren wird dazu verwendet um Maschinen mit inoffiziellen
-+@@ -196,24 +196,24 @@ im Sekundenabstand die Ausgabe, bis es a
-+ .SS "Proto" 
-+ Das von Socket verwendete Protokoll (TCP, UDP, RAW).
-+ 
-+-.SS "Recv-Q"
-++.SS "Recv\-Q"
-+ Die Anzahl von Bytes, die noch nicht von der Anwendung vom Socket abgeholt
-+ wurden.
-+ 
-+-.SS "Send-Q"
-++.SS "Send\-Q"
-+ Die Anzahl von Bytes, die von der Gegenseite noch nicht best\(:atigt wurde.
-+ 
-+ .SS "Lokale Adresse" 
-+ Die lokale Adresse (lokaler Rechnername) und Portnummer des Sockets.  Au\(sser
-+ bei Verwendung der
-+-.B -n
-++.B \-n
-+ Option wird die Socketadresse nach dem kanonischen Rechnernamen und die
-+ Portnummer in den zugeh\(:origen Dienstenamen aufgel\(sst.
-+ 
-+ .SS "Gegenadresse"
-+ Die Adresse und Portnummer der Gegenseite des Sockets.  Wie bei lokalen
-+ Adressen schaltet der
-+-.B -n
-++.B \-n
-+ Schalter die Umwandlung von Rechneradresse und Portnummer ab.
-+ 
-+ .SS "State"
-+@@ -267,7 +267,7 @@ Der Socket wartet auf eingehende Verbind
-+ angezeit, wenn die
-+ The socket is listening for incoming connections. Those sockets are only
-+ displayed if the
-+-.BR -a , --listening
-++.BR \-a , \-\-listening
-+ Option gegeben wird.
-+ .TP
-+ .I
-+@@ -285,7 +285,7 @@ Der Name oder die Benutzer-ID des Eigent
-+ .SS "PID/Program name"
-+ Durch einen Schr\(:agstrich abgetrenntes Paar von Prozess-ID und Programmname
-+ des Programms, das diesen Socket besitzt.  Die Option
-+-.B -p
-++.B \-p
-+ schaltet die Anzeige dieser Spalte ein.  Es werden
-+ .B root
-+ Privilegien ben\(:otigt um die n\(:otigen Daten zu erhalten.  F\(:ur IPX
-+@@ -359,7 +359,7 @@ Der Socket ist unbenutzt
-+ H\(:Ort
-+ Der Socket lauscht nach Verbindungsanfragen.  Diese Sockets werden nur
-+ angezeigt, wenn die
-+-.BR -a , --listening
-++.BR \-a , \-\-listening
-+ Option gesetzt ist.
-+ .TP
-+ .I
-+@@ -411,7 +411,7 @@ werden.)
-+ 
-+ .PP
-+ .SH BEMERKUNGEN
-+-Seit der Kern Version 2.2 zeigt netstat -i keine Schnittstellenstatistiken
-++Seit der Kern Version 2.2 zeigt netstat \-i keine Schnittstellenstatistiken
-+ von Schnittstellenaliasen mehr an.  Um Statistiken per Schnittstelle zur
-+ erhalten, m\(:ussen jetzt mit dem
-+ .BR ipchains(8) 
-+@@ -489,14 +489,14 @@ so kann unsinnige Information ausgegeben
-+ unwahrscheinlich.
-+ .br
-+ Die
-+-.B netstat -i
-++.B netstat \-i
-+ die beschrieben wird sollte nach einigem S\(:aubern der BETA-Version des
-+ Codes des Net-Tools Packets funktionieren.
-+ 
-+ .PP
-+ .SH AUTOREN
-+ Die Benutzerschnittstelle wurde von Fred Baumgarten
-+-<dc6iq@insu1.etec.uni-karlsruhe.de> geschrieben, die Manpage zum gr\(:o\(ssten
-++<dc6iq@insu1.etec.uni\-karlsruhe.de> geschrieben, die Manpage zum gr\(:o\(ssten
-+ Teil von Matt Welsh <mdw@tc.cornell.edu>.  Sie wurde von Alan Cox
-+ <Alan.Cox@linux.org> aktualisiert, ben\(:otigt aber weitere Arbeit.
-+ .br
-+Index: net-tools/man/de_DE/plipconfig.8
-+===================================================================
-+--- net-tools.orig/man/de_DE/plipconfig.8
-++++ net-tools/man/de_DE/plipconfig.8
-+@@ -1,4 +1,4 @@
-+-.TH PLIPCONFIG 8 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
-++.TH PLIPCONFIG 8 "6. M\(:arz 1999" "net\-tools" "Handbuch f\(:ur Linuxprogrammierer"
-+ .SH NAME
-+ plipconfig \- Einstellung von PLIP Schnittstellen-Parametern
-+ .SH SYNOPSIS
-+Index: net-tools/man/de_DE/rarp.8
-+===================================================================
-+--- net-tools.orig/man/de_DE/rarp.8
-++++ net-tools/man/de_DE/rarp.8
-+@@ -1,14 +1,14 @@
-+-.TH RARP 8 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
-++.TH RARP 8 "6. M\(:arz 1999" "net\-tools" "Handbuch f\(:ur Linuxprogrammierer"
-+ .SH NAME
-+ rarp \- Manipulation des RARP-Caches
-+ .SH SYNOPSIS
-+-.B "rarp [-V] [--version] [-h] [--help]"
-++.B "rarp [\-V] [\-\-version] [\-h] [\-\-help]"
-+ .br
-+-.B "rarp -a"
-++.B "rarp \-a"
-+ .br
-+-.B "rarp [-v] -d Rechnername ..."
-++.B "rarp [\-v] \-d Rechnername ..."
-+ .br
-+-.B "rarp [-v] [-t type] -s Rechnername hw_addr"
-++.B "rarp [\-v] [\-t type] \-s Rechnername hw_addr"
-+ .SH BESCHREIBUNG
-+ .B Rarp
-+ kann die RARP-Tabelle des Kernels auf verschiedene Arten manipulieren.  Die
-+Index: net-tools/man/de_DE/route.8
-+===================================================================
-+--- net-tools.orig/man/de_DE/route.8
-++++ net-tools/man/de_DE/route.8
-+@@ -1,4 +1,4 @@
-+-.TH ROUTE 8 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
-++.TH ROUTE 8 "2007-12-02" "net\-tools" "Handbuch f\(:ur Linuxprogrammierer"
-+ .SH NAME
-+ route \- Anzeigen der IP-Routen-Tabelle
-+ .SH SYNOPSIS
-+@@ -51,11 +51,11 @@ Schnittstelle]
-+ .RB [ \-V ] 
-+ .RB [ \-\-version ]
-+ .RB [ \-h ]
-+-.RB [ \--help ]
-++.RB [ \-\-help ]
-+ .SH BESCHREIBUNG
-+ .B Route
-+ wird zum \(:Andern der IP-Routing-Tabelle der Kernels verwendet.  Seine
-+-prim\(:are Verwendung ist statische Routen f\*:ur bestimmte Rechner oder
-++prim\(:are Verwendung ist statische Routen f\(:ur bestimmte Rechner oder
-+ Netzwerke \(:uber eine Schnittstelle einzutragen, nachdem diese mit dem
-+ Programm
-+ .BR ifconfig (8)
-+@@ -92,13 +92,13 @@ Das
-+ ist ein Netzwerk.
-+ 
-+ .TP
-+-.B -host
-++.B \-host
-+ daS
-+ .B Ziel
-+ ist ein Rechner
-+ 
-+ .TP 
-+-.B -F
-++.B \-F
-+ Zeit die FIB Routentabelle des Kerns an.  Das Ausgabeformat kann mit den
-+ Optionen
-+ .B \-e
-+@@ -107,7 +107,7 @@ and
-+ ge\(:andert werden.
-+ 
-+ .TP 
-+-.B -C
-++.B \-C
-+ zeigt den Routencache des Kernels an.
-+ 
-+ .TP
-+@@ -120,8 +120,8 @@ f\(:ugt eine Route zu.
-+ 
-+ .TP
-+ .B Ziel
-+-Das Zielnetzwerk oder -System.  Die Angabe von sowohl IP-Adressen in Form
-+-von dezimalen durch Punkt getrennten Quadrupeln als auch Rechner- und
-++Das Zielnetzwerk oder \(hySystem.  Die Angabe von sowohl IP-Adressen in Form
-++von dezimalen durch Punkt getrennten Quadrupeln als auch Rechner\(hy und
-+ Netznamen ist zul\(:assig.
-+ 
-+ .TP
-+@@ -130,7 +130,7 @@ Netznamen ist zul\(:assig.
-+ 
-+ .TP
-+ .B gw Router
-+-Alle IP-Pakete f\(:ur das Zielnetzwerk / -System werden zum angegebenen
-++Alle IP-Pakete f\(:ur das Zielnetzwerk / \(hySystem werden zum angegebenen
-+ Router weitergeleitet.
-+ 
-+ .B ANMERKUNG:
-+@@ -202,7 +202,7 @@ der Optionen (metric, netmask, gw und de
-+ 
-+ .SH BEISPIELE
-+ .TP
-+-.B route add -net 127.0.0.0
-++.B route add \-net 127.0.0.0
-+ erzeugt die normale Loopbackroute mit der Netzmaske 255.0.0.0 (Netzwerk Klasse
-+ A, ermittelt aus der Zieladresse) und assoziert sie mit der Schnittstelle lo
-+ unter der Annahme, da\(ss dieses Ger\(:at vorher mit
-+@@ -210,18 +210,18 @@ unter der Annahme, da\(ss dieses Ger\(:a
-+ konfiguriert wurde. 
-+ 
-+ .TP 
-+-.B route add -net 192.56.76.0 netmask 255.255.255.0 dev eth0
-++.B route add \-net 192.56.76.0 netmask 255.255.255.0 dev eth0
-+ Legt eine Route zum Netzwerk 192.56.76.x \(:uber eth0 an.  Die Angabe der
-+ Klasse C Netzmaske ist in diesem Fall nicht n\(:otig, 192.* Klasse C
-+ IP-Adressen sind.  Das Wort dev darf in diesem Fall ausgelassen werden.
-+ 
-+ .TP
-+-.B route add default gw mango-gw
-++.B route add default gw mango\-gw
-+ legt eine Standardroute, d.h. eine Route die verwendet wird, wenn keine andere
-+-Route passt, an.  Alle Pakete \(:uber diese Route werden \(:uber mango-gw
-++Route passt, an.  Alle Pakete \(:uber diese Route werden \(:uber mango\-gw
-+ weitergeleitet.  Die Schnittstelle, die tats\(:achlich f\(:ur diese Route
-+-verwendet wird, h\(:angt davon ab, wie mango-gw erreicht werden kann.  Zuvor
-+-mu\(ss mango-gw bereits \(:uber eine andere Route erreicht werden k\(:onnen.
-++verwendet wird, h\(:angt davon ab, wie mango\-gw erreicht werden kann.  Zuvor
-++mu\(ss mango\-gw bereits \(:uber eine andere Route erreicht werden k\(:onnen.
-+ 
-+ .TP
-+ .B route add ipx4 sl0
-+@@ -229,7 +229,7 @@ Legt eine Route zum Rechner ipx4 \(:uber
-+ wird angenommen da\(ss ipx4 der SLIP-Rechner auf der Gegenseite ist.
-+ 
-+ .TP
-+-.B route add -net 192.57.66.0 netmask 255.255.255.0 gw ipx4
-++.B route add \-net 192.57.66.0 netmask 255.255.255.0 gw ipx4
-+ Dieses Kommando sorgt daf\(:ur, dass das Netz 192.57.66.x \(:uber die
-+ obige Route \(:uber die SLIP-Schnittstelle weitergeleitet wird.
-+ 
-+@@ -250,7 +250,7 @@ Dies installiert eine zur\(:uckweisende 
-+ Die Ausgabe der Kernelroutentabelle besteht aus folgenden Spalten
-+ .TP
-+ .B Ziel
-+-Das Zielnetzwerk oder -System.
-++Das Zielnetzwerk oder \(hySystem.
-+ .TP
-+ .B Router
-+ Die Adresse des weiterleitenden Routers oder "*", wenn keine gesetzt ist.
-+@@ -296,10 +296,10 @@ von Routend\(:amonen ben\(:otigt werden.
-+ Anzahl der Referenzen auf diese Route.  Wird vom Linux Kern nicht benutzt.
-+ .TP
-+ .B Benutzer
-+-Zahl der Suchvorg\(:ange nach dieser Route.  Abh\(:angig von -F und -C
-+-werden entweder fehlgeschlagene Suchen im Cache (-F) oder Cache-Treffer (-C)
-+-Count of lookups for the route.  Depending on the use of -F and -C this will
-+-be either route cache misses (-F) or hits (-C).
-++Zahl der Suchvorg\(:ange nach dieser Route.  Abh\(:angig von \-F und \-C
-++werden entweder fehlgeschlagene Suchen im Cache (\-F) oder Cache-Treffer (\-C)
-++Count of lookups for the route.  Depending on the use of \-F and \-C this will
-++be either route cache misses (\-F) or hits (\-C).
-+ .TP
-+ .B Schnittstelle
-+ Schnittstelle auf die Pakete f\(:ur diese Route geleitet werden.
-+@@ -345,6 +345,6 @@ zugef\(:ugt.  Bernd Eckenfels hat schlie
-+ irtt beigesteuert und den Code mit dem von Netstat vereinigt.
-+ .SH AUTOREN
-+ .B Route
-+-wird zur Zeit von Phil Blundel (Philip.Blundell@pobox.com) gewartet.
-++wird zur Zeit von Phil Blundel <Philip.Blundell@pobox.com> und Bernd Eckenfels <net-tools@lina.inka.de> gewartet.
-+ .SH \(:Ubersetzung
-+ Ralf B\(:achle <ralf@gnu.org>
-+Index: net-tools/man/de_DE/slattach.8
-+===================================================================
-+--- net-tools.orig/man/de_DE/slattach.8
-++++ net-tools/man/de_DE/slattach.8
-+@@ -1,8 +1,8 @@
-+-.TH SLATTACH 8 "6. M\(:arz 1999" "net-tools" "slattach"
-++.TH SLATTACH 8 "6. M\(:arz 1999" "net\-tools" "slattach"
-+ .SH NAME
-+ slattach \- Anbindung einer Netzwerksschnittstelle an eine serielle Verbindung
-+ .SH SYNOPSIS
-+-.B "slattach [-dehlLmnqv] [-c Kommando] [-p Protokoll] [-s Geschwindigkeit]
-++.B "slattach [\-dehlLmnqv] [\-c Kommando] [\-p Protokoll] [\-s Geschwindigkeit]
-+ [Terminal]"
-+ .br
-+ .SH BESCHREIBUNG
-+@@ -12,46 +12,46 @@ Reihe von m\(:oglichen Netzwerksmodi umz
-+ m\(:oglich, es zur Verbindung mit anderen Computern zu verwenden.
-+ .SH OPTIONEN
-+ .TP
-+-.B "[-c Kommando]"
-++.B "[\-c Kommando]"
-+ Den Befehl
-+ .B Kommando
-+ beim Auflegen der Verbindung ausf\(:uhren.  Die kann benutzt werden um
-+ Skripte laufen zu lassen oder eine Verbindung nach Abbruch wiederaufzubauen.
-+ .TP
-+-.B "[-d]"
-++.B "[\-d]"
-+ Zus\(:atzliche Ausgaben zur Fehlersuche einschalten.  N\(:utzlich, wenn
-+ eine Konfiguration nicht arbeitet.
-+ .TP
-+-.B "[-h]"
-++.B "[\-h]"
-+ Beenden, wenn der Tr\(:ager verloren geht.  Dies funktioniert sowohl auf
-+ /dev/tty als auch auf /dev/cua Ger\(:aten dadurch, da\(ss der Tr\(:ager
-+ alle 15 Sekunden \(:uberpr\(:uft wird.
-+-.B "[-v]"
-++.B "[\-v]"
-+ Ausf\(:uhrliche Ausgaben.  Die ist n\(:utzlich in Shellskripten.
-+ .TP
-+-.B "[-q]"
-++.B "[\-q]"
-+ Schaltet alle Ausgaben aus.
-+ .TP
-+-.B "[-l]"
-++.B "[\-l]"
-+ Erzeugt eine Sperrdatei in /var/lock \(:ahnlich wie UUCP.
-+ .TP
-+-.B "[-n]"
-++.B "[\-n]"
-+ Equivalent mit dem
-+ .B mesg n
-+ Befehl.
-+ .TP
-+-.B "[-m]"
-++.B "[\-m]"
-+ Versetzt \fBnot\fP die Verbindung in den 8-bit raw-Modus.
-+ .TP
-+-.B "[-e]"
-++.B "[\-e]"
-+ Beenden sofort nach der Initialisierung des Ger\(:ats anstelle darauf zu
-+ warten, da\(ss die Leitung aufgelegt wird.
-+ .TP
-+-.B "[-L]"
-++.B "[\-L]"
-+ Aktiviert 3-Draht-Betrieb.  Das Terminal wird in die CLOCAL Betriebsart
-+ geschaltet und der Tr\(:ager wird nicht \(:uberwacht.
-+ .TP
-+-.B "[-p Protokoll]"
-++.B "[\-p Protokoll]"
-+ Setzt ein spezifisches Protkoll um eine Leitung zu benutzen.  Die
-+ Voreinstellung ist
-+ .BR cslip ,
-+@@ -79,7 +79,7 @@ Verbindungen sollte stattdessen das
-+ .B axattach
-+ Programm verwendet werden.
-+ .TP
-+-.B "[-s Geschwindigkeit]"
-++.B "[\-s Geschwindigkeit]"
-+ Setzt eine von der Voreinstellung abweichende \(:Ubertragungseschwindigkeit.
-+ .PP
-+ Werden keine Argument gegeben, sie wird das aktuelle Terminal, das ist
-+Index: net-tools/man/en_US/arp.8
-+===================================================================
-+--- net-tools.orig/man/en_US/arp.8
-++++ net-tools/man/en_US/arp.8
-+@@ -1,4 +1,4 @@
-+-.TH ARP 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
-++.TH ARP 8 "2007-12-01" "net\-tools" "Linux Programmer's Manual"
-+ .SH NAME
-+ arp \- manipulate the system ARP cache
-+ .SH SYNOPSIS
-+@@ -167,8 +167,8 @@ used with 2.4 and newer kernels.
-+ Similar to the
-+ .B \-s
-+ option, only this time the address info is taken from file
-+-.B filename
-+-.  This can be used if ARP entries for a lot of hosts have to be
-++.B filename.
-++This can be used if ARP entries for a lot of hosts have to be
-+ set up.  The name of the data file is very often
-+ .IR /etc/ethers , 
-+ but this is not official. If no filename is specified /etc/ethers
-+@@ -196,7 +196,7 @@ flag. Permanent entries are marked with
-+ and published entries have the
-+ .B P
-+ flag.
-+-.SH EXAMPLES
-++.SH EXSAMPLES
-+ .B /usr/sbin/arp -i eth0 -Ds 10.0.0.2 eth1 pub
-+ 
-+ This will answer ARP requests for 10.0.0.2 on eth0 with the MAC address for
-+Index: net-tools/man/en_US/ethers.5
-+===================================================================
-+--- net-tools.orig/man/en_US/ethers.5
-++++ net-tools/man/en_US/ethers.5
-+@@ -1,4 +1,4 @@
-+-.TH ETHERS 5 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
-++.TH ETHERS 5 "May 15th, 2005" "" "File formats"
-+ .SH NAME \"{{{roff}}}\"{{{
-+ ethers \- Ethernet address to IP number database
-+ .\"}}}
-+@@ -7,17 +7,17 @@ ethers \- Ethernet address to IP number 
-+ IP numbers, one line for each IP number:
-+ .sp
-+ .RS
-+-\fIEthernet\-address\fP  \fIIP\-number\fP
-++\fIEthernet-address\fP  \fIIP-number\fP
-+ .RE
-+ .sp
-+ The two items are separated by any number of SPACE and/or TAB characters.
-+ A \fB#\fP at the beginning of a line starts a comment
-+-which extends to the end of the line.  The \fIEthernet\-address\fP is
-++which extends to the end of the line.  The \fIEthernet-address\fP is
-+ written as
-+ .IR x : x : x : x : x : x ,
-+ where \fIx\fP is a hexadecimal number between \fB0\fP and \fBff\fP
-+ which represents one byte of the address, which is in network byte
-+-order (big-endian).  The \fIIP\-number\fP may be a hostname which
-++order (big-endian).  The \fIIP-number\fP may be a hostname which
-+ can be resolved by DNS or a dot separated number.
-+ .\"}}}
-+ .SH EXAMPLES \"{{{
-+Index: net-tools/man/en_US/hostname.1
-+===================================================================
-+--- net-tools.orig/man/en_US/hostname.1
-++++ net-tools/man/en_US/hostname.1
-+@@ -1,4 +1,4 @@
-+-.TH HOSTNAME 1 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
-++.TH HOSTNAME 1 "28 Jan 1996" "net\-tools" "Linux Programmer's Manual"
-+ 
-+ .SH NAME
-+ hostname \- show or set the system's host name
-+Index: net-tools/man/en_US/ifconfig.8
-+===================================================================
-+--- net-tools.orig/man/en_US/ifconfig.8
-++++ net-tools/man/en_US/ifconfig.8
-+@@ -1,4 +1,4 @@
-+-.TH IFCONFIG 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
-++.TH IFCONFIG 8 "2007-12-02" "net\-tools" "Linux Programmer's Manual"
-+ .SH NAME
-+ ifconfig \- configure a network interface
-+ .SH SYNOPSIS
-+@@ -45,7 +45,7 @@ supported address families include
-+ display all interfaces which are currently available, even if down
-+ .TP
-+ .B -s
-+-display a short list (like netstat -i)
-++display a short list (like netstat \-i)
-+ .TP
-+ .B -v
-+ be more verbose for some error conditions
-+Index: net-tools/man/en_US/mii-tool.8
-+===================================================================
-+--- net-tools.orig/man/en_US/mii-tool.8
-++++ net-tools/man/en_US/mii-tool.8
-+@@ -1,7 +1,7 @@
-+ .\" Copyright (C) 2000 David A. Hinds -- dhinds@pcmcia.sourceforge.org
-+ .\" mii-tool.8 1.5 2000/04/25 22:58:19
-+ .\"
-+-.TH MII\-TOOL 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
-++.TH MII\-TOOL 8 "2004/03/28 23:30:00" "net\-tools"
-+ 
-+ .SH NAME
-+ mii\-tool \- view, manipulate media-independent interface status
-+Index: net-tools/man/en_US/nameif.8
-+===================================================================
-+--- net-tools.orig/man/en_US/nameif.8
-++++ net-tools/man/en_US/nameif.8
-+@@ -1,4 +1,4 @@
-+-.TH NAMEIF 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
-++.TH NAMEIF 8 "18 Oct 2000" "net\-tools" "Linux's Administrator's Manual"
-+ .SH NAME
-+ nameif \- name network interfaces based on MAC addresses
-+ .SH SYNOPSIS
-+Index: net-tools/man/en_US/netstat.8
-+===================================================================
-+--- net-tools.orig/man/en_US/netstat.8
-++++ net-tools/man/en_US/netstat.8
-+@@ -23,7 +23,7 @@ netstat \- Print network connections, ro
-+ .RB [ \-\-listening | \-l ]
-+ .RB [ \-\-all | \-a ]
-+ .RB [ \-\-numeric | \-n ]
-+-.RB [ \-\-numeric\-hosts "] [" \-\-numeric\-ports "] [" \-\-numeric\-users ]
-++.RB [ \-\-numeric-hosts "] [" \-\-numeric-ports "] [" \-\-numeric\-users ]
-+ .RB [ \-\-symbolic | \-N ]
-+ .RB [ \-\-extend | \-e  [ \-\-extend | \-e] ]
-+ .RB [ \-\-timers | \-o ]
-+@@ -186,11 +186,9 @@ Print routing information from the route
-+ .SS "Proto" 
-+ The protocol (tcp, udp, raw) used by the socket. 
-+ .SS "Recv\-Q"
-+-Established: The count of bytes not copied by the user program connected to this socket.
-+-Listening: Since Kernel 2.6.18 this column contains the current syn backlog.
-++The count of bytes not copied by the user program connected to this socket.
-+ .SS "Send\-Q"
-+-Established: The count of bytes not acknowledged by the remote host.
-+-Listening: Since Kernel 2.6.18 this column contains the maximum size of the syn backlog.
-++The count of bytes not acknowledged by the remote host.
-+ .SS "Local Address" 
-+ Address and port number of the local end of the socket.  Unless the
-+ .BR \-\-numeric " (" \-n )
-+Index: net-tools/man/en_US/plipconfig.8
-+===================================================================
-+--- net-tools.orig/man/en_US/plipconfig.8
-++++ net-tools/man/en_US/plipconfig.8
-+@@ -1,4 +1,4 @@
-+-.TH PLIPCONFIG 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
-++.TH PLIPCONFIG 8 "17 February 1995" "" ""
-+ .SH NAME
-+ plipconfig \- fine tune PLIP device parameters 
-+ .SH SYNOPSIS
-+Index: net-tools/man/en_US/rarp.8
-+===================================================================
-+--- net-tools.orig/man/en_US/rarp.8
-++++ net-tools/man/en_US/rarp.8
-+@@ -1,4 +1,4 @@
-+-.TH RARP 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
-++.TH RARP 8 "4 August 1997" "net\-tools" "Linux Programmer's Manual"
-+ .SH NAME
-+ rarp \- manipulate the system RARP table
-+ .SH SYNOPSIS
-+Index: net-tools/man/en_US/route.8
-+===================================================================
-+--- net-tools.orig/man/en_US/route.8
-++++ net-tools/man/en_US/route.8
-+@@ -1,4 +1,4 @@
-+-.TH ROUTE 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
-++.TH ROUTE 8 "2007-12-02" "net\-tools" "Linux Programmer's Manual"
-+ .SH NAME
-+ route \- show / manipulate the IP routing table
-+ .SH SYNOPSIS
-+Index: net-tools/man/en_US/slattach.8
-+===================================================================
-+--- net-tools.orig/man/en_US/slattach.8
-++++ net-tools/man/en_US/slattach.8
-+@@ -1,4 +1,4 @@
-+-.TH SLATTACH 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
-++.TH SLATTACH 8 "10 Oct 2006" "" ""
-+ .SH NAME
-+ slattach \- attach a network interface to a serial line
-+ .SH SYNOPSIS
-+Index: net-tools/man/fr_FR/arp.8
-+===================================================================
-+--- net-tools.orig/man/fr_FR/arp.8
-++++ net-tools/man/fr_FR/arp.8
-+@@ -1,12 +1,12 @@
-+-.TH ARP 8 "5 Jan 1999" "net-tools" "Linux Programmer's Manual"
-++.TH ARP 8 "5 Jan 1999" "net\-tools" "Linux Programmer's Manual"
-+ .SH NOM
-+ arp \- manipule la table ARP du syst�me
-+ .SH SYNOPSIS
-+ .B arp 
-+ .RB [ \-vn ] 
-+ .RB [ "\-H type" ] 
-+-.RB [ "-i if" ] 
-+-.B -a 
-++.RB [ "\-i if" ] 
-++.B \-a 
-+ .RB [ nom_h�te ]
-+ .PP
-+ .B arp 
-+@@ -19,14 +19,14 @@ arp \- manipule la table ARP du syst�me
-+ .RB [ \-v ] 
-+ .RB [ "\-H type" ] 
-+ .RB [ "\-i if" ] 
-+-.B -s nom_h�te hw_addr
-++.B \-s nom_h�te hw_addr
-+ .RB [ temp ] 
-+ .PP
-+ .B arp 
-+ .RB [ \-v ] 
-+ .RB [ "\-H type" ] 
-+ .RB [ "\-i if" ] 
-+-.B -s nom_h�te hw_addr
-++.B \-s nom_h�te hw_addr
-+ .RB [ "netmask nm" ] 
-+ .B pub
-+ .PP
-+@@ -34,15 +34,15 @@ arp \- manipule la table ARP du syst�me
-+ .RB [ \-v ] 
-+ .RB [ "\-H type" ] 
-+ .RB [ "\-i if" ] 
-+-.B -Ds nom_h�te ifa
-++.B \-Ds nom_h�te ifa
-+ .RB [ "netmask nm" ] 
-+ .B pub
-+ .PP
-+ .B arp 
-+ .RB [ \-vnD ]
-+ .RB [ "\-H type" ] 
-+-.RB [ "-i if" ]
-+-.B -f nom_fichier
-++.RB [ "\-i if" ]
-++.B \-f nom_fichier
-+ 
-+ .SH DESCRIPTION
-+ .B Arp
-+@@ -61,7 +61,7 @@ Dit � l'utilisateur ce qui se passe en �
-+ Affiche les adresses num�riques au lieu d'essayer de d�terminer les nom
-+ d'h�tes symboliques.
-+ .TP
-+-.B "\-H type, \-\-hw-type type"
-++.B "\-H type, \-\-hw\-type type"
-+ En positionnant ou lisant les entr�es ARP, ce param�tre optionnel indique
-+ � 
-+ .B arp
-+@@ -92,7 +92,7 @@ les entr�es seront affich�es.
-+ Enl�ve une entr�e pour l'h�te sp�cifi�.  Ceci peut �tre
-+ utilis� si l'h�te concern� ne fonctionne plus, par exemple.
-+ .TP
-+-.B "\-D, \-\-use-device"
-++.B "\-D, \-\-use\-device"
-+ Utilise l'adresse mat�rielle de l'interface
-+ .BR ifa
-+ .
-+@@ -178,7 +178,7 @@ et les entr�es 'pub' ont l'indicateur
-+ rarp(8), route(8), ifconfig(8), netstat(8)
-+ .SH AUTEUR
-+ Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> avec les am�liorations
-+-apport�es par le mainteneur des net-tools Bernd Eckenfels
-+-<net-tools@lina.inka.de>.
-++apport�es par le mainteneur des net\-tools Bernd Eckenfels
-++<net\-tools@lina.inka.de>.
-+ .SH TRADUCTION
-+ Jean Michel VANSTEENE (vanstee@worldnet.fr)
-+Index: net-tools/man/fr_FR/hostname.1
-+===================================================================
-+--- net-tools.orig/man/fr_FR/hostname.1
-++++ net-tools/man/fr_FR/hostname.1
-+@@ -1,4 +1,4 @@
-+-.TH HOSTNAME 1 "15 Mars 1999" "net-tools" "Linux Programmer's Manual"
-++.TH HOSTNAME 1 "15 Mars 1999" "net\-tools" "Linux Programmer's Manual"
-+ .SH NOM
-+ hostname \- affiche ou d�finit le nom d'h�te du syst�me
-+ .br
-+@@ -22,7 +22,7 @@ nodename \- affiche ou d�finit le nom de
-+ .RB [ \-f ]
-+ .RB [ \-\-fqdn ]
-+ .RB [ \-i ]
-+-.RB [ \-\-ip-address ]
-++.RB [ \-\-ip\-address ]
-+ .RB [ \-\-long ]
-+ .RB [ \-s ]
-+ .RB [ \-\-short ]
-+@@ -177,7 +177,7 @@ le nom FQDN et le nom de domaine (qui fa
-+ .I "\-h, \-\-help"
-+ Affiche un message d'aide et se termine.
-+ .TP
-+-.I "\-i, \-\-ip-address"
-++.I "\-i, \-\-ip\-address"
-+ Affiche la (les) adresse(s) IP de l'h�te.
-+ .TP
-+ .I "\-n, \-\-node"
-+@@ -203,9 +203,9 @@ Affiche le nom de domaine NIS. Si un par
-+ .SH FICHIERS
-+ .B /etc/hosts
-+ .SH AUTEURS
-+-Peter Tobias, <tobias@et-inf.fho-emden.de>
-++Peter Tobias, <tobias@et\-inf.fho\-emden.de>
-+ .br
-+-Bernd Eckenfels, <net-tools@lina.inka.de> (NIS et pages de manuel).
-++Bernd Eckenfels, <net\-tools@lina.inka.de> (NIS et pages de manuel).
-+ .br
-+ Steve Whitehouse, <SteveW@ACM.org> (Support DECnet et pages de manuel).
-+ .SH TRADUCTION
-+Index: net-tools/man/fr_FR/ifconfig.8
-+===================================================================
-+--- net-tools.orig/man/fr_FR/ifconfig.8
-++++ net-tools/man/fr_FR/ifconfig.8
-+@@ -1,4 +1,4 @@
-+-.TH IFCONFIG 8 "4 August 1997" "net-tools" "Linux Programmer's Manual"
-++.TH IFCONFIG 8 "2007-12-02" "net\-tools" "Linux Programmer's Manual"
-+ .SH NOM
-+ ifconfig \- configure une interface r�seau
-+ .SH SYNOPSIS
-+@@ -20,7 +20,7 @@ seul le param�tre
-+ .B interface
-+ est donn�, il affiche seulement l'�tat de l'interface correspondante;
-+ si seul le param�tre
-+-.B -a
-++.B \-a
-+ est fourni, il affiche l'�tat de toutes les interfaces, m�me celles qui
-+ ne sont pas actives.
-+ Autrement, il consid�re qu'il faut positionner de nouvelles valeurs.
-+@@ -128,14 +128,14 @@ permet d'indiquer au pilote de d�tecter 
-+ utilis�. Une fois de plus, tous les p�riph�riques ne supportent pas cette
-+ option.
-+ .TP
-+-.B "[-]broadcast [adr]"
-++.B "[\-]broadcast [adr]"
-+ Si l'adresse est �galement donn�e, d�finit l'adresse broadcast
-+ protocolaire pour cette interface. Autrement, il permet d'armer (ou d�sarmer)
-+ l'indicateur
-+ .B IFF_BROADCAST
-+ de l'interface.
-+ .TP
-+-.B "[-]pointopoint [adr]"
-++.B "[\-]pointopoint [adr]"
-+ Ce mot cl� valide le mode
-+ .B point-�-point
-+ d'une interface, signifiant qu'il existe un lien direct entre 2 machines,
-+@@ -196,7 +196,7 @@ comptabilit� particuli�res pour l'adress
-+ M�me si les adresses appletalk DDP et IPX peuvent �tre affich�es,
-+ elles ne peuvent �tre modifi�es avec cette commande.
-+ .SH VOIR AUSSI
-+-route(8), netstat(8), arp(8), rarp(8), ipchains(8)
-++route(8), netstat(8), arp(8), rarp(8), ipchains(8), iptables(8), ifup(8), interfaces(5).
-+ .SH AUTHORS
-+ Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
-+ .br
-+Index: net-tools/man/fr_FR/netstat.8
-+===================================================================
-+--- net-tools.orig/man/fr_FR/netstat.8
-++++ net-tools/man/fr_FR/netstat.8
-+@@ -8,7 +8,7 @@
-+ .\" Modified: Tuan Hoang tuan@optimus.mitre.org 
-+ .\"
-+ .\"
-+-.TH NETSTAT 8 "2007-12-02" "net-tools" "Linux Programmer's Manual"
-++.TH NETSTAT 8 "2007-12-02" "net\-tools" "Linux Programmer's Manual"
-+ 
-+ .SH NAME
-+ netstat \- Affiche les connexions r�seau, les tables de routage, les
-+@@ -76,17 +76,17 @@ ouvertes. C'est l'option par d�faut : si
-+ d'adresses, les sockets actives de toutes les familles d'adresses seront
-+ affich�es.
-+ Avec le param�tre
-+-.B -e
-++.B \-e
-+ vous obtenez quelques informations suppl�mentaires (userid). Avec le param�tre
-+-.B -v
-++.B \-v
-+ vous pouvez demander � netstat de signaler des familles d'adresses connues
-+ non support�es par le noyau. Le param�tre
-+-.B -o
-++.B \-o
-+ affiche des informations suppl�mentaires sur les timers r�seau. En donnant
-+ le param�tre
-+-.B -p
-++.B \-p
-+ vous verrez le PID et le nom du processus � qui appartient la socket. Le param�tre
-+-.B -a
-++.B \-a
-+ affiche toutes les sockets, y compris les sockets d'�coute des serveurs. La famille
-+ d'adresses
-+ .B inet
-+@@ -97,9 +97,9 @@ Avec le param�tre
-+ .BR \-r ", " \-\-route
-+ vous pouvez visualiser les tables de routage dans le m�me format qu'avec la
-+ commande
-+-.B "route -e" 
-++.B "route \-e" 
-+ .
-+-.B "netstat -er" 
-++.B "netstat \-er" 
-+ utilisera le format de la commande
-+ .BR route .
-+ Veuillez consulter
-+@@ -108,19 +108,19 @@ pour plus de d�tails.
-+ 
-+ .SS "\-i, \-\-interfaces \fIiface\fI"
-+ Si vous utilisez l'option
-+-.BR -i ", " --interfaces
-++.BR \-i ", " \-\-interfaces
-+ , une table de toutes (ou de l'interface
-+ .IR iface 
-+ sp�cifi�e) les interfaces r�seau sera affich�e. Le format de sortie est le
-+ m�me que celui de la commande
-+-.B "ifconfig -e"
-++.B "ifconfig \-e"
-+ , et est d�crit dans
-+ .BR ifconfig (8).
-+-.B "netstat -ei"
-++.B "netstat \-ei"
-+ affiche une table ou une seule entr�e d'interface comme la commande 
-+ .BR ifconfig .
-+ Avec le param�tre
-+-.B -a
-++.B \-a
-+ , vous pouvez inclure les interfaces qui ne sont pas configur�es (c.a.d qui
-+ n'ont pas l'indicateur
-+ .BR U = UP
-+@@ -129,7 +129,7 @@ arm�).
-+ .SS "\-M, \-\-masquerade"
-+ 
-+ Permet de voir les sessions ayant de l'IP-masquerade. Avec le param�tre
-+-.B -e 
-++.B \-e 
-+ vous pouvez inclure quelques informations concernant les num�ros de
-+ s�quence et les deltas caus�s par des r��critures de donn�es sur des
-+ sessions FTP (commande PORT). Le support de l'IP-Masquerade est utilis�
-+@@ -197,24 +197,24 @@ l'interrompiez.
-+ .SS "Proto" 
-+ Le protocole (TCP, UDP, RAW) utilis� par la socket. 
-+ 
-+-.SS "Recv-Q"
-++.SS "Recv\-Q"
-+ Le nombre d'octets non encore lus par le programme utilisateur connect�
-+ � cette socket.
-+ 
-+-.SS "Send-Q"
-++.SS "Send\-Q"
-+ Le nombre d'octets non encore acquitt�s par l'h�te distant.
-+ 
-+ .SS "Local Address (Adresse locale)" 
-+ L'adresse locale (nom d'h�te local) et num�ro de port de la
-+ socket. Sauf si l'option
-+-.B -n
-++.B \-n
-+ est donn�e, l'adresse de la prise est traduite en nom d'h�te,
-+ et le num�ro de port est traduit en nom de service correspondant.
-+ 
-+ .SS "Foreign Address (Adresse distante)"
-+ L'adresse distante (nom d'h�te distant) et le num�ro de port de
-+ la prise. Comme pour l'adresse locale et le num�ro de port, l'option
-+-.B -n
-++.B \-n
-+ invalide la traduction du nom d'h�te et de service.
-+ 
-+ .SS "State (Etat)"
-+@@ -264,7 +264,7 @@ Le distant termine, et la socket est fer
-+ LISTEN
-+ La socket est � l'�coute de connexions entrantes. Ces sockets ne sont
-+ affich�es que si le param�tre
-+-.BR -a , --listening
-++.BR \-a , \-\-listening
-+ est fourni.
-+ .TP
-+ .I
-+@@ -282,7 +282,7 @@ Le nom d'utilisateur ou l'UID du propri�
-+ .SS "PID/Program name (PID/Nom de Programme)"
-+ Le PID et le nom du programme (s�par�s par un slash) propri�taire de la
-+ socket. Le param�tre
-+-.B -p
-++.B \-p
-+ active l'affichage de cette colonne. Vous devez avoir les droits de
-+ .B root
-+ puisque vous devez avoir les droits d'acc�s aux processus pour visualiser
-+@@ -357,7 +357,7 @@ La socket n'est pas allou�e
-+ LISTENING
-+ La socket est � l'�coute de demandes de connexions. Ces sockets ne sont
-+ affich�es que si le param�tre
-+-.BR -a , --listening
-++.BR \-a , \-\-listening
-+ est fourni.
-+ .TP
-+ .I
-+@@ -406,7 +406,7 @@ Affiche le chemin correspondant � l'atta
-+ 
-+ .PP
-+ .SH NOTES
-+-Depuis la version 2.2 du noyau, netstat -i n'affiche plus les statistiques
-++Depuis la version 2.2 du noyau, netstat \-i n'affiche plus les statistiques
-+ des interfaces alias. Pour obtenir les compteurs par interface alias, vous
-+ devez d�finir des r�gles sp�cifiques � l'aide de la commande
-+ .BR ipchains (8).
-+@@ -482,18 +482,18 @@ si une socket change d'�tat au moment ou
-+ Ceci est peut probable.
-+ .br
-+ Le param�tre
-+-.B netstat -i
-++.B netstat \-i
-+ est d�crit tel qu'il fonctionnera lorsque le code de la version BETA du
-+-paquetage net-tools aura �t� nettoy�.
-++paquetage net\-tools aura �t� nettoy�.
-+ 
-+ .PP
-+ .SH AUTEURS
-+ L'interface utilisateur de netstat a �t� d�velopp�e par
-+-Fred Baumgarten <dc6iq@insu1.etec.uni-karlsruhe.de>. Les pages du
-++Fred Baumgarten <dc6iq@insu1.etec.uni\-karlsruhe.de>. Les pages du
-+ manuel essentiellement �crites par Matt Welsh
-+ <mdw@tc.cornell.edu>. Mis � jour par Alan Cox <Alan.Cox@linux.org>.
-+ .br
-+-La page de manuel et la commande incluse dans le paquetage net-tools
-++La page de manuel et la commande incluse dans le paquetage net\-tools
-+ a �t� totallement r��crite par Bernd Eckenfels 
-+ <ecki@linux.de>.
-+ .SH TRADUCTION
-+Index: net-tools/man/fr_FR/rarp.8
-+===================================================================
-+--- net-tools.orig/man/fr_FR/rarp.8
-++++ net-tools/man/fr_FR/rarp.8
-+@@ -1,14 +1,14 @@
-+-.TH RARP 8 "4 Ao�t 1997" "net-tools" "Linux Programmer's Manual"
-++.TH RARP 8 "4 Ao�t 1997" "net\-tools" "Linux Programmer's Manual"
-+ .SH NOM
-+ rarp \- manipule la table syst�me RARP
-+ .SH SYNOPSIS
-+-.B "rarp [-V] [--version] [-h] [--help]"
-++.B "rarp [\-V] [\-\-version] [\-h] [\-\-help]"
-+ .br
-+-.B "rarp -a"
-++.B "rarp \-a"
-+ .br
-+-.B "rarp [-v] -d nom_d_hote ..."
-++.B "rarp [\-v] \-d nom_d_hote ..."
-+ .br
-+-.B "rarp [-v] [-t type] -s nom_d_hote adr_materiel"
-++.B "rarp [\-v] [\-t type] \-s nom_d_hote adr_materiel"
-+ .SH DESCRIPTION
-+ .B Rarp
-+ manipule la table RARP du noyau de diff�rentes fa�ons.  Les options de base
-+Index: net-tools/man/fr_FR/route.8
-+===================================================================
-+--- net-tools.orig/man/fr_FR/route.8
-++++ net-tools/man/fr_FR/route.8
-+@@ -1,4 +1,4 @@
-+-.TH ROUTE 8 "8 Ao�t 1997" "net-tools" "Linux Programmer's Manual"
-++.TH ROUTE 8 "2007-12-02" "net\-tools" "Linux Programmer's Manual"
-+ .SH NAME
-+ route \- affiche / manipule la table de routage IP
-+ .SH SYNOPSIS
-+@@ -51,7 +51,7 @@ If]
-+ .RB [ \-V ] 
-+ .RB [ \-\-version ]
-+ .RB [ \-h ]
-+-.RB [ \--help ]
-++.RB [ \-\-help ]
-+ .SH DESCRIPTION
-+ .B Route
-+ manipule la table de routage IP du noyau.  Son utilisation premi�re
-+@@ -77,7 +77,7 @@ savoir pourquoi la route vers votre serv
-+ .TP
-+ .B \-e
-+ utilise
-+-.BR netstat (8)-format
-++.BR netstat (8)\-format
-+ pour l'affichage de la table de routage.
-+ .B \-ee 
-+ G�n�re une tr�s longue ligne avec tous les param�tres � partir de la table
-+@@ -90,13 +90,13 @@ la
-+ est un r�seau.
-+ 
-+ .TP
-+-.B -host
-++.B \-host
-+ la
-+ .B cible 
-+ est un h�te.
-+ 
-+ .TP 
-+-.B -F
-++.B \-F
-+ affiche la table de routage FIB du noyau. L'organisation peut �tre chang�e avec
-+ .B \-e
-+ et
-+@@ -104,7 +104,7 @@ et
-+ .
-+ 
-+ .TP 
-+-.B -C
-++.B \-C
-+ affiche le cache de routage du noyau. 
-+ 
-+ .TP
-+@@ -188,25 +188,25 @@ modificateurs de route (metric - netmask
-+ 
-+ .SH EXEMPLES
-+ .TP
-+-.B route add -net 127.0.0.0
-++.B route add \-net 127.0.0.0
-+ ajoute l'entr�e loopback normale, en utilisant le masque 255.0.0.0 (r�seau
-+ de classe A, selon l'adresse de destination) et associ�e avec l'interface 
-+ "lo" (en supposant que ce p�riph�rique a �t� correctement configur� avec
-+ .BR ifconfig (8)). 
-+ 
-+ .TP 
-+-.B route add -net 192.56.76.0 netmask 255.255.255.0 dev eth0
-++.B route add \-net 192.56.76.0 netmask 255.255.255.0 dev eth0
-+ ajoute une route vers le r�seau 192.56.76.x via 
-+ "eth0". Le masque de classe C n'est pas vraiment n�cessaire ici car
-+ 192.* est une adresse IP de classe C. Le mot "dev" peut �tre omis. 
-+ 
-+ .TP
-+-.B route add default gw mango-gw
-++.B route add default gw mango\-gw
-+ ajoute une route par d�faut (qui sera utilis�e si aucune autre route ne
-+ convient). Tous les paquets empreintant cette route passeront par
-+-"mango-gw". Le p�riph�rique qui sera effectivement utilis� pour cette route
-+-d�pend de la fa�on dont on atteint "mango-gw" - la route statique vers
-+-"mango-gw" devra �tre pr�alablement configur�e. 
-++"mango\-gw". Le p�riph�rique qui sera effectivement utilis� pour cette route
-++d�pend de la fa�on dont on atteint "mango\-gw" - la route statique vers
-++"mango\-gw" devra �tre pr�alablement configur�e. 
-+ 
-+ .TP
-+ .B route add ipx4 sl0
-+@@ -214,7 +214,7 @@ ajoute une route vers l'h�te "ipx4" via 
-+ "ipx4" est l'h�te SLIP).
-+ 
-+ .TP
-+-.B route add -net 192.57.66.0 netmask 255.255.255.0 gw ipx4
-++.B route add \-net 192.57.66.0 netmask 255.255.255.0 gw ipx4
-+ Cette commande route le r�seau "192.57.66.x" par l'ancienne route vers l'interface SLIP.
-+ 
-+ .TP
-+@@ -285,8 +285,8 @@ de routage.
-+ Nombre de r�f�rences � cette route. (Pas utilis� dans le noyau Linux.)
-+ .TP
-+ .B Use
-+-Count of lookups for the route.  Depending on the use of -F and -C this will
-+-be either route cache misses (-F) or hits (-C).
-++Count of lookups for the route.  Depending on the use of \-F and \-C this will
-++be either route cache misses (\-F) or hits (\-C).
-+ .TP
-+ .B Iface
-+ Interface vers laquelle les paquets empruntant cette route seront envoy�s.
-+@@ -330,6 +330,6 @@ Linus Torvalds pour pl15. Alan Cox a ajo
-+ la gestion des fen�tres et MSS pour Linux 1.1.22. Le support de irtt 
-+ et la fusion avec netstat ont �t� r�alis�s par Bernd Eckenfels.
-+ .SH AUTEUR
-+-Maintenu par Phil Blundell <Philip.Blundell@pobox.com>.
-++Maintenu par Phil Blundell <Philip.Blundell@pobox.com> et Bernd Eckenfels <net-tools@lina.inka.de>.
-+ .SH TRADUCTION
-+-Jean-Michel VANSTEENE (vanstee@worldnet.fr)
-++Jean-Michel VANSTEENE <vanstee@worldnet.fr>
-+Index: net-tools/man/fr_FR/slattach.8
-+===================================================================
-+--- net-tools.orig/man/fr_FR/slattach.8
-++++ net-tools/man/fr_FR/slattach.8
-+@@ -2,7 +2,7 @@
-+ .SH NOM
-+ slattach \- attache une interface r�seau � une ligne s�rie
-+ .SH SYNOPSIS
-+-.B "slattach [-dehlLmnqv] [-c commande] [-p proto] [-s vitesse] [tty]"
-++.B "slattach [\-dehlLmnqv] [\-c commande] [\-p proto] [\-s vitesse] [tty]"
-+ .br
-+ .SH DESCRIPTION
-+ .B Slattach
-+@@ -12,46 +12,46 @@ ceci vous permettant de l'utiliser pour 
-+ vers d'autres syst�mes.
-+ .SH OPTIONS
-+ .TP
-+-.B "[-c commande]"
-++.B "[\-c commande]"
-+ Ex�cute
-+ .B `commande'
-+ lorsque la ligne est suspendue. Ceci peut �tre utilis� pour lancer
-+ des scripts ou r��tablir des connexions quand un lien tombe.
-+ .TP
-+-.B "[-d]"
-++.B "[\-d]"
-+ Valide le d�bogage.  Utile pour d�terminer pourquoi une configuration
-+ ne fonctionne pas.
-+ .TP
-+-.B "[-h]"
-++.B "[\-h]"
-+ Termine lorsque la porteuse est perdue. Ceci fonctionne � la fois sur
-+ les p�riph�riques /dev/tty et /dev/cua en contr�lant directement
-+ l'�tat de la porteuse toutes les 15 secondes.
-+ .TP
-+-.B "[-v]"
-++.B "[\-v]"
-+ Valide le mode verbeux.  Utile pour les shell scripts.
-+ .TP
-+-.B "[-q]"
-++.B "[\-q]"
-+ Op�re en mode silencieux - pas de messages du tout.
-+ .TP
-+-.B "[-l]"
-++.B "[\-l]"
-+ Cr�e un fichier de v�rouillage pour le p�riph�rique comme
-+ pour UUCP dans /var/lock.
-+ .TP
-+-.B "[-n]"
-++.B "[\-n]"
-+ Equivalent � la commande "mesg n".
-+ .TP
-+-.B "[-m]"
-++.B "[\-m]"
-+ \fBn'\fPinitialise \fBpas\fP la ligne en mode raw 8 bits.
-+ .TP
-+-.B "[-e]"
-++.B "[\-e]"
-+ Termine correctement apr�s l'initialisation du p�riph�rique,
-+ au lieu d'attendre que la ligne soit suspendue.
-+ .TP
-+-.B "[-L]"
-++.B "[\-L]"
-+ Valide les op�rations 3 lignes. Le terminal est mis en mode CLOCAL, 
-+ la surveillance de porteuse est invalid�e.
-+ .TP
-+-.B "[-p proto]"
-++.B "[\-p proto]"
-+ D�finit le protocole sp�cifique � utiliser sur la ligne.
-+ La valeur par d�faut est 
-+ .B "cslip"
-+@@ -75,7 +75,7 @@ pour �tre actif sur la ligne. Pour les c
-+ .B axattach
-+ doit �tre utilis�.
-+ .TP
-+-.B "[-s vitesse]"
-++.B "[\-s vitesse]"
-+ D�finit la vitesse de la ligne, diff�rente de la valeur par d�faut.
-+ .PP
-+ Si aucun argument n'est donn�, la ligne courante du terminal
-+Index: net-tools/man/pt_BR/arp.8
-+===================================================================
-+--- net-tools.orig/man/pt_BR/arp.8
-++++ net-tools/man/pt_BR/arp.8
-+@@ -1,12 +1,12 @@
-+-.TH ARP 8 "22 de junho de 1996" "net-tools" "Manual do Programador Linux"
-++.TH ARP 8 "22 de junho de 1996" "net\-tools" "Manual do Programador Linux"
-+ .SH NOME
-+ arp \- manipula o cache ARP do sistema
-+ .SH SINOPSE
-+ .B arp 
-+ .RB [ \-vn ] 
-+ .RB [ "\-H tipo" ] 
-+-.RB [ "-i if" ] 
-+-.B -a 
-++.RB [ "\-i if" ] 
-++.B \-a 
-+ .RB [ m�quina ]
-+ .PP
-+ .B arp 
-+@@ -20,7 +20,7 @@ arp \- manipula o cache ARP do sistema
-+ .RB [ \-v ] 
-+ .RB [ "\-H tipo" ] 
-+ .RB [ "\-i if" ] 
-+-.B -s m�quina endere�o_hardware
-++.B \-s m�quina endere�o_hardware
-+ .RB [ temp ] 
-+ .RB [ nopub ]
-+ .PP
-+@@ -28,7 +28,7 @@ arp \- manipula o cache ARP do sistema
-+ .RB [ \-v ] 
-+ .RB [ "\-H tipo" ] 
-+ .RB [ "\-i if" ] 
-+-.B -s m�quina endere�o_hardware
-++.B \-s m�quina endere�o_hardware
-+ .RB [ "netmask nm" ] 
-+ .B pub
-+ .PP
-+@@ -36,15 +36,15 @@ arp \- manipula o cache ARP do sistema
-+ .RB [ \-v ] 
-+ .RB [ "\-H tipo" ] 
-+ .RB [ "\-i if" ] 
-+-.B -Ds m�quina ifa
-++.B \-Ds m�quina ifa
-+ .RB [ "netmask nm" ] 
-+ .B pub
-+ .PP
-+ .B arp 
-+ .RB [ \-vnD ]
-+ .RB [ "\-H tipo" ] 
-+-.RB [ "-i if" ]
-+-.B -f arquivo
-++.RB [ "\-i if" ]
-++.B \-f arquivo
-+ 
-+ .SH DESCRI��O
-+ .B arp
-+@@ -62,7 +62,7 @@ Mostra ao usu�rio o que est� acontecendo
-+ mostra endere�os num�ricos, ao inv�s de tentar determinar os nomes simb�licos da
-+ m�quina, porta e usu�rio.
-+ .TP
-+-.B "\-H type, \-\-hw-type type"
-++.B "\-H type, \-\-hw\-type type"
-+ Quando configurando ou lendo o cache ARP, este par�metro opcional informa ao
-+ .B arp
-+ que classe de entradas devem ser verificadas. O valor padr�o deste par�metro �
-+@@ -96,7 +96,7 @@ ou
-+ para decidir se uma entrada p�blica ou privada deve ser removida. Se voc�
-+ n�o informar uma destas flags as duas entradas ser�o removidas.
-+ .TP
-+-.B "\-D, \-\-use-device"
-++.B "\-D, \-\-use\-device"
-+ Usa o endere�o de hardware da interface 
-+ .BR ifa
-+ .TP
-+@@ -170,7 +170,7 @@ e entradas publicadas tem uma flag 
-+ .I /etc/ethers
-+ .SH AUTOR
-+ Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> com muitas melhorias
-+-feitas pelo mantenedor do net-tools, Bernd Eckenfels <net-tools@lina.inka.de>.
-++feitas pelo mantenedor do net\-tools, Bernd Eckenfels <net\-tools@lina.inka.de>.
-+ Tradu��o para a l�ngua portuguesa feita por
-+ Arnaldo Carvalho de Melo <acme@conectiva.com.br> em 11/abril/1998.
-+ Revisado por 
-+Index: net-tools/man/pt_BR/hostname.1
-+===================================================================
-+--- net-tools.orig/man/pt_BR/hostname.1
-++++ net-tools/man/pt_BR/hostname.1
-+@@ -1,4 +1,4 @@
-+-.TH HOSTNAME 1 "28 de janeiro de 1996" "net-tools" "Manual do Programador Linux"
-++.TH HOSTNAME 1 "28 de janeiro de 1996" "net\-tools" "Manual do Programador Linux"
-+ 
-+ .SH NOME
-+ hostname \- mostra ou configura o nome da m�quina 
-+@@ -21,7 +21,7 @@ ypdomainname \- mostra ou configura o no
-+ .RB [ \-f ]
-+ .RB [ \-\-fqdn ]
-+ .RB [ \-i ]
-+-.RB [ \-\-ip-address ]
-++.RB [ \-\-ip\-address ]
-+ .RB [ \-\-long ]
-+ .RB [ \-s ]
-+ .RB [ \-\-short ]
-+@@ -161,7 +161,7 @@ do dom�nio DNS (que � parte do FQDN) no 
-+ .I "\-h, \-\-help"
-+ Mostra uma mensagem sobre como utilizar o comando e termina.
-+ .TP
-+-.I "\-i, \-\-ip-address"
-++.I "\-i, \-\-ip\-address"
-+ Mostra o(s) endere�o(s) IP da m�quina.
-+ .TP
-+ .I "\-s, \-\-short"
-+@@ -180,9 +180,9 @@ Mostra o nome do dom�nio NIS. Se um par�
-+ .SH ARQUIVOS
-+ .B /etc/hosts
-+ .SH AUTOR
-+-Peter Tobias, <tobias@et-inf.fho-emden.de>
-++Peter Tobias, <tobias@et\-inf.fho\-emden.de>
-+ .BR
-+-Bernd Eckenfels, <net-tools@lina.inka.de> (NIS e p�gina man).
-++Bernd Eckenfels, <net\-tools@lina.inka.de> (NIS e p�gina man).
-+ .BR
-+ Arnaldo Carvalho de Melo, <acme@conectiva.com.br> Tradu��o para a l�ngua
-+ portuguesa.
-+Index: net-tools/man/pt_BR/ifconfig.8
-+===================================================================
-+--- net-tools.orig/man/pt_BR/ifconfig.8
-++++ net-tools/man/pt_BR/ifconfig.8
-+@@ -1,4 +1,4 @@
-+-.TH IFCONFIG 8 "10 de fevereiro de 1996" "net-tools" "Manual do Programador Linux"
-++.TH IFCONFIG 8 "2007-12-02" "net\-tools" "Manual do Programador Linux"
-+ .SH NOME
-+ ifconfig \- configura uma interface de rede
-+ .SH SINOPSE
-+@@ -61,7 +61,7 @@ o sinal de menos (\-) estiver presente a
-+ .TP
-+ .B "[\-]trailers" 
-+ Habilita ou desabilita o uso de trailer em frames Ethernet. N�o �
-+-utilizada na implementa��o atual do pacote net-tools.
-++utilizada na implementa��o atual do pacote net\-tools.
-+ .TP
-+ .B "[\-]allmulti" 
-+ Habilita ou desabilita o modo
-+@@ -97,7 +97,7 @@ uso de sub-redes.
-+ Configura a linha de interrup��o (IRQ) usada por este dispositivo. Muitos
-+ dispositivos n�o suportam configura��o din�mica de IRQ.
-+ .TP
-+-.B "[-]broadcast [endere�o]"
-++.B "[\-]broadcast [endere�o]"
-+ Se o argumento endere�o for informado, configura o endere�o de protocolo
-+ broadcast para esta interface. De outra forma ele somente configura a flag
-+ .B IFF_BROADCAST
-+@@ -105,7 +105,7 @@ da interface.  Se a palavra-chave for pr
-+ .B (-)
-+ , ent�o a flag � removida.
-+ .TP
-+-.B "[-]pointopoint [endere�o]"
-++.B "[\-]pointopoint [endere�o]"
-+ Esta palavra-chave habilita o modo
-+ .B ponto-a-ponto
-+ da interface, significando que ela � um link direto entre duas m�quinas
-+@@ -169,7 +169,7 @@ endere�os usando o comando
-+ Os endere�os appletalk DDP e IPX ser�o mostrados, mas n�o podem ser alterados
-+ com este comando.
-+ .SH VEJA TAMB�M
-+-route(8), netstat(8), arp(8), rarp(8), ipchains(8)
-++route(8), netstat(8), arp(8), rarp(8), ipchains(8), iptables(8), ifup(8), interfaces(5).
-+ .SH AUTORES
-+ Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
-+ Alan Cox, <Alan.Cox@linux.org>
-+Index: net-tools/man/pt_BR/netstat.8
-+===================================================================
-+--- net-tools.orig/man/pt_BR/netstat.8
-++++ net-tools/man/pt_BR/netstat.8
-+@@ -8,7 +8,7 @@
-+ .\" Traduzido para portugu�s por Arnaldo Carvalho de Melo <acme@conectiva.com.br>
-+ .\" Revisado por Jorge Luiz Godoy Filho <jorge@bestway.com.br>
-+ .\"
-+-.TH NETSTAT 8 "2007-12-02" "net-tools" "Manual do Programador Linux"
-++.TH NETSTAT 8 "2007-12-02" "net\-tools" "Manual do Programador Linux"
-+ 
-+ .SH NOME
-+ netstat \- Mostra conex�es de rede, tabelas de roteamento, estat�sticas de interface e conex�es
-+@@ -72,14 +72,14 @@ Voc� pode ver o estado das conex�es de r
-+ abertos. Esta � a opera��o padr�o: se voc� n�o especificar nenhuma
-+ fam�lia de endere�os, os sockets ativos de todas as fam�lias de endere�os
-+ configuradas ser�o mostrados. Com
-+-.B -e
-++.B \-e
-+ voc� obter� informa��es adicionais (userid). Com a chave
-+-.B -v
-++.B \-v
-+ voc� poder� fazer com que o netstat reclame sobre fam�lias de endere�os
-+ conhecidas que n�o sejam suportadas pelo kernel. A op��o
-+-.B -o
-++.B \-o
-+ mostra algumas informa��es adicionais sobre temporizadores de rede.
-+-.B -a
-++.B \-a
-+ mostra todos os sockets, incluindo sockets de servidores. A fam�lia de
-+ endere�os
-+ .B inet
-+@@ -89,8 +89,8 @@ mostrar� sockets raw, udp e tcp.
-+ Com a op��o
-+ .BR \-r ", " \-\-route
-+ voc� obter� as tabelas de roteamento do kernel no mesmo formato usado por
-+-.BR "route -e" .
-+-.B "netstat -er" 
-++.BR "route \-e" .
-++.B "netstat \-er" 
-+ usar� o formato de apresenta��o do comando
-+ .BR route .
-+ Por favor veja
-+@@ -99,18 +99,18 @@ para maiores detalhes.
-+ 
-+ .SS "\-i, \-\-interfaces \fIiface\fI"
-+ Se voc� usar a op��o
-+-.BR -i ", " --interfaces
-++.BR \-i ", " \-\-interfaces
-+ , uma tabela de todas (ou da
-+ .IR iface
-+ especificada) as interfaces de rede ser� mostrada. A sa�da usa o formato
-+-.B "ifconfig -e"
-++.B "ifconfig \-e"
-+ , e � descrita em
-+ .BR ifconfig (8).
-+-.B "netstat -ei" 
-++.B "netstat \-ei" 
-+ mostrar� uma tabela ou uma entrada de interface como
-+ .B ifconfig
-+ mostra. Com a chave
-+-.B -a
-++.B \-a
-+ , voc� pode incluir interfaces que n�o estejam configuradas (i.e. n�o tem
-+ a flag 
-+ .BR U = UP
-+@@ -119,7 +119,7 @@ configurada).
-+ .SS "\-M, \-\-masquerade"
-+ 
-+ Uma lista de todas as sess�es mascaradas tamb�m pode ser vista. Com a chave
-+-.B -e 
-++.B \-e 
-+ voc� pode incluir mais algumas informa��es sobre numera��o sequencial e deltas
-+ , causados por reescritas de dados em sess�es FTP (comando PORT).
-+ O suporte a mascaramento � usado para esconder m�quinas em endere�os de
-+@@ -179,23 +179,23 @@ voc� o interrompa.
-+ .SS "Proto" 
-+ O protocolo (tcp, udp, raw) usado pelo socket.
-+ 
-+-.SS "Recv-Q"
-++.SS "Recv\-Q"
-+ O contador de bytes n�o copiados pelo programa conectado a este socket.
-+ 
-+-.SS "Send-Q"
-++.SS "Send\-Q"
-+ O contador de bytes n�o confirmados pela m�quina remota.
-+ 
-+ .SS "Endere�o Local" 
-+ O endere�o local (nome da m�quina local) e o numero da porta do socket. A menos
-+ que a chave
-+-.B -n
-++.B \-n
-+ seja especificada o endere�o do socket ser� resolvido para seu nome de m�quina
-+ can�nico e o n�mero da porta ser� traduzido para o servi�o correspondente.
-+ 
-+ .SS "Endere�o Remoto"
-+ O endere�o remoto (nome da m�quina remota) e o n�mero da porta do socket. Como
-+ com o endere�o local, a chave
-+-.B -n
-++.B \-n
-+ desliga a resolu��o do nome da m�quina e do servi�o.
-+ 
-+ .SS "Estado"
-+@@ -245,7 +245,7 @@ confirma��o.
-+ OUVINDO
-+ O socket est� ouvindo por conex�es. Estes socket s�o somente mostrados se
-+ a chave
-+-.BR -a , --listening
-++.BR \-a , \-\-listening
-+ for especificada.
-+ .TP
-+ .I
-+@@ -329,7 +329,7 @@ Este socket n�o est� alocado.
-+ LISTENING
-+ O socket est� aguardando por uma solicita��o de conex�o. S�o mostrados
-+ apenas se as op��es
-+-.BR -a , --listening
-++.BR \-a , \-\-listening
-+ forem selecionadas.
-+ .TP
-+ .I
-+@@ -372,7 +372,7 @@ Mostra o caminho (path) do processo do q
-+ 
-+ .PP
-+ .SH NOTAS
-+-Desde o kernel 2.2 o netstat -i n�o mostra estat�sticas para apelidos (aliases)
-++Desde o kernel 2.2 o netstat \-i n�o mostra estat�sticas para apelidos (aliases)
-+ de interfaces. Para obter contadores por apelido de interface voc� precisa
-+ configurar regras expl�citas usando o comando
-+ +.BR ipchains(8)
-+@@ -447,20 +447,20 @@ Ocasionalmente informa��es estranhas pod
-+ enquanto � visualizado. Isso � incomum.
-+ .br
-+ As op��es descritas para
-+-.B netstat -i
-++.B netstat \-i
-+ foram descritas como dever�o funcionar ap�s alguma limpeza da libera��o
-+-BETA do pacote net-tools.
-++BETA do pacote net\-tools.
-+ 
-+ .PP
-+ .SH AUTORES
-+ A interface com o usu�rio foi escrita por Fred Baumgarten
-+-<dc6iq@insu1.etec.uni-karlsruhe.de> a p�gina do manual basicamente
-++<dc6iq@insu1.etec.uni\-karlsruhe.de> a p�gina do manual basicamente
-+ por Matt Welsh <mdw@tc.cornell.edu>. Foi atualizada por
-+ Alan Cox <Alan.Cox@linux.org> mas poderia ter sido feita com um pouco
-+ mais de trabalho.
-+ .BR
-+ .LP
-+-A p�gina do manual e os comandos inclu�dos no pacote net-tools
-++A p�gina do manual e os comandos inclu�dos no pacote net\-tools
-+ foram totalmente reescritos desde Bernd Eckenfels
-+ <ecki@linux.de>.
-+ .BR
-+Index: net-tools/man/pt_BR/rarp.8
-+===================================================================
-+--- net-tools.orig/man/pt_BR/rarp.8
-++++ net-tools/man/pt_BR/rarp.8
-+@@ -1,12 +1,12 @@
-+-.TH RARP 8 "10 de fevereiro de 1996" "net-tools" "Manual do Programador Linux"
-++.TH RARP 8 "10 de fevereiro de 1996" "net\-tools" "Manual do Programador Linux"
-+ .SH NOME
-+ rarp \- manipula a tabela RARP do sistema
-+ .SH SINOPSE
-+-.B "rarp [-v] [-t tipo] -a [m�quina]"
-++.B "rarp [\-v] [\-t tipo] \-a [m�quina]"
-+ .br
-+-.B "rarp [-v] -d m�quina ..."
-++.B "rarp [\-v] \-d m�quina ..."
-+ .br
-+-.B "rarp [-v] [-t tipo] -s m�quina endere�o_hardware"
-++.B "rarp [\-v] [\-t tipo] \-s m�quina endere�o_hardware"
-+ .SH DESCRI��O
-+ .B Rarp
-+ manipula as tabelas RARP do kernel de varias formas. As op��es principais
-+Index: net-tools/man/pt_BR/route.8
-+===================================================================
-+--- net-tools.orig/man/pt_BR/route.8
-++++ net-tools/man/pt_BR/route.8
-+@@ -1,4 +1,4 @@
-+-.TH ROUTE 8 "27 Jan 1996" "net-tools" "Manual do Programador Linux"
-++.TH ROUTE 8 "2007-12-02" "net\-tools" "Manual do Programador Linux"
-+ .SH NOME
-+ route \- mostra / manipula a tabela de roteamento IP
-+ .SH SINOPSE
-+@@ -47,7 +47,7 @@ If]
-+ .RB [ \-V ] 
-+ .RB [ \-\-version ]
-+ .RB [ \-h ]
-+-.RB [ \--help ]
-++.RB [ \-\-help ]
-+ .SH DESCRICAO
-+ .B Route
-+ manipula a tabela de roteamento IP do kernel. Seu principal uso �
-+@@ -186,7 +186,7 @@ modificadores do route (metric - netmask
-+ 
-+ .SH EXEMPLOS
-+ .TP
-+-.B route add -net 127.0.0.0
-++.B route add \-net 127.0.0.0
-+ Adiciona a entrada para a interface loopback normal, usando mascara igual
-+ a 255.0.0.0 (rede classe A, determinada a partir do endere�o de destino),
-+ associada ao dispositivo "lo" (assumindo que este dispositivo tenha sido
-+@@ -194,17 +194,17 @@ previamente configurado com o
-+ .BR ifconfig (8)). 
-+ 
-+ .TP 
-+-.B route add -net 192.56.76.0 netmask 255.255.255.0 dev eth0
-++.B route add \-net 192.56.76.0 netmask 255.255.255.0 dev eth0
-+ Adiciona uma rota para a rede 192.56.76.x atrav�s da interface "eth0". O 
-+ modificador de mascara classe C n�o � realmente necess�rio aqui por que
-+ 192.* � um endere�o IP de classe C. A palavra "dev" pode ser omitida aqui.
-+ 
-+ .TP
-+-.B route add default gw mango-gw
-++.B route add default gw mango\-gw
-+ Adiciona uma rota default (que ser� usada se nenhuma outra rota for encontrada).
-+-Todos os pacotes que usarem esta rota ser�o passados para a m�quina "mango-gw".
-++Todos os pacotes que usarem esta rota ser�o passados para a m�quina "mango\-gw".
-+ O dispositivo que ser� utilizado para esta rota depende de como � poss�vel
-+-alcan�ar "mango-gw" - a rota est�tica para "mango-gw" ter� que ser configurada
-++alcan�ar "mango\-gw" - a rota est�tica para "mango\-gw" ter� que ser configurada
-+ previamente.
-+ 
-+ .TP
-+@@ -213,12 +213,12 @@ Adiciona uma rota para a m�quina "ipx4" 
-+ que "ipx4" � a m�quina SLIP).
-+ 
-+ .TP
-+-.B route add -net 192.57.66.0 netmask 255.255.255.0 gw ipx4
-++.B route add \-net 192.57.66.0 netmask 255.255.255.0 gw ipx4
-+ Este comando adiciona a rede "192.57.66.x" para ser alcan�ada atrav�s da
-+ rota anterior atrav�s da interface SLIP.
-+ 
-+ .TP
-+-.B route add -net 224.0.0.0 netmask 240.0.0.0 dev eth0
-++.B route add \-net 224.0.0.0 netmask 240.0.0.0 dev eth0
-+ Isto � bem obscura, documentada para que as pessoas saibam como us�-la. 
-+ Configura para que todas as rotas IP classe D (multicast) v�o atrav�s da
-+ interface "eth0". Esta � a linha de configura��o normal a ser usada com
-+@@ -239,8 +239,8 @@ A rede ou m�quina de destino.
-+ A m�quina roteador ou '*' se nenhuma estiver configurada.
-+ .TP
-+ .B Mascara Gen�rica
-+-A mascara para a rede destino. '255.255.255.255' para uma m�quina de destino,
-+-'0.0.0.0' para a rota
-++A mascara para a rede destino. '255.255.255.255' para uma m�quina de
-++destino, '0.0.0.0' para a rota
-+ .B default
-+ .
-+ .TP
-+@@ -321,7 +321,7 @@ para o linux foi originalmente escrito p
-+ Linus Torvalds para a vers�o pl15. Alan Cox adicionou as op��es para
-+ mss e window no kernel 1.1.22. O suporte a irtt (compartilhado com o
-+ netstat) foi feito por Bernd Eckenfels.
-++.SH AUTHOR
-++Currently maintained by Phil Blundell <Philip.Blundell@pobox.com> and Bernd Eckenfels <net-tools@lina.inka.de>.
-+ .SH TRADU��O
-+ Arnaldo Carvalho de Melo <acme@conectiva.com.br> - 13/04/1998
-+-.SH BUGS
-+-nenhum :)
---- net-tools-1.60.orig/debian/patches/CVS-20020730-route.c_opts_64.patch
-+++ net-tools-1.60/debian/patches/CVS-20020730-route.c_opts_64.patch
-@@ -0,0 +1,39 @@
-+Add support for -6 & -4 flags to route.c
-+From upstream CVS
-+Index: net-tools/route.c
-+===================================================================
-+--- net-tools.orig/route.c
-++++ net-tools/route.c
-+@@ -2,7 +2,7 @@
-+  * route        This file contains an implementation of the command
-+  *              that manages the IP routing table in the kernel.
-+  *
-+- * Version:     $Id: route.c,v 1.9 2001/04/15 14:41:17 pb Exp $
-++ * Version:     $Id: route.c,v 1.10 2002/07/30 05:24:20 ecki Exp $
-+  *
-+  * Maintainer:  Bernd 'eckes' Eckenfels, <net-tools@lina.inka.de>
-+  *
-+@@ -142,7 +142,7 @@ int main(int argc, char **argv)
-+     }
-+ 
-+     /* Fetch the command-line arguments. */
-+-    while ((i = getopt_long(argc, argv, "A:eCFhnNVv?", longopts, &lop)) != EOF)
-++    while ((i = getopt_long(argc, argv, "A:eCFhnN64Vv?", longopts, &lop)) != EOF)
-+ 	switch (i) {
-+ 	case -1:
-+ 	    break;
-+@@ -176,6 +176,14 @@ int main(int argc, char **argv)
-+ 	    if ((i = aftrans_opt(optarg)))
-+ 		exit(i);
-+ 	    break;
-++	case '6':
-++	    if ((i = aftrans_opt("inet6")))
-++		exit(i);
-++	    break;
-++	case '4':
-++	    if ((i = aftrans_opt("inet")))
-++		exit(i);
-++	    break;
-+ 	case 'V':
-+ 	    version();
-+ 	case 'h':
---- net-tools-1.60.orig/debian/patches/CVS-lib_sync.patch
-+++ net-tools-1.60/debian/patches/CVS-lib_sync.patch
-@@ -0,0 +1,1873 @@
-+Sync with upstream CVS, for most files in lib/
-+
-+Index: net-tools/lib/Makefile
-+===================================================================
-+--- net-tools.orig/lib/Makefile
-++++ net-tools/lib/Makefile
-+@@ -16,7 +16,7 @@
-+ #
-+ 
-+ 
-+-HWOBJS	 = hw.o loopback.o slip.o ether.o ax25.o ppp.o arcnet.o tr.o tunnel.o frame.o sit.o rose.o ash.o fddi.o hippi.o hdlclapb.o strip.o irda.o ec_hw.o x25.o
-++HWOBJS	 = hw.o loopback.o slip.o ether.o ax25.o ppp.o arcnet.o tr.o tunnel.o frame.o sit.o rose.o ash.o fddi.o hippi.o hdlclapb.o strip.o irda.o ec_hw.o x25.o eui64.o ib.o
-+ AFOBJS	 = unix.o inet.o inet6.o ax25.o ipx.o ddp.o ipx.o netrom.o af.o rose.o econet.o x25.o
-+ AFGROBJS = inet_gr.o inet6_gr.o ipx_gr.o ddp_gr.o netrom_gr.o ax25_gr.o rose_gr.o getroute.o x25_gr.o
-+ AFSROBJS = inet_sr.o inet6_sr.o netrom_sr.o ipx_sr.o setroute.o x25_sr.o
-+Index: net-tools/lib/ddp_gr.c
-+===================================================================
-+--- net-tools.orig/lib/ddp_gr.c
-++++ net-tools/lib/ddp_gr.c
-+@@ -1,3 +1,20 @@
-++/*
-++ * lib/ddp_gr.c         Prinbting of DDP (AppleTalk) routing table
-++ *                      used by the NET-LIB.
-++ *
-++ * NET-LIB      
-++ *
-++ * Version:     $Id: ddp_gr.c,v 1.4 2002/06/02 05:25:15 ecki Exp $
-++ *
-++ * Author:      Ajax <ajax@firest0rm.org>
-++ *
-++ * Modification:
-++ *  2002-06-02 integrated into main source by Bernd Eckenfels
-++ *
-++ */
-++
-++/* TODO: name lookups (/etc/atalk.names?  NBP?) */
-++
-+ #include "config.h"
-+ 
-+ #if HAVE_AFATALK
-+@@ -16,9 +33,61 @@
-+ #include "pathnames.h"
-+ #include "intl.h"
-+ 
-++/* stolen from inet_gr.c */
-++#define flags_decode(i,o) do {                  \
-++        o[0] = '\0';                            \
-++        if (i & RTF_UP) strcat(o, "U");         \
-++        if (i & RTF_GATEWAY) strcat(o, "G");    \
-++        if (i & RTF_REJECT) strcat(o, "!");     \
-++        if (i & RTF_HOST) strcat(o, "H");       \
-++        if (i & RTF_REINSTATE) strcat(o, "R");  \
-++        if (i & RTF_DYNAMIC) strcat(o, "D");    \
-++        if (i & RTF_MODIFIED) strcat(o, "M");   \
-++        if (i & RTF_DEFAULT) strcat(o, "d");    \
-++        if (i & RTF_ALLONLINK) strcat(o, "a");  \
-++        if (i & RTF_ADDRCONF) strcat(o, "c");   \
-++        if (i & RTF_NONEXTHOP) strcat(o, "o");  \
-++        if (i & RTF_EXPIRES) strcat(o, "e");    \
-++        if (i & RTF_CACHE) strcat(o, "c");      \
-++        if (i & RTF_FLOW) strcat(o, "f");       \
-++        if (i & RTF_POLICY) strcat(o, "p");     \
-++        if (i & RTF_LOCAL) strcat(o, "l");      \
-++        if (i & RTF_MTU) strcat(o, "u");        \
-++        if (i & RTF_WINDOW) strcat(o, "w");     \
-++        if (i & RTF_IRTT) strcat(o, "i");       \
-++        if (i & RTF_NOTCACHED) strcat(o, "n");  \
-++    } while (0)
-++
-+ int DDP_rprint(int options)
-+ {
-+-    fprintf(stderr, _("Routing table for `ddp' not yet supported.\n"));
-+-    return (1);
-++    FILE *fp;
-++    char *dest, *gw, *dev, *flags;
-++    char oflags[32];
-++    char *hdr = "Destination     Gateway         Device          Flags";
-++
-++    fp = fopen(_PATH_PROCNET_ATALK_ROUTE, "r");
-++
-++    if (!fp) {
-++        perror("Error opening " _PATH_PROCNET_ATALK_ROUTE);
-++        fprintf(stderr, "DDP (AppleTalk) not configured on this system.\n");
-++        return 1;
-++    }
-++
-++    fscanf(fp, "%as %as %as %as\n", &dest, &gw, &flags, &dev);
-++    free(dest); free(gw); free(dev); free(flags);
-++
-++    printf("%s\n", hdr);
-++
-++    while (fscanf(fp, "%as %as %as %as\n", &dest, &gw, &flags, &dev) == 4) {
-++        int iflags = atoi(flags);
-++        flags_decode(iflags, oflags);
-++        printf("%-16s%-16s%-16s%-s\n", dest, gw, dev, oflags);
-++        free(dest); free(gw); free(dev); free(flags);
-++    }
-++
-++    fclose(fp);
-++    
-++    return 0;
-++
-+ }
-+ #endif
-+Index: net-tools/lib/ether.c
-+===================================================================
-+--- net-tools.orig/lib/ether.c
-++++ net-tools/lib/ether.c
-+@@ -2,7 +2,7 @@
-+  * lib/ether.c        This file contains an implementation of the "Ethernet"
-+  *              support functions.
-+  *
-+- * Version:     $Id: ether.c,v 1.7 1999/09/27 11:00:47 philip Exp $
-++ * Version:     $Id: ether.c,v 1.8 2002/07/30 05:17:29 ecki Exp $
-+  *
-+  * Author:      Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
-+  *              Copyright 1993 MicroWalt Corporation
-+@@ -39,7 +39,7 @@ static char *pr_ether(unsigned char *ptr
-+ {
-+     static char buff[64];
-+ 
-+-    snprintf(buff, sizeof(buff), "%02X:%02X:%02X:%02X:%02X:%02X",
-++    snprintf(buff, sizeof(buff), "%02x:%02x:%02x:%02x:%02x:%02x",
-+ 	     (ptr[0] & 0377), (ptr[1] & 0377), (ptr[2] & 0377),
-+ 	     (ptr[3] & 0377), (ptr[4] & 0377), (ptr[5] & 0377)
-+ 	);
-+Index: net-tools/lib/hw.c
-+===================================================================
-+--- net-tools.orig/lib/hw.c
-++++ net-tools/lib/hw.c
-+@@ -2,7 +2,7 @@
-+  * lib/hw.c   This file contains the top-level part of the hardware
-+  *              support functions module.
-+  *
-+- * Version:     $Id: hw.c,v 1.17 2000/05/20 13:38:10 pb Exp $
-++ * Version:     $Id: hw.c,v 1.19 2008/10/03 01:52:04 ecki Exp $
-+  *
-+  * Maintainer:  Bernd 'eckes' Eckenfels, <net-tools@lina.inka.de>
-+  *
-+@@ -73,6 +73,10 @@ extern struct hwtype irda_hwtype;
-+ 
-+ extern struct hwtype ec_hwtype;
-+ 
-++extern struct hwtype ib_hwtype;
-++
-++extern struct hwtype eui64_hwtype;
-++
-+ static struct hwtype *hwtypes[] =
-+ {
-+ 
-+@@ -144,6 +148,12 @@ static struct hwtype *hwtypes[] =
-+ #if HAVE_HWX25
-+     &x25_hwtype,
-+ #endif
-++#if HAVE_HWIB
-++    &ib_hwtype,
-++#endif
-++#if HAVE_HWEUI64
-++    &eui64_hwtype,
-++#endif
-+     &unspec_hwtype,
-+     NULL
-+ };
-+@@ -217,6 +227,12 @@ void hwinit()
-+ #if HAVE_HWEC
-+     ec_hwtype.title = _("Econet");
-+ #endif
-++#if HAVE_HWIB
-++    ib_hwtype.title = _("InfiniBand");
-++#endif
-++#if HAVE_HWEUI64
-++    eui64_hwtype.title = _("Generic EUI-64");
-++#endif
-+     sVhwinit = 1;
-+ }
-+ 
-+Index: net-tools/lib/inet.c
-+===================================================================
-+--- net-tools.orig/lib/inet.c
-++++ net-tools/lib/inet.c
-+@@ -3,7 +3,7 @@
-+  *              support functions for the net-tools.
-+  *              (NET-3 base distribution).
-+  *
-+- * Version:    $Id: inet.c,v 1.13 1999/12/11 13:35:56 freitag Exp $
-++ * Version:    $Id: inet.c,v 1.14 2003/10/19 11:57:37 pb Exp $
-+  *
-+  * Author:      Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
-+  *              Copyright 1993 MicroWalt Corporation
-+@@ -144,7 +144,7 @@ static int INET_rresolve(char *name, siz
-+     struct hostent *ent;
-+     struct netent *np;
-+     struct addr *pn;
-+-    unsigned long ad, host_ad;
-++    u_int32_t ad, host_ad;
-+     int host = 0;
-+ 
-+     /* Grmpf. -FvK */
-+@@ -155,7 +155,7 @@ static int INET_rresolve(char *name, siz
-+ 	errno = EAFNOSUPPORT;
-+ 	return (-1);
-+     }
-+-    ad = (unsigned long) sin->sin_addr.s_addr;
-++    ad = sin->sin_addr.s_addr;
-+ #ifdef DEBUG
-+     fprintf (stderr, "rresolve: %08lx, mask %08x, num %08x \n", ad, netmask, numeric);
-+ #endif
-+Index: net-tools/lib/inet6.c
-+===================================================================
-+--- net-tools.orig/lib/inet6.c
-++++ net-tools/lib/inet6.c
-+@@ -3,7 +3,7 @@
-+  *              support functions for the net-tools.
-+  *              (most of it copied from lib/inet.c 1.26).
-+  *
-+- * Version:     $Id: inet6.c,v 1.10 2000/10/28 11:04:00 pb Exp $
-++ * Version:     $Id: inet6.c,v 1.12 2002/12/10 01:03:09 ecki Exp $
-+  *
-+  * Author:      Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
-+  *              Copyright 1993 MicroWalt Corporation
-+@@ -44,6 +44,21 @@
-+ 
-+ extern int h_errno;		/* some netdb.h versions don't export this */
-+ 
-++char * fix_v4_address(char *buf, struct in6_addr *in6) 
-++{ 
-++	if (IN6_IS_ADDR_V4MAPPED(in6->s6_addr)) { 
-++			char *s =strchr(buf, '.'); 
-++			if (s) { 
-++				while (s > buf && *s != ':')
-++					--s;
-++				if (*s == ':') ++s; 	
-++				else s = NULL; 
-++			} 	
-++			if (s) return s;
-++	} 
-++	return buf; 
-++} 
-++
-+ static int INET6_resolve(char *name, struct sockaddr_in6 *sin6)
-+ {
-+     struct addrinfo req, *ai;
-+@@ -83,14 +98,14 @@ static int INET6_rresolve(char *name, st
-+ 	return (-1);
-+     }
-+     if (numeric & 0x7FFF) {
-+-	inet_ntop(AF_INET6, &sin6->sin6_addr, name, 80);
-++	inet_ntop( AF_INET6, &sin6->sin6_addr, name, 80);
-+ 	return (0);
-+     }
-+     if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
-+         if (numeric & 0x8000)
-+ 	    strcpy(name, "default");
-+ 	else
-+-	    strcpy(name, "*");
-++	    strcpy(name, "[::]");
-+ 	return (0);
-+     }
-+ 
-+@@ -109,13 +124,14 @@ static void INET6_reserror(char *text)
-+ }
-+ 
-+ 
-++
-+ /* Display an Internet socket address. */
-+ static char *INET6_print(unsigned char *ptr)
-+ {
-+     static char name[80];
-+ 
-+     inet_ntop(AF_INET6, (struct in6_addr *) ptr, name, 80);
-+-    return name;
-++	return fix_v4_address(name, (struct in6_addr *)ptr);
-+ }
-+ 
-+ 
-+@@ -129,13 +145,14 @@ static char *INET6_sprint(struct sockadd
-+ 	return safe_strncpy(buff, _("[NONE SET]"), sizeof(buff));
-+     if (INET6_rresolve(buff, (struct sockaddr_in6 *) sap, numeric) != 0)
-+ 	return safe_strncpy(buff, _("[UNKNOWN]"), sizeof(buff));
-+-    return (buff);
-++    return (fix_v4_address(buff, &((struct sockaddr_in6 *)sap)->sin6_addr));
-+ }
-+ 
-+ 
-+ static int INET6_getsock(char *bufp, struct sockaddr *sap)
-+ {
-+     struct sockaddr_in6 *sin6;
-++	char *p;
-+ 
-+     sin6 = (struct sockaddr_in6 *) sap;
-+     sin6->sin6_family = AF_INET6;
-+@@ -143,7 +160,9 @@ static int INET6_getsock(char *bufp, str
-+ 
-+     if (inet_pton(AF_INET6, bufp, sin6->sin6_addr.s6_addr) <= 0)
-+ 	return (-1);
-+-
-++	p = fix_v4_address(bufp, &sin6->sin6_addr);
-++	if (p != bufp) 
-++		memcpy(bufp, p, strlen(p)+1); 
-+     return 16;			/* ?;) */
-+ }
-+ 
-+Index: net-tools/lib/inet6_gr.c
-+===================================================================
-+--- net-tools.orig/lib/inet6_gr.c
-++++ net-tools/lib/inet6_gr.c
-+@@ -1,4 +1,4 @@
-+-/*
-++ /*
-+    Modifications:
-+    1998-07-01 - Arnaldo Carvalho de Melo - GNU gettext instead of catgets,
-+    snprintf instead of sprintf
-+@@ -71,11 +71,15 @@ int rprint_fib6(int ext, int numeric)
-+         printf(_("INET6 (IPv6) not configured in this system.\n"));
-+ 	return 1;
-+     }
-+-    printf(_("Kernel IPv6 routing table\n"));
-+ 
-+-    printf(_("Destination                                 "
-+-	     "Next Hop                                "
-+-	     "Flags Metric Ref    Use Iface\n"));
-++    if (numeric & RTF_CACHE)
-++    	printf(_("Kernel IPv6 routing cache\n"));
-++    else
-++    	printf(_("Kernel IPv6 routing table\n"));
-++
-++    printf(_("Destination                    "
-++	     "Next Hop                   "
-++	     "Flag Met Ref Use If\n"));
-+ 
-+     while (fgets(buff, 1023, fp)) {
-+ 	num = sscanf(buff, "%4s%4s%4s%4s%4s%4s%4s%4s %02x %4s%4s%4s%4s%4s%4s%4s%4s %02x %4s%4s%4s%4s%4s%4s%4s%4s %08x %08x %08x %08x %s\n",
-+@@ -87,13 +91,19 @@ int rprint_fib6(int ext, int numeric)
-+ 		     &slen,
-+ 		     naddr6p[0], naddr6p[1], naddr6p[2], naddr6p[3],
-+ 		     naddr6p[4], naddr6p[5], naddr6p[6], naddr6p[7],
-+-		     &metric, &use, &refcnt, &iflags, iface);
-++		     &metric, &refcnt, &use, &iflags, iface);
-+ #if 0
-+ 	if (num < 23)
-+ 	    continue;
-+ #endif
-+-	if (!(iflags & RTF_UP))
-+-	    continue;
-++	if (iflags & RTF_CACHE) {
-++		if (!(numeric & RTF_CACHE))
-++			continue;
-++	} else {
-++		if (numeric & RTF_CACHE)
-++			continue;
-++	}
-++			
-+ 	/* Fetch and resolve the target address. */
-+ 	snprintf(addr6, sizeof(addr6), "%s:%s:%s:%s:%s:%s:%s:%s",
-+ 		 addr6p[0], addr6p[1], addr6p[2], addr6p[3],
-+@@ -112,7 +122,12 @@ int rprint_fib6(int ext, int numeric)
-+ 		 inet6_aftype.sprint((struct sockaddr *) &snaddr6, 1));
-+ 
-+ 	/* Decode the flags. */
-+-	strcpy(flags, "U");
-++
-++	flags[0]=0;
-++	if (iflags & RTF_UP)
-++	    strcat(flags, "U");
-++	if (iflags & RTF_REJECT)
-++	    strcat(flags, "!");
-+ 	if (iflags & RTF_GATEWAY)
-+ 	    strcat(flags, "G");
-+ 	if (iflags & RTF_HOST)
-+@@ -123,9 +138,19 @@ int rprint_fib6(int ext, int numeric)
-+ 	    strcat(flags, "A");
-+ 	if (iflags & RTF_CACHE)
-+ 	    strcat(flags, "C");
-++	if (iflags & RTF_ALLONLINK)
-++	    strcat(flags, "a");
-++	if (iflags & RTF_EXPIRES)
-++	    strcat(flags, "e");
-++	if (iflags & RTF_MODIFIED)
-++	    strcat(flags, "m");
-++	if (iflags & RTF_NONEXTHOP)
-++	    strcat(flags, "n");
-++	if (iflags & RTF_FLOW)
-++	    strcat(flags, "f");
-+ 
-+ 	/* Print the info. */
-+-	printf("%-43s %-39s %-5s %-6d %-2d %7d %-8s\n",
-++	printf("%-30s %-26s %-4s %-3d %-1d%6d %s\n",
-+ 	       addr6, naddr6, flags, metric, refcnt, use, iface);
-+     }
-+ 
-+@@ -144,8 +169,7 @@ int rprint_cache6(int ext, int numeric)
-+     char addr6p[8][5], haddrp[6][3];
-+ 
-+     if (!fp) {
-+-	ESYSNOT("nd_print", "ND Table");
-+-	return 1;
-++	return rprint_fib6(ext, numeric | RTF_CACHE);
-+     }
-+     printf(_("Kernel IPv6 Neighbour Cache\n"));
-+ 
-+Index: net-tools/lib/inet_sr.c
-+===================================================================
-+--- net-tools.orig/lib/inet_sr.c
-++++ net-tools/lib/inet_sr.c
-+@@ -3,6 +3,7 @@
-+    1998-07-01 - Arnaldo Carvalho de Melo - GNU gettext instead of catgets
-+    1999-10-07 - Kurt Garloff		 - for -host and gws: prefer host names
-+ 						over networks (or even reject)
-++   2003-10-11 - Maik Broemme		 - gcc 3.x warnign fixes (default: break;)
-+  */
-+ 
-+ #include "config.h"
-+@@ -104,7 +105,6 @@ static int INET_setroute(int action, int
-+        isnet = 1; break;
-+     case 2:
-+        isnet = 0; break;
-+-    default:
-+     }
-+ 
-+     /* Fill in the other fields. */
-+Index: net-tools/lib/interface.c
-+===================================================================
-+--- net-tools.orig/lib/interface.c
-++++ net-tools/lib/interface.c
-+@@ -7,7 +7,7 @@
-+    8/2000  Andi Kleen make the list operations a bit more efficient.
-+    People are crazy enough to use thousands of aliases now.
-+ 
-+-   $Id: interface.c,v 1.14 2001/02/10 19:31:15 pb Exp $
-++   $Id: interface.c,v 1.30 2005/08/23 22:46:51 ecki Exp $
-+  */
-+ 
-+ #include "config.h"
-+@@ -23,6 +23,7 @@
-+ #include <string.h>
-+ #include <unistd.h>
-+ #include <ctype.h>
-++#include <string.h>
-+ 
-+ #if HAVE_AFIPX
-+ #if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)
-+@@ -87,14 +88,20 @@ int procnetdev_vsn = 1;
-+ 
-+ int ife_short;
-+ 
-++int if_list_all = 0;	/* do we have requested the complete proc list, yet? */
-++
-+ static struct interface *int_list, *int_last;
-+ 
-+ static int if_readlist_proc(char *);
-+ 
-+-static struct interface *add_interface(char *name)
-++static struct interface *if_cache_add(char *name)
-+ {
-+     struct interface *ife, **nextp, *new;
-+ 
-++    if (!int_list)
-++    	int_last = NULL;
-++
-++    /* the cache is sorted, so if we hit a smaller if, exit */
-+     for (ife = int_last; ife; ife = ife->prev) {
-+ 	    int n = nstrcmp(ife->name, name); 
-+ 	    if (n == 0) 
-+@@ -104,7 +111,7 @@ static struct interface *add_interface(c
-+     }
-+     new(new); 
-+     safe_strncpy(new->name, name, IFNAMSIZ); 
-+-    nextp = ife ? &ife->next : &int_list;
-++    nextp = ife ? &ife->next : &int_list; // keep sorting
-+     new->prev = ife;
-+     new->next = *nextp; 
-+     if (new->next) 
-+@@ -117,19 +124,22 @@ static struct interface *add_interface(c
-+ 
-+ struct interface *lookup_interface(char *name)
-+ {
-+-    struct interface *ife = NULL;
-+-
-+-    if (if_readlist_proc(name) < 0) 
-+-	    return NULL; 
-+-    ife = add_interface(name); 
-+-    return ife;
-++   /* if we have read all, use it */
-++   if (if_list_all)
-++   	return if_cache_add(name);
-++
-++   /* otherwise we read a limited list */
-++   if (if_readlist_proc(name) < 0)
-++   	return NULL;
-++ 
-++   return if_cache_add(name);
-+ }
-+ 
-+ int for_all_interfaces(int (*doit) (struct interface *, void *), void *cookie)
-+ {
-+     struct interface *ife;
-+ 
-+-    if (!int_list && (if_readlist() < 0))
-++    if (!if_list_all && (if_readlist() < 0))
-+ 	return -1;
-+     for (ife = int_list; ife; ife = ife->next) {
-+ 	int err = doit(ife, cookie);
-+@@ -139,13 +149,15 @@ int for_all_interfaces(int (*doit) (stru
-+     return 0;
-+ }
-+ 
-+-int free_interface_list(void)
-++int if_cache_free(void)
-+ {
-+     struct interface *ife;
-+     while ((ife = int_list) != NULL) {
-+ 	int_list = ife->next;
-+ 	free(ife);
-+     }
-++    int_last = NULL;
-++    if_list_all = 0;
-+     return 0;
-+ }
-+ 
-+@@ -180,7 +192,7 @@ static int if_readconf(void)
-+ 	}
-+ 	if (ifc.ifc_len == sizeof(struct ifreq) * numreqs) {
-+ 	    /* assume it overflowed and try again */
-+-	    numreqs += 10;
-++	    numreqs *= 2;
-+ 	    continue;
-+ 	}
-+ 	break;
-+@@ -188,7 +200,7 @@ static int if_readconf(void)
-+ 
-+     ifr = ifc.ifc_req;
-+     for (n = 0; n < ifc.ifc_len; n += sizeof(struct ifreq)) {
-+-	add_interface(ifr->ifr_name);
-++	if_cache_add(ifr->ifr_name);
-+ 	ifr++;
-+     }
-+     err = 0;
-+@@ -198,7 +210,7 @@ out:
-+     return err;
-+ }
-+ 
-+-static char *get_name(char *name, char *p)
-++char *get_name(char *name, char *p)
-+ {
-+     while (isspace(*p))
-+ 	p++;
-+@@ -206,16 +218,19 @@ static char *get_name(char *name, char *
-+ 	if (isspace(*p))
-+ 	    break;
-+ 	if (*p == ':') {	/* could be an alias */
-+-	    char *dot = p, *dotname = name;
-+-	    *name++ = *p++;
-+-	    while (isdigit(*p))
-+-		*name++ = *p++;
-+-	    if (*p != ':') {	/* it wasn't, backup */
-+-		p = dot;
-+-		name = dotname;
-++		char *dot = p++;
-++ 		while (*p && isdigit(*p)) p++;
-++		if (*p == ':') {
-++			/* Yes it is, backup and copy it. */
-++			p = dot;
-++			*name++ = *p++;
-++			while (*p && isdigit(*p)) {
-++				*name++ = *p++;
-++			}
-++		} else {
-++			/* No, it isn't */
-++			p = dot;
-+ 	    }
-+-	    if (*p == '\0')
-+-		return NULL;
-+ 	    p++;
-+ 	    break;
-+ 	}
-+@@ -225,7 +240,7 @@ static char *get_name(char *name, char *
-+     return p;
-+ }
-+ 
-+-static int procnetdev_version(char *buf)
-++int procnetdev_version(char *buf)
-+ {
-+     if (strstr(buf, "compressed"))
-+ 	return 3;
-+@@ -234,12 +249,12 @@ static int procnetdev_version(char *buf)
-+     return 1;
-+ }
-+ 
-+-static int get_dev_fields(char *bp, struct interface *ife)
-++int get_dev_fields(char *bp, struct interface *ife)
-+ {
-+     switch (procnetdev_vsn) {
-+     case 3:
-+ 	sscanf(bp,
-+-	"%llu %llu %lu %lu %lu %lu %lu %lu %llu %llu %lu %lu %lu %lu %lu %lu",
-++	"%Lu %Lu %lu %lu %lu %lu %lu %lu %Lu %Lu %lu %lu %lu %lu %lu %lu",
-+ 	       &ife->stats.rx_bytes,
-+ 	       &ife->stats.rx_packets,
-+ 	       &ife->stats.rx_errors,
-+@@ -259,7 +274,7 @@ static int get_dev_fields(char *bp, stru
-+ 	       &ife->stats.tx_compressed);
-+ 	break;
-+     case 2:
-+-	sscanf(bp, "%llu %llu %lu %lu %lu %lu %llu %llu %lu %lu %lu %lu %lu",
-++	sscanf(bp, "%Lu %Lu %lu %lu %lu %lu %Lu %Lu %lu %lu %lu %lu %lu",
-+ 	       &ife->stats.rx_bytes,
-+ 	       &ife->stats.rx_packets,
-+ 	       &ife->stats.rx_errors,
-+@@ -277,7 +292,7 @@ static int get_dev_fields(char *bp, stru
-+ 	ife->stats.rx_multicast = 0;
-+ 	break;
-+     case 1:
-+-	sscanf(bp, "%llu %lu %lu %lu %lu %llu %lu %lu %lu %lu %lu",
-++	sscanf(bp, "%Lu %lu %lu %lu %lu %Lu %lu %lu %lu %lu %lu",
-+ 	       &ife->stats.rx_packets,
-+ 	       &ife->stats.rx_errors,
-+ 	       &ife->stats.rx_dropped,
-+@@ -300,22 +315,16 @@ static int get_dev_fields(char *bp, stru
-+ 
-+ static int if_readlist_proc(char *target)
-+ {
-+-    static int proc_read; 
-+     FILE *fh;
-+     char buf[512];
-+     struct interface *ife;
-+     int err;
-+ 
-+-    if (proc_read) 
-+-	    return 0; 
-+-    if (!target) 
-+-	    proc_read = 1;
-+-
-+     fh = fopen(_PATH_PROCNET_DEV, "r");
-+     if (!fh) {
-+ 		fprintf(stderr, _("Warning: cannot open %s (%s). Limited output.\n"),
-+ 			_PATH_PROCNET_DEV, strerror(errno)); 
-+-		return if_readconf();
-++		return -2;
-+ 	}	
-+     fgets(buf, sizeof buf, fh);	/* eat line */
-+     fgets(buf, sizeof buf, fh);
-+@@ -350,7 +359,7 @@ static int if_readlist_proc(char *target
-+     while (fgets(buf, sizeof buf, fh)) {
-+ 	char *s, name[IFNAMSIZ];
-+ 	s = get_name(name, buf);    
-+-	ife = add_interface(name);
-++	ife = if_cache_add(name);
-+ 	get_dev_fields(s, ife);
-+ 	ife->statistics_valid = 1;
-+ 	if (target && !strcmp(target,name))
-+@@ -359,7 +368,6 @@ static int if_readlist_proc(char *target
-+     if (ferror(fh)) {
-+ 	perror(_PATH_PROCNET_DEV);
-+ 	err = -1;
-+-	proc_read = 0; 
-+     }
-+ 
-+ #if 0
-+@@ -371,9 +379,16 @@ static int if_readlist_proc(char *target
-+ 
-+ int if_readlist(void) 
-+ { 
-+-    int err = if_readlist_proc(NULL); 
-+-    if (!err)
-+-	    err = if_readconf();
-++    /* caller will/should check not to call this too often 
-++     *   (i.e. only if if_list_all == 0 
-++     */
-++    int err = 0;
-++
-++    err |= if_readlist_proc(NULL); 
-++    err |= if_readconf();
-++
-++    if_list_all = 1;
-++
-+     return err;
-+ } 
-+ 
-+@@ -580,10 +595,10 @@ int do_if_print(struct interface *ife, v
-+ void ife_print_short(struct interface *ptr)
-+ {
-+     printf("%-5.5s ", ptr->name);
-+-    printf("%5d %3d", ptr->mtu, ptr->metric);
-++    printf("%5d %-2d ", ptr->mtu, ptr->metric);
-+     /* If needed, display the interface statistics. */
-+     if (ptr->statistics_valid) {
-+-	printf("%8llu %6lu %6lu %6lu",
-++	printf("%8llu %6lu %6lu %-6lu ",
-+ 	       ptr->stats.rx_packets, ptr->stats.rx_errors,
-+ 	       ptr->stats.rx_dropped, ptr->stats.rx_fifo_errors);
-+ 	printf("%8llu %6lu %6lu %6lu ",
-+@@ -636,9 +651,10 @@ void ife_print_long(struct interface *pt
-+     int hf;
-+     int can_compress = 0;
-+     unsigned long long rx, tx, short_rx, short_tx;
-+-    char Rext[5]="b";
-+-    char Text[5]="b";
-+-
-++    const char *Rext = "B";
-++    const char *Text = "B";
-++    static char flags[200];
-++    
-+ #if HAVE_AFIPX
-+     static struct aftype *ipxtype = NULL;
-+ #endif
-+@@ -670,32 +686,70 @@ void ife_print_long(struct interface *pt
-+     if (hw == NULL)
-+ 	hw = get_hwntype(-1);
-+ 
-+-    printf(_("%-9.9s Link encap:%s  "), ptr->name, hw->title);
-+-    /* For some hardware types (eg Ash, ATM) we don't print the 
-+-       hardware address if it's null.  */
-+-    if (hw->print != NULL && (! (hw_null_address(hw, ptr->hwaddr) &&
-+-				  hw->suppress_null_addr)))
-+-	printf(_("HWaddr %s  "), hw->print(ptr->hwaddr));
-+-#ifdef IFF_PORTSEL
-+-    if (ptr->flags & IFF_PORTSEL) {
-+-	printf(_("Media:%s"), if_port_text[ptr->map.port][0]);
-+-	if (ptr->flags & IFF_AUTOMEDIA)
-+-	    printf(_("(auto)"));
-+-    }
-++    sprintf(flags, "flags=%d<", ptr->flags);
-++    /* DONT FORGET TO ADD THE FLAGS IN ife_print_short, too */
-++    if (ptr->flags == 0)
-++	strcat(flags,">");
-++    if (ptr->flags & IFF_UP)
-++	strcat(flags,_("UP,"));
-++    if (ptr->flags & IFF_BROADCAST)
-++	strcat(flags,_("BROADCAST,"));
-++    if (ptr->flags & IFF_DEBUG)
-++	strcat(flags,_("DEBUG,"));
-++    if (ptr->flags & IFF_LOOPBACK)
-++	strcat(flags,_("LOOPBACK,"));
-++    if (ptr->flags & IFF_POINTOPOINT)
-++	strcat(flags,_("POINTOPOINT,"));
-++    if (ptr->flags & IFF_NOTRAILERS)
-++	strcat(flags,_("NOTRAILERS,"));
-++    if (ptr->flags & IFF_RUNNING)
-++	strcat(flags,_("RUNNING,"));
-++    if (ptr->flags & IFF_NOARP)
-++	strcat(flags,_("NOARP,"));
-++    if (ptr->flags & IFF_PROMISC)
-++	strcat(flags,_("PROMISC,"));
-++    if (ptr->flags & IFF_ALLMULTI)
-++	strcat(flags,_("ALLMULTI,"));
-++    if (ptr->flags & IFF_SLAVE)
-++	strcat(flags,_("SLAVE,"));
-++    if (ptr->flags & IFF_MASTER)
-++	strcat(flags,_("MASTER,"));
-++    if (ptr->flags & IFF_MULTICAST)
-++	strcat(flags,_("MULTICAST,"));
-++#ifdef HAVE_DYNAMIC
-++    if (ptr->flags & IFF_DYNAMIC)
-++	strcat(flags,_("DYNAMIC,"));
-++#endif
-++    /* DONT FORGET TO ADD THE FLAGS IN ife_print_short */
-++    if (flags[strlen(flags)-1] == ',')
-++      flags[strlen(flags)-1] = '>';
-++    else
-++      flags[strlen(flags)-1] = 0;
-++      
-++
-++    printf(_("%s: %s  mtu %d  metric %d"),
-++	   ptr->name, flags, ptr->mtu, ptr->metric ? ptr->metric : 1);
-++#ifdef SIOCSKEEPALIVE
-++    if (ptr->outfill || ptr->keepalive)
-++	printf(_("  outfill %d  keepalive %d"),
-++	       ptr->outfill, ptr->keepalive);
-+ #endif
-+     printf("\n");
-+ 
-++
-++
-+ #if HAVE_AFINET
-+     if (ptr->has_ip) {
-+-	printf(_("          %s addr:%s "), ap->name,
-++	printf(_("        %s %s"), ap->name,
-+ 	       ap->sprint(&ptr->addr, 1));
-+-	if (ptr->flags & IFF_POINTOPOINT) {
-+-	    printf(_(" P-t-P:%s "), ap->sprint(&ptr->dstaddr, 1));
-+-	}
-++	printf(_("  netmask %s"), ap->sprint(&ptr->netmask, 1));
-+ 	if (ptr->flags & IFF_BROADCAST) {
-+-	    printf(_(" Bcast:%s "), ap->sprint(&ptr->broadaddr, 1));
-++	    printf(_("  broadcast %s"), ap->sprint(&ptr->broadaddr, 1));
-++	}
-++	if (ptr->flags & IFF_POINTOPOINT) {
-++	    printf(_("  destination %s"), ap->sprint(&ptr->dstaddr, 1));
-+ 	}
-+-	printf(_(" Mask:%s\n"), ap->sprint(&ptr->netmask, 1));
-++	printf("\n");
-+     }
-+ #endif
-+ 
-+@@ -712,29 +766,30 @@ void ife_print_long(struct interface *pt
-+ 			addr6p[0], addr6p[1], addr6p[2], addr6p[3],
-+ 			addr6p[4], addr6p[5], addr6p[6], addr6p[7]);
-+ 		inet6_aftype.input(1, addr6, (struct sockaddr *) &sap);
-+-		printf(_("          inet6 addr: %s/%d"),
-+-		 inet6_aftype.sprint((struct sockaddr *) &sap, 1), plen);
-+-		printf(_(" Scope:"));
-+-		switch (scope) {
-+-		case 0:
-+-		    printf(_("Global"));
-+-		    break;
-+-		case IPV6_ADDR_LINKLOCAL:
-+-		    printf(_("Link"));
-+-		    break;
-+-		case IPV6_ADDR_SITELOCAL:
-+-		    printf(_("Site"));
-+-		    break;
-+-		case IPV6_ADDR_COMPATv4:
-+-		    printf(_("Compat"));
-+-		    break;
-+-		case IPV6_ADDR_LOOPBACK:
-+-		    printf(_("Host"));
-+-		    break;
-+-		default:
-+-		    printf(_("Unknown"));
-++		printf(_("        %s %s  prefixlen %d"),
-++			inet6_aftype.name, 
-++			inet6_aftype.sprint((struct sockaddr *) &sap, 1), 
-++			plen);
-++		printf(_("  scopeid 0x%x"), scope);
-++
-++		flags[0] = '<'; flags[1] = 0;
-++		if (scope & IPV6_ADDR_COMPATv4) {
-++		    	strcat(flags, _("compat,"));
-++		    	scope -= IPV6_ADDR_COMPATv4;
-+ 		}
-+-		printf("\n");
-++		if (scope == 0)
-++			strcat(flags, _("global,"));
-++		if (scope & IPV6_ADDR_LINKLOCAL)
-++			strcat(flags, _("link,"));
-++		if (scope & IPV6_ADDR_SITELOCAL)
-++			strcat(flags, _("site,"));
-++		if (scope & IPV6_ADDR_LOOPBACK)
-++			strcat(flags, _("host,"));
-++		if (flags[strlen(flags)-1] == ',')
-++			flags[strlen(flags)-1] = '>';
-++		else
-++			flags[strlen(flags)-1] = 0;
-++		printf("%s\n", flags);
-+ 	    }
-+ 	}
-+ 	fclose(f);
-+@@ -747,17 +802,17 @@ void ife_print_long(struct interface *pt
-+ 
-+     if (ipxtype != NULL) {
-+ 	if (ptr->has_ipx_bb)
-+-	    printf(_("          IPX/Ethernet II addr:%s\n"),
-+-		   ipxtype->sprint(&ptr->ipxaddr_bb, 1));
-++	    printf(_("        %s Ethernet-II   %s\n"),
-++		   ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_bb, 1));
-+ 	if (ptr->has_ipx_sn)
-+-	    printf(_("          IPX/Ethernet SNAP addr:%s\n"),
-+-		   ipxtype->sprint(&ptr->ipxaddr_sn, 1));
-++	    printf(_("        %s Ethernet-SNAP %s\n"),
-++		   ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_sn, 1));
-+ 	if (ptr->has_ipx_e2)
-+-	    printf(_("          IPX/Ethernet 802.2 addr:%s\n"),
-+-		   ipxtype->sprint(&ptr->ipxaddr_e2, 1));
-++	    printf(_("        %s Ethernet802.2 %s\n"),
-++		   ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_e2, 1));
-+ 	if (ptr->has_ipx_e3)
-+-	    printf(_("          IPX/Ethernet 802.3 addr:%s\n"),
-+-		   ipxtype->sprint(&ptr->ipxaddr_e3, 1));
-++	    printf(_("        %s Ethernet802.3 %s\n"),
-++		   ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_e3, 1));
-+     }
-+ #endif
-+ 
-+@@ -766,7 +821,7 @@ void ife_print_long(struct interface *pt
-+ 	ddptype = get_afntype(AF_APPLETALK);
-+     if (ddptype != NULL) {
-+ 	if (ptr->has_ddp)
-+-	    printf(_("          EtherTalk Phase 2 addr:%s\n"), ddptype->sprint(&ptr->ddpaddr, 1));
-++	    printf(_("        %s %s\n"), ddptype->name, ddptype->sprint(&ptr->ddpaddr, 1));
-+     }
-+ #endif
-+ 
-+@@ -775,53 +830,30 @@ void ife_print_long(struct interface *pt
-+ 	ectype = get_afntype(AF_ECONET);
-+     if (ectype != NULL) {
-+ 	if (ptr->has_econet)
-+-	    printf(_("          econet addr:%s\n"), ectype->sprint(&ptr->ecaddr, 1));
-++	    printf(_("        %s %s\n"), ectype->name, ectype->sprint(&ptr->ecaddr, 1));
-+     }
-+ #endif
-+ 
-+-    printf("          ");
-+-    /* DONT FORGET TO ADD THE FLAGS IN ife_print_short, too */
-+-    if (ptr->flags == 0)
-+-	printf(_("[NO FLAGS] "));
-+-    if (ptr->flags & IFF_UP)
-+-	printf(_("UP "));
-+-    if (ptr->flags & IFF_BROADCAST)
-+-	printf(_("BROADCAST "));
-+-    if (ptr->flags & IFF_DEBUG)
-+-	printf(_("DEBUG "));
-+-    if (ptr->flags & IFF_LOOPBACK)
-+-	printf(_("LOOPBACK "));
-+-    if (ptr->flags & IFF_POINTOPOINT)
-+-	printf(_("POINTOPOINT "));
-+-    if (ptr->flags & IFF_NOTRAILERS)
-+-	printf(_("NOTRAILERS "));
-+-    if (ptr->flags & IFF_RUNNING)
-+-	printf(_("RUNNING "));
-+-    if (ptr->flags & IFF_NOARP)
-+-	printf(_("NOARP "));
-+-    if (ptr->flags & IFF_PROMISC)
-+-	printf(_("PROMISC "));
-+-    if (ptr->flags & IFF_ALLMULTI)
-+-	printf(_("ALLMULTI "));
-+-    if (ptr->flags & IFF_SLAVE)
-+-	printf(_("SLAVE "));
-+-    if (ptr->flags & IFF_MASTER)
-+-	printf(_("MASTER "));
-+-    if (ptr->flags & IFF_MULTICAST)
-+-	printf(_("MULTICAST "));
-+-#ifdef HAVE_DYNAMIC
-+-    if (ptr->flags & IFF_DYNAMIC)
-+-	printf(_("DYNAMIC "));
-+-#endif
-+-    /* DONT FORGET TO ADD THE FLAGS IN ife_print_short */
-+-    printf(_(" MTU:%d  Metric:%d"),
-+-	   ptr->mtu, ptr->metric ? ptr->metric : 1);
-+-#ifdef SIOCSKEEPALIVE
-+-    if (ptr->outfill || ptr->keepalive)
-+-	printf(_("  Outfill:%d  Keepalive:%d"),
-+-	       ptr->outfill, ptr->keepalive);
-++    /* For some hardware types (eg Ash, ATM) we don't print the 
-++       hardware address if it's null.  */
-++    if (hw->print != NULL && (! (hw_null_address(hw, ptr->hwaddr) &&
-++				  hw->suppress_null_addr)))
-++	printf(_("        %s %s"), hw->name, hw->print(ptr->hwaddr));
-++    else
-++	printf(_("        %s"), hw->name);
-++    if (ptr->tx_queue_len != -1)
-++    	printf(_("  txqueuelen %d"), ptr->tx_queue_len);
-++    printf("  (%s)\n", hw->title);
-++
-++#ifdef IFF_PORTSEL
-++    if (ptr->flags & IFF_PORTSEL) {
-++	printf(_("        media %s"), if_port_text[ptr->map.port][0]);
-++	if (ptr->flags & IFF_AUTOMEDIA)
-++	    printf(_("autoselect"));
-++    	printf("\n");
-++    }
-+ #endif
-+-    printf("\n");
-++
-+ 
-+     /* If needed, display the interface statistics. */
-+ 
-+@@ -830,55 +862,87 @@ void ife_print_long(struct interface *pt
-+ 	 *      not for the aliases, although strictly speaking they're shared
-+ 	 *      by all addresses.
-+ 	 */
-+-	printf("          ");
-+-
-+-	printf(_("RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"),
-+-	       ptr->stats.rx_packets, ptr->stats.rx_errors,
-+-	       ptr->stats.rx_dropped, ptr->stats.rx_fifo_errors,
-+-	       ptr->stats.rx_frame_errors);
-+-	if (can_compress)
-+-	    printf(_("             compressed:%lu\n"), ptr->stats.rx_compressed);
-+-
-+ 	rx = ptr->stats.rx_bytes;  
-+-	tx = ptr->stats.tx_bytes;
-+ 	short_rx = rx * 10;  
-++	if (rx > 1125899906842624ull) {
-++	    short_rx /= 1125899906842624ull;
-++	    Rext = "PiB";
-++	} else if (rx > 1099511627776ull) {
-++	    short_rx /= 1099511627776ull;
-++	    Rext = "TiB";
-++	} else if (rx > 1073741824ull) {
-++	    short_rx /= 1073741824ull;
-++	    Rext = "GiB";
-++	} else if (rx > 1048576) {
-++	    short_rx /= 1048576;
-++	    Rext = "MiB";
-++	} else if (rx > 1024) {
-++	    short_rx /= 1024;
-++	    Rext = "KiB";
-++	}
-++	tx = ptr->stats.tx_bytes;
-+ 	short_tx = tx * 10;
-+-	if (rx > 1048576) { short_rx /= 1048576;  strcpy(Rext, "Mb"); }
-+-	else if (rx > 1024) { short_rx /= 1024;  strcpy(Rext, "Kb"); }
-+-	if (tx > 1048576) { short_tx /= 1048576;  strcpy(Text, "Mb"); }
-+-	else if (tx > 1024) { short_tx /= 1024;  strcpy(Text, "Kb"); }
-+-
-+-	printf("          ");
-+-	printf(_("TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"),
-+-	       ptr->stats.tx_packets, ptr->stats.tx_errors,
-+-	       ptr->stats.tx_dropped, ptr->stats.tx_fifo_errors,
-+-	       ptr->stats.tx_carrier_errors);
-+-	printf(_("          collisions:%lu "), ptr->stats.collisions);
-+-	if (can_compress)
-+-	    printf(_("compressed:%lu "), ptr->stats.tx_compressed);
-+-	if (ptr->tx_queue_len != -1)
-+-	    printf(_("txqueuelen:%d "), ptr->tx_queue_len);
-+-	printf("\n          ");
-+-	printf(_("RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"),
-++	if (tx > 1125899906842624ull) {
-++	    short_tx /= 1125899906842624ull;
-++	    Text = "PiB";
-++	} else 	if (tx > 1099511627776ull) {
-++	    short_tx /= 1099511627776ull;
-++	    Text = "TiB";
-++	} else if (tx > 1073741824ull) {
-++	    short_tx /= 1073741824ull;
-++	    Text = "GiB";
-++	} else if (tx > 1048576) {
-++	    short_tx /= 1048576;
-++	    Text = "MiB";
-++	} else if (tx > 1024) {
-++	    short_tx /= 1024;
-++	    Text = "KiB";
-++	}
-++
-++	printf("        ");
-++	printf(_("RX packets %llu  bytes %llu (%lu.%lu %s)\n"), 
-++		ptr->stats.rx_packets, 
-+ 	       rx, (unsigned long)(short_rx / 10), 
-+-	       (unsigned long)(short_rx % 10), Rext, 
-+-	       tx, (unsigned long)(short_tx / 10), 
-+-	       (unsigned long)(short_tx % 10), Text);
-++	       (unsigned long)(short_rx % 10), Rext);
-++	if (can_compress) {
-++  	    printf("        ");
-++	    printf(_("RX compressed:%lu\n"), ptr->stats.rx_compressed);
-++	}
-++	printf("        ");
-++	printf(_("RX errors %lu  dropped %lu  overruns %lu  frame %lu\n"),
-++	       ptr->stats.rx_errors, ptr->stats.rx_dropped, 
-++	       ptr->stats.rx_fifo_errors, ptr->stats.rx_frame_errors);
-++
-++
-++	printf("        ");
-++	printf(_("TX packets %llu  bytes %llu (%lu.%lu %s)\n"),
-++		ptr->stats.tx_packets, 
-++	        tx, (unsigned long)(short_tx / 10), 
-++	        (unsigned long)(short_tx % 10), Text);
-++	if (can_compress) {
-++  	    printf("        ");
-++	    printf(_("TX compressed %lu\n"), ptr->stats.tx_compressed);
-++	}
-++	printf("        ");
-++	printf(_("TX errors %lu  dropped %lu overruns %lu  carrier %lu  collisions %lu\n"),
-++	       ptr->stats.tx_errors,
-++	       ptr->stats.tx_dropped, ptr->stats.tx_fifo_errors,
-++	       ptr->stats.tx_carrier_errors, ptr->stats.collisions);
-+     }
-+ 
-+     if ((ptr->map.irq || ptr->map.mem_start || ptr->map.dma ||
-+-	 ptr->map.base_addr)) {
-+-	printf("          ");
-++	 ptr->map.base_addr >= 0x100)) {
-++	printf("        device ");
-+ 	if (ptr->map.irq)
-+-	    printf(_("Interrupt:%d "), ptr->map.irq);
-++	    printf(_("interrupt %d  "), ptr->map.irq);
-+ 	if (ptr->map.base_addr >= 0x100)	/* Only print devices using it for 
-+ 						   I/O maps */
-+-	    printf(_("Base address:0x%x "), ptr->map.base_addr);
-++	    printf(_("base 0x%x  "), ptr->map.base_addr);
-+ 	if (ptr->map.mem_start) {
-+-	    printf(_("Memory:%lx-%lx "), ptr->map.mem_start, ptr->map.mem_end);
-++	    printf(_("memory 0x%lx-%lx  "), ptr->map.mem_start, ptr->map.mem_end);
-+ 	}
-+ 	if (ptr->map.dma)
-+-	    printf(_("DMA chan:%x "), ptr->map.dma);
-++	    printf(_("  dma 0x%x"), ptr->map.dma);
-+ 	printf("\n");
-+     }
-+     printf("\n");
-+Index: net-tools/lib/ipx.c
-+===================================================================
-+--- net-tools.orig/lib/ipx.c
-++++ net-tools/lib/ipx.c
-+@@ -133,6 +133,9 @@ static int IPX_input(int type, char *buf
-+     char *ep;
-+     int nbo;
-+ 
-++    if (!sai)
-++    	return (-1);
-++    	
-+     sai->sipx_family = AF_IPX;
-+     sai->sipx_network = htonl(0);
-+     sai->sipx_node[0] = sai->sipx_node[1] = sai->sipx_node[2] =
-+Index: net-tools/lib/ipx_gr.c
-+===================================================================
-+--- net-tools.orig/lib/ipx_gr.c
-++++ net-tools/lib/ipx_gr.c
-+@@ -38,21 +38,27 @@ int IPX_rprint(int options)
-+     char net[128], router_net[128];
-+     char router_node[128];
-+     int num;
-+-    FILE *fp = fopen(_PATH_PROCNET_IPX_ROUTE, "r");
-++    FILE *fp;
-+     struct aftype *ap;
-+     struct sockaddr sa;
-+ 
-+-    if ((ap = get_afntype(AF_IPX)) == NULL) {
-+-	EINTERN("lib/ipx_rt.c", "AF_IPX missing");
-+-	return (-1);
-+-    }
-++    fp = fopen(_PATH_PROCNET_IPX_ROUTE1, "r");
-+ 
-+     if (!fp) {
-+-        perror(_PATH_PROCNET_IPX_ROUTE);
-+-        printf(_("IPX not configured in this system.\n"));
-++        fp = fopen(_PATH_PROCNET_IPX_ROUTE2, "r");
-++    }
-++    
-++    if (!fp) {
-++        perror(NULL);
-++        printf(_("IPX routing not in file %s or %s found.\n"), _PATH_PROCNET_IPX_ROUTE1, _PATH_PROCNET_IPX_ROUTE2);
-+ 	return 1;
-+     }
-+ 
-++    if ((ap = get_afntype(AF_IPX)) == NULL) {
-++	EINTERN("lib/ipx_rt.c", "AF_IPX missing");
-++	return (-1);
-++    }
-++
-+     printf(_("Kernel IPX routing table\n"));	/* xxx */
-+     printf(_("Destination               Router Net                Router Node\n"));
-+ 
-+Index: net-tools/lib/irda.c
-+===================================================================
-+--- net-tools.orig/lib/irda.c
-++++ net-tools/lib/irda.c
-+@@ -1,13 +1,15 @@
-+ /*********************************************************************
-+  *                
-+  * Filename:      irda.c
-+- * Version:       0.1
-+- * Description:   A first attempt to make ifconfig understand IrDA
-++ * Version:       0.2
-++ * Description:   A second attempt to make ifconfig understand IrDA
-+  * Status:        Experimental.
-+  * Author:        Dag Brattli <dagb@cs.uit.no>
-+  * Created at:    Wed Apr 21 09:03:09 1999
-+  * Modified at:   Wed Apr 21 09:17:05 1999
-+  * Modified by:   Dag Brattli <dagb@cs.uit.no>
-++ * Modified at:   Wed May  1 11:51:44 CEST 2002
-++ * Modified by:   Christoph Bartelmus <christoph@bartelmus.de>
-+  * 
-+  *     This program is free software; you can redistribute it and/or 
-+  *     modify it under the terms of the GNU General Public License as 
-+@@ -59,9 +61,9 @@
-+  */
-+ static char *irda_print(unsigned char *ptr)
-+ {
-+-    static char buff[8];
-++    static char buff[12];
-+ 
-+-    sprintf(&buff[strlen(buff)], "%02x:%02x:%02x:%02x", ptr[3], ptr[2], 
-++    snprintf(buff, 12, "%02x:%02x:%02x:%02x", ptr[3], ptr[2], 
-+ 	    ptr[1], ptr[0]);
-+ 
-+     return (buff);
-+Index: net-tools/lib/net-features.h
-+===================================================================
-+--- net-tools.orig/lib/net-features.h
-++++ net-tools/lib/net-features.h
-+@@ -295,6 +295,13 @@ static char *Features =
-+ "-"
-+ #endif
-+ "HDLC/LAPB "
-++
-++#if HAVE_HWEUI64
-++"+"
-++#else
-++"-"
-++#endif
-++"EUI64 "
-+ ;
-+ 
-+ 
-+Index: net-tools/lib/nstrcmp.c
-+===================================================================
-+--- net-tools.orig/lib/nstrcmp.c
-++++ net-tools/lib/nstrcmp.c
-+@@ -1,34 +1,157 @@
-+ /* Copyright 1998 by Andi Kleen. Subject to the GPL. */
-+-/* $Id: nstrcmp.c,v 1.2 1998/11/15 20:11:38 freitag Exp $ */ 
-++/* rewritten by bernd eckenfels because of complicated alias semantic */
-++/* $Id: nstrcmp.c,v 1.4 2004/06/03 22:49:17 ecki Exp $ */ 
-+ #include <ctype.h>
-+ #include <stdlib.h>
-++#include <string.h>
-+ #include "util.h"
-+ 
-+-/* like strcmp(), but knows about numbers */
-+-int nstrcmp(const char *astr, const char *b)
-++
-++/* return numerical :999 suffix or null. sideeffect: replace ':' with \0 */
-++char* cutalias(char* name)
-+ {
-+-    const char *a = astr;
-++	int digit = 0;
-++	int pos;
-++	
-++	for(pos=strlen(name); pos>0; pos--)
-++	{
-++		if (name[pos-1]==':' && digit)
-++		{
-++			name[pos-1]='\0';
-++			return name+pos;
-++		}
-++		if (!isdigit(name[pos-1]))
-++			break;
-++		digit = 1;
-++	}
-++	return NULL;
-++}
-+ 
-+-    while (*a == *b) {
-+-	if (*a == '\0')
-+-	    return 0;
-+-	a++;
-+-	b++;
-+-    }
-+-    if (isdigit(*a)) {
-+-	if (!isdigit(*b))
-+-	    return -1;
-+-	while (a > astr) {
-+-	    a--;
-+-	    if (!isdigit(*a)) {
-+-		a++;
-+-		break;
-+-	    }
-+-	    if (!isdigit(*b))
-+-		return -1;
-+-	    b--;
-++
-++/* return index of last non digit or -1 if it does not end with digits */
-++int rindex_nondigit(char *name)
-++{
-++	int pos = strlen(name);
-++
-++	for(pos=strlen(name); pos>0; pos--)
-++	{
-++		if (!isdigit(name[pos-1]))
-++			return pos;
-+ 	}
-+-	return atoi(a) > atoi(b) ? 1 : -1;
-+-    }
-+-    return *a - *b;
-++	return 0;
-++}
-++
-++
-++/* like strcmp(), but knows about numbers and ':' alias suffix */
-++int nstrcmp(const char *ap, const char *bp)
-++{
-++	char *a = (char*)strdup(ap);
-++	char *b = (char*)strdup(bp);
-++	char *an, *bn;
-++	int av = 0, bv = 0;
-++	char *aalias=cutalias(a);
-++	char *balias=cutalias(b);
-++	int aindex=rindex_nondigit(a);
-++	int bindex=rindex_nondigit(b);
-++	int complen=(aindex<bindex)?aindex:bindex;
-++	int res = strncmp(a, b, complen);
-++
-++	if (res != 0)
-++		{ free(a); free(b); return res; }
-++		
-++	if (aindex > bindex)
-++		{ free(a); free(b); return 1; }
-++		
-++	if (aindex < bindex)
-++		{ free(a); free(b); return -1; }
-++		
-++	an = a+aindex;
-++	bn = b+bindex;
-++	
-++	av = atoi(an);
-++	bv = atoi(bn);
-++	
-++	if (av < bv)
-++		{ free(a); free(b); return -1; }
-++		
-++	if (av > bv)
-++		{ free(a); free(b); return 1; }
-++		
-++	av = -1;
-++	if (aalias != NULL)
-++		av = atoi(aalias);
-++	
-++	bv = -1;
-++	if (balias != NULL)
-++		bv = atoi(balias);
-++	
-++	free(a); free(b);
-++	
-++	if (av < bv)
-++		return -1;
-++		
-++	if (av > bv)
-++		return 1;
-++		
-++	return 0;
-++}
-++
-++
-++#ifdef NSTRCMP_TEST
-++
-++int cs(int s)
-++{
-++	if (s < 0) return -1;
-++	if (s > 0) return 1;
-++	return 0;
-++}
-++
-++
-++int dotest(char* a, char* b, int exp)
-++{
-++	int res = nstrcmp(a, b);
-++	int err = (cs(res) != cs(exp));
-++	printf("nstrcmp(\"%s\", \"%s\")=%d %d %s\n", a, b, res, exp, err?"WRONG":"OK");
-++	return err;
-+ }
-++
-++int main()
-++{
-++	int err = 0;
-++	
-++	err |= dotest("eth1", "eth1", 0);
-++	err |= dotest("eth0:1", "eth0:1", 0);
-++	err |= dotest("lan", "lan", 0);
-++	err |= dotest("100", "100", 0);
-++	err |= dotest("", "", 0);
-++	err |= dotest(":", ":", 0);
-++	err |= dotest("a:b:c", "a:b:c", 0);
-++	err |= dotest("a:", "a:", 0);
-++	err |= dotest(":a", ":a", 0);
-++
-++	err |= dotest("a", "aa", -1);	
-++	err |= dotest("eth0", "eth1", -1);
-++	err |= dotest("eth1", "eth20", -1);
-++	err |= dotest("eth20", "eth100", -1);
-++	err |= dotest("eth1", "eth13", -1);
-++	err |= dotest("eth", "eth2", -1);
-++	err |= dotest("eth0:1", "eth0:2", -1);
-++	err |= dotest("eth1:10", "eth13:10", -1);
-++	err |= dotest("eth1:1", "eth1:13", -1);
-++	err |= dotest("a", "a:", -1);
-++	
-++	err |= dotest("aa", "a", 1);
-++	err |= dotest("eth2", "eth1", 1);
-++	err |= dotest("eth13", "eth1", 1);	
-++	err |= dotest("eth2", "eth", 1);
-++	err |= dotest("eth2:10", "eth2:1", 1);
-++	err |= dotest("eth2:5", "eth2:4", 1);
-++	err |= dotest("eth3:2", "eth2:3", 1);
-++	err |= dotest("eth13:1", "eth1:0", 1);
-++	err |= dotest("a:", "a", 1);
-++	err |= dotest("a1b12", "a1b2", 1);
-++
-++	return err;
-++}
-++
-++#endif
-+Index: net-tools/lib/pathnames.h
-+===================================================================
-+--- net-tools.orig/lib/pathnames.h
-++++ net-tools/lib/pathnames.h
-+@@ -1,4 +1,3 @@
-+-
-+ /*
-+  * lib/pathnames.h    This file contains the definitions of the path 
-+  *                      names used by the NET-LIB.
-+@@ -29,8 +28,10 @@
-+ #define _PATH_PROCNET_NR_NODES		"/proc/net/nr_nodes"
-+ #define _PATH_PROCNET_ARP		"/proc/net/arp"
-+ #define _PATH_PROCNET_AX25		"/proc/net/ax25"
-+-#define _PATH_PROCNET_IPX		"/proc/net/ipx"
-+-#define _PATH_PROCNET_IPX_ROUTE		"/proc/net/ipx_route"
-++#define _PATH_PROCNET_IPX_SOCKET1	"/proc/net/ipx/socket"
-++#define _PATH_PROCNET_IPX_SOCKET2	"/proc/net/ipx"
-++#define _PATH_PROCNET_IPX_ROUTE1	"/proc/net/ipx/route"
-++#define _PATH_PROCNET_IPX_ROUTE2	"/proc/net/ipx_route"
-+ #define _PATH_PROCNET_ATALK		"/proc/net/appletalk"
-+ #define _PATH_PROCNET_IP_BLK		"/proc/net/ip_block"
-+ #define _PATH_PROCNET_IP_FWD		"/proc/net/ip_forward"
-+@@ -45,6 +46,7 @@
-+ #define _PATH_PROCNET_X25              "/proc/net/x25"
-+ #define _PATH_PROCNET_X25_ROUTE                "/proc/net/x25_routes"
-+ #define _PATH_PROCNET_DEV_MCAST		"/proc/net/dev_mcast"
-++#define _PATH_PROCNET_ATALK_ROUTE	"/proc/net/atalk_route"
-+ 
-+ /* pathname for the netlink device */
-+ #define _PATH_DEV_ROUTE	"/dev/route"
-+Index: net-tools/lib/proc.c
-+===================================================================
-+--- net-tools.orig/lib/proc.c
-++++ net-tools/lib/proc.c
-+@@ -1,11 +1,12 @@
-+ /* Tolerant /proc file parser. Copyright 1998 Andi Kleen */
-+-/* $Id: proc.c,v 1.4 1999/01/05 20:54:00 philip Exp $ */ 
-++/* $Id: proc.c,v 1.5 2007/12/01 18:44:57 ecki Exp $ */ 
-+ /* Fixme: cannot currently cope with removed fields */ 
-+ 
-+ #include <string.h>
-+ #include <stdarg.h>
-+ #include <stdio.h>
-+ #include <ctype.h>
-++#include <unistd.h>
-+ 
-+ /* Caller must free return string. */
-+ 
-+@@ -72,3 +73,22 @@ int proc_guess_fmt(char *name, FILE *fh,
-+     va_end(ap);
-+     return flag;
-+ }
-++
-++
-++FILE *proc_fopen(const char *name)
-++{
-++    static char *buffer;
-++    static size_t pagesz;
-++    FILE *fd = fopen(name, "r");
-++
-++    if (fd == NULL)
-++      return NULL;
-++      
-++    if (!buffer) {
-++      pagesz = getpagesize();
-++      buffer = malloc(pagesz);
-++    }
-++    
-++    setvbuf(fd, buffer, _IOFBF, pagesz);
-++    return fd;
-++}
-+Index: net-tools/lib/proc.h
-+===================================================================
-+--- net-tools.orig/lib/proc.h
-++++ net-tools/lib/proc.h
-+@@ -1,5 +1,7 @@
-+-
-+-
-+-/* Generate a suitable scanf format for a column title line */
-++/* 
-++ * prototypes for proc.c
-++ */
-+ char *proc_gen_fmt(char *name, int more, FILE * fh,...);
-+ int   proc_guess_fmt(char *name, FILE* fh,...);
-++FILE *proc_fopen(const char *name);
-++
-+Index: net-tools/lib/tr.c
-+===================================================================
-+--- net-tools.orig/lib/tr.c
-++++ net-tools/lib/tr.c
-+@@ -2,7 +2,7 @@
-+  * lib/tr.c   This file contains an implementation of the "Tokenring"
-+  *              support functions.
-+  *
-+- * Version:     $Id: tr.c,v 1.8 2000/02/02 08:56:30 freitag Exp $
-++ * Version:     $Id: tr.c,v 1.9 2005/05/16 03:15:12 ecki Exp $
-+  *
-+  * Author:      Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
-+  *              Copyright 1993 MicroWalt Corporation
-+@@ -30,8 +30,14 @@
-+ #include "net-support.h"
-+ #include "pathnames.h"
-+ #include "intl.h"
-++#include "util.h"
-+ 
-++
-++/* actual definition at the end of file */
-+ extern struct hwtype tr_hwtype;
-++#ifdef ARPHRD_IEEE802_TR
-++extern struct hwtype tr_hwtype1;
-++#endif
-+ 
-+ static char *pr_tr(unsigned char *ptr)
-+ {
-+@@ -42,7 +48,7 @@ static char *pr_tr(unsigned char *ptr)
-+ 	     (ptr[3] & 0377), (ptr[4] & 0377), (ptr[5] & 0377)
-+ 	);
-+     return (buff);
-+-}
-++      }
-+ 
-+ 
-+ static int in_tr(char *bufp, struct sockaddr *sap)
-+@@ -51,7 +57,17 @@ static int in_tr(char *bufp, struct sock
-+     char c, *orig;
-+     int i, val;
-+ 
-++#ifdef ARPHRD_IEEE802_TR
-++    if (kernel_version() < KRELEASE(2,3,30)) { 
-++        sap->sa_family = tr_hwtype.type;
-++    } else { 
-++        sap->sa_family = tr_hwtype1.type;
-++    } 	
-++#else
-+     sap->sa_family = tr_hwtype.type;
-++    #warning "Limited functionality, no support for ARPHRD_IEEE802_TR (old kernel headers?)"
-++#endif
-++
-+     ptr = sap->sa_data;
-+ 
-+     i = 0;
-+Index: net-tools/lib/util-ank.c
-+===================================================================
-+--- net-tools.orig/lib/util-ank.c
-++++ net-tools/lib/util-ank.c
-+@@ -293,7 +293,7 @@ int inet_addr_match(inet_prefix *a, inet
-+ 	return 0;
-+ }
-+ 
-+-const char *format_host(int af, void *addr, __u8 *abuf, int alen)
-++const char *format_host(int af, void *addr, char *abuf, int alen)
-+ {
-+ #ifdef RESOLVE_HOSTNAMES
-+ 	if (resolve_hosts) {
-+Index: net-tools/lib/util.h
-+===================================================================
-+--- net-tools.orig/lib/util.h
-++++ net-tools/lib/util.h
-+@@ -14,3 +14,6 @@ int nstrcmp(const char *, const char *);
-+ 
-+ char *safe_strncpy(char *dst, const char *src, size_t size); 
-+ 
-++
-++#define netmin(a,b) ((a)<(b) ? (a) : (b))
-++#define netmax(a,b) ((a)>(b) ? (a) : (b))
-+Index: net-tools/lib/x25_sr.c
-+===================================================================
-+--- net-tools.orig/lib/x25_sr.c
-++++ net-tools/lib/x25_sr.c
-+@@ -67,7 +67,7 @@ static int X25_setroute(int action, int 
-+   strcpy(target, *args++);
-+ 
-+   /* Clean out the x25_route_struct structure. */
-+-  memset((char *) &rt, 0, sizeof(struct x25_route_struct));
-++  memset((char *) &rt, 0, sizeof(rt));
-+ 
-+ 
-+   if ((sigdigits = x25_aftype.input(0, target, (struct sockaddr *)&sx25)) < 0) {
-+@@ -76,8 +76,8 @@ static int X25_setroute(int action, int 
-+   }
-+   rt.sigdigits=sigdigits;
-+ 
-+-  /* x25_route_struct.address isn't type struct sockaddr_x25, Why? */
-+-  memcpy(&rt.address, &sx25.sx25_addr, sizeof(x25_address));
-++  /* this works with 2.4 and 2.6 headers struct x25_address vs. typedef */
-++  memcpy(&rt.address, &sx25.sx25_addr, sizeof(sx25.sx25_addr));
-+ 
-+   while (*args) {
-+ 	if (!strcmp(*args,"device") || !strcmp(*args,"dev")) {
-+Index: net-tools/lib/eui64.c
-+===================================================================
-+--- /dev/null
-++++ net-tools/lib/eui64.c
-+@@ -0,0 +1,155 @@
-++/*
-++ * lib/eui64.c  This file contains support for generic EUI-64 hw addressing
-++ *
-++ * Version:     $Id: eui64.c,v 1.1 2001/11/12 02:12:05 ecki Exp $
-++ *
-++ * Author:      Daniel Stodden <stodden@in.tum.de>
-++ *              Copyright 2001 Daniel Stodden
-++ *
-++ *              blueprinted from ether.c 
-++ *              Copyright 1993 MicroWalt Corporation
-++ *
-++ *              This program is free software; you can redistribute it
-++ *              and/or  modify it under  the terms of  the GNU General
-++ *              Public  License as  published  by  the  Free  Software
-++ *              Foundation;  either  version 2 of the License, or  (at
-++ *              your option) any later version.
-++ */
-++#include "config.h"
-++
-++#if HAVE_HWEUI64
-++
-++#include <sys/types.h>
-++#include <sys/ioctl.h>
-++#include <sys/socket.h>
-++#include <net/if_arp.h>
-++#include <stdlib.h>
-++#include <stdio.h>
-++#include <ctype.h>
-++#include <errno.h>
-++#include <fcntl.h>
-++#include <string.h>
-++#include <termios.h>
-++#include <unistd.h>
-++#include "net-support.h"
-++#include "pathnames.h"
-++#include "intl.h"
-++
-++/*
-++ * EUI-64 constants
-++ */
-++
-++#define EUI64_ALEN	8
-++
-++#ifndef ARPHRD_EUI64
-++#define ARPHRD_EUI64	27
-++#warning "ARPHRD_EUI64 not defined in <net/if_arp.h>. Using private value 27"
-++#endif
-++
-++struct hwtype eui64_hwtype;
-++
-++/* Display an EUI-64 address in readable format. */
-++static char *pr_eui64( unsigned char *ptr )
-++{
-++	static char buff[64];
-++
-++	snprintf(buff, sizeof(buff), "%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X",
-++		 (ptr[0] & 0377), (ptr[1] & 0377), (ptr[2] & 0377), (ptr[3] & 0377), 
-++		 (ptr[4] & 0377), (ptr[5] & 0377), (ptr[6] & 0377), (ptr[7] & 0377)
-++		);
-++	return (buff);
-++}
-++
-++/* Start the PPP encapsulation on the file descriptor. */
-++static int in_eui64( char *bufp, struct sockaddr *sap )
-++{
-++	unsigned char *ptr;
-++	char c, *orig;
-++	int i;
-++	unsigned val;
-++
-++	sap->sa_family = eui64_hwtype.type;
-++	ptr = sap->sa_data;
-++
-++	i = 0;
-++	orig = bufp;
-++	
-++	while ((*bufp != '\0') && (i < EUI64_ALEN)) {
-++		val = 0;
-++		c = *bufp++;
-++		if (isdigit(c))
-++			val = c - '0';
-++		else if (c >= 'a' && c <= 'f')
-++			val = c - 'a' + 10;
-++		else if (c >= 'A' && c <= 'F')
-++			val = c - 'A' + 10;
-++		else {
-++#ifdef DEBUG
-++			fprintf( stderr, _("in_eui64(%s): invalid eui64 address!\n"), 
-++				 orig );
-++#endif
-++			errno = EINVAL;
-++			return (-1);
-++		}
-++
-++		val <<= 4;
-++		c = *bufp;
-++		if (isdigit(c))
-++			val |= c - '0';
-++		else if (c >= 'a' && c <= 'f')
-++			val |= c - 'a' + 10;
-++		else if (c >= 'A' && c <= 'F')
-++			val |= c - 'A' + 10;
-++		else if (c == ':' || c == 0)
-++			val >>= 4;
-++		else {
-++#ifdef DEBUG
-++			fprintf( stderr, _("in_eui64(%s): invalid eui64 address!\n"), 
-++				 orig );
-++#endif
-++			errno = EINVAL;
-++			return (-1);
-++		}
-++
-++		if (c != 0)
-++			bufp++;
-++
-++		*ptr++ = (unsigned char) (val & 0377);
-++		i++;
-++		
-++		/* We might get a semicolon here - not required. */
-++		if (*bufp == ':') {
-++			if (i == EUI64_ALEN) {
-++#ifdef DEBUG
-++				fprintf(stderr, _("in_eui64(%s): trailing : ignored!\n"),
-++					orig)
-++#endif
-++					; /* nothing */
-++			}
-++			bufp++;
-++		}
-++	}
-++
-++	/* That's it.  Any trailing junk? */
-++	if ((i == EUI64_ALEN) && (*bufp != '\0')) {
-++#ifdef DEBUG
-++		fprintf(stderr, _("in_eui64(%s): trailing junk!\n"), orig);
-++		errno = EINVAL;
-++		return (-1);
-++#endif
-++	}
-++#ifdef DEBUG
-++	fprintf(stderr, "in_eui64(%s): %s\n", orig, pr_eui64(sap->sa_data));
-++#endif
-++
-++    return (0);
-++}
-++
-++struct hwtype eui64_hwtype =
-++{
-++	"eui64", NULL, /*"EUI-64 addressing", */ ARPHRD_EUI64, EUI64_ALEN,
-++	pr_eui64, in_eui64, NULL, 0
-++};
-++
-++
-++#endif				/* HAVE_EUI64 */
-+Index: net-tools/lib/ib.c
-+===================================================================
-+--- /dev/null
-++++ net-tools/lib/ib.c
-+@@ -0,0 +1,147 @@
-++/*
-++ * lib/ib.c        This file contains an implementation of the "Infiniband"
-++ *              support functions.
-++ *
-++ * Version:     $Id: ib.c,v 1.1 2005/02/06 11:00:47 tduffy Exp $
-++ *
-++ * Author:      Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
-++ *              Copyright 1993 MicroWalt Corporation
-++ *		Tom Duffy <tduffy@sun.com>
-++ *
-++ *              This program is free software; you can redistribute it
-++ *              and/or  modify it under  the terms of  the GNU General
-++ *              Public  License as  published  by  the  Free  Software
-++ *              Foundation;  either  version 2 of the License, or  (at
-++ *              your option) any later version.
-++ */
-++#include "config.h"
-++
-++#if HAVE_HWIB
-++#include <sys/types.h>
-++#include <sys/socket.h>
-++#include <net/if_arp.h>
-++#include <linux/if_infiniband.h>
-++#include <stdlib.h>
-++#include <stdio.h>
-++#include <errno.h>
-++#include <ctype.h>
-++#include <string.h>
-++#include <unistd.h>
-++#include "net-support.h"
-++#include "pathnames.h"
-++#include "intl.h"
-++#include "util.h"
-++
-++extern struct hwtype ib_hwtype;
-++
-++
-++/* Display an InfiniBand address in readable format. */
-++static char *pr_ib(unsigned char *ptr)
-++{
-++    static char buff[128];
-++    char *pos;
-++    unsigned int i;
-++
-++    pos = buff;
-++    for (i = 0; i < INFINIBAND_ALEN; i++) {
-++	pos += sprintf(pos, "%02X:", (*ptr++ & 0377));
-++    }
-++    buff[strlen(buff) - 1] = '\0';
-++
-++    /* snprintf(buff, sizeof(buff), "%02X:%02X:%02X:%02X:%02X:%02X",
-++	     (ptr[0] & 0377), (ptr[1] & 0377), (ptr[2] & 0377),
-++	     (ptr[3] & 0377), (ptr[4] & 0377), (ptr[5] & 0377)
-++	);
-++    */
-++    return (buff);
-++}
-++
-++
-++/* Input an Infiniband address and convert to binary. */
-++static int in_ib(char *bufp, struct sockaddr *sap)
-++{
-++    unsigned char *ptr;
-++    char c, *orig;
-++    int i;
-++    unsigned val;
-++
-++    sap->sa_family = ib_hwtype.type;
-++    ptr = sap->sa_data;
-++
-++    i = 0;
-++    orig = bufp;
-++    while ((*bufp != '\0') && (i < INFINIBAND_ALEN)) {
-++	val = 0;
-++	c = *bufp++;
-++	if (isdigit(c))
-++	    val = c - '0';
-++	else if (c >= 'a' && c <= 'f')
-++	    val = c - 'a' + 10;
-++	else if (c >= 'A' && c <= 'F')
-++	    val = c - 'A' + 10;
-++	else {
-++#ifdef DEBUG
-++	    fprintf(stderr, _("in_ib(%s): invalid infiniband address!\n"), orig);
-++#endif
-++	    errno = EINVAL;
-++	    return (-1);
-++	}
-++	val <<= 4;
-++	c = *bufp;
-++	if (isdigit(c))
-++	    val |= c - '0';
-++	else if (c >= 'a' && c <= 'f')
-++	    val |= c - 'a' + 10;
-++	else if (c >= 'A' && c <= 'F')
-++	    val |= c - 'A' + 10;
-++	else if (c == ':' || c == 0)
-++	    val >>= 4;
-++	else {
-++#ifdef DEBUG
-++	    fprintf(stderr, _("in_ib(%s): invalid infiniband address!\n"), orig);
-++#endif
-++	    errno = EINVAL;
-++	    return (-1);
-++	}
-++	if (c != 0)
-++	    bufp++;
-++	*ptr++ = (unsigned char) (val & 0377);
-++	i++;
-++
-++	/* We might get a semicolon here - not required. */
-++	if (*bufp == ':') {
-++	    if (i == INFINIBAND_ALEN) {
-++#ifdef DEBUG
-++		fprintf(stderr, _("in_ib(%s): trailing : ignored!\n"),
-++			orig)
-++#endif
-++		    ;		/* nothing */
-++	    }
-++	    bufp++;
-++	}
-++    }
-++
-++    /* That's it.  Any trailing junk? */
-++    if ((i == INFINIBAND_ALEN) && (*bufp != '\0')) {
-++#ifdef DEBUG
-++	fprintf(stderr, _("in_ib(%s): trailing junk!\n"), orig);
-++	errno = EINVAL;
-++	return (-1);
-++#endif
-++    }
-++#ifdef DEBUG
-++    fprintf(stderr, "in_ib(%s): %s\n", orig, pr_ib(sap->sa_data));
-++#endif
-++
-++    return (0);
-++}
-++
-++
-++struct hwtype ib_hwtype =
-++{
-++    "infiniband", NULL, ARPHRD_INFINIBAND, INFINIBAND_ALEN,
-++    pr_ib, in_ib, NULL
-++};
-++
-++
-++#endif				/* HAVE_HWIB */
---- net-tools-1.60.orig/debian/patches/CVS-20051204-slttach.c_sync.patch
-+++ net-tools-1.60/debian/patches/CVS-20051204-slttach.c_sync.patch
-@@ -0,0 +1,43 @@
-+Sync with upstream CVS, complete log:
-+
-+Revision 1.11 - Sun Dec 4 05:15:36 2005 UTC by ecki
-+use file version
-+
-+Revision 1.10 - Sun Dec 4 05:14:08 2005 UTC by ecki
-+make slattach 3-wire -L mode work (no RTSCTS) (Debian Bug #175743)
-+
-+Index: net-tools/slattach.c
-+===================================================================
-+--- net-tools.orig/slattach.c
-++++ net-tools/slattach.c
-+@@ -73,7 +73,7 @@
-+ 
-+ 
-+ const char *Release = RELEASE,
-+-	   *Version = "@(#) slattach 1.21 (1999-11-21)",
-++	   *Version = "$Id: slattach.c,v 1.11 2005/12/04 05:15:36 ecki Exp $",
-+ 	   *Signature = "net-tools, Fred N. van Kempen et al.";
-+ 
-+ 
-+@@ -115,7 +115,7 @@ int		opt_h = 0;		/* "hangup" on carrier 
-+ int		opt_k = 0;		/* "keepalive" value		*/
-+ #endif
-+ int		opt_l = 0;		/* "lock it" flag		*/
-+-int		opt_L = 0;		/* clocal flag			*/
-++int		opt_L = 0;		/* 3-wire mode flag		*/
-+ int		opt_m = 0;		/* "set RAW mode" flag		*/
-+ int		opt_n = 0;		/* "set No Mesg" flag		*/
-+ #ifdef SIOCSOUTFILL
-+@@ -342,9 +342,11 @@ tty_set_raw(struct termios *tty)
-+   tty->c_oflag = (0);				/* output flags		*/
-+   tty->c_lflag = (0);				/* local flags		*/
-+   speed = (tty->c_cflag & CBAUD);		/* save current speed	*/
-+-  tty->c_cflag = (CRTSCTS | HUPCL | CREAD);	/* UART flags		*/
-++  tty->c_cflag = (HUPCL | CREAD);		/* UART flags		*/
-+   if (opt_L) 
-+ 	tty->c_cflag |= CLOCAL;
-++  else
-++	tty->c_cflag |= CRTSCTS;
-+   tty->c_cflag |= speed;			/* restore speed	*/
-+   return(0);
-+ }
---- net-tools-1.60.orig/debian/patches/CVS-20071202-rarp.c_sync.patch
-+++ net-tools-1.60/debian/patches/CVS-20071202-rarp.c_sync.patch
-@@ -0,0 +1,41 @@
-+Sync with upstream CVS, complete log:
-+
-+Revision 1.9 - Sun Dec 2 02:19:52 2007 UTC by ecki
-+more backoff
-+
-+Revision 1.8 - Sat Dec 1 19:36:55 2007 UTC by ecki
-+backoff proc_fopen usage from etherfile.
-+
-+Revision 1.7 - Sat Dec 1 18:51:09 2007 UTC by ecki
-+Page aligned fopen buffer
-+
-+Index: net-tools/rarp.c
-+===================================================================
-+--- net-tools.orig/rarp.c
-++++ net-tools/rarp.c
-+@@ -3,7 +3,7 @@
-+  *              that maintains the kernel's RARP cache.  It is derived
-+  *              from Fred N. van Kempen's arp command.
-+  *
-+- * Version:	$Id: rarp.c,v 1.6 2001/04/08 17:05:05 pb Exp $
-++ * Version:	$Id: rarp.c,v 1.9 2007/12/02 02:19:52 ecki Exp $
-+  *
-+  * Usage:       rarp -d hostname                      Delete entry
-+  *              rarp -s hostname ethernet_address     Add entry
-+@@ -40,6 +40,7 @@
-+ #include "net-support.h"
-+ #include "version.h"
-+ #include "pathnames.h"
-++#include "proc.h"
-+ 
-+ static char no_rarp_message[] = N_("This kernel does not support RARP.\n");
-+ 
-+@@ -154,7 +155,7 @@ static int rarp_file(int fd, const char 
-+ 
-+ static int display_cache(void)
-+ {
-+-    FILE *fd = fopen(_PATH_PROCNET_RARP, "r");
-++    FILE *fd = proc_fopen(_PATH_PROCNET_RARP);
-+     char buffer[256];
-+     if (fd == NULL) {
-+ 	if (errno == ENOENT)
---- net-tools-1.60.orig/debian/patches/CVS-20081003-statistics.c_sync.patch
-+++ net-tools-1.60/debian/patches/CVS-20081003-statistics.c_sync.patch
-@@ -0,0 +1,385 @@
-+Sync with upstream CVS, complete log:
-+
-+Revision 1.21 - Fri Oct 3 00:05:20 2008 UTC by ecki
-+Enable netstat -s for IPv6 (Debian Bug #453859 from Varun Chandramohan)
-+
-+Revision 1.20 - Sat Dec 1 18:44:56 2007 UTC by ecki
-+Faster pagesize aligned fopen for netstat -s (Eric Dumazet)
-+
-+Revision 1.19 - Sat Dec 1 18:29:05 2007 UTC by ecki
-+Better netstat -s error handling and larger buffers
-+
-+Revision 1.18 - Wed Feb 12 03:30:57 2003 UTC by ak
-+Add text for two new TCP statistics and fix some existing descriptions
-+
-+Revision 1.17 - Sun Apr 28 15:41:01 2002 UTC by ak
-+Fix some counter descriptions.  Noted by Jamal Hadi.
-+
-+Revision 1.16 - Wed Oct 24 11:57:05 2001 UTC by ak
-+(Finally) update netstat -s for 2.4 statistics.
-+
-+Revision 1.15 - Fri Oct 19 09:28:01 2001 UTC by ak
-+Only print unknown statistics when their counter is > 0.
-+
-+Index: net-tools/statistics.c
-+===================================================================
-+--- net-tools.orig/statistics.c
-++++ net-tools/statistics.c
-+@@ -1,6 +1,6 @@
-+ /*
-+  * Copyright 1997,1999,2000 Andi Kleen. Subject to the GPL. 
-+- * $Id: statistics.c,v 1.14 2001/02/02 18:01:23 pb Exp $
-++ * $Id: statistics.c,v 1.21 2008/10/03 00:05:20 ecki Exp $
-+  * 19980630 - i18n - Arnaldo Carvalho de Melo <acme@conectiva.com.br> 
-+  * 19981113 - i18n fixes - Arnaldo Carvalho de Melo <acme@conectiva.com.br> 
-+  * 19990101 - added net/netstat, -t, -u, -w supprt - Bernd Eckenfels 
-+@@ -11,6 +11,7 @@
-+ #include <string.h>
-+ #include "config.h"
-+ #include "intl.h"
-++#include "proc.h"
-+ 
-+ /* #define WARN 1 */
-+ 
-+@@ -83,6 +84,32 @@ struct entry Iptab[] =
-+     {"FragCreates", N_("%u fragments created"), opt_number}
-+ };
-+ 
-++struct entry Ip6tab[] =
-++{
-++    {"Ip6InReceives", N_("%u total packets received"), number},
-++    {"Ip6InHdrErrors", N_("%u with invalid headers"), opt_number},
-++    {"Ip6InTooBigErrors", N_("%u with packets too big"), opt_number},
-++    {"Ip6InNoRoutes", N_("%u incoming packets with no route"), opt_number},
-++    {"Ip6InAddrErrors", N_("%u with invalid addresses"), opt_number},
-++    {"Ip6InUnknownProtos", N_("%u with unknown protocol"), opt_number},
-++    {"Ip6InTruncatedPkts", N_("%u with truncated packets"), opt_number},
-++    {"Ip6InDiscards", N_("%u incoming packets discarded"), number},
-++    {"Ip6InDelivers", N_("%u incoming packets delivered"), number},
-++    {"Ip6OutForwDatagrams", N_("%u forwarded"), number},
-++    {"Ip6OutRequests", N_("%u requests sent out"), number},     /*? */
-++    {"Ip6OutDiscards", N_("%u outgoing packets dropped"), opt_number},
-++    {"Ip6OutNoRoutes", N_("%u dropped because of missing route"), opt_number},
-++    {"Ip6ReasmTimeout", N_("%u fragments dropped after timeout"), opt_number},
-++    {"Ip6ReasmReqds", N_("%u reassemblies required"), opt_number}, /* ? */
-++    {"Ip6ReasmOKs", N_("%u packets reassembled ok"), opt_number},
-++    {"Ip6ReasmFails", N_("%u packet reassembles failed"), opt_number},
-++    {"Ip6FragOKs", N_("%u fragments received ok"), opt_number},
-++    {"Ip6FragFails", N_("%u fragments failed"), opt_number},
-++    {"Ip6FragCreates", N_("%u fragments created"), opt_number},
-++    {"Ip6InMcastPkts", N_("%u incoming multicast packets"), opt_number},
-++    {"Ip6OutMcastPkts", N_("%u outgoing multicast packets"), opt_number}
-++};
-++
-+ struct entry Icmptab[] =
-+ {
-+     {"InMsgs", N_("%u ICMP messages received"), number},
-+@@ -113,6 +140,41 @@ struct entry Icmptab[] =
-+     {"OutAddrMaskReps", N_("address mask replies: %u"), i_outp_icmp | I_TITLE},
-+ };
-+ 
-++struct entry Icmp6tab[] =
-++{
-++    {"Icmp6InMsgs", N_("%u ICMP messages received"), number},
-++    {"Icmp6InErrors", N_("%u input ICMP message failed."), number},
-++    {"Icmp6InDestUnreachs", N_("destination unreachable: %u"), i_inp_icmp | I_TITLE},
-++    {"Icmp6InPktTooBigs", N_("packets too big: %u"), i_inp_icmp | I_TITLE},
-++    {"Icmp6InTimeExcds", N_("received ICMPv6 time exceeded: %u"), i_inp_icmp | I_TITLE},
-++    {"Icmp6InParmProblems", N_("parameter problem: %u"), i_inp_icmp | I_TITLE},
-++    {"Icmp6InEchos", N_("echo requests: %u"), i_inp_icmp | I_TITLE},
-++    {"Icmp6InEchoReplies", N_("echo replies: %u"), i_inp_icmp | I_TITLE},
-++    {"Icmp6InGroupMembQueries", N_("group member queries: %u"), i_inp_icmp | I_TITLE},
-++    {"Icmp6InGroupMembResponses", N_("group member responses: %u"), i_inp_icmp | I_TITLE},
-++    {"Icmp6InGroupMembReductions", N_("group member reductions: %u"), i_inp_icmp | I_TITLE},
-++    {"Icmp6InRouterSolicits", N_("router solicits: %u"), i_inp_icmp | I_TITLE},
-++    {"Icmp6InRouterAdvertisements", N_("router advertisement: %u"), i_inp_icmp | I_TITLE},
-++    {"Icmp6InNeighborSolicits", N_("neighbour solicits: %u"), i_inp_icmp | I_TITLE},
-++    {"Icmp6InNeighborAdvertisements", N_("neighbour advertisement: %u"), i_inp_icmp | I_TITLE},
-++    {"Icmp6InRedirects", N_("redirects: %u"), i_inp_icmp | I_TITLE},
-++    {"Icmp6OutMsgs", N_("%u ICMP messages sent"), number},
-++    {"Icmp6OutDestUnreachs", N_("destination unreachable: %u"), i_outp_icmp | I_TITLE},
-++    {"Icmp6OutPktTooBigs", N_("packets too big: %u"), i_outp_icmp | I_TITLE},
-++    {"Icmp6OutTimeExcds", N_("sent ICMPv6 time exceeded: %u"), i_outp_icmp | I_TITLE},
-++    {"Icmp6OutParmProblems", N_("parameter problem: %u"), i_outp_icmp | I_TITLE},
-++    {"Icmp6OutEchos", N_("echo requests: %u"), i_outp_icmp | I_TITLE},
-++    {"Icmp6OutEchoReplies", N_("echo replies: %u"), i_outp_icmp | I_TITLE},
-++    {"Icmp6OutGroupMembQueries", N_("group member queries: %u"), i_outp_icmp | I_TITLE},
-++    {"Icmp6OutGroupMembResponses", N_("group member responses: %u"), i_outp_icmp | I_TITLE},
-++    {"Icmp6OutGroupMembReductions", N_("group member reductions: %u"), i_outp_icmp | I_TITLE},
-++    {"Icmp6OutRouterSolicits", N_("router solicits: %u"), i_outp_icmp | I_TITLE},
-++    {"Icmp6OutRouterAdvertisements ", N_("router advertisement: %u"), i_outp_icmp | I_TITLE},
-++    {"Icmp6OutNeighborSolicits", N_("neighbor solicits: %u"), i_outp_icmp | I_TITLE},
-++    {"Icmp6OutNeighborAdvertisements", N_("neighbor advertisements: %u"), i_outp_icmp | I_TITLE},
-++    {"Icmp6OutRedirects", N_("redirects: %u"), i_outp_icmp | I_TITLE},
-++};
-++
-+ struct entry Tcptab[] =
-+ {
-+     {"RtoAlgorithm", N_("RTO algorithm is %s"), i_rto_alg | I_STATIC},
-+@@ -139,6 +201,14 @@ struct entry Udptab[] =
-+     {"OutDatagrams", N_("%u packets sent"), number},
-+ };
-+ 
-++struct entry Udp6tab[] =
-++{
-++    {"Udp6InDatagrams", N_("%u packets received"), number},
-++    {"Udp6NoPorts", N_("%u packets to unknown port received."), number},
-++    {"Udp6InErrors", N_("%u packet receive errors"), number},
-++    {"Udp6OutDatagrams", N_("%u packets sent"), number},
-++};
-++
-+ struct entry Tcpexttab[] =
-+ {
-+     {"SyncookiesSent", N_("%u SYN cookies sent"), opt_number},
-+@@ -172,19 +242,59 @@ struct entry Tcpexttab[] =
-+     { "DelayedACKLost", N_("Quick ack mode was activated %u times"), opt_number },
-+     { "ListenOverflows", N_("%u times the listen queue of a socket overflowed"),
-+       opt_number },
-+-    { "ListenDrops", N_("%u SYNs to LISTEN sockets ignored"), opt_number },
-++    { "ListenDrops", N_("%u SYNs to LISTEN sockets dropped"), opt_number },
-+     { "TCPPrequeued", N_("%u packets directly queued to recvmsg prequeue."), 
-+       opt_number },
-+-    { "TCPDirectCopyFromBacklog", N_("%u packets directly received"
-+-				     " from backlog"), opt_number },
-+-    { "TCPDirectCopyFromPrequeue", N_("%u packets directly received"
-+-				      " from prequeue"), opt_number },
-++    { "TCPDirectCopyFromBacklog", N_("%u bytes directly in process context from backlog"), opt_number },
-++    { "TCPDirectCopyFromPrequeue", N_("%u bytes directly received in process context from prequeue"),
-++				      opt_number },
-+     { "TCPPrequeueDropped", N_("%u packets dropped from prequeue"), opt_number },
-+-    { "TCPHPHits", N_("%u packets header predicted"), number },
-++    { "TCPHPHits", N_("%u packet headers predicted"), number },
-+     { "TCPHPHitsToUser", N_("%u packets header predicted and "
-+ 			    "directly queued to user"), opt_number },
-+     { "SockMallocOOM", N_("Ran %u times out of system memory during " 
-+ 			  "packet sending"), opt_number }, 
-++    { "TCPPureAcks", N_("%u acknowledgments not containing data payload received"), opt_number },
-++    { "TCPHPAcks", N_("%u predicted acknowledgments"), opt_number },
-++    { "TCPRenoRecovery", N_("%u times recovered from packet loss due to fast retransmit"), opt_number },
-++    { "TCPSackRecovery", N_("%u times recovered from packet loss by selective acknowledgements"), opt_number },
-++    { "TCPSACKReneging", N_("%u bad SACK blocks received"), opt_number },
-++    { "TCPFACKReorder", N_("Detected reordering %u times using FACK"), opt_number },
-++    { "TCPSACKReorder", N_("Detected reordering %u times using SACK"), opt_number },
-++    { "TCPTSReorder", N_("Detected reordering %u times using time stamp"), opt_number },
-++    { "TCPRenoReorder", N_("Detected reordering %u times using reno fast retransmit"), opt_number },
-++    { "TCPFullUndo", N_("%u congestion windows fully recovered without slow start"), opt_number }, 
-++    { "TCPPartialUndo", N_("%u congestion windows partially recovered using Hoe heuristic"), opt_number },
-++    { "TCPDSackUndo", N_("%u congestion window recovered without slow start using DSACK"), opt_number },
-++    { "TCPLossUndo", N_("%u congestion windows recovered without slow start after partial ack"), opt_number },
-++    { "TCPLostRetransmits", N_("%u retransmits lost"), opt_number },
-++    { "TCPRenoFailures",  N_("%u timeouts after reno fast retransmit"), opt_number },
-++    { "TCPSackFailures",  N_("%u timeouts after SACK recovery"), opt_number },
-++    { "TCPLossFailures",  N_("%u timeouts in loss state"), opt_number },
-++    { "TCPFastRetrans", N_("%u fast retransmits"), opt_number },
-++    { "TCPForwardRetrans", N_("%u forward retransmits"), opt_number }, 
-++    { "TCPSlowStartRetrans", N_("%u retransmits in slow start"), opt_number },
-++    { "TCPTimeouts", N_("%u other TCP timeouts"), opt_number },
-++    { "TCPRenoRecoveryFailed", N_("%u reno fast retransmits failed"), opt_number },
-++    { "TCPSackRecoveryFail", N_("%u SACK retransmits failed"), opt_number },
-++    { "TCPSchedulerFailed", N_("%u times receiver scheduled too late for direct processing"), opt_number },
-++    { "TCPRcvCollapsed", N_("%u packets collapsed in receive queue due to low socket buffer"), opt_number },
-++    { "TCPDSACKOldSent", N_("%u DSACKs sent for old packets"), opt_number },
-++    { "TCPDSACKOfoSent", N_("%u DSACKs sent for out of order packets"), opt_number },
-++    { "TCPDSACKRecv", N_("%u DSACKs received"), opt_number },
-++    { "TCPDSACKOfoRecv", N_("%u DSACKs for out of order packets received"), opt_number },
-++    { "TCPAbortOnSyn", N_("%u connections reset due to unexpected SYN"), opt_number },
-++    { "TCPAbortOnData", N_("%u connections reset due to unexpected data"), opt_number },
-++    { "TCPAbortOnClose", N_("%u connections reset due to early user close"), opt_number },
-++    { "TCPAbortOnMemory", N_("%u connections aborted due to memory pressure"), opt_number },
-++    { "TCPAbortOnTimeout", N_("%u connections aborted due to timeout"), opt_number },
-++    { "TCPAbortOnLinger", N_("%u connections aborted after user close in linger timeout"), opt_number },
-++    { "TCPAbortFailed", N_("%u times unabled to send RST due to no memory"), opt_number }, 
-++    { "TCPMemoryPressures", N_("TCP ran low on memory %u times"), opt_number }, 
-++    { "TCPLoss", N_("%u TCP data loss events"), opt_number },
-++    { "TCPDSACKUndo", N_("%u congestion windows recovered without slow start by DSACK"), 
-++	opt_number },
-++    { "TCPRenoRecoveryFail", N_("%u classic Reno fast retransmits failed"), opt_number },
-+ };
-+ 
-+ struct tabtab {
-+@@ -204,6 +314,15 @@ struct tabtab snmptabs[] =
-+     {NULL}
-+ };
-+ 
-++struct tabtab snmp6tabs[] =
-++{
-++    {"Ip6", Ip6tab, sizeof(Ip6tab), &f_raw},
-++    {"Icmp6", Icmp6tab, sizeof(Icmp6tab), &f_raw},
-++    {"Udp6", Udp6tab, sizeof(Udp6tab), &f_udp},
-++    {"Tcp6", Tcptab, sizeof(Tcptab), &f_tcp},
-++    {NULL}
-++};
-++
-+ /* XXX IGMP */
-+ 
-+ int cmpentries(const void *a, const void *b)
-+@@ -222,7 +341,8 @@ void printval(struct tabtab *tab, char *
-+ 	    ent = bsearch(&key, tab->tab, tab->size / sizeof(struct entry),
-+ 			  sizeof(struct entry), cmpentries);
-+     if (!ent) {			/* try our best */
-+-	printf("%*s%s: %d\n", states[state].indent, "", title, val);
-++	if (val) 
-++		printf("%*s%s: %d\n", states[state].indent, "", title, val);
-+ 	return;
-+     }
-+     type = ent->type;
-+@@ -289,14 +409,17 @@ struct tabtab *newtable(struct tabtab *t
-+ 	return &dummytab;
-+ }
-+ 
-+-void process_fd(FILE *f)
-++int process_fd(FILE *f, int all, char *filter)
-+ {
-+-    char buf1[1024], buf2[1024];
-++    char buf1[2048], buf2[2048];
-+     char *sp, *np, *p;
-+     while (fgets(buf1, sizeof buf1, f)) {
-+ 	int endflag;
-+ 	struct tabtab *tab;
-+ 
-++        if (buf1[0] == '\n') // skip empty first line in 2.6 kernels
-++            continue;
-++            
-+ 	if (!fgets(buf2, sizeof buf2, f))
-+ 	    break;
-+ 	sp = strchr(buf1, ':');
-+@@ -305,6 +428,10 @@ void process_fd(FILE *f)
-+ 	    goto formaterr;
-+ 	*sp = '\0';
-+ 
-++        if (!all)
-++           if (strncmp(buf1, filter, strlen(filter)))
-++               continue;
-++
-+ 	tab = newtable(snmptabs, buf1);
-+ 	if (tab == NULL) {
-+ 		printf("unknown %s\n", buf1);
-+@@ -330,13 +457,47 @@ void process_fd(FILE *f)
-+ 	    sp = p + 1;
-+ 	}
-+     }
-+-  return;
-++  return 0;
-+   
-+ formaterr:
-+-  perror(_("error parsing /proc/net/snmp"));
-+-  return;
-++  return -1;
-++}
-++
-++void cpytitle(char *original, char *new)
-++{
-++     char *ptr = original;
-++     while(*ptr != '6' && *ptr != '\0') {
-++           *new = *ptr;
-++            new++;
-++            ptr++;
-++     }
-++    *new = *ptr;
-++    new++;
-++    *new = '\0';
-+ }
-+ 
-++void process6_fd(FILE *f)
-++{
-++   char buf1[1024],buf2[50],buf3[1024];
-++   unsigned long val;
-++   struct tabtab *tab = NULL;
-++   int cpflg = 0;
-++
-++   while (fgets(buf1, sizeof buf1, f)) {
-++          sscanf(buf1, "%s %lu", buf2, &val);
-++          if(!cpflg) {
-++             cpytitle(buf2, buf3);
-++             tab = newtable(snmp6tabs, buf3);
-++             cpflg = 1;
-++          }
-++          if(!strstr(buf2, buf3)) {
-++             cpytitle(buf2, buf3);
-++             tab = newtable(snmp6tabs, buf3);
-++          }
-++          printval(tab, buf2, val);
-++   }
-++
-++}
-+ 
-+ void parsesnmp(int flag_raw, int flag_tcp, int flag_udp)
-+ {
-+@@ -344,22 +505,25 @@ void parsesnmp(int flag_raw, int flag_tc
-+ 
-+     f_raw = flag_raw; f_tcp = flag_tcp; f_udp = flag_udp;
-+     
-+-    f = fopen("/proc/net/snmp", "r");
-++    f = proc_fopen("/proc/net/snmp");
-+     if (!f) {
-+ 	perror(_("cannot open /proc/net/snmp"));
-+ 	return;
-+     }
-+-    process_fd(f);
-++
-++    if (process_fd(f, 1, NULL) < 0)
-++      fprintf(stderr, _("Problem while parsing /proc/net/snmp\n"));
-+ 
-+     if (ferror(f))
-+ 	perror("/proc/net/snmp");
-+ 
-+     fclose(f);
-+ 
-+-    f = fopen("/proc/net/netstat", "r");
-++    f = proc_fopen("/proc/net/netstat");
-+ 
-+     if (f) {
-+-    	process_fd(f);
-++    	if (process_fd(f, 1, NULL) <0)
-++          fprintf(stderr, _("Problem while parsing /proc/net/netstat\n"));
-+ 
-+         if (ferror(f))
-+ 	    perror("/proc/net/netstat");
-+@@ -369,6 +533,33 @@ void parsesnmp(int flag_raw, int flag_tc
-+     return;
-+ }
-+     
-++void parsesnmp6(int flag_raw, int flag_tcp, int flag_udp)
-++{
-++    FILE *f;
-++
-++    f_raw = flag_raw; f_tcp = flag_tcp; f_udp = flag_udp;
-++
-++    f = fopen("/proc/net/snmp6", "r");
-++    if (!f) {
-++        perror(_("cannot open /proc/net/snmp6"));
-++        return;
-++    }
-++    process6_fd(f);
-++    if (ferror(f))
-++        perror("/proc/net/snmp6");
-++
-++    fclose(f);
-++    f = fopen("/proc/net/snmp", "r");
-++    if (!f) {
-++        perror(_("cannot open /proc/net/snmp"));
-++        return;
-++    }
-++    process_fd(f, 0, "Tcp");
-++    if (ferror(f))
-++        perror("/proc/net/snmp");
-++
-++    fclose(f);
-++}
-+ 
-+ void inittab(void)
-+ {
-+@@ -379,3 +570,13 @@ void inittab(void)
-+ 	qsort(t->tab, t->size / sizeof(struct entry),
-+ 	      sizeof(struct entry), cmpentries);
-+ }
-++
-++void inittab6(void)
-++{
-++    struct tabtab *t;
-++
-++    for (t = snmp6tabs; t->title; t++)
-++        qsort(t->tab, t->size / sizeof(struct entry),
-++              sizeof(struct entry), cmpentries);
-++}
-++
---- net-tools-1.60.orig/debian/patches/CVS-20051204-arp.c_sync.patch
-+++ net-tools-1.60/debian/patches/CVS-20051204-arp.c_sync.patch
-@@ -0,0 +1,311 @@
-+Sync with upstream CVS, complete log:
-+
-+Revision 1.25 - Sun Dec 4 02:57:15 2005 UTC by ecki
-+In order to fix alignment bugs with recent GCCs I have to use
-+sockaddr_storage instead of sockaddr for allocation.
-+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=340384
-+Thanks to Blars Blarson, Jurij Smakov and Steve Langasek
-+
-+Revision 1.24 - Mon May 16 04:30:17 2005 UTC by ecki
-+desupport dontpub in arp.8 and arp -? (Debian Bug #203396)
-+
-+Revision 1.23 - Sat Feb 8 19:56:25 2003 UTC by ecki
-+fixed an logic error in the "not found" handling for deleting entries
-+also added a documentation comment and newer errno values for 2.4
-+Thanks to niteowl@intrinsity.com for pointing out.
-+
-+Revision 1.22 - Tue Dec 10 01:01:24 2002 UTC by ecki
-+change confusing "*" into "<from_interface>"
-+
-+Revision 1.21 - Sun May 6 02:14:07 2001 UTC by ecki
-+changed a type arp -a now prints PUB instead of PUP for proxy arp entries
-+
-+Index: net-tools/arp.c
-+===================================================================
-+--- net-tools.orig/arp.c
-++++ net-tools/arp.c
-+@@ -8,7 +8,7 @@
-+  *              NET-3 Networking Distribution for the LINUX operating
-+  *              system.
-+  *
-+- * Version:     $Id: arp.c,v 1.20 2001/04/08 17:05:05 pb Exp $
-++ * Version:     $Id: arp.c,v 1.25 2005/12/04 02:57:15 ecki Exp $
-+  *
-+  * Maintainer:  Bernd 'eckes' Eckenfels, <net-tools@lina.inka.de>
-+  *
-+@@ -100,9 +100,10 @@ static int arp_del(char **args)
-+ {
-+     char host[128];
-+     struct arpreq req;
-+-    struct sockaddr sa;
-++    struct sockaddr_storage ss;
-++    struct sockaddr *sa;
-+     int flags = 0;
-+-    int err;
-++    int deleted = 0;
-+ 
-+     memset((char *) &req, 0, sizeof(req));
-+ 
-+@@ -112,12 +113,13 @@ static int arp_del(char **args)
-+ 	return (-1);
-+     }
-+     safe_strncpy(host, *args, (sizeof host));
-+-    if (ap->input(0, host, &sa) < 0) {
-++    sa = (struct sockaddr *)&ss;
-++    if (ap->input(0, host, sa) < 0) {
-+ 	ap->herror(host);
-+ 	return (-1);
-+     }
-+     /* If a host has more than one address, use the correct one! */
-+-    memcpy((char *) &req.arp_pa, (char *) &sa, sizeof(struct sockaddr));
-++    memcpy((char *) &req.arp_pa, (char *) sa, sizeof(struct sockaddr));
-+ 
-+     if (hw_set)
-+ 	req.arp_ha.sa_family = hw->type;
-+@@ -148,7 +150,7 @@ static int arp_del(char **args)
-+ 	    continue;
-+ 	}
-+ 	if (!strcmp(*args, "dontpub")) {
-+-#ifdef HAVE_ATF_DONTPUB
-++#ifdef ATF_DONTPUB
-+ 	    req.arp_flags |= ATF_DONTPUB;
-+ #else
-+ 	    ENOSUPP("arp", "ATF_DONTPUB");
-+@@ -157,7 +159,7 @@ static int arp_del(char **args)
-+ 	    continue;
-+ 	}
-+ 	if (!strcmp(*args, "auto")) {
-+-#ifdef HAVE_ATF_MAGIC
-++#ifdef ATF_MAGIC
-+ 	    req.arp_flags |= ATF_MAGIC;
-+ #else
-+ 	    ENOSUPP("arp", "ATF_MAGIC");
-+@@ -177,11 +179,11 @@ static int arp_del(char **args)
-+ 		usage();
-+ 	    if (strcmp(*args, "255.255.255.255") != 0) {
-+ 		strcpy(host, *args);
-+-		if (ap->input(0, host, &sa) < 0) {
-++		if (ap->input(0, host, sa) < 0) {
-+ 		    ap->herror(host);
-+ 		    return (-1);
-+ 		}
-+-		memcpy((char *) &req.arp_netmask, (char *) &sa,
-++		memcpy((char *) &req.arp_netmask, (char *) sa,
-+ 		       sizeof(struct sockaddr));
-+ 		req.arp_flags |= ATF_NETMASK;
-+ 	    }
-+@@ -190,35 +192,41 @@ static int arp_del(char **args)
-+ 	}
-+ 	usage();
-+     }
-++
-++    // if neighter priv nor pub is given, work on both
-+     if (flags == 0)
-+ 	flags = 3;
-+ 
-+     strcpy(req.arp_dev, device);
-+ 
-+-    err = -1;
-++    /* unfortuatelly the kernel interface does not allow us to
-++       delete private entries anlone, so we need this hack
-++       to avoid "not found" errors if we try both. */
-++    deleted = 0;
-+ 
-+     /* Call the kernel. */
-+     if (flags & 2) {
-+ 	if (opt_v)
-+-	    fprintf(stderr, "arp: SIOCDARP(nopub)\n");
-+-	if ((err = ioctl(sockfd, SIOCDARP, &req) < 0)) {
-+-	    if (errno == ENXIO) {
-++	    fprintf(stderr, "arp: SIOCDARP(dontpub)\n");
-++	if (ioctl(sockfd, SIOCDARP, &req) < 0) {
-++	    if ((errno == ENXIO) || (errno == ENOENT)) {
-+ 		if (flags & 1)
-+-		    goto nopub;
-++		    goto dontpub;
-+ 		printf(_("No ARP entry for %s\n"), host);
-+ 		return (-1);
-+ 	    }
-+-	    perror("SIOCDARP(priv)");
-++	    perror("SIOCDARP(dontpub)");
-+ 	    return (-1);
-+-	}
-++	} else
-++	  deleted = 1;
-+     }
-+-    if ((flags & 1) && (err)) {
-+-      nopub:
-++    if (!deleted && (flags & 1)) {
-++      dontpub:
-+ 	req.arp_flags |= ATF_PUBL;
-+ 	if (opt_v)
-+ 	    fprintf(stderr, "arp: SIOCDARP(pub)\n");
-+ 	if (ioctl(sockfd, SIOCDARP, &req) < 0) {
-+-	    if (errno == ENXIO) {
-++	    if ((errno == ENXIO) || (errno == ENOENT)) {
-+ 		printf(_("No ARP entry for %s\n"), host);
-+ 		return (-1);
-+ 	    }
-+@@ -260,7 +268,8 @@ static int arp_set(char **args)
-+ {
-+     char host[128];
-+     struct arpreq req;
-+-    struct sockaddr sa;
-++    struct sockaddr_storage ss;
-++    struct sockaddr *sa;
-+     int flags;
-+ 
-+     memset((char *) &req, 0, sizeof(req));
-+@@ -271,12 +280,13 @@ static int arp_set(char **args)
-+ 	return (-1);
-+     }
-+     safe_strncpy(host, *args++, (sizeof host));
-+-    if (ap->input(0, host, &sa) < 0) {
-++    sa = (struct sockaddr *)&ss;
-++    if (ap->input(0, host, sa) < 0) {
-+ 	ap->herror(host);
-+ 	return (-1);
-+     }
-+     /* If a host has more than one address, use the correct one! */
-+-    memcpy((char *) &req.arp_pa, (char *) &sa, sizeof(struct sockaddr));
-++    memcpy((char *) &req.arp_pa, (char *) sa, sizeof(struct sockaddr));
-+ 
-+     /* Fetch the hardware address. */
-+     if (*args == NULL) {
-+@@ -317,7 +327,7 @@ static int arp_set(char **args)
-+ 	    continue;
-+ 	}
-+ 	if (!strcmp(*args, "dontpub")) {
-+-#ifdef HAVE_ATF_DONTPUB
-++#ifdef ATF_DONTPUB
-+ 	    flags |= ATF_DONTPUB;
-+ #else
-+ 	    ENOSUPP("arp", "ATF_DONTPUB");
-+@@ -326,7 +336,7 @@ static int arp_set(char **args)
-+ 	    continue;
-+ 	}
-+ 	if (!strcmp(*args, "auto")) {
-+-#ifdef HAVE_ATF_MAGIC
-++#ifdef ATF_MAGIC
-+ 	    flags |= ATF_MAGIC;
-+ #else
-+ 	    ENOSUPP("arp", "ATF_MAGIC");
-+@@ -346,11 +356,11 @@ static int arp_set(char **args)
-+ 		usage();
-+ 	    if (strcmp(*args, "255.255.255.255") != 0) {
-+ 		strcpy(host, *args);
-+-		if (ap->input(0, host, &sa) < 0) {
-++		if (ap->input(0, host, sa) < 0) {
-+ 		    ap->herror(host);
-+ 		    return (-1);
-+ 		}
-+-		memcpy((char *) &req.arp_netmask, (char *) &sa,
-++		memcpy((char *) &req.arp_netmask, (char *) sa,
-+ 		       sizeof(struct sockaddr));
-+ 		flags |= ATF_NETMASK;
-+ 	    }
-+@@ -445,11 +455,11 @@ static void arp_disp_2(char *name, int t
-+ 	strcat(flags, "M");
-+     if (arp_flags & ATF_PUBL)
-+ 	strcat(flags, "P");
-+-#ifdef HAVE_ATF_MAGIC
-++#ifdef ATF_MAGIC
-+     if (arp_flags & ATF_MAGIC)
-+ 	strcat(flags, "A");
-+ #endif
-+-#ifdef HAVE_ATF_DONTPUB
-++#ifdef ATF_DONTPUB
-+     if (arp_flags & ATF_DONTPUB)
-+ 	strcat(flags, "!");
-+ #endif
-+@@ -463,7 +473,7 @@ static void arp_disp_2(char *name, int t
-+ 
-+     if (!(arp_flags & ATF_COM)) {
-+ 	if (arp_flags & ATF_PUBL)
-+-	    printf("%-8.8s%-20.20s", "*", "*");
-++	    printf("%-8.8s%-20.20s", "*", _("<from_interface>"));
-+ 	else
-+ 	    printf("%-8.8s%-20.20s", "", _("(incomplete)"));
-+     } else {
-+@@ -486,7 +496,7 @@ static void arp_disp(char *name, char *i
-+ 
-+     if (!(arp_flags & ATF_COM)) {
-+ 	if (arp_flags & ATF_PUBL)
-+-	    printf("* ");
-++	    printf("<from_interface> ");
-+ 	else
-+ 	    printf(_("<incomplete> "));
-+     } else {
-+@@ -499,12 +509,12 @@ static void arp_disp(char *name, char *i
-+     if (arp_flags & ATF_PERM)
-+ 	printf("PERM ");
-+     if (arp_flags & ATF_PUBL)
-+-	printf("PUP ");
-+-#ifdef HAVE_ATF_MAGIC
-++	printf("PUB ");
-++#ifdef ATF_MAGIC
-+     if (arp_flags & ATF_MAGIC)
-+ 	printf("AUTO ");
-+ #endif
-+-#ifdef HAVE_ATF_DONTPUB
-++#ifdef ATF_DONTPUB
-+     if (arp_flags & ATF_DONTPUB)
-+ 	printf("DONTPUB ");
-+ #endif
-+@@ -519,7 +529,8 @@ static void arp_disp(char *name, char *i
-+ static int arp_show(char *name)
-+ {
-+     char host[100];
-+-    struct sockaddr sa;
-++    struct sockaddr_storage ss;
-++    struct sockaddr *sa;
-+     char ip[100];
-+     char hwa[100];
-+     char mask[100];
-+@@ -532,14 +543,15 @@ static int arp_show(char *name)
-+ 
-+     host[0] = '\0';
-+ 
-++    sa = (struct sockaddr *)&ss;
-+     if (name != NULL) {
-+ 	/* Resolve the host name. */
-+ 	safe_strncpy(host, name, (sizeof host));
-+-	if (ap->input(0, host, &sa) < 0) {
-++	if (ap->input(0, host, sa) < 0) {
-+ 	    ap->herror(host);
-+ 	    return (-1);
-+ 	}
-+-	safe_strncpy(host, ap->sprint(&sa, 1), sizeof(host));
-++	safe_strncpy(host, ap->sprint(sa, 1), sizeof(host));
-+     }
-+     /* Open the PROCps kernel table. */
-+     if ((fp = fopen(_PATH_PROCNET_ARP, "r")) == NULL) {
-+@@ -575,10 +587,10 @@ static int arp_show(char *name)
-+ 	    if (opt_n)
-+ 		hostname = "?";
-+ 	    else {
-+-		if (ap->input(0, ip, &sa) < 0)
-++		if (ap->input(0, ip, sa) < 0)
-+ 		    hostname = ip;
-+ 		else
-+-		    hostname = ap->sprint(&sa, opt_n | 0x8000);
-++		    hostname = ap->sprint(sa, opt_n | 0x8000);
-+ 		if (strcmp(hostname, ip) == 0)
-+ 		    hostname = "?";
-+ 	    }
-+@@ -612,11 +624,10 @@ static void version(void)
-+ static void usage(void)
-+ {
-+     fprintf(stderr, _("Usage:\n  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP cache\n"));
-+-    fprintf(stderr, _("  arp [-v]          [-i <if>] -d  <hostname> [pub][nopub]    <-Delete ARP entry\n"));
-+-    fprintf(stderr, _("  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]              <-Add entry from file\n"));
-+-    fprintf(stderr, _("  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [temp][nopub] <-Add entry\n"));
-+-    fprintf(stderr, _("  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  <-''-\n"));
-+-    fprintf(stderr, _("  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub      <-''-\n\n"));
-++    fprintf(stderr, _("  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP entry\n"));
-++    fprintf(stderr, _("  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from file\n"));
-++    fprintf(stderr, _("  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add entry\n"));
-++    fprintf(stderr, _("  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          <-''-\n\n"));
-+     
-+     fprintf(stderr, _("        -a                       display (all) hosts in alternative (BSD) style\n"));
-+     fprintf(stderr, _("        -s, --set                set a new ARP entry\n"));
---- net-tools-1.60.orig/debian/patches/CVS-20081002-ifconfig.c_sync.patch
-+++ net-tools-1.60/debian/patches/CVS-20081002-ifconfig.c_sync.patch
-@@ -0,0 +1,379 @@
-+Sync with upstream CVS, complete log:
-+
-+Revision 1.58 - Thu Oct 2 23:31:04 2008 UTC by ecki
-+Avoid segfault of ifconfig(8) on missing /proc/net/dev
-+(Debian Bug #222209 Pierre Lombard, Tollef Fog Heen)
-+
-+Revision 1.57 - Tue Dec 10 00:56:41 2002 UTC by ecki
-+- change columns of netstat -i/ifconfig -s to avoid run-into (Stefan Illner)
-+- prevent segfault on protocol families without host error member
-+- use /128 as default prefix if not specified instead of /0
-+
-+Revision 1.56 - Fri Jul 5 17:36:02 2002 UTC by ecki
-+Jack Bloch noticed that the hw comamnd of ifconfig returns a
-+confusing -EBUSY if interface is up (on lkml).
-+
-+Revision 1.55 - Wed Jul 3 23:40:47 2002 UTC by ecki
-+there is no such thing as -i option for ifconfig
-+removed variable, fixed usage, added options to english man page
-+
-+Revision 1.54 - Thu Nov 1 03:00:13 2001 UTC by ecki
-+delay the setting of netmask derived from /mask after setting address
-+(Debian Bug #116573 reported by Brian Warner)
-+
-+Revision 1.53 - Thu Nov 1 01:54:49 2001 UTC by ecki
-+minor fix to return E_USAGE on -V instead of exit(0);
-+
-+Revision 1.52 - Thu Nov 1 01:48:31 2001 UTC by ecki
-+failed to set error flag if netmask setting reported an error
-+(Debian Bug #117837 reported by Sam Clegg)
-+
-+Revision 1.51 - Fri Jun 29 03:48:51 2001 UTC by ecki
-+this will check after clearing a flag, that it is indeed cleared. it will
-+also be a bit more verbose and precise on errors. See Debian Bug #102474
-+
-+Index: net-tools/ifconfig.c
-+===================================================================
-+--- net-tools.orig/ifconfig.c
-++++ net-tools/ifconfig.c
-+@@ -3,7 +3,7 @@
-+  *              that either displays or sets the characteristics of
-+  *              one or more of the system's networking interfaces.
-+  *
-+- * Version:     $Id: ifconfig.c,v 1.50 2001/04/13 18:25:18 pb Exp $
-++ * Version:     $Id: ifconfig.c,v 1.58 2008/10/02 23:31:04 ecki Exp $
-+  *
-+  * Author:      Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
-+  *              and others.  Copyright 1993 MicroWalt Corporation
-+@@ -88,7 +88,6 @@ struct in6_ifreq {
-+ char *Release = RELEASE, *Version = "ifconfig 1.42 (2001-04-13)";
-+ 
-+ int opt_a = 0;			/* show all interfaces          */
-+-int opt_i = 0;			/* show the statistics          */
-+ int opt_v = 0;			/* debugging output flag        */
-+ 
-+ int addr_family = 0;		/* currently selected AF        */
-+@@ -105,7 +104,7 @@ static int if_print(char *ifname)
-+     int res;
-+ 
-+     if (ife_short)
-+-	printf(_("Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR Flg\n"));
-++	printf(_("Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR Flg\n"));
-+ 
-+     if (!ifname) {
-+ 	res = for_all_interfaces(do_if_print, &opt_a);
-+@@ -113,6 +112,9 @@ static int if_print(char *ifname)
-+ 	struct interface *ife;
-+ 
-+ 	ife = lookup_interface(ifname);
-++	if (!ife) {
-++		return -1;
-++	}
-+ 	res = do_if_fetch(ife); 
-+ 	if (res >= 0) 
-+ 	    ife_print(ife);
-+@@ -127,7 +129,7 @@ static int set_flag(char *ifname, short 
-+ 
-+     safe_strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
-+     if (ioctl(skfd, SIOCGIFFLAGS, &ifr) < 0) {
-+-	fprintf(stderr, _("%s: unknown interface: %s\n"), 
-++	fprintf(stderr, _("%s: ERROR while getting interface flags: %s\n"), 
-+ 		ifname,	strerror(errno));
-+ 	return (-1);
-+     }
-+@@ -159,7 +161,7 @@ static int clr_flag(char *ifname, short 
-+ 
-+     safe_strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
-+     if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) {
-+-	fprintf(stderr, _("%s: unknown interface: %s\n"), 
-++	fprintf(stderr, _("%s: ERROR while getting interface flags: %s\n"), 
-+ 		ifname, strerror(errno));
-+ 	return -1;
-+     }
-+@@ -172,9 +174,35 @@ static int clr_flag(char *ifname, short 
-+     return (0);
-+ }
-+ 
-++/** test is a specified flag is set */
-++static int test_flag(char *ifname, short flags)
-++{
-++    struct ifreq ifr;
-++    int fd;
-++
-++    if (strchr(ifname, ':')) {
-++        /* This is a v4 alias interface.  Downing it via a socket for
-++	   another AF may have bad consequences. */
-++        fd = get_socket_for_af(AF_INET);
-++	if (fd < 0) {
-++	    fprintf(stderr, _("No support for INET on this system.\n"));
-++	    return -1;
-++	}
-++    } else
-++        fd = skfd;
-++
-++    safe_strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
-++    if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) {
-++	fprintf(stderr, _("%s: ERROR while testing interface flags: %s\n"), 
-++		ifname, strerror(errno));
-++	return -1;
-++    }
-++    return (ifr.ifr_flags & flags);
-++}
-++
-+ static void usage(void)
-+ {
-+-    fprintf(stderr, _("Usage:\n  ifconfig [-a] [-i] [-v] [-s] <interface> [[<AF>] <address>]\n"));
-++    fprintf(stderr, _("Usage:\n  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"));
-+ #if HAVE_AFINET
-+     fprintf(stderr, _("  [add <address>[/<prefixlen>]]\n"));
-+     fprintf(stderr, _("  [del <address>[/<prefixlen>]]\n"));
-+@@ -208,7 +236,7 @@ static void usage(void)
-+ static void version(void)
-+ {
-+     fprintf(stderr, "%s\n%s\n", Release, Version);
-+-    exit(0);
-++    exit(E_USAGE);
-+ }
-+ 
-+ static int set_netmask(int skfd, struct ifreq *ifr, struct sockaddr *sa)
-+@@ -222,18 +250,19 @@ static int set_netmask(int skfd, struct 
-+ 		strerror(errno));
-+ 	err = 1;
-+     }
-+-    return 0;
-++    return err;
-+ }
-+ 
-+ int main(int argc, char **argv)
-+ {
-+     struct sockaddr sa;
-++    struct sockaddr samask;
-+     struct sockaddr_in sin;
-+     char host[128];
-+     struct aftype *ap;
-+     struct hwtype *hw;
-+     struct ifreq ifr;
-+-    int goterr = 0, didnetmask = 0;
-++    int goterr = 0, didnetmask = 0, neednetmask=0;
-+     char **spp;
-+     int fd;
-+ #if HAVE_AFINET6
-+@@ -388,6 +417,8 @@ int main(int argc, char **argv)
-+ 	}
-+ 	if (!strcmp(*spp, "-promisc")) {
-+ 	    goterr |= clr_flag(ifr.ifr_name, IFF_PROMISC);
-++	    if (test_flag(ifr.ifr_name, IFF_PROMISC) > 0)
-++	    	fprintf(stderr, _("Warning: Interface %s still in promisc mode... maybe other application is running?\n"), ifr.ifr_name);
-+ 	    spp++;
-+ 	    continue;
-+ 	}
-+@@ -398,6 +429,8 @@ int main(int argc, char **argv)
-+ 	}
-+ 	if (!strcmp(*spp, "-multicast")) {
-+ 	    goterr |= clr_flag(ifr.ifr_name, IFF_MULTICAST);
-++	    if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0)
-++	    	fprintf(stderr, _("Warning: Interface %s still in MULTICAST mode.\n"), ifr.ifr_name);
-+ 	    spp++;
-+ 	    continue;
-+ 	}
-+@@ -408,6 +441,8 @@ int main(int argc, char **argv)
-+ 	}
-+ 	if (!strcmp(*spp, "-allmulti")) {
-+ 	    goterr |= clr_flag(ifr.ifr_name, IFF_ALLMULTI);
-++	    if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0)
-++	    	fprintf(stderr, _("Warning: Interface %s still in ALLMULTI mode.\n"), ifr.ifr_name);
-+ 	    spp++;
-+ 	    continue;
-+ 	}
-+@@ -430,6 +465,8 @@ int main(int argc, char **argv)
-+ 	if (!strcmp(*spp, "-dynamic")) {
-+ 	    goterr |= clr_flag(ifr.ifr_name, IFF_DYNAMIC);
-+ 	    spp++;
-++	    if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0)
-++	    	fprintf(stderr, _("Warning: Interface %s still in DYNAMIC mode.\n"), ifr.ifr_name);
-+ 	    continue;
-+ 	}
-+ #endif
-+@@ -486,6 +523,8 @@ int main(int argc, char **argv)
-+ 
-+ 	if (!strcmp(*spp, "-broadcast")) {
-+ 	    goterr |= clr_flag(ifr.ifr_name, IFF_BROADCAST);
-++	    if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0)
-++	    	fprintf(stderr, _("Warning: Interface %s still in BROADCAST mode.\n"), ifr.ifr_name);
-+ 	    spp++;
-+ 	    continue;
-+ 	}
-+@@ -493,7 +532,10 @@ int main(int argc, char **argv)
-+ 	    if (*++spp != NULL) {
-+ 		safe_strncpy(host, *spp, (sizeof host));
-+ 		if (ap->input(0, host, &sa) < 0) {
-+-		    ap->herror(host);
-++		    if (ap->herror)
-++		    	ap->herror(host);
-++		    else
-++		    	fprintf(stderr, _("ifconfig: Error resolving '%s' for broadcast\n"), host);
-+ 		    goterr = 1;
-+ 		    spp++;
-+ 		    continue;
-+@@ -515,7 +557,10 @@ int main(int argc, char **argv)
-+ 		usage();
-+ 	    safe_strncpy(host, *spp, (sizeof host));
-+ 	    if (ap->input(0, host, &sa) < 0) {
-+-		ap->herror(host);
-++		    if (ap->herror)
-++		    	ap->herror(host);
-++		    else
-++		    	fprintf(stderr, _("ifconfig: Error resolving '%s' for dstaddr\n"), host);
-+ 		goterr = 1;
-+ 		spp++;
-+ 		continue;
-+@@ -535,13 +580,16 @@ int main(int argc, char **argv)
-+ 		usage();
-+ 	    safe_strncpy(host, *spp, (sizeof host));
-+ 	    if (ap->input(0, host, &sa) < 0) {
-+-		ap->herror(host);
-++		    if (ap->herror)
-++		    	ap->herror(host);
-++		    else
-++		    	fprintf(stderr, _("ifconfig: Error resolving '%s' for netmask\n"), host);
-+ 		goterr = 1;
-+ 		spp++;
-+ 		continue;
-+ 	    }
-+ 	    didnetmask++;
-+-	    goterr = set_netmask(ap->fd, &ifr, &sa);
-++	    goterr |= set_netmask(ap->fd, &ifr, &sa);
-+ 	    spp++;
-+ 	    continue;
-+ 	}
-+@@ -613,6 +661,8 @@ int main(int argc, char **argv)
-+ 	if (!strcmp(*spp, "-pointopoint")) {
-+ 	    goterr |= clr_flag(ifr.ifr_name, IFF_POINTOPOINT);
-+ 	    spp++;
-++	    if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0)
-++	    	fprintf(stderr, _("Warning: Interface %s still in POINTOPOINT mode.\n"), ifr.ifr_name);
-+ 	    continue;
-+ 	}
-+ 	if (!strcmp(*spp, "pointopoint")) {
-+@@ -620,7 +670,10 @@ int main(int argc, char **argv)
-+ 		spp++;
-+ 		safe_strncpy(host, *spp, (sizeof host));
-+ 		if (ap->input(0, host, &sa)) {
-+-		    ap->herror(host);
-++		    if (ap->herror)
-++		    	ap->herror(host);
-++		    else
-++		    	fprintf(stderr, _("ifconfig: Error resolving '%s' for pointopoint\n"), host);
-+ 		    goterr = 1;
-+ 		    spp++;
-+ 		    continue;
-+@@ -661,8 +714,12 @@ int main(int argc, char **argv)
-+ 	    memcpy((char *) &ifr.ifr_hwaddr, (char *) &sa,
-+ 		   sizeof(struct sockaddr));
-+ 	    if (ioctl(skfd, SIOCSIFHWADDR, &ifr) < 0) {
-+-		fprintf(stderr, "SIOCSIFHWADDR: %s\n",
-+-			strerror(errno));
-++		if (errno == EBUSY)
-++			fprintf(stderr, "SIOCSIFHWADDR: %s - you may need to down the interface\n",
-++				strerror(errno));
-++		else
-++			fprintf(stderr, "SIOCSIFHWADDR: %s\n",
-++				strerror(errno));
-+ 		goterr = 1;
-+ 	    }
-+ 	    spp++;
-+@@ -681,12 +738,15 @@ int main(int argc, char **argv)
-+ 			usage();
-+ 		    *cp = 0;
-+ 		} else {
-+-		    prefix_len = 0;
-++		    prefix_len = 128;
-+ 		}
-+ 		safe_strncpy(host, *spp, (sizeof host));
-+ 		if (inet6_aftype.input(1, host, 
-+ 				       (struct sockaddr *) &sa6) < 0) {
-+-		    inet6_aftype.herror(host);
-++		    if (inet6_aftype.herror)
-++		    	inet6_aftype.herror(host);
-++		    else
-++		    	fprintf(stderr, _("ifconfig: Error resolving '%s' for add\n"), host);
-+ 		    goterr = 1;
-+ 		    spp++;
-+ 		    continue;
-+@@ -771,7 +831,7 @@ int main(int argc, char **argv)
-+ 			usage();
-+ 		    *cp = 0;
-+ 		} else {
-+-		    prefix_len = 0;
-++		    prefix_len = 128;
-+ 		}
-+ 		safe_strncpy(host, *spp, (sizeof host));
-+ 		if (inet6_aftype.input(1, host, 
-+@@ -800,6 +860,8 @@ int main(int argc, char **argv)
-+ 		}
-+ 		ifr6.ifr6_ifindex = ifr.ifr_ifindex;
-+ 		ifr6.ifr6_prefixlen = prefix_len;
-++		if (opt_v)
-++			fprintf(stderr, "now deleting: ioctl(SIOCDIFADDR,{ifindex=%d,prefixlen=%ld})\n",ifr.ifr_ifindex,prefix_len);
-+ 		if (ioctl(fd, SIOCDIFADDR, &ifr6) < 0) {
-+ 		    fprintf(stderr, "SIOCDIFADDR: %s\n",
-+ 			    strerror(errno));
-+@@ -859,7 +921,7 @@ int main(int argc, char **argv)
-+ 		    usage();
-+ 		*cp = 0;
-+ 	    } else {
-+-		prefix_len = 0;
-++		prefix_len = 128;
-+ 	    }
-+ 	    safe_strncpy(host, *spp, (sizeof host));
-+ 	    if (inet6_aftype.input(1, host, (struct sockaddr *) &sa6) < 0) {
-+@@ -903,7 +965,7 @@ int main(int argc, char **argv)
-+ 	/* FIXME: sa is too small for INET6 addresses, inet6 should use that too, 
-+ 	   broadcast is unexpected */
-+ 	if (ap->getmask) {
-+-	    switch (ap->getmask(host, &sa, NULL)) {
-++	    switch (ap->getmask(host, &samask, NULL)) {
-+ 	    case -1:
-+ 		usage();
-+ 		break;
-+@@ -911,8 +973,8 @@ int main(int argc, char **argv)
-+ 		if (didnetmask)
-+ 		    usage();
-+ 
-+-		goterr = set_netmask(skfd, &ifr, &sa);
-+-		didnetmask++;
-++		// remeber to set the netmask from samask later
-++		neednetmask = 1;
-+ 		break;
-+ 	    }
-+ 	}
-+@@ -921,9 +983,11 @@ int main(int argc, char **argv)
-+ 	   exit(1);
-+ 	}
-+ 	if (ap->input(0, host, &sa) < 0) {
-+-	    ap->herror(host);
-+-	    fprintf(stderr, _("ifconfig: `--help' gives usage information.\n"));
-+-	    exit(1);
-++	    if (ap->herror)
-++	    	ap->herror(host);
-++	    else
-++	    	fprintf(stderr,_("ifconfig: error resolving '%s' to set address for af=%s\n"), host, ap->name); fprintf(stderr,
-++	    _("ifconfig: `--help' gives usage information.\n")); exit(1);
-+ 	}
-+ 	memcpy((char *) &ifr.ifr_addr, (char *) &sa, sizeof(struct sockaddr));
-+ 	{
-+@@ -980,6 +1044,14 @@ int main(int argc, char **argv)
-+ 	spp++;
-+     }
-+ 
-++    if (neednetmask) {
-++	goterr |= set_netmask(skfd, &ifr, &samask);
-++	didnetmask++;
-++    }
-++
-++    if (opt_v && goterr)
-++    	fprintf(stderr, _("WARNING: at least one error occured. (%d)\n"), goterr);
-++
-+     return (goterr);
-+ }
-+ 
---- net-tools-1.60.orig/debian/patches/CVS-20060927-mii-tool.c_sync.patch
-+++ net-tools-1.60/debian/patches/CVS-20060927-mii-tool.c_sync.patch
-@@ -0,0 +1,341 @@
-+Sync with upstream CVS, complete log:
-+
-+Revision 1.9 - Wed Sep 27 20:59:18 2006 UTC by ecki
-+
-+GigE Support by Stephen Hemminger from
-+http://developer.osdl.org/shemminger/prototypes/mii-tool.tar.bz2
-+with verbose register patch from Dean Gaudet
-+
-+Revision 1.8 - Thu Jun 3 22:18:26 2004 UTC by ecki
-+
-+added linebreak to  version signature
-+
-+Revision 1.7 - Mon Oct 20 22:22:22 2003 UTC by ecki
-+make sure version string is helpful
-+
-+Revision 1.6 - Mon Oct 20 22:01:13 2003 UTC by ecki
-+patch to recognize more hardware without MII support (from Redhat Bug#77882,
-+notified by Tilmann Bubeck).
-+
-+Revision 1.5 - Sat Jun 28 03:19:04 2003 UTC by ecki
-+Use new style MII ioctls only. This will give you a warning, if compiled
-+with old kernel source tree. It will also not work if compiled with
-+new source on old kernels. The new ioctls also require root for reading, the
-+old didnt. This fixes Debian bug #133648. No fallback compatibility
-+is included for reasons of cleaner source.
-+
-+Revision 1.4 - Wed May 28 19:41:16 2003 UTC by ecki
-+make it compile on stricter gcc3.3
-+
-+Revision 1.3 - Sun Sep 15 00:25:14 2002 UTC by ecki
-+Implemented the Sean Reifenschneider suggested fflush() to the --watch
-+function of mii-tool.
-+
-+Revision 1.2 - Fri Jun 14 01:08:20 2002 UTC by ecki
-+this fixes segfault on -A "" and -F "" in mii-tool reported in debian
-+bug #139027
-+
-+Index: net-tools/mii-tool.c
-+===================================================================
-+--- net-tools.orig/mii-tool.c
-++++ net-tools/mii-tool.c
-+@@ -29,8 +29,7 @@
-+ 	http://www.national.com/pf/DP/DP83840.html
-+ */
-+ 
-+-static char version[] =
-+-"mii-tool.c 1.9 2000/04/28 00:56:08 (David Hinds)\n";
-++static char Version[] = "$Id: mii-tool.c,v 1.9 2006/09/27 20:59:18 ecki Exp $\n(Author: David Hinds based on Donald Becker's mii-diag)";
-+ 
-+ #include <unistd.h>
-+ #include <stdlib.h>
-+@@ -46,16 +45,19 @@ static char version[] =
-+ #include <sys/socket.h>
-+ #include <sys/ioctl.h>
-+ #include <net/if.h>
-++#include <linux/sockios.h>
-++
-+ #ifndef __GLIBC__
-+ #include <linux/if_arp.h>
-+ #include <linux/if_ether.h>
-+ #endif
-+ #include "mii.h"
-++#include "version.h"
-+ 
-+ #define MAX_ETH		8		/* Maximum # of interfaces */
-+ 
-+ /* Table of known MII's */
-+-static struct {
-++static const struct {
-+     u_short	id1, id2;
-+     char	*name;
-+ } mii_id[] = {
-+@@ -74,6 +76,9 @@ static struct {
-+     { 0x0181, 0x4410, "Quality QS6612" },
-+     { 0x0282, 0x1c50, "SMSC 83C180" },
-+     { 0x0300, 0xe540, "TDK 78Q2120" },
-++    { 0x0141, 0x0c20, "Yukon 88E1011" },
-++    { 0x0141, 0x0cc0, "Yukon-EC 88E1111" },
-++    { 0x0141, 0x0c90, "Yukon-2 88E1112" },
-+ };
-+ #define NMII (sizeof(mii_id)/sizeof(mii_id[0]))
-+ 
-+@@ -137,40 +142,48 @@ static void mdio_write(int skfd, int loc
-+ 
-+ const struct {
-+     char	*name;
-+-    u_short	value;
-++    u_short	value[2];
-+ } media[] = {
-+     /* The order through 100baseT4 matches bits in the BMSR */
-+-    { "10baseT-HD",	MII_AN_10BASET_HD },
-+-    { "10baseT-FD",	MII_AN_10BASET_FD },
-+-    { "100baseTx-HD",	MII_AN_100BASETX_HD },
-+-    { "100baseTx-FD",	MII_AN_100BASETX_FD },
-+-    { "100baseT4",	MII_AN_100BASET4 },
-+-    { "100baseTx",	MII_AN_100BASETX_FD | MII_AN_100BASETX_HD },
-+-    { "10baseT",	MII_AN_10BASET_FD | MII_AN_10BASET_HD },
-++    { "10baseT-HD",	{MII_AN_10BASET_HD} },
-++    { "10baseT-FD",	{MII_AN_10BASET_FD} },
-++    { "100baseTx-HD",	{MII_AN_100BASETX_HD} },
-++    { "100baseTx-FD",	{MII_AN_100BASETX_FD} },
-++    { "100baseT4",	{MII_AN_100BASET4} },
-++    { "100baseTx",	{MII_AN_100BASETX_FD | MII_AN_100BASETX_HD} },
-++    { "10baseT",	{MII_AN_10BASET_FD | MII_AN_10BASET_HD} },
-++
-++    { "1000baseT-HD",	{0, MII_BMCR2_1000HALF} },
-++    { "1000baseT-FD",	{0, MII_BMCR2_1000FULL} },
-++    { "1000baseT",	{0, MII_BMCR2_1000HALF|MII_BMCR2_1000FULL} },
-+ };
-+ #define NMEDIA (sizeof(media)/sizeof(media[0]))
-+ 	
-+ /* Parse an argument list of media types */
-+-static int parse_media(char *arg)
-++static int parse_media(char *arg, unsigned *bmcr2)
-+ {
-+     int mask, i;
-+     char *s;
-+     mask = strtoul(arg, &s, 16);
-+     if ((*arg != '\0') && (*s == '\0')) {
-+ 	if ((mask & MII_AN_ABILITY_MASK) &&
-+-	    !(mask & ~MII_AN_ABILITY_MASK))
-+-	    return mask;
-++	    !(mask & ~MII_AN_ABILITY_MASK)) {
-++		*bmcr2 = 0;
-++		return mask;
-++	}
-+ 	goto failed;
-+-    } else {
-+-	mask = 0;
-+-	s = strtok(arg, ", ");
-+-	do {
-++    }
-++    mask = 0;
-++    *bmcr2 = 0;
-++    s = strtok(arg, ", ");
-++    do {
-+ 	    for (i = 0; i < NMEDIA; i++)
-+-		if (strcasecmp(media[i].name, s) == 0) break;
-++		if (s && strcasecmp(media[i].name, s) == 0) break;
-+ 	    if (i == NMEDIA) goto failed;
-+-	    mask |= media[i].value;
-+-	} while ((s = strtok(NULL, ", ")) != NULL);
-+-    }
-++	    mask |= media[i].value[0];
-++	    *bmcr2 |= media[i].value[1];
-++    } while ((s = strtok(NULL, ", ")) != NULL);
-++
-+     return mask;
-+ failed:
-+     fprintf(stderr, "Invalid media specification '%s'.\n", arg);
-+@@ -179,11 +192,24 @@ failed:
-+ 
-+ /*--------------------------------------------------------------------*/
-+ 
-+-static char *media_list(int mask, int best)
-++static const char *media_list(unsigned mask, unsigned mask2, int best)
-+ {
-+     static char buf[100];
-+     int i;
-+     *buf = '\0';
-++
-++    if (mask & MII_BMCR_SPEED1000) {
-++	if (mask2 & MII_BMCR2_1000HALF) {
-++	    strcat(buf, " ");
-++	    strcat(buf, "1000baseT-HD");
-++	    if (best) goto out;
-++	}
-++	if (mask2 & MII_BMCR2_1000FULL) {
-++	    strcat(buf, " ");
-++	    strcat(buf, "1000baseT-FD");
-++	    if (best) goto out;
-++	}
-++    }
-+     mask >>= 5;
-+     for (i = 4; i >= 0; i--) {
-+ 	if (mask & (1<<i)) {
-+@@ -192,6 +218,7 @@ static char *media_list(int mask, int be
-+ 	    if (best) break;
-+ 	}
-+     }
-++ out:
-+     if (mask & (1<<5))
-+ 	strcat(buf, " flow-control");
-+     return buf;
-+@@ -201,15 +228,15 @@ int show_basic_mii(int sock, int phy_id)
-+ {
-+     char buf[100];
-+     int i, mii_val[32];
-+-    int bmcr, bmsr, advert, lkpar;
-++    unsigned bmcr, bmsr, advert, lkpar, bmcr2, lpa2;
-+ 
-+     /* Some bits in the BMSR are latched, but we can't rely on being
-+        the only reader, so only the current values are meaningful */
-+     mdio_read(sock, MII_BMSR);
-+-    for (i = 0; i < ((verbose > 1) ? 32 : 8); i++)
-++    for (i = 0; i < ((verbose > 1) ? 32 : MII_BASIC_MAX); i++)
-+ 	mii_val[i] = mdio_read(sock, i);
-+ 
-+-    if (mii_val[MII_BMCR] == 0xffff) {
-++    if (mii_val[MII_BMCR] == 0xffff  || mii_val[MII_BMSR] == 0x0000) {
-+ 	fprintf(stderr, "  No MII transceiver present!.\n");
-+ 	return -1;
-+     }
-+@@ -217,6 +244,7 @@ int show_basic_mii(int sock, int phy_id)
-+     /* Descriptive rename. */
-+     bmcr = mii_val[MII_BMCR]; bmsr = mii_val[MII_BMSR];
-+     advert = mii_val[MII_ANAR]; lkpar = mii_val[MII_ANLPAR];
-++    bmcr2 = mii_val[MII_CTRL1000]; lpa2 = mii_val[MII_STAT1000];
-+ 
-+     sprintf(buf, "%s: ", ifr.ifr_name);
-+     if (bmcr & MII_BMCR_AN_ENA) {
-+@@ -224,7 +252,7 @@ int show_basic_mii(int sock, int phy_id)
-+ 	    if (advert & lkpar) {
-+ 		strcat(buf, (lkpar & MII_AN_ACK) ?
-+ 		       "negotiated" : "no autonegotiation,");
-+-		strcat(buf, media_list(advert & lkpar, 1));
-++		strcat(buf, media_list(advert & lkpar, bmcr2 & lpa2>>2, 1));
-+ 		strcat(buf, ", ");
-+ 	    } else {
-+ 		strcat(buf, "autonegotiation failed, ");
-+@@ -234,8 +262,10 @@ int show_basic_mii(int sock, int phy_id)
-+ 	}
-+     } else {
-+ 	sprintf(buf+strlen(buf), "%s Mbit, %s duplex, ",
-+-	       (bmcr & MII_BMCR_100MBIT) ? "100" : "10",
-+-	       (bmcr & MII_BMCR_DUPLEX) ? "full" : "half");
-++		((bmcr2 & (MII_BMCR2_1000HALF | MII_BMCR2_1000FULL)) & lpa2 >> 2)
-++		? "1000"
-++		: (bmcr & MII_BMCR_100MBIT) ? "100" : "10",
-++		(bmcr & MII_BMCR_DUPLEX) ? "full" : "half");
-+     }
-+     strcat(buf, (bmsr & MII_BMSR_LINK_VALID) ? "link ok" : "no link");
-+ 
-+@@ -296,12 +326,13 @@ int show_basic_mii(int sock, int phy_id)
-+ 	if (bmsr & MII_BMSR_REMOTE_FAULT)
-+ 	    printf("remote fault, ");
-+ 	printf((bmsr & MII_BMSR_LINK_VALID) ? "link ok" : "no link");
-+-	printf("\n  capabilities:%s", media_list(bmsr >> 6, 0));
-+-	printf("\n  advertising: %s", media_list(advert, 0));
-++	printf("\n  capabilities:%s", media_list(bmsr >> 6, bmcr2, 0));
-++	printf("\n  advertising: %s", media_list(advert, lpa2 >> 2, 0));
-+ 	if (lkpar & MII_AN_ABILITY_MASK)
-+-	    printf("\n  link partner:%s", media_list(lkpar, 0));
-++	    printf("\n  link partner:%s", media_list(lkpar, bmcr2, 0));
-+ 	printf("\n");
-+     }
-++    fflush(stdout);
-+     return 0;
-+ }
-+ 
-+@@ -329,7 +360,7 @@ static int do_one_xcvr(int skfd, char *i
-+ 	printf("resetting the transceiver...\n");
-+ 	mdio_write(skfd, MII_BMCR, MII_BMCR_RESET);
-+     }
-+-    if (nway_advertise) {
-++    if (nway_advertise > 0) {
-+ 	mdio_write(skfd, MII_ANAR, nway_advertise | 1);
-+ 	opt_restart = 1;
-+     }
-+@@ -379,27 +410,38 @@ static void watch_one_xcvr(int skfd, cha
-+ /*--------------------------------------------------------------------*/
-+ 
-+ const char *usage =
-+-"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]
-+-       -V, --version               display version information
-+-       -v, --verbose               more verbose output
-+-       -R, --reset                 reset MII to poweron state
-+-       -r, --restart               restart autonegotiation
-+-       -w, --watch                 monitor for link status changes
-+-       -l, --log                   with -w, write events to syslog
-+-       -A, --advertise=media,...   advertise only specified media
-+-       -F, --force=media           force specified media technology
-+-media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD,
-+-       (to advertise both HD and FD) 100baseTx, 10baseT\n";
-++"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]\n"
-++"       -V, --version               display version information\n"
-++"       -v, --verbose               more verbose output\n"
-++"       -R, --reset                 reset MII to poweron state\n"
-++"       -r, --restart               restart autonegotiation\n"
-++"       -w, --watch                 monitor for link status changes\n"
-++"       -l, --log                   with -w, write events to syslog\n"
-++"       -A, --advertise=media,...   advertise only specified media\n"
-++"       -F, --force=media           force specified media technology\n"
-++"media: 1000baseTx-HD, 1000baseTx-FD,\n"
-++"       100baseT4, 100baseTx-FD, 100baseTx-HD,\n"
-++"       10baseT-FD, 10baseT-HD,\n"
-++"       (to advertise both HD and FD) 1000baseTx, 100baseTx, 10baseT\n";
-++
-++
-++static void version(void)
-++{
-++    fprintf(stderr, "%s\n%s\n", Version, RELEASE);
-++    exit(5); /* E_VERSION */
-++}
-++
-+ 
-+ int main(int argc, char **argv)
-+ {
-+     int i, c, ret, errflag = 0;
-+     char s[6];
-++    unsigned ctrl1000 = 0;
-+     
-+     while ((c = getopt_long(argc, argv, "A:F:p:lrRvVw?", longopts, 0)) != EOF)
-+ 	switch (c) {
-+-	case 'A': nway_advertise = parse_media(optarg); break;
-+-	case 'F': fixed_speed = parse_media(optarg); break;
-++	case 'A': nway_advertise = parse_media(optarg, &ctrl1000); break;
-++	case 'F': fixed_speed = parse_media(optarg, &ctrl1000); break;
-+ 	case 'p': override_phy = atoi(optarg); break;
-+ 	case 'r': opt_restart++;	break;
-+ 	case 'R': opt_reset++;		break;
-+@@ -411,6 +453,10 @@ int main(int argc, char **argv)
-+ 	}
-+     /* Check for a few inappropriate option combinations */
-+     if (opt_watch) verbose = 0;
-++
-++    if ((nway_advertise < 0) || (fixed_speed < 0))
-++    	return 2;
-++
-+     if (errflag || (fixed_speed & (fixed_speed-1)) ||
-+ 	(fixed_speed && (opt_restart || nway_advertise))) {
-+ 	fprintf(stderr, usage, argv[0]);
-+@@ -418,7 +464,7 @@ int main(int argc, char **argv)
-+     }
-+ 
-+     if (opt_version)
-+-	printf(version);
-++	version();
-+ 
-+     /* Open a basic socket. */
-+     if ((skfd = socket(AF_INET, SOCK_DGRAM,0)) < 0) {
-+@@ -426,6 +472,9 @@ int main(int argc, char **argv)
-+ 	exit(-1);
-+     }
-+ 
-++    if (verbose > 1)
-++    	printf("Using SIOCGMIIPHY=0x%x\n", SIOCGMIIPHY);	
-++
-+     /* No remaining args means show all interfaces. */
-+     if (optind == argc) {
-+ 	ret = 1;
---- net-tools-1.60.orig/debian/patches/CVS-20070316-netstat.c_sync.patch
-+++ net-tools-1.60/debian/patches/CVS-20070316-netstat.c_sync.patch
-@@ -0,0 +1,484 @@
-+Sync with upstream's CVS until rev 1.53
-+
-+Revision 1.53 - Thu Mar 16 08:59:42 2006 UTC by ecki
-+
-+Debian Bug #260587 fixed, make sure the Columns state and user in netstat -t -e
-+are separated by blanks. This may cause scripts to fail parsing by column width.
-+Better wait for the script compatible output. Problems exists for ESTABLIHED
-+state only.
-+
-+Revision 1.52 - Tue Aug 2 22:28:10 2005 UTC by ecki
-+make ipx in 2.6 work (perhaps).
-+Fixes http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=318503
-+
-+Revision 1.51 - Thu Jun 3 22:27:37 2004 UTC by ecki
-+avoid namespace conflicts
-+
-+Revision 1.50 - Tue Dec 10 00:56:41 2002 UTC by ecki
-+ - change columns of netstat -i/ifconfig -s to avoid run-into (Stefan Illner)
-+ - prevent segfault on protocol families without host error member
-+ - use /128 as default prefix if not specified instead of /0
-+
-+Revision 1.49 - Tue Jul 23 21:08:16 2002 UTC by ecki
-+allow support for -6 and -4 options to netstat, also allow both, and
-+print out tcp6, udp6 or raw6 if it is a v6 socket
-+
-+Revision 1.48 - Thu Jun 27 18:04:02 2002 UTC by ecki
-+fixing debian bug #151130 reported by Dan Jacobson where netstat
-+was printing 81 chars in a line for tcp, udp and raw.
-+
-+Revision 1.47 - Tue Feb 19 01:12:49 2002 UTC by ecki
-+inodes in unix domain sockets are now padded to 8chars (netstat -x)
-+
-+Revision 1.46 - Tue Feb 19 00:55:35 2002 UTC by ecki
-+fixes debian bug#134600 (sigsegv in netstat on negative inoded in
-+/proc/net/udp) on "netstat -lpu". Thanks to Arnaud Giersch for the report.
-+
-+Revision 1.45 - Sun Nov 25 06:48:50 2001 UTC by ecki
-+this fixes Debian Bug #109164 (netstat -ci does only print stats once). It
-+also renames add_interface and free_interface list to if_cache_add/free.
-+I am not sure if removing the "proc_read" flag will harm performance, looks
-+likt this check is never triggereed. Anyway, we need more efficient b-search
-+sooner or later.
-+
-+Revision 1.44 - Sun Aug 26 05:25:21 2001 UTC by ak
-+Fix netstat -- don't print all v4 addresses as v4-mapped-in-v6.
-+
-+Index: net-tools/netstat.c
-+===================================================================
-+--- net-tools.orig/netstat.c
-++++ net-tools/netstat.c
-+@@ -6,7 +6,7 @@
-+  *              NET-3 Networking Distribution for the LINUX operating
-+  *              system.
-+  *
-+- * Version:     $Id: netstat.c,v 1.43 2001/04/15 14:41:17 pb Exp $
-++ * Version:     $Id: netstat.c,v 1.54 2007/12/01 18:12:34 ecki Exp $
-+  *
-+  * Authors:     Fred Baumgarten, <dc6iq@insu1.etec.uni-karlsruhe.de>
-+  *              Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
-+@@ -216,7 +216,7 @@ FILE *procinfo;
-+ 
-+ static struct prg_node {
-+     struct prg_node *next;
-+-    int inode;
-++    unsigned long inode;
-+     char name[PROGNAME_WIDTH];
-+ } *prg_hash[PRG_HASH_SIZE];
-+ 
-+@@ -249,7 +249,7 @@ static char prg_cache_loaded = 0;
-+ /* NOT working as of glibc-2.0.7: */
-+ #undef  DIRENT_HAVE_D_TYPE_WORKS
-+ 
-+-static void prg_cache_add(int inode, char *name)
-++static void prg_cache_add(unsigned long inode, char *name)
-+ {
-+     unsigned hi = PRG_HASHIT(inode);
-+     struct prg_node **pnp,*pn;
-+@@ -272,7 +272,7 @@ static void prg_cache_add(int inode, cha
-+     strcpy(pn->name,name);
-+ }
-+ 
-+-static const char *prg_cache_get(int inode)
-++static const char *prg_cache_get(unsigned long inode)
-+ {
-+     unsigned hi=PRG_HASHIT(inode);
-+     struct prg_node *pn;
-+@@ -295,16 +295,18 @@ static void prg_cache_clear(void)
-+     prg_cache_loaded=0;
-+ }
-+ 
-+-static void extract_type_1_socket_inode(const char lname[], long * inode_p) {
-++static int extract_type_1_socket_inode(const char lname[], unsigned long * inode_p) {
-+ 
-+     /* If lname is of the form "socket:[12345]", extract the "12345"
-+        as *inode_p.  Otherwise, return -1 as *inode_p.
-+        */
-+ 
-+-    if (strlen(lname) < PRG_SOCKET_PFXl+3) *inode_p = -1;
-+-    else if (memcmp(lname, PRG_SOCKET_PFX, PRG_SOCKET_PFXl)) *inode_p = -1;
-+-    else if (lname[strlen(lname)-1] != ']') *inode_p = -1;
-+-    else {
-++    if (strlen(lname) < PRG_SOCKET_PFXl+3) return(-1);
-++    
-++    if (memcmp(lname, PRG_SOCKET_PFX, PRG_SOCKET_PFXl)) return(-1);
-++    if (lname[strlen(lname)-1] != ']') return(-1);
-++
-++    {
-+         char inode_str[strlen(lname + 1)];  /* e.g. "12345" */
-+         const int inode_str_len = strlen(lname) - PRG_SOCKET_PFXl - 1;
-+         char *serr;
-+@@ -313,37 +315,41 @@ static void extract_type_1_socket_inode(
-+         inode_str[inode_str_len] = '\0';
-+         *inode_p = strtol(inode_str,&serr,0);
-+         if (!serr || *serr || *inode_p < 0 || *inode_p >= INT_MAX) 
-+-            *inode_p = -1;
-++            return(-1);
-+     }
-++    return(0);
-+ }
-+ 
-+ 
-+ 
-+-static void extract_type_2_socket_inode(const char lname[], long * inode_p) {
-++static int extract_type_2_socket_inode(const char lname[], unsigned long * inode_p) {
-+ 
-+     /* If lname is of the form "[0000]:12345", extract the "12345"
-+        as *inode_p.  Otherwise, return -1 as *inode_p.
-+        */
-+ 
-+-    if (strlen(lname) < PRG_SOCKET_PFX2l+1) *inode_p = -1;
-+-    else if (memcmp(lname, PRG_SOCKET_PFX2, PRG_SOCKET_PFX2l)) *inode_p = -1;
-+-    else {
-++    if (strlen(lname) < PRG_SOCKET_PFX2l+1) return(-1);
-++    if (memcmp(lname, PRG_SOCKET_PFX2, PRG_SOCKET_PFX2l)) return(-1);
-++
-++    {
-+         char *serr;
-+ 
-+         *inode_p=strtol(lname + PRG_SOCKET_PFX2l,&serr,0);
-+         if (!serr || *serr || *inode_p < 0 || *inode_p >= INT_MAX) 
-+-            *inode_p = -1;
-++            return(-1);
-+     }
-++    return(0);
-+ }
-+ 
-+ 
-+ 
-++
-+ static void prg_cache_load(void)
-+ {
-+     char line[LINE_MAX],eacces=0;
-+     int procfdlen,fd,cmdllen,lnamelen;
-+     char lname[30],cmdlbuf[512],finbuf[PROGNAME_WIDTH];
-+-    long inode;
-++    unsigned long inode;
-+     const char *cs,*cmdlp;
-+     DIR *dirproc=NULL,*dirfd=NULL;
-+     struct dirent *direproc,*direfd;
-+@@ -386,11 +392,9 @@ static void prg_cache_load(void)
-+ 	    lnamelen=readlink(line,lname,sizeof(lname)-1);
-+             lname[lnamelen] = '\0';  /*make it a null-terminated string*/
-+ 
-+-            extract_type_1_socket_inode(lname, &inode);
-+-
-+-            if (inode < 0) extract_type_2_socket_inode(lname, &inode);
-+-
-+-            if (inode < 0) continue;
-++            if (extract_type_1_socket_inode(lname, &inode) < 0)
-++              if (extract_type_2_socket_inode(lname, &inode) < 0)
-++                continue;
-+ 
-+ 	    if (!cmdlp) {
-+ 		if (procfdlen - PATH_FD_SUFFl + PATH_CMDLINEl >= 
-+@@ -527,10 +531,10 @@ static void finish_this_one(int uid, uns
-+ 
-+     if (flag_exp > 1) {
-+ 	if (!(flag_not & FLAG_NUM_USER) && ((pw = getpwuid(uid)) != NULL))
-+-	    printf("%-10s ", pw->pw_name);
-++	    printf(" %-10s ", pw->pw_name);
-+ 	else
-+-	    printf("%-10d ", uid);
-+-	printf("%-10ld ",inode);
-++	    printf(" %-10d ", uid);
-++	printf("%-10lu ",inode);
-+     }
-+     if (flag_prg)
-+ 	printf("%-" PROGNAME_WIDTHs "s",prg_cache_get(inode));
-+@@ -705,6 +709,7 @@ static void tcp_do_one(int lnr, const ch
-+     unsigned long rxq, txq, time_len, retr, inode;
-+     int num, local_port, rem_port, d, state, uid, timer_run, timeout;
-+     char rem_addr[128], local_addr[128], timers[64], buffer[1024], more[512];
-++    char *protname;
-+     struct aftype *ap;
-+ #if HAVE_AFINET6
-+     struct sockaddr_in6 localaddr, remaddr;
-+@@ -719,12 +724,13 @@ static void tcp_do_one(int lnr, const ch
-+ 	return;
-+ 
-+     num = sscanf(line,
-+-    "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %ld %512s\n",
-++    "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %lu %512s\n",
-+ 		 &d, local_addr, &local_port, rem_addr, &rem_port, &state,
-+ 		 &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more);
-+ 
-+     if (strlen(local_addr) > 8) {
-+ #if HAVE_AFINET6
-++	protname = "tcp6";
-+ 	/* Demangle what the kernel gives us */
-+ 	sscanf(local_addr, "%08X%08X%08X%08X",
-+ 	       &in6.s6_addr32[0], &in6.s6_addr32[1],
-+@@ -740,6 +746,7 @@ static void tcp_do_one(int lnr, const ch
-+ 	remaddr.sin6_family = AF_INET6;
-+ #endif
-+     } else {
-++	protname = "tcp";
-+ 	sscanf(local_addr, "%X",
-+ 	       &((struct sockaddr_in *) &localaddr)->sin_addr.s_addr);
-+ 	sscanf(rem_addr, "%X",
-+@@ -813,8 +820,8 @@ static void tcp_do_one(int lnr, const ch
-+ 			 timer_run, (double) time_len / HZ, retr, timeout);
-+ 		break;
-+ 	    }
-+-	printf("tcp   %6ld %6ld %-23s %-23s %-12s",
-+-	       rxq, txq, local_addr, rem_addr, _(tcp_state[state]));
-++	printf("%-4s  %6ld %6ld %-*s %-*s %-11s",
-++	       protname, rxq, txq, netmax(23,strlen(local_addr)), local_addr, netmax(23,strlen(rem_addr)), rem_addr, _(tcp_state[state]));
-+ 
-+ 	finish_this_one(uid,inode,timers);
-+     }
-+@@ -831,6 +838,7 @@ static void udp_do_one(int lnr, const ch
-+     char buffer[8192], local_addr[64], rem_addr[64];
-+     char *udp_state, timers[64], more[512];
-+     int num, local_port, rem_port, d, state, timer_run, uid, timeout;
-++    char *protname;
-+ #if HAVE_AFINET6
-+     struct sockaddr_in6 localaddr, remaddr;
-+     char addr6[INET6_ADDRSTRLEN];
-+@@ -847,13 +855,14 @@ static void udp_do_one(int lnr, const ch
-+ 
-+     more[0] = '\0';
-+     num = sscanf(line,
-+-		 "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %ld %512s\n",
-++		 "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %lu %512s\n",
-+ 		 &d, local_addr, &local_port,
-+ 		 rem_addr, &rem_port, &state,
-+ 	  &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more);
-+ 
-+     if (strlen(local_addr) > 8) {
-+ #if HAVE_AFINET6
-++	protname="udp6";
-+ 	sscanf(local_addr, "%08X%08X%08X%08X",
-+ 	       &in6.s6_addr32[0], &in6.s6_addr32[1],
-+ 	       &in6.s6_addr32[2], &in6.s6_addr32[3]);
-+@@ -868,6 +877,7 @@ static void udp_do_one(int lnr, const ch
-+ 	remaddr.sin6_family = AF_INET6;
-+ #endif
-+     } else {
-++        protname="udp";
-+ 	sscanf(local_addr, "%X",
-+ 	       &((struct sockaddr_in *) &localaddr)->sin_addr.s_addr);
-+ 	sscanf(rem_addr, "%X",
-+@@ -953,8 +963,8 @@ static void udp_do_one(int lnr, const ch
-+ 			 retr, timeout);
-+ 		break;
-+ 	    }
-+-	printf("udp   %6ld %6ld %-23s %-23s %-12s",
-+-	       rxq, txq, local_addr, rem_addr, udp_state);
-++	printf("%-4s  %6ld %6ld %-23s %-23s %-11s",
-++	       protname, rxq, txq, local_addr, rem_addr, udp_state);
-+ 
-+ 	finish_this_one(uid,inode,timers);
-+     }
-+@@ -971,6 +981,7 @@ static void raw_do_one(int lnr, const ch
-+     char buffer[8192], local_addr[64], rem_addr[64];
-+     char timers[64], more[512];
-+     int num, local_port, rem_port, d, state, timer_run, uid, timeout;
-++    char *protname;
-+ #if HAVE_AFINET6
-+     struct sockaddr_in6 localaddr, remaddr;
-+     char addr6[INET6_ADDRSTRLEN];
-+@@ -987,12 +998,13 @@ static void raw_do_one(int lnr, const ch
-+ 
-+     more[0] = '\0';
-+     num = sscanf(line,
-+-		 "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %ld %512s\n",
-++		 "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %lu %512s\n",
-+ 		 &d, local_addr, &local_port, rem_addr, &rem_port, &state,
-+ 	  &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more);
-+ 
-+     if (strlen(local_addr) > 8) {
-+ #if HAVE_AFINET6
-++	protname = "raw6";
-+ 	sscanf(local_addr, "%08X%08X%08X%08X",
-+ 	       &in6.s6_addr32[0], &in6.s6_addr32[1],
-+            &in6.s6_addr32[2], &in6.s6_addr32[3]);
-+@@ -1007,6 +1019,7 @@ static void raw_do_one(int lnr, const ch
-+ 	remaddr.sin6_family = AF_INET6;
-+ #endif
-+     } else {
-++        protname = "raw";
-+ 	sscanf(local_addr, "%X",
-+ 	       &((struct sockaddr_in *) &localaddr)->sin_addr.s_addr);
-+ 	sscanf(rem_addr, "%X",
-+@@ -1074,8 +1087,8 @@ static void raw_do_one(int lnr, const ch
-+ 			 retr, timeout);
-+ 		break;
-+ 	    }
-+-	printf("raw   %6ld %6ld %-23s %-23s %-12d",
-+-	       rxq, txq, local_addr, rem_addr, state);
-++	printf("%-4s  %6ld %6ld %-23s %-23s %-11d",
-++	       protname, rxq, txq, local_addr, rem_addr, state);
-+ 
-+ 	finish_this_one(uid,inode,timers);
-+     }
-+@@ -1099,9 +1112,9 @@ static void unix_do_one(int nr, const ch
-+     static int has = 0;
-+     char path[MAXPATHLEN], ss_flags[32];
-+     char *ss_proto, *ss_state, *ss_type;
-+-    int num, state, type, inode;
-++    int num, state, type;
-+     void *d;
-+-    unsigned long refcnt, proto, flags;
-++    unsigned long refcnt, proto, flags, inode;
-+ 
-+     if (nr == 0) {
-+ 	if (strstr(line, "Inode"))
-+@@ -1109,14 +1122,14 @@ static void unix_do_one(int nr, const ch
-+ 	return;
-+     }
-+     path[0] = '\0';
-+-    num = sscanf(line, "%p: %lX %lX %lX %X %X %d %s",
-++    num = sscanf(line, "%p: %lX %lX %lX %X %X %lu %s",
-+ 		 &d, &refcnt, &proto, &flags, &type, &state, &inode, path);
-+     if (num < 6) {
-+ 	fprintf(stderr, _("warning, got bogus unix line.\n"));
-+ 	return;
-+     }
-+     if (!(has & HAS_INODE))
-+-	snprintf(path,sizeof(path),"%d",inode);
-++	snprintf(path,sizeof(path),"%lu",inode);
-+ 
-+     if (!flag_all) {
-+     	if ((state == SS_UNCONNECTED) && (flags & SO_ACCEPTCON)) {
-+@@ -1208,9 +1221,9 @@ static void unix_do_one(int nr, const ch
-+     printf("%-5s %-6ld %-11s %-10s %-13s ",
-+ 	   ss_proto, refcnt, ss_flags, ss_type, ss_state);
-+     if (has & HAS_INODE)
-+-	printf("%-6d ",inode);
-++	printf("%-8lu ",inode);
-+     else
-+-	printf("-      ");
-++	printf("-        ");
-+     if (flag_prg)
-+ 	printf("%-" PROGNAME_WIDTHs "s",(has & HAS_INODE?prg_cache_get(inode):"-"));
-+     puts(path);
-+@@ -1350,18 +1363,37 @@ static int ipx_info(void)
-+     char sad[50], dad[50];
-+     struct sockaddr sa;
-+     unsigned sport = 0, dport = 0;
-+-
-+-    if (!(f = fopen(_PATH_PROCNET_IPX, "r"))) {
-+-	if (errno != ENOENT) {
-+-	    perror(_PATH_PROCNET_IPX);
-+-	    return (-1);
-+-	}
-+-	if (flag_arg || flag_ver)
-+-	    ESYSNOT("netstat", "AF IPX");
-+-	if (flag_arg)
-+-	    return (1);
-+-	else
-+-	    return (0);
-++    struct stat s;
-++    
-++    f = fopen(_PATH_PROCNET_IPX_SOCKET1, "r");
-++    if (!f) {
-++        if (errno != ENOENT) {
-++            perror(_PATH_PROCNET_IPX_SOCKET1);
-++            return (-1);
-++        }
-++        f = fopen(_PATH_PROCNET_IPX_SOCKET2, "r");
-++
-++        /* We need to check for directory */
-++        if (f) {
-++            fstat(fileno(f), &s);
-++            if (!S_ISREG(s.st_mode)) {
-++                fclose(f);
-++                f=NULL;
-++            }
-++        }
-++
-++        if (!f) {
-++            if (errno != ENOENT) {
-++	        perror(_PATH_PROCNET_IPX_SOCKET2);
-++	        return (-1);
-++	    }
-++	    if (flag_arg || flag_ver)
-++	        ESYSNOT("netstat", "AF IPX");
-++	    if (flag_arg)
-++	        return (1);
-++ 	    else
-++	        return (0);
-++        }
-+     }
-+     printf(_("Active IPX sockets\nProto Recv-Q Send-Q Local Address              Foreign Address            State"));	/* xxx */
-+     if (flag_exp > 1)
-+@@ -1381,7 +1413,7 @@ static int ipx_info(void)
-+ 	    sscanf(st, "%X", &sport);	/* net byt order */
-+ 	    sport = ntohs(sport);
-+ 	} else {
-+-	    EINTERN("netstat.c", _PATH_PROCNET_IPX " sport format error");
-++	    EINTERN("netstat.c", "ipx socket format error in source port");
-+ 	    return (-1);
-+ 	}
-+ 	nc = 0;
-+@@ -1391,7 +1423,7 @@ static int ipx_info(void)
-+ 		sscanf(st, "%X", &dport);	/* net byt order */
-+ 		dport = ntohs(dport);
-+ 	    } else {
-+-		EINTERN("netstat.c", _PATH_PROCNET_IPX " dport format error");
-++		EINTERN("netstat.c", "ipx soket format error in destination port");
-+ 		return (-1);
-+ 	    }
-+ 	} else
-+@@ -1449,7 +1481,7 @@ static int iface_info(void)
-+     }
-+     if (flag_exp < 2) {
-+ 	ife_short = 1;
-+-	printf(_("Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR Flg\n"));
-++	printf(_("Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR Flg\n"));
-+     }
-+ 
-+     if (for_all_interfaces(do_if_print, &flag_all) < 0) {
-+@@ -1457,7 +1489,7 @@ static int iface_info(void)
-+ 	exit(1);
-+     }
-+     if (flag_cnt)
-+-	free_interface_list();
-++	if_cache_free();
-+     else {
-+ 	close(skfd);
-+ 	skfd = -1;
-+@@ -1503,7 +1535,7 @@ static void usage(void)
-+     fprintf(stderr, _("        -C, --cache              display routing cache instead of FIB\n\n"));
-+ 
-+     fprintf(stderr, _("  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --netrom\n"));
-+-    fprintf(stderr, _("  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"), DFLT_AF);
-++    fprintf(stderr, _("  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"), DFLT_AF);
-+     fprintf(stderr, _("  List of possible address families (which support routing):\n"));
-+     print_aflist(1); /* 1 = routeable */
-+     exit(E_USAGE);
-+@@ -1514,7 +1546,7 @@ int main
-+  (int argc, char *argv[]) {
-+     int i;
-+     int lop;
-+-    struct option longopts[] =
-++    static struct option longopts[] =
-+     {
-+ 	AFTRANS_OPTS,
-+ 	{"version", 0, 0, 'V'},
-+@@ -1556,7 +1588,7 @@ int main
-+     getroute_init();		/* Set up AF routing support */
-+ 
-+     afname[0] = '\0';
-+-    while ((i = getopt_long(argc, argv, "MCFA:acdegphinNorstuVv?wxl", longopts, &lop)) != EOF)
-++    while ((i = getopt_long(argc, argv, "MCFA:acdegphinNorstuVv?wxl64", longopts, &lop)) != EOF)
-+ 	switch (i) {
-+ 	case -1:
-+ 	    break;
-+@@ -1624,6 +1656,14 @@ int main
-+ 	case 'o':
-+ 	    flag_opt++;
-+ 	    break;
-++	case '6':
-++	    if (aftrans_opt("inet6"))
-++		exit(1);
-++	    break;
-++	case '4':
-++	    if (aftrans_opt("inet"))
-++		exit(1);
-++	    break;
-+ 	case 'V':
-+ 	    version();
-+ 	    /*NOTREACHED */
---- net-tools-1.60.orig/debian/patches/netstat.c-local_changes.patch
-+++ net-tools-1.60/debian/patches/netstat.c-local_changes.patch
-@@ -0,0 +1,61 @@
-+Undocumented patches found in diff.gz.
-+
-+Index: net-tools/netstat.c
-+===================================================================
-+--- net-tools.orig/netstat.c
-++++ net-tools/netstat.c
-+@@ -387,6 +387,10 @@ static void prg_cache_load(void)
-+ #ifdef DIRENT_HAVE_D_TYPE_WORKS
-+ 	    if (direfd->d_type!=DT_LNK) 
-+ 		continue;
-++#else
-++	    /* Skip . and .. */
-++	    if (!isdigit(direfd->d_name[0]))
-++		continue;
-+ #endif
-+ 	    if (procfdlen+1+strlen(direfd->d_name)+1>sizeof(line)) 
-+ 		continue;
-+@@ -541,9 +545,9 @@ static void finish_this_one(int uid, uns
-+ 	printf("%-10lu ",inode);
-+     }
-+     if (flag_prg)
-+-	printf("%-" PROGNAME_WIDTHs "s",prg_cache_get(inode));
-++	printf(" %-16s",prg_cache_get(inode));
-+     if (flag_opt)
-+-	printf("%s", timers);
-++	printf(" %s", timers);
-+     putchar('\n');
-+ }
-+ 
-+@@ -1250,7 +1254,7 @@ static int unix_info(void)
-+ 	printf(_("(w/o servers)"));
-+     }
-+ 
-+-    printf(_("\nProto RefCnt Flags       Type       State         I-Node"));
-++    printf(_("\nProto RefCnt Flags       Type       State         I-Node  "));
-+     print_progname_banner();
-+     printf(_(" Path\n"));	/* xxx */
-+ 
-+@@ -1813,10 +1817,11 @@ int main
-+ 	    }
-+ 	    printf(_("\nProto Recv-Q Send-Q Local Address           Foreign Address         State      "));	/* xxx */
-+ 	    if (flag_exp > 1)
-+-		printf(_(" User       Inode     "));
-+-	    print_progname_banner();
-++		printf(_(" User       Inode      "));
-++            if (flag_prg)
-++                printf(_(" PID/Program name"));
-+ 	    if (flag_opt)
-+-		printf(_(" Timer"));	/* xxx */
-++		printf(_(" Timer"));
-+ 	    printf("\n");
-+ #else
-+ 	    if (flag_arg) {
-+@@ -1917,6 +1922,7 @@ int main
-+ 	    }
-+ #endif
-+ 	}
-++	            
-+ 	if (!flag_cnt || i)
-+ 	    break;
-+ 	sleep(1);
---- net-tools-1.60.orig/debian/patches/CVS-20061011-ipmaddr.c_buffer_overflow.patch
-+++ net-tools-1.60/debian/patches/CVS-20061011-ipmaddr.c_buffer_overflow.patch
-@@ -0,0 +1,36 @@
-+Patch by Jochen Voss, already applied in upstream CVS. (Bug #392263)
-+Index: net-tools/ipmaddr.c
-+===================================================================
-+--- net-tools.orig/ipmaddr.c
-++++ net-tools/ipmaddr.c
-+@@ -291,13 +291,15 @@ static void print_mlist(FILE *fp, struct
-+ static int multiaddr_list(int argc, char **argv)
-+ {
-+ 	struct ma_info *list = NULL;
-++	size_t l;
-+ 
-+ 	while (argc > 0) {
-+ 		if (strcmp(*argv, "dev") == 0) {
-+ 			NEXT_ARG();
-+-			if (filter_dev[0])
-++			l = strlen(*argv);
-++			if (l <= 0 || l >= sizeof(filter_dev))
-+ 				usage();
-+-			strcpy(filter_dev, *argv);
-++			strncpy(filter_dev, *argv, sizeof (filter_dev));
-+ 		} else if (strcmp(*argv, "all") == 0) {
-+ 			filter_family = AF_UNSPEC;
-+ 		} else if (strcmp(*argv, "ipv4") == 0) {
-+@@ -307,9 +309,10 @@ static int multiaddr_list(int argc, char
-+ 		} else if (strcmp(*argv, "link") == 0) {
-+ 			filter_family = AF_PACKET;
-+ 		} else {
-+-			if (filter_dev[0])
-++			l = strlen(*argv);
-++			if (l <= 0 || l >= sizeof(filter_dev))
-+ 				usage();
-+-			strcpy(filter_dev, *argv);
-++			strncpy(filter_dev, *argv, sizeof (filter_dev));
-+ 		}
-+ 		argv++; argc--;
-+ 	}
---- net-tools-1.60.orig/debian/patches/series
-+++ net-tools-1.60/debian/patches/series
-@@ -0,0 +1,22 @@
-+CVS-20020730-route.c_opts_64.patch
-+CVS-20030911-nameif.c_sync.patch
-+CVS-20031011-hostname.c_sync.patch
-+CVS-20051204-arp.c_sync.patch
-+CVS-20051204-slttach.c_sync.patch
-+CVS-20060927-mii-tool.c_sync.patch
-+CVS-20061011-includes_sync.patch
-+CVS-20061011-ipmaddr.c_buffer_overflow.patch
-+CVS-20070316-netstat.c_sync.patch
-+CVS-20071202-rarp.c_sync.patch
-+CVS-20081002-ifconfig.c_sync.patch
-+CVS-20081003-statistics.c_sync.patch
-+CVS-lib_sync.patch
-+CVS-20081003-config.in_sync.patch
-+CVS-20081002-manpages_sync.patch
-+netstat.c-assorted_changes.patch
-+Bug#254243-netstat.c-wide-opt.patch
-+netstat.c-local_changes.patch
-+translations.patch
-+lib_local_changes.patch
-+local-manpages.patch
-+Bug#345331-socket_overflow.patch
---- net-tools-1.60.orig/debian/patches/Bug#345331-socket_overflow.patch
-+++ net-tools-1.60/debian/patches/Bug#345331-socket_overflow.patch
-@@ -0,0 +1,28 @@
-+Patch by Antonio Galea <ant9000@netwise.it> to solve the socket number overflow
-+from #345331
-+
-+diff -urNad net-tools-1.60/netstat.c /tmp/dpep.15Gej9/net-tools-1.60/netstat.c
-+--- net-tools-1.60/netstat.c	2005-12-30 16:52:15.000000000 +0100
-++++ /tmp/dpep.15Gej9/net-tools-1.60/netstat.c	2005-12-30 16:56:00.000000000 +0100
-+@@ -313,8 +313,8 @@
-+ 
-+         strncpy(inode_str, lname+PRG_SOCKET_PFXl, inode_str_len);
-+         inode_str[inode_str_len] = '\0';
-+-        *inode_p = strtol(inode_str,&serr,0);
-+-        if (!serr || *serr || *inode_p < 0 || *inode_p >= INT_MAX) 
-++        *inode_p = strtoul(inode_str,&serr,0);
-++        if (!serr || *serr)
-+             return(-1);
-+     }
-+     return(0);
-+@@ -334,8 +334,8 @@
-+     {
-+         char *serr;
-+ 
-+-        *inode_p=strtol(lname + PRG_SOCKET_PFX2l,&serr,0);
-+-        if (!serr || *serr || *inode_p < 0 || *inode_p >= INT_MAX) 
-++        *inode_p=strtoul(lname + PRG_SOCKET_PFX2l,&serr,0);
-++        if (!serr || *serr)
-+             return(-1);
-+     }
-+     return(0);
---- net-tools-1.60.orig/debian/patches/lib_local_changes.patch
-+++ net-tools-1.60/debian/patches/lib_local_changes.patch
-@@ -0,0 +1,410 @@
-+Changes extracted from diff.gz, not present in upstream's CVS.
-+
-+Index: net-tools/lib/ec_hw.c
-+===================================================================
-+--- net-tools.orig/lib/ec_hw.c
-++++ net-tools/lib/ec_hw.c
-+@@ -16,6 +16,8 @@
-+ 
-+ #if HAVE_HWEC
-+ 
-++#include <stddef.h>
-++
-+ #include <net/if_arp.h>
-+ #include "net-support.h"
-+ 
-+Index: net-tools/lib/fddi.c
-+===================================================================
-+--- net-tools.orig/lib/fddi.c
-++++ net-tools/lib/fddi.c
-+@@ -26,6 +26,7 @@
-+ #error "No FDDI Support in your current Kernelsource Tree."
-+ #error "Disable HW Type FDDI"
-+ #endif
-++#include <linux/types.h>
-+ #if __GLIBC__ >= 2
-+ #include <netinet/if_fddi.h>
-+ #else
-+Index: net-tools/lib/interface.c
-+===================================================================
-+--- net-tools.orig/lib/interface.c
-++++ net-tools/lib/interface.c
-+@@ -594,7 +594,7 @@ int do_if_print(struct interface *ife, v
-+ 
-+ void ife_print_short(struct interface *ptr)
-+ {
-+-    printf("%-5.5s ", ptr->name);
-++    printf("%-9s ", ptr->name);
-+     printf("%5d %-2d ", ptr->mtu, ptr->metric);
-+     /* If needed, display the interface statistics. */
-+     if (ptr->statistics_valid) {
-+@@ -653,8 +653,7 @@ void ife_print_long(struct interface *pt
-+     unsigned long long rx, tx, short_rx, short_tx;
-+     const char *Rext = "B";
-+     const char *Text = "B";
-+-    static char flags[200];
-+-    
-++
-+ #if HAVE_AFIPX
-+     static struct aftype *ipxtype = NULL;
-+ #endif
-+@@ -686,70 +685,32 @@ void ife_print_long(struct interface *pt
-+     if (hw == NULL)
-+ 	hw = get_hwntype(-1);
-+ 
-+-    sprintf(flags, "flags=%d<", ptr->flags);
-+-    /* DONT FORGET TO ADD THE FLAGS IN ife_print_short, too */
-+-    if (ptr->flags == 0)
-+-	strcat(flags,">");
-+-    if (ptr->flags & IFF_UP)
-+-	strcat(flags,_("UP,"));
-+-    if (ptr->flags & IFF_BROADCAST)
-+-	strcat(flags,_("BROADCAST,"));
-+-    if (ptr->flags & IFF_DEBUG)
-+-	strcat(flags,_("DEBUG,"));
-+-    if (ptr->flags & IFF_LOOPBACK)
-+-	strcat(flags,_("LOOPBACK,"));
-+-    if (ptr->flags & IFF_POINTOPOINT)
-+-	strcat(flags,_("POINTOPOINT,"));
-+-    if (ptr->flags & IFF_NOTRAILERS)
-+-	strcat(flags,_("NOTRAILERS,"));
-+-    if (ptr->flags & IFF_RUNNING)
-+-	strcat(flags,_("RUNNING,"));
-+-    if (ptr->flags & IFF_NOARP)
-+-	strcat(flags,_("NOARP,"));
-+-    if (ptr->flags & IFF_PROMISC)
-+-	strcat(flags,_("PROMISC,"));
-+-    if (ptr->flags & IFF_ALLMULTI)
-+-	strcat(flags,_("ALLMULTI,"));
-+-    if (ptr->flags & IFF_SLAVE)
-+-	strcat(flags,_("SLAVE,"));
-+-    if (ptr->flags & IFF_MASTER)
-+-	strcat(flags,_("MASTER,"));
-+-    if (ptr->flags & IFF_MULTICAST)
-+-	strcat(flags,_("MULTICAST,"));
-+-#ifdef HAVE_DYNAMIC
-+-    if (ptr->flags & IFF_DYNAMIC)
-+-	strcat(flags,_("DYNAMIC,"));
-+-#endif
-+-    /* DONT FORGET TO ADD THE FLAGS IN ife_print_short */
-+-    if (flags[strlen(flags)-1] == ',')
-+-      flags[strlen(flags)-1] = '>';
-+-    else
-+-      flags[strlen(flags)-1] = 0;
-+-      
-+-
-+-    printf(_("%s: %s  mtu %d  metric %d"),
-+-	   ptr->name, flags, ptr->mtu, ptr->metric ? ptr->metric : 1);
-+-#ifdef SIOCSKEEPALIVE
-+-    if (ptr->outfill || ptr->keepalive)
-+-	printf(_("  outfill %d  keepalive %d"),
-+-	       ptr->outfill, ptr->keepalive);
-++    printf(_("%-9s Link encap:%s  "), ptr->name, hw->title);
-++    /* For some hardware types (eg Ash, ATM) we don't print the 
-++       hardware address if it's null.  */
-++    if (hw->print != NULL && (! (hw_null_address(hw, ptr->hwaddr) &&
-++				  hw->suppress_null_addr)))
-++	printf(_("HWaddr %s  "), hw->print(ptr->hwaddr));
-++#ifdef IFF_PORTSEL
-++    if (ptr->flags & IFF_PORTSEL) {
-++	printf(_("Media:%s"), if_port_text[ptr->map.port][0]);
-++	if (ptr->flags & IFF_AUTOMEDIA)
-++	    printf(_("(auto)"));
-++    }
-+ #endif
-+     printf("\n");
-+ 
-+-
-+-
-+ #if HAVE_AFINET
-+     if (ptr->has_ip) {
-+-	printf(_("        %s %s"), ap->name,
-++	printf(_("          %s addr:%s "), ap->name,
-+ 	       ap->sprint(&ptr->addr, 1));
-+-	printf(_("  netmask %s"), ap->sprint(&ptr->netmask, 1));
-+-	if (ptr->flags & IFF_BROADCAST) {
-+-	    printf(_("  broadcast %s"), ap->sprint(&ptr->broadaddr, 1));
-+-	}
-+ 	if (ptr->flags & IFF_POINTOPOINT) {
-+-	    printf(_("  destination %s"), ap->sprint(&ptr->dstaddr, 1));
-++	    printf(_(" P-t-P:%s "), ap->sprint(&ptr->dstaddr, 1));
-+ 	}
-+-	printf("\n");
-++	if (ptr->flags & IFF_BROADCAST) {
-++	    printf(_(" Bcast:%s "), ap->sprint(&ptr->broadaddr, 1));
-++	}
-++	printf(_(" Mask:%s\n"), ap->sprint(&ptr->netmask, 1));
-+     }
-+ #endif
-+ 
-+@@ -757,7 +718,7 @@ void ife_print_long(struct interface *pt
-+     /* FIXME: should be integrated into interface.c.   */
-+ 
-+     if ((f = fopen(_PATH_PROCNET_IFINET6, "r")) != NULL) {
-+-	while (fscanf(f, "%4s%4s%4s%4s%4s%4s%4s%4s %02x %02x %02x %02x %20s\n",
-++	while (fscanf(f, "%4s%4s%4s%4s%4s%4s%4s%4s %08x %02x %02x %02x %20s\n",
-+ 		      addr6p[0], addr6p[1], addr6p[2], addr6p[3],
-+ 		      addr6p[4], addr6p[5], addr6p[6], addr6p[7],
-+ 		  &if_idx, &plen, &scope, &dad_status, devname) != EOF) {
-+@@ -766,30 +727,29 @@ void ife_print_long(struct interface *pt
-+ 			addr6p[0], addr6p[1], addr6p[2], addr6p[3],
-+ 			addr6p[4], addr6p[5], addr6p[6], addr6p[7]);
-+ 		inet6_aftype.input(1, addr6, (struct sockaddr *) &sap);
-+-		printf(_("        %s %s  prefixlen %d"),
-+-			inet6_aftype.name, 
-+-			inet6_aftype.sprint((struct sockaddr *) &sap, 1), 
-+-			plen);
-+-		printf(_("  scopeid 0x%x"), scope);
-+-
-+-		flags[0] = '<'; flags[1] = 0;
-+-		if (scope & IPV6_ADDR_COMPATv4) {
-+-		    	strcat(flags, _("compat,"));
-+-		    	scope -= IPV6_ADDR_COMPATv4;
-++		printf(_("          inet6 addr: %s/%d"),
-++		 inet6_aftype.sprint((struct sockaddr *) &sap, 1), plen);
-++		printf(_(" Scope:"));
-++		switch (scope) {
-++		case 0:
-++		    printf(_("Global"));
-++		    break;
-++		case IPV6_ADDR_LINKLOCAL:
-++		    printf(_("Link"));
-++		    break;
-++		case IPV6_ADDR_SITELOCAL:
-++		    printf(_("Site"));
-++		    break;
-++		case IPV6_ADDR_COMPATv4:
-++		    printf(_("Compat"));
-++		    break;
-++		case IPV6_ADDR_LOOPBACK:
-++		    printf(_("Host"));
-++		    break;
-++		default:
-++		    printf(_("Unknown"));
-+ 		}
-+-		if (scope == 0)
-+-			strcat(flags, _("global,"));
-+-		if (scope & IPV6_ADDR_LINKLOCAL)
-+-			strcat(flags, _("link,"));
-+-		if (scope & IPV6_ADDR_SITELOCAL)
-+-			strcat(flags, _("site,"));
-+-		if (scope & IPV6_ADDR_LOOPBACK)
-+-			strcat(flags, _("host,"));
-+-		if (flags[strlen(flags)-1] == ',')
-+-			flags[strlen(flags)-1] = '>';
-+-		else
-+-			flags[strlen(flags)-1] = 0;
-+-		printf("%s\n", flags);
-++		printf("\n");
-+ 	    }
-+ 	}
-+ 	fclose(f);
-+@@ -802,17 +762,17 @@ void ife_print_long(struct interface *pt
-+ 
-+     if (ipxtype != NULL) {
-+ 	if (ptr->has_ipx_bb)
-+-	    printf(_("        %s Ethernet-II   %s\n"),
-+-		   ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_bb, 1));
-++	    printf(_("          IPX/Ethernet II addr:%s\n"),
-++		   ipxtype->sprint(&ptr->ipxaddr_bb, 1));
-+ 	if (ptr->has_ipx_sn)
-+-	    printf(_("        %s Ethernet-SNAP %s\n"),
-+-		   ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_sn, 1));
-++	    printf(_("          IPX/Ethernet SNAP addr:%s\n"),
-++		   ipxtype->sprint(&ptr->ipxaddr_sn, 1));
-+ 	if (ptr->has_ipx_e2)
-+-	    printf(_("        %s Ethernet802.2 %s\n"),
-+-		   ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_e2, 1));
-++	    printf(_("          IPX/Ethernet 802.2 addr:%s\n"),
-++		   ipxtype->sprint(&ptr->ipxaddr_e2, 1));
-+ 	if (ptr->has_ipx_e3)
-+-	    printf(_("        %s Ethernet802.3 %s\n"),
-+-		   ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_e3, 1));
-++	    printf(_("          IPX/Ethernet 802.3 addr:%s\n"),
-++		   ipxtype->sprint(&ptr->ipxaddr_e3, 1));
-+     }
-+ #endif
-+ 
-+@@ -821,7 +781,7 @@ void ife_print_long(struct interface *pt
-+ 	ddptype = get_afntype(AF_APPLETALK);
-+     if (ddptype != NULL) {
-+ 	if (ptr->has_ddp)
-+-	    printf(_("        %s %s\n"), ddptype->name, ddptype->sprint(&ptr->ddpaddr, 1));
-++	    printf(_("          EtherTalk Phase 2 addr:%s\n"), ddptype->sprint(&ptr->ddpaddr, 1));
-+     }
-+ #endif
-+ 
-+@@ -830,30 +790,53 @@ void ife_print_long(struct interface *pt
-+ 	ectype = get_afntype(AF_ECONET);
-+     if (ectype != NULL) {
-+ 	if (ptr->has_econet)
-+-	    printf(_("        %s %s\n"), ectype->name, ectype->sprint(&ptr->ecaddr, 1));
-++	    printf(_("          econet addr:%s\n"), ectype->sprint(&ptr->ecaddr, 1));
-+     }
-+ #endif
-+ 
-+-    /* For some hardware types (eg Ash, ATM) we don't print the 
-+-       hardware address if it's null.  */
-+-    if (hw->print != NULL && (! (hw_null_address(hw, ptr->hwaddr) &&
-+-				  hw->suppress_null_addr)))
-+-	printf(_("        %s %s"), hw->name, hw->print(ptr->hwaddr));
-+-    else
-+-	printf(_("        %s"), hw->name);
-+-    if (ptr->tx_queue_len != -1)
-+-    	printf(_("  txqueuelen %d"), ptr->tx_queue_len);
-+-    printf("  (%s)\n", hw->title);
-+-
-+-#ifdef IFF_PORTSEL
-+-    if (ptr->flags & IFF_PORTSEL) {
-+-	printf(_("        media %s"), if_port_text[ptr->map.port][0]);
-+-	if (ptr->flags & IFF_AUTOMEDIA)
-+-	    printf(_("autoselect"));
-+-    	printf("\n");
-+-    }
-++    printf("          ");
-++    /* DONT FORGET TO ADD THE FLAGS IN ife_print_short, too */
-++    if (ptr->flags == 0)
-++	printf(_("[NO FLAGS] "));
-++    if (ptr->flags & IFF_UP)
-++	printf(_("UP "));
-++    if (ptr->flags & IFF_BROADCAST)
-++	printf(_("BROADCAST "));
-++    if (ptr->flags & IFF_DEBUG)
-++	printf(_("DEBUG "));
-++    if (ptr->flags & IFF_LOOPBACK)
-++	printf(_("LOOPBACK "));
-++    if (ptr->flags & IFF_POINTOPOINT)
-++	printf(_("POINTOPOINT "));
-++    if (ptr->flags & IFF_NOTRAILERS)
-++	printf(_("NOTRAILERS "));
-++    if (ptr->flags & IFF_RUNNING)
-++	printf(_("RUNNING "));
-++    if (ptr->flags & IFF_NOARP)
-++	printf(_("NOARP "));
-++    if (ptr->flags & IFF_PROMISC)
-++	printf(_("PROMISC "));
-++    if (ptr->flags & IFF_ALLMULTI)
-++	printf(_("ALLMULTI "));
-++    if (ptr->flags & IFF_SLAVE)
-++	printf(_("SLAVE "));
-++    if (ptr->flags & IFF_MASTER)
-++	printf(_("MASTER "));
-++    if (ptr->flags & IFF_MULTICAST)
-++	printf(_("MULTICAST "));
-++#ifdef HAVE_DYNAMIC
-++    if (ptr->flags & IFF_DYNAMIC)
-++	printf(_("DYNAMIC "));
-+ #endif
-+-
-++    /* DONT FORGET TO ADD THE FLAGS IN ife_print_short */
-++    printf(_(" MTU:%d  Metric:%d"),
-++	   ptr->mtu, ptr->metric ? ptr->metric : 1);
-++#ifdef SIOCSKEEPALIVE
-++    if (ptr->outfill || ptr->keepalive)
-++	printf(_("  Outfill:%d  Keepalive:%d"),
-++	       ptr->outfill, ptr->keepalive);
-++#endif
-++    printf("\n");
-+ 
-+     /* If needed, display the interface statistics. */
-+ 
-+@@ -862,8 +845,19 @@ void ife_print_long(struct interface *pt
-+ 	 *      not for the aliases, although strictly speaking they're shared
-+ 	 *      by all addresses.
-+ 	 */
-++	printf("          ");
-++
-++	printf(_("RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"),
-++	       ptr->stats.rx_packets, ptr->stats.rx_errors,
-++	       ptr->stats.rx_dropped, ptr->stats.rx_fifo_errors,
-++	       ptr->stats.rx_frame_errors);
-++	if (can_compress)
-++	    printf(_("             compressed:%lu\n"), ptr->stats.rx_compressed);
-++
-+ 	rx = ptr->stats.rx_bytes;  
-++	tx = ptr->stats.tx_bytes;
-+ 	short_rx = rx * 10;  
-++	short_tx = tx * 10;
-+ 	if (rx > 1125899906842624ull) {
-+ 	    short_rx /= 1125899906842624ull;
-+ 	    Rext = "PiB";
-+@@ -880,8 +874,6 @@ void ife_print_long(struct interface *pt
-+ 	    short_rx /= 1024;
-+ 	    Rext = "KiB";
-+ 	}
-+-	tx = ptr->stats.tx_bytes;
-+-	short_tx = tx * 10;
-+ 	if (tx > 1125899906842624ull) {
-+ 	    short_tx /= 1125899906842624ull;
-+ 	    Text = "PiB";
-+@@ -899,50 +891,37 @@ void ife_print_long(struct interface *pt
-+ 	    Text = "KiB";
-+ 	}
-+ 
-+-	printf("        ");
-+-	printf(_("RX packets %llu  bytes %llu (%lu.%lu %s)\n"), 
-+-		ptr->stats.rx_packets, 
-+-	       rx, (unsigned long)(short_rx / 10), 
-+-	       (unsigned long)(short_rx % 10), Rext);
-+-	if (can_compress) {
-+-  	    printf("        ");
-+-	    printf(_("RX compressed:%lu\n"), ptr->stats.rx_compressed);
-+-	}
-+-	printf("        ");
-+-	printf(_("RX errors %lu  dropped %lu  overruns %lu  frame %lu\n"),
-+-	       ptr->stats.rx_errors, ptr->stats.rx_dropped, 
-+-	       ptr->stats.rx_fifo_errors, ptr->stats.rx_frame_errors);
-+-
-+-
-+-	printf("        ");
-+-	printf(_("TX packets %llu  bytes %llu (%lu.%lu %s)\n"),
-+-		ptr->stats.tx_packets, 
-+-	        tx, (unsigned long)(short_tx / 10), 
-+-	        (unsigned long)(short_tx % 10), Text);
-+-	if (can_compress) {
-+-  	    printf("        ");
-+-	    printf(_("TX compressed %lu\n"), ptr->stats.tx_compressed);
-+-	}
-+-	printf("        ");
-+-	printf(_("TX errors %lu  dropped %lu overruns %lu  carrier %lu  collisions %lu\n"),
-+-	       ptr->stats.tx_errors,
-++	printf("          ");
-++	printf(_("TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"),
-++	       ptr->stats.tx_packets, ptr->stats.tx_errors,
-+ 	       ptr->stats.tx_dropped, ptr->stats.tx_fifo_errors,
-+-	       ptr->stats.tx_carrier_errors, ptr->stats.collisions);
-++	       ptr->stats.tx_carrier_errors);
-++	printf(_("          collisions:%lu "), ptr->stats.collisions);
-++	if (can_compress)
-++	    printf(_("compressed:%lu "), ptr->stats.tx_compressed);
-++	if (ptr->tx_queue_len != -1)
-++	    printf(_("txqueuelen:%d "), ptr->tx_queue_len);
-++	printf("\n          ");
-++	printf(_("RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"),
-++	       rx, (unsigned long)(short_rx / 10), 
-++	       (unsigned long)(short_rx % 10), Rext, 
-++	       tx, (unsigned long)(short_tx / 10), 
-++	       (unsigned long)(short_tx % 10), Text);
-+     }
-+ 
-+     if ((ptr->map.irq || ptr->map.mem_start || ptr->map.dma ||
-+ 	 ptr->map.base_addr >= 0x100)) {
-+-	printf("        device ");
-++	printf("          ");
-+ 	if (ptr->map.irq)
-+-	    printf(_("interrupt %d  "), ptr->map.irq);
-++	    printf(_("Interrupt:%d "), ptr->map.irq);
-+ 	if (ptr->map.base_addr >= 0x100)	/* Only print devices using it for 
-+ 						   I/O maps */
-+-	    printf(_("base 0x%x  "), ptr->map.base_addr);
-++	    printf(_("Base address:0x%x "), ptr->map.base_addr);
-+ 	if (ptr->map.mem_start) {
-+-	    printf(_("memory 0x%lx-%lx  "), ptr->map.mem_start, ptr->map.mem_end);
-++	    printf(_("Memory:%lx-%lx "), ptr->map.mem_start, ptr->map.mem_end);
-+ 	}
-+ 	if (ptr->map.dma)
-+-	    printf(_("  dma 0x%x"), ptr->map.dma);
-++	    printf(_("DMA chan:%x "), ptr->map.dma);
-+ 	printf("\n");
-+     }
-+     printf("\n");
---- net-tools-1.60.orig/debian/patches/CVS-20061011-includes_sync.patch
-+++ net-tools-1.60/debian/patches/CVS-20061011-includes_sync.patch
-@@ -0,0 +1,113 @@
-+Sync with upstream CVS, complete log:
-+
-+2006-10-10 22:14  ecki
-+
-+	* util-ank.h: fixed signedness compiler warning
-+
-+2006-09-27 17:59  ecki
-+
-+	* mii.h: GigE Support by Stephen Hemminger from
-+	  http://developer.osdl.org/shemminger/prototypes/mii-tool.tar.bz2
-+	  with verbose register patch from Dean Gaudet
-+
-+2003-06-28 00:19  ecki
-+
-+	* mii.h: Use new style MII ioctls only. This will give you a
-+	  warning, if compiled with old kernel source tree. It will also
-+	  not work if compiled with new source on old kernels. The new
-+	  ioctls also require root for reading, the old didnt. This fixes
-+	  Debian bug #133648. No fallback compatibility is included for
-+	  reasons of cleaner source.
-+
-+2002-03-04 21:47  ecki
-+
-+	* interface.h: export procnetdev_version, get_dev_fields, get_name
-+	  from lib/interface.c for general usage (e.g. in my next patch to
-+	  iptunnel)
-+
-+2001-11-25 03:48  ecki
-+
-+	* interface.h: this fixes Debian Bug #109164 (netstat -ci does only
-+	  print stats once). It also renames add_interface and
-+	  free_interface list to if_cache_add/free.  I am not sure if
-+	  removing the "proc_read" flag will harm performance, looks likt
-+	  this check is never triggereed. Anyway, we need more efficient
-+	  b-search sooner or later.
-+
-+--- net-tools-1.60.orig/include/util-ank.h
-++++ net-tools-1.60/include/util-ank.h
-+@@ -75,6 +75,6 @@
-+ extern int do_class(int argc, char **argv);
-+ extern int do_filter(int argc, char **argv);
-+ 
-+-extern const char *format_host(int af, void *addr, __u8 *abuf, int alen);
-++extern const char *format_host(int af, void *addr, char *abuf, int alen);
-+ 
-+ #endif /* __UTILS_H__ */
-+--- net-tools-1.60.orig/include/mii.h
-++++ net-tools-1.60/include/mii.h
-+@@ -6,11 +6,14 @@
-+  * Copyright (C) 2000 David A. Hinds -- dhinds@pcmcia.sourceforge.org
-+  */
-+ 
-+-#ifndef _LINUX_MII_H
-+-#define _LINUX_MII_H
-++#ifndef _NETTOOL_MII_H
-++#define _NETTOOLS_MII_H
-++
-++#include <linux/sockios.h>
-+ 
-+ /* network interface ioctl's for MII commands */
-+ #ifndef SIOCGMIIPHY
-++#warning "SIOCGMIIPHY is not defined by your kernel source"
-+ #define SIOCGMIIPHY (SIOCDEVPRIVATE)	/* Read from current PHY */
-+ #define SIOCGMIIREG (SIOCDEVPRIVATE+1) 	/* Read any PHY register */
-+ #define SIOCSMIIREG (SIOCDEVPRIVATE+2) 	/* Write any PHY register */
-+@@ -38,6 +41,7 @@
-+ #define  MII_BMCR_RESTART	0x0200
-+ #define  MII_BMCR_DUPLEX	0x0100
-+ #define  MII_BMCR_COLTEST	0x0080
-++#define  MII_BMCR_SPEED1000	0x0040
-+ 
-+ /* Basic Mode Status Register */
-+ #define MII_BMSR		0x01
-+@@ -83,4 +87,17 @@
-+ #define  MII_ANER_PAGE_RX	0x0002
-+ #define  MII_ANER_LP_AN_ABLE	0x0001
-+ 
-+-#endif /* _LINUX_MII_H */
-++#define MII_CTRL1000		0x09
-++#define   MII_BMCR2_1000FULL	0x0200
-++#define   MII_BMCR2_1000HALF	0x0100
-++
-++#define MII_STAT1000		0x0a
-++#define   MII_LPA2_1000LOCALOK  0x2000
-++#define   MII_LPA2_1000REMRXOK	0x1000
-++#define   MII_LPA2_1000FULL	0x0800
-++#define   MII_LPA2_1000HALF	0x0400
-++
-++/* Last register we need for show_basic_mii() */
-++#define MII_BASIC_MAX          (MII_STAT1000+1)
-++
-++#endif /* _NETTOOLS_MII_H */
-+--- net-tools-1.60.orig/include/interface.h
-++++ net-tools-1.60/include/interface.h
-+@@ -64,13 +64,17 @@
-+ extern int if_fetch(struct interface *ife);
-+ 
-+ extern int for_all_interfaces(int (*)(struct interface *, void *), void *);
-+-extern int free_interface_list(void);
-++extern int if_cache_free(void);
-+ extern struct interface *lookup_interface(char *name);
-+ extern int if_readlist(void);
-+ 
-+ extern int do_if_fetch(struct interface *ife);
-+ extern int do_if_print(struct interface *ife, void *cookie);
-+ 
-++extern int    procnetdev_version(char *buf);
-++extern int    get_dev_fields(char *bp, struct interface *ife);
-++extern char * get_name(char *name, char *p);
-++
-+ extern void ife_print(struct interface *ptr);
-+ 
-+ extern int ife_short;
---- net-tools-1.60.orig/debian/patches/CVS-20031011-hostname.c_sync.patch
-+++ net-tools-1.60/debian/patches/CVS-20031011-hostname.c_sync.patch
-@@ -0,0 +1,97 @@
-+Sync with upstream CVS, complete log:
-+
-+Revision 1.12 - Sat Oct 11 21:08:10 2003 UTC by ecki
-+Maik Broemme contributed gcc warning fixes (break after default: label)
-+
-+Revision 1.11 - Thu Jun 12 03:22:30 2003 UTC by ecki
-+make hostname compile warnign free with gcc 3.3 (Ec)
-+
-+Index: net-tools/hostname.c
-+===================================================================
-+--- net-tools.orig/hostname.c
-++++ net-tools/hostname.c
-+@@ -9,20 +9,19 @@
-+  *              dnsdmoainname   
-+  *              nisdomainname {name|-F file}
-+  *
-+- * Version:     hostname 1.96 (1996-02-18)
-++ * Version:     hostname 1.101 (2003-10-11)
-+  *
-+  * Author:      Peter Tobias <tobias@et-inf.fho-emden.de>
-+  *
-+  * Changes:
-+- *      {1.90}  Peter Tobias :          Added -a and -i options.
-+- *      {1.91}  Bernd Eckenfels :       -v,-V rewritten, long_opts 
-+- *                                      (major rewrite), usage.
-+- *960120 {1.95} Bernd Eckenfels :       -y/nisdomainname - support for get/
-+- *                                      setdomainname added 
-+- *960218 {1.96} Bernd Eckenfels :       netinet/in.h added
-+- *980629 {1.97} Arnaldo Carvalho de Melo : gettext instead of catgets for i18n
-+- *20000213 {1.99} Arnaldo Carvalho de Melo : fixed some i18n strings
-++ *         {1.90}  Peter Tobias : Added -a and -i options.
-++ *         {1.91}  Bernd Eckenfels : -v,-V rewritten, long_opts (major rewrite), usage.
-++ *19960120 {1.95}  Bernd Eckenfels : -y/nisdomainname - support for get/setdomainname added 
-++ *19960218 {1.96}  Bernd Eckenfels : netinet/in.h added
-++ *19980629 {1.97}  Arnaldo Carvalho de Melo : gettext instead of catgets for i18n
-++ *20000213 {1.99}  Arnaldo Carvalho de Melo : fixed some i18n strings
-+  *20010404 {1.100} Arnaldo Carvalho de Melo: use setlocale
-++ *20031011 {1.101} Maik Broemme: gcc 3.x fixes (default: break)
-+  *
-+  *              This program is free software; you can redistribute it
-+  *              and/or  modify it under  the terms of  the GNU General
-+@@ -31,7 +30,9 @@
-+  *              your option) any later version.
-+  */
-+ #include <stdio.h>
-++#include <stdlib.h>
-+ #include <unistd.h>
-++#include <stdlib.h>
-+ #include <getopt.h>
-+ #include <string.h>
-+ #include <netdb.h>
-+@@ -78,6 +79,7 @@ static void setnname(char *nname)
-+             fprintf(stderr, _("%s: name too long\n"), program_name);
-+             break;
-+         default:
-++	    break;
-+         }
-+ 	exit(1);
-+     }
-+@@ -97,7 +99,6 @@ static void sethname(char *hname)
-+ 	case EINVAL:
-+ 	    fprintf(stderr, _("%s: name too long\n"), program_name);
-+ 	    break;
-+-	default:
-+ 	}
-+ 	exit(1);
-+     };
-+@@ -116,7 +117,6 @@ static void setdname(char *dname)
-+ 	case EINVAL:
-+ 	    fprintf(stderr, _("%s: name too long\n"), program_name);
-+ 	    break;
-+-	default:
-+ 	}
-+ 	exit(1);
-+     };
-+@@ -173,7 +173,6 @@ static void showhname(char *hname, int c
-+ 	    *p = '\0';
-+ 	printf("%s\n", hp->h_name);
-+ 	break;
-+-    default:
-+     }
-+ }
-+ 
-+@@ -326,11 +325,12 @@ int main(int argc, char **argv)
-+ 	    break;
-+ 	case 'V':
-+ 	    version();
-++	    break; // not reached
-+ 	case '?':
-+ 	case 'h':
-+ 	default:
-+ 	    usage();
-+-
-++	    break; // not reached
-+ 	};
-+ 
-+ 
---- net-tools-1.60.orig/debian/patches/Bug#254243-netstat.c-wide-opt.patch
-+++ net-tools-1.60/debian/patches/Bug#254243-netstat.c-wide-opt.patch
-@@ -0,0 +1,113 @@
-+This patch adds the --wide option to netstat, to avoid truncation of ipv6
-+addresses, by Luar Roji. (Bug #254243)
-+
-+Already in upstream's CVS (rev 1.60)
-+
-+Index: net-tools/man/en_US/netstat.8
-+===================================================================
-+--- net-tools.orig/man/en_US/netstat.8
-++++ net-tools/man/en_US/netstat.8
-+@@ -8,7 +8,7 @@
-+ .\" Modified: Tuan Hoang tqhoang@bigfoot.com 
-+ .\"
-+ .\"
-+-.TH NETSTAT 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
-++.TH NETSTAT 8 "2008-11-16" "net\-tools" "Linux Programmer's Manual"
-+ 
-+ .SH NAME
-+ netstat \- Print network connections, routing tables, interface statistics, masquerade connections, and multicast memberships
-+@@ -118,6 +118,9 @@ Display summary statistics for each prot
-+ .SS "\-\-verbose , \-v"
-+ Tell the user what is going on by being verbose. Especially print some
-+ useful information about unconfigured address families.
-++.SS "\-\-wide , \-W"
-++Do not truncate IP addresses by using output as wide as needed. This is
-++optional for now to not break existing scripts.
-+ .SS "\-\-numeric , \-n"
-+ Show numerical addresses instead of trying to determine symbolic host, port
-+ or user names.
-+Index: net-tools/netstat.c
-+===================================================================
-+--- net-tools.orig/netstat.c
-++++ net-tools/netstat.c
-+@@ -149,6 +149,7 @@ int flag_udp = 0;
-+ int flag_igmp= 0;
-+ int flag_rom = 0;
-+ int flag_exp = 1;
-++int flag_wide= 0;
-+ int flag_prg = 0;
-+ int flag_arg = 0;
-+ int flag_ver = 0;
-+@@ -782,16 +783,20 @@ static void tcp_do_one(int lnr, const ch
-+ 		 get_sname(htons(local_port), "tcp",
-+ 			   flag_not & FLAG_NUM_PORT));
-+ 
-+-	if ((strlen(local_addr) + strlen(buffer)) > 22)
-+-	    local_addr[22 - strlen(buffer)] = '\0';
-++	if (!flag_wide) {
-++	    if ((strlen(local_addr) + strlen(buffer)) > 22)
-++		local_addr[22 - strlen(buffer)] = '\0';
-++	}
-+ 
-+ 	strcat(local_addr, ":");
-+ 	strcat(local_addr, buffer);
-+ 	snprintf(buffer, sizeof(buffer), "%s",
-+ 		 get_sname(htons(rem_port), "tcp", flag_not & FLAG_NUM_PORT));
-+ 
-+-	if ((strlen(rem_addr) + strlen(buffer)) > 22)
-+-	    rem_addr[22 - strlen(buffer)] = '\0';
-++	if (!flag_wide) {
-++	    if ((strlen(rem_addr) + strlen(buffer)) > 22)
-++		rem_addr[22 - strlen(buffer)] = '\0';
-++	}
-+ 
-+ 	strcat(rem_addr, ":");
-+ 	strcat(rem_addr, buffer);
-+@@ -1511,9 +1516,9 @@ static void version(void)
-+ 
-+ static void usage(void)
-+ {
-+-    fprintf(stderr, _("usage: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--help}\n"));
-+-    fprintf(stderr, _("       netstat [-vnNcaeol] [<Socket> ...]\n"));
-+-    fprintf(stderr, _("       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n\n"));
-++    fprintf(stderr, _("usage: netstat [-vWeenNcCF] [<Af>] -r         netstat {-V|--version|-h|--help}\n"));
-++    fprintf(stderr, _("       netstat [-vWnNcaeol] [<Socket> ...]\n"));
-++    fprintf(stderr, _("       netstat { [-vWeenNac] -i | [-cWnNe] -M | -s }\n\n"));
-+ 
-+     fprintf(stderr, _("        -r, --route              display routing table\n"));
-+     fprintf(stderr, _("        -i, --interfaces         display interface table\n"));
-+@@ -1523,6 +1528,7 @@ static void usage(void)
-+     fprintf(stderr, _("        -M, --masquerade         display masqueraded connections\n\n"));
-+ #endif
-+     fprintf(stderr, _("        -v, --verbose            be verbose\n"));
-++    fprintf(stderr, _("        -W, --wide               don't truncate IP addresses\n"));
-+     fprintf(stderr, _("        -n, --numeric            don't resolve names\n"));
-+     fprintf(stderr, _("        --numeric-hosts          don't resolve host names\n"));
-+     fprintf(stderr, _("        --numeric-ports          don't resolve port names\n"));
-+@@ -1572,6 +1578,7 @@ int main
-+ 	{"programs", 0, 0, 'p'},
-+ 	{"verbose", 0, 0, 'v'},
-+ 	{"statistics", 0, 0, 's'},
-++	{"wide", 0, 0, 'W'},
-+ 	{"numeric", 0, 0, 'n'},
-+ 	{"numeric-hosts", 0, 0, '!'},
-+ 	{"numeric-ports", 0, 0, '@'},
-+@@ -1591,7 +1598,7 @@ int main
-+     getroute_init();		/* Set up AF routing support */
-+ 
-+     afname[0] = '\0';
-+-    while ((i = getopt_long(argc, argv, "MCFA:acdegphinNorstuVv?wxl64", longopts, &lop)) != EOF)
-++    while ((i = getopt_long(argc, argv, "MCFA:acdegphinNorstuWVv?wxl64", longopts, &lop)) != EOF)
-+ 	switch (i) {
-+ 	case -1:
-+ 	    break;
-+@@ -1635,6 +1642,9 @@ int main
-+ 	case 'i':
-+ 	    flag_int++;
-+ 	    break;
-++	case 'W':
-++	    flag_wide++;
-++	    break;
-+ 	case 'n':
-+ 	    flag_not |= FLAG_NUM;
-+ 	    break;
---- net-tools-1.60.orig/debian/patches/CVS-20081002-manpages_sync.patch
-+++ net-tools-1.60/debian/patches/CVS-20081002-manpages_sync.patch
-@@ -0,0 +1,1398 @@
-+Sync from upstream's CVS for all manpages. Full log:
-+
-+2008-10-02 20:16  ecki
-+
-+	* en_US/: arp.8, ethers.5, hostname.1, ifconfig.8, mii-tool.8,
-+	  nameif.8, netstat.8, plipconfig.8, rarp.8, route.8, slattach.8:
-+	  Fix hypen in man pages (Debian Bug#288343 from Andrew Moise) Move
-+	  man pages to sysadmin books update samples for route(8) (Debian
-+	  Bug#400844, #368697 Danny Rathjens) update see also for
-+	  ifconfig(8) (Debian Bug#365916 Dan Jacobs)
-+
-+2008-10-02 19:42  ecki
-+
-+	* en_US/arp.8: fix some more hypens, changed book name and updated
-+	  date to 2008-10-03
-+
-+2008-10-02 19:30  ecki
-+
-+	* en_US/netstat.8: document the additional info in Send-Q/Recv-Q
-+	  with recent kernels for listening sockets.
-+
-+2008-06-16 21:18  ecki
-+
-+	* en_US/arp.8: Spelling error (Debian Bug #486448 reported by
-+	  Volker Stolz)
-+
-+2007-12-02 01:42  ecki
-+
-+	* de_DE/netstat.8, en_US/netstat.8, fr_FR/netstat.8,
-+	  pt_BR/netstat.8: fixed interfaceS spelling (Debian Bug #435690).
-+	  Thanks Alan and Liu Xing.
-+
-+2007-12-01 15:19  ecki
-+
-+	* en_US/arp.8: cleanup man page (arp.8 2007-12-01)
-+
-+2007-11-07 20:01  ecki
-+
-+	* en_US/ifconfig.8: Fix Formatting Bug for ifconfig.8 (Debian
-+	  Bug#450432 reported by Ivan Shmakov)
-+
-+2006-10-10 02:58  ecki
-+
-+	* en_US/slattach.8: formatting fixes from Justin Pryzby in Debian
-+	  Bug #391495
-+
-+2005-09-04 00:51  ecki
-+
-+	* en_US/slattach.8 (tags: net-tools-1_65): Spelling fix for Debian
-+	  Bug#326124 reported by A. Costa.
-+
-+2005-06-30 16:26  ecki
-+
-+	* en_US/ifconfig.8: minor formatting
-+
-+2005-06-30 15:42  ecki
-+
-+	* en_US/ifconfig.8: added pointer to iptables(8) not only
-+	  ipchains(8) (Toralf F�rster)
-+
-+2005-05-16 01:30  ecki
-+
-+	* en_US/arp.8: desupport dontpub in arp.8 and arp -? (Debian Bug
-+	  #203396)
-+
-+2005-05-13 19:34  ecki
-+
-+	* en_US/ethers.5: line break fix debian bug #305637
-+
-+2005-05-13 19:31  ecki
-+
-+	* en_US/mii-tool.8: spellig fix debian bug #305638
-+
-+2005-05-13 19:28  ecki
-+
-+	* en_US/route.8: spelling fix debian bug #305640
-+
-+2004-06-29 17:28  ecki
-+
-+	* en_US/netstat.8 (tags: net-tools-1_65): little formatting fix
-+
-+2004-03-28 18:35  ecki
-+
-+	* en_US/mii-tool.8 (tags: net-tools-1_65): added diagnostics
-+	  (closes debian bug #239229: EINVAL for downed interface)
-+
-+2003-10-02 17:06  ecki
-+
-+	* en_US/: netstat.8, route.8 (tags: net-tools-1_65): fixes for man
-+	  page bugs reported by Hugh Redelmeier.
-+
-+2003-05-28 17:59  ecki
-+
-+	* en_US/: ifconfig.8 (tags: net-tools-1_65), netstat.8: fixed
-+	  wording of binary units counters and interpunctuation in
-+	  netstat(8)
-+
-+2003-02-25 18:03  ecki
-+
-+	* en_US/ifconfig.8: Marc Lehmann pointed out that binary prefixes
-+	  are made up by the IEEE and are not official SI yet. (Debian Bug
-+	  #182478)
-+
-+2003-02-08 19:49  ecki
-+
-+	* en_US/ifconfig.8: add a comment about alias interfaces and
-+	  primary interface of scopes (intended to fix Debian wishlist bug
-+	  #179780 and normal bug #64458)
-+
-+2002-07-03 20:40  ecki
-+
-+	* en_US/ifconfig.8: there is no such thing as -i option for
-+	  ifconfig removed variable, fixed usage, added options to english
-+	  man page
-+
-+2002-02-20 11:31  ecki
-+
-+	* de_DE/netstat.8 (tags: net-tools-1_65): fixed typo in german man
-+	  page and added a comment that man page is currently not
-+	  completely up-to-date.
-+
-+2001-11-24 02:56  ecki
-+
-+	* de_DE/netstat.8, en_US/netstat.8: fixed minor errors in netstat.8
-+	  man page (--numeric-users was missing, some font problems and
-+	  --interfaces has no <interface> argument (Debian Bug #120475)
-+	  thanks for the report to Uwe Hermann.
-+
-+2001-11-11 22:46  ecki
-+
-+	* en_US/ifconfig.8: added documentation about SI prefixes for
-+	  decimal numbers
-+
-+2001-11-05 10:12  ecki
-+
-+	* en_US/rarp.8, fr_FR/arp.8, fr_FR/hostname.1, fr_FR/ifconfig.8,
-+	  fr_FR/netstat.8, fr_FR/rarp.8, pt_BR/rarp.8 (utags:
-+	  net-tools-1_65): changed troff syntax according to ESR's report
-+
-+2001-11-05 10:07  ecki
-+
-+	* en_US/arp.8 (tags: net-tools-1_65): fixed troff syntax, as
-+	  reported by ESR. Did not changed the date of the man page.
-+
-+2001-06-29 04:47  ecki
-+
-+	* en_US/ifconfig.8: made man page more useful and added right link
-+	  for irq conflicts in ifconfig.8
-+
-+2001-06-29 00:50  ecki
-+
-+	* fr_FR/netstat.8: man page fix CLOSED -> CLOSE
-+
-+2001-06-29 00:15  ecki
-+
-+	* en_US/netstat.8: fixed CLOSED -> CLOSE in french and english
-+	  manpage as of bug report from Matthew Tippett
-+
-+Index: net-tools/man/de_DE/netstat.8
-+===================================================================
-+--- net-tools.orig/man/de_DE/netstat.8
-++++ net-tools/man/de_DE/netstat.8
-+@@ -9,7 +9,7 @@
-+ .\" Modified: Tuan Hoang tuan@optimus.mitre.org 
-+ .\"
-+ .\"
-+-.TH NETSTAT 8 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
-++.TH NETSTAT 8 "2007-12-02" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
-+ 
-+ .SH NAME
-+ netstat \- Anzeige von Netzwerksverbindungen, Routentabellen, Schnittstellenstatistiken, maskierten Verbindungen, Netlink-Nachrichten und Mitgliedschaft in Multicastgruppen
-+@@ -44,7 +44,6 @@ netstat \- Anzeige von Netzwerksverbindu
-+ .B netstat
-+ .RB [ \-veenpac ]
-+ .RB { \-\-interfaces | \-i }
-+-.RI [ Schnittstelle ]
-+ 
-+ .PP
-+ 
-+@@ -68,6 +67,8 @@ netstat \- Anzeige von Netzwerksverbindu
-+ .SH BESCHREIBUNG
-+ .B Netstat
-+ zeigt Informationen des Linux Netzwerkssystems an.
-++.PP
-++.B Bitte beachten Sie, dass der Inhalt der deutschen man-page nicht vollst\(:andig ist, im Moment.
-+ 
-+ .SS "(no option)"
-+ Ohne Optionen zeigt
-+@@ -103,18 +104,17 @@ benutzt das Ausgabeformat von
-+ Wegen Details siehe
-+ .BR route (8).
-+ 
-+-.SS "\-i, \-\-interface \fISchnittstelle\fI"
-++.SS "\-i, \-\-interfaces"
-+ Wird die
-+ .BR -i ", " --interfaces
-+-Option verwendet,  so wird eine Tabelle aller (oder der angegebenen
-+-.IR Schnittstellen ) 
-++Option verwendet,  so wird eine Tabelle aller Schnittstellen
-+ ausgedruckt.  Die Ausgabe ist im Format von
-+ .B "ifconfig -e"
-+ und wird in
-+ .BR ifconfig (8)
-+ beschrieben.
-+ .B "netstat -ei" 
-+-druckt eine Tabelle oder einen Eintrag f\(:ur einen einzelnes Interface wie
-++druckt eine Tabelle f\(:ur Interfaces wie
-+ .BR ifconfig .
-+ Die
-+ .B -a
-+@@ -182,7 +182,7 @@ Dies hat den gleichen Effekt wie die Lan
-+ und
-+ .BR \-\-ddp.
-+ 
-+-.SS "\-c, \-\-continous"
-++.SS "\-c, \-\-continuous"
-+ Mit dieser Option wiederholt
-+ .B netstat
-+ im Sekundenabstand die Ausgabe, bis es abgebrochen wird.
-+Index: net-tools/man/en_US/arp.8
-+===================================================================
-+--- net-tools.orig/man/en_US/arp.8
-++++ net-tools/man/en_US/arp.8
-+@@ -1,56 +1,111 @@
-+-.TH ARP 8 "5 Jan 1999" "net-tools" "Linux Programmer's Manual"
-++.TH ARP 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
-+ .SH NAME
-+ arp \- manipulate the system ARP cache
-+ .SH SYNOPSIS
-+ .B arp 
-+ .RB [ \-vn ] 
-+-.RB [ "\-H type" ] 
-+-.RB [ "-i if" ] 
-+-.B -a 
-+-.RB [ hostname ]
-++.RB [ \-H 
-++.IR type ] 
-++.RB [ \-i
-++.IR if ] 
-++.RB [ \-a ] 
-++.RI [ hostname ]
-+ .PP
-+ .B arp 
-+ .RB [ \-v ]
-+-.RB [ "\-i if" ] 
-+-.B "\-d hostname"
-++.RB [ \-i
-++.IR if ] 
-++.B \-d 
-++.I hostname
-+ .RB [ pub ]
-+ .PP
-+ .B arp 
-+ .RB [ \-v ] 
-+-.RB [ "\-H type" ] 
-+-.RB [ "\-i if" ] 
-+-.B -s hostname hw_addr
-++.RB [ \-H
-++.IR type ] 
-++.RB [ \-i
-++.IR if ] 
-++.B \-s
-++.I hostname hw_addr
-+ .RB [ temp ] 
-+ .PP
-+ .B arp 
-+ .RB [ \-v ] 
-+-.RB [ "\-H type" ] 
-+-.RB [ "\-i if" ] 
-+-.B -s hostname hw_addr
-+-.RB [ "netmask nm" ] 
-++.RB [ \-H
-++.IR type ] 
-++.RB [ \-i
-++.IR if ] 
-++.B \-s
-++.I hostname hw_addr
-++.RB [ netmask
-++.IR nm ] 
-+ .B pub
-+ .PP
-+ .B arp 
-+ .RB [ \-v ] 
-+-.RB [ "\-H type" ] 
-+-.RB [ "\-i if" ] 
-+-.B -Ds hostname ifa
-+-.RB [ "netmask nm" ] 
-++.RB [ \-H
-++.IR type ] 
-++.RB [ \-i
-++.IR if ] 
-++.B \-Ds 
-++.I hostname
-++.I ifname
-++.RB [ netmask
-++.IR nm ] 
-+ .B pub
-+ .PP
-+ .B arp 
-+ .RB [ \-vnD ]
-+-.RB [ "\-H type" ] 
-+-.RB [ "-i if" ]
-+-.B -f [filename]
-++.RB [ \-H 
-++.IR type ] 
-++.RB [ \-i
-++.IR if ]
-++.B \-f 
-++.RI [ filename ]
-+ 
-+ .SH DESCRIPTION
-+ .B Arp
-+-manipulates the kernel's ARP cache in various ways.  The primary options
-+-are clearing an address mapping entry and manually setting up one.  For
-+-debugging purposes, the
-++manipulates or displays the kernel's IPv4 network neighbour cache. It can add
-++entries to the table, delete one or display the current content.
-++
-++.B ARP
-++stands for Address Resolution Protocol, which is used to find the media
-++access control address of a network neighbour for a given IPv4 Address.
-++.SH MODES
-+ .B arp
-+-program also allows a complete dump of the ARP cache.
-++with no mode specifier will print the current content of the table. It is
-++possible to limit the number of entries printed, by specifying an hardware
-++address type, interface name or host address.
-++
-++.B arp -d
-++.I address
-++will delete a ARP table entry. Root or netadmin priveledge is required to do
-++this. The entry is found by IP address. If a hostname is given, it will be
-++resolved before looking up the entry in the ARP table.
-++
-++.B arp -s
-++.I address hw_addr
-++is used to set up a new table entry. The format of the 
-++.I hw_addr
-++parameter is dependent on the hardware class, but for most classes one can
-++assume that the usual presentation can be used.  For the Ethernet class,
-++this is 6 bytes in hexadecimal, separated by colons. When adding proxy arp
-++entries (that is those with the
-++.BR pub lish 
-++flag set a 
-++.B netmask 
-++may be specified to proxy arp for entire subnets. This is not good
-++practice, but is supported by older kernels because it can be
-++useful. If the
-++.B temp
-++flag is not supplied entries will be permanent stored into the ARP
-++cache. To simplyfy setting up entries for one of your own network interfaces, you can use the
-++.B "arp \-Ds"
-++.I address ifname
-++form. In that case the hardware address is taken from the interface with the
-++specified name.
-++
-++.br
-+ .SH OPTIONS
-+ .TP
-+ .B "\-v, \-\-verbose"
-+@@ -60,7 +115,7 @@ Tell the user what is going on by being 
-+ shows numerical addresses instead of trying to determine symbolic host, port
-+ or user names.
-+ .TP
-+-.B "\-H type, \-\-hw-type type"
-++.B "\-H type, \-\-hw\-type type"
-+ When setting or reading the ARP cache, this optional parameter tells
-+ .B arp
-+ which class of entries it should check for.  The default value of
-+@@ -76,21 +131,13 @@ Other values might include network techn
-+ and
-+ .RB "NET/ROM (" netrom ")."
-+ .TP
-+-.B "\-a [hostname], \-\-display [hostname]"
-+-Shows the entries of the specified hosts.  If the
-+-.B hostname
-+-parameter is not used,
-+-.B all
-+-entries will be displayed.
-+-.TP
-+-.B "\-d hostname, \-\-delete hostname"
-+-Remove any entry for the specified host.  This can be used if the
-+-indicated host is brought down, for example.
-++.B \-a
-++Use alternate BSD style output format (with no fixed columns).
-+ .TP
-+ .B "\-D, \-\-use-device"
-+-Use the interface
-+-.BR ifa "'s"
-+-hardware address.
-++Instead of a hw_addr, the given argument is the name of an interface. 
-++.B arp
-++will use the MAC address of that interface for the table entry. This is usually the best option to set up a proxy ARP entry to yourself.
-+ .TP
-+ .B "\-i If, \-\-device If"
-+ Select an interface. When dumping the ARP cache only entries matching
-+@@ -106,33 +153,15 @@ be answered. 
-+ .B NOTE:
-+ This has to be different from the interface to which the IP
-+ datagrams will be routed.
-+-.TP
-+-.B "\-s hostname hw_addr, \-\-set hostname"
-+-Manually create an ARP address mapping entry for host
-+-.B hostname
-+-with hardware address set to
-+-.B hw_addr
-+-.  The format of the hardware address is dependent on the hardware
-+-class, but for most classes one can assume that the usual presentation
-+-can be used.  For the Ethernet class, this is 6 bytes in hexadecimal,
-+-separated by colons. When adding proxy arp entries (that is those with
-+-the 
-+-.BR pub lish 
-+-flag set a 
-+-.B netmask 
-+-may be specified to proxy arp for entire subnets. This is not good
-+-practice, but is supported by older kernels because it can be
-+-useful. If the
-+-.B temp
-+-flag is not supplied entries will be permanent stored into the ARP
-+-cache.
-+-.br
-+ .B NOTE:
-+ As of kernel 2.2.0 it is no longer possible to set an ARP entry for an 
-+ entire subnet. Linux instead does automagic proxy arp when a route
-+ exists and it is forwarding. See 
-+ .BR arp (7)
-+-for details.
-++for details. Also the
-++.B dontpub
-++option which is available for delete and set operations cannot be 
-++used with 2.4 and newer kernels.
-+ .TP
-+ .B "\-f filename, \-\-file filename"
-+ Similar to the
-+@@ -167,8 +196,18 @@ flag. Permanent entries are marked with
-+ and published entries have the
-+ .B P
-+ flag.
-++.SH EXAMPLES
-++.B /usr/sbin/arp -i eth0 -Ds 10.0.0.2 eth1 pub
-++
-++This will answer ARP requests for 10.0.0.2 on eth0 with the MAC address for
-++eth1.
-++
-++.B /usr/sbin/arp -i eth1 -d 10.0.0.1
-++
-++Delete the ARP table entry for 10.0.0.1 on interface eth1. This will match
-++published proxy ARP entries and permanent entries.
-+ .SH FILES
-+-.I /proc/net/arp,
-++.I /proc/net/arp
-+ .br
-+ .I /etc/networks
-+ .br
-+@@ -178,5 +217,4 @@ flag.
-+ .SH SEE ALSO
-+ rarp(8), route(8), ifconfig(8), netstat(8)
-+ .SH AUTHORS
-+-Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> with a lot of improvements
-+-from net-tools Maintainer Bernd Eckenfels <net-tools@lina.inka.de>.
-++Fred N. van Kempen <waltje@uwalt.nl.mugnet.org>, Bernd Eckenfels <net\-tools@lina.inka.de>.
-+Index: net-tools/man/en_US/ethers.5
-+===================================================================
-+--- net-tools.orig/man/en_US/ethers.5
-++++ net-tools/man/en_US/ethers.5
-+@@ -1,4 +1,4 @@
-+-.TH ETHERS 5 "April 26th, 1996" "" "File formats"
-++.TH ETHERS 5 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
-+ .SH NAME \"{{{roff}}}\"{{{
-+ ethers \- Ethernet address to IP number database
-+ .\"}}}
-+@@ -7,17 +7,17 @@ ethers \- Ethernet address to IP number 
-+ IP numbers, one line for each IP number:
-+ .sp
-+ .RS
-+-\fIEthernet-address\fP  \fIIP-number\fP
-++\fIEthernet\-address\fP  \fIIP\-number\fP
-+ .RE
-+ .sp
-+-The two items are separated by any number of SPACE and/or TAB char
-+-acters.   A \fB#\fP at the beginning of a line starts a comment
-+-which extends to the end of the line.  The \fIEthernet-address\fP is
-++The two items are separated by any number of SPACE and/or TAB characters.
-++A \fB#\fP at the beginning of a line starts a comment
-++which extends to the end of the line.  The \fIEthernet\-address\fP is
-+ written as
-+ .IR x : x : x : x : x : x ,
-+ where \fIx\fP is a hexadecimal number between \fB0\fP and \fBff\fP
-+ which represents one byte of the address, which is in network byte
-+-order (big-endian).  The \fIIP-number\fP may be a hostname which
-++order (big-endian).  The \fIIP\-number\fP may be a hostname which
-+ can be resolved by DNS or a dot separated number.
-+ .\"}}}
-+ .SH EXAMPLES \"{{{
-+Index: net-tools/man/en_US/hostname.1
-+===================================================================
-+--- net-tools.orig/man/en_US/hostname.1
-++++ net-tools/man/en_US/hostname.1
-+@@ -1,4 +1,4 @@
-+-.TH HOSTNAME 1 "28 Jan 1996" "net-tools" "Linux Programmer's Manual"
-++.TH HOSTNAME 1 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
-+ 
-+ .SH NAME
-+ hostname \- show or set the system's host name
-+@@ -23,7 +23,7 @@ nodename \- show or set the system's DEC
-+ .RB [ \-f ]
-+ .RB [ \-\-fqdn ]
-+ .RB [ \-i ]
-+-.RB [ \-\-ip-address ]
-++.RB [ \-\-ip\-address ]
-+ .RB [ \-\-long ]
-+ .RB [ \-s ]
-+ .RB [ \-\-short ]
-+@@ -181,7 +181,7 @@ part of the FQDN) in the \fI/etc/hosts\f
-+ .I "\-h, \-\-help"
-+ Print a usage message and exit.
-+ .TP
-+-.I "\-i, \-\-ip-address"
-++.I "\-i, \-\-ip\-address"
-+ Display the IP address(es) of the host.
-+ .TP
-+ .I "\-n, \-\-node"
-+@@ -205,9 +205,9 @@ Display the NIS domain name. If a parame
-+ .SH FILES
-+ .B /etc/hosts
-+ .SH AUTHOR
-+-Peter Tobias, <tobias@et-inf.fho-emden.de>
-++Peter Tobias, <tobias@et\-inf.fho\-emden.de>
-+ .br
-+-Bernd Eckenfels, <net-tools@lina.inka.de> (NIS and manpage).
-++Bernd Eckenfels, <net\-tools@lina.inka.de> (NIS and manpage).
-+ .br
-+ Steve Whitehouse, <SteveW@ACM.org> (DECnet support and manpage).
-+ 
-+Index: net-tools/man/en_US/ifconfig.8
-+===================================================================
-+--- net-tools.orig/man/en_US/ifconfig.8
-++++ net-tools/man/en_US/ifconfig.8
-+@@ -1,10 +1,10 @@
-+-.TH IFCONFIG 8 "14 August 2000" "net-tools" "Linux Programmer's Manual"
-++.TH IFCONFIG 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
-+ .SH NAME
-+ ifconfig \- configure a network interface
-+ .SH SYNOPSIS
-+-.B "ifconfig [interface]"
-++.B "ifconfig [-v] [-a] [-s] [interface]"
-+ .br
-+-.B "ifconfig interface [aftype] options | address ..."
-++.B "ifconfig [-v] interface [aftype] options | address ..."
-+ .SH DESCRIPTION
-+ .B Ifconfig
-+ is used to configure the kernel-resident network interfaces.  It is
-+@@ -18,7 +18,7 @@ a single
-+ .B interface
-+ argument is given, it displays the status of the given interface
-+ only; if a single
-+-.B -a
-++.B \-a
-+ argument is given, it displays the status of all interfaces, even
-+ those that are down.  Otherwise, it configures an interface.
-+ 
-+@@ -41,11 +41,27 @@ supported address families include
-+ (AMPR Packet radio).
-+ .SH OPTIONS
-+ .TP
-++.B -a
-++display all interfaces which are currently available, even if down
-++.TP
-++.B -s
-++display a short list (like netstat -i)
-++.TP
-++.B -v
-++be more verbose for some error conditions
-++.TP
-+ .B interface
-+ The name of the interface.  This is usually a driver name followed by
-+ a unit number, for example
-+ .B eth0
-+-for the first Ethernet interface.
-++for the first Ethernet interface. If your kernel supports alias interfaces,
-++you can specify them with 
-++.B eth0:0
-++for the first alias of eth0. You can use them to assign a second address. To
-++delete an alias interface use
-++.BR "ifconfig eth0:0 down" .
-++Note: for every scope (i.e. same net with address/netmask combination) all
-++aliases are deleted, if you delete the first (primary).
-+ .TP
-+ .B up
-+ This flag causes the interface to be activated.  It is implicitly
-+@@ -122,13 +138,13 @@ are 
-+ can be used to tell the driver to auto-sense the media.  Again, not
-+ all drivers can do this.
-+ .TP
-+-.B "[-]broadcast [addr]"
-++.B "[\-]broadcast [addr]"
-+ If the address argument is given, set the protocol broadcast
-+ address for this interface.  Otherwise, set (or clear) the
-+ .B IFF_BROADCAST
-+ flag for the interface.
-+ .TP
-+-.B "[-]pointopoint [addr]"
-++.B "[\-]pointopoint [addr]"
-+ This keyword enables the
-+ .B point-to-point
-+ mode of an interface, meaning that it is a direct link between two
-+@@ -173,11 +189,20 @@ alias interfaces anymore. The statistics
-+ are shared with all alias addresses on the same device. If you want per-address
-+ statistics you should add explicit accounting
-+ rules for the address using the 
-+-.BR ipchains(8)
-++.BR ipchains (8)
-++or
-++.BR iptables (8)
-+ command.
-+ .LP
-+-Interrupt problems with Ethernet device drivers fail with EAGAIN. See
-+-.I http://cesdis.gsfc.nasa.gov/linux/misc/irq-conflict.html
-++Since net\-tools 1.60\-4 ifconfig is printing byte counters and human readable
-++counters with IEC 60027-2 units. So 1 KiB are 2^10 byte. Note, the numbers 
-++are truncated to one decimal (which can by quite a large error if you 
-++consider 0.1 PiB is 112.589.990.684.262 bytes :)
-++.LP
-++Interrupt problems with Ethernet device drivers fail with EAGAIN
-++.I (SIOCSIIFLAGS: Resource temporarily unavailable)
-++it is most likely a interrupt conflict. See
-++.I http://www.scyld.com/expert/irq\-conflict.html
-+ for more information.
-+ .SH FILES
-+ .I /proc/net/socket 
-+@@ -189,7 +214,9 @@ for more information.
-+ While appletalk DDP and IPX addresses will be displayed they cannot be
-+ altered by this command.
-+ .SH SEE ALSO
-+-route(8), netstat(8), arp(8), rarp(8), ipchains(8)
-++route(8), netstat(8), arp(8), rarp(8), ipchains(8), iptables(8), ifup(8), interfaces(5).
-++.br
-++http://physics.nist.gov/cuu/Units/binary.html - Prefixes for binary multiples
-+ .SH AUTHORS
-+ Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
-+ .br
-+@@ -198,3 +225,5 @@ Alan Cox, <Alan.Cox@linux.org>
-+ Phil Blundell, <Philip.Blundell@pobox.com>
-+ .br
-+ Andi Kleen
-++.br
-++Bernd Eckenfels, <net\-tools@lina.inka.de>
-+Index: net-tools/man/en_US/mii-tool.8
-+===================================================================
-+--- net-tools.orig/man/en_US/mii-tool.8
-++++ net-tools/man/en_US/mii-tool.8
-+@@ -1,13 +1,13 @@
-+ .\" Copyright (C) 2000 David A. Hinds -- dhinds@pcmcia.sourceforge.org
-+ .\" mii-tool.8 1.5 2000/04/25 22:58:19
-+ .\"
-+-.TH MII-TOOL 8 "2000/04/25 22:58:19" "net-tools"
-++.TH MII\-TOOL 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
-+ 
-+ .SH NAME
-+-mii-tool \- view, manipulate media-independent interface status
-++mii\-tool \- view, manipulate media-independent interface status
-+ 
-+ .SH SYNOPSIS
-+-.B mii-tool
-++.B mii\-tool
-+ [\fB\-v\fR, \fB\-\-verbose\fR]
-+ [\fB\-V\fR, \fB\-\-version\fR]
-+ [\fB\-R\fR, \fB\-\-reset\fR]
-+@@ -32,12 +32,12 @@ single-speed hubs, are unable to autoneg
-+ devices, the MII protocol also allows for establishing a link by
-+ simply detecting either a 10baseT or 100baseT link beat.  The \fB\-F\fR
-+ or \fB\-\-force\fR options can be used to force the MII to operate in
-+-one mode, instead of autonegotiating.  The \fB\-A\fR and \fB-F\fR
-++one mode, instead of autonegotiating.  The \fB\-A\fR and \fB\-F\fR
-+ options are mutually exclusive.
-+ .PP
-+ The default short output reports the negotiated link speed and link
-+ status for each interface.  If an interface or interfaces are not
-+-specified on the command line, then \fBmii-tool\fR will check any
-++specified on the command line, then \fBmii\-tool\fR will check any
-+ available interfaces from \fBeth0\fR through \fBeth7\fR.
-+ .SH OPTIONS
-+ .TP
-+@@ -59,7 +59,7 @@ Watch interface(s) and report changes in
-+ interfaces are polled at one second intervals.
-+ .TP
-+ \fB\-l\fR, \fB\-\-log\fR
-+-Used with \fB-w\fR, records link status changes in the system log
-++Used with \fB\-w\fR, records link status changes in the system log
-+ instead of printing on standard output.
-+ .TP
-+ \fB\-F\fI media\fR, \fB\-\-force=\fImedia\fR
-+@@ -72,7 +72,24 @@ media technologies.  Multiple technologi
-+ commas.  Valid media are \fB100baseT4\fR, \fB100baseTx-FD\fR,
-+ \fB100baseTx-HD\fR, \fB10baseT-FD\fR, and \fB10baseT-HD\fR.
-+ 
-++.SH DIAGNOSTICS
-++.TP
-++SIOCGMIIPHY on 'eth?' failed: Invalid argument
-++If the interface is not running (up), kernel will refuse to report its link state.
-++.TP
-++SIOCGMIIPHY on 'eth?' failed: Operation not permitted
-++Most kernels restrict access to root.
-++.TP
-++SIOCGMIIPHY on 'eth?' failed: No such device
-++This error is shown, if the kernel does not know about the named device.
-++.TP
-++SIOCGMIIPHY on 'eth?' failed: Operation not supported 
-++The interface in question does not support MII queries. Most likely, it does not have 
-++MII transceivers, at all.
-++
-+ .SH AUTHORS
-+ David Hinds \- dhinds@pcmcia.sourceforge.org
-+ .br
-+ Donald Becker \- becker@scyld.com
-++.br
-++Bernd Eckenfels \- ecki@debian.org
-+Index: net-tools/man/en_US/nameif.8
-+===================================================================
-+--- net-tools.orig/man/en_US/nameif.8
-++++ net-tools/man/en_US/nameif.8
-+@@ -1,10 +1,10 @@
-+-.TH NAMEIF 8 "18 Oct 2000" "net-tools" "Linux's Administrator's Manual"
-++.TH NAMEIF 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
-+ .SH NAME
-+ nameif \- name network interfaces based on MAC addresses
-+ .SH SYNOPSIS
-+-.B "nameif [-c configfile] [-s]"
-++.B "nameif [\-c configfile] [\-s]"
-+ .br
-+-.B "nameif [-c configfile] [-s] {interface macaddress}"
-++.B "nameif [\-c configfile] [\-s] {interface macaddress}"
-+ .SH DESCRIPTION
-+ .B nameif 
-+ renames network interfaces based on mac addresses. When no arguments are
-+@@ -18,11 +18,11 @@ looks for the interface with the given M
-+ name given.
-+ 
-+ When the 
-+-.I -s
-++.I \-s
-+ argument is given all error messages go to the syslog.
-+ 
-+ When the 
-+-.I -c 
-++.I \-c 
-+ argument is given with a file name that file is read instead of /etc/mactab.
-+ 
-+ .SH NOTES
-+Index: net-tools/man/en_US/netstat.8
-+===================================================================
-+--- net-tools.orig/man/en_US/netstat.8
-++++ net-tools/man/en_US/netstat.8
-+@@ -8,7 +8,7 @@
-+ .\" Modified: Tuan Hoang tqhoang@bigfoot.com 
-+ .\"
-+ .\"
-+-.TH NETSTAT 8 "19 December 2000" "net-tools" "Linux Programmer's Manual"
-++.TH NETSTAT 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
-+ 
-+ .SH NAME
-+ netstat \- Print network connections, routing tables, interface statistics, masquerade connections, and multicast memberships
-+@@ -23,7 +23,7 @@ netstat \- Print network connections, ro
-+ .RB [ \-\-listening | \-l ]
-+ .RB [ \-\-all | \-a ]
-+ .RB [ \-\-numeric | \-n ]
-+-.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ]
-++.RB [ \-\-numeric\-hosts "] [" \-\-numeric\-ports "] [" \-\-numeric\-users ]
-+ .RB [ \-\-symbolic | \-N ]
-+ .RB [ \-\-extend | \-e  [ \-\-extend | \-e] ]
-+ .RB [ \-\-timers | \-o ]
-+@@ -37,31 +37,30 @@ netstat \- Print network connections, ro
-+ .RB [ \-\-extend | \-e  [ \-\-extend | \-e] ]
-+ .RB [ \-\-verbose | \-v ]
-+ .RB [ \-\-numeric | \-n ]
-+-.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ]
-++.RB [ \-\-numeric\-hosts "] [" \-\-numeric\-ports "] [" \-\-numeric\-users ]
-+ .RB [ \-\-continuous | \-c]
-+ .P
-+ .B netstat
-+ .RB { \-\-interfaces | \-i }
-+-.RI [ iface ]
-+ .RB [ \-\-all | \-a ]
-+ .RB [ \-\-extend | \-e  [ \-\-extend | \-e] ]
-+ .RB [ \-\-verbose | \-v ]
-+ .RB [ \-\-program | \-p ]
-+ .RB [ \-\-numeric | \-n ]
-+-.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ]
-++.RB [ \-\-numeric-hosts "] [" \-\-numeric-ports "] [" \-\-numeric-users ]
-+ .RB [ \-\-continuous | \-c]
-+ .P
-+ .B netstat
-+ .RB { \-\-groups | \-g }
-+ .RB [ \-\-numeric | \-n ]
-+-.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ]
-++.RB [ \-\-numeric\-hosts "] [" \-\-numeric\-ports "] [" \-\-numeric\-users ]
-+ .RB [ \-\-continuous | \-c]
-+ .P
-+ .B netstat
-+ .RB { \-\-masquerade | \-M }
-+ .RB [ \-\-extend | \-e ]
-+ .RB [ \-\-numeric | \-n ]
-+-.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ]
-++.RB [ \-\-numeric\-hosts "] [" \-\-numeric\-ports "] [" \-\-numeric\-users ]
-+ .RB [ \-\-continuous | \-c]
-+ .P
-+ .B netstat
-+@@ -78,6 +77,8 @@ netstat \- Print network connections, ro
-+ .P
-+ .IR address_family_options :
-+ .PP
-++.RB [ -4 ]
-++.RB [ -6 ]
-+ .RB [ \-\-protocol= { inet , unix , ipx , ax25 , netrom , ddp }[, ...] ]
-+ .RB [ \-\-unix | \-x ] 
-+ .RB [ \-\-inet | \-\-ip ]
-+@@ -98,12 +99,17 @@ displays a list of open sockets.  If you
-+ address families, then the active sockets of all configured address
-+ families will be printed.
-+ .SS "\-\-route , \-r"
-+-Display the kernel routing tables.
-++Display the kernel routing tables. See the description in 
-++.BR route (8) 
-++for details. 
-++.B netstat -r 
-++and 
-++.B route -e 
-++produce the same output.
-+ .SS "\-\-groups , \-g"
-+ Display multicast group membership information for IPv4 and IPv6.
-+-.SS "\-\-interface=\fIiface \fR, \fB\-i"
-+-Display a table of all network interfaces, or the specified
-+-.IR iface ) .
-++.SS "\-\-interfaces, \-i"
-++Display a table of all network interfaces.
-+ .SS "\-\-masquerade , \-M"
-+ Display a list of masqueraded connections.
-+ .SS "\-\-statistics , \-s"
-+@@ -115,13 +121,13 @@ useful information about unconfigured ad
-+ .SS "\-\-numeric , \-n"
-+ Show numerical addresses instead of trying to determine symbolic host, port
-+ or user names.
-+-.SS "\-\-numeric-hosts"
-++.SS "\-\-numeric\-hosts"
-+ shows numerical host addresses but does not affect the resolution of
-+ port or user names.
-+-.SS "\-\-numeric-ports"
-++.SS "\-\-numeric\-ports"
-+ shows numerical port numbers but does not affect the resolution of
-+ host or user names.
-+-.SS "\-\-numeric-users"
-++.SS "\-\-numeric\-users"
-+ shows numerical user IDs but does not affect the resolution of host or
-+ port names.
-+ 
-+@@ -164,23 +170,24 @@ Show the PID and name of the program to 
-+ Show only listening sockets.  (These are omitted by default.)
-+ .SS "\-a, \-\-all"
-+ Show both listening and non-listening sockets.  With the
-+-.B --interfaces
-+-option, show interfaces that are not marked 
-++.B \-\-interfaces
-++option, show interfaces that are not up
-+ .SS "\-F"
-+ Print routing information from the FIB.  (This is the default.)
-+ .SS "\-C"
-+ Print routing information from the route cache.
-+-.IR UP .
-+ .P
-+ .SH OUTPUT
-+ .P
-+ .SS Active Internet connections \fR(TCP, UDP, raw)\fR
-+ .SS "Proto" 
-+ The protocol (tcp, udp, raw) used by the socket. 
-+-.SS "Recv-Q"
-+-The count of bytes not copied by the user program connected to this socket.
-+-.SS "Send-Q"
-+-The count of bytes not acknowledged by the remote host.
-++.SS "Recv\-Q"
-++Established: The count of bytes not copied by the user program connected to this socket.
-++Listening: Since Kernel 2.6.18 this column contains the current syn backlog.
-++.SS "Send\-Q"
-++Established: The count of bytes not acknowledged by the remote host.
-++Listening: Since Kernel 2.6.18 this column contains the maximum size of the syn backlog.
-+ .SS "Local Address" 
-+ Address and port number of the local end of the socket.  Unless the
-+ .BR \-\-numeric " (" \-n )
-+@@ -221,7 +228,7 @@ TIME_WAIT
-+ The socket is waiting after close to handle packets still in the network.
-+ .TP
-+ .I
-+-CLOSED
-++CLOSE
-+ The socket is not being used.
-+ .TP
-+ .I
-+@@ -255,7 +262,7 @@ The username or the user id (UID) of the
-+ .SS "PID/Program name"
-+ Slash-separated pair of the process id (PID) and process name of the 
-+ process that owns the socket.
-+-.B --program
-++.B \-\-program
-+ causes this column to be included.  You will also need
-+ .I superuser
-+ privileges to see this information on sockets you don't own.  This
-+@@ -358,7 +365,7 @@ to the socket.
-+ .PP
-+ .SH NOTES
-+ Starting with Linux release 2.2 
-+-.B netstat -i 
-++.B netstat \-i 
-+ does not show interface statistics for alias interfaces. To get per
-+ alias interface counters you need to setup explicit rules using the
-+ .BR ipchains(8) 
-+@@ -438,12 +445,12 @@ as it is viewed. This is unlikely to occ
-+ .P
-+ .SH AUTHORS
-+ The netstat user interface was written by Fred Baumgarten
-+-<dc6iq@insu1.etec.uni-karlsruhe.de> the man page basically
-++<dc6iq@insu1.etec.uni\-karlsruhe.de>, the man page basically
-+ by Matt Welsh <mdw@tc.cornell.edu>. It was updated by
-+ Alan Cox <Alan.Cox@linux.org> but could do with a bit more
-+ work.  It was updated again by Tuan Hoang
-+ <tqhoang@bigfoot.com>.
-+ .br
-+-The man page and the command included in the net-tools
-++The man page and the command included in the net\-tools
-+ package is totally rewritten by Bernd Eckenfels 
-+ <ecki@linux.de>.
-+Index: net-tools/man/en_US/plipconfig.8
-+===================================================================
-+--- net-tools.orig/man/en_US/plipconfig.8
-++++ net-tools/man/en_US/plipconfig.8
-+@@ -1,4 +1,4 @@
-+-.TH PLIPCONFIG 8 "17 February 1995" "" ""
-++.TH PLIPCONFIG 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
-+ .SH NAME
-+ plipconfig \- fine tune PLIP device parameters 
-+ .SH SYNOPSIS
-+Index: net-tools/man/en_US/rarp.8
-+===================================================================
-+--- net-tools.orig/man/en_US/rarp.8
-++++ net-tools/man/en_US/rarp.8
-+@@ -1,20 +1,20 @@
-+-.TH RARP 8 "4 August 1997" "net-tools" "Linux Programmer's Manual"
-++.TH RARP 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
-+ .SH NAME
-+ rarp \- manipulate the system RARP table
-+ .SH SYNOPSIS
-+-.B "rarp [-V] [--version] [-h] [--help]"
-++.B "rarp [\-V] [\-\-version] [\-h] [\-\-help]"
-+ .br
-+-.B "rarp -a"
-++.B "rarp \-a"
-+ .br
-+-.B "rarp [-v] -d hostname ..."
-++.B "rarp [\-v] \-d hostname ..."
-+ .br
-+-.B "rarp [-v] [-t type] -s hostname hw_addr"
-++.B "rarp [\-v] [\-t type] \-s hostname hw_addr"
-+ .SH NOTE
-+ .P
-+ This program is obsolete.  From version 2.3, the Linux kernel 
-+ no longer contains RARP support.  For a replacement RARP daemon, see
-+ .I
-+-ftp://ftp.dementia.org/pub/net-tools
-++ftp://ftp.dementia.org/pub/net\-tools
-+ .SH DESCRIPTION
-+ .B Rarp
-+ manipulates the kernel's RARP table in various ways.  The primary options
-+@@ -61,8 +61,8 @@ Remove all RARP entries for the specifie
-+ Create a RARP address mapping entry for host
-+ .B hostname
-+ with hardware address set to
-+-.B hw_addr
-+-.  The format of the hardware address is dependent on the hardware
-++.BR hw_addr .
-++The format of the hardware address is dependent on the hardware
-+ class, but for most classes one can assume that the usual presentation
-+ can be used.  For the Ethernet class, this is 6 bytes in hexadecimal,
-+ separated by colons.
-+Index: net-tools/man/en_US/route.8
-+===================================================================
-+--- net-tools.orig/man/en_US/route.8
-++++ net-tools/man/en_US/route.8
-+@@ -1,4 +1,4 @@
-+-.TH ROUTE 8 "2 January 2000" "net-tools" "Linux Programmer's Manual"
-++.TH ROUTE 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
-+ .SH NAME
-+ route \- show / manipulate the IP routing table
-+ .SH SYNOPSIS
-+@@ -51,7 +51,7 @@ If]
-+ .RB [ \-V ] 
-+ .RB [ \-\-version ]
-+ .RB [ \-h ]
-+-.RB [ \--help ]
-++.RB [ \-\-help ]
-+ .SH DESCRIPTION
-+ .B Route
-+ manipulates the kernel's IP routing tables.  Its primary use is to set
-+@@ -73,16 +73,16 @@ displays the current contents of the rou
-+ .SH OPTIONS
-+ .TP
-+ .B \-A family
-+-use the specified address family (eg `inet'; use `route --help' for a full 
-++use the specified address family (eg `inet'; use `route \-\-help' for a full 
-+ list).
-+ 
-+ .TP 
-+-.B -F
-++.B \-F
-+ operate on the kernel's FIB (Forwarding Information Base) routing
-+ table. 
-+ This is the default.
-+ .TP 
-+-.B -C
-++.B \-C
-+ operate on the kernel's routing cache.
-+ 
-+ .TP
-+@@ -96,7 +96,7 @@ nameserver has vanished.
-+ .TP
-+ .B \-e
-+ use
-+-.BR netstat (8)-format
-++.BR netstat (8)\-format
-+ for displaying the routing table.
-+ .B \-ee 
-+ will generate a very long line with all parameters from the routing table.
-+@@ -117,7 +117,7 @@ the
-+ .B target
-+ is a network.
-+ .TP
-+-.B -host
-++.B \-host
-+ the
-+ .B target 
-+ is a host.
-+@@ -141,7 +141,7 @@ set the metric field in the routing tabl
-+ set the TCP Maximum Segment Size (MSS) for connections over this route
-+ to M bytes. 
-+ The default is the device MTU minus headers, or a lower MTU when path mtu 
-+-discovery occured. This setting can be used to force smaller TCP packets on the
-++discovery occurred. This setting can be used to force smaller TCP packets on the
-+ other end when path mtu discovery does not work (usually because of
-+ misconfigured firewalls that block ICMP Fragmentation Needed)
-+ .TP 
-+@@ -179,24 +179,27 @@ modifiers (metric - netmask - gw - dev) 
-+ 
-+ .SH EXAMPLES
-+ .TP
-+-.B route add -net 127.0.0.0
-+-adds the normal loopback entry, using netmask 255.0.0.0 (class A net,
-+-determined from the destination address) and associated with the 
-+-"lo" device (assuming this device was prviously set up correctly with
-++.B route add \-net 127.0.0.0 netmask 255.0.0.0 dev lo
-++adds the normal loopback entry, using netmask 255.0.0.0 and associated with the 
-++"lo" device (assuming this device was previously set up correctly with
-+ .BR ifconfig (8)). 
-+ 
-+ .TP 
-+-.B route add -net 192.56.76.0 netmask 255.255.255.0 dev eth0
-+-adds a route to the network 192.56.76.x via 
-+-"eth0". The Class C netmask modifier is not really necessary here because
-+-192.* is a Class C IP address. The word "dev" can be omitted here. 
-++.B route add \-net 192.56.76.0 netmask 255.255.255.0 dev eth0
-++adds a route to the local network 192.56.76.x via 
-++"eth0".  The word "dev" can be omitted here. 
-+ 
-+ .TP
-+-.B route add default gw mango-gw
-++.B route del default
-++deletes the current default route, which is labeled "default" or 0.0.0.0
-++in the destination field of the current routing table.
-++
-++.TP
-++.B route add default gw mango\-gw
-+ adds a default route (which will be used if no other route matches).
-+-All packets using this route will be gatewayed through "mango-gw". The
-++All packets using this route will be gatewayed through "mango\-gw". The
-+ device which will actually be used for that route depends on how we
-+-can reach "mango-gw" - the static route to "mango-gw" will have to be
-++can reach "mango\-gw" - the static route to "mango\-gw" will have to be
-+ set up before. 
-+ 
-+ .TP
-+@@ -205,18 +208,18 @@ Adds the route to the "ipx4" host via th
-+ "ipx4" is the SLIP host).
-+ 
-+ .TP
-+-.B route add -net 192.57.66.0 netmask 255.255.255.0 gw ipx4
-++.B route add \-net 192.57.66.0 netmask 255.255.255.0 gw ipx4
-+ This command adds the net "192.57.66.x" to be gatewayed through the former
-+ route to the SLIP interface.
-+ 
-+ .TP
-+-.B route add -net 224.0.0.0 netmask 240.0.0.0 dev eth0
-++.B route add \-net 224.0.0.0 netmask 240.0.0.0 dev eth0
-+ This is an obscure one documented so people know how to do it. This sets
-+ all of the class D (multicast) IP routes to go via "eth0". This is the
-+ correct normal configuration line with a multicasting kernel. 
-+ 
-+ .TP
-+-.B route add -net 10.0.0.0 netmask 255.0.0.0 reject
-++.B route add \-net 10.0.0.0 netmask 255.0.0.0 reject
-+ This installs a rejecting route for the private network "10.x.x.x."
-+ 
-+ .LP
-+@@ -282,14 +285,14 @@ recent kernels, but may be needed by rou
-+ Number of references to this route. (Not used in the Linux kernel.)
-+ .TP
-+ .B Use
-+-Count of lookups for the route.  Depending on the use of -F and -C this will
-+-be either route cache misses (-F) or hits (-C).
-++Count of lookups for the route.  Depending on the use of \-F and \-C this will
-++be either route cache misses (\-F) or hits (\-C).
-+ .TP
-+ .B Iface
-+ Interface to which packets for this route will be sent.
-+ .TP
-+ .B MSS 
-+-Default maximum segement size for TCP connections over this route.
-++Default maximum segment size for TCP connections over this route.
-+ .TP
-+ .B Window  
-+ Default window size for TCP connections over this route.
-+@@ -323,4 +326,4 @@ for Linux was originally written by Fred
-+ Linus Torvalds for pl15. Alan Cox added the mss and window options for
-+ Linux 1.1.22. irtt support and merged with netstat from Bernd Eckenfels.
-+ .SH AUTHOR
-+-Currently maintained by Phil Blundell <Philip.Blundell@pobox.com>.
-++Currently maintained by Phil Blundell <Philip.Blundell@pobox.com> and Bernd Eckenfels <net-tools@lina.inka.de>.
-+Index: net-tools/man/en_US/slattach.8
-+===================================================================
-+--- net-tools.orig/man/en_US/slattach.8
-++++ net-tools/man/en_US/slattach.8
-+@@ -1,8 +1,8 @@
-+-.TH SLATTACH 8 "12 Feb 1994" "" ""
-++.TH SLATTACH 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
-+ .SH NAME
-+ slattach \- attach a network interface to a serial line
-+ .SH SYNOPSIS
-+-.B "slattach [-dehlLmnqv] [-c command] [-p proto] [-s speed] [tty]"
-++.B "slattach [\-dehlLmnqv] [\-c command] [\-p proto] [\-s speed] [tty]"
-+ .br
-+ .SH DESCRIPTION
-+ .B Slattach
-+@@ -11,47 +11,48 @@ is a tiny little program that can be use
-+ you to use it for point-to-point links to other computers.
-+ .SH OPTIONS
-+ .TP
-+-.B "[-c command]"
-++.B "[\-c command]"
-+ Execute
-+ .B command
-+ when the line is hung up. This can be used to run scripts or re-establish
-+ connections when a link goes down.
-+ .TP
-+-.B "[-d]"
-++.B "[\-d]"
-+ Enable debugging output.  Useful when determining why a given
-+ setup doesn't work.
-+ .TP
-+-.B "[-h]"
-++.B "[\-h]"
-+ Exit when the carrier is lost. This works on both /dev/tty and /dev/cua
-+ devices by directly monitoring the carrier status every 15 seconds.
-+-.B "[-v]"
-++.TP
-++.B "[\-v]"
-+ Enable verbose output.  Useful in shell scripts.
-+ .TP
-+-.B "[-q]"
-++.B "[\-q]"
-+ Operate in quiet mode - no messages at all.
-+ .TP
-+-.B "[-l]"
-++.B "[\-l]"
-+ Create an UUCP-style lockfile for the device in /var/lock.
-+ .TP
-+-.B "[-n]"
-++.B "[\-n]"
-+ Equivalent to the "mesg n" command.
-+ .TP
-+-.B "[-m]"
-++.B "[\-m]"
-+ Do \fBnot\fP initialize the line into 8 bits raw mode.
-+ .TP
-+-.B "[-e]"
-++.B "[\-e]"
-+ Exit right after initializing device, instead of waiting for the
-+-line to hangup.
-++line to hang up.
-+ .TP
-+-.B "[-L]"
-++.B "[\-L]"
-+ Enable 3 wire operation. The terminal is moved into CLOCAL mode, 
-+ carrier watching is disabled.
-+ .TP
-+-.B "[-p proto]"
-++.B "[\-p proto]"
-+ Set a specific kind of protocol to use on the line.  The default
-+ is set to
-+-.B "cslip"
-+-, i.e. compressed SLIP.  Other possible values are
-++.BR "cslip" ,
-++i.e. compressed SLIP.  Other possible values are
-+ .B "slip"
-+ (normal SLIP), 
-+ .B "adaptive"
-+@@ -70,7 +71,7 @@ to be active on the line. For kiss conne
-+ .B axattach
-+ program should be used.
-+ .TP
-+-.B "[-s speed]"
-++.B "[\-s speed]"
-+ Set a specific line speed, other than the default.
-+ .PP
-+ If no arguments are given, the current terminal line (usually: the
-+Index: net-tools/man/fr_FR/arp.8
-+===================================================================
-+--- net-tools.orig/man/fr_FR/arp.8
-++++ net-tools/man/fr_FR/arp.8
-+@@ -140,8 +140,8 @@ pour un sous r�seau entier.
-+ Similaire � l'option 
-+ .B \-s
-+ , mais cette fois les informations d'adresses sont prises dans le fichier
-+-.B nom_de_fichier
-+-. Ceci peut �tre utilis� si les entr�es ARP � configurer sont
-++.BR nom_de_fichier .
-++Ceci peut �tre utilis� si les entr�es ARP � configurer sont
-+ nombreuses.  Le nom du fichier de donn�es est tr�s souvent nomm�
-+ .B /etc/ethers
-+ , mais ce n'est pas officiel.
-+@@ -160,8 +160,8 @@ en notation d�cimale point�e.
-+ .LP
-+ Chaque entr�e compl�te se trouvant dans le cache ARP est marqu�e de
-+ l'indicateur
-+-.B C
-+-. Les entr�es permanentes sont marqu�es de l'indicateur
-++.BR C .
-++Les entr�es permanentes sont marqu�es de l'indicateur
-+ .B M
-+ et les entr�es 'pub' ont l'indicateur
-+ .B P
-+Index: net-tools/man/fr_FR/hostname.1
-+===================================================================
-+--- net-tools.orig/man/fr_FR/hostname.1
-++++ net-tools/man/fr_FR/hostname.1
-+@@ -84,8 +84,8 @@ Appel� sans argument, le programme affic
-+ .LP
-+ .B hostname
-+ fournit le nom du syst�me tel qu'il est retourn� par la fonction
-+-.BR getdomainname (2)
-+-. Ceci est connu comme nom de domaine YP/NIS du syst�me.
-++.BR getdomainname (2).
-++Ceci est connu comme nom de domaine YP/NIS du syst�me.
-+ 
-+ 
-+ .LP
-+@@ -145,8 +145,8 @@ Le nom de domaine DNS est la partie suiv
-+ .LP
-+ La fa�on dont vous pouvez le changer d�pend de la configuration
-+ (habituellement dans 
-+-.IR /etc/host.conf )
-+-. Si le fichier 'hosts' est analys� avant d'interroger le DNS ou 
-++.IR /etc/host.conf ).
-++Si le fichier 'hosts' est analys� avant d'interroger le DNS ou 
-+ NIS) vous pouvez le changer dans le fichier 
-+ .IR /etc/hosts .
-+ 
-+Index: net-tools/man/fr_FR/ifconfig.8
-+===================================================================
-+--- net-tools.orig/man/fr_FR/ifconfig.8
-++++ net-tools/man/fr_FR/ifconfig.8
-+@@ -60,14 +60,14 @@ le signe moins (\-) est pr�sent, l'optio
-+ .TP
-+ .B "[\-]promisc"
-+ Valide ou invalide le mode
-+-.B promiscuous
-+-.  S'il est valid�, tous les paquets circulant sur le r�seau
-++.BR promiscuous .
-++S'il est valid�, tous les paquets circulant sur le r�seau
-+ seront re�us sur cette interface.
-+ .TP
-+ .B "[\-]allmulti"
-+ Valide ou invalide le fonctionnement de l'interface en mode
-+-.B all-multicast
-+-.  S'il est valid�, tous les paquets multicast circulant sur le r�seau
-++.BR all-multicast .
-++S'il est valid�, tous les paquets multicast circulant sur le r�seau
-+ seront re�us sur cette interface.
-+ .TP
-+ .B "metric N"
-+Index: net-tools/man/fr_FR/netstat.8
-+===================================================================
-+--- net-tools.orig/man/fr_FR/netstat.8
-++++ net-tools/man/fr_FR/netstat.8
-+@@ -8,7 +8,7 @@
-+ .\" Modified: Tuan Hoang tuan@optimus.mitre.org 
-+ .\"
-+ .\"
-+-.TH NETSTAT 8 "25 F�v 1999" "net-tools" "Linux Programmer's Manual"
-++.TH NETSTAT 8 "2007-12-02" "net-tools" "Linux Programmer's Manual"
-+ 
-+ .SH NAME
-+ netstat \- Affiche les connexions r�seau, les tables de routage, les
-+@@ -106,7 +106,7 @@ Veuillez consulter
-+ .BR route (8)
-+ pour plus de d�tails.
-+ 
-+-.SS "\-i, \-\-interface \fIiface\fI"
-++.SS "\-i, \-\-interfaces \fIiface\fI"
-+ Si vous utilisez l'option
-+ .BR -i ", " --interfaces
-+ , une table de toutes (ou de l'interface
-+@@ -118,8 +118,8 @@ m�me que celui de la commande
-+ .BR ifconfig (8).
-+ .B "netstat -ei"
-+ affiche une table ou une seule entr�e d'interface comme la commande 
-+-.B ifconfig
-+-. Avec le param�tre
-++.BR ifconfig .
-++Avec le param�tre
-+ .B -a
-+ , vous pouvez inclure les interfaces qui ne sont pas configur�es (c.a.d qui
-+ n'ont pas l'indicateur
-+@@ -249,7 +249,7 @@ La socket attend le traitement de tous l
-+ avant d'entreprendre la fermeture.
-+ .TP
-+ .I
-+-CLOSED
-++CLOSE
-+ La socket n'est pas utilis�e.
-+ .TP
-+ .I
-+@@ -409,8 +409,7 @@ Affiche le chemin correspondant � l'atta
-+ Depuis la version 2.2 du noyau, netstat -i n'affiche plus les statistiques
-+ des interfaces alias. Pour obtenir les compteurs par interface alias, vous
-+ devez d�finir des r�gles sp�cifiques � l'aide de la commande
-+-.BR ipchains(8) 
-+-.  
-++.BR ipchains (8).
-+ 
-+ .SH FICHIERS
-+ .ta
-+Index: net-tools/man/fr_FR/rarp.8
-+===================================================================
-+--- net-tools.orig/man/fr_FR/rarp.8
-++++ net-tools/man/fr_FR/rarp.8
-+@@ -55,8 +55,8 @@ Supprime toutes les entr�es RARP relativ
-+ Cr�e manuellement une correspondance d'adresses RARP pour l'h�te
-+ .B nom_d_h�te
-+ avec l'adresse mat�rielle
-+-.B adr_materielle
-+-. Le format de l'adresse mat�rielle est d�pendant du mat�riel,
-++.BR adr_materielle .
-++Le format de l'adresse mat�rielle est d�pendant du mat�riel,
-+ mais pour la plupart on peut consid�rer que la pr�sentation classique
-+ peut �tre utilis�e.  Pour la classe Ethernet, c'est 6 octets en hexad�cimal,
-+ s�par�s par des double-points.
-+Index: net-tools/man/pt_BR/netstat.8
-+===================================================================
-+--- net-tools.orig/man/pt_BR/netstat.8
-++++ net-tools/man/pt_BR/netstat.8
-+@@ -8,7 +8,7 @@
-+ .\" Traduzido para portugu�s por Arnaldo Carvalho de Melo <acme@conectiva.com.br>
-+ .\" Revisado por Jorge Luiz Godoy Filho <jorge@bestway.com.br>
-+ .\"
-+-.TH NETSTAT 8 "19 de maio de 1997" "net-tools" "Manual do Programador Linux"
-++.TH NETSTAT 8 "2007-12-02" "net-tools" "Manual do Programador Linux"
-+ 
-+ .SH NOME
-+ netstat \- Mostra conex�es de rede, tabelas de roteamento, estat�sticas de interface e conex�es
-+@@ -97,7 +97,7 @@ Por favor veja
-+ .BR route (8)
-+ para maiores detalhes.
-+ 
-+-.SS "\-i, \-\-interface \fIiface\fI"
-++.SS "\-i, \-\-interfaces \fIiface\fI"
-+ Se voc� usar a op��o
-+ .BR -i ", " --interfaces
-+ , uma tabela de todas (ou da
-+Index: net-tools/man/pt_BR/rarp.8
-+===================================================================
-+--- net-tools.orig/man/pt_BR/rarp.8
-++++ net-tools/man/pt_BR/rarp.8
-+@@ -50,8 +50,8 @@ m�quina indicada for desligada, por exem
-+ Cria um mapeamento de endere�os RARP para a m�quina
-+ .B m�quina
-+ com endere�o de hardware configurado para
-+-.B endere�o_hardware
-+-.  O formato do endere�o de hardware depende da classe do hardware, mas
-++.B endere�o_hardware.
-++O formato do endere�o de hardware depende da classe do hardware, mas
-+ para a maioria das classes voc� pode assumir que a apresenta��o usual pode
-+ ser usada.  Para a classe Ethernet, s�o 6 bytes em hexadecimal, separados
-+ por dois pontos (:).
---- net-tools-1.60.orig/debian/patches/translations.patch
-+++ net-tools-1.60/debian/patches/translations.patch
-@@ -0,0 +1,24458 @@
-+Probably unsyncable changes, extracted from diff.gz
-+
-+Index: net-tools/po/pt_BR.po
-+===================================================================
-+--- net-tools.orig/po/pt_BR.po
-++++ net-tools/po/pt_BR.po
-+@@ -10,275 +10,287 @@
-+ msgid ""
-+ msgstr ""
-+ "Project-Id-Version: net-tools 1.54\n"
-+-"POT-Creation-Date: 2000-02-14 02:31+0100\n"
-++"Report-Msgid-Bugs-To: \n"
-++"POT-Creation-Date: 2007-06-30 12:28+0900\n"
-+ "PO-Revision-Date: 1999-03-01 02:38+0100\n"
-+ "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
-+ "MIME-Version: 1.0\n"
-+-"Content-Type: text/plain; charset=ISO8859-9\n"
-++"Content-Type: text/plain; charset=ISO-8859-9\n"
-+ "Content-Transfer-Encoding: 8bit\n"
-+ 
-+-#: ../arp.c:110 ../arp.c:269
-++#: ../arp.c:112 ../arp.c:279
-++#, c-format
-+ msgid "arp: need host name\n"
-+ msgstr "arp: preciso do nome da m�quina\n"
-+ 
-+-#: ../arp.c:207 ../arp.c:221
-++#: ../arp.c:215 ../arp.c:230
-+ #, c-format
-+ msgid "No ARP entry for %s\n"
-+ msgstr "Nenhuma entrada ARP para %s\n"
-+ 
-+-#: ../arp.c:239
-++#: ../arp.c:248
-+ #, c-format
-+ msgid "arp: cant get HW-Address for `%s': %s.\n"
-+ msgstr "arp: n�o foi poss�vel obter o endere�o de hardware para `%s': %s.\n"
-+ 
-+-#: ../arp.c:243
-++#: ../arp.c:252
-++#, c-format
-+ msgid "arp: protocol type mismatch.\n"
-+ msgstr "arp: erro no tipo do protocolo.\n"
-+ 
-+-#: ../arp.c:252
-++#: ../arp.c:261
-+ #, c-format
-+ msgid "arp: device `%s' has HW address %s `%s'.\n"
-+ msgstr "arp: o dispositivo `%s' tem endere�o de hardware %s `%s'.\n"
-+ 
-+-#: ../arp.c:282
-++#: ../arp.c:293
-++#, c-format
-+ msgid "arp: need hardware address\n"
-+ msgstr "arp: preciso do endere�o de hardware\n"
-+ 
-+-#: ../arp.c:290
-++#: ../arp.c:301
-++#, c-format
-+ msgid "arp: invalid hardware address\n"
-+ msgstr "arp: endere�o inv�lido de hardware\n"
-+ 
-+-#: ../arp.c:387
-++#: ../arp.c:398
-+ #, c-format
-+ msgid "arp: cannot open etherfile %s !\n"
-+ msgstr "arp: n�o foi poss�vel abrir o arquivo etherfile %s!\n"
-+ 
-+-#: ../arp.c:403
-++#: ../arp.c:414
-+ #, c-format
-+ msgid "arp: format error on line %u of etherfile %s !\n"
-+ msgstr "arp: erro de formato na linha %u do arquivo etherfile %s!\n"
-+ 
-+-#: ../arp.c:416
-++#: ../arp.c:427
-+ #, c-format
-+ msgid "arp: cannot set entry on line %u of etherfile %s !\n"
-+ msgstr "arp: n�o foi poss�vel configurar a linha %u do arquivo etherfile %s!\n"
-+ 
-+-#: ../arp.c:437
-+-msgid "Address\t\t\tHWtype\tHWaddress\t    Flags Mask\t\t  Iface\n"
-++#: ../arp.c:448
-++#, fuzzy, c-format
-++msgid ""
-++"Address                  HWtype  HWaddress           Flags Mask            "
-++"Iface\n"
-+ msgstr "Endere�o\t\tTipoHW\tEndere�oHW\t Flags Mascara\t\t Iface\n"
-+ 
-+-#: ../arp.c:467
-++#: ../arp.c:476
-++#, fuzzy
-++msgid "<from_interface>"
-++msgstr "%s: interface desconhecida.\n"
-++
-++#: ../arp.c:478
-+ msgid "(incomplete)"
-+ msgstr "(incompleto)"
-+ 
-+-#: ../arp.c:484
-++#: ../arp.c:495
-+ #, c-format
-+ msgid "%s (%s) at "
-+ msgstr "%s (%s) em "
-+ 
-+-#: ../arp.c:490
-++#: ../arp.c:501
-++#, c-format
-+ msgid "<incomplete> "
-+ msgstr "<incompleto> "
-+ 
-+-#: ../arp.c:496
-++#: ../arp.c:507
-+ #, c-format
-+ msgid "netmask %s "
-+ msgstr "mascara %s "
-+ 
-+-#: ../arp.c:513
-++#: ../arp.c:524
-+ #, c-format
-+ msgid "on %s\n"
-+ msgstr "em %s\n"
-+ 
-+-#: ../arp.c:592
-++#: ../arp.c:605
-+ #, c-format
-+ msgid "Entries: %d\tSkipped: %d\tFound: %d\n"
-+ msgstr "Entradas: %d\tIgnorada: %d\tEncontrada: %d\n"
-+ 
-+-#: ../arp.c:596
-++#: ../arp.c:609
-+ #, c-format
-+ msgid "%s (%s) -- no entry\n"
-+ msgstr "%s (%s) -- nenhuma entrada\n"
-+ 
-+-#: ../arp.c:598
-++#: ../arp.c:611
-+ #, c-format
-+ msgid "arp: in %d entries no match found.\n"
-+ msgstr "arp: em %d entradas n�o foi encontrado.\n"
-+ 
-+-#: ../arp.c:613
-++#: ../arp.c:626
-++#, c-format
-+ msgid ""
-+ "Usage:\n"
-+ "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP "
-+ "cache\n"
-+ msgstr ""
-+ "Uso:\n"
-+-"  arp [-vn]  [<HW>] [-i <if>] [-a] [<m�quina>]             <-Mostra cache "
-+-"ARP\n"
-++"  arp [-vn]  [<HW>] [-i <if>] [-a] [<m�quina>]             <-Mostra cache ARP\n"
-+ 
-+-#: ../arp.c:614
-++#: ../arp.c:627
-++#, fuzzy, c-format
-+ msgid ""
-+-"  arp [-v]          [-i <if>] -d  <hostname> [pub][nopub]    <-Delete ARP "
-++"  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP "
-+ "entry\n"
-+-msgstr ""
-+-"  arp [-v]          [-i <if>] -d  <m�quina>  [pub][nopub]  <-Remove entrada "
-+-"ARP\n"
-++msgstr "  arp [-v]          [-i <if>] -d  <m�quina>  [pub][nopub]  <-Remove entrada ARP\n"
-+ 
-+-#: ../arp.c:615
-++#: ../arp.c:628
-++#, fuzzy, c-format
-+ msgid ""
-+-"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]              <-Add entry from "
-++"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from "
-+ "file\n"
-+ msgstr ""
-+ "  arp [-vnD] [<HW>] [-i <if>] -f  [<arquivo>]         <-Inclui entrada de "
-+ "arquivo\n"
-+ 
-+-#: ../arp.c:616
-++#: ../arp.c:629
-++#, fuzzy, c-format
-+ msgid ""
-+-"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [temp][nopub] <-Add "
-++"  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add "
-+ "entry\n"
-+-msgstr ""
-+-"  arp [-v] [<HW>] [-i <if>] -s <m�quina> <end_hw> [temp][nopub] <-Inc. "
-+-"Entrada\n"
-+-
-+-#: ../arp.c:617
-+-msgid ""
-+-"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
-+-"<-''-\n"
-+-msgstr ""
-+-"  arp [-v]   [<HW>] [-i <if>] -s  <m�quina> <end_hw>  [netmask <nm>] pub  "
-+-"<-''-\n"
-++msgstr "  arp [-v] [<HW>] [-i <if>] -s <m�quina> <end_hw> [temp][nopub] <-Inc. Entrada\n"
-+ 
-+-#: ../arp.c:618
-++#: ../arp.c:630
-++#, fuzzy, c-format
-+ msgid ""
-+-"  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub      "
-++"  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          "
-+ "<-''-\n"
-+ "\n"
-+-msgstr ""
-+-"  arp [-v]   [<HW>] [-i <if>] -Ds <m�quina>  <if> [netmask <nm>] pub      "
-+-"<-''-\n"
-++msgstr "  arp [-v]   [<HW>] [-i <if>] -Ds <m�quina>  <if> [netmask <nm>] pub      <-''-\n"
-+ 
-+-#: ../arp.c:620
-++#: ../arp.c:632
-++#, c-format
-+ msgid ""
-+ "        -a                       display (all) hosts in alternative (BSD) "
-+ "style\n"
-+-msgstr ""
-+-"        -a               mostra (todas as) m�quinas no estilo alternativo "
-+-"(BSD)\n"
-++msgstr "        -a               mostra (todas as) m�quinas no estilo alternativo (BSD)\n"
-+ 
-+-#: ../arp.c:621
-++#: ../arp.c:633
-++#, c-format
-+ msgid "        -s, --set                set a new ARP entry\n"
-+ msgstr "        -s, --set                define uma nova entrada ARP\n"
-+ 
-+-#: ../arp.c:622
-++#: ../arp.c:634
-++#, c-format
-+ msgid "        -d, --delete             delete a specified entry\n"
-+ msgstr "        -d, --delete             remove a entrada especificada\n"
-+ 
-+-#: ../arp.c:623 ../netstat.c:1436 ../route.c:85
-++#: ../arp.c:635 ../netstat.c:1503 ../route.c:86
-++#, c-format
-+ msgid "        -v, --verbose            be verbose\n"
-+ msgstr "        -v, --verbose           listagem detalhada\n"
-+ 
-+-#: ../arp.c:624 ../netstat.c:1437 ../route.c:86
-+-msgid "        -n, --numeric            dont resolve names\n"
-++#: ../arp.c:636 ../netstat.c:1504 ../route.c:87
-++#, fuzzy, c-format
-++msgid "        -n, --numeric            don't resolve names\n"
-+ msgstr "        -n, --numeric           n�o resolve nomes\n"
-+ 
-+-#: ../arp.c:625
-++#: ../arp.c:637
-++#, c-format
-+ msgid ""
-+ "        -i, --device             specify network interface (e.g. eth0)\n"
-+ msgstr ""
-+ "        -i, --device             especifica a interface de rede (ex: eth0)\n"
-+ 
-+-#: ../arp.c:626
-++#: ../arp.c:638
-++#, c-format
-+ msgid "        -D, --use-device         read <hwaddr> from given device\n"
-+ msgstr "        -D, --use-device         leia <hwaddr> de um dispositivo\n"
-+ 
-+-#: ../arp.c:627
-++#: ../arp.c:639
-++#, c-format
-+ msgid "        -A, -p, --protocol       specify protocol family\n"
-+ msgstr "        -A, -p, --protocol       especifica a fam�lia de protocolos\n"
-+ 
-+-#: ../arp.c:628
-++#: ../arp.c:640
-++#, c-format
-+ msgid ""
-+-"        -f, --file               read new entries from file or from "
-+-"/etc/ethers\n"
-++"        -f, --file               read new entries from file or from /etc/"
-++"ethers\n"
-+ "\n"
-+ msgstr ""
-+-"        -f, --file             leia novas entradas de arquivo ou de "
-+-"/etc/ethers\n"
-++"        -f, --file             leia novas entradas de arquivo ou de /etc/"
-++"ethers\n"
-+ "\n"
-+ 
-+-#: ../arp.c:630 ../rarp.c:181
-++#: ../arp.c:642 ../rarp.c:182
-+ #, c-format
-+ msgid "  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"
-+-msgstr ""
-+-" <HW>=Use '-H <hw>' para especificar o tipo de endere�o de hw. Default: %s\n"
-++msgstr " <HW>=Use '-H <hw>' para especificar o tipo de endere�o de hw. Default: %s\n"
-+ 
-+-#: ../arp.c:631 ../rarp.c:182
-++#: ../arp.c:643 ../rarp.c:183
-++#, c-format
-+ msgid "  List of possible hardware types (which support ARP):\n"
-+ msgstr "  Lista dos tipos de hardware poss�veis (que suportam ARP):\n"
-+ 
-+-#: ../arp.c:664
-++#: ../arp.c:677 ../arp.c:762
-+ #, c-format
-+ msgid "%s: hardware type not supported!\n"
-+ msgstr "%s: tipo de hardware n�o suportado!\n"
-+ 
-+-#: ../arp.c:668
-++#: ../arp.c:681
-+ #, c-format
-+ msgid "%s: address family not supported!\n"
-+ msgstr "%s: fam�lia de endere�os n�o suportada!\n"
-+ 
-+-#: ../arp.c:703
-++#: ../arp.c:716
-++#, c-format
-+ msgid "arp: -N not yet supported.\n"
-+ msgstr "arp: -N ainda n�o suportada.\n"
-+ 
-+-#: ../arp.c:713
-++#: ../arp.c:726
-+ #, c-format
-+ msgid "arp: %s: unknown address family.\n"
-+ msgstr "arp: %s: fam�lia de endere�os desconhecida.\n"
-+ 
-+-#: ../arp.c:722
-++#: ../arp.c:735
-+ #, c-format
-+ msgid "arp: %s: unknown hardware type.\n"
-+ msgstr "arp: %s: tipo de hardware desconhecido.\n"
-+ 
-+-#: ../arp.c:741
-++#: ../arp.c:754
-+ #, c-format
-+ msgid "arp: %s: kernel only supports 'inet'.\n"
-+ msgstr "arp: %s: kernel somente suporta �net'.\n"
-+ 
-+-#: ../arp.c:746
-++#: ../arp.c:767
-+ #, c-format
-+ msgid "arp: %s: hardware type without ARP support.\n"
-+ msgstr "arp: %s: tipo de hardware sem suporte a ARP.\n"
-+ 
-+-#: ../hostname.c:69
-++#: ../hostname.c:71
-+ #, c-format
-+ msgid "Setting nodename to `%s'\n"
-+ msgstr "Configurando nome do n� como `%s'\n"
-+ 
-+-#: ../hostname.c:74
-++#: ../hostname.c:76
-+ #, c-format
-+ msgid "%s: you must be root to change the node name\n"
-+ msgstr "%s: voc� deve ser root para mudar o nome do n�\n"
-+ 
-+-#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116
-++#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117
-+ #, c-format
-+ msgid "%s: name too long\n"
-+ msgstr "%s: nome muito longo\n"
-+ 
-+-#: ../hostname.c:89
-++#: ../hostname.c:91
-+ #, c-format
-+ msgid "Setting hostname to `%s'\n"
-+ msgstr "Configurando nome da m�quina para `%s'\n"
-+ 
-+-#: ../hostname.c:94
-++#: ../hostname.c:96
-+ #, c-format
-+ msgid "%s: you must be root to change the host name\n"
-+ msgstr "%s: voc� deve ser root para mudar o nome da m�quina\n"
-+ 
-+-#: ../hostname.c:108
-++#: ../hostname.c:109
-+ #, c-format
-+ msgid "Setting domainname to `%s'\n"
-+ msgstr "Configurando nome do dom�nio para `%s'\n"
-+ 
-+-#: ../hostname.c:113
-++#: ../hostname.c:114
-+ #, c-format
-+ msgid "%s: you must be root to change the domain name\n"
-+ msgstr "%s: voc� deve ser root para mudar o nome do dom�nio\n"
-+@@ -303,37 +315,38 @@ msgstr "Resultado: h_aliases=`%s'\n"
-+ msgid "Result: h_addr_list=`%s'\n"
-+ msgstr "Resultado: h_addr_list=`%s'\n"
-+ 
-+-#: ../hostname.c:209
-++#: ../hostname.c:208
-+ #, c-format
-+ msgid "%s: can't open `%s'\n"
-+ msgstr "%s: n�o foi poss�vel abrir `%s'\n"
-+ 
-+-#: ../hostname.c:223
-++#: ../hostname.c:222
-++#, c-format
-+ msgid "Usage: hostname [-v] {hostname|-F file}      set hostname (from file)\n"
-+-msgstr ""
-+-"Uso: hostname [-v] {m�quina|-F arquivo}       configura nome da m�quina (de "
-+-"arquivo)\n"
-++msgstr "Uso: hostname [-v] {m�quina|-F arquivo}       configura nome da m�quina (de arquivo)\n"
-+ 
-+-#: ../hostname.c:224
-++#: ../hostname.c:223
-++#, c-format
-+ msgid ""
-+ "       domainname [-v] {nisdomain|-F file}   set NIS domainname (from file)\n"
-+ msgstr ""
-+ "       domainname [-v] {dom�nio_nis|-F file} configura nome do dom�nio NIS\n"
-+ "                                             (a partir de arquivo)\n"
-+ 
-+-#: ../hostname.c:226
-++#: ../hostname.c:225
-++#, c-format
-+ msgid ""
-+ "       nodename [-v] {nodename|-F file}      set DECnet node name (from "
-+ "file)\n"
-+-msgstr ""
-+-"Uso: hostname [-v] {m�quina|-F arquivo}   configura o nome do n� DECnet (de "
-+-"arquivo)\n"
-++msgstr "Uso: hostname [-v] {m�quina|-F arquivo}   configura o nome do n� DECnet (de arquivo)\n"
-+ 
-+-#: ../hostname.c:228
-++#: ../hostname.c:227
-++#, c-format
-+ msgid "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  display formatted name\n"
-+ msgstr "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  mostra nome formatado\n"
-+ 
-+-#: ../hostname.c:229
-++#: ../hostname.c:228
-++#, c-format
-+ msgid ""
-+ "       hostname [-v]                         display hostname\n"
-+ "\n"
-+@@ -341,7 +354,8 @@ msgstr ""
-+ "     hostname [-v]                            mostra nome da m�quina\n"
-+ "\n"
-+ 
-+-#: ../hostname.c:230
-++#: ../hostname.c:229
-++#, c-format
-+ msgid ""
-+ "       hostname -V|--version|-h|--help       print info and exit\n"
-+ "\n"
-+@@ -349,7 +363,8 @@ msgstr ""
-+ "     hostname -V|--version|-h|--help          mostra informa��es e termina\n"
-+ "\n"
-+ 
-+-#: ../hostname.c:231
-++#: ../hostname.c:230
-++#, c-format
-+ msgid ""
-+ "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
-+ "\n"
-+@@ -357,35 +372,43 @@ msgstr ""
-+ "    dnsdomainname=m�quina -d, {yp,nis,}domainname=hostname -y\n"
-+ "\n"
-+ 
-+-#: ../hostname.c:232
-++#: ../hostname.c:231
-++#, c-format
-+ msgid "    -s, --short           short host name\n"
-+ msgstr "    -s, --short           nome curto da m�quina\n"
-+ 
-+-#: ../hostname.c:233
-++#: ../hostname.c:232
-++#, c-format
-+ msgid "    -a, --alias           alias names\n"
-+ msgstr "    -a, --alias           aliases para a m�quina\n"
-+ 
-+-#: ../hostname.c:234
-++#: ../hostname.c:233
-++#, c-format
-+ msgid "    -i, --ip-address      addresses for the hostname\n"
-+ msgstr "    -i, --ip-address      endere�os da m�quina\n"
-+ 
-+-#: ../hostname.c:235
-++#: ../hostname.c:234
-++#, c-format
-+ msgid "    -f, --fqdn, --long    long host name (FQDN)\n"
-+ msgstr "    -f, --fqdn, --long    nome longo da m�quina (FQDN)\n"
-+ 
-+-#: ../hostname.c:236
-++#: ../hostname.c:235
-++#, c-format
-+ msgid "    -d, --domain          DNS domain name\n"
-+ msgstr "    -d, --domain          nome do dom�nio DNS\n"
-+ 
-+-#: ../hostname.c:237
-++#: ../hostname.c:236
-++#, c-format
-+ msgid "    -y, --yp, --nis       NIS/YP domainname\n"
-+ msgstr "    -y, --yp, --nis       nome do dom�nio NIS/YP\n"
-+ 
-+-#: ../hostname.c:239
-++#: ../hostname.c:238
-++#, c-format
-+ msgid "    -n, --node            DECnet node name\n"
-+ msgstr "    -n, --node            nome do n� DECnet\n"
-+ 
-+-#: ../hostname.c:241
-++#: ../hostname.c:240
-++#, c-format
-+ msgid ""
-+ "    -F, --file            read hostname or NIS domainname from given file\n"
-+ "\n"
-+@@ -393,7 +416,8 @@ msgstr ""
-+ "    -F, --file            leia o nome da m�quina ou dom�nio NIS do arquivo\n"
-+ "\n"
-+ 
-+-#: ../hostname.c:243
-++#: ../hostname.c:242
-++#, c-format
-+ msgid ""
-+ "   This command can read or set the hostname or the NIS domainname. You can\n"
-+ "   also read the DNS domain or the FQDN (fully qualified domain name).\n"
-+@@ -413,15 +437,16 @@ msgid "%s: You can't change the DNS doma
-+ msgstr "%s: Voc� n�o pode mudar o nome do dom�nio DNS com este comando\n"
-+ 
-+ #: ../hostname.c:339
-++#, c-format
-+ msgid ""
-+ "\n"
-+ "Unless you are using bind or NIS for host lookups you can change the DNS\n"
-+ msgstr ""
-+ "\n"
-+-"A menos que esteja usando bind ou NIS para resolu��o de nomes voc� pode "
-+-"mudar\n"
-++"A menos que esteja usando bind ou NIS para resolu��o de nomes voc� pode mudar\n"
-+ 
-+ #: ../hostname.c:340
-++#, c-format
-+ msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n"
-+ msgstr "o nome do dom�nio DNS (que � parte do FQDN) no arquivo /etc/hosts.\n"
-+ 
-+@@ -440,552 +465,453 @@ msgstr "getdomainname()=`%s'\n"
-+ msgid "getnodename()=`%s'\n"
-+ msgstr "getnodename()=`%s'\n"
-+ 
-+-#: ../ifconfig.c:159
-+-#, c-format
-+-msgid "%-9.9s Link encap:%s  "
-+-msgstr "%-9.9s  Encapsulamento do Link: %s  "
-++#: ../ifconfig.c:107
-++#, fuzzy, c-format
-++msgid ""
-++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
-++"Flg\n"
-++msgstr "Iface     MTU Met  RX-OK RX-ERR RX-DRP RX-OVR  TX-OK TX-ERR TX-DRP TX-OV Op��es\n"
-+ 
-+-#: ../ifconfig.c:164
-+-#, c-format
-+-msgid "HWaddr %s  "
-+-msgstr "Endere�o de HW %s  "
-++#: ../ifconfig.c:129 ../ifconfig.c:161
-++#, fuzzy, c-format
-++msgid "%s: ERROR while getting interface flags: %s\n"
-++msgstr ""
-++"%s: erro obtendo informa��es da interface: %s\n"
-++"\n"
-+ 
-+-#: ../ifconfig.c:167
-++#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862
-++#: ../ifconfig.c:973
-+ #, c-format
-+-msgid "Media:%s"
-+-msgstr "M�dia:%s"
-++msgid "No support for INET on this system.\n"
-++msgstr "Este sistema n�o tem suporte a INET.\n"
-+ 
-+-#: ../ifconfig.c:169
-+-msgid "(auto)"
-+-msgstr "(auto)"
-++#: ../ifconfig.c:193
-++#, fuzzy, c-format
-++msgid "%s: ERROR while testing interface flags: %s\n"
-++msgstr ""
-++"%s: erro obtendo informa��es da interface: %s\n"
-++"\n"
-+ 
-+-#: ../ifconfig.c:176
-+-#, c-format
-+-msgid "          %s addr:%s "
-+-msgstr "          %s end.: %s "
-++#: ../ifconfig.c:202
-++#, fuzzy, c-format
-++msgid ""
-++"Usage:\n"
-++"  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"
-++msgstr ""
-++"Uso:\n"
-++"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <endere�o>]\n"
-+ 
-+-#: ../ifconfig.c:179
-++#: ../ifconfig.c:204
-+ #, c-format
-+-msgid " P-t-P:%s "
-+-msgstr " P-a-P:%s "
-++msgid "  [add <address>[/<prefixlen>]]\n"
-++msgstr "  [add <endere�o>[/<tam_prefixo>]]\n"
-+ 
-+-#: ../ifconfig.c:182
-++#: ../ifconfig.c:205
-+ #, c-format
-+-msgid " Bcast:%s "
-+-msgstr " Bcast:%s "
-++msgid "  [del <address>[/<prefixlen>]]\n"
-++msgstr "  [del <endere�o>[/<tam_prefixo>]]\n"
-+ 
-+-#: ../ifconfig.c:184
-++#: ../ifconfig.c:206
-+ #, c-format
-+-msgid " Mask:%s\n"
-+-msgstr " Masc:%s\n"
-++msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
-++msgstr "  [[-]broadcast [<endere�o>]]  [[-]pointopoint [<endere�o>]]\n"
-+ 
-+-#: ../ifconfig.c:201
-++#: ../ifconfig.c:207
-+ #, c-format
-+-msgid "          inet6 addr: %s/%d"
-+-msgstr "          endere�o inet6: %s/%d"
-+-
-+-#: ../ifconfig.c:203
-+-msgid " Scope:"
-+-msgstr " Escopo:"
-+-
-+-#: ../ifconfig.c:206
-+-msgid "Global"
-+-msgstr "Global"
-++msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
-++msgstr "  [netmask <endere�o>]  [dstaddr <endere�o>]  [tunnel <endere�o>]\n"
-+ 
-+-#: ../ifconfig.c:209
-+-msgid "Link"
-+-msgstr "Link"
-++#: ../ifconfig.c:210
-++#, c-format
-++msgid "  [outfill <NN>] [keepalive <NN>]\n"
-++msgstr "  [outfill <NN>] [keepalive <NN>]\n"
-+ 
-+ #: ../ifconfig.c:212
-+-msgid "Site"
-+-msgstr "Site"
-+-
-+-#: ../ifconfig.c:215
-+-msgid "Compat"
-+-msgstr "Compat"
-+-
-+-#: ../ifconfig.c:218
-+-msgid "Host"
-+-msgstr "M�quina"
-+-
-+-#: ../ifconfig.c:221
-+-msgid "Unknown"
-+-msgstr "Desconhecido"
-+-
-+-#: ../ifconfig.c:236
-+ #, c-format
-+-msgid "          IPX/Ethernet II addr:%s\n"
-+-msgstr "      Endere�o IPX/Ethernet II:%s\n"
-++msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
-++msgstr "  [hw <HW> <endere�o>]  [metric <NN>]  [mtu <NN>]\n"
-+ 
-+-#: ../ifconfig.c:239
-++#: ../ifconfig.c:213
-+ #, c-format
-+-msgid "          IPX/Ethernet SNAP addr:%s\n"
-+-msgstr "      Endere�o IPX/Ethernet SNAP:%s\n"
-++msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
-++msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
-+ 
-+-#: ../ifconfig.c:242
-++#: ../ifconfig.c:214
-+ #, c-format
-+-msgid "          IPX/Ethernet 802.2 addr:%s\n"
-+-msgstr "      Endere�o IPX/Ethernet 802.2:%s\n"
-++msgid "  [multicast]  [[-]promisc]\n"
-++msgstr "  [multicast]  [[-]promisc]\n"
-+ 
-+-#: ../ifconfig.c:245
-++#: ../ifconfig.c:215
-+ #, c-format
-+-msgid "          IPX/Ethernet 802.3 addr:%s\n"
-+-msgstr "      Endere�o IPX/Ethernet 802.3:%s\n"
-++msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
-++msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <tipo>]\n"
-+ 
-+-#: ../ifconfig.c:255
-++#: ../ifconfig.c:217
-+ #, c-format
-+-msgid "          EtherTalk Phase 2 addr:%s\n"
-+-msgstr "          Endere�o EtherTalk fase 2:%s\n"
-++msgid "  [txqueuelen <NN>]\n"
-++msgstr "  [txqueuelen <NN>]\n"
-+ 
-+-#: ../ifconfig.c:264
-++#: ../ifconfig.c:220
-+ #, c-format
-+-msgid "          econet addr:%s\n"
-+-msgstr "          Endere�o econet:%s\n"
-+-
-+-#: ../ifconfig.c:270
-+-msgid "[NO FLAGS] "
-+-msgstr "[NENHUMA FLAG] "
-+-
-+-#: ../ifconfig.c:272
-+-msgid "UP "
-+-msgstr "UP "
-+-
-+-#: ../ifconfig.c:274
-+-msgid "BROADCAST "
-+-msgstr "BROADCAST"
-+-
-+-#: ../ifconfig.c:276
-+-msgid "DEBUG "
-+-msgstr "DEBUG "
-+-
-+-#: ../ifconfig.c:278
-+-msgid "LOOPBACK "
-+-msgstr "LOOPBACK"
-+-
-+-#: ../ifconfig.c:280
-+-msgid "POINTOPOINT "
-+-msgstr "POINTOPOINT "
-+-
-+-#: ../ifconfig.c:282
-+-msgid "NOTRAILERS "
-+-msgstr "NOTRAILERS "
-+-
-+-#: ../ifconfig.c:284
-+-msgid "RUNNING "
-+-msgstr "RUNNING "
-++msgid "  [[-]dynamic]\n"
-++msgstr "  [[-]dynamic]\n"
-+ 
-+-#: ../ifconfig.c:286
-+-msgid "NOARP "
-+-msgstr "NOARP "
-++#: ../ifconfig.c:222
-++#, c-format
-++msgid ""
-++"  [up|down] ...\n"
-++"\n"
-++msgstr ""
-++"  [up|down] ...\n"
-++"\n"
-+ 
-+-#: ../ifconfig.c:288
-+-msgid "PROMISC "
-+-msgstr "PROMISC "
-++#: ../ifconfig.c:224
-++#, c-format
-++msgid "  <HW>=Hardware Type.\n"
-++msgstr "  <HW>=Tipo de Hardware.\n"
-+ 
-+-#: ../ifconfig.c:290
-+-msgid "ALLMULTI "
-+-msgstr "ALLMULTI "
-++#: ../ifconfig.c:225
-++#, c-format
-++msgid "  List of possible hardware types:\n"
-++msgstr "  Lista dos tipos poss�veis de hardware:\n"
-+ 
-+-#: ../ifconfig.c:292
-+-msgid "SLAVE "
-+-msgstr "SLAVE "
-++#. 1 = ARPable
-++#: ../ifconfig.c:227
-++#, c-format
-++msgid "  <AF>=Address family. Default: %s\n"
-++msgstr "  <AF>=Fam�lia de endere�os. Default: %s\n"
-+ 
-+-#: ../ifconfig.c:294
-+-msgid "MASTER "
-+-msgstr "MASTER "
-++#: ../ifconfig.c:228
-++#, c-format
-++msgid "  List of possible address families:\n"
-++msgstr "  Lista de fam�lias de endere�os poss�veis:\n"
-+ 
-+-#: ../ifconfig.c:296
-+-msgid "MULTICAST "
-+-msgstr "MULTICAST "
-++#: ../ifconfig.c:303
-++#, c-format
-++msgid "ifconfig: option `%s' not recognised.\n"
-++msgstr ""
-+ 
-+-#: ../ifconfig.c:299
-+-msgid "DYNAMIC "
-+-msgstr "DYNAMIC "
-++#: ../ifconfig.c:305 ../ifconfig.c:962
-++#, c-format
-++msgid "ifconfig: `--help' gives usage information.\n"
-++msgstr ""
-+ 
-+-#: ../ifconfig.c:302
-++#: ../ifconfig.c:380
-+ #, c-format
-+-msgid " MTU:%d  Metric:%d"
-+-msgstr " MTU:%d  M�trica:%d"
-++msgid "Unknown media type.\n"
-++msgstr "Tipo desconhecido de m�dia.\n"
-+ 
-+-#: ../ifconfig.c:306
-++#: ../ifconfig.c:417
-+ #, c-format
-+-msgid "  Outfill:%d  Keepalive:%d"
-+-msgstr "  Outfill:%d  Keepalive:%d"
-++msgid ""
-++"Warning: Interface %s still in promisc mode... maybe other application is "
-++"running?\n"
-++msgstr ""
-+ 
-+-#: ../ifconfig.c:320
-++#: ../ifconfig.c:429
-+ #, c-format
-+-msgid "RX packets:%lu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
-+-msgstr "Pacotes RX:%lu erros:%lu descartados:%lu sobreposi��es:%lu frame:%lu\n"
-++msgid "Warning: Interface %s still in MULTICAST mode.\n"
-++msgstr ""
-+ 
-+-#: ../ifconfig.c:325
-++#: ../ifconfig.c:441
-+ #, c-format
-+-msgid "             compressed:%lu\n"
-+-msgstr "             compactados:%lu\n"
-++msgid "Warning: Interface %s still in ALLMULTI mode.\n"
-++msgstr ""
-+ 
-+-#: ../ifconfig.c:329
-++#: ../ifconfig.c:465
-+ #, c-format
-+-msgid "TX packets:%lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
-++msgid "Warning: Interface %s still in DYNAMIC mode.\n"
-+ msgstr ""
-+-"Pacotes TX:%lu erros:%lu descartados:%lu sobreposi��es:%lu portadora:%lu\n"
-+ 
-+-#: ../ifconfig.c:333
-++#: ../ifconfig.c:523
-+ #, c-format
-+-msgid "          collisions:%lu "
-+-msgstr "          colis�es:%lu "
-++msgid "Warning: Interface %s still in BROADCAST mode.\n"
-++msgstr ""
-+ 
-+-#: ../ifconfig.c:335
-++#: ../ifconfig.c:652
-+ #, c-format
-+-msgid "compressed:%lu "
-+-msgstr "compactados:%lu "
-++msgid "Warning: Interface %s still in POINTOPOINT mode.\n"
-++msgstr ""
-+ 
-+-#: ../ifconfig.c:337
-++#: ../ifconfig.c:684
-+ #, c-format
-+-msgid "txqueuelen:%d "
-+-msgstr "txqueuelen:%d "
-+-
-+-#: ../ifconfig.c:345
-+-#, c-format
-+-msgid "Interrupt:%d "
-+-msgstr "IRQ:%d "
-+-
-+-#. Only print devices using it for
-+-#. I/O maps
-+-#: ../ifconfig.c:348
-+-#, c-format
-+-msgid "Base address:0x%x "
-+-msgstr "Endere�o de E/S:0x%x "
-++msgid "hw address type `%s' has no handler to set address. failed.\n"
-++msgstr ""
-+ 
-+-#: ../ifconfig.c:350
-++#: ../ifconfig.c:693
-+ #, c-format
-+-msgid "Memory:%lx-%lx "
-+-msgstr "Mem�ria:%lx-%lx "
-++msgid "%s: invalid %s address.\n"
-++msgstr "%s: endere�o %s inv�lido.\n"
-+ 
-+-#: ../ifconfig.c:353
-++#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913
-+ #, c-format
-+-msgid "DMA chan:%x "
-+-msgstr "Canal DMA:%x "
-++msgid "No support for INET6 on this system.\n"
-++msgstr "Este sistema n�o tem suporte a INET6.\n"
-+ 
-+-#: ../ifconfig.c:384 ../ifconfig.c:405
-++#: ../ifconfig.c:780 ../ifconfig.c:871
-+ #, c-format
-+-msgid "%s: unknown interface: %s\n"
-+-msgstr "%s: interface desconhecida: %s\n"
-+-
-+-#: ../ifconfig.c:421
-+-msgid ""
-+-"Usage:\n"
-+-"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <address>]\n"
-+-msgstr ""
-+-"Uso:\n"
-+-"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <endere�o>]\n"
-+-
-+-#: ../ifconfig.c:425
-+-msgid "  [add <address>[/<prefixlen>]]\n"
-+-msgstr "  [add <endere�o>[/<tam_prefixo>]]\n"
-+-
-+-#: ../ifconfig.c:427
-+-msgid "  [del <address>[/<prefixlen>]]\n"
-+-msgstr "  [del <endere�o>[/<tam_prefixo>]]\n"
-+-
-+-#: ../ifconfig.c:432
-+-msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
-+-msgstr "  [[-]broadcast [<endere�o>]]  [[-]pointopoint [<endere�o>]]\n"
-+-
-+-#: ../ifconfig.c:433
-+-msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
-+-msgstr "  [netmask <endere�o>]  [dstaddr <endere�o>]  [tunnel <endere�o>]\n"
-+-
-+-#: ../ifconfig.c:436
-+-msgid "  [outfill <NN>] [keepalive <NN>]\n"
-+-msgstr "  [outfill <NN>] [keepalive <NN>]\n"
-+-
-+-#: ../ifconfig.c:438
-+-msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
-+-msgstr "  [hw <HW> <endere�o>]  [metric <NN>]  [mtu <NN>]\n"
-+-
-+-#: ../ifconfig.c:439
-+-msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
-+-msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
-+-
-+-#: ../ifconfig.c:440
-+-msgid "  [multicast]  [[-]promisc]\n"
-+-msgstr "  [multicast]  [[-]promisc]\n"
-+-
-+-#: ../ifconfig.c:441
-+-msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
-+-msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <tipo>]\n"
-+-
-+-#: ../ifconfig.c:443
-+-msgid "  [txqueuelen <NN>]\n"
-+-msgstr "  [txqueuelen <NN>]\n"
-+-
-+-#: ../ifconfig.c:446
-+-msgid "  [[-]dynamic]\n"
-+-msgstr "  [[-]dynamic]\n"
-+-
-+-#: ../ifconfig.c:448
-+-msgid ""
-+-"  [up|down] ...\n"
-+-"\n"
-++msgid "Interface %s not initialized\n"
-+ msgstr ""
-+-"  [up|down] ...\n"
-+-"\n"
-+-
-+-#: ../ifconfig.c:450
-+-msgid "  <HW>=Hardware Type.\n"
-+-msgstr "  <HW>=Tipo de Hardware.\n"
-+-
-+-#: ../ifconfig.c:451
-+-msgid "  List of possible hardware types:\n"
-+-msgstr "  Lista dos tipos poss�veis de hardware:\n"
-+-
-+-#. 1 = ARPable
-+-#: ../ifconfig.c:453
-+-#, c-format
-+-msgid "  <AF>=Address family. Default: %s\n"
-+-msgstr "  <AF>=Fam�lia de endere�os. Default: %s\n"
-+-
-+-#: ../ifconfig.c:454
-+-msgid "  List of possible address families:\n"
-+-msgstr "  Lista de fam�lias de endere�os poss�veis:\n"
-+-
-+-#: ../ifconfig.c:593
-+-msgid "Unknown media type.\n"
-+-msgstr "Tipo desconhecido de m�dia.\n"
-+ 
-+-#: ../ifconfig.c:881
-+-#, c-format
-+-msgid "%s: invalid %s address.\n"
-++#: ../ifconfig.c:792 ../ifconfig.c:882
-++#, fuzzy, c-format
-++msgid "Bad address.\n"
-+ msgstr "%s: endere�o %s inv�lido.\n"
-+ 
-+-#: ../ifconfig.c:920 ../ifconfig.c:963 ../ifconfig.c:1011
-+-msgid "No support for INET6 on this system.\n"
-+-msgstr "Este sistema n�o tem suporte a INET6.\n"
-+-
-+-#: ../ifconfig.c:983
-++#: ../ifconfig.c:885
-++#, c-format
-+ msgid "Address deletion not supported on this system.\n"
-+ msgstr "Remo��o de endere�o n�o suportada neste sistema.\n"
-+ 
-+-#: ../ifconfig.c:1066
-+-msgid "No support for INET on this system.\n"
-+-msgstr "Este sistema n�o tem suporte a INET.\n"
-++#: ../ifconfig.c:957
-++#, fuzzy, c-format
-++msgid "ifconfig: Cannot set address for this protocol family.\n"
-++msgstr "N�o sei como configurar endere�os para a fam�lia %d.\n"
-+ 
-+-#: ../ifconfig.c:1076
-++#: ../ifconfig.c:983
-++#, c-format
-+ msgid "No support for ECONET on this system.\n"
-+ msgstr "Este sistema n�o tem suporte a ECONET.\n"
-+ 
-+-#: ../ifconfig.c:1084
-++#: ../ifconfig.c:991
-+ #, c-format
-+ msgid "Don't know how to set addresses for family %d.\n"
-+ msgstr "N�o sei como configurar endere�os para a fam�lia %d.\n"
-+ 
-+-#: ../netstat.c:383
-++#: ../ifconfig.c:1021
-++#, c-format
-++msgid "WARNING: at least one error occured. (%d)\n"
-++msgstr ""
-++
-++#: ../netstat.c:434
-+ #, c-format
-+ msgid ""
-+ "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n"
-+-msgstr ""
-+-"(N�o foi poss�vel ler informa��es para \"-p\": geteuid()=%d mas voc� deve "
-+-"ser root.)\n"
-++msgstr "(N�o foi poss�vel ler informa��es para \"-p\": geteuid()=%d mas voc� deve ser root.)\n"
-+ 
-+-#: ../netstat.c:387
-++#: ../netstat.c:438
-++#, c-format
-+ msgid ""
-+ "(Not all processes could be identified, non-owned process info\n"
-+ " will not be shown, you would have to be root to see it all.)\n"
-+ msgstr ""
-+-"(Nem todos os processos puderam ser identificados, informa��es sobre "
-+-"processos\n"
-++"(Nem todos os processos puderam ser identificados, informa��es sobre processos\n"
-+ " de outrem n�o ser�o mostrados, voc� deve ser root para v�-los todos.)\n"
-+ 
-+-#: ../netstat.c:394 ../netstat.c:1089 ../netstat.c:1166
-++#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266
-+ msgid "LISTENING"
-+ msgstr "OUVINDO"
-+ 
-+-#: ../netstat.c:395
-++#: ../netstat.c:446
-+ msgid "CONN SENT"
-+ msgstr "CONN ENVIADO"
-+ 
-+-#: ../netstat.c:396 ../netstat.c:1168
-++#: ../netstat.c:447 ../netstat.c:1268
-+ msgid "DISC SENT"
-+ msgstr "DISC ENVIADO"
-+ 
-+-#: ../netstat.c:397 ../netstat.c:464 ../netstat.c:809 ../netstat.c:1169
-++#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269
-+ msgid "ESTABLISHED"
-+ msgstr "ESTABELECIDA"
-+ 
-+-#: ../netstat.c:419
-++#: ../netstat.c:470
-++#, c-format
-+ msgid "Active NET/ROM sockets\n"
-+ msgstr "Ative sockets NET/ROM\n"
-+ 
-+-#: ../netstat.c:420
-++#: ../netstat.c:471
-++#, c-format
-+ msgid ""
-+-"User       Dest       Source     Device  State        Vr/Vs    Send-Q  "
-+-"Recv-Q\n"
-+-msgstr ""
-+-"Usu�rio    Destino    Origem  Dispositivo Estado      Vr/Vs  Send-Q  Recv-Q\n"
-++"User       Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-"
-++"Q\n"
-++msgstr "Usu�rio    Destino    Origem  Dispositivo Estado      Vr/Vs  Send-Q  Recv-Q\n"
-+ 
-+-#: ../netstat.c:430 ../netstat.c:1208
-++#: ../netstat.c:481 ../netstat.c:1308
-+ #, c-format
-+ msgid "Problem reading data from %s\n"
-+ msgstr "Problemas lendo dados de %s\n"
-+ 
-+-#: ../netstat.c:465
-++#: ../netstat.c:516
-+ msgid "SYN_SENT"
-+ msgstr "SYN_ENVIADO"
-+ 
-+-#: ../netstat.c:466
-++#: ../netstat.c:517
-+ msgid "SYN_RECV"
-+ msgstr "SYN_RECEBIDO"
-+ 
-+-#: ../netstat.c:467
-++#: ../netstat.c:518
-+ msgid "FIN_WAIT1"
-+ msgstr "ESPERA_FIN1"
-+ 
-+-#: ../netstat.c:468
-++#: ../netstat.c:519
-+ msgid "FIN_WAIT2"
-+ msgstr "ESPERA_FIN2"
-+ 
-+-#: ../netstat.c:469
-++#: ../netstat.c:520
-+ msgid "TIME_WAIT"
-+ msgstr "TIME_WAIT"
-+ 
-+-#: ../netstat.c:470
-++#: ../netstat.c:521
-+ msgid "CLOSE"
-+ msgstr "FECHAR"
-+ 
-+-#: ../netstat.c:471
-++#: ../netstat.c:522
-+ msgid "CLOSE_WAIT"
-+ msgstr "ESPERANDO_FECHAR"
-+ 
-+-#: ../netstat.c:472
-++#: ../netstat.c:523
-+ msgid "LAST_ACK"
-+ msgstr "�LTIMO_ACK"
-+ 
-+-#: ../netstat.c:473
-++#: ../netstat.c:524
-+ msgid "LISTEN"
-+ msgstr "OU�A"
-+ 
-+-#: ../netstat.c:474
-++#: ../netstat.c:525
-+ msgid "CLOSING"
-+ msgstr "FECHANDO"
-+ 
-+-#: ../netstat.c:544
-++#: ../netstat.c:596
-+ #, c-format
-+ msgid "warning, got bogus igmp6 line %d.\n"
-+ msgstr "aten��o, recebi linha igmp6 inv�lida %d.\n"
-+ 
-+-#: ../netstat.c:549 ../netstat.c:587 ../netstat.c:670 ../netstat.c:803
-+-#: ../netstat.c:935 ../netstat.c:940
-++#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898
-++#: ../netstat.c:1032 ../netstat.c:1037
-+ #, c-format
-+ msgid "netstat: unsupported address family %d !\n"
-+ msgstr "netstat: fam�lia de protocolos %d n�o suportada!\n"
-+ 
-+-#: ../netstat.c:562 ../netstat.c:567 ../netstat.c:575 ../netstat.c:582
-++#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634
-+ #, c-format
-+ msgid "warning, got bogus igmp line %d.\n"
-+ msgstr "aten��o, recebi linha igmp inv�lida %d.\n"
-+ 
-+-#: ../netstat.c:666
-++#: ../netstat.c:677
-++#, fuzzy, c-format
-++msgid "Active X.25 sockets\n"
-++msgstr "Ativar sockets AX.25\n"
-++
-++#. IMHO, Vr/Vs is not very usefull --SF
-++#: ../netstat.c:679
-++#, fuzzy, c-format
-++msgid ""
-++"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  Recv-"
-++"Q\n"
-++msgstr "Destino    Origem Dispositivo Estado       Vr/Vs  Send-Q  Recv-Q\n"
-++
-++#: ../netstat.c:759
-++#, c-format
-+ msgid "warning, got bogus tcp line.\n"
-+ msgstr "aten��o, recebi linha tcp inv�lida.\n"
-+ 
-+-#: ../netstat.c:704 ../netstat.c:855 ../netstat.c:975
-++#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075
-+ #, c-format
-+ msgid "off (0.00/%ld/%d)"
-+ msgstr "desligado (0.00/%ld/%ld)"
-+ 
-+-#: ../netstat.c:708
-++#: ../netstat.c:804
-+ #, c-format
-+ msgid "on (%2.2f/%ld/%d)"
-+ msgstr "em (%2.2f/%ld/%d)"
-+ 
-+-#: ../netstat.c:713
-++#: ../netstat.c:809
-+ #, c-format
-+ msgid "keepalive (%2.2f/%ld/%d)"
-+ msgstr "keepalive (%2.2f/%ld/%d)"
-+ 
-+-#: ../netstat.c:718
-++#: ../netstat.c:814
-+ #, c-format
-+ msgid "timewait (%2.2f/%ld/%d)"
-+ msgstr "timewait (%2.2f/%ld/%d)"
-+ 
-+-#: ../netstat.c:723 ../netstat.c:864 ../netstat.c:985
-++#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085
-+ #, c-format
-+ msgid "unkn-%d (%2.2f/%ld/%d)"
-+ msgstr "desconh.-%d (%2.2f/%ld)"
-+ 
-+-#: ../netstat.c:799
-++#: ../netstat.c:894
-++#, c-format
-+ msgid "warning, got bogus udp line.\n"
-+ msgstr "aten��o, recebi linha udp inv�lida.\n"
-+ 
-+-#: ../netstat.c:817 ../netstat.c:1075 ../netstat.c:1108
-++#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208
-+ msgid "UNKNOWN"
-+ msgstr "DESCONHECIDA"
-+ 
-+-#: ../netstat.c:860 ../netstat.c:980
-++#: ../netstat.c:958 ../netstat.c:1080
-+ #, c-format
-+ msgid "on%d (%2.2f/%ld/%d)"
-+ msgstr "ligado %d (%2.2f/%ld)"
-+ 
-+-#: ../netstat.c:949
-++#: ../netstat.c:1046
-++#, c-format
-+ msgid "warning, got bogus raw line.\n"
-+ msgstr "aten��o, recebi linha raw inv�lida.\n"
-+ 
-+-#: ../netstat.c:1028
-++#: ../netstat.c:1128
-++#, c-format
-+ msgid "warning, got bogus unix line.\n"
-+ msgstr "aten��o, recebi linha unix inv�lida.\n"
-+ 
-+-#: ../netstat.c:1055
-++#: ../netstat.c:1155
-+ msgid "STREAM"
-+ msgstr "STREAM"
-+ 
-+-#: ../netstat.c:1059
-++#: ../netstat.c:1159
-+ msgid "DGRAM"
-+ msgstr "DGRAM"
-+ 
-+-#: ../netstat.c:1063
-++#: ../netstat.c:1163
-+ msgid "RAW"
-+ msgstr "RAW"
-+ 
-+-#: ../netstat.c:1067
-++#: ../netstat.c:1167
-+ msgid "RDM"
-+ msgstr "RDM"
-+ 
-+-#: ../netstat.c:1071
-++#: ../netstat.c:1171
-+ msgid "SEQPACKET"
-+ msgstr "SEQPACKET"
-+ 
-+-#: ../netstat.c:1080
-++#: ../netstat.c:1180
-+ msgid "FREE"
-+ msgstr "LIVRE"
-+ 
-+-#: ../netstat.c:1096
-++#: ../netstat.c:1196
-+ msgid "CONNECTING"
-+ msgstr "CONECTANDO"
-+ 
-+-#: ../netstat.c:1100
-++#: ../netstat.c:1200
-+ msgid "CONNECTED"
-+ msgstr "CONECTADO"
-+ 
-+-#: ../netstat.c:1104
-++#: ../netstat.c:1204
-+ msgid "DISCONNECTING"
-+ msgstr "DESCONECTANDO"
-+ 
-+-#: ../netstat.c:1135
-++#: ../netstat.c:1235
-++#, c-format
-+ msgid "Active UNIX domain sockets "
-+ msgstr "Domain sockets UNIX ativos "
-+ 
-+-#: ../netstat.c:1137 ../netstat.c:1666
-++#: ../netstat.c:1237 ../netstat.c:1756
-++#, c-format
-+ msgid "(servers and established)"
-+ msgstr "(servidores e estabelecidas)"
-+ 
-+-#: ../netstat.c:1140 ../netstat.c:1669
-++#: ../netstat.c:1240 ../netstat.c:1759
-++#, c-format
-+ msgid "(only servers)"
-+ msgstr "(sem os servidores)"
-+ 
-+-#: ../netstat.c:1142 ../netstat.c:1671
-++#: ../netstat.c:1242 ../netstat.c:1761
-++#, c-format
-+ msgid "(w/o servers)"
-+ msgstr "(sem os servidores)"
-+ 
-+-#: ../netstat.c:1145
-++#: ../netstat.c:1245
-++#, c-format
-+ msgid ""
-+ "\n"
-+ "Proto RefCnt Flags       Type       State         I-Node"
-+@@ -993,114 +919,118 @@ msgstr ""
-+ "\n"
-+ "Proto CntRef Flags       Tipo       Estado        I-Node Rota"
-+ 
-+-#: ../netstat.c:1147
-++#: ../netstat.c:1247
-++#, c-format
-+ msgid " Path\n"
-+ msgstr " Caminho\n"
-+ 
-+-#: ../netstat.c:1167
-++#: ../netstat.c:1267
-+ msgid "SABM SENT"
-+ msgstr "SABM ENVIADO"
-+ 
-+-#: ../netstat.c:1170
-++#: ../netstat.c:1270
-+ msgid "RECOVERY"
-+ msgstr "RECUPERA��O"
-+ 
-+-#: ../netstat.c:1184
-++#: ../netstat.c:1284
-++#, c-format
-+ msgid "Active AX.25 sockets\n"
-+ msgstr "Ativar sockets AX.25\n"
-+ 
-+-#: ../netstat.c:1185
-++#: ../netstat.c:1285
-++#, c-format
-+ msgid "Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-Q\n"
-+ msgstr "Destino    Origem Dispositivo Estado       Vr/Vs  Send-Q  Recv-Q\n"
-+ 
-+-#: ../netstat.c:1228
-++#: ../netstat.c:1328
-+ #, c-format
-+ msgid "problem reading data from %s\n"
-+ msgstr "problemas lendo dados de %s\n"
-+ 
-+-#: ../netstat.c:1279
-++#: ../netstat.c:1379
-++#, c-format
-+ msgid ""
-+ "Active IPX sockets\n"
-+ "Proto Recv-Q Send-Q Local Address              Foreign Address            "
-+ "State"
-+ msgstr ""
-+ "Sockets IPX ativos\n"
-+-"Proto Recv-Q Send-Q Endere�o Local             Endere�o Remoto           "
-+-"Estado"
-++"Proto Recv-Q Send-Q Endere�o Local             Endere�o Remoto           Estado"
-+ 
-+-#: ../netstat.c:1281
-++#: ../netstat.c:1381
-++#, c-format
-+ msgid " User"
-+ msgstr " Usu�rio"
-+ 
-+-#: ../netstat.c:1315
-++#: ../netstat.c:1415
-+ msgid "ESTAB"
-+ msgstr "ESTAB"
-+ 
-+-#: ../netstat.c:1323
-++#: ../netstat.c:1423
-+ msgid "UNK."
-+ msgstr "DESC."
-+ 
-+-#: ../netstat.c:1367
-+-msgid "     - no statistics available -"
-+-msgstr "     - estat�sticas n�o dispon�veis -"
-+-
-+-#: ../netstat.c:1370
-+-msgid "[NO FLAGS]"
-+-msgstr "[SEM FLAGS]"
-+-
-+-#: ../netstat.c:1400
-++#: ../netstat.c:1461
-++#, c-format
-+ msgid "Kernel Interface table\n"
-+ msgstr "Tabela de Interfaces do Kernel\n"
-+ 
-+-#: ../netstat.c:1401
-++#: ../netstat.c:1465
-++#, fuzzy, c-format
-+ msgid ""
-+-"Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
-++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
-+ "Flg\n"
-+-msgstr ""
-+-"Iface     MTU Met  RX-OK RX-ERR RX-DRP RX-OVR  TX-OK TX-ERR TX-DRP TX-OV "
-+-"Op��es\n"
-++msgstr "Iface     MTU Met  RX-OK RX-ERR RX-DRP RX-OVR  TX-OK TX-ERR TX-DRP TX-OV Op��es\n"
-+ 
-+-#: ../netstat.c:1404
-++#: ../netstat.c:1469
-+ msgid "missing interface information"
-+ msgstr "falta informa��o da interface"
-+ 
-+-#: ../netstat.c:1425
-++#: ../netstat.c:1492
-++#, c-format
-+ msgid ""
-+-"usage: netstat [-veenNcCF] [<Af>] -r         netstat "
-+-"{-V|--version|-h|--help}\n"
-++"usage: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
-++"help}\n"
-+ msgstr ""
-+ "uso: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--help}\n"
-+ 
-+-#: ../netstat.c:1426
-++#: ../netstat.c:1493
-++#, c-format
-+ msgid "       netstat [-vnNcaeol] [<Socket> ...]\n"
-+ msgstr "     netstat [-vnNcaeo] [<Socket>]\n"
-+ 
-+-#: ../netstat.c:1427
-++#: ../netstat.c:1494
-++#, c-format
-+ msgid ""
-+ "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
-+ "\n"
-+ msgstr "     netstat [-vnNcaeo] [<Socket>]\n"
-+ 
-+-#: ../netstat.c:1429
-++#: ../netstat.c:1496
-++#, c-format
-+ msgid "        -r, --route              display routing table\n"
-+ msgstr "        -r, --route             mostra tabela de roteamento\n"
-+ 
-+-#: ../netstat.c:1430
-++#: ../netstat.c:1497
-++#, c-format
-+ msgid "        -i, --interfaces         display interface table\n"
-+ msgstr "        -i, --interfaces        mostra tabela de interfaces\n"
-+ 
-+-#: ../netstat.c:1431
-++#: ../netstat.c:1498
-++#, c-format
-+ msgid "        -g, --groups             display multicast group memberships\n"
-+ msgstr ""
-+ "        -o, --timers            mostra temporizadores\n"
-+ "\n"
-+ 
-+-#: ../netstat.c:1432
-++#: ../netstat.c:1499
-++#, c-format
-+ msgid ""
-+ "        -s, --statistics         display networking statistics (like SNMP)\n"
-+ msgstr "        -i, --interfaces        mostra tabela de interfaces\n"
-+ 
-+-#: ../netstat.c:1434
-++#: ../netstat.c:1501
-++#, c-format
-+ msgid ""
-+ "        -M, --masquerade         display masqueraded connections\n"
-+ "\n"
-+@@ -1108,19 +1038,38 @@ msgstr ""
-+ "        -M, --masquerade        mostra conex�es mascaradas\n"
-+ "\n"
-+ 
-+-#: ../netstat.c:1438 ../route.c:87
-++#: ../netstat.c:1505
-++#, fuzzy, c-format
-++msgid "        --numeric-hosts          don't resolve host names\n"
-++msgstr "        -n, --numeric           n�o resolve nomes\n"
-++
-++#: ../netstat.c:1506
-++#, fuzzy, c-format
-++msgid "        --numeric-ports          don't resolve port names\n"
-++msgstr "        -n, --numeric           n�o resolve nomes\n"
-++
-++#: ../netstat.c:1507
-++#, fuzzy, c-format
-++msgid "        --numeric-users          don't resolve user names\n"
-++msgstr "        -n, --numeric           n�o resolve nomes\n"
-++
-++#: ../netstat.c:1508
-++#, c-format
-+ msgid "        -N, --symbolic           resolve hardware names\n"
-+ msgstr "        -n, --numeric           n�o resolve nomes\n"
-+ 
-+-#: ../netstat.c:1439 ../route.c:88
-++#: ../netstat.c:1509 ../route.c:88
-++#, c-format
-+ msgid "        -e, --extend             display other/more information\n"
-+ msgstr "        -e, --extend             mostra outras/mais informa��es\n"
-+ 
-+-#: ../netstat.c:1440
-++#: ../netstat.c:1510
-++#, c-format
-+ msgid "        -p, --programs           display PID/Program name for sockets\n"
-+ msgstr "        -r, --route             mostra tabela de roteamento\n"
-+ 
-+-#: ../netstat.c:1441
-++#: ../netstat.c:1511
-++#, c-format
-+ msgid ""
-+ "        -c, --continuous         continuous listing\n"
-+ "\n"
-+@@ -1128,30 +1077,33 @@ msgstr ""
-+ "        -c, --continuous        listagem cont�nua\n"
-+ "\n"
-+ 
-+-#: ../netstat.c:1442
-++#: ../netstat.c:1512
-++#, c-format
-+ msgid "        -l, --listening          display listening server sockets\n"
-+ msgstr "        -L, --netlink           mostra mensagens netlink do kernel\n"
-+ 
-+-#: ../netstat.c:1443
-++#: ../netstat.c:1513
-++#, c-format
-+ msgid ""
-+ "        -a, --all, --listening   display all sockets (default: connected)\n"
-+ msgstr "        -a, --all, --listening  mostra tudo\n"
-+ 
-+-#: ../netstat.c:1444
-++#: ../netstat.c:1514
-++#, c-format
-+ msgid "        -o, --timers             display timers\n"
-+ msgstr ""
-+ "        -o, --timers            mostra temporizadores\n"
-+ "\n"
-+ 
-+-#: ../netstat.c:1445 ../route.c:89
-++#: ../netstat.c:1515 ../route.c:89
-++#, c-format
-+ msgid ""
-+ "        -F, --fib                display Forwarding Information Base "
-+ "(default)\n"
-+-msgstr ""
-+-"        -F, --fib             mostra a Base de Informa��es de Repasse "
-+-"(default)\n"
-++msgstr "        -F, --fib             mostra a Base de Informa��es de Repasse (default)\n"
-+ 
-+-#: ../netstat.c:1446 ../route.c:90
-++#: ../netstat.c:1516 ../route.c:90
-++#, c-format
-+ msgid ""
-+ "        -C, --cache              display routing cache instead of FIB\n"
-+ "\n"
-+@@ -1159,136 +1111,145 @@ msgstr ""
-+ "        -C, --cache              mostra cache de roteamento no lugar da FIB\n"
-+ "\n"
-+ 
-+-#: ../netstat.c:1448
-++#: ../netstat.c:1518
-++#, c-format
-+ msgid ""
-+-"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
-+-"--netrom\n"
-++"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
-++"netrom\n"
-+ msgstr ""
-+-"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
-+-"--netrom\n"
-++"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
-++"netrom\n"
-+ 
-+-#: ../netstat.c:1449 ../route.c:92
-+-#, c-format
-+-msgid "  <AF>=Use '-A <af>' or '--<af>' Default: %s\n"
-++#: ../netstat.c:1519
-++#, fuzzy, c-format
-++msgid "  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"
-+ msgstr "  <AF>=Use '-A <af>' ou [--<af>' Default: %s\n"
-+ 
-+-#: ../netstat.c:1450 ../route.c:93
-++#: ../netstat.c:1520 ../route.c:93
-++#, c-format
-+ msgid "  List of possible address families (which support routing):\n"
-+-msgstr ""
-+-"  Lista das fam�lias de endere�os poss�veis (que suportam roteamento):\n"
-++msgstr "  Lista das fam�lias de endere�os poss�veis (que suportam roteamento):\n"
-+ 
-+-#: ../netstat.c:1663
-++#: ../netstat.c:1753
-++#, c-format
-+ msgid "Active Internet connections "
-+ msgstr "Conex�es Internet Ativas "
-+ 
-+-#: ../netstat.c:1673
-++#: ../netstat.c:1763
-++#, c-format
-+ msgid ""
-+ "\n"
-+-"Proto Recv-Q Send-Q Local Address           Foreign Address         State    "
-+-"  "
-++"Proto Recv-Q Send-Q Local Address           Foreign Address         "
-++"State      "
-+ msgstr ""
-+ "\n"
-+-"Proto Recv-Q Send-Q Endere�o Local          Endere�o Remoto         Estado   "
-+-"  "
-++"Proto Recv-Q Send-Q Endere�o Local          Endere�o Remoto         Estado     "
-+ 
-+-#: ../netstat.c:1675
-++#: ../netstat.c:1765
-++#, c-format
-+ msgid " User       Inode     "
-+ msgstr " Usu�rio   "
-+ 
-+-#: ../netstat.c:1678
-++#: ../netstat.c:1768
-++#, c-format
-+ msgid " Timer"
-+ msgstr " Temporizador"
-+ 
-+-#: ../netstat.c:1708
-++#: ../netstat.c:1798
-++#, c-format
-+ msgid "IPv4 Group Memberships\n"
-+ msgstr "IPv4 Group Memberships\n"
-+ 
-+-#: ../netstat.c:1709
-++#: ../netstat.c:1799
-++#, c-format
-+ msgid "Interface       RefCnt Group\n"
-+ msgstr "Interface       CntRef Grupo\n"
-+ 
-+-#: ../rarp.c:43
-++#: ../rarp.c:44
-+ msgid "This kernel does not support RARP.\n"
-+ msgstr "Este kernel n�o tem suporte a RARP.\n"
-+ 
-+-#: ../rarp.c:82
-++#: ../rarp.c:83
-+ #, c-format
-+ msgid "no RARP entry for %s.\n"
-+ msgstr "Sem entrada RARP para %s.\n"
-+ 
-+-#: ../rarp.c:95
-++#: ../rarp.c:96
-+ #, c-format
-+ msgid "%s: bad hardware address\n"
-+ msgstr "%s: endere�o de hardware inv�lido\n"
-+ 
-+-#: ../rarp.c:127
-++#: ../rarp.c:128
-+ #, c-format
-+ msgid "rarp: cannot open file %s:%s.\n"
-+ msgstr "rarp: n�o foi poss�vel abrir o arquivo %s:%s.\n"
-+ 
-+-#: ../rarp.c:139
-++#: ../rarp.c:140
-+ #, c-format
-+ msgid "rarp: format error at %s:%u\n"
-+ msgstr "rarp: erro de formato em %s:%u\n"
-+ 
-+-#: ../rarp.c:143 ../rarp.c:287
-++#: ../rarp.c:144 ../rarp.c:289
-+ #, c-format
-+ msgid "rarp: %s: unknown host\n"
-+ msgstr "rarp: %s: m�quina desconhecida\n"
-+ 
-+-#: ../rarp.c:146
-++#: ../rarp.c:147
-+ #, c-format
-+ msgid "rarp: cannot set entry from %s:%u\n"
-+ msgstr "rarp: n�o � poss�vel incluir uma entrada para %s:%u\n"
-+ 
-+-#: ../rarp.c:175
-++#: ../rarp.c:176
-++#, c-format
-+ msgid "Usage: rarp -a                               list entries in cache.\n"
-+ msgstr ""
-+ "Uso: rarp -a                                   lista entradas no cache\n"
-+ 
-+-#: ../rarp.c:176
-++#: ../rarp.c:177
-++#, c-format
-+ msgid "       rarp -d <hostname>                    delete entry from cache.\n"
-+-msgstr ""
-+-"     rarp -d m�quina                           remove entrada do cache\n"
-++msgstr "     rarp -d m�quina                           remove entrada do cache\n"
-+ 
-+-#: ../rarp.c:177
-++#: ../rarp.c:178
-++#, c-format
-+ msgid "       rarp [<HW>] -s <hostname> <hwaddr>    add entry to cache.\n"
-+-msgstr ""
-+-"     rarp [-t tipo-hw] -s m�quina endere�o-hw  adiciona entrada ao cache\n"
-++msgstr "     rarp [-t tipo-hw] -s m�quina endere�o-hw  adiciona entrada ao cache\n"
-+ 
-+-#: ../rarp.c:178
-++#: ../rarp.c:179
-++#, c-format
-+ msgid ""
-+ "       rarp -f                               add entries from /etc/ethers.\n"
-+ msgstr ""
-+ "       rarp -f                               adiciona entradas a partir do\n"
-+ "                                             arquivo ethers.\n"
-+ 
-+-#: ../rarp.c:179
-++#: ../rarp.c:180
-++#, c-format
-+ msgid ""
-+ "       rarp -V                               display program version.\n"
-+ "\n"
-+-msgstr ""
-+-"     rarp -V                                   mostra vers�o do programa\n"
-++msgstr "     rarp -V                                   mostra vers�o do programa\n"
-+ 
-+-#: ../rarp.c:236
-++#: ../rarp.c:238
-+ #, c-format
-+ msgid "%s: illegal option mix.\n"
-+ msgstr "%s: mistura ilegal de op��es.\n"
-+ 
-+-#: ../rarp.c:267
-++#: ../rarp.c:269
-+ #, c-format
-+ msgid "rarp: %s: unknown hardware type.\n"
-+ msgstr "rarp: %s: tipo desconhecido de hardware.\n"
-+ 
-+-#: ../route.c:79
-++#: ../route.c:80
-++#, c-format
-+ msgid ""
-+ "Usage: route [-nNvee] [-FC] [<AF>]           List kernel routing tables\n"
-+ msgstr ""
-+-"Uso: route [-nNvee] [-FC] [fam�lias_de_endere�os]  Lista as tabelas de "
-+-"rotea-\n"
-++"Uso: route [-nNvee] [-FC] [fam�lias_de_endere�os]  Lista as tabelas de rotea-\n"
-+ "                                                   mento do kernel\n"
-+ 
-+-#: ../route.c:80
-++#: ../route.c:81
-++#, c-format
-+ msgid ""
-+ "       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n"
-+ "\n"
-+@@ -1298,35 +1259,42 @@ msgstr ""
-+ "                                                   mento da fam�lia.\n"
-+ "\n"
-+ 
-+-#: ../route.c:82
-++#: ../route.c:83
-++#, c-format
-+ msgid ""
-+ "       route {-h|--help} [<AF>]              Detailed usage syntax for "
-+ "specified AF.\n"
-+ msgstr ""
-+-"       route {-h|--help} [fam�lia_de_endere�os]    Sintaxe para a AF "
-+-"(Fam�lia\n"
-+-"                                                   de endere�os) "
-+-"espeficicada.\n"
-++"       route {-h|--help} [fam�lia_de_endere�os]    Sintaxe para a AF (Fam�lia\n"
-++"                                                   de endere�os) espeficicada.\n"
-+ 
-+-#: ../route.c:83
-++#: ../route.c:84
-++#, c-format
-+ msgid ""
-+ "       route {-V|--version}                  Display version/author and "
-+ "exit.\n"
-+ "\n"
-+ msgstr ""
-+-"       route {-V|--version}                        Mostra a vers�o do "
-+-"comando\n"
-++"       route {-V|--version}                        Mostra a vers�o do comando\n"
-+ "                                                   e sai.\n"
-+ 
-++#: ../route.c:92
-++#, fuzzy, c-format
-++msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
-++msgstr "  <AF>=Use '-A <af>' ou [--<af>' Default: %s\n"
-++
-+ #: ../plipconfig.c:66
-++#, c-format
-+ msgid "Usage: plipconfig [-a] [-i] [-v] interface\n"
-+ msgstr "Uso: ifconfig [-a] [-i] [-v] interface\n"
-+ 
-+ #: ../plipconfig.c:67
-++#, c-format
-+ msgid "                  [nibble NN] [trigger NN]\n"
-+ msgstr "                [[fam�lia] endere�o]\n"
-+ 
-+ #: ../plipconfig.c:68
-++#, c-format
-+ msgid "       plipconfig -V | --version\n"
-+ msgstr "       plipconfig -V | --version\n"
-+ 
-+@@ -1335,25 +1303,29 @@ msgstr "       plipconfig -V | --version
-+ msgid "%s\tnibble %lu  trigger %lu\n"
-+ msgstr "%s\tnibble %lu  trigger %lu\n"
-+ 
-+-#: ../iptunnel.c:79
-++#: ../iptunnel.c:85
-++#, c-format
-+ msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
-+ msgstr "Uso: iptunnel { add | change | del | show } [ NOME ]\n"
-+ 
-+-#: ../iptunnel.c:80
-++#: ../iptunnel.c:86
-++#, c-format
-+ msgid ""
-+ "          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
-+-msgstr ""
-+-"          [ mode { ipip | gre | sit } ] [ remote END ] [ local END ]\n"
-++msgstr "          [ mode { ipip | gre | sit } ] [ remote END ] [ local END ]\n"
-+ 
-+-#: ../iptunnel.c:81
-++#: ../iptunnel.c:87
-++#, c-format
-+ msgid "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
-+ msgstr "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
-+ 
-+-#: ../iptunnel.c:82
-++#: ../iptunnel.c:88
-++#, c-format
-+ msgid "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
-+ msgstr "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev DISP_F�SICO ]\n"
-+ 
-+-#: ../iptunnel.c:83
-++#: ../iptunnel.c:89
-++#, c-format
-+ msgid ""
-+ "       iptunnel -V | --version\n"
-+ "\n"
-+@@ -1361,451 +1333,734 @@ msgstr ""
-+ "       iptunnel -V | --version\n"
-+ "\n"
-+ 
-+-#: ../iptunnel.c:84
-++#: ../iptunnel.c:90
-++#, c-format
-+ msgid "Where: NAME := STRING\n"
-+ msgstr "Onde: NAME := STRING\n"
-+ 
-+-#: ../iptunnel.c:85
-++#: ../iptunnel.c:91
-++#, c-format
-+ msgid "       ADDR := { IP_ADDRESS | any }\n"
-+ msgstr "       END := { ENDERE�O_IP | any }\n"
-+ 
-+-#: ../iptunnel.c:86
-++#: ../iptunnel.c:92
-++#, c-format
-+ msgid "       TOS  := { NUMBER | inherit }\n"
-+ msgstr "       TOS  := { N�MERO | inherit }\n"
-+ 
-+-#: ../iptunnel.c:87
-++#: ../iptunnel.c:93
-++#, c-format
-+ msgid "       TTL  := { 1..255 | inherit }\n"
-+ msgstr "       TTL  := { 1..255 | inherit }\n"
-+ 
-+-#: ../iptunnel.c:88
-++#: ../iptunnel.c:94
-++#, c-format
-+ msgid "       KEY  := { DOTTED_QUAD | NUMBER }\n"
-+ msgstr "       KEY  := { QUATRO_N�MEROS_SEPARADOS_POR_PONTOS | N�MERO }\n"
-+ 
-+-#: ../iptunnel.c:326
-++#: ../iptunnel.c:332
-++#, c-format
-+ msgid "Keys are not allowed with ipip and sit.\n"
-+ msgstr "Chaves n�o s�o permitidas com ipip e sit.\n"
-+ 
-+-#: ../iptunnel.c:346
-++#: ../iptunnel.c:352
-++#, c-format
-+ msgid "Broadcast tunnel requires a source address.\n"
-+ msgstr "Um t�nel de broadcast precisa de um endere�o de origem.\n"
-+ 
-+-#: ../iptunnel.c:361
-++#: ../iptunnel.c:367
-++#, c-format
-+ msgid "ttl != 0 and noptmudisc are incompatible\n"
-+ msgstr "ttl != 0 e noptmudisc s�o incompat�veis\n"
-+ 
-+-#: ../iptunnel.c:373
-++#: ../iptunnel.c:379
-++#, c-format
-+ msgid "cannot determine tunnel mode (ipip, gre or sit)\n"
-+ msgstr "n�o foi poss�vel determinar o modo do t�nel (ip, gre ou sit)\n"
-+ 
-+-#: ../iptunnel.c:411
-++#: ../iptunnel.c:417
-+ #, c-format
-+ msgid "%s: %s/ip  remote %s  local %s "
-+ msgstr "%s: %s/ip  remoto %s  local %s "
-+ 
-+-#: ../iptunnel.c:415
-++#: ../iptunnel.c:421
-+ msgid "unknown"
-+ msgstr "Desconhecido"
-+ 
-+-#: ../iptunnel.c:447
-++#: ../iptunnel.c:453
-++#, c-format
-+ msgid "  Drop packets out of sequence.\n"
-+ msgstr "  Descarte pacotes fora de seq��ncia.\n"
-+ 
-+-#: ../iptunnel.c:449
-++#: ../iptunnel.c:455
-++#, c-format
-+ msgid "  Checksum in received packet is required.\n"
-+ msgstr "  � necess�rio checksum nos pacotes recebidos.\n"
-+ 
-+-#: ../iptunnel.c:451
-++#: ../iptunnel.c:457
-++#, c-format
-+ msgid "  Sequence packets on output.\n"
-+ msgstr "  Seq�encie pacotes na sa�da.\n"
-+ 
-+-#: ../iptunnel.c:453
-++#: ../iptunnel.c:459
-++#, c-format
-+ msgid "  Checksum output packets.\n"
-+ msgstr "  Calcule o checksum para pacotes de sa�da.\n"
-+ 
-+-#: ../iptunnel.c:481
-++#: ../iptunnel.c:487
-++#, c-format
-+ msgid "Wrong format of /proc/net/dev. Sorry.\n"
-+ msgstr "Formato errado de /proc/net/dev. Desculpe.\n"
-+ 
-+-#: ../iptunnel.c:494
-++#: ../iptunnel.c:500
-+ #, c-format
-+ msgid "Failed to get type of [%s]\n"
-+ msgstr "N�o foi poss�vel obter o tipo de [%s]\n"
-+ 
-+-#: ../iptunnel.c:510
-++#: ../iptunnel.c:516
-++#, c-format
-+ msgid "RX: Packets    Bytes        Errors CsumErrs OutOfSeq Mcasts\n"
-+ msgstr "RX: Pacotes    Bytes        Erros  CsunErrs ForaSeq  Mcasts\n"
-+ 
-+-#: ../iptunnel.c:513
-++#: ../iptunnel.c:519
-++#, c-format
-+ msgid "TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs\n"
-+ msgstr "TX: Pacotes    Bytes        Erros  DeadLoop SemRota  SemBufs\n"
-+ 
-+-#: ../statistics.c:45
-++#: ../statistics.c:47
-+ msgid "ICMP input histogram:"
-+ msgstr "Histograma de entrada ICMP:"
-+ 
-+-#: ../statistics.c:46
-++#: ../statistics.c:48
-+ msgid "ICMP output histogram:"
-+ msgstr "Histograma de sa�da ICMP"
-+ 
-+-#: ../statistics.c:63
-++#: ../statistics.c:65
-+ #, c-format
-+ msgid "Forwarding is %s"
-+ msgstr "Repassagem est� %s"
-+ 
-+-#: ../statistics.c:64
-+-#, c-format
-+-msgid "Default TTL is %d"
-++#: ../statistics.c:66
-++#, fuzzy, c-format
-++msgid "Default TTL is %u"
-+ msgstr "Default TTL � %d"
-+ 
-+-#: ../statistics.c:65
-+-#, c-format
-+-msgid "%d total packets received"
-++#: ../statistics.c:67
-++#, fuzzy, c-format
-++msgid "%u total packets received"
-+ msgstr "%d total de pacotes recebidos"
-+ 
-+-#: ../statistics.c:66
-+-#, c-format
-+-msgid "%d with invalid headers"
-++#: ../statistics.c:68
-++#, fuzzy, c-format
-++msgid "%u with invalid headers"
-+ msgstr "%d com cabe�alhos inv�lidos"
-+ 
-+-#: ../statistics.c:67
-+-#, c-format
-+-msgid "%d with invalid addresses"
-++#: ../statistics.c:69
-++#, fuzzy, c-format
-++msgid "%u with invalid addresses"
-+ msgstr "%d com endere�os inv�lidos"
-+ 
-+-#: ../statistics.c:68
-+-#, c-format
-+-msgid "%d forwarded"
-++#: ../statistics.c:70
-++#, fuzzy, c-format
-++msgid "%u forwarded"
-+ msgstr "%d repassados"
-+ 
-+-#: ../statistics.c:69
-+-#, c-format
-+-msgid "%d with unknown protocol"
-++#: ../statistics.c:71
-++#, fuzzy, c-format
-++msgid "%u with unknown protocol"
-+ msgstr "%d com protocolo desconhecido"
-+ 
-+-#: ../statistics.c:70
-+-#, c-format
-+-msgid "%d incoming packets discarded"
-++#: ../statistics.c:72
-++#, fuzzy, c-format
-++msgid "%u incoming packets discarded"
-+ msgstr "%d pacotes entrantes descartados"
-+ 
-+-#: ../statistics.c:71
-+-#, c-format
-+-msgid "%d incoming packets delivered"
-++#: ../statistics.c:73
-++#, fuzzy, c-format
-++msgid "%u incoming packets delivered"
-+ msgstr "%d pacotes entrantes despachados"
-+ 
-+-#: ../statistics.c:72
-+-#, c-format
-+-msgid "%d requests sent out"
-++#: ../statistics.c:74
-++#, fuzzy, c-format
-++msgid "%u requests sent out"
-+ msgstr "%d requisi��es enviadas"
-+ 
-+ #. ?
-+-#: ../statistics.c:73
-+-#, c-format
-+-msgid "%d outgoing packets dropped"
-++#: ../statistics.c:75
-++#, fuzzy, c-format
-++msgid "%u outgoing packets dropped"
-+ msgstr "%d pacotes saintes descartados"
-+ 
-+-#: ../statistics.c:74
-+-#, c-format
-+-msgid "%d dropped because of missing route"
-++#: ../statistics.c:76
-++#, fuzzy, c-format
-++msgid "%u dropped because of missing route"
-+ msgstr "%d descartados devido a falta de rota"
-+ 
-+-#: ../statistics.c:75
-+-#, c-format
-+-msgid "%d fragments dropped after timeout"
-++#: ../statistics.c:77
-++#, fuzzy, c-format
-++msgid "%u fragments dropped after timeout"
-+ msgstr "%d fragmentos descartados ap�s estouro de tempo"
-+ 
-+-#: ../statistics.c:76
-+-#, c-format
-+-msgid "%d reassemblies required"
-++#: ../statistics.c:78
-++#, fuzzy, c-format
-++msgid "%u reassemblies required"
-+ msgstr "%d remontagens requeridas"
-+ 
-+ #. ?
-+-#: ../statistics.c:77
-+-#, c-format
-+-msgid "%d packets reassembled ok"
-++#: ../statistics.c:79
-++#, fuzzy, c-format
-++msgid "%u packets reassembled ok"
-+ msgstr "%d pacotes remontados sem problemas"
-+ 
-+-#: ../statistics.c:78
-+-#, c-format
-+-msgid "%d packet reassembles failed"
-++#: ../statistics.c:80
-++#, fuzzy, c-format
-++msgid "%u packet reassembles failed"
-+ msgstr "%d remontagens de pacotes falharam"
-+ 
-+-#: ../statistics.c:79
-+-#, c-format
-+-msgid "%d fragments received ok"
-++#: ../statistics.c:81
-++#, fuzzy, c-format
-++msgid "%u fragments received ok"
-+ msgstr "%d fragmentos recebidos sem problemas"
-+ 
-+-#: ../statistics.c:80
-+-#, c-format
-+-msgid "%d fragments failed"
-++#: ../statistics.c:82
-++#, fuzzy, c-format
-++msgid "%u fragments failed"
-+ msgstr "%d fragmentos falharam"
-+ 
-+-#: ../statistics.c:81
-+-#, c-format
-+-msgid "%d fragments created"
-++#: ../statistics.c:83
-++#, fuzzy, c-format
-++msgid "%u fragments created"
-+ msgstr "%d fragmentos criados"
-+ 
-+-#: ../statistics.c:86
-+-#, c-format
-+-msgid "%d ICMP messages received"
-++#: ../statistics.c:88
-++#, fuzzy, c-format
-++msgid "%u ICMP messages received"
-+ msgstr "%d mensagens ICMP recebidas"
-+ 
-+-#: ../statistics.c:87
-+-#, c-format
-+-msgid "%d input ICMP message failed."
-++#: ../statistics.c:89
-++#, fuzzy, c-format
-++msgid "%u input ICMP message failed."
-+ msgstr "%d mensagens ICMP entrantes falharam."
-+ 
-+-#: ../statistics.c:88 ../statistics.c:101
-+-#, c-format
-+-msgid "destination unreachable: %d"
-++#: ../statistics.c:90 ../statistics.c:103
-++#, fuzzy, c-format
-++msgid "destination unreachable: %u"
-+ msgstr "destino n�o alcan��vel: %d"
-+ 
-+-#: ../statistics.c:89
-+-#, c-format
-+-msgid "timeout in transit: %d"
-++#: ../statistics.c:91
-++#, fuzzy, c-format
-++msgid "timeout in transit: %u"
-+ msgstr "estouro de tempo em tr�nsito: %d"
-+ 
-+-#: ../statistics.c:90 ../statistics.c:103
-+-#, c-format
-+-msgid "wrong parameters: %d"
-++#: ../statistics.c:92 ../statistics.c:105
-++#, fuzzy, c-format
-++msgid "wrong parameters: %u"
-+ msgstr "par�metros errados: %d"
-+ 
-+ #. ?
-+-#: ../statistics.c:91
-+-#, c-format
-+-msgid "source quenchs: %d"
-++#: ../statistics.c:93
-++#, fuzzy, c-format
-++msgid "source quenches: %u"
-+ msgstr "source quenchs: %d"
-+ 
-+-#: ../statistics.c:92
-+-#, c-format
-+-msgid "redirects: %d"
-++#: ../statistics.c:94
-++#, fuzzy, c-format
-++msgid "redirects: %u"
-+ msgstr "redire��es: %d"
-+ 
-+-#: ../statistics.c:93
-+-#, c-format
-+-msgid "echo requests: %d"
-++#: ../statistics.c:95
-++#, fuzzy, c-format
-++msgid "echo requests: %u"
-+ msgstr "requisi��es de eco: %d"
-+ 
-+-#: ../statistics.c:94 ../statistics.c:107
-+-#, c-format
-+-msgid "echo replies: %d"
-++#: ../statistics.c:96 ../statistics.c:109
-++#, fuzzy, c-format
-++msgid "echo replies: %u"
-+ msgstr "respostas de eco: %d"
-+ 
-+-#: ../statistics.c:95
-+-#, c-format
-+-msgid "timestamp request: %d"
-++#: ../statistics.c:97
-++#, fuzzy, c-format
-++msgid "timestamp request: %u"
-+ msgstr "requisi��es de timestamp: %d"
-+ 
-+-#: ../statistics.c:96
-+-#, c-format
-+-msgid "timestamp reply: %d"
-++#: ../statistics.c:98
-++#, fuzzy, c-format
-++msgid "timestamp reply: %u"
-+ msgstr "respostas a timestamps: %d"
-+ 
-+-#: ../statistics.c:97
-+-#, c-format
-+-msgid "address mask request: %d"
-++#: ../statistics.c:99
-++#, fuzzy, c-format
-++msgid "address mask request: %u"
-+ msgstr "requisi��es de mascara de endere�o: %d"
-+ 
-+ #. ?
-+-#: ../statistics.c:98
-+-msgid "address mask replies"
-+-msgstr "resposta a mascara de endere�o"
-++#: ../statistics.c:100 ../statistics.c:113
-++#, fuzzy, c-format
-++msgid "address mask replies: %u"
-++msgstr "respostas a m�scara de endere�o: %d"
-+ 
-+ #. ?
-+-#: ../statistics.c:99
-+-#, c-format
-+-msgid "%d ICMP messages sent"
-++#: ../statistics.c:101
-++#, fuzzy, c-format
-++msgid "%u ICMP messages sent"
-+ msgstr "%d mensagens ICMP enviadas"
-+ 
-+-#: ../statistics.c:100
-+-#, c-format
-+-msgid "%d ICMP messages failed"
-++#: ../statistics.c:102
-++#, fuzzy, c-format
-++msgid "%u ICMP messages failed"
-+ msgstr "%d mensagens ICMP falharam"
-+ 
-+-#: ../statistics.c:102
-+-#, c-format
-+-msgid "time exceeded: %d"
-++#: ../statistics.c:104
-++#, fuzzy, c-format
-++msgid "time exceeded: %u"
-+ msgstr "tempo excedido: %d"
-+ 
-+ #. ?
-+-#: ../statistics.c:104
-+-#, c-format
-+-msgid "source quench: %d"
-++#: ../statistics.c:106
-++#, fuzzy, c-format
-++msgid "source quench: %u"
-+ msgstr "source quench: %d"
-+ 
-+-#: ../statistics.c:105
-+-#, c-format
-+-msgid "redirect: %d"
-++#: ../statistics.c:107
-++#, fuzzy, c-format
-++msgid "redirect: %u"
-+ msgstr "redire��es: %d"
-+ 
-+-#: ../statistics.c:106
-+-#, c-format
-+-msgid "echo request: %d"
-++#: ../statistics.c:108
-++#, fuzzy, c-format
-++msgid "echo request: %u"
-+ msgstr "requisi��es de eco: %d"
-+ 
-+-#: ../statistics.c:108
-+-#, c-format
-+-msgid "timestamp requests: %d"
-++#: ../statistics.c:110
-++#, fuzzy, c-format
-++msgid "timestamp requests: %u"
-+ msgstr "requisi��es de timestamp: %d"
-+ 
-+-#: ../statistics.c:109
-+-#, c-format
-+-msgid "timestamp replies: %d"
-++#: ../statistics.c:111
-++#, fuzzy, c-format
-++msgid "timestamp replies: %u"
-+ msgstr "respostas a timestamp: %d"
-+ 
-+-#: ../statistics.c:110
-+-#, c-format
-+-msgid "address mask requests: %d"
-++#: ../statistics.c:112
-++#, fuzzy, c-format
-++msgid "address mask requests: %u"
-+ msgstr "requisi��es de m�scara de endere�o: %d"
-+ 
-+-#: ../statistics.c:111
-+-#, c-format
-+-msgid "address mask replies: %d"
-+-msgstr "respostas a m�scara de endere�o: %d"
-+-
-+-#: ../statistics.c:116
-++#: ../statistics.c:118
-+ #, c-format
-+ msgid "RTO algorithm is %s"
-+ msgstr "Algor�tmo RTO � %s"
-+ 
-+-#: ../statistics.c:120
-+-#, c-format
-+-msgid "%d active connections openings"
-++#: ../statistics.c:122
-++#, fuzzy, c-format
-++msgid "%u active connections openings"
-+ msgstr "%d tentativas de conex�o falharam"
-+ 
-+-#: ../statistics.c:121
-+-#, c-format
-+-msgid "%d passive connection openings"
-++#: ../statistics.c:123
-++#, fuzzy, c-format
-++msgid "%u passive connection openings"
-+ msgstr "%d opens passivos"
-+ 
-+-#: ../statistics.c:122
-+-#, c-format
-+-msgid "%d failed connection attempts"
-++#: ../statistics.c:124
-++#, fuzzy, c-format
-++msgid "%u failed connection attempts"
-+ msgstr "%d tentativas de conex�o falharam"
-+ 
-+-#: ../statistics.c:123
-+-#, c-format
-+-msgid "%d connection resets received"
-++#: ../statistics.c:125
-++#, fuzzy, c-format
-++msgid "%u connection resets received"
-+ msgstr "%d resets de conex�o recebidas"
-+ 
-+-#: ../statistics.c:124
-+-#, c-format
-+-msgid "%d connections established"
-++#: ../statistics.c:126
-++#, fuzzy, c-format
-++msgid "%u connections established"
-+ msgstr "%d conex�es estabelecidas"
-+ 
-+-#: ../statistics.c:125
-+-#, c-format
-+-msgid "%d segments received"
-++#: ../statistics.c:127
-++#, fuzzy, c-format
-++msgid "%u segments received"
-+ msgstr "%d segmentos recebidos"
-+ 
-+-#: ../statistics.c:126
-+-#, c-format
-+-msgid "%d segments send out"
-++#: ../statistics.c:128
-++#, fuzzy, c-format
-++msgid "%u segments send out"
-+ msgstr "%d segmentos enviados"
-+ 
-+-#: ../statistics.c:127
-+-#, c-format
-+-msgid "%d segments retransmited"
-++#: ../statistics.c:129
-++#, fuzzy, c-format
-++msgid "%u segments retransmited"
-+ msgstr "%d segmentos retransmitidos"
-+ 
-+-#: ../statistics.c:128
-+-#, c-format
-+-msgid "%d bad segments received."
-++#: ../statistics.c:130
-++#, fuzzy, c-format
-++msgid "%u bad segments received."
-+ msgstr "%d segmentos ruins recebidos."
-+ 
-+-#: ../statistics.c:129
-+-#, c-format
-+-msgid "%d resets sent"
-++#: ../statistics.c:131
-++#, fuzzy, c-format
-++msgid "%u resets sent"
-+ msgstr "%d resets enviados"
-+ 
-+-#: ../statistics.c:134
-+-#, c-format
-+-msgid "%d packets received"
-++#: ../statistics.c:136
-++#, fuzzy, c-format
-++msgid "%u packets received"
-+ msgstr "%d pacotes recebidos"
-+ 
-+-#: ../statistics.c:135
-+-#, c-format
-+-msgid "%d packets to unknown port received."
-++#: ../statistics.c:137
-++#, fuzzy, c-format
-++msgid "%u packets to unknown port received."
-+ msgstr "%d pacotes para portas desconhecidas recebidos."
-+ 
-+-#: ../statistics.c:136
-+-#, c-format
-+-msgid "%d packet receive errors"
-++#: ../statistics.c:138
-++#, fuzzy, c-format
-++msgid "%u packet receive errors"
-+ msgstr "%d erros de recep��o de pacotes"
-+ 
-+-#: ../statistics.c:137
-+-#, c-format
-+-msgid "%d packets sent"
-++#: ../statistics.c:139
-++#, fuzzy, c-format
-++msgid "%u packets sent"
-+ msgstr "%d pacotes enviados"
-+ 
-+-#: ../statistics.c:142
-++#: ../statistics.c:144
-++#, fuzzy, c-format
-++msgid "%u SYN cookies sent"
-++msgstr "%d pacotes enviados"
-++
-++#: ../statistics.c:145
-++#, fuzzy, c-format
-++msgid "%u SYN cookies received"
-++msgstr "%d pacotes recebidos"
-++
-++#: ../statistics.c:146
-++#, fuzzy, c-format
-++msgid "%u invalid SYN cookies received"
-++msgstr "%d pacotes recebidos"
-++
-++#: ../statistics.c:148
-++#, fuzzy, c-format
-++msgid "%u resets received for embryonic SYN_RECV sockets"
-++msgstr "%d resets recebidos para sockets embri�nicos SYN_RECV"
-++
-++#: ../statistics.c:150
-++#, fuzzy, c-format
-++msgid "%u packets pruned from receive queue because of socket buffer overrun"
-++msgstr "%d pacotes retirados da fila de recep��o devido a sobreposi��o de buffers de sockets"
-++
-++#. obsolete: 2.2.0 doesn't do that anymore
-++#: ../statistics.c:153
-++#, fuzzy, c-format
-++msgid "%u packets pruned from receive queue"
-++msgstr "%d pacotes retirados da fila de fora de ordem (out-of-order)"
-++
-++#: ../statistics.c:154
-++#, fuzzy, c-format
-++msgid ""
-++"%u packets dropped from out-of-order queue because of socket buffer overrun"
-++msgstr "%d pacotes descartados da fila de fora de ordem devido a sobreposi��o de buffers de sockets"
-++
-++#: ../statistics.c:156
-++#, fuzzy, c-format
-++msgid "%u ICMP packets dropped because they were out-of-window"
-++msgstr "%d pacotes ICMP descartados porque estavam fora da janela"
-++
-++#: ../statistics.c:158
-++#, fuzzy, c-format
-++msgid "%u ICMP packets dropped because socket was locked"
-++msgstr "%d pacotes ICMP descartadas porque o socket estava bloqueado"
-++
-++#: ../statistics.c:160
-++#, c-format
-++msgid "%u TCP sockets finished time wait in fast timer"
-++msgstr ""
-++
-++#: ../statistics.c:161
-++#, c-format
-++msgid "%u time wait sockets recycled by time stamp"
-++msgstr ""
-++
-++#: ../statistics.c:162
-++#, c-format
-++msgid "%u TCP sockets finished time wait in slow timer"
-++msgstr ""
-++
-++#: ../statistics.c:163
-++#, c-format
-++msgid "%u passive connections rejected because of time stamp"
-++msgstr ""
-++
-++#: ../statistics.c:165
-++#, c-format
-++msgid "%u active connections rejected because of time stamp"
-++msgstr ""
-++
-++#: ../statistics.c:167
-+ #, c-format
-+-msgid "%d SYN cookies sent"
-++msgid "%u packets rejects in established connections because of timestamp"
-++msgstr ""
-++
-++#: ../statistics.c:169
-++#, fuzzy, c-format
-++msgid "%u delayed acks sent"
-+ msgstr "%d pacotes enviados"
-+ 
-+-#: ../statistics.c:143
-++#: ../statistics.c:170
-+ #, c-format
-+-msgid "%d SYN cookies received"
-+-msgstr "%d pacotes recebidos"
-++msgid "%u delayed acks further delayed because of locked socket"
-++msgstr ""
-+ 
-+-#: ../statistics.c:144
-++#: ../statistics.c:172
-+ #, c-format
-+-msgid "%d invalid SYN cookies received"
-+-msgstr "%d pacotes recebidos"
-++msgid "Quick ack mode was activated %u times"
-++msgstr ""
-+ 
-+-#: ../statistics.c:146
-++#: ../statistics.c:173
-+ #, c-format
-+-msgid "%d resets received for embryonic SYN_RECV sockets"
-+-msgstr "%d resets recebidos para sockets embri�nicos SYN_RECV"
-++msgid "%u times the listen queue of a socket overflowed"
-++msgstr ""
-+ 
-+-#: ../statistics.c:148
-++#: ../statistics.c:175
-+ #, c-format
-+-msgid "%d packets pruned from receive queue because of socket buffer overrun"
-++msgid "%u SYNs to LISTEN sockets ignored"
-+ msgstr ""
-+-"%d pacotes retirados da fila de recep��o devido a sobreposi��o de buffers de "
-+-"sockets"
-+ 
-+-#. obsolete: 2.2.0 doesn't do that anymore
-+-#: ../statistics.c:151
-++#: ../statistics.c:176
-++#, c-format
-++msgid "%u packets directly queued to recvmsg prequeue."
-++msgstr ""
-++
-++#: ../statistics.c:178
-+ #, c-format
-+-msgid "%d packets pruned from out-of-order queue"
-++msgid "%u of bytes directly received from backlog"
-++msgstr ""
-++
-++#: ../statistics.c:180
-++#, c-format
-++msgid "%u of bytes directly received from prequeue"
-++msgstr ""
-++
-++#: ../statistics.c:182
-++#, fuzzy, c-format
-++msgid "%u packets dropped from prequeue"
-+ msgstr "%d pacotes retirados da fila de fora de ordem (out-of-order)"
-+ 
-+-#: ../statistics.c:152
-++#: ../statistics.c:183
-++#, fuzzy, c-format
-++msgid "%u packet headers predicted"
-++msgstr "%d pacotes recebidos"
-++
-++#: ../statistics.c:184
-+ #, c-format
-+-msgid ""
-+-"%d packets dropped from out-of-order queue because of socket buffer overrun"
-++msgid "%u packets header predicted and directly queued to user"
-+ msgstr ""
-+-"%d pacotes descartados da fila de fora de ordem devido a sobreposi��o de "
-+-"buffers de sockets"
-+ 
-+-#: ../statistics.c:154
-++#: ../statistics.c:186
-+ #, c-format
-+-msgid "%d ICMP packets dropped because they were out-of-window"
-+-msgstr "%d pacotes ICMP descartados porque estavam fora da janela"
-++msgid "Ran %u times out of system memory during packet sending"
-++msgstr ""
-+ 
-+-#: ../statistics.c:156
-++#: ../statistics.c:188
-++#, fuzzy, c-format
-++msgid "%u acknowledgments not containing data received"
-++msgstr "%d pacotes para portas desconhecidas recebidos."
-++
-++#: ../statistics.c:189
-+ #, c-format
-+-msgid "%d ICMP packets dropped because socket was locked"
-+-msgstr "%d pacotes ICMP descartadas porque o socket estava bloqueado"
-++msgid "%u predicted acknowledgments"
-++msgstr ""
-++
-++#: ../statistics.c:190
-++#, c-format
-++msgid "%u times recovered from packet loss due to fast retransmit"
-++msgstr ""
-++
-++#: ../statistics.c:191
-++#, c-format
-++msgid "%u times recovered from packet loss due to SACK data"
-++msgstr ""
-++
-++#: ../statistics.c:192
-++#, fuzzy, c-format
-++msgid "%u bad SACKs received"
-++msgstr "%d segmentos ruins recebidos."
-++
-++#: ../statistics.c:193
-++#, c-format
-++msgid "Detected reordering %u times using FACK"
-++msgstr ""
-++
-++#: ../statistics.c:194
-++#, c-format
-++msgid "Detected reordering %u times using SACK"
-++msgstr ""
-++
-++#: ../statistics.c:195
-++#, c-format
-++msgid "Detected reordering %u times using time stamp"
-++msgstr ""
-++
-++#: ../statistics.c:196
-++#, c-format
-++msgid "Detected reordering %u times using reno fast retransmit"
-++msgstr ""
-++
-++#: ../statistics.c:197
-++#, c-format
-++msgid "%u congestion windows fully recovered"
-++msgstr ""
-++
-++#: ../statistics.c:198
-++#, c-format
-++msgid "%u congestion windows partially recovered using Hoe heuristic"
-++msgstr ""
-++
-++#: ../statistics.c:199
-++#, c-format
-++msgid "%u congestion window recovered using DSACK"
-++msgstr ""
-++
-++#: ../statistics.c:200
-++#, c-format
-++msgid "%u congestion windows recovered after partial ack"
-++msgstr ""
-++
-++#: ../statistics.c:201
-++#, fuzzy, c-format
-++msgid "%u retransmits lost"
-++msgstr "%d resets enviados"
-++
-++#: ../statistics.c:202
-++#, c-format
-++msgid "%u timeouts after reno fast retransmit"
-++msgstr ""
-++
-++#: ../statistics.c:203
-++#, c-format
-++msgid "%u timeouts after SACK recovery"
-++msgstr ""
-++
-++#: ../statistics.c:204
-++#, c-format
-++msgid "%u timeouts in loss state"
-++msgstr ""
-++
-++#: ../statistics.c:205
-++#, fuzzy, c-format
-++msgid "%u fast retransmits"
-++msgstr "%d segmentos retransmitidos"
-++
-++#: ../statistics.c:206
-++#, c-format
-++msgid "%u forward retransmits"
-++msgstr ""
-++
-++#: ../statistics.c:207
-++#, c-format
-++msgid "%u retransmits in slow start"
-++msgstr ""
-++
-++#: ../statistics.c:208
-++#, c-format
-++msgid "%u other TCP timeouts"
-++msgstr ""
-++
-++#: ../statistics.c:209
-++#, fuzzy, c-format
-++msgid "%u reno fast retransmits failed"
-++msgstr "%d segmentos retransmitidos"
-++
-++#: ../statistics.c:210
-++#, fuzzy, c-format
-++msgid "%u sack retransmits failed"
-++msgstr "%d remontagens de pacotes falharam"
-++
-++#: ../statistics.c:211
-++#, c-format
-++msgid "%u times receiver scheduled too late for direct processing"
-++msgstr ""
-++
-++#: ../statistics.c:212
-++#, fuzzy, c-format
-++msgid "%u packets collapsed in receive queue due to low socket buffer"
-++msgstr "%d pacotes retirados da fila de recep��o devido a sobreposi��o de buffers de sockets"
-++
-++#: ../statistics.c:213
-++#, c-format
-++msgid "%u DSACKs sent for old packets"
-++msgstr ""
-++
-++#: ../statistics.c:214
-++#, c-format
-++msgid "%u DSACKs sent for out of order packets"
-++msgstr ""
-++
-++#: ../statistics.c:215
-++#, fuzzy, c-format
-++msgid "%u DSACKs received"
-++msgstr "%d pacotes recebidos"
-++
-++#: ../statistics.c:216
-++#, fuzzy, c-format
-++msgid "%u DSACKs for out of order packets received"
-++msgstr "%d total de pacotes recebidos"
-++
-++#: ../statistics.c:217
-++#, fuzzy, c-format
-++msgid "%u connections reset due to unexpected SYN"
-++msgstr "%d resets de conex�o recebidas"
-++
-++#: ../statistics.c:218
-++#, fuzzy, c-format
-++msgid "%u connections reset due to unexpected data"
-++msgstr "%d resets de conex�o recebidas"
-++
-++#: ../statistics.c:219
-++#, fuzzy, c-format
-++msgid "%u connections reset due to early user close"
-++msgstr "%d resets de conex�o recebidas"
-++
-++#: ../statistics.c:220
-++#, c-format
-++msgid "%u connections aborted due to memory pressure"
-++msgstr ""
-++
-++#: ../statistics.c:221
-++#, fuzzy, c-format
-++msgid "%u connections aborted due to timeout"
-++msgstr "%d resets de conex�o recebidas"
-+ 
-+ #: ../statistics.c:222
-++#, c-format
-++msgid "%u connections aborted after user close in linger timeout"
-++msgstr ""
-++
-++#: ../statistics.c:223
-++#, c-format
-++msgid "%u times unabled to send RST due to no memory"
-++msgstr ""
-++
-++#: ../statistics.c:224
-++#, c-format
-++msgid "TCP ran low on memory %u times"
-++msgstr ""
-++
-++#: ../statistics.c:225
-++#, c-format
-++msgid "%u TCP data loss events"
-++msgstr ""
-++
-++#: ../statistics.c:292
-+ msgid "enabled"
-+ msgstr "habilitado"
-+ 
-+-#: ../statistics.c:222
-++#: ../statistics.c:292
-+ msgid "disabled"
-+ msgstr "desabilitado"
-+ 
-+-#: ../statistics.c:272
-+-#, c-format
-+-msgid "unknown title %s\n"
-+-msgstr "t�tulo %s desconhecido\n"
-+-
-+-#: ../statistics.c:298
-++#: ../statistics.c:375
-+ msgid "error parsing /proc/net/snmp"
-+ msgstr "erro lendo /proc/net/snmp"
-+ 
-+-#: ../statistics.c:311
-++#: ../statistics.c:388
-+ msgid "cannot open /proc/net/snmp"
-+ msgstr "n�o foi poss�vel abrir /proc/net/snmp"
-+ 
-+@@ -1819,89 +2074,95 @@ msgstr "O tipo de hardware `%s' n�o � su
-+ msgid "Cannot change line discipline to `%s'.\n"
-+ msgstr "N�o foi poss�vel mudar a disciplina da linha para `%s'.\n"
-+ 
-+-#: ../lib/af.c:145 ../lib/hw.c:148
-++#: ../lib/af.c:153 ../lib/hw.c:161
-+ msgid "UNSPEC"
-+ msgstr "N�o Especificado"
-+ 
-+-#: ../lib/af.c:147
-++#: ../lib/af.c:155
-+ msgid "UNIX Domain"
-+ msgstr "UNIX Domain"
-+ 
-+-#: ../lib/af.c:150
-++#: ../lib/af.c:158
-+ msgid "DARPA Internet"
-+ msgstr "DARPA Internet"
-+ 
-+-#: ../lib/af.c:153
-++#: ../lib/af.c:161
-+ msgid "IPv6"
-+ msgstr "IPv6"
-+ 
-+-#: ../lib/af.c:156 ../lib/hw.c:169
-++#: ../lib/af.c:164 ../lib/hw.c:182
-+ msgid "AMPR AX.25"
-+ msgstr "AX.25 AMPR"
-+ 
-+-#: ../lib/af.c:159 ../lib/hw.c:175
-++#: ../lib/af.c:167 ../lib/hw.c:188
-+ msgid "AMPR NET/ROM"
-+ msgstr "NET/ROM AMPR"
-+ 
-+-#: ../lib/af.c:162
-++#: ../lib/af.c:170
-+ msgid "Novell IPX"
-+ msgstr "Novell IPX"
-+ 
-+-#: ../lib/af.c:165
-++#: ../lib/af.c:173
-+ msgid "Appletalk DDP"
-+ msgstr "Appletalk DDP"
-+ 
-+-#: ../lib/af.c:168 ../lib/hw.c:207
-++#: ../lib/af.c:176 ../lib/hw.c:223
-+ msgid "Econet"
-+ msgstr "Econet"
-+ 
-+-#: ../lib/af.c:171 ../lib/hw.c:172
-++#: ../lib/af.c:179
-++msgid "CCITT X.25"
-++msgstr ""
-++
-++#: ../lib/af.c:182 ../lib/hw.c:185
-+ msgid "AMPR ROSE"
-+ msgstr "AMPR ROSE"
-+ 
-+-#: ../lib/af.c:174 ../lib/hw.c:160
-++#: ../lib/af.c:185 ../lib/hw.c:173
-+ msgid "Ash"
-+ msgstr "Ash"
-+ 
-+-#: ../lib/af.c:232
-++#: ../lib/af.c:243
-++#, c-format
-+ msgid "Please don't supply more than one address family.\n"
-+ msgstr "Por favor n�o especifique mais que uma fam�lia de endere�os.\n"
-+ 
-+-#: ../lib/af.c:293
-++#: ../lib/af.c:304
-++#, c-format
-+ msgid "Too much address family arguments.\n"
-+ msgstr "Excesso no n�mero de fam�lias de endere�os.\n"
-+ 
-+-#: ../lib/af.c:304
-++#: ../lib/af.c:315
-+ #, c-format
-+ msgid "Unknown address family `%s'.\n"
-+ msgstr "Fam�lia de endere�os `%s' desconhecida.\n"
-+ 
-+-#: ../lib/arcnet.c:53 ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52
-+-#: ../lib/fddi.c:67 ../lib/hippi.c:68 ../lib/inet.c:244 ../lib/inet.c:259
-+-#: ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 ../lib/rose.c:71
-+-#: ../lib/rose.c:126 ../lib/unix.c:56 ../lib/unix.c:76
-+-msgid "[NONE SET]"
-+-msgstr "[Nenhum configurado]"
-+-
-+-#: ../lib/arcnet.c:81 ../lib/arcnet.c:96
-++#: ../lib/arcnet.c:70 ../lib/arcnet.c:85
-+ #, c-format
-+ msgid "in_arcnet(%s): invalid arcnet address!\n"
-+ msgstr "in_arcnet(%s): endere�o arcnet inv�lido!\n"
-+ 
-+-#: ../lib/arcnet.c:108
-++#: ../lib/arcnet.c:97
-+ #, c-format
-+ msgid "in_arcnet(%s): trailing : ignored!\n"
-+ msgstr "in_arcnet(%s): trailing : ignorado!\n"
-+ 
-+-#: ../lib/arcnet.c:120
-++#: ../lib/arcnet.c:109
-+ #, c-format
-+ msgid "in_arcnet(%s): trailing junk!\n"
-+ msgstr "in_arcnet(%s): lixo no trailing!\n"
-+ 
-+ #: ../lib/ash.c:81
-++#, c-format
-+ msgid "Malformed Ash address"
-+ msgstr "Endere�o Ash mal formado"
-+ 
-++#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244
-++#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78
-++#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76
-++msgid "[NONE SET]"
-++msgstr "[Nenhum configurado]"
-++
-+ #: ../lib/ax25.c:97 ../lib/netrom.c:100
-+ msgid "Invalid callsign"
-+ msgstr "Callsign inv�lido"
-+@@ -1911,22 +2172,21 @@ msgid "Callsign too long"
-+ msgstr "Callsign muito longo"
-+ 
-+ #: ../lib/ax25_gr.c:47
-++#, c-format
-+ msgid "AX.25 not configured in this system.\n"
-+ msgstr "O AX.25 n�o foi configurado neste sistema.\n"
-+ 
-+ #: ../lib/ax25_gr.c:50
-++#, c-format
-+ msgid "Kernel AX.25 routing table\n"
-+ msgstr "Tabela de roteamento AX.25 do kernel\n"
-+ 
-+ #. xxx
-+ #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55
-++#, c-format
-+ msgid "Destination  Iface    Use\n"
-+ msgstr "Destino      Iface    Uso\n"
-+ 
-+-#: ../lib/ddp_gr.c:21
-+-msgid "Routing table for `ddp' not yet supported.\n"
-+-msgstr "Tabela de roteamento para `ddp' ainda n�o suportada.\n"
-+-
-+ #: ../lib/ether.c:74 ../lib/ether.c:91
-+ #, c-format
-+ msgid "in_ether(%s): invalid ether address!\n"
-+@@ -1942,253 +2202,268 @@ msgstr "in_ether(%s): trailing : ignorad
-+ msgid "in_ether(%s): trailing junk!\n"
-+ msgstr "in_ether(%s): lixo no trailing!\n"
-+ 
-+-#: ../lib/fddi.c:95 ../lib/fddi.c:110
-++#: ../lib/fddi.c:84 ../lib/fddi.c:99
-+ #, c-format
-+ msgid "in_fddi(%s): invalid fddi address!\n"
-+ msgstr "in_fddi(%S): endere�o fddi inv�lido!\n"
-+ 
-+-#: ../lib/fddi.c:122
-++#: ../lib/fddi.c:111
-+ #, c-format
-+ msgid "in_fddi(%s): trailing : ignored!\n"
-+ msgstr "in_fddi(%s): trailing : ignorado!\n"
-+ 
-+-#: ../lib/fddi.c:134
-++#: ../lib/fddi.c:123
-+ #, c-format
-+ msgid "in_fddi(%s): trailing junk!\n"
-+ msgstr "in_fddi(%s): lixo no trailing!\n"
-+ 
-+-#: ../lib/getroute.c:97 ../lib/setroute.c:76
-++#: ../lib/getroute.c:101 ../lib/setroute.c:80
-+ #, c-format
-+ msgid "Address family `%s' not supported.\n"
-+ msgstr "Fam�lia de endere�os `%s' n�o suportada.\n"
-+ 
-+-#: ../lib/getroute.c:103 ../lib/setroute.c:80
-++#: ../lib/getroute.c:107 ../lib/setroute.c:84
-+ #, c-format
-+ msgid "No routing for address family `%s'.\n"
-+ msgstr "Nenhum roteamento para a fam�lia `%s'\n"
-+ 
-+-#: ../lib/hippi.c:96 ../lib/hippi.c:111
-++#: ../lib/hippi.c:84 ../lib/hippi.c:99
-+ #, c-format
-+ msgid "in_hippi(%s): invalid hippi address!\n"
-+ msgstr "in_fddi(%S): endere�o fddi inv�lido!\n"
-+ 
-+-#: ../lib/hippi.c:123
-++#: ../lib/hippi.c:111
-+ #, c-format
-+ msgid "in_hippi(%s): trailing : ignored!\n"
-+ msgstr "in_fddi(%s): trailing : ignorado!\n"
-+ 
-+-#: ../lib/hippi.c:134
-++#: ../lib/hippi.c:122
-+ #, c-format
-+ msgid "in_hippi(%s): trailing junk!\n"
-+ msgstr "in_fddi(%s): lixo no trailing!\n"
-+ 
-+-#: ../lib/hw.c:147
-++#: ../lib/hw.c:160
-+ msgid "Local Loopback"
-+ msgstr "Loopback Local"
-+ 
-+-#: ../lib/hw.c:150
-++#: ../lib/hw.c:163
-+ msgid "Serial Line IP"
-+ msgstr "SLIP"
-+ 
-+-#: ../lib/hw.c:151
-++#: ../lib/hw.c:164
-+ msgid "VJ Serial Line IP"
-+ msgstr "SLIP VJ"
-+ 
-+-#: ../lib/hw.c:152
-++#: ../lib/hw.c:165
-+ msgid "6-bit Serial Line IP"
-+ msgstr "SLIP 6 bits"
-+ 
-+-#: ../lib/hw.c:153
-++#: ../lib/hw.c:166
-+ msgid "VJ 6-bit Serial Line IP"
-+ msgstr "SLIP VJ 6 bits"
-+ 
-+-#: ../lib/hw.c:154
-++#: ../lib/hw.c:167
-+ msgid "Adaptive Serial Line IP"
-+ msgstr "SLIP Adaptativo"
-+ 
-+-#: ../lib/hw.c:157
-++#: ../lib/hw.c:170
-+ msgid "Ethernet"
-+ msgstr "Ethernet"
-+ 
-+-#: ../lib/hw.c:163
-++#: ../lib/hw.c:176
-+ msgid "Fiber Distributed Data Interface"
-+ msgstr "FDDI - Fibra �tica"
-+ 
-+-#: ../lib/hw.c:166
-++#: ../lib/hw.c:179
-+ msgid "HIPPI"
-+ msgstr "HIPPI"
-+ 
-+-#: ../lib/hw.c:178
-++#: ../lib/hw.c:191
-++msgid "generic X.25"
-++msgstr ""
-++
-++#: ../lib/hw.c:194
-+ msgid "IPIP Tunnel"
-+ msgstr "T�nel IPIP"
-+ 
-+-#: ../lib/hw.c:181
-++#: ../lib/hw.c:197
-+ msgid "Point-to-Point Protocol"
-+ msgstr "Protocolo Ponto-a-Ponto"
-+ 
-+-#: ../lib/hw.c:184
-++#: ../lib/hw.c:200
-+ msgid "(Cisco)-HDLC"
-+ msgstr "(Cisco)-HDLC"
-+ 
-+-#: ../lib/hw.c:185
-++#: ../lib/hw.c:201
-+ msgid "LAPB"
-+ msgstr "LAPB"
-+ 
-+-#: ../lib/hw.c:188
-++#: ../lib/hw.c:204
-+ msgid "ARCnet"
-+ msgstr "ARCnet"
-+ 
-+-#: ../lib/hw.c:191
-++#: ../lib/hw.c:207
-+ msgid "Frame Relay DLCI"
-+ msgstr "Frame Relay DLCI"
-+ 
-+-#: ../lib/hw.c:192
-++#: ../lib/hw.c:208
-+ msgid "Frame Relay Access Device"
-+ msgstr "FRAD - Dispositivo de Acesso a Frame Relay"
-+ 
-+-#: ../lib/hw.c:195
-++#: ../lib/hw.c:211
-+ msgid "IPv6-in-IPv4"
-+ msgstr "IPv6 sobre IPv4"
-+ 
-+-#: ../lib/hw.c:198
-++#: ../lib/hw.c:214
-+ msgid "IrLAP"
-+ msgstr "IrLAP"
-+ 
-+-#: ../lib/hw.c:201
-++#: ../lib/hw.c:217
-+ msgid "16/4 Mbps Token Ring"
-+ msgstr "16/4 Mbps Token Ring"
-+ 
-+-#: ../lib/hw.c:203
-++#: ../lib/hw.c:219
-+ msgid "16/4 Mbps Token Ring (New)"
-+ msgstr "16/4 Mbps Token Ring (Novo)"
-+ 
-++#: ../lib/hw.c:226
-++msgid "Generic EUI-64"
-++msgstr ""
-++
-+ #: ../lib/inet.c:153 ../lib/inet6.c:79
-+ #, c-format
-+ msgid "rresolve: unsupport address family %d !\n"
-+ msgstr "rresolve: fam�lia de endere�os %d n�o suportada!\n"
-+ 
-+-#: ../lib/inet6_gr.c:79
-++#: ../lib/inet6.c:131
-++#, fuzzy
-++msgid "[UNKNOWN]"
-++msgstr "DESCONHECIDA"
-++
-++#: ../lib/inet6_gr.c:71
-++#, c-format
-+ msgid "INET6 (IPv6) not configured in this system.\n"
-+ msgstr "NET/ROM n�o configurado neste sistema.\n"
-+ 
-+-#: ../lib/inet6_gr.c:82
-++#: ../lib/inet6_gr.c:74
-++#, c-format
-+ msgid "Kernel IPv6 routing table\n"
-+ msgstr "Tabela de Roteamento IPv6 do Kernel\n"
-+ 
-+-#: ../lib/inet6_gr.c:84
-++#: ../lib/inet6_gr.c:76
-++#, c-format
-+ msgid ""
-+-"Destination                                 Next Hop                         "
-+-"       Flags Metric Ref    Use Iface\n"
-+-msgstr ""
-+-"Destino                                     Pr�ximo \"Hop\"                  "
-+-"        Op��es M�trica Ref   Uso Iface\n"
-++"Destination                                 Next "
-++"Hop                                Flags Metric Ref    Use Iface\n"
-++msgstr "Destino                                     Pr�ximo \"Hop\"                          Op��es M�trica Ref   Uso Iface\n"
-+ 
-+-#: ../lib/inet6_gr.c:158
-++#: ../lib/inet6_gr.c:150
-++#, c-format
-+ msgid "Kernel IPv6 Neighbour Cache\n"
-+ msgstr "Cache de Vizinhos IPv6 do Kernel\n"
-+ 
-+-#: ../lib/inet6_gr.c:161
-++#: ../lib/inet6_gr.c:153
-++#, c-format
-+ msgid ""
-+ "Neighbour                                   HW Address        Iface    Flags "
-+ "Ref State\n"
-+-msgstr ""
-+-"Vizinho                                     Endere�o HW       Iface   Op��es "
-+-"Estado Ref\n"
-++msgstr "Vizinho                                     Endere�o HW       Iface   Op��es Estado Ref\n"
-+ 
-+-#: ../lib/inet6_gr.c:165
-++#: ../lib/inet6_gr.c:157
-++#, c-format
-+ msgid ""
-+ "Neighbour                                   HW Address        Iface    Flags "
-+ "Ref State            Stale(sec) Delete(sec)\n"
-+ msgstr ""
-+-"Vizinho                                     Endere�o HW       Iface   Op��es "
-+-"Estado Ref\n"
-++"Vizinho                                     Endere�o HW       Iface   Op��es Estado Ref\n"
-+ "       Parado(seg) Remover(seg)\n"
-+ 
-+ #: ../lib/inet6_sr.c:46
-++#, c-format
-+ msgid "Usage: inet6_route [-vF] del Target\n"
-+ msgstr "Uso: inet6_route [-vF] del Destino\n"
-+ 
-+ #: ../lib/inet6_sr.c:47
-++#, c-format
-+ msgid "       inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n"
-+ msgstr "       inet6_route [-vF] add Destino [gw Gw] [metric M] [[dev] If]\n"
-+ 
-+ #: ../lib/inet6_sr.c:48
-++#, c-format
-+ msgid "       inet6_route [-FC] flush      NOT supported\n"
-+ msgstr "       inet6_route [-FC] flush      N�O suportado\n"
-+ 
-+-#: ../lib/inet6_sr.c:182
-++#: ../lib/inet6_sr.c:188
-++#, c-format
-+ msgid "Flushing `inet6' routing table not supported\n"
-+ msgstr "Limpeza da tabela de roteamento `inet6' n�o � suportada\n"
-+ 
-+ #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220
-++#, c-format
-+ msgid "INET (IPv4) not configured in this system.\n"
-+ msgstr "NET/ROM n�o configurado neste sistema.\n"
-+ 
-+ #: ../lib/inet_gr.c:53
-++#, c-format
-+ msgid "Kernel IP routing table\n"
-+ msgstr "Tabela de Roteamento IP do Kernel\n"
-+ 
-+ #: ../lib/inet_gr.c:56
-++#, c-format
-+ msgid ""
-+ "Destination     Gateway         Genmask         Flags Metric Ref    Use "
-+ "Iface\n"
-+-msgstr ""
-+-"Destino         Roteador        M�scaraGen.    Op��es M�trica Ref   Uso "
-+-"Iface\n"
-++msgstr "Destino         Roteador        M�scaraGen.    Op��es M�trica Ref   Uso Iface\n"
-+ 
-+ #: ../lib/inet_gr.c:59
-++#, c-format
-+ msgid ""
-+ "Destination     Gateway         Genmask         Flags   MSS Window  irtt "
-+ "Iface\n"
-+-msgstr ""
-+-"Destino         Roteador        M�scaraGen.    Op��es   MSS Janela  irtt "
-+-"Iface\n"
-++msgstr "Destino         Roteador        M�scaraGen.    Op��es   MSS Janela  irtt Iface\n"
-+ 
-+ #: ../lib/inet_gr.c:62
-++#, c-format
-+ msgid ""
-+ "Destination     Gateway         Genmask         Flags Metric Ref    Use "
-+ "Iface    MSS   Window irtt\n"
-+-msgstr ""
-+-"Destino         Roteador        M�scaraGen     Op��es M�trica Ref   Uso "
-+-"Iface    MSS   Janela irtt\n"
-++msgstr "Destino         Roteador        M�scaraGen     Op��es M�trica Ref   Uso Iface    MSS   Janela irtt\n"
-+ 
-+ #: ../lib/inet_gr.c:237
-++#, c-format
-+ msgid "Kernel IP routing cache\n"
-+ msgstr "Tabela de Roteamento IP do Kernel\n"
-+ 
-+ #: ../lib/inet_gr.c:258
-++#, c-format
-+ msgid ""
-+ "Source          Destination     Gateway         Flags Metric Ref    Use "
-+ "Iface\n"
-+-msgstr ""
-+-"Destino         Roteador        M�scaraGen.    Op��es M�trica Ref   Uso "
-+-"Iface\n"
-++msgstr "Destino         Roteador        M�scaraGen.    Op��es M�trica Ref   Uso Iface\n"
-+ 
-+ #: ../lib/inet_gr.c:261
-++#, c-format
-+ msgid ""
-+ "Source          Destination     Gateway         Flags   MSS Window  irtt "
-+ "Iface\n"
-+-msgstr ""
-+-"Destino         Roteador        M�scaraGen.    Op��es   MSS Janela  irtt "
-+-"Iface\n"
-++msgstr "Destino         Roteador        M�scaraGen.    Op��es   MSS Janela  irtt Iface\n"
-+ 
-+ #: ../lib/inet_gr.c:266
-++#, c-format
-+ msgid ""
-+ "Source          Destination     Gateway         Flags Metric Ref    Use "
-+ "Iface    MSS   Window irtt  HH  Arp\n"
-+-msgstr ""
-+-"Destino         Roteador        Origem         Op��es M�trica Ref   Uso "
-+-"Iface    MSS   Janela irtt   HH  Arp\n"
-++msgstr "Destino         Roteador        Origem         Op��es M�trica Ref   Uso Iface    MSS   Janela irtt   HH  Arp\n"
-+ 
-+ #: ../lib/inet_gr.c:290
-++#, c-format
-+ msgid ""
-+ "Source          Destination     Gateway         Flags Metric Ref    Use "
-+ "Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
-+-msgstr ""
-+-"Destino         Roteador        Origem         Op��es M�trica Ref   Uso "
-+-"Iface    MSS   Janela irtt   HH  Arp\n"
-++msgstr "Destino         Roteador        Origem         Op��es M�trica Ref   Uso Iface    MSS   Janela irtt   HH  Arp\n"
-+ 
-+-#: ../lib/inet_sr.c:50
-++#: ../lib/inet_sr.c:51
-++#, c-format
-+ msgid ""
-+ "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] "
-+ "[[dev] If]\n"
-+@@ -2196,31 +2471,36 @@ msgstr ""
-+ "Uso: inet_route [-vF] del {-host|-net} Destino[/prefixo] [gw Gw] [metric M] "
-+ "[[dev] If]\n"
-+ 
-+-#: ../lib/inet_sr.c:51
-++#: ../lib/inet_sr.c:52
-++#, c-format
-+ msgid ""
-+ "       inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n"
-+ msgstr ""
-+ "       inet_route [-vF] add {-host|-net} Destino[/prefixo] [gw Gw] [metric "
-+ "M]\n"
-+ 
-+-#: ../lib/inet_sr.c:52
-++#: ../lib/inet_sr.c:53
-++#, c-format
-+ msgid ""
-+ "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
-+ msgstr ""
-+ "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
-+ 
-+-#: ../lib/inet_sr.c:53
-++#: ../lib/inet_sr.c:54
-++#, c-format
-+ msgid "                              [mod] [dyn] [reinstate] [[dev] If]\n"
-+ msgstr "                              [mod] [dyn] [reinstate] [[dev] If]\n"
-+ 
-+-#: ../lib/inet_sr.c:54
-++#: ../lib/inet_sr.c:55
-++#, c-format
-+ msgid ""
-+ "       inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n"
-+ msgstr ""
-+ "       inet_route [-vF] add {-host|-net} Destino[/prefixo] [metric M] "
-+ "reject\n"
-+ 
-+-#: ../lib/inet_sr.c:55
-++#: ../lib/inet_sr.c:56
-++#, c-format
-+ msgid "       inet_route [-FC] flush      NOT supported\n"
-+ msgstr "       inet_route [-FC] flush      N�O suportado\n"
-+ 
-+@@ -2230,14 +2510,17 @@ msgid "route: %s: cannot use a NETWORK a
-+ msgstr "route: %s: n�o � poss�vel usar uma REDE como roteador!\n"
-+ 
-+ #: ../lib/inet_sr.c:174
-++#, c-format
-+ msgid "route: Invalid MSS/MTU.\n"
-+ msgstr "route: MSS inv�lido.\n"
-+ 
-+ #: ../lib/inet_sr.c:187
-++#, c-format
-+ msgid "route: Invalid window.\n"
-+ msgstr "route: janela inv�lida.\n"
-+ 
-+ #: ../lib/inet_sr.c:203
-++#, c-format
-+ msgid "route: Invalid initial rtt.\n"
-+ msgstr "route: rtt inicial inv�lido.\n"
-+ 
-+@@ -2252,75 +2535,92 @@ msgid "route: bogus netmask %s\n"
-+ msgstr "route: netmask %s inv�lida\n"
-+ 
-+ #: ../lib/inet_sr.c:270
-++#, c-format
-+ msgid "route: netmask doesn't match route address\n"
-+ msgstr "route: a netmask n�o casa com o endere�o de rede\n"
-+ 
-+ #: ../lib/inet_sr.c:306
-++#, c-format
-+ msgid "Flushing `inet' routing table not supported\n"
-+ msgstr "N�o � suportado limpar a tabela de roteamento `inet'\n"
-+ 
-+ #: ../lib/inet_sr.c:310
-++#, c-format
-+ msgid "Modifying `inet' routing cache not supported\n"
-+ msgstr "N�o � suportado modificar o cache de roteamento `inet'\n"
-+ 
-+ #: ../lib/ipx_gr.c:52
-++#, c-format
-+ msgid "IPX not configured in this system.\n"
-+ msgstr "O AX.25 n�o foi configurado neste sistema.\n"
-+ 
-+ #: ../lib/ipx_gr.c:56
-++#, c-format
-+ msgid "Kernel IPX routing table\n"
-+ msgstr "Tabela de roteamento IPX do kernel\n"
-+ 
-+ #. xxx
-+ #: ../lib/ipx_gr.c:57
-++#, c-format
-+ msgid "Destination               Router Net                Router Node\n"
-+ msgstr "Destino                   Rede Roteadora            N� Roteador\n"
-+ 
-+ #: ../lib/ipx_sr.c:33
-++#, c-format
-+ msgid "IPX: this needs to be written\n"
-+ msgstr "NET/ROM: isto precisa ser escrito\n"
-+ 
-+-#: ../lib/masq_info.c:197
-++#: ../lib/masq_info.c:198
-++#, c-format
-+ msgid "IP masquerading entries\n"
-+ msgstr "Entradas de IP mascarado\n"
-+ 
-+-#: ../lib/masq_info.c:200
-++#: ../lib/masq_info.c:201
-++#, c-format
-+ msgid "prot   expire source               destination          ports\n"
-+ msgstr "prot   expira origem               destino             portas\n"
-+ 
-+-#: ../lib/masq_info.c:203
-++#: ../lib/masq_info.c:204
-++#, c-format
-+ msgid ""
-+-"prot   expire    initseq delta prevd source               destination        "
-+-"  ports\n"
-++"prot   expire    initseq delta prevd source               "
-++"destination          ports\n"
-+ msgstr ""
-+-"prot   expira    initseq delta prevd origem               destino            "
-+-" portas\n"
-++"prot   expira    initseq delta prevd origem               "
-++"destino             portas\n"
-+ 
-+ #: ../lib/netrom_gr.c:48
-++#, c-format
-+ msgid "NET/ROM not configured in this system.\n"
-+ msgstr "NET/ROM n�o configurado neste sistema.\n"
-+ 
-+ #: ../lib/netrom_gr.c:51
-++#, c-format
-+ msgid "Kernel NET/ROM routing table\n"
-+ msgstr "Tabela de roteamento NET/ROM do kernel\n"
-+ 
-+ #: ../lib/netrom_gr.c:52
-++#, c-format
-+ msgid "Destination  Mnemonic  Quality  Neighbour  Iface\n"
-+ msgstr "Destino      Mnem�nico Qualidade Vizinho   Iface\n"
-+ 
-+ #: ../lib/netrom_sr.c:34
-++#, c-format
-+ msgid "netrom usage\n"
-+ msgstr "uso de netrom\n"
-+ 
-+ #: ../lib/netrom_sr.c:44
-++#, c-format
-+ msgid "NET/ROM: this needs to be written\n"
-+ msgstr "NET/ROM: isto precisa ser escrito\n"
-+ 
-+ #: ../lib/ppp.c:44
-++#, c-format
-+ msgid "You cannot start PPP with this program.\n"
-+ msgstr "Voc� n�o pode iniciar o PPP com este programa.\n"
-+ 
-+ #: ../lib/ppp_ac.c:38
-++#, c-format
-+ msgid "Sorry, use pppd!\n"
-+ msgstr "Desculpe, use o pppd!\n"
-+ 
-+@@ -2329,51 +2629,314 @@ msgid "Node address must be ten digits"
-+ msgstr "Endere�o do n� deve ter dez d�gitos"
-+ 
-+ #: ../lib/rose_gr.c:51
-++#, c-format
-+ msgid "ROSE not configured in this system.\n"
-+ msgstr "ROSE n�o configurada neste sistema.\n"
-+ 
-+ #: ../lib/rose_gr.c:54
-++#, c-format
-+ msgid "Kernel ROSE routing table\n"
-+ msgstr "Tabela de roteamento ROSE do kernel\n"
-+ 
-+-#: ../lib/tr.c:70 ../lib/tr.c:85
-++#: ../lib/tr.c:86 ../lib/tr.c:101
-+ #, c-format
-+ msgid "in_tr(%s): invalid token ring address!\n"
-+ msgstr "in_tr(%s): endere�o token ring inv�lido!\n"
-+ 
-+-#: ../lib/tr.c:97
-++#: ../lib/tr.c:113
-+ #, c-format
-+ msgid "in_tr(%s): trailing : ignored!\n"
-+ msgstr "in_tr(%s): trailing : ignorado!\n"
-+ 
-+-#: ../lib/tr.c:109
-++#: ../lib/tr.c:125
-+ #, c-format
-+ msgid "in_tr(%s): trailing junk!\n"
-+ msgstr "in_tr(%s): lixo no trailing!\n"
-+ 
-+-#: ../lib/interface.c:124
-++#: ../lib/interface.c:176
-+ #, c-format
-+ msgid "warning: no inet socket available: %s\n"
-+ msgstr "aten��o: nenhum socket inet dispon�vel: %s\n"
-+ 
-+-#: ../lib/interface.c:270
-++#: ../lib/interface.c:325
-+ #, c-format
-+ msgid "Warning: cannot open %s (%s). Limited output.\n"
-+ msgstr "Aten��o: n�o foi poss�vel abrir %s (%s). Sa�da limitada.\n"
-+ 
-+ #. Give better error message for this case.
-+-#: ../lib/interface.c:504
-++#: ../lib/interface.c:571
-+ msgid "Device not found"
-+ msgstr "%s: dispositivo n�o encontrado"
-+ 
-+-#: ../lib/interface.c:508
-++#: ../lib/interface.c:575
-+ #, c-format
-+ msgid "%s: error fetching interface information: %s\n"
-++msgstr "%s: erro obtendo informa��es da interface: %s\n"
-++
-++#: ../lib/interface.c:608
-++msgid "     - no statistics available -"
-++msgstr "     - estat�sticas n�o dispon�veis -"
-++
-++#: ../lib/interface.c:612
-++#, c-format
-++msgid "[NO FLAGS]"
-++msgstr "[SEM FLAGS]"
-++
-++#: ../lib/interface.c:688
-++#, c-format
-++msgid "%-9.9s Link encap:%s  "
-++msgstr "%-9.9s  Encapsulamento do Link: %s  "
-++
-++#: ../lib/interface.c:693
-++#, c-format
-++msgid "HWaddr %s  "
-++msgstr "Endere�o de HW %s  "
-++
-++#: ../lib/interface.c:696
-++#, c-format
-++msgid "Media:%s"
-++msgstr "M�dia:%s"
-++
-++#: ../lib/interface.c:698
-++#, c-format
-++msgid "(auto)"
-++msgstr "(auto)"
-++
-++#: ../lib/interface.c:705
-++#, c-format
-++msgid "          %s addr:%s "
-++msgstr "          %s end.: %s "
-++
-++#: ../lib/interface.c:708
-++#, c-format
-++msgid " P-t-P:%s "
-++msgstr " P-a-P:%s "
-++
-++#: ../lib/interface.c:711
-++#, c-format
-++msgid " Bcast:%s "
-++msgstr " Bcast:%s "
-++
-++#: ../lib/interface.c:713
-++#, c-format
-++msgid " Mask:%s\n"
-++msgstr " Masc:%s\n"
-++
-++#: ../lib/interface.c:730
-++#, c-format
-++msgid "          inet6 addr: %s/%d"
-++msgstr "          endere�o inet6: %s/%d"
-++
-++#: ../lib/interface.c:732
-++#, c-format
-++msgid " Scope:"
-++msgstr " Escopo:"
-++
-++#: ../lib/interface.c:735
-++#, c-format
-++msgid "Global"
-++msgstr "Global"
-++
-++#: ../lib/interface.c:738
-++#, c-format
-++msgid "Link"
-++msgstr "Link"
-++
-++#: ../lib/interface.c:741
-++#, c-format
-++msgid "Site"
-++msgstr "Site"
-++
-++#: ../lib/interface.c:744
-++#, c-format
-++msgid "Compat"
-++msgstr "Compat"
-++
-++#: ../lib/interface.c:747
-++#, c-format
-++msgid "Host"
-++msgstr "M�quina"
-++
-++#: ../lib/interface.c:750
-++#, c-format
-++msgid "Unknown"
-++msgstr "Desconhecido"
-++
-++#: ../lib/interface.c:765
-++#, c-format
-++msgid "          IPX/Ethernet II addr:%s\n"
-++msgstr "      Endere�o IPX/Ethernet II:%s\n"
-++
-++#: ../lib/interface.c:768
-++#, c-format
-++msgid "          IPX/Ethernet SNAP addr:%s\n"
-++msgstr "      Endere�o IPX/Ethernet SNAP:%s\n"
-++
-++#: ../lib/interface.c:771
-++#, c-format
-++msgid "          IPX/Ethernet 802.2 addr:%s\n"
-++msgstr "      Endere�o IPX/Ethernet 802.2:%s\n"
-++
-++#: ../lib/interface.c:774
-++#, c-format
-++msgid "          IPX/Ethernet 802.3 addr:%s\n"
-++msgstr "      Endere�o IPX/Ethernet 802.3:%s\n"
-++
-++#: ../lib/interface.c:784
-++#, c-format
-++msgid "          EtherTalk Phase 2 addr:%s\n"
-++msgstr "          Endere�o EtherTalk fase 2:%s\n"
-++
-++#: ../lib/interface.c:793
-++#, c-format
-++msgid "          econet addr:%s\n"
-++msgstr "          Endere�o econet:%s\n"
-++
-++#: ../lib/interface.c:800
-++#, c-format
-++msgid "[NO FLAGS] "
-++msgstr "[NENHUMA FLAG] "
-++
-++#: ../lib/interface.c:802
-++#, c-format
-++msgid "UP "
-++msgstr "UP "
-++
-++#: ../lib/interface.c:804
-++#, c-format
-++msgid "BROADCAST "
-++msgstr "BROADCAST"
-++
-++#: ../lib/interface.c:806
-++#, c-format
-++msgid "DEBUG "
-++msgstr "DEBUG "
-++
-++#: ../lib/interface.c:808
-++#, c-format
-++msgid "LOOPBACK "
-++msgstr "LOOPBACK"
-++
-++#: ../lib/interface.c:810
-++#, c-format
-++msgid "POINTOPOINT "
-++msgstr "POINTOPOINT "
-++
-++#: ../lib/interface.c:812
-++#, c-format
-++msgid "NOTRAILERS "
-++msgstr "NOTRAILERS "
-++
-++#: ../lib/interface.c:814
-++#, c-format
-++msgid "RUNNING "
-++msgstr "RUNNING "
-++
-++#: ../lib/interface.c:816
-++#, c-format
-++msgid "NOARP "
-++msgstr "NOARP "
-++
-++#: ../lib/interface.c:818
-++#, c-format
-++msgid "PROMISC "
-++msgstr "PROMISC "
-++
-++#: ../lib/interface.c:820
-++#, c-format
-++msgid "ALLMULTI "
-++msgstr "ALLMULTI "
-++
-++#: ../lib/interface.c:822
-++#, c-format
-++msgid "SLAVE "
-++msgstr "SLAVE "
-++
-++#: ../lib/interface.c:824
-++#, c-format
-++msgid "MASTER "
-++msgstr "MASTER "
-++
-++#: ../lib/interface.c:826
-++#, c-format
-++msgid "MULTICAST "
-++msgstr "MULTICAST "
-++
-++#: ../lib/interface.c:829
-++#, c-format
-++msgid "DYNAMIC "
-++msgstr "DYNAMIC "
-++
-++#. DONT FORGET TO ADD THE FLAGS IN ife_print_short
-++#: ../lib/interface.c:832
-++#, c-format
-++msgid " MTU:%d  Metric:%d"
-++msgstr " MTU:%d  M�trica:%d"
-++
-++#: ../lib/interface.c:836
-++#, c-format
-++msgid "  Outfill:%d  Keepalive:%d"
-++msgstr "  Outfill:%d  Keepalive:%d"
-++
-++#: ../lib/interface.c:850
-++#, fuzzy, c-format
-++msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
-++msgstr "Pacotes RX:%lu erros:%lu descartados:%lu sobreposi��es:%lu frame:%lu\n"
-++
-++#: ../lib/interface.c:855
-++#, c-format
-++msgid "             compressed:%lu\n"
-++msgstr "             compactados:%lu\n"
-++
-++#: ../lib/interface.c:895
-++#, fuzzy, c-format
-++msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
-++msgstr "Pacotes TX:%lu erros:%lu descartados:%lu sobreposi��es:%lu portadora:%lu\n"
-++
-++#: ../lib/interface.c:899
-++#, c-format
-++msgid "          collisions:%lu "
-++msgstr "          colis�es:%lu "
-++
-++#: ../lib/interface.c:901
-++#, c-format
-++msgid "compressed:%lu "
-++msgstr "compactados:%lu "
-++
-++#: ../lib/interface.c:903
-++#, c-format
-++msgid "txqueuelen:%d "
-++msgstr "txqueuelen:%d "
-++
-++#: ../lib/interface.c:905
-++#, c-format
-++msgid "RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"
-+ msgstr ""
-+-"%s: erro obtendo informa��es da interface: %s\n"
-+-"\n"
-+ 
-+-#: ../lib/sockets.c:59
-++#: ../lib/interface.c:916
-++#, c-format
-++msgid "Interrupt:%d "
-++msgstr "IRQ:%d "
-++
-++#. Only print devices using it for
-++#. I/O maps
-++#: ../lib/interface.c:919
-++#, c-format
-++msgid "Base address:0x%x "
-++msgstr "Endere�o de E/S:0x%x "
-++
-++#: ../lib/interface.c:921
-++#, c-format
-++msgid "Memory:%lx-%lx "
-++msgstr "Mem�ria:%lx-%lx "
-++
-++#: ../lib/interface.c:924
-++#, c-format
-++msgid "DMA chan:%x "
-++msgstr "Canal DMA:%x "
-++
-++#: ../lib/sockets.c:63
-++#, c-format
-+ msgid "No usable address families found.\n"
-+ msgstr "Nenhuma fam�lia de endere�os que possa ser usada foi encontrada.\n"
-+ 
-+@@ -2397,29 +2960,32 @@ msgstr "%s: endere�o %s inv�lido.\n"
-+ msgid "ip: argument is wrong: %s\n"
-+ msgstr "ip: argumento errado: %s\n"
-+ 
-+-#: ../ipmaddr.c:56
-++#: ../ipmaddr.c:61
-++#, c-format
-+ msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n"
-+ msgstr "Uso: ipmaddr [ add | del ] ENDMULTI dev STRING\n"
-+ 
-+-#: ../ipmaddr.c:57
-++#: ../ipmaddr.c:62
-++#, c-format
-+ msgid "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
-+ msgstr "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
-+ 
-+-#: ../ipmaddr.c:58
-++#: ../ipmaddr.c:63
-++#, c-format
-+ msgid "       ipmaddr -V | -version\n"
-+ msgstr "       ipmaddr -V | -version\n"
-+ 
-+-#: ../ipmaddr.c:258
-++#: ../ipmaddr.c:263
-+ #, c-format
-+ msgid "family %d "
-+ msgstr "fam�lia %d "
-+ 
-+-#: ../ipmaddr.c:267
-++#: ../ipmaddr.c:272
-+ #, c-format
-+ msgid " users %d"
-+ msgstr " usu�rios %d"
-+ 
-+-#: ../ipmaddr.c:353
-++#: ../ipmaddr.c:358
-+ msgid "Cannot create socket"
-+ msgstr "N�o foi poss�vel criar o socket"
-+ 
-+@@ -2434,6 +3000,7 @@ msgid "slattach: tty_lock: (%s): %s\n"
-+ msgstr "slattach: tty_lock: (%s): %s\n"
-+ 
-+ #: ../slattach.c:192
-++#, c-format
-+ msgid "slattach: cannot write PID file\n"
-+ msgstr "slattach: n�o foi poss�vel escrever o arquivo PID\n"
-+ 
-+@@ -2452,39 +3019,69 @@ msgstr "slattach: tty_hangup(DROP): %s\n
-+ msgid "slattach: tty_hangup(RAISE): %s\n"
-+ msgstr "slattach: tty_hangup(RAISE): %s\n"
-+ 
-+-#: ../slattach.c:486
-++#: ../slattach.c:468
-++#, fuzzy, c-format
-++msgid "slattach: tty name too long\n"
-++msgstr "%s: nome muito longo\n"
-++
-++#: ../slattach.c:498
-++#, c-format
-+ msgid "slattach: tty_open: cannot get current state!\n"
-+ msgstr "slattach: tty_open: n�o foi poss�vel obter o estado corrente!\n"
-+ 
-+-#: ../slattach.c:493
-++#: ../slattach.c:505
-++#, c-format
-+ msgid "slattach: tty_open: cannot get current line disc!\n"
-+-msgstr ""
-+-"slattach: tty_open: n�o foi poss�vel obter a disciplina de linha corrente!\n"
-++msgstr "slattach: tty_open: n�o foi poss�vel obter a disciplina de linha corrente!\n"
-+ 
-+-#: ../slattach.c:501
-++#: ../slattach.c:513
-++#, c-format
-+ msgid "slattach: tty_open: cannot set RAW mode!\n"
-+ msgstr "slattach: tty_open: n�o foi poss�vel configurar o modo RAW!\n"
-+ 
-+-#: ../slattach.c:508
-++#: ../slattach.c:520
-+ #, c-format
-+ msgid "slattach: tty_open: cannot set %s bps!\n"
-+ msgstr "slattach: tty_open: n�o foi poss�vel configurar %s bps!\n"
-+ 
-+-#: ../slattach.c:518
-++#: ../slattach.c:530
-++#, c-format
-+ msgid "slattach: tty_open: cannot set 8N1 mode!\n"
-+ msgstr "slattach: tty_open: n�o foi poss�vel configurar modo 8N1!\n"
-+ 
-+-#: ../slattach.c:686
-++#: ../slattach.c:672
-++#, c-format
-++msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n"
-++msgstr ""
-++
-++#: ../slattach.c:704
-+ #, c-format
-+ msgid "%s started"
-+ msgstr "%s inicializado"
-+ 
-+-#: ../slattach.c:687
-++#: ../slattach.c:705
-+ #, c-format
-+ msgid " on %s"
-+ msgstr " em %s"
-+ 
-+-#: ../slattach.c:688
-++#: ../slattach.c:706
-+ #, c-format
-+ msgid " interface %s\n"
-+ msgstr "%s: interface desconhecida.\n"
-++
-++#~ msgid ""
-++#~ "  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
-++#~ "<-''-\n"
-++#~ msgstr "  arp [-v]   [<HW>] [-i <if>] -s  <m�quina> <end_hw>  [netmask <nm>] pub  <-''-\n"
-++
-++#~ msgid "%s: unknown interface: %s\n"
-++#~ msgstr "%s: interface desconhecida: %s\n"
-++
-++#~ msgid "address mask replies"
-++#~ msgstr "resposta a mascara de endere�o"
-++
-++#~ msgid "unknown title %s\n"
-++#~ msgstr "t�tulo %s desconhecido\n"
-++
-++#~ msgid "Routing table for `ddp' not yet supported.\n"
-++#~ msgstr "Tabela de roteamento para `ddp' ainda n�o suportada.\n"
-+Index: net-tools/po/net-tools.pot
-+===================================================================
-+--- net-tools.orig/po/net-tools.pot
-++++ net-tools/po/net-tools.pot
-+@@ -1,253 +1,275 @@
-+ # SOME DESCRIPTIVE TITLE.
-+-# Copyright (C) YEAR Free Software Foundation, Inc.
-++# 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.
-+ #
-+ #, fuzzy
-+ msgid ""
-+ msgstr ""
-+ "Project-Id-Version: PACKAGE VERSION\n"
-+-"POT-Creation-Date: 2001-04-15 15:40+0100\n"
-++"Report-Msgid-Bugs-To: \n"
-++"POT-Creation-Date: 2007-06-30 12:28+0900\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"
-+ "MIME-Version: 1.0\n"
-+ "Content-Type: text/plain; charset=CHARSET\n"
-+-"Content-Transfer-Encoding: ENCODING\n"
-++"Content-Transfer-Encoding: 8bit\n"
-+ 
-+-#: ../arp.c:111 ../arp.c:270
-++#: ../arp.c:112 ../arp.c:279
-++#, c-format
-+ msgid "arp: need host name\n"
-+ msgstr ""
-+ 
-+-#: ../arp.c:208 ../arp.c:222
-++#: ../arp.c:215 ../arp.c:230
-+ #, c-format
-+ msgid "No ARP entry for %s\n"
-+ msgstr ""
-+ 
-+-#: ../arp.c:240
-++#: ../arp.c:248
-+ #, c-format
-+ msgid "arp: cant get HW-Address for `%s': %s.\n"
-+ msgstr ""
-+ 
-+-#: ../arp.c:244
-++#: ../arp.c:252
-++#, c-format
-+ msgid "arp: protocol type mismatch.\n"
-+ msgstr ""
-+ 
-+-#: ../arp.c:253
-++#: ../arp.c:261
-+ #, c-format
-+ msgid "arp: device `%s' has HW address %s `%s'.\n"
-+ msgstr ""
-+ 
-+-#: ../arp.c:283
-++#: ../arp.c:293
-++#, c-format
-+ msgid "arp: need hardware address\n"
-+ msgstr ""
-+ 
-+-#: ../arp.c:291
-++#: ../arp.c:301
-++#, c-format
-+ msgid "arp: invalid hardware address\n"
-+ msgstr ""
-+ 
-+-#: ../arp.c:388
-++#: ../arp.c:398
-+ #, c-format
-+ msgid "arp: cannot open etherfile %s !\n"
-+ msgstr ""
-+ 
-+-#: ../arp.c:404
-++#: ../arp.c:414
-+ #, c-format
-+ msgid "arp: format error on line %u of etherfile %s !\n"
-+ msgstr ""
-+ 
-+-#: ../arp.c:417
-++#: ../arp.c:427
-+ #, c-format
-+ msgid "arp: cannot set entry on line %u of etherfile %s !\n"
-+ msgstr ""
-+ 
-+-#: ../arp.c:438
-++#: ../arp.c:448
-++#, c-format
-+ msgid ""
-+ "Address                  HWtype  HWaddress           Flags Mask            "
-+ "Iface\n"
-+ msgstr ""
-+ 
-+-#: ../arp.c:468
-++#: ../arp.c:476
-++msgid "<from_interface>"
-++msgstr ""
-++
-++#: ../arp.c:478
-+ msgid "(incomplete)"
-+ msgstr ""
-+ 
-+-#: ../arp.c:485
-++#: ../arp.c:495
-+ #, c-format
-+ msgid "%s (%s) at "
-+ msgstr ""
-+ 
-+-#: ../arp.c:491
-++#: ../arp.c:501
-++#, c-format
-+ msgid "<incomplete> "
-+ msgstr ""
-+ 
-+-#: ../arp.c:497
-++#: ../arp.c:507
-+ #, c-format
-+ msgid "netmask %s "
-+ msgstr ""
-+ 
-+-#: ../arp.c:514
-++#: ../arp.c:524
-+ #, c-format
-+ msgid "on %s\n"
-+ msgstr ""
-+ 
-+-#: ../arp.c:593
-++#: ../arp.c:605
-+ #, c-format
-+ msgid "Entries: %d\tSkipped: %d\tFound: %d\n"
-+ msgstr ""
-+ 
-+-#: ../arp.c:597
-++#: ../arp.c:609
-+ #, c-format
-+ msgid "%s (%s) -- no entry\n"
-+ msgstr ""
-+ 
-+-#: ../arp.c:599
-++#: ../arp.c:611
-+ #, c-format
-+ msgid "arp: in %d entries no match found.\n"
-+ msgstr ""
-+ 
-+-#: ../arp.c:614
-++#: ../arp.c:626
-++#, c-format
-+ msgid ""
-+ "Usage:\n"
-+ "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP "
-+ "cache\n"
-+ msgstr ""
-+ 
-+-#: ../arp.c:615
-++#: ../arp.c:627
-++#, c-format
-+ msgid ""
-+-"  arp [-v]          [-i <if>] -d  <hostname> [pub][nopub]    <-Delete ARP "
-++"  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP "
-+ "entry\n"
-+ msgstr ""
-+ 
-+-#: ../arp.c:616
-++#: ../arp.c:628
-++#, c-format
-+ msgid ""
-+-"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]              <-Add entry from "
-++"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from "
-+ "file\n"
-+ msgstr ""
-+ 
-+-#: ../arp.c:617
-++#: ../arp.c:629
-++#, c-format
-+ msgid ""
-+-"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [temp][nopub] <-Add "
-++"  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add "
-+ "entry\n"
-+ msgstr ""
-+ 
-+-#: ../arp.c:618
-+-msgid ""
-+-"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
-+-"<-''-\n"
-+-msgstr ""
-+-
-+-#: ../arp.c:619
-++#: ../arp.c:630
-++#, c-format
-+ msgid ""
-+-"  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub      "
-++"  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          "
-+ "<-''-\n"
-+ "\n"
-+ msgstr ""
-+ 
-+-#: ../arp.c:621
-++#: ../arp.c:632
-++#, c-format
-+ msgid ""
-+ "        -a                       display (all) hosts in alternative (BSD) "
-+ "style\n"
-+ msgstr ""
-+ 
-+-#: ../arp.c:622
-++#: ../arp.c:633
-++#, c-format
-+ msgid "        -s, --set                set a new ARP entry\n"
-+ msgstr ""
-+ 
-+-#: ../arp.c:623
-++#: ../arp.c:634
-++#, c-format
-+ msgid "        -d, --delete             delete a specified entry\n"
-+ msgstr ""
-+ 
-+-#: ../arp.c:624 ../netstat.c:1490 ../route.c:86
-++#: ../arp.c:635 ../netstat.c:1503 ../route.c:86
-++#, c-format
-+ msgid "        -v, --verbose            be verbose\n"
-+ msgstr ""
-+ 
-+-#: ../arp.c:625 ../netstat.c:1491 ../route.c:87
-++#: ../arp.c:636 ../netstat.c:1504 ../route.c:87
-++#, c-format
-+ msgid "        -n, --numeric            don't resolve names\n"
-+ msgstr ""
-+ 
-+-#: ../arp.c:626
-++#: ../arp.c:637
-++#, c-format
-+ msgid ""
-+ "        -i, --device             specify network interface (e.g. eth0)\n"
-+ msgstr ""
-+ 
-+-#: ../arp.c:627
-++#: ../arp.c:638
-++#, c-format
-+ msgid "        -D, --use-device         read <hwaddr> from given device\n"
-+ msgstr ""
-+ 
-+-#: ../arp.c:628
-++#: ../arp.c:639
-++#, c-format
-+ msgid "        -A, -p, --protocol       specify protocol family\n"
-+ msgstr ""
-+ 
-+-#: ../arp.c:629
-++#: ../arp.c:640
-++#, c-format
-+ msgid ""
-+-"        -f, --file               read new entries from file or from "
-+-"/etc/ethers\n"
-++"        -f, --file               read new entries from file or from /etc/"
-++"ethers\n"
-+ "\n"
-+ msgstr ""
-+ 
-+-#: ../arp.c:631 ../rarp.c:182
-++#: ../arp.c:642 ../rarp.c:182
-+ #, c-format
-+ msgid "  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"
-+ msgstr ""
-+ 
-+-#: ../arp.c:632 ../rarp.c:183
-++#: ../arp.c:643 ../rarp.c:183
-++#, c-format
-+ msgid "  List of possible hardware types (which support ARP):\n"
-+ msgstr ""
-+ 
-+-#: ../arp.c:666 ../arp.c:751
-++#: ../arp.c:677 ../arp.c:762
-+ #, c-format
-+ msgid "%s: hardware type not supported!\n"
-+ msgstr ""
-+ 
-+-#: ../arp.c:670
-++#: ../arp.c:681
-+ #, c-format
-+ msgid "%s: address family not supported!\n"
-+ msgstr ""
-+ 
-+-#: ../arp.c:705
-++#: ../arp.c:716
-++#, c-format
-+ msgid "arp: -N not yet supported.\n"
-+ msgstr ""
-+ 
-+-#: ../arp.c:715
-++#: ../arp.c:726
-+ #, c-format
-+ msgid "arp: %s: unknown address family.\n"
-+ msgstr ""
-+ 
-+-#: ../arp.c:724
-++#: ../arp.c:735
-+ #, c-format
-+ msgid "arp: %s: unknown hardware type.\n"
-+ msgstr ""
-+ 
-+-#: ../arp.c:743
-++#: ../arp.c:754
-+ #, c-format
-+ msgid "arp: %s: kernel only supports 'inet'.\n"
-+ msgstr ""
-+ 
-+-#: ../arp.c:756
-++#: ../arp.c:767
-+ #, c-format
-+ msgid "arp: %s: hardware type without ARP support.\n"
-+ msgstr ""
-+ 
-+-#: ../hostname.c:70
-++#: ../hostname.c:71
-+ #, c-format
-+ msgid "Setting nodename to `%s'\n"
-+ msgstr ""
-+ 
-+-#: ../hostname.c:75
-++#: ../hostname.c:76
-+ #, c-format
-+ msgid "%s: you must be root to change the node name\n"
-+ msgstr ""
-+ 
-+-#: ../hostname.c:78 ../hostname.c:98 ../hostname.c:117
-++#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117
-+ #, c-format
-+ msgid "%s: name too long\n"
-+ msgstr ""
-+ 
-+-#: ../hostname.c:90
-++#: ../hostname.c:91
-+ #, c-format
-+ msgid "Setting hostname to `%s'\n"
-+ msgstr ""
-+ 
-+-#: ../hostname.c:95
-++#: ../hostname.c:96
-+ #, c-format
-+ msgid "%s: you must be root to change the host name\n"
-+ msgstr ""
-+@@ -262,103 +284,119 @@ msgstr ""
-+ msgid "%s: you must be root to change the domain name\n"
-+ msgstr ""
-+ 
-+-#: ../hostname.c:132
-++#: ../hostname.c:131
-+ #, c-format
-+ msgid "Resolving `%s' ...\n"
-+ msgstr ""
-+ 
-+-#: ../hostname.c:138
-++#: ../hostname.c:137
-+ #, c-format
-+ msgid "Result: h_name=`%s'\n"
-+ msgstr ""
-+ 
-+-#: ../hostname.c:143
-++#: ../hostname.c:142
-+ #, c-format
-+ msgid "Result: h_aliases=`%s'\n"
-+ msgstr ""
-+ 
-+-#: ../hostname.c:148
-++#: ../hostname.c:147
-+ #, c-format
-+ msgid "Result: h_addr_list=`%s'\n"
-+ msgstr ""
-+ 
-+-#: ../hostname.c:210
-++#: ../hostname.c:208
-+ #, c-format
-+ msgid "%s: can't open `%s'\n"
-+ msgstr ""
-+ 
-+-#: ../hostname.c:224
-++#: ../hostname.c:222
-++#, c-format
-+ msgid "Usage: hostname [-v] {hostname|-F file}      set hostname (from file)\n"
-+ msgstr ""
-+ 
-+-#: ../hostname.c:225
-++#: ../hostname.c:223
-++#, c-format
-+ msgid ""
-+ "       domainname [-v] {nisdomain|-F file}   set NIS domainname (from file)\n"
-+ msgstr ""
-+ 
-+-#: ../hostname.c:227
-++#: ../hostname.c:225
-++#, c-format
-+ msgid ""
-+ "       nodename [-v] {nodename|-F file}      set DECnet node name (from "
-+ "file)\n"
-+ msgstr ""
-+ 
-+-#: ../hostname.c:229
-++#: ../hostname.c:227
-++#, c-format
-+ msgid "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  display formatted name\n"
-+ msgstr ""
-+ 
-+-#: ../hostname.c:230
-++#: ../hostname.c:228
-++#, c-format
-+ msgid ""
-+ "       hostname [-v]                         display hostname\n"
-+ "\n"
-+ msgstr ""
-+ 
-+-#: ../hostname.c:231
-++#: ../hostname.c:229
-++#, c-format
-+ msgid ""
-+ "       hostname -V|--version|-h|--help       print info and exit\n"
-+ "\n"
-+ msgstr ""
-+ 
-+-#: ../hostname.c:232
-++#: ../hostname.c:230
-++#, c-format
-+ msgid ""
-+ "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
-+ "\n"
-+ msgstr ""
-+ 
-+-#: ../hostname.c:233
-++#: ../hostname.c:231
-++#, c-format
-+ msgid "    -s, --short           short host name\n"
-+ msgstr ""
-+ 
-+-#: ../hostname.c:234
-++#: ../hostname.c:232
-++#, c-format
-+ msgid "    -a, --alias           alias names\n"
-+ msgstr ""
-+ 
-+-#: ../hostname.c:235
-++#: ../hostname.c:233
-++#, c-format
-+ msgid "    -i, --ip-address      addresses for the hostname\n"
-+ msgstr ""
-+ 
-+-#: ../hostname.c:236
-++#: ../hostname.c:234
-++#, c-format
-+ msgid "    -f, --fqdn, --long    long host name (FQDN)\n"
-+ msgstr ""
-+ 
-+-#: ../hostname.c:237
-++#: ../hostname.c:235
-++#, c-format
-+ msgid "    -d, --domain          DNS domain name\n"
-+ msgstr ""
-+ 
-+-#: ../hostname.c:238
-++#: ../hostname.c:236
-++#, c-format
-+ msgid "    -y, --yp, --nis       NIS/YP domainname\n"
-+ msgstr ""
-+ 
-+-#: ../hostname.c:240
-++#: ../hostname.c:238
-++#, c-format
-+ msgid "    -n, --node            DECnet node name\n"
-+ msgstr ""
-+ 
-+-#: ../hostname.c:242
-++#: ../hostname.c:240
-++#, c-format
-+ msgid ""
-+ "    -F, --file            read hostname or NIS domainname from given file\n"
-+ "\n"
-+ msgstr ""
-+ 
-+-#: ../hostname.c:244
-++#: ../hostname.c:242
-++#, c-format
-+ msgid ""
-+ "   This command can read or set the hostname or the NIS domainname. You can\n"
-+ "   also read the DNS domain or the FQDN (fully qualified domain name).\n"
-+@@ -367,587 +405,706 @@ msgid ""
-+ "   part of the FQDN) in the /etc/hosts file.\n"
-+ msgstr ""
-+ 
-+-#: ../hostname.c:340
-++#: ../hostname.c:338
-+ #, c-format
-+ msgid "%s: You can't change the DNS domain name with this command\n"
-+ msgstr ""
-+ 
-+-#: ../hostname.c:341
-++#: ../hostname.c:339
-++#, c-format
-+ msgid ""
-+ "\n"
-+ "Unless you are using bind or NIS for host lookups you can change the DNS\n"
-+ msgstr ""
-+ 
-+-#: ../hostname.c:342
-++#: ../hostname.c:340
-++#, c-format
-+ msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n"
-+ msgstr ""
-+ 
-+-#: ../hostname.c:359
-++#: ../hostname.c:357
-+ #, c-format
-+ msgid "gethostname()=`%s'\n"
-+ msgstr ""
-+ 
-+-#: ../hostname.c:376
-++#: ../hostname.c:374
-+ #, c-format
-+ msgid "getdomainname()=`%s'\n"
-+ msgstr ""
-+ 
-+-#: ../hostname.c:391
-++#: ../hostname.c:389
-+ #, c-format
-+ msgid "getnodename()=`%s'\n"
-+ msgstr ""
-+ 
-+-#: ../ifconfig.c:108
-++#: ../ifconfig.c:107
-++#, c-format
-+ msgid ""
-+-"Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
-++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
-+ "Flg\n"
-+ msgstr ""
-+ 
-+-#: ../ifconfig.c:130 ../ifconfig.c:162
-++#: ../ifconfig.c:129 ../ifconfig.c:161
-+ #, c-format
-+-msgid "%s: unknown interface: %s\n"
-++msgid "%s: ERROR while getting interface flags: %s\n"
-+ msgstr ""
-+ 
-+-#: ../ifconfig.c:154 ../ifconfig.c:734 ../ifconfig.c:825 ../ifconfig.c:936
-++#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862
-++#: ../ifconfig.c:973
-++#, c-format
-+ msgid "No support for INET on this system.\n"
-+ msgstr ""
-+ 
-+-#: ../ifconfig.c:177
-++#: ../ifconfig.c:193
-++#, c-format
-++msgid "%s: ERROR while testing interface flags: %s\n"
-++msgstr ""
-++
-++#: ../ifconfig.c:202
-++#, c-format
-+ msgid ""
-+ "Usage:\n"
-+-"  ifconfig [-a] [-i] [-v] [-s] <interface> [[<AF>] <address>]\n"
-++"  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"
-+ msgstr ""
-+ 
-+-#: ../ifconfig.c:179
-++#: ../ifconfig.c:204
-++#, c-format
-+ msgid "  [add <address>[/<prefixlen>]]\n"
-+ msgstr ""
-+ 
-+-#: ../ifconfig.c:180
-++#: ../ifconfig.c:205
-++#, c-format
-+ msgid "  [del <address>[/<prefixlen>]]\n"
-+ msgstr ""
-+ 
-+-#: ../ifconfig.c:181
-++#: ../ifconfig.c:206
-++#, c-format
-+ msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
-+ msgstr ""
-+ 
-+-#: ../ifconfig.c:182
-++#: ../ifconfig.c:207
-++#, c-format
-+ msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
-+ msgstr ""
-+ 
-+-#: ../ifconfig.c:185
-++#: ../ifconfig.c:210
-++#, c-format
-+ msgid "  [outfill <NN>] [keepalive <NN>]\n"
-+ msgstr ""
-+ 
-+-#: ../ifconfig.c:187
-++#: ../ifconfig.c:212
-++#, c-format
-+ msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
-+ msgstr ""
-+ 
-+-#: ../ifconfig.c:188
-++#: ../ifconfig.c:213
-++#, c-format
-+ msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
-+ msgstr ""
-+ 
-+-#: ../ifconfig.c:189
-++#: ../ifconfig.c:214
-++#, c-format
-+ msgid "  [multicast]  [[-]promisc]\n"
-+ msgstr ""
-+ 
-+-#: ../ifconfig.c:190
-++#: ../ifconfig.c:215
-++#, c-format
-+ msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
-+ msgstr ""
-+ 
-+-#: ../ifconfig.c:192
-++#: ../ifconfig.c:217
-++#, c-format
-+ msgid "  [txqueuelen <NN>]\n"
-+ msgstr ""
-+ 
-+-#: ../ifconfig.c:195
-++#: ../ifconfig.c:220
-++#, c-format
-+ msgid "  [[-]dynamic]\n"
-+ msgstr ""
-+ 
-+-#: ../ifconfig.c:197
-++#: ../ifconfig.c:222
-++#, c-format
-+ msgid ""
-+ "  [up|down] ...\n"
-+ "\n"
-+ msgstr ""
-+ 
-+-#: ../ifconfig.c:199
-++#: ../ifconfig.c:224
-++#, c-format
-+ msgid "  <HW>=Hardware Type.\n"
-+ msgstr ""
-+ 
-+-#: ../ifconfig.c:200
-++#: ../ifconfig.c:225
-++#, c-format
-+ msgid "  List of possible hardware types:\n"
-+ msgstr ""
-+ 
-+ #. 1 = ARPable
-+-#: ../ifconfig.c:202
-++#: ../ifconfig.c:227
-+ #, c-format
-+ msgid "  <AF>=Address family. Default: %s\n"
-+ msgstr ""
-+ 
-+-#: ../ifconfig.c:203
-++#: ../ifconfig.c:228
-++#, c-format
-+ msgid "  List of possible address families:\n"
-+ msgstr ""
-+ 
-+-#: ../ifconfig.c:278
-++#: ../ifconfig.c:303
-+ #, c-format
-+ msgid "ifconfig: option `%s' not recognised.\n"
-+ msgstr ""
-+ 
-+-#: ../ifconfig.c:280 ../ifconfig.c:925
-++#: ../ifconfig.c:305 ../ifconfig.c:962
-++#, c-format
-+ msgid "ifconfig: `--help' gives usage information.\n"
-+ msgstr ""
-+ 
-+-#: ../ifconfig.c:355
-++#: ../ifconfig.c:380
-++#, c-format
-+ msgid "Unknown media type.\n"
-+ msgstr ""
-+ 
-+-#: ../ifconfig.c:647
-++#: ../ifconfig.c:417
-++#, c-format
-++msgid ""
-++"Warning: Interface %s still in promisc mode... maybe other application is "
-++"running?\n"
-++msgstr ""
-++
-++#: ../ifconfig.c:429
-++#, c-format
-++msgid "Warning: Interface %s still in MULTICAST mode.\n"
-++msgstr ""
-++
-++#: ../ifconfig.c:441
-++#, c-format
-++msgid "Warning: Interface %s still in ALLMULTI mode.\n"
-++msgstr ""
-++
-++#: ../ifconfig.c:465
-++#, c-format
-++msgid "Warning: Interface %s still in DYNAMIC mode.\n"
-++msgstr ""
-++
-++#: ../ifconfig.c:523
-++#, c-format
-++msgid "Warning: Interface %s still in BROADCAST mode.\n"
-++msgstr ""
-++
-++#: ../ifconfig.c:652
-++#, c-format
-++msgid "Warning: Interface %s still in POINTOPOINT mode.\n"
-++msgstr ""
-++
-++#: ../ifconfig.c:684
-+ #, c-format
-+ msgid "hw address type `%s' has no handler to set address. failed.\n"
-+ msgstr ""
-+ 
-+-#: ../ifconfig.c:656
-++#: ../ifconfig.c:693
-+ #, c-format
-+ msgid "%s: invalid %s address.\n"
-+ msgstr ""
-+ 
-+-#: ../ifconfig.c:700 ../ifconfig.c:790 ../ifconfig.c:876
-++#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913
-++#, c-format
-+ msgid "No support for INET6 on this system.\n"
-+ msgstr ""
-+ 
-+-#: ../ifconfig.c:743 ../ifconfig.c:834
-++#: ../ifconfig.c:780 ../ifconfig.c:871
-+ #, c-format
-+ msgid "Interface %s not initialized\n"
-+ msgstr ""
-+ 
-+-#: ../ifconfig.c:755 ../ifconfig.c:845
-++#: ../ifconfig.c:792 ../ifconfig.c:882
-++#, c-format
-+ msgid "Bad address.\n"
-+ msgstr ""
-+ 
-+-#: ../ifconfig.c:848
-++#: ../ifconfig.c:885
-++#, c-format
-+ msgid "Address deletion not supported on this system.\n"
-+ msgstr ""
-+ 
-+-#: ../ifconfig.c:920
-++#: ../ifconfig.c:957
-++#, c-format
-+ msgid "ifconfig: Cannot set address for this protocol family.\n"
-+ msgstr ""
-+ 
-+-#: ../ifconfig.c:946
-++#: ../ifconfig.c:983
-++#, c-format
-+ msgid "No support for ECONET on this system.\n"
-+ msgstr ""
-+ 
-+-#: ../ifconfig.c:954
-++#: ../ifconfig.c:991
-+ #, c-format
-+ msgid "Don't know how to set addresses for family %d.\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:430
-++#: ../ifconfig.c:1021
-++#, c-format
-++msgid "WARNING: at least one error occured. (%d)\n"
-++msgstr ""
-++
-++#: ../netstat.c:434
-+ #, c-format
-+ msgid ""
-+ "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:434
-++#: ../netstat.c:438
-++#, c-format
-+ msgid ""
-+ "(Not all processes could be identified, non-owned process info\n"
-+ " will not be shown, you would have to be root to see it all.)\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:441 ../netstat.c:1176 ../netstat.c:1253
-++#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266
-+ msgid "LISTENING"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:442
-++#: ../netstat.c:446
-+ msgid "CONN SENT"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:443 ../netstat.c:1255
-++#: ../netstat.c:447 ../netstat.c:1268
-+ msgid "DISC SENT"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:444 ../netstat.c:511 ../netstat.c:894 ../netstat.c:1256
-++#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269
-+ msgid "ESTABLISHED"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:466
-++#: ../netstat.c:470
-++#, c-format
-+ msgid "Active NET/ROM sockets\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:467
-++#: ../netstat.c:471
-++#, c-format
-+ msgid ""
-+-"User       Dest       Source     Device  State        Vr/Vs    Send-Q  "
-+-"Recv-Q\n"
-++"User       Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-"
-++"Q\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:477 ../netstat.c:1295
-++#: ../netstat.c:481 ../netstat.c:1308
-+ #, c-format
-+ msgid "Problem reading data from %s\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:512
-++#: ../netstat.c:516
-+ msgid "SYN_SENT"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:513
-++#: ../netstat.c:517
-+ msgid "SYN_RECV"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:514
-++#: ../netstat.c:518
-+ msgid "FIN_WAIT1"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:515
-++#: ../netstat.c:519
-+ msgid "FIN_WAIT2"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:516
-++#: ../netstat.c:520
-+ msgid "TIME_WAIT"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:517
-++#: ../netstat.c:521
-+ msgid "CLOSE"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:518
-++#: ../netstat.c:522
-+ msgid "CLOSE_WAIT"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:519
-++#: ../netstat.c:523
-+ msgid "LAST_ACK"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:520
-++#: ../netstat.c:524
-+ msgid "LISTEN"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:521
-++#: ../netstat.c:525
-+ msgid "CLOSING"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:592
-++#: ../netstat.c:596
-+ #, c-format
-+ msgid "warning, got bogus igmp6 line %d.\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:597 ../netstat.c:635 ../netstat.c:756 ../netstat.c:888
-+-#: ../netstat.c:1019 ../netstat.c:1024
-++#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898
-++#: ../netstat.c:1032 ../netstat.c:1037
-+ #, c-format
-+ msgid "netstat: unsupported address family %d !\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:610 ../netstat.c:615 ../netstat.c:623 ../netstat.c:630
-++#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634
-+ #, c-format
-+ msgid "warning, got bogus igmp line %d.\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:673
-++#: ../netstat.c:677
-++#, c-format
-+ msgid "Active X.25 sockets\n"
-+ msgstr ""
-+ 
-+ #. IMHO, Vr/Vs is not very usefull --SF
-+-#: ../netstat.c:675
-++#: ../netstat.c:679
-++#, c-format
-+ msgid ""
-+-"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  "
-+-"Recv-Q\n"
-++"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  Recv-"
-++"Q\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:752
-++#: ../netstat.c:759
-++#, c-format
-+ msgid "warning, got bogus tcp line.\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:793 ../netstat.c:943 ../netstat.c:1062
-++#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075
-+ #, c-format
-+ msgid "off (0.00/%ld/%d)"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:797
-++#: ../netstat.c:804
-+ #, c-format
-+ msgid "on (%2.2f/%ld/%d)"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:802
-++#: ../netstat.c:809
-+ #, c-format
-+ msgid "keepalive (%2.2f/%ld/%d)"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:807
-++#: ../netstat.c:814
-+ #, c-format
-+ msgid "timewait (%2.2f/%ld/%d)"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:812 ../netstat.c:952 ../netstat.c:1072
-++#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085
-+ #, c-format
-+ msgid "unkn-%d (%2.2f/%ld/%d)"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:884
-++#: ../netstat.c:894
-++#, c-format
-+ msgid "warning, got bogus udp line.\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:902 ../netstat.c:1162 ../netstat.c:1195
-++#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208
-+ msgid "UNKNOWN"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:948 ../netstat.c:1067
-++#: ../netstat.c:958 ../netstat.c:1080
-+ #, c-format
-+ msgid "on%d (%2.2f/%ld/%d)"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1033
-++#: ../netstat.c:1046
-++#, c-format
-+ msgid "warning, got bogus raw line.\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1115
-++#: ../netstat.c:1128
-++#, c-format
-+ msgid "warning, got bogus unix line.\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1142
-++#: ../netstat.c:1155
-+ msgid "STREAM"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1146
-++#: ../netstat.c:1159
-+ msgid "DGRAM"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1150
-++#: ../netstat.c:1163
-+ msgid "RAW"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1154
-++#: ../netstat.c:1167
-+ msgid "RDM"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1158
-++#: ../netstat.c:1171
-+ msgid "SEQPACKET"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1167
-++#: ../netstat.c:1180
-+ msgid "FREE"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1183
-++#: ../netstat.c:1196
-+ msgid "CONNECTING"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1187
-++#: ../netstat.c:1200
-+ msgid "CONNECTED"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1191
-++#: ../netstat.c:1204
-+ msgid "DISCONNECTING"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1222
-++#: ../netstat.c:1235
-++#, c-format
-+ msgid "Active UNIX domain sockets "
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1224 ../netstat.c:1735
-++#: ../netstat.c:1237 ../netstat.c:1756
-++#, c-format
-+ msgid "(servers and established)"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1227 ../netstat.c:1738
-++#: ../netstat.c:1240 ../netstat.c:1759
-++#, c-format
-+ msgid "(only servers)"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1229 ../netstat.c:1740
-++#: ../netstat.c:1242 ../netstat.c:1761
-++#, c-format
-+ msgid "(w/o servers)"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1232
-++#: ../netstat.c:1245
-++#, c-format
-+ msgid ""
-+ "\n"
-+ "Proto RefCnt Flags       Type       State         I-Node"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1234
-++#: ../netstat.c:1247
-++#, c-format
-+ msgid " Path\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1254
-++#: ../netstat.c:1267
-+ msgid "SABM SENT"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1257
-++#: ../netstat.c:1270
-+ msgid "RECOVERY"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1271
-++#: ../netstat.c:1284
-++#, c-format
-+ msgid "Active AX.25 sockets\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1272
-++#: ../netstat.c:1285
-++#, c-format
-+ msgid "Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-Q\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1315
-++#: ../netstat.c:1328
-+ #, c-format
-+ msgid "problem reading data from %s\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1366
-++#: ../netstat.c:1379
-++#, c-format
-+ msgid ""
-+ "Active IPX sockets\n"
-+ "Proto Recv-Q Send-Q Local Address              Foreign Address            "
-+ "State"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1368
-++#: ../netstat.c:1381
-++#, c-format
-+ msgid " User"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1402
-++#: ../netstat.c:1415
-+ msgid "ESTAB"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1410
-++#: ../netstat.c:1423
-+ msgid "UNK."
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1448
-++#: ../netstat.c:1461
-++#, c-format
-+ msgid "Kernel Interface table\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1452
-++#: ../netstat.c:1465
-++#, c-format
-+ msgid ""
-+-"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
-++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
-+ "Flg\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1456
-++#: ../netstat.c:1469
-+ msgid "missing interface information"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1479
-++#: ../netstat.c:1492
-++#, c-format
-+ msgid ""
-+-"usage: netstat [-veenNcCF] [<Af>] -r         netstat "
-+-"{-V|--version|-h|--help}\n"
-++"usage: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
-++"help}\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1480
-++#: ../netstat.c:1493
-++#, c-format
-+ msgid "       netstat [-vnNcaeol] [<Socket> ...]\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1481
-++#: ../netstat.c:1494
-++#, c-format
-+ msgid ""
-+ "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
-+ "\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1483
-++#: ../netstat.c:1496
-++#, c-format
-+ msgid "        -r, --route              display routing table\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1484
-++#: ../netstat.c:1497
-++#, c-format
-+ msgid "        -i, --interfaces         display interface table\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1485
-++#: ../netstat.c:1498
-++#, c-format
-+ msgid "        -g, --groups             display multicast group memberships\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1486
-++#: ../netstat.c:1499
-++#, c-format
-+ msgid ""
-+ "        -s, --statistics         display networking statistics (like SNMP)\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1488
-++#: ../netstat.c:1501
-++#, c-format
-+ msgid ""
-+ "        -M, --masquerade         display masqueraded connections\n"
-+ "\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1492
-++#: ../netstat.c:1505
-++#, c-format
-+ msgid "        --numeric-hosts          don't resolve host names\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1493
-++#: ../netstat.c:1506
-++#, c-format
-+ msgid "        --numeric-ports          don't resolve port names\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1494
-++#: ../netstat.c:1507
-++#, c-format
-+ msgid "        --numeric-users          don't resolve user names\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1495
-++#: ../netstat.c:1508
-++#, c-format
-+ msgid "        -N, --symbolic           resolve hardware names\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1496 ../route.c:88
-++#: ../netstat.c:1509 ../route.c:88
-++#, c-format
-+ msgid "        -e, --extend             display other/more information\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1497
-++#: ../netstat.c:1510
-++#, c-format
-+ msgid "        -p, --programs           display PID/Program name for sockets\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1498
-++#: ../netstat.c:1511
-++#, c-format
-+ msgid ""
-+ "        -c, --continuous         continuous listing\n"
-+ "\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1499
-++#: ../netstat.c:1512
-++#, c-format
-+ msgid "        -l, --listening          display listening server sockets\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1500
-++#: ../netstat.c:1513
-++#, c-format
-+ msgid ""
-+ "        -a, --all, --listening   display all sockets (default: connected)\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1501
-++#: ../netstat.c:1514
-++#, c-format
-+ msgid "        -o, --timers             display timers\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1502 ../route.c:89
-++#: ../netstat.c:1515 ../route.c:89
-++#, c-format
-+ msgid ""
-+ "        -F, --fib                display Forwarding Information Base "
-+ "(default)\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1503 ../route.c:90
-++#: ../netstat.c:1516 ../route.c:90
-++#, c-format
-+ msgid ""
-+ "        -C, --cache              display routing cache instead of FIB\n"
-+ "\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1505
-++#: ../netstat.c:1518
-++#, c-format
-+ msgid ""
-+-"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
-+-"--netrom\n"
-++"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
-++"netrom\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1506 ../route.c:92
-++#: ../netstat.c:1519
-+ #, c-format
-+-msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
-++msgid "  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1507 ../route.c:93
-++#: ../netstat.c:1520 ../route.c:93
-++#, c-format
-+ msgid "  List of possible address families (which support routing):\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1732
-++#: ../netstat.c:1753
-++#, c-format
-+ msgid "Active Internet connections "
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1742
-++#: ../netstat.c:1763
-++#, c-format
-+ msgid ""
-+ "\n"
-+-"Proto Recv-Q Send-Q Local Address           Foreign Address         State    "
-+-"  "
-++"Proto Recv-Q Send-Q Local Address           Foreign Address         "
-++"State      "
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1744
-++#: ../netstat.c:1765
-++#, c-format
-+ msgid " User       Inode     "
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1747
-++#: ../netstat.c:1768
-++#, c-format
-+ msgid " Timer"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1777
-++#: ../netstat.c:1798
-++#, c-format
-+ msgid "IPv4 Group Memberships\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1778
-++#: ../netstat.c:1799
-++#, c-format
-+ msgid "Interface       RefCnt Group\n"
-+ msgstr ""
-+ 
-+@@ -986,23 +1143,28 @@ msgid "rarp: cannot set entry from %s:%u
-+ msgstr ""
-+ 
-+ #: ../rarp.c:176
-++#, c-format
-+ msgid "Usage: rarp -a                               list entries in cache.\n"
-+ msgstr ""
-+ 
-+ #: ../rarp.c:177
-++#, c-format
-+ msgid "       rarp -d <hostname>                    delete entry from cache.\n"
-+ msgstr ""
-+ 
-+ #: ../rarp.c:178
-++#, c-format
-+ msgid "       rarp [<HW>] -s <hostname> <hwaddr>    add entry to cache.\n"
-+ msgstr ""
-+ 
-+ #: ../rarp.c:179
-++#, c-format
-+ msgid ""
-+ "       rarp -f                               add entries from /etc/ethers.\n"
-+ msgstr ""
-+ 
-+ #: ../rarp.c:180
-++#, c-format
-+ msgid ""
-+ "       rarp -V                               display program version.\n"
-+ "\n"
-+@@ -1019,38 +1181,50 @@ msgid "rarp: %s: unknown hardware type.\
-+ msgstr ""
-+ 
-+ #: ../route.c:80
-++#, c-format
-+ msgid ""
-+ "Usage: route [-nNvee] [-FC] [<AF>]           List kernel routing tables\n"
-+ msgstr ""
-+ 
-+ #: ../route.c:81
-++#, c-format
-+ msgid ""
-+ "       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n"
-+ "\n"
-+ msgstr ""
-+ 
-+ #: ../route.c:83
-++#, c-format
-+ msgid ""
-+ "       route {-h|--help} [<AF>]              Detailed usage syntax for "
-+ "specified AF.\n"
-+ msgstr ""
-+ 
-+ #: ../route.c:84
-++#, c-format
-+ msgid ""
-+ "       route {-V|--version}                  Display version/author and "
-+ "exit.\n"
-+ "\n"
-+ msgstr ""
-+ 
-++#: ../route.c:92
-++#, c-format
-++msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
-++msgstr ""
-++
-+ #: ../plipconfig.c:66
-++#, c-format
-+ msgid "Usage: plipconfig [-a] [-i] [-v] interface\n"
-+ msgstr ""
-+ 
-+ #: ../plipconfig.c:67
-++#, c-format
-+ msgid "                  [nibble NN] [trigger NN]\n"
-+ msgstr ""
-+ 
-+ #: ../plipconfig.c:68
-++#, c-format
-+ msgid "       plipconfig -V | --version\n"
-+ msgstr ""
-+ 
-+@@ -1060,61 +1234,75 @@ msgid "%s\tnibble %lu  trigger %lu\n"
-+ msgstr ""
-+ 
-+ #: ../iptunnel.c:85
-++#, c-format
-+ msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
-+ msgstr ""
-+ 
-+ #: ../iptunnel.c:86
-++#, c-format
-+ msgid ""
-+ "          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
-+ msgstr ""
-+ 
-+ #: ../iptunnel.c:87
-++#, c-format
-+ msgid "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
-+ msgstr ""
-+ 
-+ #: ../iptunnel.c:88
-++#, c-format
-+ msgid "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
-+ msgstr ""
-+ 
-+ #: ../iptunnel.c:89
-++#, c-format
-+ msgid ""
-+ "       iptunnel -V | --version\n"
-+ "\n"
-+ msgstr ""
-+ 
-+ #: ../iptunnel.c:90
-++#, c-format
-+ msgid "Where: NAME := STRING\n"
-+ msgstr ""
-+ 
-+ #: ../iptunnel.c:91
-++#, c-format
-+ msgid "       ADDR := { IP_ADDRESS | any }\n"
-+ msgstr ""
-+ 
-+ #: ../iptunnel.c:92
-++#, c-format
-+ msgid "       TOS  := { NUMBER | inherit }\n"
-+ msgstr ""
-+ 
-+ #: ../iptunnel.c:93
-++#, c-format
-+ msgid "       TTL  := { 1..255 | inherit }\n"
-+ msgstr ""
-+ 
-+ #: ../iptunnel.c:94
-++#, c-format
-+ msgid "       KEY  := { DOTTED_QUAD | NUMBER }\n"
-+ msgstr ""
-+ 
-+ #: ../iptunnel.c:332
-++#, c-format
-+ msgid "Keys are not allowed with ipip and sit.\n"
-+ msgstr ""
-+ 
-+ #: ../iptunnel.c:352
-++#, c-format
-+ msgid "Broadcast tunnel requires a source address.\n"
-+ msgstr ""
-+ 
-+ #: ../iptunnel.c:367
-++#, c-format
-+ msgid "ttl != 0 and noptmudisc are incompatible\n"
-+ msgstr ""
-+ 
-+ #: ../iptunnel.c:379
-++#, c-format
-+ msgid "cannot determine tunnel mode (ipip, gre or sit)\n"
-+ msgstr ""
-+ 
-+@@ -1128,22 +1316,27 @@ msgid "unknown"
-+ msgstr ""
-+ 
-+ #: ../iptunnel.c:453
-++#, c-format
-+ msgid "  Drop packets out of sequence.\n"
-+ msgstr ""
-+ 
-+ #: ../iptunnel.c:455
-++#, c-format
-+ msgid "  Checksum in received packet is required.\n"
-+ msgstr ""
-+ 
-+ #: ../iptunnel.c:457
-++#, c-format
-+ msgid "  Sequence packets on output.\n"
-+ msgstr ""
-+ 
-+ #: ../iptunnel.c:459
-++#, c-format
-+ msgid "  Checksum output packets.\n"
-+ msgstr ""
-+ 
-+ #: ../iptunnel.c:487
-++#, c-format
-+ msgid "Wrong format of /proc/net/dev. Sorry.\n"
-+ msgstr ""
-+ 
-+@@ -1153,10 +1346,12 @@ msgid "Failed to get type of [%s]\n"
-+ msgstr ""
-+ 
-+ #: ../iptunnel.c:516
-++#, c-format
-+ msgid "RX: Packets    Bytes        Errors CsumErrs OutOfSeq Mcasts\n"
-+ msgstr ""
-+ 
-+ #: ../iptunnel.c:519
-++#, c-format
-+ msgid "TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs\n"
-+ msgstr ""
-+ 
-+@@ -1563,12 +1758,12 @@ msgstr ""
-+ 
-+ #: ../statistics.c:178
-+ #, c-format
-+-msgid "%u packets directly received from backlog"
-++msgid "%u of bytes directly received from backlog"
-+ msgstr ""
-+ 
-+ #: ../statistics.c:180
-+ #, c-format
-+-msgid "%u packets directly received from prequeue"
-++msgid "%u of bytes directly received from prequeue"
-+ msgstr ""
-+ 
-+ #: ../statistics.c:182
-+@@ -1578,7 +1773,7 @@ msgstr ""
-+ 
-+ #: ../statistics.c:183
-+ #, c-format
-+-msgid "%u packets header predicted"
-++msgid "%u packet headers predicted"
-+ msgstr ""
-+ 
-+ #: ../statistics.c:184
-+@@ -1591,19 +1786,209 @@ msgstr ""
-+ msgid "Ran %u times out of system memory during packet sending"
-+ msgstr ""
-+ 
-+-#: ../statistics.c:253
-++#: ../statistics.c:188
-++#, c-format
-++msgid "%u acknowledgments not containing data received"
-++msgstr ""
-++
-++#: ../statistics.c:189
-++#, c-format
-++msgid "%u predicted acknowledgments"
-++msgstr ""
-++
-++#: ../statistics.c:190
-++#, c-format
-++msgid "%u times recovered from packet loss due to fast retransmit"
-++msgstr ""
-++
-++#: ../statistics.c:191
-++#, c-format
-++msgid "%u times recovered from packet loss due to SACK data"
-++msgstr ""
-++
-++#: ../statistics.c:192
-++#, c-format
-++msgid "%u bad SACKs received"
-++msgstr ""
-++
-++#: ../statistics.c:193
-++#, c-format
-++msgid "Detected reordering %u times using FACK"
-++msgstr ""
-++
-++#: ../statistics.c:194
-++#, c-format
-++msgid "Detected reordering %u times using SACK"
-++msgstr ""
-++
-++#: ../statistics.c:195
-++#, c-format
-++msgid "Detected reordering %u times using time stamp"
-++msgstr ""
-++
-++#: ../statistics.c:196
-++#, c-format
-++msgid "Detected reordering %u times using reno fast retransmit"
-++msgstr ""
-++
-++#: ../statistics.c:197
-++#, c-format
-++msgid "%u congestion windows fully recovered"
-++msgstr ""
-++
-++#: ../statistics.c:198
-++#, c-format
-++msgid "%u congestion windows partially recovered using Hoe heuristic"
-++msgstr ""
-++
-++#: ../statistics.c:199
-++#, c-format
-++msgid "%u congestion window recovered using DSACK"
-++msgstr ""
-++
-++#: ../statistics.c:200
-++#, c-format
-++msgid "%u congestion windows recovered after partial ack"
-++msgstr ""
-++
-++#: ../statistics.c:201
-++#, c-format
-++msgid "%u retransmits lost"
-++msgstr ""
-++
-++#: ../statistics.c:202
-++#, c-format
-++msgid "%u timeouts after reno fast retransmit"
-++msgstr ""
-++
-++#: ../statistics.c:203
-++#, c-format
-++msgid "%u timeouts after SACK recovery"
-++msgstr ""
-++
-++#: ../statistics.c:204
-++#, c-format
-++msgid "%u timeouts in loss state"
-++msgstr ""
-++
-++#: ../statistics.c:205
-++#, c-format
-++msgid "%u fast retransmits"
-++msgstr ""
-++
-++#: ../statistics.c:206
-++#, c-format
-++msgid "%u forward retransmits"
-++msgstr ""
-++
-++#: ../statistics.c:207
-++#, c-format
-++msgid "%u retransmits in slow start"
-++msgstr ""
-++
-++#: ../statistics.c:208
-++#, c-format
-++msgid "%u other TCP timeouts"
-++msgstr ""
-++
-++#: ../statistics.c:209
-++#, c-format
-++msgid "%u reno fast retransmits failed"
-++msgstr ""
-++
-++#: ../statistics.c:210
-++#, c-format
-++msgid "%u sack retransmits failed"
-++msgstr ""
-++
-++#: ../statistics.c:211
-++#, c-format
-++msgid "%u times receiver scheduled too late for direct processing"
-++msgstr ""
-++
-++#: ../statistics.c:212
-++#, c-format
-++msgid "%u packets collapsed in receive queue due to low socket buffer"
-++msgstr ""
-++
-++#: ../statistics.c:213
-++#, c-format
-++msgid "%u DSACKs sent for old packets"
-++msgstr ""
-++
-++#: ../statistics.c:214
-++#, c-format
-++msgid "%u DSACKs sent for out of order packets"
-++msgstr ""
-++
-++#: ../statistics.c:215
-++#, c-format
-++msgid "%u DSACKs received"
-++msgstr ""
-++
-++#: ../statistics.c:216
-++#, c-format
-++msgid "%u DSACKs for out of order packets received"
-++msgstr ""
-++
-++#: ../statistics.c:217
-++#, c-format
-++msgid "%u connections reset due to unexpected SYN"
-++msgstr ""
-++
-++#: ../statistics.c:218
-++#, c-format
-++msgid "%u connections reset due to unexpected data"
-++msgstr ""
-++
-++#: ../statistics.c:219
-++#, c-format
-++msgid "%u connections reset due to early user close"
-++msgstr ""
-++
-++#: ../statistics.c:220
-++#, c-format
-++msgid "%u connections aborted due to memory pressure"
-++msgstr ""
-++
-++#: ../statistics.c:221
-++#, c-format
-++msgid "%u connections aborted due to timeout"
-++msgstr ""
-++
-++#: ../statistics.c:222
-++#, c-format
-++msgid "%u connections aborted after user close in linger timeout"
-++msgstr ""
-++
-++#: ../statistics.c:223
-++#, c-format
-++msgid "%u times unabled to send RST due to no memory"
-++msgstr ""
-++
-++#: ../statistics.c:224
-++#, c-format
-++msgid "TCP ran low on memory %u times"
-++msgstr ""
-++
-++#: ../statistics.c:225
-++#, c-format
-++msgid "%u TCP data loss events"
-++msgstr ""
-++
-++#: ../statistics.c:292
-+ msgid "enabled"
-+ msgstr ""
-+ 
-+-#: ../statistics.c:253
-++#: ../statistics.c:292
-+ msgid "disabled"
-+ msgstr ""
-+ 
-+-#: ../statistics.c:336
-++#: ../statistics.c:375
-+ msgid "error parsing /proc/net/snmp"
-+ msgstr ""
-+ 
-+-#: ../statistics.c:349
-++#: ../statistics.c:388
-+ msgid "cannot open /proc/net/snmp"
-+ msgstr ""
-+ 
-+@@ -1617,7 +2002,7 @@ msgstr ""
-+ msgid "Cannot change line discipline to `%s'.\n"
-+ msgstr ""
-+ 
-+-#: ../lib/af.c:153 ../lib/hw.c:156
-++#: ../lib/af.c:153 ../lib/hw.c:161
-+ msgid "UNSPEC"
-+ msgstr ""
-+ 
-+@@ -1633,11 +2018,11 @@ msgstr ""
-+ msgid "IPv6"
-+ msgstr ""
-+ 
-+-#: ../lib/af.c:164 ../lib/hw.c:177
-++#: ../lib/af.c:164 ../lib/hw.c:182
-+ msgid "AMPR AX.25"
-+ msgstr ""
-+ 
-+-#: ../lib/af.c:167 ../lib/hw.c:183
-++#: ../lib/af.c:167 ../lib/hw.c:188
-+ msgid "AMPR NET/ROM"
-+ msgstr ""
-+ 
-+@@ -1649,7 +2034,7 @@ msgstr ""
-+ msgid "Appletalk DDP"
-+ msgstr ""
-+ 
-+-#: ../lib/af.c:176 ../lib/hw.c:218
-++#: ../lib/af.c:176 ../lib/hw.c:223
-+ msgid "Econet"
-+ msgstr ""
-+ 
-+@@ -1657,19 +2042,21 @@ msgstr ""
-+ msgid "CCITT X.25"
-+ msgstr ""
-+ 
-+-#: ../lib/af.c:182 ../lib/hw.c:180
-++#: ../lib/af.c:182 ../lib/hw.c:185
-+ msgid "AMPR ROSE"
-+ msgstr ""
-+ 
-+-#: ../lib/af.c:185 ../lib/hw.c:168
-++#: ../lib/af.c:185 ../lib/hw.c:173
-+ msgid "Ash"
-+ msgstr ""
-+ 
-+ #: ../lib/af.c:243
-++#, c-format
-+ msgid "Please don't supply more than one address family.\n"
-+ msgstr ""
-+ 
-+ #: ../lib/af.c:304
-++#, c-format
-+ msgid "Too much address family arguments.\n"
-+ msgstr ""
-+ 
-+@@ -1694,6 +2081,7 @@ msgid "in_arcnet(%s): trailing junk!\n"
-+ msgstr ""
-+ 
-+ #: ../lib/ash.c:81
-++#, c-format
-+ msgid "Malformed Ash address"
-+ msgstr ""
-+ 
-+@@ -1712,22 +2100,21 @@ msgid "Callsign too long"
-+ msgstr ""
-+ 
-+ #: ../lib/ax25_gr.c:47
-++#, c-format
-+ msgid "AX.25 not configured in this system.\n"
-+ msgstr ""
-+ 
-+ #: ../lib/ax25_gr.c:50
-++#, c-format
-+ msgid "Kernel AX.25 routing table\n"
-+ msgstr ""
-+ 
-+ #. xxx
-+ #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55
-++#, c-format
-+ msgid "Destination  Iface    Use\n"
-+ msgstr ""
-+ 
-+-#: ../lib/ddp_gr.c:21
-+-msgid "Routing table for `ddp' not yet supported.\n"
-+-msgstr ""
-+-
-+ #: ../lib/ether.c:74 ../lib/ether.c:91
-+ #, c-format
-+ msgid "in_ether(%s): invalid ether address!\n"
-+@@ -1783,90 +2170,94 @@ msgstr ""
-+ msgid "in_hippi(%s): trailing junk!\n"
-+ msgstr ""
-+ 
-+-#: ../lib/hw.c:155
-++#: ../lib/hw.c:160
-+ msgid "Local Loopback"
-+ msgstr ""
-+ 
-+-#: ../lib/hw.c:158
-++#: ../lib/hw.c:163
-+ msgid "Serial Line IP"
-+ msgstr ""
-+ 
-+-#: ../lib/hw.c:159
-++#: ../lib/hw.c:164
-+ msgid "VJ Serial Line IP"
-+ msgstr ""
-+ 
-+-#: ../lib/hw.c:160
-++#: ../lib/hw.c:165
-+ msgid "6-bit Serial Line IP"
-+ msgstr ""
-+ 
-+-#: ../lib/hw.c:161
-++#: ../lib/hw.c:166
-+ msgid "VJ 6-bit Serial Line IP"
-+ msgstr ""
-+ 
-+-#: ../lib/hw.c:162
-++#: ../lib/hw.c:167
-+ msgid "Adaptive Serial Line IP"
-+ msgstr ""
-+ 
-+-#: ../lib/hw.c:165
-++#: ../lib/hw.c:170
-+ msgid "Ethernet"
-+ msgstr ""
-+ 
-+-#: ../lib/hw.c:171
-++#: ../lib/hw.c:176
-+ msgid "Fiber Distributed Data Interface"
-+ msgstr ""
-+ 
-+-#: ../lib/hw.c:174
-++#: ../lib/hw.c:179
-+ msgid "HIPPI"
-+ msgstr ""
-+ 
-+-#: ../lib/hw.c:186
-++#: ../lib/hw.c:191
-+ msgid "generic X.25"
-+ msgstr ""
-+ 
-+-#: ../lib/hw.c:189
-++#: ../lib/hw.c:194
-+ msgid "IPIP Tunnel"
-+ msgstr ""
-+ 
-+-#: ../lib/hw.c:192
-++#: ../lib/hw.c:197
-+ msgid "Point-to-Point Protocol"
-+ msgstr ""
-+ 
-+-#: ../lib/hw.c:195
-++#: ../lib/hw.c:200
-+ msgid "(Cisco)-HDLC"
-+ msgstr ""
-+ 
-+-#: ../lib/hw.c:196
-++#: ../lib/hw.c:201
-+ msgid "LAPB"
-+ msgstr ""
-+ 
-+-#: ../lib/hw.c:199
-++#: ../lib/hw.c:204
-+ msgid "ARCnet"
-+ msgstr ""
-+ 
-+-#: ../lib/hw.c:202
-++#: ../lib/hw.c:207
-+ msgid "Frame Relay DLCI"
-+ msgstr ""
-+ 
-+-#: ../lib/hw.c:203
-++#: ../lib/hw.c:208
-+ msgid "Frame Relay Access Device"
-+ msgstr ""
-+ 
-+-#: ../lib/hw.c:206
-++#: ../lib/hw.c:211
-+ msgid "IPv6-in-IPv4"
-+ msgstr ""
-+ 
-+-#: ../lib/hw.c:209
-++#: ../lib/hw.c:214
-+ msgid "IrLAP"
-+ msgstr ""
-+ 
-+-#: ../lib/hw.c:212
-++#: ../lib/hw.c:217
-+ msgid "16/4 Mbps Token Ring"
-+ msgstr ""
-+ 
-+-#: ../lib/hw.c:214
-++#: ../lib/hw.c:219
-+ msgid "16/4 Mbps Token Ring (New)"
-+ msgstr ""
-+ 
-++#: ../lib/hw.c:226
-++msgid "Generic EUI-64"
-++msgstr ""
-++
-+ #: ../lib/inet.c:153 ../lib/inet6.c:79
-+ #, c-format
-+ msgid "rresolve: unsupport address family %d !\n"
-+@@ -1877,131 +2268,157 @@ msgid "[UNKNOWN]"
-+ msgstr ""
-+ 
-+ #: ../lib/inet6_gr.c:71
-++#, c-format
-+ msgid "INET6 (IPv6) not configured in this system.\n"
-+ msgstr ""
-+ 
-+ #: ../lib/inet6_gr.c:74
-++#, c-format
-+ msgid "Kernel IPv6 routing table\n"
-+ msgstr ""
-+ 
-+ #: ../lib/inet6_gr.c:76
-++#, c-format
-+ msgid ""
-+-"Destination                                 Next Hop                         "
-+-"       Flags Metric Ref    Use Iface\n"
-++"Destination                                 Next "
-++"Hop                                Flags Metric Ref    Use Iface\n"
-+ msgstr ""
-+ 
-+ #: ../lib/inet6_gr.c:150
-++#, c-format
-+ msgid "Kernel IPv6 Neighbour Cache\n"
-+ msgstr ""
-+ 
-+ #: ../lib/inet6_gr.c:153
-++#, c-format
-+ msgid ""
-+ "Neighbour                                   HW Address        Iface    Flags "
-+ "Ref State\n"
-+ msgstr ""
-+ 
-+ #: ../lib/inet6_gr.c:157
-++#, c-format
-+ msgid ""
-+ "Neighbour                                   HW Address        Iface    Flags "
-+ "Ref State            Stale(sec) Delete(sec)\n"
-+ msgstr ""
-+ 
-+ #: ../lib/inet6_sr.c:46
-++#, c-format
-+ msgid "Usage: inet6_route [-vF] del Target\n"
-+ msgstr ""
-+ 
-+ #: ../lib/inet6_sr.c:47
-++#, c-format
-+ msgid "       inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n"
-+ msgstr ""
-+ 
-+ #: ../lib/inet6_sr.c:48
-++#, c-format
-+ msgid "       inet6_route [-FC] flush      NOT supported\n"
-+ msgstr ""
-+ 
-+ #: ../lib/inet6_sr.c:188
-++#, c-format
-+ msgid "Flushing `inet6' routing table not supported\n"
-+ msgstr ""
-+ 
-+ #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220
-++#, c-format
-+ msgid "INET (IPv4) not configured in this system.\n"
-+ msgstr ""
-+ 
-+ #: ../lib/inet_gr.c:53
-++#, c-format
-+ msgid "Kernel IP routing table\n"
-+ msgstr ""
-+ 
-+ #: ../lib/inet_gr.c:56
-++#, c-format
-+ msgid ""
-+ "Destination     Gateway         Genmask         Flags Metric Ref    Use "
-+ "Iface\n"
-+ msgstr ""
-+ 
-+ #: ../lib/inet_gr.c:59
-++#, c-format
-+ msgid ""
-+ "Destination     Gateway         Genmask         Flags   MSS Window  irtt "
-+ "Iface\n"
-+ msgstr ""
-+ 
-+ #: ../lib/inet_gr.c:62
-++#, c-format
-+ msgid ""
-+ "Destination     Gateway         Genmask         Flags Metric Ref    Use "
-+ "Iface    MSS   Window irtt\n"
-+ msgstr ""
-+ 
-+ #: ../lib/inet_gr.c:237
-++#, c-format
-+ msgid "Kernel IP routing cache\n"
-+ msgstr ""
-+ 
-+ #: ../lib/inet_gr.c:258
-++#, c-format
-+ msgid ""
-+ "Source          Destination     Gateway         Flags Metric Ref    Use "
-+ "Iface\n"
-+ msgstr ""
-+ 
-+ #: ../lib/inet_gr.c:261
-++#, c-format
-+ msgid ""
-+ "Source          Destination     Gateway         Flags   MSS Window  irtt "
-+ "Iface\n"
-+ msgstr ""
-+ 
-+ #: ../lib/inet_gr.c:266
-++#, c-format
-+ msgid ""
-+ "Source          Destination     Gateway         Flags Metric Ref    Use "
-+ "Iface    MSS   Window irtt  HH  Arp\n"
-+ msgstr ""
-+ 
-+ #: ../lib/inet_gr.c:290
-++#, c-format
-+ msgid ""
-+ "Source          Destination     Gateway         Flags Metric Ref    Use "
-+ "Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
-+ msgstr ""
-+ 
-+-#: ../lib/inet_sr.c:50
-++#: ../lib/inet_sr.c:51
-++#, c-format
-+ msgid ""
-+ "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] "
-+ "[[dev] If]\n"
-+ msgstr ""
-+ 
-+-#: ../lib/inet_sr.c:51
-++#: ../lib/inet_sr.c:52
-++#, c-format
-+ msgid ""
-+ "       inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n"
-+ msgstr ""
-+ 
-+-#: ../lib/inet_sr.c:52
-++#: ../lib/inet_sr.c:53
-++#, c-format
-+ msgid ""
-+ "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
-+ msgstr ""
-+ 
-+-#: ../lib/inet_sr.c:53
-++#: ../lib/inet_sr.c:54
-++#, c-format
-+ msgid "                              [mod] [dyn] [reinstate] [[dev] If]\n"
-+ msgstr ""
-+ 
-+-#: ../lib/inet_sr.c:54
-++#: ../lib/inet_sr.c:55
-++#, c-format
-+ msgid ""
-+ "       inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n"
-+ msgstr ""
-+ 
-+-#: ../lib/inet_sr.c:55
-++#: ../lib/inet_sr.c:56
-++#, c-format
-+ msgid "       inet_route [-FC] flush      NOT supported\n"
-+ msgstr ""
-+ 
-+@@ -2011,14 +2428,17 @@ msgid "route: %s: cannot use a NETWORK a
-+ msgstr ""
-+ 
-+ #: ../lib/inet_sr.c:174
-++#, c-format
-+ msgid "route: Invalid MSS/MTU.\n"
-+ msgstr ""
-+ 
-+ #: ../lib/inet_sr.c:187
-++#, c-format
-+ msgid "route: Invalid window.\n"
-+ msgstr ""
-+ 
-+ #: ../lib/inet_sr.c:203
-++#, c-format
-+ msgid "route: Invalid initial rtt.\n"
-+ msgstr ""
-+ 
-+@@ -2033,73 +2453,90 @@ msgid "route: bogus netmask %s\n"
-+ msgstr ""
-+ 
-+ #: ../lib/inet_sr.c:270
-++#, c-format
-+ msgid "route: netmask doesn't match route address\n"
-+ msgstr ""
-+ 
-+ #: ../lib/inet_sr.c:306
-++#, c-format
-+ msgid "Flushing `inet' routing table not supported\n"
-+ msgstr ""
-+ 
-+ #: ../lib/inet_sr.c:310
-++#, c-format
-+ msgid "Modifying `inet' routing cache not supported\n"
-+ msgstr ""
-+ 
-+ #: ../lib/ipx_gr.c:52
-++#, c-format
-+ msgid "IPX not configured in this system.\n"
-+ msgstr ""
-+ 
-+ #: ../lib/ipx_gr.c:56
-++#, c-format
-+ msgid "Kernel IPX routing table\n"
-+ msgstr ""
-+ 
-+ #. xxx
-+ #: ../lib/ipx_gr.c:57
-++#, c-format
-+ msgid "Destination               Router Net                Router Node\n"
-+ msgstr ""
-+ 
-+ #: ../lib/ipx_sr.c:33
-++#, c-format
-+ msgid "IPX: this needs to be written\n"
-+ msgstr ""
-+ 
-+ #: ../lib/masq_info.c:198
-++#, c-format
-+ msgid "IP masquerading entries\n"
-+ msgstr ""
-+ 
-+ #: ../lib/masq_info.c:201
-++#, c-format
-+ msgid "prot   expire source               destination          ports\n"
-+ msgstr ""
-+ 
-+ #: ../lib/masq_info.c:204
-++#, c-format
-+ msgid ""
-+-"prot   expire    initseq delta prevd source               destination        "
-+-"  ports\n"
-++"prot   expire    initseq delta prevd source               "
-++"destination          ports\n"
-+ msgstr ""
-+ 
-+ #: ../lib/netrom_gr.c:48
-++#, c-format
-+ msgid "NET/ROM not configured in this system.\n"
-+ msgstr ""
-+ 
-+ #: ../lib/netrom_gr.c:51
-++#, c-format
-+ msgid "Kernel NET/ROM routing table\n"
-+ msgstr ""
-+ 
-+ #: ../lib/netrom_gr.c:52
-++#, c-format
-+ msgid "Destination  Mnemonic  Quality  Neighbour  Iface\n"
-+ msgstr ""
-+ 
-+ #: ../lib/netrom_sr.c:34
-++#, c-format
-+ msgid "netrom usage\n"
-+ msgstr ""
-+ 
-+ #: ../lib/netrom_sr.c:44
-++#, c-format
-+ msgid "NET/ROM: this needs to be written\n"
-+ msgstr ""
-+ 
-+ #: ../lib/ppp.c:44
-++#, c-format
-+ msgid "You cannot start PPP with this program.\n"
-+ msgstr ""
-+ 
-+ #: ../lib/ppp_ac.c:38
-++#, c-format
-+ msgid "Sorry, use pppd!\n"
-+ msgstr ""
-+ 
-+@@ -2108,287 +2545,314 @@ msgid "Node address must be ten digits"
-+ msgstr ""
-+ 
-+ #: ../lib/rose_gr.c:51
-++#, c-format
-+ msgid "ROSE not configured in this system.\n"
-+ msgstr ""
-+ 
-+ #: ../lib/rose_gr.c:54
-++#, c-format
-+ msgid "Kernel ROSE routing table\n"
-+ msgstr ""
-+ 
-+-#: ../lib/tr.c:70 ../lib/tr.c:85
-++#: ../lib/tr.c:86 ../lib/tr.c:101
-+ #, c-format
-+ msgid "in_tr(%s): invalid token ring address!\n"
-+ msgstr ""
-+ 
-+-#: ../lib/tr.c:97
-++#: ../lib/tr.c:113
-+ #, c-format
-+ msgid "in_tr(%s): trailing : ignored!\n"
-+ msgstr ""
-+ 
-+-#: ../lib/tr.c:109
-++#: ../lib/tr.c:125
-+ #, c-format
-+ msgid "in_tr(%s): trailing junk!\n"
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:164
-++#: ../lib/interface.c:176
-+ #, c-format
-+ msgid "warning: no inet socket available: %s\n"
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:316
-++#: ../lib/interface.c:325
-+ #, c-format
-+ msgid "Warning: cannot open %s (%s). Limited output.\n"
-+ msgstr ""
-+ 
-+ #. Give better error message for this case.
-+-#: ../lib/interface.c:556
-++#: ../lib/interface.c:571
-+ msgid "Device not found"
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:560
-++#: ../lib/interface.c:575
-+ #, c-format
-+ msgid "%s: error fetching interface information: %s\n"
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:593
-++#: ../lib/interface.c:608
-+ msgid "     - no statistics available -"
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:597
-++#: ../lib/interface.c:612
-++#, c-format
-+ msgid "[NO FLAGS]"
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:673
-++#: ../lib/interface.c:688
-+ #, c-format
-+ msgid "%-9.9s Link encap:%s  "
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:678
-++#: ../lib/interface.c:693
-+ #, c-format
-+ msgid "HWaddr %s  "
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:681
-++#: ../lib/interface.c:696
-+ #, c-format
-+ msgid "Media:%s"
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:683
-++#: ../lib/interface.c:698
-++#, c-format
-+ msgid "(auto)"
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:690
-++#: ../lib/interface.c:705
-+ #, c-format
-+ msgid "          %s addr:%s "
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:693
-++#: ../lib/interface.c:708
-+ #, c-format
-+ msgid " P-t-P:%s "
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:696
-++#: ../lib/interface.c:711
-+ #, c-format
-+ msgid " Bcast:%s "
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:698
-++#: ../lib/interface.c:713
-+ #, c-format
-+ msgid " Mask:%s\n"
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:715
-++#: ../lib/interface.c:730
-+ #, c-format
-+ msgid "          inet6 addr: %s/%d"
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:717
-++#: ../lib/interface.c:732
-++#, c-format
-+ msgid " Scope:"
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:720
-++#: ../lib/interface.c:735
-++#, c-format
-+ msgid "Global"
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:723
-++#: ../lib/interface.c:738
-++#, c-format
-+ msgid "Link"
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:726
-++#: ../lib/interface.c:741
-++#, c-format
-+ msgid "Site"
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:729
-++#: ../lib/interface.c:744
-++#, c-format
-+ msgid "Compat"
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:732
-++#: ../lib/interface.c:747
-++#, c-format
-+ msgid "Host"
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:735
-++#: ../lib/interface.c:750
-++#, c-format
-+ msgid "Unknown"
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:750
-++#: ../lib/interface.c:765
-+ #, c-format
-+ msgid "          IPX/Ethernet II addr:%s\n"
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:753
-++#: ../lib/interface.c:768
-+ #, c-format
-+ msgid "          IPX/Ethernet SNAP addr:%s\n"
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:756
-++#: ../lib/interface.c:771
-+ #, c-format
-+ msgid "          IPX/Ethernet 802.2 addr:%s\n"
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:759
-++#: ../lib/interface.c:774
-+ #, c-format
-+ msgid "          IPX/Ethernet 802.3 addr:%s\n"
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:769
-++#: ../lib/interface.c:784
-+ #, c-format
-+ msgid "          EtherTalk Phase 2 addr:%s\n"
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:778
-++#: ../lib/interface.c:793
-+ #, c-format
-+ msgid "          econet addr:%s\n"
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:785
-++#: ../lib/interface.c:800
-++#, c-format
-+ msgid "[NO FLAGS] "
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:787
-++#: ../lib/interface.c:802
-++#, c-format
-+ msgid "UP "
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:789
-++#: ../lib/interface.c:804
-++#, c-format
-+ msgid "BROADCAST "
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:791
-++#: ../lib/interface.c:806
-++#, c-format
-+ msgid "DEBUG "
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:793
-++#: ../lib/interface.c:808
-++#, c-format
-+ msgid "LOOPBACK "
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:795
-++#: ../lib/interface.c:810
-++#, c-format
-+ msgid "POINTOPOINT "
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:797
-++#: ../lib/interface.c:812
-++#, c-format
-+ msgid "NOTRAILERS "
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:799
-++#: ../lib/interface.c:814
-++#, c-format
-+ msgid "RUNNING "
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:801
-++#: ../lib/interface.c:816
-++#, c-format
-+ msgid "NOARP "
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:803
-++#: ../lib/interface.c:818
-++#, c-format
-+ msgid "PROMISC "
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:805
-++#: ../lib/interface.c:820
-++#, c-format
-+ msgid "ALLMULTI "
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:807
-++#: ../lib/interface.c:822
-++#, c-format
-+ msgid "SLAVE "
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:809
-++#: ../lib/interface.c:824
-++#, c-format
-+ msgid "MASTER "
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:811
-++#: ../lib/interface.c:826
-++#, c-format
-+ msgid "MULTICAST "
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:814
-++#: ../lib/interface.c:829
-++#, c-format
-+ msgid "DYNAMIC "
-+ msgstr ""
-+ 
-+ #. DONT FORGET TO ADD THE FLAGS IN ife_print_short
-+-#: ../lib/interface.c:817
-++#: ../lib/interface.c:832
-+ #, c-format
-+ msgid " MTU:%d  Metric:%d"
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:821
-++#: ../lib/interface.c:836
-+ #, c-format
-+ msgid "  Outfill:%d  Keepalive:%d"
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:835
-++#: ../lib/interface.c:850
-+ #, c-format
-+ msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:840
-++#: ../lib/interface.c:855
-+ #, c-format
-+ msgid "             compressed:%lu\n"
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:852
-++#: ../lib/interface.c:895
-+ #, c-format
-+ msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:856
-++#: ../lib/interface.c:899
-+ #, c-format
-+ msgid "          collisions:%lu "
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:858
-++#: ../lib/interface.c:901
-+ #, c-format
-+ msgid "compressed:%lu "
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:860
-++#: ../lib/interface.c:903
-+ #, c-format
-+ msgid "txqueuelen:%d "
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:862
-++#: ../lib/interface.c:905
-+ #, c-format
-+ msgid "RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:873
-++#: ../lib/interface.c:916
-+ #, c-format
-+ msgid "Interrupt:%d "
-+ msgstr ""
-+ 
-+ #. Only print devices using it for
-+ #. I/O maps
-+-#: ../lib/interface.c:876
-++#: ../lib/interface.c:919
-+ #, c-format
-+ msgid "Base address:0x%x "
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:878
-++#: ../lib/interface.c:921
-+ #, c-format
-+ msgid "Memory:%lx-%lx "
-+ msgstr ""
-+ 
-+-#: ../lib/interface.c:881
-++#: ../lib/interface.c:924
-+ #, c-format
-+ msgid "DMA chan:%x "
-+ msgstr ""
-+ 
-+ #: ../lib/sockets.c:63
-++#, c-format
-+ msgid "No usable address families found.\n"
-+ msgstr ""
-+ 
-+@@ -2413,14 +2877,17 @@ msgid "ip: argument is wrong: %s\n"
-+ msgstr ""
-+ 
-+ #: ../ipmaddr.c:61
-++#, c-format
-+ msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n"
-+ msgstr ""
-+ 
-+ #: ../ipmaddr.c:62
-++#, c-format
-+ msgid "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
-+ msgstr ""
-+ 
-+ #: ../ipmaddr.c:63
-++#, c-format
-+ msgid "       ipmaddr -V | -version\n"
-+ msgstr ""
-+ 
-+@@ -2449,6 +2916,7 @@ msgid "slattach: tty_lock: (%s): %s\n"
-+ msgstr ""
-+ 
-+ #: ../slattach.c:192
-++#, c-format
-+ msgid "slattach: cannot write PID file\n"
-+ msgstr ""
-+ 
-+@@ -2468,18 +2936,22 @@ msgid "slattach: tty_hangup(RAISE): %s\n
-+ msgstr ""
-+ 
-+ #: ../slattach.c:468
-++#, c-format
-+ msgid "slattach: tty name too long\n"
-+ msgstr ""
-+ 
-+ #: ../slattach.c:498
-++#, c-format
-+ msgid "slattach: tty_open: cannot get current state!\n"
-+ msgstr ""
-+ 
-+ #: ../slattach.c:505
-++#, c-format
-+ msgid "slattach: tty_open: cannot get current line disc!\n"
-+ msgstr ""
-+ 
-+ #: ../slattach.c:513
-++#, c-format
-+ msgid "slattach: tty_open: cannot set RAW mode!\n"
-+ msgstr ""
-+ 
-+@@ -2489,6 +2961,7 @@ msgid "slattach: tty_open: cannot set %s
-+ msgstr ""
-+ 
-+ #: ../slattach.c:530
-++#, c-format
-+ msgid "slattach: tty_open: cannot set 8N1 mode!\n"
-+ msgstr ""
-+ 
-+Index: net-tools/po/et_EE.po
-+===================================================================
-+--- net-tools.orig/po/et_EE.po
-++++ net-tools/po/et_EE.po
-+@@ -6,7 +6,8 @@
-+ msgid ""
-+ msgstr ""
-+ "Project-Id-Version: net-tools 1.58\n"
-+-"POT-Creation-Date: 2001-02-15 21:28+0200\n"
-++"Report-Msgid-Bugs-To: \n"
-++"POT-Creation-Date: 2007-06-30 12:28+0900\n"
-+ "PO-Revision-Date: 2001-02-15 18:00+0300\n"
-+ "Last-Translator: Meelis Roos <mroos@linux.ee>\n"
-+ "Language-Team: Estonian <linux-ee@eenet.ee>\n"
-+@@ -14,53 +15,58 @@ msgstr ""
-+ "Content-Type: text/plain; charset=iso-8859-15\n"
-+ "Content-Transfer-Encoding: 8bit\n"
-+ 
-+-#: ../arp.c:110 ../arp.c:269
-++#: ../arp.c:112 ../arp.c:279
-++#, c-format
-+ msgid "arp: need host name\n"
-+ msgstr "arp: puudub hosti nimi\n"
-+ 
-+-#: ../arp.c:207 ../arp.c:221
-++#: ../arp.c:215 ../arp.c:230
-+ #, c-format
-+ msgid "No ARP entry for %s\n"
-+ msgstr "%s jaoks pole ARP kirjet\n"
-+ 
-+-#: ../arp.c:239
-++#: ../arp.c:248
-+ #, c-format
-+ msgid "arp: cant get HW-Address for `%s': %s.\n"
-+ msgstr "arp: ei saa riistvaralist aadressi `%s' jaoks: %s\n"
-+ 
-+-#: ../arp.c:243
-++#: ../arp.c:252
-++#, c-format
-+ msgid "arp: protocol type mismatch.\n"
-+ msgstr "arp: vale protokolli t��p\n"
-+ 
-+-#: ../arp.c:252
-++#: ../arp.c:261
-+ #, c-format
-+ msgid "arp: device `%s' has HW address %s `%s'.\n"
-+ msgstr "arp: seadmel `%s' on riistvaraline aadress %s `%s'\n"
-+ 
-+-#: ../arp.c:282
-++#: ../arp.c:293
-++#, c-format
-+ msgid "arp: need hardware address\n"
-+ msgstr "arp: puudub riistvaraline aadress\n"
-+ 
-+-#: ../arp.c:290
-++#: ../arp.c:301
-++#, c-format
-+ msgid "arp: invalid hardware address\n"
-+ msgstr "arp: vigane riistvaraline aadress\n"
-+ 
-+-#: ../arp.c:387
-++#: ../arp.c:398
-+ #, c-format
-+ msgid "arp: cannot open etherfile %s !\n"
-+ msgstr "arp: ei saa avada faili %s\n"
-+ 
-+-#: ../arp.c:403
-++#: ../arp.c:414
-+ #, c-format
-+ msgid "arp: format error on line %u of etherfile %s !\n"
-+ msgstr "arp: formaadiviga real %u failis %s\n"
-+ 
-+-#: ../arp.c:416
-++#: ../arp.c:427
-+ #, c-format
-+ msgid "arp: cannot set entry on line %u of etherfile %s !\n"
-+ msgstr "arp: ei saa kehtestada ARP kirjet real %u failis %s\n"
-+ 
-+-#: ../arp.c:437
-++#: ../arp.c:448
-++#, c-format
-+ msgid ""
-+ "Address                  HWtype  HWaddress           Flags Mask            "
-+ "Iface\n"
-+@@ -68,45 +74,52 @@ msgstr ""
-+ "Aadress                  HWt��p  HWaadress           Lipud Mask            "
-+ "Liides\n"
-+ 
-+-#: ../arp.c:467
-++#: ../arp.c:476
-++#, fuzzy
-++msgid "<from_interface>"
-++msgstr " liides %s\n"
-++
-++#: ../arp.c:478
-+ msgid "(incomplete)"
-+ msgstr "(mittet�ielik)"
-+ 
-+-#: ../arp.c:484
-++#: ../arp.c:495
-+ #, c-format
-+ msgid "%s (%s) at "
-+ msgstr "%s (%s) aadressil "
-+ 
-+-#: ../arp.c:490
-++#: ../arp.c:501
-++#, c-format
-+ msgid "<incomplete> "
-+ msgstr "<mittet�ielik>"
-+ 
-+-#: ../arp.c:496
-++#: ../arp.c:507
-+ #, c-format
-+ msgid "netmask %s "
-+ msgstr "v�rgumask %s "
-+ 
-+-#: ../arp.c:513
-++#: ../arp.c:524
-+ #, c-format
-+ msgid "on %s\n"
-+ msgstr "liides %s\n"
-+ 
-+-#: ../arp.c:592
-++#: ../arp.c:605
-+ #, c-format
-+ msgid "Entries: %d\tSkipped: %d\tFound: %d\n"
-+ msgstr "ARP kirjeid kokku: %s\tignoreerisin: %d\tleidsin: %d\n"
-+ 
-+-#: ../arp.c:596
-++#: ../arp.c:609
-+ #, c-format
-+ msgid "%s (%s) -- no entry\n"
-+ msgstr "%s (%s) -- pole kirjet\n"
-+ 
-+-#: ../arp.c:598
-++#: ../arp.c:611
-+ #, c-format
-+ msgid "arp: in %d entries no match found.\n"
-+ msgstr "arp: ei leidnud %d kirje hulgast sobivat\n"
-+ 
-+-#: ../arp.c:613
-++#: ../arp.c:626
-++#, c-format
-+ msgid ""
-+ "Usage:\n"
-+ "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP "
-+@@ -116,47 +129,45 @@ msgstr ""
-+ "ARP cache vaatamine:\n"
-+ "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hosti nimi>]\n"
-+ 
-+-#: ../arp.c:614
-++#: ../arp.c:627
-++#, fuzzy, c-format
-+ msgid ""
-+-"  arp [-v]          [-i <if>] -d  <hostname> [pub][nopub]    <-Delete ARP "
-++"  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP "
-+ "entry\n"
-+ msgstr ""
-+ "ARP kirje kustutamine:\n"
-+ "  arp [-v]          [-i <if>] -d  <hosti nimi> [pub] [nopub]\n"
-+ 
-+-#: ../arp.c:615
-++#: ../arp.c:628
-++#, fuzzy, c-format
-+ msgid ""
-+-"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]              <-Add entry from "
-++"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from "
-+ "file\n"
-+ msgstr ""
-+ "ARP kirjete lisamine failist:\n"
-+ "  arp [-vnD] [<HW>] [-i <if>] -f  [<failinimi>]\n"
-+ 
-+-#: ../arp.c:616
-++#: ../arp.c:629
-++#, fuzzy, c-format
-+ msgid ""
-+-"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [temp][nopub] <-Add "
-++"  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add "
-+ "entry\n"
-+ msgstr ""
-+ "ARP kirje lisamine:\n"
-+ "  arp [-v]   [<HW>] [-i <if>] -s  <hosti nimi> <hwaddr> [temp] [nopub]\n"
-+ 
-+-#: ../arp.c:617
-+-msgid ""
-+-"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
-+-"<-''-\n"
-+-msgstr ""
-+-"  arp [-v]   [<HW>] [-i <if>] -s  <hosti nimi> <hwaddr> [netmask <nm>] pub\n"
-+-
-+-#: ../arp.c:618
-++#: ../arp.c:630
-++#, fuzzy, c-format
-+ msgid ""
-+-"  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub      "
-++"  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          "
-+ "<-''-\n"
-+ "\n"
-+ msgstr ""
-+ "  arp [-v]   [<HW>] [-i <if>] -Ds <hosti nimi> <if> [netmask <nm>] pub\n"
-+ "\n"
-+ 
-+-#: ../arp.c:620
-++#: ../arp.c:632
-++#, c-format
-+ msgid ""
-+ "        -a                       display (all) hosts in alternative (BSD) "
-+ "style\n"
-+@@ -164,122 +175,132 @@ msgstr ""
-+ "        -a                       n�ita k�iki hoste alternatiivsel (BSD) "
-+ "kujul\n"
-+ 
-+-#: ../arp.c:621
-++#: ../arp.c:633
-++#, c-format
-+ msgid "        -s, --set                set a new ARP entry\n"
-+ msgstr "        -s, --set                uue ARP kirje seadmine\n"
-+ 
-+-#: ../arp.c:622
-++#: ../arp.c:634
-++#, c-format
-+ msgid "        -d, --delete             delete a specified entry\n"
-+ msgstr "        -d, --delete             m��ratud kirje kustutamine\n"
-+ 
-+-#: ../arp.c:623 ../netstat.c:1485 ../route.c:85
-++#: ../arp.c:635 ../netstat.c:1503 ../route.c:86
-++#, c-format
-+ msgid "        -v, --verbose            be verbose\n"
-+ msgstr "        -v, --verbose            jutukas v�ljund\n"
-+ 
-+-#: ../arp.c:624
-++#: ../arp.c:636 ../netstat.c:1504 ../route.c:87
-++#, c-format
-+ msgid "        -n, --numeric            don't resolve names\n"
-+ msgstr "        -n, --numeric            mitte lahendada nimesid\n"
-+ 
-+-#: ../arp.c:625
-++#: ../arp.c:637
-++#, c-format
-+ msgid ""
-+ "        -i, --device             specify network interface (e.g. eth0)\n"
-+ msgstr ""
-+ "        -i, --device             v�rguliidese t�psustamine (n�iteks eth0)\n"
-+ 
-+-#: ../arp.c:626
-++#: ../arp.c:638
-++#, c-format
-+ msgid "        -D, --use-device         read <hwaddr> from given device\n"
-+ msgstr "        -D, --use-device         lugeda <hwaddr> vastavalt liideselt\n"
-+ 
-+-#: ../arp.c:627
-++#: ../arp.c:639
-++#, c-format
-+ msgid "        -A, -p, --protocol       specify protocol family\n"
-+ msgstr "        -A, -p, --protocol       protokollipere m��ramine\n"
-+ 
-+-#: ../arp.c:628
-++#: ../arp.c:640
-++#, c-format
-+ msgid ""
-+-"        -f, --file               read new entries from file or from "
-+-"/etc/ethers\n"
-++"        -f, --file               read new entries from file or from /etc/"
-++"ethers\n"
-+ "\n"
-+ msgstr ""
-+-"        -f, --file               lugeda kirjed antud failist v�i "
-+-"/etc/ethers'st\n"
-++"        -f, --file               lugeda kirjed antud failist v�i /etc/"
-++"ethers'st\n"
-+ "\n"
-+ 
-+-#: ../arp.c:630 ../rarp.c:181
-++#: ../arp.c:642 ../rarp.c:182
-+ #, c-format
-+ msgid "  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"
-+ msgstr ""
-+ "  <HW>=kasutage '-H <hw>' riistvaralise aadressi m��ramiseks.\n"
-+ "       Vaikimisi: %s\n"
-+ 
-+-#: ../arp.c:631 ../rarp.c:182
-++#: ../arp.c:643 ../rarp.c:183
-++#, c-format
-+ msgid "  List of possible hardware types (which support ARP):\n"
-+ msgstr "  V�imalike ARP-i toetavate riistvara t��pide nimekiri:\n"
-+ 
-+-#: ../arp.c:664 ../arp.c:749
-++#: ../arp.c:677 ../arp.c:762
-+ #, c-format
-+ msgid "%s: hardware type not supported!\n"
-+ msgstr "arp: riistvara t��pi %s ei toetata\n"
-+ 
-+-#: ../arp.c:668
-++#: ../arp.c:681
-+ #, c-format
-+ msgid "%s: address family not supported!\n"
-+ msgstr "arp: aadressiperekonda %s ei toetata\n"
-+ 
-+-#: ../arp.c:703
-++#: ../arp.c:716
-++#, c-format
-+ msgid "arp: -N not yet supported.\n"
-+ msgstr "arp: -N toetust pole veel\n"
-+ 
-+-#: ../arp.c:713
-++#: ../arp.c:726
-+ #, c-format
-+ msgid "arp: %s: unknown address family.\n"
-+ msgstr "arp: tundmatu aadressiperekond %s\n"
-+ 
-+-#: ../arp.c:722
-++#: ../arp.c:735
-+ #, c-format
-+ msgid "arp: %s: unknown hardware type.\n"
-+ msgstr "arp: tundmatu riistvara t��p %s\n"
-+ 
-+-#: ../arp.c:741
-++#: ../arp.c:754
-+ #, c-format
-+ msgid "arp: %s: kernel only supports 'inet'.\n"
-+ msgstr "arp: tuumas on ainult 'inet' aadressiperekonna toetus\n"
-+ 
-+-#: ../arp.c:754
-++#: ../arp.c:767
-+ #, c-format
-+ msgid "arp: %s: hardware type without ARP support.\n"
-+ msgstr "arp: riistvara t��bil %s pole ARP toetust\n"
-+ 
-+-#: ../hostname.c:69
-++#: ../hostname.c:71
-+ #, c-format
-+ msgid "Setting nodename to `%s'\n"
-+ msgstr "Sean s�lme nimeks `%s'\n"
-+ 
-+-#: ../hostname.c:74
-++#: ../hostname.c:76
-+ #, c-format
-+ msgid "%s: you must be root to change the node name\n"
-+ msgstr "%s: ainult root saab s�lme nime muuta\n"
-+ 
-+-#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116
-++#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117
-+ #, c-format
-+ msgid "%s: name too long\n"
-+ msgstr "%s: nimi on liiga pikk\n"
-+ 
-+-#: ../hostname.c:89
-++#: ../hostname.c:91
-+ #, c-format
-+ msgid "Setting hostname to `%s'\n"
-+ msgstr "Sean hosti nimeks `%s'\n"
-+ 
-+-#: ../hostname.c:94
-++#: ../hostname.c:96
-+ #, c-format
-+ msgid "%s: you must be root to change the host name\n"
-+ msgstr "%s: ainult root saab hosti nime muuta\n"
-+ 
-+-#: ../hostname.c:108
-++#: ../hostname.c:109
-+ #, c-format
-+ msgid "Setting domainname to `%s'\n"
-+ msgstr "Sean domeeni nimeks `%s'\n"
-+ 
-+-#: ../hostname.c:113
-++#: ../hostname.c:114
-+ #, c-format
-+ msgid "%s: you must be root to change the domain name\n"
-+ msgstr "%s: ainult root saab domeeni nime muuta\n"
-+@@ -304,25 +325,28 @@ msgstr "Tulemus: h_aliases=`%s'\n"
-+ msgid "Result: h_addr_list=`%s'\n"
-+ msgstr "Tulemus: h_addr_list=`%s'\n"
-+ 
-+-#: ../hostname.c:209
-++#: ../hostname.c:208
-+ #, c-format
-+ msgid "%s: can't open `%s'\n"
-+ msgstr "%s: ei saa avada faili `%s'\n"
-+ 
-+-#: ../hostname.c:223
-++#: ../hostname.c:222
-++#, c-format
-+ msgid "Usage: hostname [-v] {hostname|-F file}      set hostname (from file)\n"
-+ msgstr ""
-+ "Kasutamine:\n"
-+ "  hostname [-v] {hosti nimi|-F fail}         hosti nime seadmine (ka "
-+ "failist)\n"
-+ 
-+-#: ../hostname.c:224
-++#: ../hostname.c:223
-++#, c-format
-+ msgid ""
-+ "       domainname [-v] {nisdomain|-F file}   set NIS domainname (from file)\n"
-+ msgstr ""
-+ "  domainname [-v] {nisdomeen|-F fail}        NIS domeeni nime seadmine\n"
-+ 
-+-#: ../hostname.c:226
-++#: ../hostname.c:225
-++#, c-format
-+ msgid ""
-+ "       nodename [-v] {nodename|-F file}      set DECnet node name (from "
-+ "file)\n"
-+@@ -330,18 +354,21 @@ msgstr ""
-+ "  nodename [-v] {nodename|-F fail}           DECneti v�rgus�lme nime "
-+ "seadmine\n"
-+ 
-+-#: ../hostname.c:228
-++#: ../hostname.c:227
-++#, c-format
-+ msgid "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  display formatted name\n"
-+ msgstr ""
-+ "  hostname [-v] [-d|-f|-s|-a|-i|-y|-n]       nime n�itamine antud formaadis\n"
-+ 
-+-#: ../hostname.c:229
-++#: ../hostname.c:228
-++#, c-format
-+ msgid ""
-+ "       hostname [-v]                         display hostname\n"
-+ "\n"
-+ msgstr "  hostname [-v]                              hosti nime n�itamine\n"
-+ 
-+-#: ../hostname.c:230
-++#: ../hostname.c:229
-++#, c-format
-+ msgid ""
-+ "       hostname -V|--version|-h|--help       print info and exit\n"
-+ "\n"
-+@@ -350,7 +377,8 @@ msgstr ""
-+ "  hostname -h|--help                         seesama abiinfo\n"
-+ "\n"
-+ 
-+-#: ../hostname.c:231
-++#: ../hostname.c:230
-++#, c-format
-+ msgid ""
-+ "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
-+ "\n"
-+@@ -358,36 +386,44 @@ msgstr ""
-+ "  dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
-+ "\n"
-+ 
-+-#: ../hostname.c:232
-++#: ../hostname.c:231
-++#, c-format
-+ msgid "    -s, --short           short host name\n"
-+ msgstr "    -s, --short           l�hike hosti nimi\n"
-+ 
-+-#: ../hostname.c:233
-++#: ../hostname.c:232
-++#, c-format
-+ msgid "    -a, --alias           alias names\n"
-+ msgstr "     -a, --alias          alias-nimed\n"
-+ 
-+-#: ../hostname.c:234
-++#: ../hostname.c:233
-++#, c-format
-+ msgid "    -i, --ip-address      addresses for the hostname\n"
-+ msgstr "    -i, --ip-address      hosti IP aadressid\n"
-+ 
-+-#: ../hostname.c:235
-++#: ../hostname.c:234
-++#, c-format
-+ msgid "    -f, --fqdn, --long    long host name (FQDN)\n"
-+ msgstr ""
-+ "    -f, --fqdn, --long    pikk hosti nimi (FQDN - t�ielik s�steeminimi)\n"
-+ 
-+-#: ../hostname.c:236
-++#: ../hostname.c:235
-++#, c-format
-+ msgid "    -d, --domain          DNS domain name\n"
-+ msgstr "    -d, --domain          DNS domeeni nimi\n"
-+ 
-+-#: ../hostname.c:237
-++#: ../hostname.c:236
-++#, c-format
-+ msgid "    -y, --yp, --nis       NIS/YP domainname\n"
-+ msgstr "    -y, --yp, --nis       NIS/YP domeeni nimi\n"
-+ 
-+-#: ../hostname.c:239
-++#: ../hostname.c:238
-++#, c-format
-+ msgid "    -n, --node            DECnet node name\n"
-+ msgstr "    -n, --node            DECneti v�rgus�lme nimi\n"
-+ 
-+-#: ../hostname.c:241
-++#: ../hostname.c:240
-++#, c-format
-+ msgid ""
-+ "    -F, --file            read hostname or NIS domainname from given file\n"
-+ "\n"
-+@@ -395,7 +431,8 @@ msgstr ""
-+ "    -F, --file            lugeda hosti v�i NIS domeeni nimi failist\n"
-+ "\n"
-+ 
-+-#: ../hostname.c:243
-++#: ../hostname.c:242
-++#, c-format
-+ msgid ""
-+ "   This command can read or set the hostname or the NIS domainname. You can\n"
-+ "   also read the DNS domain or the FQDN (fully qualified domain name).\n"
-+@@ -415,6 +452,7 @@ msgid "%s: You can't change the DNS doma
-+ msgstr "%s: selle k�suga ei saa muuta DNS domeeni nime\n"
-+ 
-+ #: ../hostname.c:339
-++#, c-format
-+ msgid ""
-+ "\n"
-+ "Unless you are using bind or NIS for host lookups you can change the DNS\n"
-+@@ -423,6 +461,7 @@ msgstr ""
-+ "Kui Te EI kasuta bind'i ega NIS'i nimede lahendamiseks, saate DNS domeeni\n"
-+ 
-+ #: ../hostname.c:340
-++#, c-format
-+ msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n"
-+ msgstr "(mis on t�ieliku nime osa) nime muuta failist /etc/hosts.\n"
-+ 
-+@@ -441,76 +480,97 @@ msgstr "getdomainname()=`%s'\n"
-+ msgid "getnodename()=`%s'\n"
-+ msgstr "getnodename()=`%s'\n"
-+ 
-+-#: ../ifconfig.c:110
-++#: ../ifconfig.c:107
-++#, c-format
-+ msgid ""
-+-"Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
-++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
-+ "Flg\n"
-+ msgstr ""
-+-"Liides  MTU Meetr. RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
-++"Liides  MTU Meetr RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
-+ "Lip\n"
-+ 
-+-#: ../ifconfig.c:132 ../ifconfig.c:164
-+-#, c-format
-+-msgid "%s: unknown interface: %s\n"
-+-msgstr "ifconfig: tundmatu liides %s: %s\n"
-++#: ../ifconfig.c:129 ../ifconfig.c:161
-++#, fuzzy, c-format
-++msgid "%s: ERROR while getting interface flags: %s\n"
-++msgstr "%s: viga liidese info k�simisel: %s\n"
-+ 
-+-#: ../ifconfig.c:156 ../ifconfig.c:740 ../ifconfig.c:831 ../ifconfig.c:937
-++#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862
-++#: ../ifconfig.c:973
-++#, c-format
-+ msgid "No support for INET on this system.\n"
-+ msgstr "Antud s�steem ei toeta INET aadressiperekonda\n"
-+ 
-+-#: ../ifconfig.c:179
-++#: ../ifconfig.c:193
-++#, fuzzy, c-format
-++msgid "%s: ERROR while testing interface flags: %s\n"
-++msgstr "%s: viga liidese info k�simisel: %s\n"
-++
-++#: ../ifconfig.c:202
-++#, fuzzy, c-format
-+ msgid ""
-+ "Usage:\n"
-+-"  ifconfig [-a] [-i] [-v] [-s] <interface> [[<AF>] <address>]\n"
-++"  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"
-+ msgstr ""
-+ "Kasutamine:\n"
-+ "  ifconfig [-a] [-i] [-v] [-s] <liides> [[<AF>] <aadress>]\n"
-+ 
-+-#: ../ifconfig.c:181
-++#: ../ifconfig.c:204
-++#, c-format
-+ msgid "  [add <address>[/<prefixlen>]]\n"
-+ msgstr "  [add <aadress>[/<prefiksi pikkus>]]\n"
-+ 
-+-#: ../ifconfig.c:182
-++#: ../ifconfig.c:205
-++#, c-format
-+ msgid "  [del <address>[/<prefixlen>]]\n"
-+ msgstr "  [del <aadress>[/<prefiksi pikkus>]]\n"
-+ 
-+-#: ../ifconfig.c:183
-++#: ../ifconfig.c:206
-++#, c-format
-+ msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
-+ msgstr "  [[-]broadcast [<aadress>]]  [[-]pointopoint [<aadress>]]\n"
-+ 
-+-#: ../ifconfig.c:184
-++#: ../ifconfig.c:207
-++#, c-format
-+ msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
-+ msgstr "  [netmask <aadress>]  [dstaddr <aadress>]  [tunnel <aadress>]\n"
-+ 
-+-#: ../ifconfig.c:187
-++#: ../ifconfig.c:210
-++#, c-format
-+ msgid "  [outfill <NN>] [keepalive <NN>]\n"
-+ msgstr "  [outfill <NN>] [keepalive <NN>]\n"
-+ 
-+-#: ../ifconfig.c:189
-++#: ../ifconfig.c:212
-++#, c-format
-+ msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
-+ msgstr "  [hw <HW> <aadress>]  [metric <NN>]  [mtu <NN>]\n"
-+ 
-+-#: ../ifconfig.c:190
-++#: ../ifconfig.c:213
-++#, c-format
-+ msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
-+ msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
-+ 
-+-#: ../ifconfig.c:191
-++#: ../ifconfig.c:214
-++#, c-format
-+ msgid "  [multicast]  [[-]promisc]\n"
-+ msgstr "  [multicast]  [[-]promisc]\n"
-+ 
-+-#: ../ifconfig.c:192
-++#: ../ifconfig.c:215
-++#, c-format
-+ msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
-+ msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <t��p>]\n"
-+ 
-+-#: ../ifconfig.c:194
-++#: ../ifconfig.c:217
-++#, c-format
-+ msgid "  [txqueuelen <NN>]\n"
-+ msgstr "  [txqueuelen <NN>]\n"
-+ 
-+-#: ../ifconfig.c:197
-++#: ../ifconfig.c:220
-++#, c-format
-+ msgid "  [[-]dynamic]\n"
-+ msgstr "  [[-]dynamic]\n"
-+ 
-+-#: ../ifconfig.c:199
-++#: ../ifconfig.c:222
-++#, c-format
-+ msgid ""
-+ "  [up|down] ...\n"
-+ "\n"
-+@@ -518,73 +578,134 @@ msgstr ""
-+ "  [up|down] ...\n"
-+ "\n"
-+ 
-+-#: ../ifconfig.c:201
-++#: ../ifconfig.c:224
-++#, c-format
-+ msgid "  <HW>=Hardware Type.\n"
-+ msgstr "  <HW>=riistvara t��p\n"
-+ 
-+-#: ../ifconfig.c:202
-++#: ../ifconfig.c:225
-++#, c-format
-+ msgid "  List of possible hardware types:\n"
-+ msgstr "  V�imalike riistvara t��pide nimekiri:\n"
-+ 
-+ #. 1 = ARPable
-+-#: ../ifconfig.c:204
-++#: ../ifconfig.c:227
-+ #, c-format
-+ msgid "  <AF>=Address family. Default: %s\n"
-+ msgstr "  <AF>=aadressiperekond, vaikimisi %s\n"
-+ 
-+-#: ../ifconfig.c:205
-++#: ../ifconfig.c:228
-++#, c-format
-+ msgid "  List of possible address families:\n"
-+ msgstr "  V�imalike aadressiperekondade nimekiri:\n"
-+ 
-+-#: ../ifconfig.c:361
-++#: ../ifconfig.c:303
-++#, c-format
-++msgid "ifconfig: option `%s' not recognised.\n"
-++msgstr ""
-++
-++#: ../ifconfig.c:305 ../ifconfig.c:962
-++#, c-format
-++msgid "ifconfig: `--help' gives usage information.\n"
-++msgstr ""
-++
-++#: ../ifconfig.c:380
-++#, c-format
-+ msgid "Unknown media type.\n"
-+ msgstr "Tundmatu meedia t��p\n"
-+ 
-+-#: ../ifconfig.c:653
-++#: ../ifconfig.c:417
-++#, c-format
-++msgid ""
-++"Warning: Interface %s still in promisc mode... maybe other application is "
-++"running?\n"
-++msgstr ""
-++
-++#: ../ifconfig.c:429
-++#, c-format
-++msgid "Warning: Interface %s still in MULTICAST mode.\n"
-++msgstr ""
-++
-++#: ../ifconfig.c:441
-++#, c-format
-++msgid "Warning: Interface %s still in ALLMULTI mode.\n"
-++msgstr ""
-++
-++#: ../ifconfig.c:465
-++#, c-format
-++msgid "Warning: Interface %s still in DYNAMIC mode.\n"
-++msgstr ""
-++
-++#: ../ifconfig.c:523
-++#, c-format
-++msgid "Warning: Interface %s still in BROADCAST mode.\n"
-++msgstr ""
-++
-++#: ../ifconfig.c:652
-++#, c-format
-++msgid "Warning: Interface %s still in POINTOPOINT mode.\n"
-++msgstr ""
-++
-++#: ../ifconfig.c:684
-+ #, c-format
-+ msgid "hw address type `%s' has no handler to set address. failed.\n"
-+ msgstr ""
-+ "riistvara aadressi t��bil `%s' pole k�sitlejat aadressi seadmiseks - eba�nn\n"
-+ 
-+-#: ../ifconfig.c:662
-++#: ../ifconfig.c:693
-+ #, c-format
-+ msgid "%s: invalid %s address.\n"
-+ msgstr "%s: vigane %s aadress\n"
-+ 
-+-#: ../ifconfig.c:706 ../ifconfig.c:796 ../ifconfig.c:882
-++#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913
-++#, c-format
-+ msgid "No support for INET6 on this system.\n"
-+ msgstr "Antud s�steem ei toeta INET6 aadressiperekonda\n"
-+ 
-+-#: ../ifconfig.c:749 ../ifconfig.c:840
-++#: ../ifconfig.c:780 ../ifconfig.c:871
-+ #, c-format
-+ msgid "Interface %s not initialized\n"
-+ msgstr "Liides %s pole initsialiseeritud\n"
-+ 
-+-#: ../ifconfig.c:761 ../ifconfig.c:851
-++#: ../ifconfig.c:792 ../ifconfig.c:882
-++#, c-format
-+ msgid "Bad address.\n"
-+ msgstr "Vigane aadress\n"
-+ 
-+-#: ../ifconfig.c:854
-++#: ../ifconfig.c:885
-++#, c-format
-+ msgid "Address deletion not supported on this system.\n"
-+ msgstr "Antud s�steem ei toeta aadresside kustutamist\n"
-+ 
-+-#: ../ifconfig.c:947
-++#: ../ifconfig.c:957
-++#, fuzzy, c-format
-++msgid "ifconfig: Cannot set address for this protocol family.\n"
-++msgstr "Ei oska seada aadresse aadressiperekonna %d jaoks\n"
-++
-++#: ../ifconfig.c:983
-++#, c-format
-+ msgid "No support for ECONET on this system.\n"
-+ msgstr "Antud s�steem ei toeta ECONET aadressiperekonda\n"
-+ 
-+-#: ../ifconfig.c:955
-++#: ../ifconfig.c:991
-+ #, c-format
-+ msgid "Don't know how to set addresses for family %d.\n"
-+ msgstr "Ei oska seada aadresse aadressiperekonna %d jaoks\n"
-+ 
-+-#: ../netstat.c:429
-++#: ../ifconfig.c:1021
-++#, c-format
-++msgid "WARNING: at least one error occured. (%d)\n"
-++msgstr ""
-++
-++#: ../netstat.c:434
-+ #, c-format
-+ msgid ""
-+ "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n"
-+ msgstr ""
-+ "(\"-p\" jaoks ei saanud infot lugeda: geteuid()=%d, aga vaja oleks root'u)\n"
-+ 
-+-#: ../netstat.c:433
-++#: ../netstat.c:438
-++#, c-format
-+ msgid ""
-+ "(Not all processes could be identified, non-owned process info\n"
-+ " will not be shown, you would have to be root to see it all.)\n"
-+@@ -592,210 +713,223 @@ msgstr ""
-+ "(M�nesid protsesse ei saanud identifitseerida, teiste kasutajate\n"
-+ "info lugemiseks peab olema root)\n"
-+ 
-+-#: ../netstat.c:440 ../netstat.c:1171 ../netstat.c:1248
-++#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266
-+ msgid "LISTENING"
-+ msgstr "LISTENING"
-+ 
-+-#: ../netstat.c:441
-++#: ../netstat.c:446
-+ msgid "CONN SENT"
-+ msgstr "CONN SENT"
-+ 
-+-#: ../netstat.c:442 ../netstat.c:1250
-++#: ../netstat.c:447 ../netstat.c:1268
-+ msgid "DISC SENT"
-+ msgstr "DISC SENT"
-+ 
-+-#: ../netstat.c:443 ../netstat.c:510 ../netstat.c:889 ../netstat.c:1251
-++#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269
-+ msgid "ESTABLISHED"
-+ msgstr "ESTABLISHED"
-+ 
-+-#: ../netstat.c:465
-++#: ../netstat.c:470
-++#, c-format
-+ msgid "Active NET/ROM sockets\n"
-+ msgstr "Aktiivsed NET/ROM soklid\n"
-+ 
-+-#: ../netstat.c:466
-++#: ../netstat.c:471
-++#, c-format
-+ msgid ""
-+-"User       Dest       Source     Device  State        Vr/Vs    Send-Q  "
-+-"Recv-Q\n"
-++"User       Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-"
-++"Q\n"
-+ msgstr ""
-+ "Kasutaja   Sihtpunkt  L�htepunkt Liides  Olek         Vr/Vs    SaatJrk "
-+ "VvJrk\n"
-+ 
-+-#: ../netstat.c:476 ../netstat.c:1290
-++#: ../netstat.c:481 ../netstat.c:1308
-+ #, c-format
-+ msgid "Problem reading data from %s\n"
-+ msgstr "Probleem andmete lugemisel failist %s\n"
-+ 
-+-#: ../netstat.c:511
-++#: ../netstat.c:516
-+ msgid "SYN_SENT"
-+ msgstr "SYN_SENT"
-+ 
-+-#: ../netstat.c:512
-++#: ../netstat.c:517
-+ msgid "SYN_RECV"
-+ msgstr "SYN_RECV"
-+ 
-+-#: ../netstat.c:513
-++#: ../netstat.c:518
-+ msgid "FIN_WAIT1"
-+ msgstr "FIN_WAIT1"
-+ 
-+-#: ../netstat.c:514
-++#: ../netstat.c:519
-+ msgid "FIN_WAIT2"
-+ msgstr "FIN_WAIT2"
-+ 
-+-#: ../netstat.c:515
-++#: ../netstat.c:520
-+ msgid "TIME_WAIT"
-+ msgstr "TIME_WAIT"
-+ 
-+-#: ../netstat.c:516
-++#: ../netstat.c:521
-+ msgid "CLOSE"
-+ msgstr "CLOSE"
-+ 
-+-#: ../netstat.c:517
-++#: ../netstat.c:522
-+ msgid "CLOSE_WAIT"
-+ msgstr "CLOSE_WAIT"
-+ 
-+-#: ../netstat.c:518
-++#: ../netstat.c:523
-+ msgid "LAST_ACK"
-+ msgstr "LAST_ACK"
-+ 
-+-#: ../netstat.c:519
-++#: ../netstat.c:524
-+ msgid "LISTEN"
-+ msgstr "LISTEN"
-+ 
-+-#: ../netstat.c:520
-++#: ../netstat.c:525
-+ msgid "CLOSING"
-+ msgstr "CLOSING"
-+ 
-+-#: ../netstat.c:587
-++#: ../netstat.c:596
-+ #, c-format
-+ msgid "warning, got bogus igmp6 line %d.\n"
-+ msgstr "Hoiatus - sain imeliku igmp6 rea (nr. %d)\n"
-+ 
-+-#: ../netstat.c:592 ../netstat.c:630 ../netstat.c:751 ../netstat.c:883
-+-#: ../netstat.c:1014 ../netstat.c:1019
-++#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898
-++#: ../netstat.c:1032 ../netstat.c:1037
-+ #, c-format
-+ msgid "netstat: unsupported address family %d !\n"
-+ msgstr "netstat: aadressiperekonda %d ei toetata\n"
-+ 
-+-#: ../netstat.c:605 ../netstat.c:610 ../netstat.c:618 ../netstat.c:625
-++#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634
-+ #, c-format
-+ msgid "warning, got bogus igmp line %d.\n"
-+ msgstr "Hoiatus - sain imeliku igmp rea (nr. %d)\n"
-+ 
-+-#: ../netstat.c:668
-++#: ../netstat.c:677
-++#, c-format
-+ msgid "Active X.25 sockets\n"
-+ msgstr "Aktiivsed X.25 soklid\n"
-+ 
-+ #. IMHO, Vr/Vs is not very usefull --SF
-+-#: ../netstat.c:670
-++#: ../netstat.c:679
-++#, c-format
-+ msgid ""
-+-"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  "
-+-"Recv-Q\n"
-++"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  Recv-"
-++"Q\n"
-+ msgstr ""
-+ "Sihtpunkt    L�htepunkt      Liides  LCI  Olek         Vr/Vs  SaatJrk VvJrk\n"
-+ 
-+-#: ../netstat.c:747
-++#: ../netstat.c:759
-++#, c-format
-+ msgid "warning, got bogus tcp line.\n"
-+ msgstr "Hoiatus - sain imeliku tcp rea\n"
-+ 
-+-#: ../netstat.c:788 ../netstat.c:938 ../netstat.c:1057
-++#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075
-+ #, c-format
-+ msgid "off (0.00/%ld/%d)"
-+ msgstr "eik�i ((0.00/%ld/%d)"
-+ 
-+-#: ../netstat.c:792
-++#: ../netstat.c:804
-+ #, c-format
-+ msgid "on (%2.2f/%ld/%d)"
-+ msgstr "k�ib (%2.2f/%ld/%d)"
-+ 
-+-#: ../netstat.c:797
-++#: ../netstat.c:809
-+ #, c-format
-+ msgid "keepalive (%2.2f/%ld/%d)"
-+ msgstr "keepalive (%2.2f/%ld/%d)"
-+ 
-+-#: ../netstat.c:802
-++#: ../netstat.c:814
-+ #, c-format
-+ msgid "timewait (%2.2f/%ld/%d)"
-+ msgstr "timewait (%2.2f/%ld/%d)"
-+ 
-+-#: ../netstat.c:807 ../netstat.c:947 ../netstat.c:1067
-++#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085
-+ #, c-format
-+ msgid "unkn-%d (%2.2f/%ld/%d)"
-+ msgstr "eitea-%d (%2.2f/%ld/%d)"
-+ 
-+-#: ../netstat.c:879
-++#: ../netstat.c:894
-++#, c-format
-+ msgid "warning, got bogus udp line.\n"
-+ msgstr "Hoiatus - sain imeliku udp rea\n"
-+ 
-+-#: ../netstat.c:897 ../netstat.c:1157 ../netstat.c:1190
-++#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208
-+ msgid "UNKNOWN"
-+ msgstr "TUNDMATU"
-+ 
-+-#: ../netstat.c:943 ../netstat.c:1062
-++#: ../netstat.c:958 ../netstat.c:1080
-+ #, c-format
-+ msgid "on%d (%2.2f/%ld/%d)"
-+ msgstr "k�ib-%d (%2.2f/%ld/%d)"
-+ 
-+-#: ../netstat.c:1028
-++#: ../netstat.c:1046
-++#, c-format
-+ msgid "warning, got bogus raw line.\n"
-+ msgstr "Hoiatus - sain imeliku raw rea\n"
-+ 
-+-#: ../netstat.c:1110
-++#: ../netstat.c:1128
-++#, c-format
-+ msgid "warning, got bogus unix line.\n"
-+ msgstr "Hoiatus - sain imeliku unix rea\n"
-+ 
-+-#: ../netstat.c:1137
-++#: ../netstat.c:1155
-+ msgid "STREAM"
-+ msgstr "STREAM"
-+ 
-+-#: ../netstat.c:1141
-++#: ../netstat.c:1159
-+ msgid "DGRAM"
-+ msgstr "DGRAM"
-+ 
-+-#: ../netstat.c:1145
-++#: ../netstat.c:1163
-+ msgid "RAW"
-+ msgstr "RAW"
-+ 
-+-#: ../netstat.c:1149
-++#: ../netstat.c:1167
-+ msgid "RDM"
-+ msgstr "RDM"
-+ 
-+-#: ../netstat.c:1153
-++#: ../netstat.c:1171
-+ msgid "SEQPACKET"
-+ msgstr "SEQPACKET"
-+ 
-+-#: ../netstat.c:1162
-++#: ../netstat.c:1180
-+ msgid "FREE"
-+ msgstr "VABA"
-+ 
-+-#: ../netstat.c:1178
-++#: ../netstat.c:1196
-+ msgid "CONNECTING"
-+ msgstr "�HENDUMAS"
-+ 
-+-#: ../netstat.c:1182
-++#: ../netstat.c:1200
-+ msgid "CONNECTED"
-+ msgstr "�HENDATUD"
-+ 
-+-#: ../netstat.c:1186
-++#: ../netstat.c:1204
-+ msgid "DISCONNECTING"
-+ msgstr "LAHTI�HENDUMAS"
-+ 
-+-#: ../netstat.c:1217
-++#: ../netstat.c:1235
-++#, c-format
-+ msgid "Active UNIX domain sockets "
-+ msgstr "Aktiivsed UNIX domeeni soklid "
-+ 
-+-#: ../netstat.c:1219 ../netstat.c:1729
-++#: ../netstat.c:1237 ../netstat.c:1756
-++#, c-format
-+ msgid "(servers and established)"
-+ msgstr "(serverid ja �hendatud)"
-+ 
-+-#: ../netstat.c:1222 ../netstat.c:1732
-++#: ../netstat.c:1240 ../netstat.c:1759
-++#, c-format
-+ msgid "(only servers)"
-+ msgstr "(ainult serverid)"
-+ 
-+-#: ../netstat.c:1224 ../netstat.c:1734
-++#: ../netstat.c:1242 ../netstat.c:1761
-++#, c-format
-+ msgid "(w/o servers)"
-+ msgstr "(ilma serveriteta)"
-+ 
-+-#: ../netstat.c:1227
-++#: ../netstat.c:1245
-++#, c-format
-+ msgid ""
-+ "\n"
-+ "Proto RefCnt Flags       Type       State         I-Node"
-+@@ -803,32 +937,36 @@ msgstr ""
-+ "\n"
-+ "Proto Mitu   Lipud       T��p       Olek         I-kirje "
-+ 
-+-#: ../netstat.c:1229
-++#: ../netstat.c:1247
-++#, c-format
-+ msgid " Path\n"
-+ msgstr "Tee\n"
-+ 
-+-#: ../netstat.c:1249
-++#: ../netstat.c:1267
-+ msgid "SABM SENT"
-+ msgstr "SABM SENT"
-+ 
-+-#: ../netstat.c:1252
-++#: ../netstat.c:1270
-+ msgid "RECOVERY"
-+ msgstr "RECOVERY"
-+ 
-+-#: ../netstat.c:1266
-++#: ../netstat.c:1284
-++#, c-format
-+ msgid "Active AX.25 sockets\n"
-+ msgstr "Aktiivsed AX.25 soklid\n"
-+ 
-+-#: ../netstat.c:1267
-++#: ../netstat.c:1285
-++#, c-format
-+ msgid "Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-Q\n"
-+ msgstr "Sihtpunkt  L�htepunkt Liides  Olek         Vr/Vs    SaatJrk VvJrk\n"
-+ 
-+-#: ../netstat.c:1310
-++#: ../netstat.c:1328
-+ #, c-format
-+ msgid "problem reading data from %s\n"
-+ msgstr "Probleem andmete lugemisel failist %s\n"
-+ 
-+-#: ../netstat.c:1361
-++#: ../netstat.c:1379
-++#, c-format
-+ msgid ""
-+ "Active IPX sockets\n"
-+ "Proto Recv-Q Send-Q Local Address              Foreign Address            "
-+@@ -838,47 +976,53 @@ msgstr ""
-+ "Proto VvJrk  SaatJrk Kohalik aadress           V�line aadress             "
-+ "Olek "
-+ 
-+-#: ../netstat.c:1363
-++#: ../netstat.c:1381
-++#, c-format
-+ msgid " User"
-+ msgstr " Kasutaja"
-+ 
-+-#: ../netstat.c:1397
-++#: ../netstat.c:1415
-+ msgid "ESTAB"
-+ msgstr "ESTAB"
-+ 
-+-#: ../netstat.c:1405
-++#: ../netstat.c:1423
-+ msgid "UNK."
-+ msgstr "UNK."
-+ 
-+-#: ../netstat.c:1443
-++#: ../netstat.c:1461
-++#, c-format
-+ msgid "Kernel Interface table\n"
-+ msgstr "Tuuma liideste tabel\n"
-+ 
-+-#: ../netstat.c:1447
-++#: ../netstat.c:1465
-++#, fuzzy, c-format
-+ msgid ""
-+-"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
-++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
-+ "Flg\n"
-+ msgstr ""
-+-"Liides  MTU Meetr RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
-++"Liides  MTU Meetr. RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
-+ "Lip\n"
-+ 
-+-#: ../netstat.c:1451
-++#: ../netstat.c:1469
-+ msgid "missing interface information"
-+ msgstr "Puudulik informatsioon liideste kohta"
-+ 
-+-#: ../netstat.c:1474
-++#: ../netstat.c:1492
-++#, c-format
-+ msgid ""
-+-"usage: netstat [-veenNcCF] [<Af>] -r         netstat "
-+-"{-V|--version|-h|--help}\n"
-++"usage: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
-++"help}\n"
-+ msgstr ""
-+ "Kasutamine: netstat [-veenNcCF] [<Af>] -r\n"
-+ "            netstat {-V|--version|-h|--help}\n"
-+ 
-+-#: ../netstat.c:1475
-++#: ../netstat.c:1493
-++#, c-format
-+ msgid "       netstat [-vnNcaeol] [<Socket> ...]\n"
-+ msgstr "            netstat [-vnNcaeol] [<Sokkel> ...]\n"
-+ 
-+-#: ../netstat.c:1476
-++#: ../netstat.c:1494
-++#, c-format
-+ msgid ""
-+ "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
-+ "\n"
-+@@ -886,25 +1030,30 @@ msgstr ""
-+ "            netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
-+ "\n"
-+ 
-+-#: ../netstat.c:1478
-++#: ../netstat.c:1496
-++#, c-format
-+ msgid "        -r, --route              display routing table\n"
-+ msgstr "        -r, --route              ruutingutabeli n�itamine\n"
-+ 
-+-#: ../netstat.c:1479
-++#: ../netstat.c:1497
-++#, c-format
-+ msgid "        -i, --interfaces         display interface table\n"
-+ msgstr "        -i, --interfaces         liideste tabeli n�itamine\n"
-+ 
-+-#: ../netstat.c:1480
-++#: ../netstat.c:1498
-++#, c-format
-+ msgid "        -g, --groups             display multicast group memberships\n"
-+ msgstr "        -g, --groups             multiedastuse gruppide n�itamine\n"
-+ 
-+-#: ../netstat.c:1481
-++#: ../netstat.c:1499
-++#, c-format
-+ msgid ""
-+ "        -s, --statistics         display networking statistics (like SNMP)\n"
-+ msgstr ""
-+ "        -s, --statistics         v�rgu statistika n�itamine (SNMP stiilis)\n"
-+ 
-+-#: ../netstat.c:1483
-++#: ../netstat.c:1501
-++#, c-format
-+ msgid ""
-+ "        -M, --masquerade         display masqueraded connections\n"
-+ "\n"
-+@@ -912,36 +1061,39 @@ msgstr ""
-+ "        -M, --masquerade         maskeeritavate �henduste n�itamine\n"
-+ "\n"
-+ 
-+-#: ../netstat.c:1486 ../route.c:86
-+-msgid "        -n, --numeric            dont resolve names\n"
-+-msgstr "        -n, --numeric            mitte lahendada numbreid nimedeks\n"
-+-
-+-#: ../netstat.c:1487
-+-msgid "        --numeric-hosts          dont resolve host names\n"
-++#: ../netstat.c:1505
-++#, fuzzy, c-format
-++msgid "        --numeric-hosts          don't resolve host names\n"
-+ msgstr "        --numeric-hosts          mitte lahendada hostinimesid\n"
-+ 
-+-#: ../netstat.c:1488
-+-msgid "        --numeric-ports          dont resolve port names\n"
-++#: ../netstat.c:1506
-++#, fuzzy, c-format
-++msgid "        --numeric-ports          don't resolve port names\n"
-+ msgstr "        --numeric-ports          mitte lahendada pordinimesid\n"
-+ 
-+-#: ../netstat.c:1489
-+-msgid "        --numeric-users          dont resolve user names\n"
-++#: ../netstat.c:1507
-++#, fuzzy, c-format
-++msgid "        --numeric-users          don't resolve user names\n"
-+ msgstr "        --numeric-users          mitte lahendada kasutajanimesid\n"
-+ 
-+-#: ../netstat.c:1490
-++#: ../netstat.c:1508
-++#, c-format
-+ msgid "        -N, --symbolic           resolve hardware names\n"
-+ msgstr "        -N, --symbolic           lahendada riistvara aadressid\n"
-+ 
-+-#: ../netstat.c:1491 ../route.c:87
-++#: ../netstat.c:1509 ../route.c:88
-++#, c-format
-+ msgid "        -e, --extend             display other/more information\n"
-+ msgstr "        -e, --extend             muu info/lisainfo n�itamine\n"
-+ 
-+-#: ../netstat.c:1492
-++#: ../netstat.c:1510
-++#, c-format
-+ msgid "        -p, --programs           display PID/Program name for sockets\n"
-+ msgstr ""
-+ "        -p, --programs           soklite kohta PID/protsessi nime n�itamine\n"
-+ 
-+-#: ../netstat.c:1493
-++#: ../netstat.c:1511
-++#, c-format
-+ msgid ""
-+ "        -c, --continuous         continuous listing\n"
-+ "\n"
-+@@ -949,22 +1101,26 @@ msgstr ""
-+ "        -c, --continuous         pidevalt uuenev nimekiri\n"
-+ "\n"
-+ 
-+-#: ../netstat.c:1494
-++#: ../netstat.c:1512
-++#, c-format
-+ msgid "        -l, --listening          display listening server sockets\n"
-+ msgstr "        -l, --listening          kuulavate serversoklite n�itamine\n"
-+ 
-+-#: ../netstat.c:1495
-++#: ../netstat.c:1513
-++#, c-format
-+ msgid ""
-+ "        -a, --all, --listening   display all sockets (default: connected)\n"
-+ msgstr ""
-+ "        -a, --all, --listening   k�igi soklite n�itamine (vaikimisi "
-+ "�hendatud)\n"
-+ 
-+-#: ../netstat.c:1496
-++#: ../netstat.c:1514
-++#, c-format
-+ msgid "        -o, --timers             display timers\n"
-+ msgstr "        -o, --timers             taimerite n�itamine\n"
-+ 
-+-#: ../netstat.c:1497 ../route.c:88
-++#: ../netstat.c:1515 ../route.c:89
-++#, c-format
-+ msgid ""
-+ "        -F, --fib                display Forwarding Information Base "
-+ "(default)\n"
-+@@ -972,7 +1128,8 @@ msgstr ""
-+ "        -F, --fib                �ldiste ruutingutabelite n�itamine "
-+ "(vaikimisi)\n"
-+ 
-+-#: ../netstat.c:1498 ../route.c:89
-++#: ../netstat.c:1516 ../route.c:90
-++#, c-format
-+ msgid ""
-+ "        -C, --cache              display routing cache instead of FIB\n"
-+ "\n"
-+@@ -981,108 +1138,121 @@ msgstr ""
-+ "n�itamine\n"
-+ "\n"
-+ 
-+-#: ../netstat.c:1500
-++#: ../netstat.c:1518
-++#, c-format
-+ msgid ""
-+-"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
-+-"--netrom\n"
-++"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
-++"netrom\n"
-+ msgstr ""
-+-"  <Sokkel>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
-+-"--netrom\n"
-++"  <Sokkel>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
-++"netrom\n"
-+ 
-+-#: ../netstat.c:1501 ../route.c:91
-+-#, c-format
-+-msgid "  <AF>=Use '-A <af>' or '--<af>' Default: %s\n"
-++#: ../netstat.c:1519
-++#, fuzzy, c-format
-++msgid "  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"
-+ msgstr "  <AF>=kasutage '-A <af>' v�i '--<af>' vaikimisi: %s\n"
-+ 
-+-#: ../netstat.c:1502 ../route.c:92
-++#: ../netstat.c:1520 ../route.c:93
-++#, c-format
-+ msgid "  List of possible address families (which support routing):\n"
-+ msgstr "  V�imalike ruutingu toetavate aadressiperekondade nimekiri:\n"
-+ 
-+-#: ../netstat.c:1726
-++#: ../netstat.c:1753
-++#, c-format
-+ msgid "Active Internet connections "
-+ msgstr "Aktiivsed interneti�hendused "
-+ 
-+-#: ../netstat.c:1736
-++#: ../netstat.c:1763
-++#, c-format
-+ msgid ""
-+ "\n"
-+-"Proto Recv-Q Send-Q Local Address           Foreign Address         State    "
-+-"  "
-++"Proto Recv-Q Send-Q Local Address           Foreign Address         "
-++"State      "
-+ msgstr ""
-+ "\n"
-+-"Proto  VvJrk SaatJrk Kohalik aadress        V�line aadress          Olek     "
-+-"  "
-++"Proto  VvJrk SaatJrk Kohalik aadress        V�line aadress          "
-++"Olek       "
-+ 
-+-#: ../netstat.c:1738
-++#: ../netstat.c:1765
-++#, c-format
-+ msgid " User       Inode     "
-+ msgstr " Kasutaja   I-kirje   "
-+ 
-+-#: ../netstat.c:1741
-++#: ../netstat.c:1768
-++#, c-format
-+ msgid " Timer"
-+ msgstr " Taimer"
-+ 
-+-#: ../netstat.c:1771
-++#: ../netstat.c:1798
-++#, c-format
-+ msgid "IPv4 Group Memberships\n"
-+ msgstr "IPv4 grupikuuluvused\n"
-+ 
-+-#: ../netstat.c:1772
-++#: ../netstat.c:1799
-++#, c-format
-+ msgid "Interface       RefCnt Group\n"
-+ msgstr "Liides          Mitu   Grupp\n"
-+ 
-+-#: ../rarp.c:43
-++#: ../rarp.c:44
-+ msgid "This kernel does not support RARP.\n"
-+ msgstr "rarp: tuum ei toeta RARP'i\n"
-+ 
-+-#: ../rarp.c:82
-++#: ../rarp.c:83
-+ #, c-format
-+ msgid "no RARP entry for %s.\n"
-+ msgstr "rarp: %s jaoks pole RARP kirjet\n"
-+ 
-+-#: ../rarp.c:95
-++#: ../rarp.c:96
-+ #, c-format
-+ msgid "%s: bad hardware address\n"
-+ msgstr "rarp: vigane riistvaraline aadress %s\n"
-+ 
-+-#: ../rarp.c:127
-++#: ../rarp.c:128
-+ #, c-format
-+ msgid "rarp: cannot open file %s:%s.\n"
-+ msgstr "rarp: ei saa avada faili %s:%s\n"
-+ 
-+-#: ../rarp.c:139
-++#: ../rarp.c:140
-+ #, c-format
-+ msgid "rarp: format error at %s:%u\n"
-+ msgstr "rarp: vorminguviga failis %s real %u\n"
-+ 
-+-#: ../rarp.c:143 ../rarp.c:287
-++#: ../rarp.c:144 ../rarp.c:289
-+ #, c-format
-+ msgid "rarp: %s: unknown host\n"
-+ msgstr "rarp: tundmatu host %s\n"
-+ 
-+-#: ../rarp.c:146
-++#: ../rarp.c:147
-+ #, c-format
-+ msgid "rarp: cannot set entry from %s:%u\n"
-+ msgstr "rarp: ei saa kehtestada kirjet failist %s realt %u\n"
-+ 
-+-#: ../rarp.c:175
-++#: ../rarp.c:176
-++#, c-format
-+ msgid "Usage: rarp -a                               list entries in cache.\n"
-+ msgstr ""
-+ "Kasutamine:\n"
-+ "  rarp -a                              puhvris olevate kirjete vaatamine\n"
-+ 
-+-#: ../rarp.c:176
-++#: ../rarp.c:177
-++#, c-format
-+ msgid "       rarp -d <hostname>                    delete entry from cache.\n"
-+ msgstr "  rarp -d <hosti nimi>                 kirje kustutamine puhvrist\n"
-+ 
-+-#: ../rarp.c:177
-++#: ../rarp.c:178
-++#, c-format
-+ msgid "       rarp [<HW>] -s <hostname> <hwaddr>    add entry to cache.\n"
-+ msgstr "  rarp [<HW>] -s <hosti nimi> <hwaddr> kirje lisamine puhvrisse\n"
-+ 
-+-#: ../rarp.c:178
-++#: ../rarp.c:179
-++#, c-format
-+ msgid ""
-+ "       rarp -f                               add entries from /etc/ethers.\n"
-+ msgstr ""
-+ "  rarp -f                              kirjete lisamine failist /etc/ethers\n"
-+ 
-+-#: ../rarp.c:179
-++#: ../rarp.c:180
-++#, c-format
-+ msgid ""
-+ "       rarp -V                               display program version.\n"
-+ "\n"
-+@@ -1090,24 +1260,26 @@ msgstr ""
-+ "  rarp -V                              programmi versiooni n�itamine\n"
-+ "\n"
-+ 
-+-#: ../rarp.c:236
-++#: ../rarp.c:238
-+ #, c-format
-+ msgid "%s: illegal option mix.\n"
-+ msgstr "%s: lubamatu v�tmete kombinatsioon\n"
-+ 
-+-#: ../rarp.c:267
-++#: ../rarp.c:269
-+ #, c-format
-+ msgid "rarp: %s: unknown hardware type.\n"
-+ msgstr "rarp: tundmatu riistvara t��p %s\n"
-+ 
-+-#: ../route.c:79
-++#: ../route.c:80
-++#, c-format
-+ msgid ""
-+ "Usage: route [-nNvee] [-FC] [<AF>]           List kernel routing tables\n"
-+ msgstr ""
-+ "Kasutamine:\n"
-+ "    route [-nNvee] [-FC] [<AF>]           Tuuma ruutingutabeli n�itamine\n"
-+ 
-+-#: ../route.c:80
-++#: ../route.c:81
-++#, c-format
-+ msgid ""
-+ "       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n"
-+ "\n"
-+@@ -1115,7 +1287,8 @@ msgstr ""
-+ "    route [-v] [-FC] {add|del|flush} ...  Tuuma ruutingutabeli muutmine\n"
-+ "\n"
-+ 
-+-#: ../route.c:82
-++#: ../route.c:83
-++#, c-format
-+ msgid ""
-+ "       route {-h|--help} [<AF>]              Detailed usage syntax for "
-+ "specified AF.\n"
-+@@ -1123,7 +1296,8 @@ msgstr ""
-+ "    route {-h|--help} [<AF>]              Detailne s�ntaks perekonna AF "
-+ "jaoks\n"
-+ 
-+-#: ../route.c:83
-++#: ../route.c:84
-++#, c-format
-+ msgid ""
-+ "       route {-V|--version}                  Display version/author and "
-+ "exit.\n"
-+@@ -1132,15 +1306,23 @@ msgstr ""
-+ "    route {-V|--version}                  Versiooni ja oskuste n�itamine\n"
-+ "\n"
-+ 
-++#: ../route.c:92
-++#, fuzzy, c-format
-++msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
-++msgstr "  <AF>=kasutage '-A <af>' v�i '--<af>' vaikimisi: %s\n"
-++
-+ #: ../plipconfig.c:66
-++#, c-format
-+ msgid "Usage: plipconfig [-a] [-i] [-v] interface\n"
-+ msgstr "Kasutamine:  plipconfig [-a] [-i] [-v] liides\n"
-+ 
-+ #: ../plipconfig.c:67
-++#, c-format
-+ msgid "                  [nibble NN] [trigger NN]\n"
-+ msgstr "                        [nibble NN] [trigger NN]\n"
-+ 
-+ #: ../plipconfig.c:68
-++#, c-format
-+ msgid "       plipconfig -V | --version\n"
-+ msgstr "             plipconfig -V | --version\n"
-+ 
-+@@ -1149,25 +1331,30 @@ msgstr "             plipconfig -V | --v
-+ msgid "%s\tnibble %lu  trigger %lu\n"
-+ msgstr "%s\tnibble %lu  trigger %lu\n"
-+ 
-+-#: ../iptunnel.c:84
-++#: ../iptunnel.c:85
-++#, c-format
-+ msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
-+ msgstr "Kasutamine: iptunnel { add | change | del | show } [ NIMI ]\n"
-+ 
-+-#: ../iptunnel.c:85
-++#: ../iptunnel.c:86
-++#, c-format
-+ msgid ""
-+ "          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
-+ msgstr ""
-+ "             [ mode { ipip | gre | sit } ] [ remote AADR ] [ local AADR ]\n"
-+ 
-+-#: ../iptunnel.c:86
-++#: ../iptunnel.c:87
-++#, c-format
-+ msgid "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
-+ msgstr "             [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
-+ 
-+-#: ../iptunnel.c:87
-++#: ../iptunnel.c:88
-++#, c-format
-+ msgid "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
-+ msgstr "             [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev LIIDES ]\n"
-+ 
-+-#: ../iptunnel.c:88
-++#: ../iptunnel.c:89
-++#, c-format
-+ msgid ""
-+ "       iptunnel -V | --version\n"
-+ "\n"
-+@@ -1175,83 +1362,99 @@ msgstr ""
-+ "             iptunnel -V | --version\n"
-+ "\n"
-+ 
-+-#: ../iptunnel.c:89
-++#: ../iptunnel.c:90
-++#, c-format
-+ msgid "Where: NAME := STRING\n"
-+ msgstr "Kus:   NIMI := STRING\n"
-+ 
-+-#: ../iptunnel.c:90
-++#: ../iptunnel.c:91
-++#, c-format
-+ msgid "       ADDR := { IP_ADDRESS | any }\n"
-+ msgstr "       AADR := { IP_AADRESS | any }\n"
-+ 
-+-#: ../iptunnel.c:91
-++#: ../iptunnel.c:92
-++#, c-format
-+ msgid "       TOS  := { NUMBER | inherit }\n"
-+ msgstr "       TOS  := { ARV | inherit }\n"
-+ 
-+-#: ../iptunnel.c:92
-++#: ../iptunnel.c:93
-++#, c-format
-+ msgid "       TTL  := { 1..255 | inherit }\n"
-+ msgstr "       TTL  := { 1..255 | inherit }\n"
-+ 
-+-#: ../iptunnel.c:93
-++#: ../iptunnel.c:94
-++#, c-format
-+ msgid "       KEY  := { DOTTED_QUAD | NUMBER }\n"
-+ msgstr ""
-+ "       KEY  := { PUNKTIDEGA_ARVUNELIK | ARV }\n"
-+ "       LIIDES := F��SILISE_LIIDESE_NIMI\n"
-+ 
-+-#: ../iptunnel.c:331
-++#: ../iptunnel.c:332
-++#, c-format
-+ msgid "Keys are not allowed with ipip and sit.\n"
-+ msgstr "ipip ja sit juures ei ole v�tmed lubatud\n"
-+ 
-+-#: ../iptunnel.c:351
-++#: ../iptunnel.c:352
-++#, c-format
-+ msgid "Broadcast tunnel requires a source address.\n"
-+ msgstr "Leviedastusega tunnel vajab l�hteaadressi\n"
-+ 
-+-#: ../iptunnel.c:366
-++#: ../iptunnel.c:367
-++#, c-format
-+ msgid "ttl != 0 and noptmudisc are incompatible\n"
-+ msgstr "ttl != 0 ning noptmudisc ei sobi kokku\n"
-+ 
-+-#: ../iptunnel.c:378
-++#: ../iptunnel.c:379
-++#, c-format
-+ msgid "cannot determine tunnel mode (ipip, gre or sit)\n"
-+ msgstr "Ei suuda m��rata tunneli moodi (ipip, gre v�i sit)\n"
-+ 
-+-#: ../iptunnel.c:416
-++#: ../iptunnel.c:417
-+ #, c-format
-+ msgid "%s: %s/ip  remote %s  local %s "
-+ msgstr "%s: %s/ip teises otsas %s  siin %s "
-+ 
-+-#: ../iptunnel.c:420
-++#: ../iptunnel.c:421
-+ msgid "unknown"
-+ msgstr "tundmatu"
-+ 
-+-#: ../iptunnel.c:452
-++#: ../iptunnel.c:453
-++#, c-format
-+ msgid "  Drop packets out of sequence.\n"
-+ msgstr "  J�rjekorrav�lised paketid visatakse minema\n"
-+ 
-+-#: ../iptunnel.c:454
-++#: ../iptunnel.c:455
-++#, c-format
-+ msgid "  Checksum in received packet is required.\n"
-+ msgstr "  Vastuv�etavates pakettides on kontrollsumma kohustuslik\n"
-+ 
-+-#: ../iptunnel.c:456
-++#: ../iptunnel.c:457
-++#, c-format
-+ msgid "  Sequence packets on output.\n"
-+ msgstr "  V�ljuvad paketid varustatakse j�rjekorranumbritega\n"
-+ 
-+-#: ../iptunnel.c:458
-++#: ../iptunnel.c:459
-++#, c-format
-+ msgid "  Checksum output packets.\n"
-+ msgstr "  V�ljuvad paketid varustatakse kontrollsummaga\n"
-+ 
-+-#: ../iptunnel.c:486
-++#: ../iptunnel.c:487
-++#, c-format
-+ msgid "Wrong format of /proc/net/dev. Sorry.\n"
-+ msgstr "/proc/net/dev on vales formaadis. Vale tuuma versioon?\n"
-+ 
-+-#: ../iptunnel.c:499
-++#: ../iptunnel.c:500
-+ #, c-format
-+ msgid "Failed to get type of [%s]\n"
-+ msgstr "Ei suutnud kindlaks teha liidese %s t��pi\n"
-+ 
-+-#: ../iptunnel.c:515
-++#: ../iptunnel.c:516
-++#, c-format
-+ msgid "RX: Packets    Bytes        Errors CsumErrs OutOfSeq Mcasts\n"
-+ msgstr "RX: Pakette    Baite        Vigu   KSumVigu JrkVigu  Levipakette\n"
-+ 
-+-#: ../iptunnel.c:518
-++#: ../iptunnel.c:519
-++#, c-format
-+ msgid "TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs\n"
-+ msgstr "TX: Pakette    Baite        Vigu   DeadLoop EiRuudi  M�luOtsas\n"
-+ 
-+@@ -1658,13 +1861,13 @@ msgid "%u packets directly queued to rec
-+ msgstr "%u paketti pandi otse recvmsg eelj�rjekorda"
-+ 
-+ #: ../statistics.c:178
-+-#, c-format
-+-msgid "%u packets directly received from backlog"
-++#, fuzzy, c-format
-++msgid "%u of bytes directly received from backlog"
-+ msgstr "%u paketti v�eti vastu otse backlog-ist"
-+ 
-+ #: ../statistics.c:180
-+-#, c-format
-+-msgid "%u packets directly received from prequeue"
-++#, fuzzy, c-format
-++msgid "%u of bytes directly received from prequeue"
-+ msgstr "%u paketti v�eti vastu otse eelj�rjekorrast"
-+ 
-+ #: ../statistics.c:182
-+@@ -1673,8 +1876,8 @@ msgid "%u packets dropped from prequeue"
-+ msgstr "%u paketti kustutati eelj�rjekorrast"
-+ 
-+ #: ../statistics.c:183
-+-#, c-format
-+-msgid "%u packets header predicted"
-++#, fuzzy, c-format
-++msgid "%u packet headers predicted"
-+ msgstr "%u paketti p�ise �ige ennustusega"
-+ 
-+ #: ../statistics.c:184
-+@@ -1687,19 +1890,210 @@ msgstr "%u paketti p�ise �ige ennustuseg
-+ msgid "Ran %u times out of system memory during packet sending"
-+ msgstr "Pakettide saatmisel sai %u korda s�steemne m�lu otsa"
-+ 
-+-#: ../statistics.c:253
-++#: ../statistics.c:188
-++#, fuzzy, c-format
-++msgid "%u acknowledgments not containing data received"
-++msgstr "%u sisenevat paketti tundmatule pordile"
-++
-++#: ../statistics.c:189
-++#, c-format
-++msgid "%u predicted acknowledgments"
-++msgstr ""
-++
-++#: ../statistics.c:190
-++#, c-format
-++msgid "%u times recovered from packet loss due to fast retransmit"
-++msgstr ""
-++
-++#: ../statistics.c:191
-++#, c-format
-++msgid "%u times recovered from packet loss due to SACK data"
-++msgstr ""
-++
-++#: ../statistics.c:192
-++#, fuzzy, c-format
-++msgid "%u bad SACKs received"
-++msgstr "%u vigast segmenti v�eti vastu"
-++
-++#: ../statistics.c:193
-++#, c-format
-++msgid "Detected reordering %u times using FACK"
-++msgstr ""
-++
-++#: ../statistics.c:194
-++#, c-format
-++msgid "Detected reordering %u times using SACK"
-++msgstr ""
-++
-++#: ../statistics.c:195
-++#, c-format
-++msgid "Detected reordering %u times using time stamp"
-++msgstr ""
-++
-++#: ../statistics.c:196
-++#, c-format
-++msgid "Detected reordering %u times using reno fast retransmit"
-++msgstr ""
-++
-++#: ../statistics.c:197
-++#, fuzzy, c-format
-++msgid "%u congestion windows fully recovered"
-++msgstr "%u �henduse katkestust saabus"
-++
-++#: ../statistics.c:198
-++#, c-format
-++msgid "%u congestion windows partially recovered using Hoe heuristic"
-++msgstr ""
-++
-++#: ../statistics.c:199
-++#, c-format
-++msgid "%u congestion window recovered using DSACK"
-++msgstr ""
-++
-++#: ../statistics.c:200
-++#, c-format
-++msgid "%u congestion windows recovered after partial ack"
-++msgstr ""
-++
-++#: ../statistics.c:201
-++#, fuzzy, c-format
-++msgid "%u retransmits lost"
-++msgstr "%u katkestust saadeti"
-++
-++#: ../statistics.c:202
-++#, fuzzy, c-format
-++msgid "%u timeouts after reno fast retransmit"
-++msgstr "%u segmenti saadeti uuesti"
-++
-++#: ../statistics.c:203
-++#, c-format
-++msgid "%u timeouts after SACK recovery"
-++msgstr ""
-++
-++#: ../statistics.c:204
-++#, c-format
-++msgid "%u timeouts in loss state"
-++msgstr ""
-++
-++#: ../statistics.c:205
-++#, fuzzy, c-format
-++msgid "%u fast retransmits"
-++msgstr "%u segmenti saadeti uuesti"
-++
-++#: ../statistics.c:206
-++#, fuzzy, c-format
-++msgid "%u forward retransmits"
-++msgstr "%u edastati"
-++
-++#: ../statistics.c:207
-++#, c-format
-++msgid "%u retransmits in slow start"
-++msgstr ""
-++
-++#: ../statistics.c:208
-++#, c-format
-++msgid "%u other TCP timeouts"
-++msgstr ""
-++
-++#: ../statistics.c:209
-++#, fuzzy, c-format
-++msgid "%u reno fast retransmits failed"
-++msgstr "%u segmenti saadeti uuesti"
-++
-++#: ../statistics.c:210
-++#, fuzzy, c-format
-++msgid "%u sack retransmits failed"
-++msgstr "%u pakettide kokkupanekut eba�nnestus"
-++
-++#: ../statistics.c:211
-++#, c-format
-++msgid "%u times receiver scheduled too late for direct processing"
-++msgstr ""
-++
-++#: ../statistics.c:212
-++#, fuzzy, c-format
-++msgid "%u packets collapsed in receive queue due to low socket buffer"
-++msgstr ""
-++"%u paketti kustutati vastuv�tu j�rjekorrast sokli puhvri �let�itumise t�ttu"
-++
-++#: ../statistics.c:213
-++#, c-format
-++msgid "%u DSACKs sent for old packets"
-++msgstr ""
-++
-++#: ../statistics.c:214
-++#, c-format
-++msgid "%u DSACKs sent for out of order packets"
-++msgstr ""
-++
-++#: ../statistics.c:215
-++#, fuzzy, c-format
-++msgid "%u DSACKs received"
-++msgstr "%u paketti v�eti vastu"
-++
-++#: ../statistics.c:216
-++#, fuzzy, c-format
-++msgid "%u DSACKs for out of order packets received"
-++msgstr "kokku v�eti vastu %u paketti"
-++
-++#: ../statistics.c:217
-++#, fuzzy, c-format
-++msgid "%u connections reset due to unexpected SYN"
-++msgstr "%u �henduse katkestust saabus"
-++
-++#: ../statistics.c:218
-++#, fuzzy, c-format
-++msgid "%u connections reset due to unexpected data"
-++msgstr "%u �henduse katkestust saabus"
-++
-++#: ../statistics.c:219
-++#, fuzzy, c-format
-++msgid "%u connections reset due to early user close"
-++msgstr "%u �henduse katkestust saabus"
-++
-++#: ../statistics.c:220
-++#, c-format
-++msgid "%u connections aborted due to memory pressure"
-++msgstr ""
-++
-++#: ../statistics.c:221
-++#, fuzzy, c-format
-++msgid "%u connections aborted due to timeout"
-++msgstr "%u aktiivsest �hendusest keelduti ajatempli t�ttu"
-++
-++#: ../statistics.c:222
-++#, c-format
-++msgid "%u connections aborted after user close in linger timeout"
-++msgstr ""
-++
-++#: ../statistics.c:223
-++#, c-format
-++msgid "%u times unabled to send RST due to no memory"
-++msgstr ""
-++
-++#: ../statistics.c:224
-++#, c-format
-++msgid "TCP ran low on memory %u times"
-++msgstr ""
-++
-++#: ../statistics.c:225
-++#, c-format
-++msgid "%u TCP data loss events"
-++msgstr ""
-++
-++#: ../statistics.c:292
-+ msgid "enabled"
-+ msgstr "lubatud"
-+ 
-+-#: ../statistics.c:253
-++#: ../statistics.c:292
-+ msgid "disabled"
-+ msgstr "keelatud"
-+ 
-+-#: ../statistics.c:336
-++#: ../statistics.c:375
-+ msgid "error parsing /proc/net/snmp"
-+ msgstr "Viga /proc/net/snmp anal��simisel"
-+ 
-+-#: ../statistics.c:349
-++#: ../statistics.c:388
-+ msgid "cannot open /proc/net/snmp"
-+ msgstr "Ei saa avada faili /proc/net/snmp"
-+ 
-+@@ -1713,7 +2107,7 @@ msgstr "Riistvara t��pi `%s' ei toetata\
-+ msgid "Cannot change line discipline to `%s'.\n"
-+ msgstr "Ei suuda seada `%s' liiniprotokolliks\n"
-+ 
-+-#: ../lib/af.c:153 ../lib/hw.c:156
-++#: ../lib/af.c:153 ../lib/hw.c:161
-+ msgid "UNSPEC"
-+ msgstr "UNSPEC"
-+ 
-+@@ -1729,11 +2123,11 @@ msgstr "DARPA Internet"
-+ msgid "IPv6"
-+ msgstr "IPv6"
-+ 
-+-#: ../lib/af.c:164 ../lib/hw.c:177
-++#: ../lib/af.c:164 ../lib/hw.c:182
-+ msgid "AMPR AX.25"
-+ msgstr "AMPR AX.25"
-+ 
-+-#: ../lib/af.c:167 ../lib/hw.c:183
-++#: ../lib/af.c:167 ../lib/hw.c:188
-+ msgid "AMPR NET/ROM"
-+ msgstr "AMPR NET/ROM"
-+ 
-+@@ -1745,7 +2139,7 @@ msgstr "Novell IPX"
-+ msgid "Appletalk DDP"
-+ msgstr "Appletalk DDP"
-+ 
-+-#: ../lib/af.c:176 ../lib/hw.c:218
-++#: ../lib/af.c:176 ../lib/hw.c:223
-+ msgid "Econet"
-+ msgstr "Econet"
-+ 
-+@@ -1753,19 +2147,21 @@ msgstr "Econet"
-+ msgid "CCITT X.25"
-+ msgstr "CCITT X.25"
-+ 
-+-#: ../lib/af.c:182 ../lib/hw.c:180
-++#: ../lib/af.c:182 ../lib/hw.c:185
-+ msgid "AMPR ROSE"
-+ msgstr "AMPR ROSE"
-+ 
-+-#: ../lib/af.c:185 ../lib/hw.c:168
-++#: ../lib/af.c:185 ../lib/hw.c:173
-+ msgid "Ash"
-+ msgstr "Ash"
-+ 
-+ #: ../lib/af.c:243
-++#, c-format
-+ msgid "Please don't supply more than one address family.\n"
-+ msgstr "Meil on kombeks �ks aadressiperekond korraga\n"
-+ 
-+ #: ../lib/af.c:304
-++#, c-format
-+ msgid "Too much address family arguments.\n"
-+ msgstr "Liiga palju aadressiperekonna argumente\n"
-+ 
-+@@ -1790,6 +2186,7 @@ msgid "in_arcnet(%s): trailing junk!\n"
-+ msgstr "in_arcnet(%s): sodi l�pus\n"
-+ 
-+ #: ../lib/ash.c:81
-++#, c-format
-+ msgid "Malformed Ash address"
-+ msgstr "Vigane Ash aadress"
-+ 
-+@@ -1808,22 +2205,21 @@ msgid "Callsign too long"
-+ msgstr "Liiga pikk kutsung"
-+ 
-+ #: ../lib/ax25_gr.c:47
-++#, c-format
-+ msgid "AX.25 not configured in this system.\n"
-+ msgstr "AX.25 pole antud s�steemis konfigureeritud\n"
-+ 
-+ #: ../lib/ax25_gr.c:50
-++#, c-format
-+ msgid "Kernel AX.25 routing table\n"
-+ msgstr "Tuuma AX.25 ruutingutabel\n"
-+ 
-+ #. xxx
-+ #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55
-++#, c-format
-+ msgid "Destination  Iface    Use\n"
-+ msgstr "Sihtpunkt    Liides   Kasutus\n"
-+ 
-+-#: ../lib/ddp_gr.c:21
-+-msgid "Routing table for `ddp' not yet supported.\n"
-+-msgstr "`ddp' jaoks ruutingutabelit veel ei oska\n"
-+-
-+ #: ../lib/ether.c:74 ../lib/ether.c:91
-+ #, c-format
-+ msgid "in_ether(%s): invalid ether address!\n"
-+@@ -1879,90 +2275,94 @@ msgstr "in_hippi(%s): ignoreerin l�petav
-+ msgid "in_hippi(%s): trailing junk!\n"
-+ msgstr "in_hippi(%s): sodi l�pus\n"
-+ 
-+-#: ../lib/hw.c:155
-++#: ../lib/hw.c:160
-+ msgid "Local Loopback"
-+ msgstr "Kohalik loopback"
-+ 
-+-#: ../lib/hw.c:158
-++#: ../lib/hw.c:163
-+ msgid "Serial Line IP"
-+ msgstr "Serial Line IP"
-+ 
-+-#: ../lib/hw.c:159
-++#: ../lib/hw.c:164
-+ msgid "VJ Serial Line IP"
-+ msgstr "VJ Serial Line IP"
-+ 
-+-#: ../lib/hw.c:160
-++#: ../lib/hw.c:165
-+ msgid "6-bit Serial Line IP"
-+ msgstr "6-bitine Serial Line IP"
-+ 
-+-#: ../lib/hw.c:161
-++#: ../lib/hw.c:166
-+ msgid "VJ 6-bit Serial Line IP"
-+ msgstr "VJ 6-bitine Serial Line IP"
-+ 
-+-#: ../lib/hw.c:162
-++#: ../lib/hw.c:167
-+ msgid "Adaptive Serial Line IP"
-+ msgstr "Adaptiivne Serial Line IP"
-+ 
-+-#: ../lib/hw.c:165
-++#: ../lib/hw.c:170
-+ msgid "Ethernet"
-+ msgstr "Ethernet"
-+ 
-+-#: ../lib/hw.c:171
-++#: ../lib/hw.c:176
-+ msgid "Fiber Distributed Data Interface"
-+ msgstr "Fiber Distributed Data Interface"
-+ 
-+-#: ../lib/hw.c:174
-++#: ../lib/hw.c:179
-+ msgid "HIPPI"
-+ msgstr "HIPPI"
-+ 
-+-#: ../lib/hw.c:186
-++#: ../lib/hw.c:191
-+ msgid "generic X.25"
-+ msgstr "�ldine X.25"
-+ 
-+-#: ../lib/hw.c:189
-++#: ../lib/hw.c:194
-+ msgid "IPIP Tunnel"
-+ msgstr "IPIP tunnel"
-+ 
-+-#: ../lib/hw.c:192
-++#: ../lib/hw.c:197
-+ msgid "Point-to-Point Protocol"
-+ msgstr "Kakspunktprotokoll"
-+ 
-+-#: ../lib/hw.c:195
-++#: ../lib/hw.c:200
-+ msgid "(Cisco)-HDLC"
-+ msgstr "(Cisco-)HDLC"
-+ 
-+-#: ../lib/hw.c:196
-++#: ../lib/hw.c:201
-+ msgid "LAPB"
-+ msgstr "LAPB"
-+ 
-+-#: ../lib/hw.c:199
-++#: ../lib/hw.c:204
-+ msgid "ARCnet"
-+ msgstr "ARCnet"
-+ 
-+-#: ../lib/hw.c:202
-++#: ../lib/hw.c:207
-+ msgid "Frame Relay DLCI"
-+ msgstr "Frame Relay DLCI"
-+ 
-+-#: ../lib/hw.c:203
-++#: ../lib/hw.c:208
-+ msgid "Frame Relay Access Device"
-+ msgstr "Frame Relay Access Device"
-+ 
-+-#: ../lib/hw.c:206
-++#: ../lib/hw.c:211
-+ msgid "IPv6-in-IPv4"
-+ msgstr "IPv6-in-IPv4"
-+ 
-+-#: ../lib/hw.c:209
-++#: ../lib/hw.c:214
-+ msgid "IrLAP"
-+ msgstr "IrLAP"
-+ 
-+-#: ../lib/hw.c:212
-++#: ../lib/hw.c:217
-+ msgid "16/4 Mbps Token Ring"
-+ msgstr "16/4 Mbps Token Ring"
-+ 
-+-#: ../lib/hw.c:214
-++#: ../lib/hw.c:219
-+ msgid "16/4 Mbps Token Ring (New)"
-+ msgstr "16/4 Mbps Token Ring (New)"
-+ 
-++#: ../lib/hw.c:226
-++msgid "Generic EUI-64"
-++msgstr ""
-++
-+ #: ../lib/inet.c:153 ../lib/inet6.c:79
-+ #, c-format
-+ msgid "rresolve: unsupport address family %d !\n"
-+@@ -1972,27 +2372,32 @@ msgstr "rresolve: toetuseta aadressipere
-+ msgid "[UNKNOWN]"
-+ msgstr "[TUNDMATU]"
-+ 
-+-#: ../lib/inet6_gr.c:79
-++#: ../lib/inet6_gr.c:71
-++#, c-format
-+ msgid "INET6 (IPv6) not configured in this system.\n"
-+ msgstr "INET6 (IPv6) pole antud s�steemis konfigureeritud\n"
-+ 
-+-#: ../lib/inet6_gr.c:82
-++#: ../lib/inet6_gr.c:74
-++#, c-format
-+ msgid "Kernel IPv6 routing table\n"
-+ msgstr "Tuuma IPv6 ruutingutabel\n"
-+ 
-+-#: ../lib/inet6_gr.c:84
-++#: ../lib/inet6_gr.c:76
-++#, c-format
-+ msgid ""
-+-"Destination                                 Next Hop                         "
-+-"       Flags Metric Ref    Use Iface\n"
-++"Destination                                 Next "
-++"Hop                                Flags Metric Ref    Use Iface\n"
-+ msgstr ""
-+-"Sihtpunkt                                   J�rgmine samm                    "
-+-"       Lipud Meetr  Mitu Kasut Liides\n"
-++"Sihtpunkt                                   J�rgmine "
-++"samm                           Lipud Meetr  Mitu Kasut Liides\n"
-+ 
-+-#: ../lib/inet6_gr.c:158
-++#: ../lib/inet6_gr.c:150
-++#, c-format
-+ msgid "Kernel IPv6 Neighbour Cache\n"
-+ msgstr "Tuuma IPv6 naabrite puhver\n"
-+ 
-+-#: ../lib/inet6_gr.c:161
-++#: ../lib/inet6_gr.c:153
-++#, c-format
-+ msgid ""
-+ "Neighbour                                   HW Address        Iface    Flags "
-+ "Ref State\n"
-+@@ -2000,7 +2405,8 @@ msgstr ""
-+ "Naaber                                      HW Aadress        Liides   Lipud "
-+ "Mitu Olek\n"
-+ 
-+-#: ../lib/inet6_gr.c:165
-++#: ../lib/inet6_gr.c:157
-++#, c-format
-+ msgid ""
-+ "Neighbour                                   HW Address        Iface    Flags "
-+ "Ref State            Stale(sec) Delete(sec)\n"
-+@@ -2009,31 +2415,38 @@ msgstr ""
-+ "Mitu Olek            Stale(sec) Delete(sec)\n"
-+ 
-+ #: ../lib/inet6_sr.c:46
-++#, c-format
-+ msgid "Usage: inet6_route [-vF] del Target\n"
-+ msgstr "Kasutamine: route [-vF] del AADRESS\n"
-+ 
-+ #: ../lib/inet6_sr.c:47
-++#, c-format
-+ msgid "       inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n"
-+ msgstr ""
-+ "            route [-vF] add AADRESS [gw GW] [metric M] [[dev] LIIDES]\n"
-+ 
-+ #: ../lib/inet6_sr.c:48
-++#, c-format
-+ msgid "       inet6_route [-FC] flush      NOT supported\n"
-+ msgstr "            route [-FC] flush      Seda EI toetata\n"
-+ 
-+ #: ../lib/inet6_sr.c:188
-++#, c-format
-+ msgid "Flushing `inet6' routing table not supported\n"
-+ msgstr "`inet6' ruutingutabeli t�hjendamist ei toetata\n"
-+ 
-+ #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220
-++#, c-format
-+ msgid "INET (IPv4) not configured in this system.\n"
-+ msgstr "INET (IPv4) pole antud s�steemis konfigureeritud\n"
-+ 
-+ #: ../lib/inet_gr.c:53
-++#, c-format
-+ msgid "Kernel IP routing table\n"
-+ msgstr "Tuuma IP ruutingutabel\n"
-+ 
-+ #: ../lib/inet_gr.c:56
-++#, c-format
-+ msgid ""
-+ "Destination     Gateway         Genmask         Flags Metric Ref    Use "
-+ "Iface\n"
-+@@ -2042,6 +2455,7 @@ msgstr ""
-+ "Liides\n"
-+ 
-+ #: ../lib/inet_gr.c:59
-++#, c-format
-+ msgid ""
-+ "Destination     Gateway         Genmask         Flags   MSS Window  irtt "
-+ "Iface\n"
-+@@ -2050,6 +2464,7 @@ msgstr ""
-+ "Liides\n"
-+ 
-+ #: ../lib/inet_gr.c:62
-++#, c-format
-+ msgid ""
-+ "Destination     Gateway         Genmask         Flags Metric Ref    Use "
-+ "Iface    MSS   Window irtt\n"
-+@@ -2058,10 +2473,12 @@ msgstr ""
-+ "Liides   MSS   Aken   irtt\n"
-+ 
-+ #: ../lib/inet_gr.c:237
-++#, c-format
-+ msgid "Kernel IP routing cache\n"
-+ msgstr "Tuuma IP ruutingu puhver\n"
-+ 
-+ #: ../lib/inet_gr.c:258
-++#, c-format
-+ msgid ""
-+ "Source          Destination     Gateway         Flags Metric Ref    Use "
-+ "Iface\n"
-+@@ -2070,6 +2487,7 @@ msgstr ""
-+ "Liides\n"
-+ 
-+ #: ../lib/inet_gr.c:261
-++#, c-format
-+ msgid ""
-+ "Source          Destination     Gateway         Flags   MSS Window  irtt "
-+ "Iface\n"
-+@@ -2078,6 +2496,7 @@ msgstr ""
-+ "Liides\n"
-+ 
-+ #: ../lib/inet_gr.c:266
-++#, c-format
-+ msgid ""
-+ "Source          Destination     Gateway         Flags Metric Ref    Use "
-+ "Iface    MSS   Window irtt  HH  Arp\n"
-+@@ -2086,6 +2505,7 @@ msgstr ""
-+ "Liides   MSS    Aken  irtt  HH  Arp\n"
-+ 
-+ #: ../lib/inet_gr.c:290
-++#, c-format
-+ msgid ""
-+ "Source          Destination     Gateway         Flags Metric Ref    Use "
-+ "Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
-+@@ -2093,7 +2513,8 @@ msgstr ""
-+ "L�htepunkt      Sihtpunkt       Ruuter          Lipud Meetr  Mitu Kasut "
-+ "Liides   MSS   Aken   irtt  TOS HHRef HHUptod     SpecDst\n"
-+ 
-+-#: ../lib/inet_sr.c:50
-++#: ../lib/inet_sr.c:51
-++#, c-format
-+ msgid ""
-+ "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] "
-+ "[[dev] If]\n"
-+@@ -2101,31 +2522,36 @@ msgstr ""
-+ "Kasutamine: route [-vF] del {-host|-net} AADRESS[/PREFIKS] [gw GW] [metric "
-+ "M] [[dev] LIIDES]\n"
-+ 
-+-#: ../lib/inet_sr.c:51
-++#: ../lib/inet_sr.c:52
-++#, c-format
-+ msgid ""
-+ "       inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n"
-+ msgstr ""
-+ "            route [-vF] add {-host|-net} AADRESS[/PREFIKS] [gw GW] [metric "
-+ "M]\n"
-+ 
-+-#: ../lib/inet_sr.c:52
-++#: ../lib/inet_sr.c:53
-++#, c-format
-+ msgid ""
-+ "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
-+ msgstr ""
-+ "                              [netmask N] [mss MSS] [window W] [irtt I]\n"
-+ 
-+-#: ../lib/inet_sr.c:53
-++#: ../lib/inet_sr.c:54
-++#, c-format
-+ msgid "                              [mod] [dyn] [reinstate] [[dev] If]\n"
-+ msgstr "                              [mod] [dyn] [reinstate] [[dev] LIIDES]\n"
-+ 
-+-#: ../lib/inet_sr.c:54
-++#: ../lib/inet_sr.c:55
-++#, c-format
-+ msgid ""
-+ "       inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n"
-+ msgstr ""
-+ "            route [-vF] add {-host|-net} AADRESS[/PREFIKS] [metric M] "
-+ "reject\n"
-+ 
-+-#: ../lib/inet_sr.c:55
-++#: ../lib/inet_sr.c:56
-++#, c-format
-+ msgid "       inet_route [-FC] flush      NOT supported\n"
-+ msgstr "            route [-FC] flush      Seda EI toetata\n"
-+ 
-+@@ -2135,14 +2561,17 @@ msgid "route: %s: cannot use a NETWORK a
-+ msgstr "route: %s: v�rku ei saa kasutada ruuterina\n"
-+ 
-+ #: ../lib/inet_sr.c:174
-++#, c-format
-+ msgid "route: Invalid MSS/MTU.\n"
-+ msgstr "route: vigane MSS/MTU\n"
-+ 
-+ #: ../lib/inet_sr.c:187
-++#, c-format
-+ msgid "route: Invalid window.\n"
-+ msgstr "route: Vigane akna suurus\n"
-+ 
-+ #: ../lib/inet_sr.c:203
-++#, c-format
-+ msgid "route: Invalid initial rtt.\n"
-+ msgstr "route: vigane algne rtt\n"
-+ 
-+@@ -2157,75 +2586,92 @@ msgid "route: bogus netmask %s\n"
-+ msgstr "route: vale v�rgumask %s\n"
-+ 
-+ #: ../lib/inet_sr.c:270
-++#, c-format
-+ msgid "route: netmask doesn't match route address\n"
-+ msgstr "route: v�rgumask ei sobi ruutingu aadressiga\n"
-+ 
-+ #: ../lib/inet_sr.c:306
-++#, c-format
-+ msgid "Flushing `inet' routing table not supported\n"
-+ msgstr "`inet' ruutingutabeli t�hjendamist ei toetata\n"
-+ 
-+ #: ../lib/inet_sr.c:310
-++#, c-format
-+ msgid "Modifying `inet' routing cache not supported\n"
-+ msgstr "`inet' ruutingu puhvri muutmist ei toetata\n"
-+ 
-+ #: ../lib/ipx_gr.c:52
-++#, c-format
-+ msgid "IPX not configured in this system.\n"
-+ msgstr "IPX pole antud s�steemis konfigureeritud\n"
-+ 
-+ #: ../lib/ipx_gr.c:56
-++#, c-format
-+ msgid "Kernel IPX routing table\n"
-+ msgstr "Tuuma IPX ruutingutabel\n"
-+ 
-+ #. xxx
-+ #: ../lib/ipx_gr.c:57
-++#, c-format
-+ msgid "Destination               Router Net                Router Node\n"
-+ msgstr "Sihtpunkt                 Ruuteri v�rk              Ruuter ise\n"
-+ 
-+ #: ../lib/ipx_sr.c:33
-++#, c-format
-+ msgid "IPX: this needs to be written\n"
-+ msgstr "IPX osa vajab �mbertegemist\n"
-+ 
-+ #: ../lib/masq_info.c:198
-++#, c-format
-+ msgid "IP masquerading entries\n"
-+ msgstr "IP maskeerimise kirjed\n"
-+ 
-+ #: ../lib/masq_info.c:201
-++#, c-format
-+ msgid "prot   expire source               destination          ports\n"
-+ msgstr "Proto  Aegub  L�htepunkt           Sihtpunkt            Pordid\n"
-+ 
-+ #: ../lib/masq_info.c:204
-++#, c-format
-+ msgid ""
-+-"prot   expire    initseq delta prevd source               destination        "
-+-"  ports\n"
-++"prot   expire    initseq delta prevd source               "
-++"destination          ports\n"
-+ msgstr ""
-+-"Proto  Aegub     Initseq Delta Prevd L�htepunkt           Sihtpunkt          "
-+-"  Pordid\n"
-++"Proto  Aegub     Initseq Delta Prevd L�htepunkt           "
-++"Sihtpunkt            Pordid\n"
-+ 
-+ #: ../lib/netrom_gr.c:48
-++#, c-format
-+ msgid "NET/ROM not configured in this system.\n"
-+ msgstr "NET/ROM pole antud s�steemis konfigureeritud\n"
-+ 
-+ #: ../lib/netrom_gr.c:51
-++#, c-format
-+ msgid "Kernel NET/ROM routing table\n"
-+ msgstr "Tuuma NET/ROM ruutingutabel\n"
-+ 
-+ #: ../lib/netrom_gr.c:52
-++#, c-format
-+ msgid "Destination  Mnemonic  Quality  Neighbour  Iface\n"
-+ msgstr "Sihtpunkt   Mnemoonika Kvaliteet Naaber    Liides\n"
-+ 
-+ #: ../lib/netrom_sr.c:34
-++#, c-format
-+ msgid "netrom usage\n"
-+ msgstr "netrom kasutus\n"
-+ 
-+ #: ../lib/netrom_sr.c:44
-++#, c-format
-+ msgid "NET/ROM: this needs to be written\n"
-+ msgstr "NET/ROM osa vajab �mbertegemist\n"
-+ 
-+ #: ../lib/ppp.c:44
-++#, c-format
-+ msgid "You cannot start PPP with this program.\n"
-+ msgstr "Sellest programmist ei saa PPP-d k�ivitada\n"
-+ 
-+ #: ../lib/ppp_ac.c:38
-++#, c-format
-+ msgid "Sorry, use pppd!\n"
-+ msgstr "Palun kasutage pppd'd\n"
-+ 
-+@@ -2234,287 +2680,314 @@ msgid "Node address must be ten digits"
-+ msgstr "S�lme aadress peab olema k�mnekohaline"
-+ 
-+ #: ../lib/rose_gr.c:51
-++#, c-format
-+ msgid "ROSE not configured in this system.\n"
-+ msgstr "ROSE pole antud s�steemis konfigureeritud\n"
-+ 
-+ #: ../lib/rose_gr.c:54
-++#, c-format
-+ msgid "Kernel ROSE routing table\n"
-+ msgstr "Tuuma ROSE ruutingutabel\n"
-+ 
-+-#: ../lib/tr.c:70 ../lib/tr.c:85
-++#: ../lib/tr.c:86 ../lib/tr.c:101
-+ #, c-format
-+ msgid "in_tr(%s): invalid token ring address!\n"
-+ msgstr "in_tr(%s): vigane token ring-aadress\n"
-+ 
-+-#: ../lib/tr.c:97
-++#: ../lib/tr.c:113
-+ #, c-format
-+ msgid "in_tr(%s): trailing : ignored!\n"
-+ msgstr "in_tr(%s): ignoreerin l�petavat koolonit\n"
-+ 
-+-#: ../lib/tr.c:109
-++#: ../lib/tr.c:125
-+ #, c-format
-+ msgid "in_tr(%s): trailing junk!\n"
-+ msgstr "in_tr(%s): sodi l�pus\n"
-+ 
-+-#: ../lib/interface.c:164
-++#: ../lib/interface.c:176
-+ #, c-format
-+ msgid "warning: no inet socket available: %s\n"
-+ msgstr "Hoiatus: `inet' sokleid ei ole: %s\n"
-+ 
-+-#: ../lib/interface.c:316
-++#: ../lib/interface.c:325
-+ #, c-format
-+ msgid "Warning: cannot open %s (%s). Limited output.\n"
-+ msgstr "Hoiatus: ei saa avada faili %s (%s). V�ljund on piiratud.\n"
-+ 
-+ #. Give better error message for this case.
-+-#: ../lib/interface.c:556
-++#: ../lib/interface.c:571
-+ msgid "Device not found"
-+ msgstr "Liidest ei leitud"
-+ 
-+-#: ../lib/interface.c:560
-++#: ../lib/interface.c:575
-+ #, c-format
-+ msgid "%s: error fetching interface information: %s\n"
-+ msgstr "%s: viga liidese info k�simisel: %s\n"
-+ 
-+-#: ../lib/interface.c:593
-++#: ../lib/interface.c:608
-+ msgid "     - no statistics available -"
-+ msgstr "     - statistikat ei ole      -"
-+ 
-+-#: ../lib/interface.c:597
-++#: ../lib/interface.c:612
-++#, c-format
-+ msgid "[NO FLAGS]"
-+ msgstr "[LIPPE POLE]"
-+ 
-+-#: ../lib/interface.c:673
-++#: ../lib/interface.c:688
-+ #, c-format
-+ msgid "%-9.9s Link encap:%s  "
-+ msgstr "%-9.9s kapseldus:%s  "
-+ 
-+-#: ../lib/interface.c:678
-++#: ../lib/interface.c:693
-+ #, c-format
-+ msgid "HWaddr %s  "
-+ msgstr "HWaddr %s  "
-+ 
-+-#: ../lib/interface.c:681
-++#: ../lib/interface.c:696
-+ #, c-format
-+ msgid "Media:%s"
-+ msgstr "meedia:%s"
-+ 
-+-#: ../lib/interface.c:683
-++#: ../lib/interface.c:698
-++#, c-format
-+ msgid "(auto)"
-+ msgstr "(auto)"
-+ 
-+-#: ../lib/interface.c:690
-++#: ../lib/interface.c:705
-+ #, c-format
-+ msgid "          %s addr:%s "
-+ msgstr "          %s aadress:%s "
-+ 
-+-#: ../lib/interface.c:693
-++#: ../lib/interface.c:708
-+ #, c-format
-+ msgid " P-t-P:%s "
-+ msgstr " P-t-P:%s "
-+ 
-+-#: ../lib/interface.c:696
-++#: ../lib/interface.c:711
-+ #, c-format
-+ msgid " Bcast:%s "
-+ msgstr " bcast:%s "
-+ 
-+-#: ../lib/interface.c:698
-++#: ../lib/interface.c:713
-+ #, c-format
-+ msgid " Mask:%s\n"
-+ msgstr " mask:%s\n"
-+ 
-+-#: ../lib/interface.c:715
-++#: ../lib/interface.c:730
-+ #, c-format
-+ msgid "          inet6 addr: %s/%d"
-+ msgstr "          inet6 aadr: %s/%d"
-+ 
-+-#: ../lib/interface.c:717
-++#: ../lib/interface.c:732
-++#, c-format
-+ msgid " Scope:"
-+ msgstr " skoop:"
-+ 
-+-#: ../lib/interface.c:720
-++#: ../lib/interface.c:735
-++#, c-format
-+ msgid "Global"
-+ msgstr "globaalne"
-+ 
-+-#: ../lib/interface.c:723
-++#: ../lib/interface.c:738
-++#, c-format
-+ msgid "Link"
-+ msgstr "�hendus"
-+ 
-+-#: ../lib/interface.c:726
-++#: ../lib/interface.c:741
-++#, c-format
-+ msgid "Site"
-+ msgstr "site"
-+ 
-+-#: ../lib/interface.c:729
-++#: ../lib/interface.c:744
-++#, c-format
-+ msgid "Compat"
-+ msgstr "�hilduvus"
-+ 
-+-#: ../lib/interface.c:732
-++#: ../lib/interface.c:747
-++#, c-format
-+ msgid "Host"
-+ msgstr "host"
-+ 
-+-#: ../lib/interface.c:735
-++#: ../lib/interface.c:750
-++#, c-format
-+ msgid "Unknown"
-+ msgstr "tundmatu"
-+ 
-+-#: ../lib/interface.c:750
-++#: ../lib/interface.c:765
-+ #, c-format
-+ msgid "          IPX/Ethernet II addr:%s\n"
-+ msgstr "          IPX/Ethernet II aadr:%s\n"
-+ 
-+-#: ../lib/interface.c:753
-++#: ../lib/interface.c:768
-+ #, c-format
-+ msgid "          IPX/Ethernet SNAP addr:%s\n"
-+ msgstr "          IPX/Ethernet SNAP aadr:%s\n"
-+ 
-+-#: ../lib/interface.c:756
-++#: ../lib/interface.c:771
-+ #, c-format
-+ msgid "          IPX/Ethernet 802.2 addr:%s\n"
-+ msgstr "          IPX/Ethernet 802.2 aadr:%s\n"
-+ 
-+-#: ../lib/interface.c:759
-++#: ../lib/interface.c:774
-+ #, c-format
-+ msgid "          IPX/Ethernet 802.3 addr:%s\n"
-+ msgstr "          IPX/Ethernet 802.3 aadr:%s\n"
-+ 
-+-#: ../lib/interface.c:769
-++#: ../lib/interface.c:784
-+ #, c-format
-+ msgid "          EtherTalk Phase 2 addr:%s\n"
-+ msgstr "          EtherTalk Phase 2 aadr:%s\n"
-+ 
-+-#: ../lib/interface.c:778
-++#: ../lib/interface.c:793
-+ #, c-format
-+ msgid "          econet addr:%s\n"
-+ msgstr "          econeti aadr:%s\n"
-+ 
-+-#: ../lib/interface.c:785
-++#: ../lib/interface.c:800
-++#, c-format
-+ msgid "[NO FLAGS] "
-+ msgstr "[LIPPE POLE]"
-+ 
-+-#: ../lib/interface.c:787
-++#: ../lib/interface.c:802
-++#, c-format
-+ msgid "UP "
-+ msgstr "UP "
-+ 
-+-#: ../lib/interface.c:789
-++#: ../lib/interface.c:804
-++#, c-format
-+ msgid "BROADCAST "
-+ msgstr "BROADCAST "
-+ 
-+-#: ../lib/interface.c:791
-++#: ../lib/interface.c:806
-++#, c-format
-+ msgid "DEBUG "
-+ msgstr "DEBUG "
-+ 
-+-#: ../lib/interface.c:793
-++#: ../lib/interface.c:808
-++#, c-format
-+ msgid "LOOPBACK "
-+ msgstr "LOOPBACK "
-+ 
-+-#: ../lib/interface.c:795
-++#: ../lib/interface.c:810
-++#, c-format
-+ msgid "POINTOPOINT "
-+ msgstr "POINTOPOINT "
-+ 
-+-#: ../lib/interface.c:797
-++#: ../lib/interface.c:812
-++#, c-format
-+ msgid "NOTRAILERS "
-+ msgstr "NOTRAILERS "
-+ 
-+-#: ../lib/interface.c:799
-++#: ../lib/interface.c:814
-++#, c-format
-+ msgid "RUNNING "
-+ msgstr "RUNNING "
-+ 
-+-#: ../lib/interface.c:801
-++#: ../lib/interface.c:816
-++#, c-format
-+ msgid "NOARP "
-+ msgstr "NOARP "
-+ 
-+-#: ../lib/interface.c:803
-++#: ../lib/interface.c:818
-++#, c-format
-+ msgid "PROMISC "
-+ msgstr "PROMISC "
-+ 
-+-#: ../lib/interface.c:805
-++#: ../lib/interface.c:820
-++#, c-format
-+ msgid "ALLMULTI "
-+ msgstr "ALLMULTI "
-+ 
-+-#: ../lib/interface.c:807
-++#: ../lib/interface.c:822
-++#, c-format
-+ msgid "SLAVE "
-+ msgstr "SLAVE "
-+ 
-+-#: ../lib/interface.c:809
-++#: ../lib/interface.c:824
-++#, c-format
-+ msgid "MASTER "
-+ msgstr "MASTER "
-+ 
-+-#: ../lib/interface.c:811
-++#: ../lib/interface.c:826
-++#, c-format
-+ msgid "MULTICAST "
-+ msgstr "MULTICAST "
-+ 
-+-#: ../lib/interface.c:814
-++#: ../lib/interface.c:829
-++#, c-format
-+ msgid "DYNAMIC "
-+ msgstr "DYNAMIC "
-+ 
-+ #. DONT FORGET TO ADD THE FLAGS IN ife_print_short
-+-#: ../lib/interface.c:817
-++#: ../lib/interface.c:832
-+ #, c-format
-+ msgid " MTU:%d  Metric:%d"
-+ msgstr " MTU:%d meetrika:%d"
-+ 
-+-#: ../lib/interface.c:821
-++#: ../lib/interface.c:836
-+ #, c-format
-+ msgid "  Outfill:%d  Keepalive:%d"
-+ msgstr "  �lalhoidepakettide intervall:%d  �lalhoidetaimaut:%d"
-+ 
-+-#: ../lib/interface.c:835
-++#: ../lib/interface.c:850
-+ #, c-format
-+ msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
-+ msgstr "RX pakette:%llu vigu:%lu �ra visatud:%lu �let�it:%lu kaadri vigu:%lu\n"
-+ 
-+-#: ../lib/interface.c:840
-++#: ../lib/interface.c:855
-+ #, c-format
-+ msgid "             compressed:%lu\n"
-+ msgstr "             pakitud:%lu\n"
-+ 
-+-#: ../lib/interface.c:852
-++#: ../lib/interface.c:895
-+ #, c-format
-+ msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
-+ msgstr "TX pakette:%llu vigu:%lu �ra visatud:%lu �let�it:%lu carrier:%lu\n"
-+ 
-+-#: ../lib/interface.c:856
-++#: ../lib/interface.c:899
-+ #, c-format
-+ msgid "          collisions:%lu "
-+ msgstr "          kollisioone:%lu "
-+ 
-+-#: ../lib/interface.c:858
-++#: ../lib/interface.c:901
-+ #, c-format
-+ msgid "compressed:%lu "
-+ msgstr "pakitud:%lu "
-+ 
-+-#: ../lib/interface.c:860
-++#: ../lib/interface.c:903
-+ #, c-format
-+ msgid "txqueuelen:%d "
-+ msgstr "txqueuelen:%d "
-+ 
-+-#: ../lib/interface.c:862
-++#: ../lib/interface.c:905
-+ #, c-format
-+ msgid "RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"
-+ msgstr "RX baite:%llu (%lu.%lu %s)  TX baite:%llu (%lu.%lu %s)\n"
-+ 
-+-#: ../lib/interface.c:873
-++#: ../lib/interface.c:916
-+ #, c-format
-+ msgid "Interrupt:%d "
-+ msgstr "katkestus:%d "
-+ 
-+ #. Only print devices using it for
-+ #. I/O maps
-+-#: ../lib/interface.c:876
-++#: ../lib/interface.c:919
-+ #, c-format
-+ msgid "Base address:0x%x "
-+ msgstr "baasaadress:0x%x "
-+ 
-+-#: ../lib/interface.c:878
-++#: ../lib/interface.c:921
-+ #, c-format
-+ msgid "Memory:%lx-%lx "
-+ msgstr "m�lu:%lx-%lx "
-+ 
-+-#: ../lib/interface.c:881
-++#: ../lib/interface.c:924
-+ #, c-format
-+ msgid "DMA chan:%x "
-+ msgstr "DMA kanal:%x "
-+ 
-+ #: ../lib/sockets.c:63
-++#, c-format
-+ msgid "No usable address families found.\n"
-+ msgstr "Ei leidnud �htegi kasutatavat aadressiperekonda\n"
-+ 
-+@@ -2538,29 +3011,32 @@ msgstr "iptunnel: %s on vigane IPv4 aadr
-+ msgid "ip: argument is wrong: %s\n"
-+ msgstr "iptunnel: vale argument %s\n"
-+ 
-+-#: ../ipmaddr.c:58
-++#: ../ipmaddr.c:61
-++#, c-format
-+ msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n"
-+ msgstr "Kasutamine: ipmaddr [ add | del ] MULTIAADR dev STRING\n"
-+ 
-+-#: ../ipmaddr.c:59
-++#: ../ipmaddr.c:62
-++#, c-format
-+ msgid "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
-+ msgstr "            ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
-+ 
-+-#: ../ipmaddr.c:60
-++#: ../ipmaddr.c:63
-++#, c-format
-+ msgid "       ipmaddr -V | -version\n"
-+ msgstr "            ipmaddr -V | -version\n"
-+ 
-+-#: ../ipmaddr.c:260
-++#: ../ipmaddr.c:263
-+ #, c-format
-+ msgid "family %d "
-+ msgstr "perekond %d "
-+ 
-+-#: ../ipmaddr.c:269
-++#: ../ipmaddr.c:272
-+ #, c-format
-+ msgid " users %d"
-+ msgstr " kasutajaid %d"
-+ 
-+-#: ../ipmaddr.c:355
-++#: ../ipmaddr.c:358
-+ msgid "Cannot create socket"
-+ msgstr "Ei saa avada soklit"
-+ 
-+@@ -2575,6 +3051,7 @@ msgid "slattach: tty_lock: (%s): %s\n"
-+ msgstr "slattach: tty_lock: (%s): %s\n"
-+ 
-+ #: ../slattach.c:192
-++#, c-format
-+ msgid "slattach: cannot write PID file\n"
-+ msgstr "slattach: ei saa PID faili kirjutada\n"
-+ 
-+@@ -2594,18 +3071,22 @@ msgid "slattach: tty_hangup(RAISE): %s\n
-+ msgstr "slattach: tty_hangup(RAISE): %s\n"
-+ 
-+ #: ../slattach.c:468
-++#, c-format
-+ msgid "slattach: tty name too long\n"
-+ msgstr "slattach: terminali nimi on liiga pikk\n"
-+ 
-+ #: ../slattach.c:498
-++#, c-format
-+ msgid "slattach: tty_open: cannot get current state!\n"
-+ msgstr "slattach: tty_open: ei saa lugeda jooksvat olekut\n"
-+ 
-+ #: ../slattach.c:505
-++#, c-format
-+ msgid "slattach: tty_open: cannot get current line disc!\n"
-+ msgstr "slattach: tty_open: liiniprotokolli k�simine eba�nnestus\n"
-+ 
-+ #: ../slattach.c:513
-++#, c-format
-+ msgid "slattach: tty_open: cannot set RAW mode!\n"
-+ msgstr "slattach: tty_open: ei saa seada RAW moodi\n"
-+ 
-+@@ -2615,6 +3096,7 @@ msgid "slattach: tty_open: cannot set %s
-+ msgstr "slattach: tty_open: ei saa seada kiiruseks %s bps\n"
-+ 
-+ #: ../slattach.c:530
-++#, c-format
-+ msgid "slattach: tty_open: cannot set 8N1 mode!\n"
-+ msgstr "slattach: tty_open: ei saa seada 8N1 moodi\n"
-+ 
-+@@ -2637,3 +3119,20 @@ msgstr " pordil %s"
-+ #, c-format
-+ msgid " interface %s\n"
-+ msgstr " liides %s\n"
-++
-++#~ msgid ""
-++#~ "  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
-++#~ "<-''-\n"
-++#~ msgstr ""
-++#~ "  arp [-v]   [<HW>] [-i <if>] -s  <hosti nimi> <hwaddr> [netmask <nm>] "
-++#~ "pub\n"
-++
-++#~ msgid "%s: unknown interface: %s\n"
-++#~ msgstr "ifconfig: tundmatu liides %s: %s\n"
-++
-++#~ msgid "        -n, --numeric            dont resolve names\n"
-++#~ msgstr ""
-++#~ "        -n, --numeric            mitte lahendada numbreid nimedeks\n"
-++
-++#~ msgid "Routing table for `ddp' not yet supported.\n"
-++#~ msgstr "`ddp' jaoks ruutingutabelit veel ei oska\n"
-+Index: net-tools/po/cs.po
-+===================================================================
-+--- net-tools.orig/po/cs.po
-++++ net-tools/po/cs.po
-+@@ -5,7 +5,8 @@
-+ msgid ""
-+ msgstr ""
-+ "Project-Id-Version: net-tools-1.51\n"
-+-"POT-Creation-Date: 2000-02-14 02:31+0100\n"
-++"Report-Msgid-Bugs-To: \n"
-++"POT-Creation-Date: 2007-06-30 12:28+0900\n"
-+ "PO-Revision-Date: 1999-08-29 23:20+0200\n"
-+ "Last-Translator: Ji�� Pavlovsk� <pavlovsk@ff.cuni.cz>\n"
-+ "Language-Team: Czech <cs@li.org>\n"
-+@@ -13,96 +14,110 @@ msgstr ""
-+ "Content-Type: text/plain; charset=iso-8859-2\n"
-+ "Content-Transfer-Encoding: 8bit\n"
-+ 
-+-#: ../arp.c:110 ../arp.c:269
-++#: ../arp.c:112 ../arp.c:279
-++#, c-format
-+ msgid "arp: need host name\n"
-+ msgstr "arp: je t�eba jm�no po��ta�e\n"
-+ 
-+-#: ../arp.c:207 ../arp.c:221
-++#: ../arp.c:215 ../arp.c:230
-+ #, c-format
-+ msgid "No ARP entry for %s\n"
-+ msgstr "Pro %s neexistuje ARP polo�ka\n"
-+ 
-+-#: ../arp.c:239
-++#: ../arp.c:248
-+ #, c-format
-+ msgid "arp: cant get HW-Address for `%s': %s.\n"
-+ msgstr "arp: HW adresu `%s' nelze zjistit: %s\n"
-+ 
-+-#: ../arp.c:243
-++#: ../arp.c:252
-++#, c-format
-+ msgid "arp: protocol type mismatch.\n"
-+ msgstr "arp: chybn� zadan� typ protokolu\n"
-+ 
-+-#: ../arp.c:252
-++#: ../arp.c:261
-+ #, c-format
-+ msgid "arp: device `%s' has HW address %s `%s'.\n"
-+ msgstr "arp: za��zen� `%s' m� Hw adresu %s `%s'.\n"
-+ 
-+-#: ../arp.c:282
-++#: ../arp.c:293
-++#, c-format
-+ msgid "arp: need hardware address\n"
-+ msgstr "arp: je t�eba hardwarov� adresa\n"
-+ 
-+-#: ../arp.c:290
-++#: ../arp.c:301
-++#, c-format
-+ msgid "arp: invalid hardware address\n"
-+ msgstr "arp: nespr�vn� hardwarov� adresa\n"
-+ 
-+-#: ../arp.c:387
-++#: ../arp.c:398
-+ #, c-format
-+ msgid "arp: cannot open etherfile %s !\n"
-+ msgstr "arp: datab�zi ethernetov�ch adres %s nelze otev��t!\n"
-+ 
-+-#: ../arp.c:403
-++#: ../arp.c:414
-+ #, c-format
-+ msgid "arp: format error on line %u of etherfile %s !\n"
-+ msgstr "arp: syntaktick� chyba na ��dku %u datab�ze ethernetov�ch adres %s!\n"
-+ 
-+-#: ../arp.c:416
-++#: ../arp.c:427
-+ #, c-format
-+ msgid "arp: cannot set entry on line %u of etherfile %s !\n"
-+ msgstr ""
-+ "arp: polo�ku na ��dku %u datab�ze ethernetov�ch adres %s nelze nastavit!\n"
-+ 
-+-#: ../arp.c:437
-+-msgid "Address\t\t\tHWtype\tHWaddress\t    Flags Mask\t\t  Iface\n"
-++#: ../arp.c:448
-++#, fuzzy, c-format
-++msgid ""
-++"Address                  HWtype  HWaddress           Flags Mask            "
-++"Iface\n"
-+ msgstr "Adresa\t\t\t HWtyp\t HWadresa\t     P��z  Maska\t\t   Rozhran�\n"
-+ 
-+-#: ../arp.c:467
-++#: ../arp.c:476
-++#, fuzzy
-++msgid "<from_interface>"
-++msgstr " rozhran� %s\n"
-++
-++#: ../arp.c:478
-+ msgid "(incomplete)"
-+ msgstr "(nekompletn�)"
-+ 
-+-#: ../arp.c:484
-++#: ../arp.c:495
-+ #, c-format
-+ msgid "%s (%s) at "
-+ msgstr "%s (%s) na "
-+ 
-+-#: ../arp.c:490
-++#: ../arp.c:501
-++#, c-format
-+ msgid "<incomplete> "
-+ msgstr "<nekompletn�>"
-+ 
-+-#: ../arp.c:496
-++#: ../arp.c:507
-+ #, c-format
-+ msgid "netmask %s "
-+ msgstr "s��ov� maska %s "
-+ 
-+-#: ../arp.c:513
-++#: ../arp.c:524
-+ #, c-format
-+ msgid "on %s\n"
-+ msgstr "na %s\n"
-+ 
-+-#: ../arp.c:592
-++#: ../arp.c:605
-+ #, c-format
-+ msgid "Entries: %d\tSkipped: %d\tFound: %d\n"
-+ msgstr "Polo�ky: %d\tVynech�no: %d\tNalezeno: %d\n"
-+ 
-+-#: ../arp.c:596
-++#: ../arp.c:609
-+ #, c-format
-+ msgid "%s (%s) -- no entry\n"
-+ msgstr "%s (%s) -- ��dn� polo�ka\n"
-+ 
-+-#: ../arp.c:598
-++#: ../arp.c:611
-+ #, c-format
-+ msgid "arp: in %d entries no match found.\n"
-+ msgstr "arp: ��dn� z polo�ek (%d) nevyhovuje.\n"
-+ 
-+-#: ../arp.c:613
-++#: ../arp.c:626
-++#, c-format
-+ msgid ""
-+ "Usage:\n"
-+ "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP "
-+@@ -112,49 +127,46 @@ msgstr ""
-+ "  arp [-vn]  [<HW>] [-i <if> [-a] [<po��ta�>]             <-Zobraz� ARP "
-+ "cache\n"
-+ 
-+-#: ../arp.c:614
-++#: ../arp.c:627
-++#, fuzzy, c-format
-+ msgid ""
-+-"  arp [-v]          [-i <if>] -d  <hostname> [pub][nopub]    <-Delete ARP "
-++"  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP "
-+ "entry\n"
-+ msgstr ""
-+ "  arp [-v]          [-i <if>] -d <po��ta�> [pub][nopub]   <-Sma�e polo�ku "
-+ "ARP\n"
-+ 
-+-#: ../arp.c:615
-+-#, fuzzy
-++#: ../arp.c:628
-++#, fuzzy, c-format
-+ msgid ""
-+-"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]              <-Add entry from "
-++"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from "
-+ "file\n"
-+ msgstr ""
-+ "  arp [-vnD] [<HW>] [-i <if>] -f <soubor>                 <-P�id� polo�ku "
-+ "ze\n"
-+ "                                                          souboru\n"
-+ 
-+-#: ../arp.c:616
-++#: ../arp.c:629
-++#, fuzzy, c-format
-+ msgid ""
-+-"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [temp][nopub] <-Add "
-++"  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add "
-+ "entry\n"
-+ msgstr ""
-+ "  arp [-v]   [<HW> [-i <if> -s   <po��ta�> <hwadr> [temp][nopub] <-P�id� "
-+ "polo�ku\n"
-+ 
-+-#: ../arp.c:617
-+-msgid ""
-+-"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
-+-"<-''-\n"
-+-msgstr ""
-+-"  arp [-v]   [<HW>] [-i <if>] -s <soubor> <hwadr> [s��mask <��s>]  <-''-\n"
-+-
-+-#: ../arp.c:618
-++#: ../arp.c:630
-++#, fuzzy, c-format
-+ msgid ""
-+-"  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub      "
-++"  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          "
-+ "<-''-\n"
-+ "\n"
-+ msgstr ""
-+ "  arp [-v]   [<HW> [-i <if> -Ds  <po��ta�> <if> [s��mask <��s>] pub      "
-+ "<-''-\n"
-+ 
-+-#: ../arp.c:620
-++#: ../arp.c:632
-++#, c-format
-+ msgid ""
-+ "        -a                       display (all) hosts in alternative (BSD) "
-+ "style\n"
-+@@ -162,126 +174,134 @@ msgstr ""
-+ "        -a                       zobraz� jmna v�ech po��ta�� alternativn�m\n"
-+ "                                 (BSD) zp�sobem\n"
-+ 
-+-#: ../arp.c:621
-++#: ../arp.c:633
-++#, c-format
-+ msgid "        -s, --set                set a new ARP entry\n"
-+ msgstr "        -s, --set                nastav� novou ARP polo�ku\n"
-+ 
-+-#: ../arp.c:622
-++#: ../arp.c:634
-++#, c-format
-+ msgid "        -d, --delete             delete a specified entry\n"
-+ msgstr "        -d, --delete             sma�e zadanou ARP polo�ku\n"
-+ 
-+-#: ../arp.c:623 ../netstat.c:1436 ../route.c:85
-++#: ../arp.c:635 ../netstat.c:1503 ../route.c:86
-++#, c-format
-+ msgid "        -v, --verbose            be verbose\n"
-+ msgstr ""
-+ "        -v, --verbose            bude vypisovat podrobn� zpr�vy\n"
-+ "                                 o �innosti\n"
-+ 
-+-#: ../arp.c:624 ../netstat.c:1437 ../route.c:86
-+-msgid "        -n, --numeric            dont resolve names\n"
-++#: ../arp.c:636 ../netstat.c:1504 ../route.c:87
-++#, fuzzy, c-format
-++msgid "        -n, --numeric            don't resolve names\n"
-+ msgstr ""
-+ "        -n, --numeric            nebude p�ev�d�t ��seln� adresy\n"
-+ "                                 na kanonick� jm�na\n"
-+ 
-+-#: ../arp.c:625
-++#: ../arp.c:637
-++#, c-format
-+ msgid ""
-+ "        -i, --device             specify network interface (e.g. eth0)\n"
-+ msgstr "        -i, --device             zad�v� s��ov� rozhran� (nap�. eth0)\n"
-+ 
-+-#: ../arp.c:626
-++#: ../arp.c:638
-++#, c-format
-+ msgid "        -D, --use-device         read <hwaddr> from given device\n"
-+ msgstr "        -D, --use-device         �te <hwadr> ze zadan�ho za��zen�\n"
-+ 
-+-#: ../arp.c:627
-+-#, fuzzy
-++#: ../arp.c:639
-++#, fuzzy, c-format
-+ msgid "        -A, -p, --protocol       specify protocol family\n"
-+ msgstr "         -r, --route              vyp��e sm�rovac� tabulku\n"
-+ 
-+-#: ../arp.c:628
-+-#, fuzzy
-++#: ../arp.c:640
-++#, fuzzy, c-format
-+ msgid ""
-+-"        -f, --file               read new entries from file or from "
-+-"/etc/ethers\n"
-++"        -f, --file               read new entries from file or from /etc/"
-++"ethers\n"
-+ "\n"
-+ msgstr ""
-+ "        -f, --file               �te nov� polo�ky ze souboru\n"
-+ "\n"
-+ 
-+-#: ../arp.c:630 ../rarp.c:181
-++#: ../arp.c:642 ../rarp.c:182
-+ #, c-format
-+ msgid "  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"
-+ msgstr ""
-+ "  <HW>=Pou�ijte '-H <hw> pro zad�n� hardwarov�ho typu adresy.\n"
-+ "  Implicitn�: %s\n"
-+ 
-+-#: ../arp.c:631 ../rarp.c:182
-++#: ../arp.c:643 ../rarp.c:183
-++#, c-format
-+ msgid "  List of possible hardware types (which support ARP):\n"
-+ msgstr "  Seznam mo�n�ch hardwarov�ch typ� (podporuj�c�ch ARP):\n"
-+ 
-+-#: ../arp.c:664
-++#: ../arp.c:677 ../arp.c:762
-+ #, c-format
-+ msgid "%s: hardware type not supported!\n"
-+ msgstr "hardwarov� typ %s nen� podporov�n!\n"
-+ 
-+-#: ../arp.c:668
-++#: ../arp.c:681
-+ #, c-format
-+ msgid "%s: address family not supported!\n"
-+ msgstr "t��da adres %s nen� podporov�na!\n"
-+ 
-+-#: ../arp.c:703
-++#: ../arp.c:716
-++#, c-format
-+ msgid "arp: -N not yet supported.\n"
-+ msgstr "arp: p�ep�na� -N nen� zat�m podporov�n\n"
-+ 
-+-#: ../arp.c:713
-++#: ../arp.c:726
-+ #, c-format
-+ msgid "arp: %s: unknown address family.\n"
-+ msgstr "arp: nezn�m� t��da adres %s.\n"
-+ 
-+-#: ../arp.c:722
-++#: ../arp.c:735
-+ #, c-format
-+ msgid "arp: %s: unknown hardware type.\n"
-+ msgstr "arp: nezn�m� hardwarov� typ %s.\n"
-+ 
-+-#: ../arp.c:741
-++#: ../arp.c:754
-+ #, c-format
-+ msgid "arp: %s: kernel only supports 'inet'.\n"
-+ msgstr "arp: %s: j�dro podporuje pouze 'inet'.\n"
-+ 
-+-#: ../arp.c:746
-++#: ../arp.c:767
-+ #, c-format
-+ msgid "arp: %s: hardware type without ARP support.\n"
-+ msgstr "arp: hardwarov� typ %s nepodporuje ARP.\n"
-+ 
-+-#: ../hostname.c:69
-++#: ../hostname.c:71
-+ #, c-format
-+ msgid "Setting nodename to `%s'\n"
-+ msgstr "Nastavuji jm�no uzlu na `%s'\n"
-+ 
-+-#: ../hostname.c:74
-++#: ../hostname.c:76
-+ #, c-format
-+ msgid "%s: you must be root to change the node name\n"
-+ msgstr "%s: jm�no uzlu m��e zm�nit pouze superu�ivatel\n"
-+ 
-+-#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116
-++#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117
-+ #, c-format
-+ msgid "%s: name too long\n"
-+ msgstr "jm�no %s je p��li� dlouh�\n"
-+ 
-+-#: ../hostname.c:89
-++#: ../hostname.c:91
-+ #, c-format
-+ msgid "Setting hostname to `%s'\n"
-+ msgstr "Nastavuji jm�no po��ta�e na `%s'\n"
-+ 
-+-#: ../hostname.c:94
-++#: ../hostname.c:96
-+ #, c-format
-+ msgid "%s: you must be root to change the host name\n"
-+ msgstr "%s: jm�no po��ta�e m��e zm�nit pouze superu�ivatel\n"
-+ 
-+-#: ../hostname.c:108
-++#: ../hostname.c:109
-+ #, c-format
-+ msgid "Setting domainname to `%s'\n"
-+ msgstr "Nastavuji jm�no dom�ny na `%s'\n"
-+ 
-+-#: ../hostname.c:113
-++#: ../hostname.c:114
-+ #, c-format
-+ msgid "%s: you must be root to change the domain name\n"
-+ msgstr "%s: jm�no dom�ny m��e zm�nit pouze superu�ivatel\n"
-+@@ -306,26 +326,29 @@ msgstr "V�sledek: h_aliases=`%s'\n"
-+ msgid "Result: h_addr_list=`%s'\n"
-+ msgstr "V�sledek: h_addr_list=`%s'\n"
-+ 
-+-#: ../hostname.c:209
-++#: ../hostname.c:208
-+ #, c-format
-+ msgid "%s: can't open `%s'\n"
-+ msgstr "%s: `%s' nelze otev��t\n"
-+ 
-+-#: ../hostname.c:223
-++#: ../hostname.c:222
-++#, c-format
-+ msgid "Usage: hostname [-v] {hostname|-F file}      set hostname (from file)\n"
-+ msgstr ""
-+ "Pou�it�:\n"
-+ "    hostname [-v] {jm�no|-F soubor}       nastav� jm�no po��ta�e (ze "
-+ "souboru)\n"
-+ 
-+-#: ../hostname.c:224
-++#: ../hostname.c:223
-++#, c-format
-+ msgid ""
-+ "       domainname [-v] {nisdomain|-F file}   set NIS domainname (from file)\n"
-+ msgstr ""
-+ "    domainname [-v] {jm�no|-F soubor}     nastav� jm�no NIS dom�ny (ze\n"
-+ "                                          souboru)\n"
-+ 
-+-#: ../hostname.c:226
-++#: ../hostname.c:225
-++#, c-format
-+ msgid ""
-+ "       nodename [-v] {nodename|-F file}      set DECnet node name (from "
-+ "file)\n"
-+@@ -333,11 +356,13 @@ msgstr ""
-+ "    nodename [-v] {jm�no|-F soubor}       nastav� jm�no DECnet uzlu (ze\n"
-+ "                                          souboru)\n"
-+ 
-+-#: ../hostname.c:228
-++#: ../hostname.c:227
-++#, c-format
-+ msgid "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  display formatted name\n"
-+ msgstr "    hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  vyp��e form�tovan� jm�no\n"
-+ 
-+-#: ../hostname.c:229
-++#: ../hostname.c:228
-++#, c-format
-+ msgid ""
-+ "       hostname [-v]                         display hostname\n"
-+ "\n"
-+@@ -345,7 +370,8 @@ msgstr ""
-+ "    hostname [-v]                         vyp��e jm�no po��ta�e\n"
-+ "\n"
-+ 
-+-#: ../hostname.c:230
-++#: ../hostname.c:229
-++#, c-format
-+ msgid ""
-+ "       hostname -V|--version|-h|--help       print info and exit\n"
-+ "\n"
-+@@ -353,7 +379,8 @@ msgstr ""
-+ "    hostname -V|--version|-h|--help       vyp��e informace a skon��\n"
-+ "\n"
-+ 
-+-#: ../hostname.c:231
-++#: ../hostname.c:230
-++#, c-format
-+ msgid ""
-+ "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
-+ "\n"
-+@@ -361,35 +388,43 @@ msgstr ""
-+ "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
-+ "\n"
-+ 
-+-#: ../hostname.c:232
-++#: ../hostname.c:231
-++#, c-format
-+ msgid "    -s, --short           short host name\n"
-+ msgstr "    -s, --short           kr�tk� jm�no po��ta�e\n"
-+ 
-+-#: ../hostname.c:233
-++#: ../hostname.c:232
-++#, c-format
-+ msgid "    -a, --alias           alias names\n"
-+ msgstr "    -a, --alias           p�ezd�vky\n"
-+ 
-+-#: ../hostname.c:234
-++#: ../hostname.c:233
-++#, c-format
-+ msgid "    -i, --ip-address      addresses for the hostname\n"
-+ msgstr "    -i, --ip-address      adresy odpov�daj�c� jm�nu po��ta�e\n"
-+ 
-+-#: ../hostname.c:235
-++#: ../hostname.c:234
-++#, c-format
-+ msgid "    -f, --fqdn, --long    long host name (FQDN)\n"
-+ msgstr "    -f, --fqdn, --long    dlouh� jm�no po��ta�e (kanonick�)\n"
-+ 
-+-#: ../hostname.c:236
-++#: ../hostname.c:235
-++#, c-format
-+ msgid "    -d, --domain          DNS domain name\n"
-+ msgstr "    -d, --domain          jm�no DNS dom�ny\n"
-+ 
-+-#: ../hostname.c:237
-++#: ../hostname.c:236
-++#, c-format
-+ msgid "    -y, --yp, --nis       NIS/YP domainname\n"
-+ msgstr "    -y, --yp, --nis       jm�no NIS/YP dom�ny\n"
-+ 
-+-#: ../hostname.c:239
-++#: ../hostname.c:238
-++#, c-format
-+ msgid "    -n, --node            DECnet node name\n"
-+ msgstr "    -n, --node            jm�no DECnet uzlu\n"
-+ 
-+-#: ../hostname.c:241
-++#: ../hostname.c:240
-++#, c-format
-+ msgid ""
-+ "    -F, --file            read hostname or NIS domainname from given file\n"
-+ "\n"
-+@@ -397,7 +432,8 @@ msgstr ""
-+ "    -F, --file            �te jm�no po��ta�e �i nis dom�ny ze souboru\n"
-+ "\n"
-+ 
-+-#: ../hostname.c:243
-++#: ../hostname.c:242
-++#, c-format
-+ msgid ""
-+ "   This command can read or set the hostname or the NIS domainname. You can\n"
-+ "   also read the DNS domain or the FQDN (fully qualified domain name).\n"
-+@@ -412,6 +448,7 @@ msgid "%s: You can't change the DNS doma
-+ msgstr "%s: T�mto p��kazem nelze DNS jm�no dom�ny zm�nit\n"
-+ 
-+ #: ../hostname.c:339
-++#, c-format
-+ msgid ""
-+ "\n"
-+ "Unless you are using bind or NIS for host lookups you can change the DNS\n"
-+@@ -421,6 +458,7 @@ msgstr ""
-+ "zm�nit\n"
-+ 
-+ #: ../hostname.c:340
-++#, c-format
-+ msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n"
-+ msgstr ""
-+ "DNS jm�no dom�ny (je sou��st� kanonick�ho jm�na po��ta�e) v souboru\n"
-+@@ -441,349 +479,223 @@ msgstr "getdomainname()=`%s'\n"
-+ msgid "getnodename()=`%s'\n"
-+ msgstr "getnodename()=`%s'\n"
-+ 
-+-#: ../ifconfig.c:159
-+-#, c-format
-+-msgid "%-9.9s Link encap:%s  "
-+-msgstr "%-9.9s Zapouzd�en�:%s  "
-++#: ../ifconfig.c:107
-++#, fuzzy, c-format
-++msgid ""
-++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
-++"Flg\n"
-++msgstr ""
-++"Rozhr   MTU Met    P�-OK P�-CHYB P�-ZAH P�-P�T   OD-OK OD-CHYB OD-ZAH OD-P�T "
-++"P�Z\n"
-+ 
-+-#: ../ifconfig.c:164
-+-#, c-format
-+-msgid "HWaddr %s  "
-+-msgstr "HWadr %s  "
-++#: ../ifconfig.c:129 ../ifconfig.c:161
-++#, fuzzy, c-format
-++msgid "%s: ERROR while getting interface flags: %s\n"
-++msgstr "%s: chyba p�i z�sk�v�n� informac� o rozhran� %s\n"
-+ 
-+-#: ../ifconfig.c:167
-++#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862
-++#: ../ifconfig.c:973
-+ #, c-format
-+-msgid "Media:%s"
-+-msgstr "M�dium:%s"
-++msgid "No support for INET on this system.\n"
-++msgstr "Tento syst�m nepodporuje INET.\n"
-+ 
-+-#: ../ifconfig.c:169
-+-msgid "(auto)"
-+-msgstr "(auto)"
-++#: ../ifconfig.c:193
-++#, fuzzy, c-format
-++msgid "%s: ERROR while testing interface flags: %s\n"
-++msgstr "%s: chyba p�i z�sk�v�n� informac� o rozhran� %s\n"
-+ 
-+-#: ../ifconfig.c:176
-+-#, c-format
-+-msgid "          %s addr:%s "
-+-msgstr "          %s adr:%s "
-++#: ../ifconfig.c:202
-++#, fuzzy, c-format
-++msgid ""
-++"Usage:\n"
-++"  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"
-++msgstr ""
-++"Pou�it�:\n"
-++"  ifconfig [-a] [-i] [-v] <rozhran�> [[<AF>] <adresa>]\n"
-+ 
-+-#: ../ifconfig.c:179
-++#: ../ifconfig.c:204
-+ #, c-format
-+-msgid " P-t-P:%s "
-+-msgstr " P-t-P:%s "
-++msgid "  [add <address>[/<prefixlen>]]\n"
-++msgstr "  [add <adresa>[/<d�lka prefixu>]]\n"
-+ 
-+-# V ostatn�ch kataloz�ch se p�ekl�d� Broadcast -> v�esm�rov� vys�l�n�.
-+-# Tudi� bcast -> V�esm�r :)
-+-#: ../ifconfig.c:182
-++#: ../ifconfig.c:205
-+ #, c-format
-+-msgid " Bcast:%s "
-+-msgstr " V�esm�r:%s "
-++msgid "  [del <address>[/<prefixlen>]]\n"
-++msgstr "  [del <adresa>[/<d�lka prefixu>]]\n"
-+ 
-+-#: ../ifconfig.c:184
-++#: ../ifconfig.c:206
-+ #, c-format
-+-msgid " Mask:%s\n"
-+-msgstr "Maska:%s\n"
-++msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
-++msgstr "  [[-]broadcast [<adresa>]]  [[-]pointopoint [<adresa>]]\n"
-+ 
-+-#: ../ifconfig.c:201
-++#: ../ifconfig.c:207
-+ #, c-format
-+-msgid "          inet6 addr: %s/%d"
-+-msgstr "          inet6-adr: %s/%d"
-++msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
-++msgstr "  [netmask <adresa>]  [dstaddr <adresa>]  [tunnel <adresa>]\n"
-+ 
-+-#: ../ifconfig.c:203
-+-msgid " Scope:"
-+-msgstr " Rozsah:"
-++#: ../ifconfig.c:210
-++#, c-format
-++msgid "  [outfill <NN>] [keepalive <NN>]\n"
-++msgstr "  [outfill <NN>] [keepalive <NN>]\n"
-+ 
-+-#: ../ifconfig.c:206
-+-msgid "Global"
-+-msgstr "Glob�l"
-++#: ../ifconfig.c:212
-++#, c-format
-++msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
-++msgstr "  [hw <HW> <adresa>]  [metric <NN>]  [mtu <NN>]\n"
-+ 
-+-#: ../ifconfig.c:209
-+-msgid "Link"
-+-msgstr "Linka"
-++#: ../ifconfig.c:213
-++#, c-format
-++msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
-++msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
-+ 
-+-#: ../ifconfig.c:212
-+-msgid "Site"
-+-msgstr "Stanovi�t�"
-++#: ../ifconfig.c:214
-++#, c-format
-++msgid "  [multicast]  [[-]promisc]\n"
-++msgstr "  [multicast]  [[-]promisc]\n"
-+ 
-+ #: ../ifconfig.c:215
-+-msgid "Compat"
-+-msgstr "Kompatibilita"
-++#, c-format
-++msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
-++msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <typ>]\n"
-+ 
-+-#: ../ifconfig.c:218
-+-msgid "Host"
-+-msgstr "Po��ta�"
-++#: ../ifconfig.c:217
-++#, c-format
-++msgid "  [txqueuelen <NN>]\n"
-++msgstr "  [txqueuelen d�lka]\n"
-+ 
-+-#: ../ifconfig.c:221
-+-msgid "Unknown"
-+-msgstr "Nezn�m."
-++#: ../ifconfig.c:220
-++#, c-format
-++msgid "  [[-]dynamic]\n"
-++msgstr "  [[-]dynamic]\n"
-+ 
-+-#: ../ifconfig.c:236
-++#: ../ifconfig.c:222
-+ #, c-format
-+-msgid "          IPX/Ethernet II addr:%s\n"
-+-msgstr "          IPX/Ethernet II adr: %s\n"
-++msgid ""
-++"  [up|down] ...\n"
-++"\n"
-++msgstr ""
-++"  [up|down] ...\n"
-++"\n"
-+ 
-+-#: ../ifconfig.c:239
-++#: ../ifconfig.c:224
-+ #, c-format
-+-msgid "          IPX/Ethernet SNAP addr:%s\n"
-+-msgstr "          IPX/Ethernet SNAP adr:%s\n"
-++msgid "  <HW>=Hardware Type.\n"
-++msgstr "   <HW>=Hardwarov� Typ.\n"
-+ 
-+-#: ../ifconfig.c:242
-++#: ../ifconfig.c:225
-+ #, c-format
-+-msgid "          IPX/Ethernet 802.2 addr:%s\n"
-+-msgstr "          IPX/Ethernet 802.2 adr:%s\n"
-++msgid "  List of possible hardware types:\n"
-++msgstr "  Seznam mo�n�ch hardwarov�ch typ�:\n"
-+ 
-+-#: ../ifconfig.c:245
-++#. 1 = ARPable
-++#: ../ifconfig.c:227
-+ #, c-format
-+-msgid "          IPX/Ethernet 802.3 addr:%s\n"
-+-msgstr "          IPX/Ethernet 802.3 adr:%s\n"
-++msgid "  <AF>=Address family. Default: %s\n"
-++msgstr "   <AF>=t��da adres. Implicitn�: %s\n"
-+ 
-+-#: ../ifconfig.c:255
-++#: ../ifconfig.c:228
-+ #, c-format
-+-msgid "          EtherTalk Phase 2 addr:%s\n"
-+-msgstr "          EtherTalk Phase 2 adr:%s\n"
-++msgid "  List of possible address families:\n"
-++msgstr "  Seznam mo�n�ch t��d adres:\n"
-+ 
-+-#: ../ifconfig.c:264
-++#: ../ifconfig.c:303
-+ #, c-format
-+-msgid "          econet addr:%s\n"
-+-msgstr "          econet adr:%s\n"
-++msgid "ifconfig: option `%s' not recognised.\n"
-++msgstr ""
-+ 
-+-# Hic sunt leones ...
-+-#: ../ifconfig.c:270
-+-msgid "[NO FLAGS] "
-+-msgstr "[��DN� P��ZNAKY]"
-++#: ../ifconfig.c:305 ../ifconfig.c:962
-++#, c-format
-++msgid "ifconfig: `--help' gives usage information.\n"
-++msgstr ""
-+ 
-+-#: ../ifconfig.c:272
-+-msgid "UP "
-+-msgstr "AKTIVOV�NO "
-++#: ../ifconfig.c:380
-++#, c-format
-++msgid "Unknown media type.\n"
-++msgstr "Nezn�m� typ m�dia.\n"
-+ 
-+-#: ../ifconfig.c:274
-+-msgid "BROADCAST "
-+-msgstr "V�ESM�ROV�_VYS�L�N� "
-++#: ../ifconfig.c:417
-++#, c-format
-++msgid ""
-++"Warning: Interface %s still in promisc mode... maybe other application is "
-++"running?\n"
-++msgstr ""
-+ 
-+-#: ../ifconfig.c:276
-+-msgid "DEBUG "
-+-msgstr "DEBUG "
-++#: ../ifconfig.c:429
-++#, c-format
-++msgid "Warning: Interface %s still in MULTICAST mode.\n"
-++msgstr ""
-+ 
-+-#: ../ifconfig.c:278
-+-msgid "LOOPBACK "
-+-msgstr "SMY�KA "
-++#: ../ifconfig.c:441
-++#, c-format
-++msgid "Warning: Interface %s still in ALLMULTI mode.\n"
-++msgstr ""
-+ 
-+-#: ../ifconfig.c:280
-+-msgid "POINTOPOINT "
-+-msgstr "POINTOPOINT "
-++#: ../ifconfig.c:465
-++#, c-format
-++msgid "Warning: Interface %s still in DYNAMIC mode.\n"
-++msgstr ""
-+ 
-+-# ??
-+-#: ../ifconfig.c:282
-+-msgid "NOTRAILERS "
-+-msgstr "NOTRAILERS "
-++#: ../ifconfig.c:523
-++#, c-format
-++msgid "Warning: Interface %s still in BROADCAST mode.\n"
-++msgstr ""
-+ 
-+-#: ../ifconfig.c:284
-+-msgid "RUNNING "
-+-msgstr "B̮� "
-++#: ../ifconfig.c:652
-++#, c-format
-++msgid "Warning: Interface %s still in POINTOPOINT mode.\n"
-++msgstr ""
-+ 
-+-#: ../ifconfig.c:286
-+-msgid "NOARP "
-+-msgstr "NEARP "
-++#: ../ifconfig.c:684
-++#, c-format
-++msgid "hw address type `%s' has no handler to set address. failed.\n"
-++msgstr ""
-+ 
-+-#: ../ifconfig.c:288
-+-msgid "PROMISC "
-+-msgstr "PROMISK "
-++#: ../ifconfig.c:693
-++#, c-format
-++msgid "%s: invalid %s address.\n"
-++msgstr "%s: adresa %s je nespr�vn�.\n"
-+ 
-+-#: ../ifconfig.c:290
-+-msgid "ALLMULTI "
-+-msgstr "ALLMULTI "
-++#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913
-++#, c-format
-++msgid "No support for INET6 on this system.\n"
-++msgstr "Tento syst�m nepodporuje INET6.\n"
-+ 
-+-#: ../ifconfig.c:292
-+-msgid "SLAVE "
-+-msgstr "SLAVE "
-++#: ../ifconfig.c:780 ../ifconfig.c:871
-++#, c-format
-++msgid "Interface %s not initialized\n"
-++msgstr ""
-+ 
-+-#: ../ifconfig.c:294
-+-msgid "MASTER "
-+-msgstr "MASTER "
-++#: ../ifconfig.c:792 ../ifconfig.c:882
-++#, fuzzy, c-format
-++msgid "Bad address.\n"
-++msgstr "%s: adresa %s je nespr�vn�.\n"
-+ 
-+-#: ../ifconfig.c:296
-+-msgid "MULTICAST "
-+-msgstr "MULTICAST "
-+-
-+-#: ../ifconfig.c:299
-+-msgid "DYNAMIC "
-+-msgstr "DYNAMIC "
-+-
-+-#: ../ifconfig.c:302
-+-#, c-format
-+-msgid " MTU:%d  Metric:%d"
-+-msgstr " MTU:%d  Metrika:%d"
-+-
-+-#: ../ifconfig.c:306
-+-#, c-format
-+-msgid "  Outfill:%d  Keepalive:%d"
-+-msgstr "  Outfill:%d  Keepalive:%d"
-+-
-+-#: ../ifconfig.c:320
-+-#, c-format
-+-msgid "RX packets:%lu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
-+-msgstr "p�ijmut�ch paket�:%lu chyb:%lu zahozeno:%lu p�ete�en�:%lu r�mc�:%lu\n"
-+-
-+-#: ../ifconfig.c:325
-+-#, c-format
-+-msgid "             compressed:%lu\n"
-+-msgstr "             komprimov�no:%lu\n"
-+-
-+-# carrier?
-+-#: ../ifconfig.c:329
-+-#, c-format
-+-msgid "TX packets:%lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
-+-msgstr "odeslan�ch paket�:%lu chyb:%lu zahozeno:%lu p�ete�en�:%lu p�enos:%lu\n"
-+-
-+-#: ../ifconfig.c:333
-+-#, c-format
-+-msgid "          collisions:%lu "
-+-msgstr "          koliz�:%lu "
-+-
-+-#: ../ifconfig.c:335
-+-#, c-format
-+-msgid "compressed:%lu "
-+-msgstr "komprimov�no:%lu "
-+-
-+-#: ../ifconfig.c:337
-+-#, c-format
-+-msgid "txqueuelen:%d "
-+-msgstr "d�lka odchoz� fronty:%d "
-+-
-+-#: ../ifconfig.c:345
-+-#, c-format
-+-msgid "Interrupt:%d "
-+-msgstr "P�eru�en�:%d "
-+-
-+-#. Only print devices using it for
-+-#. I/O maps
-+-#: ../ifconfig.c:348
-+-#, c-format
-+-msgid "Base address:0x%x "
-+-msgstr "Vstupn�/V�stupn� port:0x%x "
-+-
-+-#: ../ifconfig.c:350
-+-#, c-format
-+-msgid "Memory:%lx-%lx "
-+-msgstr "Pam�:%lx-%lx "
-+-
-+-#: ../ifconfig.c:353
-+-#, c-format
-+-msgid "DMA chan:%x "
-+-msgstr "Kan�l DMA:%x "
-+-
-+-#: ../ifconfig.c:384 ../ifconfig.c:405
-+-#, c-format
-+-msgid "%s: unknown interface: %s\n"
-+-msgstr "%s: rozhran� %s nen� zn�mo\n"
-+-
-+-#: ../ifconfig.c:421
-+-msgid ""
-+-"Usage:\n"
-+-"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <address>]\n"
-+-msgstr ""
-+-"Pou�it�:\n"
-+-"  ifconfig [-a] [-i] [-v] <rozhran�> [[<AF>] <adresa>]\n"
-+-
-+-#: ../ifconfig.c:425
-+-msgid "  [add <address>[/<prefixlen>]]\n"
-+-msgstr "  [add <adresa>[/<d�lka prefixu>]]\n"
-+-
-+-#: ../ifconfig.c:427
-+-msgid "  [del <address>[/<prefixlen>]]\n"
-+-msgstr "  [del <adresa>[/<d�lka prefixu>]]\n"
-+-
-+-#: ../ifconfig.c:432
-+-msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
-+-msgstr "  [[-]broadcast [<adresa>]]  [[-]pointopoint [<adresa>]]\n"
-+-
-+-#: ../ifconfig.c:433
-+-msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
-+-msgstr "  [netmask <adresa>]  [dstaddr <adresa>]  [tunnel <adresa>]\n"
-+-
-+-#: ../ifconfig.c:436
-+-msgid "  [outfill <NN>] [keepalive <NN>]\n"
-+-msgstr "  [outfill <NN>] [keepalive <NN>]\n"
-+-
-+-#: ../ifconfig.c:438
-+-msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
-+-msgstr "  [hw <HW> <adresa>]  [metric <NN>]  [mtu <NN>]\n"
-+-
-+-#: ../ifconfig.c:439
-+-msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
-+-msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
-+-
-+-#: ../ifconfig.c:440
-+-msgid "  [multicast]  [[-]promisc]\n"
-+-msgstr "  [multicast]  [[-]promisc]\n"
-+-
-+-#: ../ifconfig.c:441
-+-msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
-+-msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <typ>]\n"
-+-
-+-#: ../ifconfig.c:443
-+-msgid "  [txqueuelen <NN>]\n"
-+-msgstr "  [txqueuelen d�lka]\n"
-+-
-+-#: ../ifconfig.c:446
-+-msgid "  [[-]dynamic]\n"
-+-msgstr "  [[-]dynamic]\n"
-+-
-+-#: ../ifconfig.c:448
-+-msgid ""
-+-"  [up|down] ...\n"
-+-"\n"
-+-msgstr ""
-+-"  [up|down] ...\n"
-+-"\n"
-+-
-+-#: ../ifconfig.c:450
-+-msgid "  <HW>=Hardware Type.\n"
-+-msgstr "   <HW>=Hardwarov� Typ.\n"
-+-
-+-#: ../ifconfig.c:451
-+-msgid "  List of possible hardware types:\n"
-+-msgstr "  Seznam mo�n�ch hardwarov�ch typ�:\n"
-+-
-+-#. 1 = ARPable
-+-#: ../ifconfig.c:453
-+-#, c-format
-+-msgid "  <AF>=Address family. Default: %s\n"
-+-msgstr "   <AF>=t��da adres. Implicitn�: %s\n"
-+-
-+-#: ../ifconfig.c:454
-+-msgid "  List of possible address families:\n"
-+-msgstr "  Seznam mo�n�ch t��d adres:\n"
-+-
-+-#: ../ifconfig.c:593
-+-msgid "Unknown media type.\n"
-+-msgstr "Nezn�m� typ m�dia.\n"
-+-
-+-#: ../ifconfig.c:881
-++#: ../ifconfig.c:885
-+ #, c-format
-+-msgid "%s: invalid %s address.\n"
-+-msgstr "%s: adresa %s je nespr�vn�.\n"
-+-
-+-#: ../ifconfig.c:920 ../ifconfig.c:963 ../ifconfig.c:1011
-+-msgid "No support for INET6 on this system.\n"
-+-msgstr "Tento syst�m nepodporuje INET6.\n"
-+-
-+-#: ../ifconfig.c:983
-+ msgid "Address deletion not supported on this system.\n"
-+ msgstr "Tento syst�m nepodporuje maz�n� adres.\n"
-+ 
-+-#: ../ifconfig.c:1066
-+-msgid "No support for INET on this system.\n"
-+-msgstr "Tento syst�m nepodporuje INET.\n"
-++#: ../ifconfig.c:957
-++#, fuzzy, c-format
-++msgid "ifconfig: Cannot set address for this protocol family.\n"
-++msgstr "Nev�m, jak nastavit adresu t��dy %d.\n"
-+ 
-+-#: ../ifconfig.c:1076
-++#: ../ifconfig.c:983
-++#, c-format
-+ msgid "No support for ECONET on this system.\n"
-+ msgstr "Tento syst�m nepodporuje ECONET.\n"
-+ 
-+-#: ../ifconfig.c:1084
-++#: ../ifconfig.c:991
-+ #, c-format
-+ msgid "Don't know how to set addresses for family %d.\n"
-+ msgstr "Nev�m, jak nastavit adresu t��dy %d.\n"
-+ 
-+-#: ../netstat.c:383
-++#: ../ifconfig.c:1021
-++#, c-format
-++msgid "WARNING: at least one error occured. (%d)\n"
-++msgstr ""
-++
-++#: ../netstat.c:434
-+ #, c-format
-+ msgid ""
-+ "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n"
-+@@ -792,7 +704,8 @@ msgstr ""
-+ "jste\n"
-+ "byl superu�ivatelem)\n"
-+ 
-+-#: ../netstat.c:387
-++#: ../netstat.c:438
-++#, c-format
-+ msgid ""
-+ "(Not all processes could be identified, non-owned process info\n"
-+ " will not be shown, you would have to be root to see it all.)\n"
-+@@ -801,199 +714,223 @@ msgstr ""
-+ "pouze o procesech, jich� jste vlastn�kem. Aby jste mohl vid�t v�e, musel\n"
-+ "byste b�t superu�ivatelem.)\n"
-+ 
-+-#: ../netstat.c:394 ../netstat.c:1089 ../netstat.c:1166
-++#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266
-+ msgid "LISTENING"
-+ msgstr "NASLOUCH�"
-+ 
-+-#: ../netstat.c:395
-++#: ../netstat.c:446
-+ msgid "CONN SENT"
-+ msgstr "CONN ODESL�N"
-+ 
-+-#: ../netstat.c:396 ../netstat.c:1168
-++#: ../netstat.c:447 ../netstat.c:1268
-+ msgid "DISC SENT"
-+ msgstr "DISC ODESL�N"
-+ 
-+-#: ../netstat.c:397 ../netstat.c:464 ../netstat.c:809 ../netstat.c:1169
-++#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269
-+ msgid "ESTABLISHED"
-+ msgstr "SPOJENO"
-+ 
-+-#: ../netstat.c:419
-++#: ../netstat.c:470
-++#, c-format
-+ msgid "Active NET/ROM sockets\n"
-+ msgstr "Aktivn� NET/ROM sokety\n"
-+ 
-+-#: ../netstat.c:420
-++#: ../netstat.c:471
-++#, c-format
-+ msgid ""
-+-"User       Dest       Source     Device  State        Vr/Vs    Send-Q  "
-+-"Recv-Q\n"
-++"User       Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-"
-++"Q\n"
-+ msgstr ""
-+-"U�ivatel   C�l        Zdroj      Za��zen� Stav        Vr/Vs    Odch-F "
-+-"P��ch-F\n"
-++"U�ivatel   C�l        Zdroj      Za��zen� Stav        Vr/Vs    Odch-F P��ch-"
-++"F\n"
-+ 
-+-#: ../netstat.c:430 ../netstat.c:1208
-++#: ../netstat.c:481 ../netstat.c:1308
-+ #, c-format
-+ msgid "Problem reading data from %s\n"
-+ msgstr "Chyba p�i �ten� dat z %s\n"
-+ 
-+ # n�sleduj�c� rad�ji ponechat v origin�le ?!
-+-#: ../netstat.c:465
-++#: ../netstat.c:516
-+ msgid "SYN_SENT"
-+ msgstr "SYN_SENT"
-+ 
-+-#: ../netstat.c:466
-++#: ../netstat.c:517
-+ msgid "SYN_RECV"
-+ msgstr "SYN_RECV"
-+ 
-+-#: ../netstat.c:467
-++#: ../netstat.c:518
-+ msgid "FIN_WAIT1"
-+ msgstr "FIN_WAIT1"
-+ 
-+-#: ../netstat.c:468
-++#: ../netstat.c:519
-+ msgid "FIN_WAIT2"
-+ msgstr "FIN_WAIT2"
-+ 
-+-#: ../netstat.c:469
-++#: ../netstat.c:520
-+ msgid "TIME_WAIT"
-+ msgstr "TIME_WAIT"
-+ 
-+-#: ../netstat.c:470
-++#: ../netstat.c:521
-+ msgid "CLOSE"
-+ msgstr "ZAV�EN"
-+ 
-+-#: ../netstat.c:471
-++#: ../netstat.c:522
-+ msgid "CLOSE_WAIT"
-+ msgstr "CLOSE_WAIT"
-+ 
-+-#: ../netstat.c:472
-++#: ../netstat.c:523
-+ msgid "LAST_ACK"
-+ msgstr "POSLEDN� ACK"
-+ 
-+-#: ../netstat.c:473
-++#: ../netstat.c:524
-+ msgid "LISTEN"
-+ msgstr "LISTEN"
-+ 
-+-#: ../netstat.c:474
-++#: ../netstat.c:525
-+ msgid "CLOSING"
-+ msgstr "ZAV�R�"
-+ 
-+-#: ../netstat.c:544
-++#: ../netstat.c:596
-+ #, c-format
-+ msgid "warning, got bogus igmp6 line %d.\n"
-+ msgstr "varov�n�, nesmysln� igmp6 ��dek %d.\n"
-+ 
-+-#: ../netstat.c:549 ../netstat.c:587 ../netstat.c:670 ../netstat.c:803
-+-#: ../netstat.c:935 ../netstat.c:940
-++#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898
-++#: ../netstat.c:1032 ../netstat.c:1037
-+ #, c-format
-+ msgid "netstat: unsupported address family %d !\n"
-+ msgstr "netstat: t��da adres %d nen� podporov�na !\n"
-+ 
-+-#: ../netstat.c:562 ../netstat.c:567 ../netstat.c:575 ../netstat.c:582
-++#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634
-+ #, c-format
-+ msgid "warning, got bogus igmp line %d.\n"
-+ msgstr "varov�n�, nesmysln� igmp ��dek %d.\n"
-+ 
-+-#: ../netstat.c:666
-++#: ../netstat.c:677
-++#, fuzzy, c-format
-++msgid "Active X.25 sockets\n"
-++msgstr "Aktivn� AX.25 sokety\n"
-++
-++#. IMHO, Vr/Vs is not very usefull --SF
-++#: ../netstat.c:679
-++#, fuzzy, c-format
-++msgid ""
-++"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  Recv-"
-++"Q\n"
-++msgstr "C�l        Zdroj      Za��z   Stav         Vr/Vs    Odhod-F P��ch-F\n"
-++
-++#: ../netstat.c:759
-++#, c-format
-+ msgid "warning, got bogus tcp line.\n"
-+ msgstr "varov�n�, nesmysln� tcp ��dek.\n"
-+ 
-+-#: ../netstat.c:704 ../netstat.c:855 ../netstat.c:975
-++#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075
-+ #, c-format
-+ msgid "off (0.00/%ld/%d)"
-+ msgstr "vyp (0.00/%ld/%d)"
-+ 
-+-#: ../netstat.c:708
-++#: ../netstat.c:804
-+ #, fuzzy, c-format
-+ msgid "on (%2.2f/%ld/%d)"
-+ msgstr "zap%d (%2.2f/%ld/%d)"
-+ 
-+-#: ../netstat.c:713
-++#: ../netstat.c:809
-+ #, fuzzy, c-format
-+ msgid "keepalive (%2.2f/%ld/%d)"
-+ msgstr "zap%d (%2.2f/%ld/%d)"
-+ 
-+-#: ../netstat.c:718
-++#: ../netstat.c:814
-+ #, fuzzy, c-format
-+ msgid "timewait (%2.2f/%ld/%d)"
-+ msgstr "zap%d (%2.2f/%ld/%d)"
-+ 
-+-#: ../netstat.c:723 ../netstat.c:864 ../netstat.c:985
-++#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085
-+ #, c-format
-+ msgid "unkn-%d (%2.2f/%ld/%d)"
-+ msgstr "nezn-%d (%2.2f/%ld/%d)"
-+ 
-+-#: ../netstat.c:799
-++#: ../netstat.c:894
-++#, c-format
-+ msgid "warning, got bogus udp line.\n"
-+ msgstr "varov�n�, nesmysln� udp ��dek.\n"
-+ 
-+-#: ../netstat.c:817 ../netstat.c:1075 ../netstat.c:1108
-++#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208
-+ msgid "UNKNOWN"
-+ msgstr "NEZN�M"
-+ 
-+-#: ../netstat.c:860 ../netstat.c:980
-++#: ../netstat.c:958 ../netstat.c:1080
-+ #, c-format
-+ msgid "on%d (%2.2f/%ld/%d)"
-+ msgstr "zap%d (%2.2f/%ld/%d)"
-+ 
-+-#: ../netstat.c:949
-++#: ../netstat.c:1046
-++#, c-format
-+ msgid "warning, got bogus raw line.\n"
-+ msgstr "varov�n�, nesmysln� 'raw' ��dek.\n"
-+ 
-+-#: ../netstat.c:1028
-++#: ../netstat.c:1128
-++#, c-format
-+ msgid "warning, got bogus unix line.\n"
-+ msgstr "varov�n�, netstat 'unix' ��dek.\n"
-+ 
-+-#: ../netstat.c:1055
-++#: ../netstat.c:1155
-+ msgid "STREAM"
-+ msgstr "STREAM"
-+ 
-+-#: ../netstat.c:1059
-++#: ../netstat.c:1159
-+ msgid "DGRAM"
-+ msgstr "DGRAM"
-+ 
-+-#: ../netstat.c:1063
-++#: ../netstat.c:1163
-+ msgid "RAW"
-+ msgstr "RAW"
-+ 
-+-#: ../netstat.c:1067
-++#: ../netstat.c:1167
-+ msgid "RDM"
-+ msgstr "RDM"
-+ 
-+-#: ../netstat.c:1071
-++#: ../netstat.c:1171
-+ msgid "SEQPACKET"
-+ msgstr "SEQPACKET"
-+ 
-+-#: ../netstat.c:1080
-++#: ../netstat.c:1180
-+ msgid "FREE"
-+ msgstr "NEALOKOV�N"
-+ 
-+-#: ../netstat.c:1096
-++#: ../netstat.c:1196
-+ msgid "CONNECTING"
-+ msgstr "SPOJUJE"
-+ 
-+-#: ../netstat.c:1100
-++#: ../netstat.c:1200
-+ msgid "CONNECTED"
-+ msgstr "SPOJEN"
-+ 
-+-#: ../netstat.c:1104
-++#: ../netstat.c:1204
-+ msgid "DISCONNECTING"
-+ msgstr "ODPOJUJE"
-+ 
-+-#: ../netstat.c:1135
-++#: ../netstat.c:1235
-++#, c-format
-+ msgid "Active UNIX domain sockets "
-+ msgstr "Aktivn� sokety dom�ny UNIX "
-+ 
-+-#: ../netstat.c:1137 ../netstat.c:1666
-++#: ../netstat.c:1237 ../netstat.c:1756
-++#, c-format
-+ msgid "(servers and established)"
-+ msgstr "(servery a nav�zan� spojen�)"
-+ 
-+-#: ../netstat.c:1140 ../netstat.c:1669
-++#: ../netstat.c:1240 ../netstat.c:1759
-++#, c-format
-+ msgid "(only servers)"
-+ msgstr "(pouze servery)"
-+ 
-+-#: ../netstat.c:1142 ../netstat.c:1671
-++#: ../netstat.c:1242 ../netstat.c:1761
-++#, c-format
-+ msgid "(w/o servers)"
-+ msgstr "(w/o servery)"
-+ 
-+-#: ../netstat.c:1145
-++#: ../netstat.c:1245
-++#, c-format
-+ msgid ""
-+ "\n"
-+ "Proto RefCnt Flags       Type       State         I-Node"
-+@@ -1001,90 +938,92 @@ msgstr ""
-+ "\n"
-+ "Proto ��ta�  P��znaky    Typ        Stav          I-Uzel"
-+ 
-+-#: ../netstat.c:1147
-++#: ../netstat.c:1247
-++#, c-format
-+ msgid " Path\n"
-+ msgstr " Cesta\n"
-+ 
-+-#: ../netstat.c:1167
-++#: ../netstat.c:1267
-+ msgid "SABM SENT"
-+ msgstr "SABM ODESL�N"
-+ 
-+-#: ../netstat.c:1170
-++#: ../netstat.c:1270
-+ msgid "RECOVERY"
-+ msgstr "OBNOVA"
-+ 
-+-#: ../netstat.c:1184
-++#: ../netstat.c:1284
-++#, c-format
-+ msgid "Active AX.25 sockets\n"
-+ msgstr "Aktivn� AX.25 sokety\n"
-+ 
-+-#: ../netstat.c:1185
-++#: ../netstat.c:1285
-++#, c-format
-+ msgid "Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-Q\n"
-+ msgstr "C�l        Zdroj      Za��z   Stav         Vr/Vs    Odhod-F P��ch-F\n"
-+ 
-+-#: ../netstat.c:1228
-++#: ../netstat.c:1328
-+ #, c-format
-+ msgid "problem reading data from %s\n"
-+ msgstr "chyba p�i �ten� dat z %s\n"
-+ 
-+-#: ../netstat.c:1279
-++#: ../netstat.c:1379
-++#, c-format
-+ msgid ""
-+ "Active IPX sockets\n"
-+ "Proto Recv-Q Send-Q Local Address              Foreign Address            "
-+ "State"
-+ msgstr ""
-+ "Aktivn� IPX sokety\n"
-+-"Proto P��ch-F Odch-F Lok�l adresa              Vzd�len� adresa               "
-+-" Stav"
-++"Proto P��ch-F Odch-F Lok�l adresa              Vzd�len� "
-++"adresa                Stav"
-+ 
-+-#: ../netstat.c:1281
-++#: ../netstat.c:1381
-++#, c-format
-+ msgid " User"
-+ msgstr " U�ivatel"
-+ 
-+-#: ../netstat.c:1315
-++#: ../netstat.c:1415
-+ msgid "ESTAB"
-+ msgstr "SPOJEN"
-+ 
-+-#: ../netstat.c:1323
-++#: ../netstat.c:1423
-+ msgid "UNK."
-+ msgstr "NEZ."
-+ 
-+-#: ../netstat.c:1367
-+-msgid "     - no statistics available -"
-+-msgstr "     - statistick� data nejsou dostupn� -"
-+-
-+-#: ../netstat.c:1370
-+-msgid "[NO FLAGS]"
-+-msgstr "[��DN� P��ZNAKY]"
-+-
-+-#: ../netstat.c:1400
-++#: ../netstat.c:1461
-++#, c-format
-+ msgid "Kernel Interface table\n"
-+ msgstr "Tabulka rozhran� v j�dru\n"
-+ 
-+-#: ../netstat.c:1401
-++#: ../netstat.c:1465
-++#, fuzzy, c-format
-+ msgid ""
-+-"Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
-++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
-+ "Flg\n"
-+ msgstr ""
-+ "Rozhr   MTU Met    P�-OK P�-CHYB P�-ZAH P�-P�T   OD-OK OD-CHYB OD-ZAH OD-P�T "
-+ "P�Z\n"
-+ 
-+-#: ../netstat.c:1404
-++#: ../netstat.c:1469
-+ msgid "missing interface information"
-+ msgstr "chyb� informace o rozhran�"
-+ 
-+-#: ../netstat.c:1425
-++#: ../netstat.c:1492
-++#, c-format
-+ msgid ""
-+-"usage: netstat [-veenNcCF] [<Af>] -r         netstat "
-+-"{-V|--version|-h|--help}\n"
-++"usage: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
-++"help}\n"
-+ msgstr ""
-+-"Pou�it�: netstat [--veenNcCF] [<TA>] -r       netstat "
-+-"{-V|--version|-h|--help}\n"
-++"Pou�it�: netstat [--veenNcCF] [<TA>] -r       netstat {-V|--version|-h|--"
-++"help}\n"
-+ 
-+-#: ../netstat.c:1426
-++#: ../netstat.c:1493
-++#, c-format
-+ msgid "       netstat [-vnNcaeol] [<Socket> ...]\n"
-+ msgstr "         netstat [-vnNcaeol] [<Soket> ...]\n"
-+ 
-+-#: ../netstat.c:1427
-++#: ../netstat.c:1494
-++#, c-format
-+ msgid ""
-+ "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
-+ "\n"
-+@@ -1092,27 +1031,32 @@ msgstr ""
-+ "         netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
-+ "\n"
-+ 
-+-#: ../netstat.c:1429
-++#: ../netstat.c:1496
-++#, c-format
-+ msgid "        -r, --route              display routing table\n"
-+ msgstr "         -r, --route              vyp��e sm�rovac� tabulku\n"
-+ 
-+-#: ../netstat.c:1430
-++#: ../netstat.c:1497
-++#, c-format
-+ msgid "        -i, --interfaces         display interface table\n"
-+ msgstr "         -i, --interfaces         vyp��e tabulku rozhran�\n"
-+ 
-+-#: ../netstat.c:1431
-++#: ../netstat.c:1498
-++#, c-format
-+ msgid "        -g, --groups             display multicast group memberships\n"
-+ msgstr ""
-+ "         -g, --groups             vyp��e �lenstv� v multicast skupin�ch\n"
-+ 
-+-#: ../netstat.c:1432
-++#: ../netstat.c:1499
-++#, c-format
-+ msgid ""
-+ "        -s, --statistics         display networking statistics (like SNMP)\n"
-+ msgstr ""
-+ "         -s, --statistics         vyp��e statistiku s��ov� aktivity (jako "
-+ "SNMP)\n"
-+ 
-+-#: ../netstat.c:1434
-++#: ../netstat.c:1501
-++#, c-format
-+ msgid ""
-+ "        -M, --masquerade         display masqueraded connections\n"
-+ "\n"
-+@@ -1120,20 +1064,45 @@ msgstr ""
-+ "         -M, --masquerade         vyp��e maskovan� spojen�\n"
-+ "\n"
-+ 
-+-#: ../netstat.c:1438 ../route.c:87
-++#: ../netstat.c:1505
-++#, fuzzy, c-format
-++msgid "        --numeric-hosts          don't resolve host names\n"
-++msgstr ""
-++"        -n, --numeric            nebude p�ev�d�t ��seln� adresy\n"
-++"                                 na kanonick� jm�na\n"
-++
-++#: ../netstat.c:1506
-++#, fuzzy, c-format
-++msgid "        --numeric-ports          don't resolve port names\n"
-++msgstr ""
-++"        -n, --numeric            nebude p�ev�d�t ��seln� adresy\n"
-++"                                 na kanonick� jm�na\n"
-++
-++#: ../netstat.c:1507
-++#, fuzzy, c-format
-++msgid "        --numeric-users          don't resolve user names\n"
-++msgstr ""
-++"        -n, --numeric            nebude p�ev�d�t ��seln� adresy\n"
-++"                                 na kanonick� jm�na\n"
-++
-++#: ../netstat.c:1508
-++#, c-format
-+ msgid "        -N, --symbolic           resolve hardware names\n"
-+ msgstr "         -N, --symbolic           p�evede hw jm�na\n"
-+ 
-+-#: ../netstat.c:1439 ../route.c:88
-++#: ../netstat.c:1509 ../route.c:88
-++#, c-format
-+ msgid "        -e, --extend             display other/more information\n"
-+ msgstr "         -e, --extend             vyp��e podrobn�j�� informace\n"
-+ 
-+-#: ../netstat.c:1440
-++#: ../netstat.c:1510
-++#, c-format
-+ msgid "        -p, --programs           display PID/Program name for sockets\n"
-+ msgstr ""
-+ "         -p, --programs           vyp��e PID/jm�no programu pro sokety\n"
-+ 
-+-#: ../netstat.c:1441
-++#: ../netstat.c:1511
-++#, c-format
-+ msgid ""
-+ "        -c, --continuous         continuous listing\n"
-+ "\n"
-+@@ -1141,23 +1110,27 @@ msgstr ""
-+ "         -c, --continuous         nep�eru�ovan� v�pis\n"
-+ "\n"
-+ 
-+-#: ../netstat.c:1442
-++#: ../netstat.c:1512
-++#, c-format
-+ msgid "        -l, --listening          display listening server sockets\n"
-+ msgstr ""
-+ "         -l, --listening          vyp��e sokety, na nich� je naslouch�no\n"
-+ 
-+-#: ../netstat.c:1443
-++#: ../netstat.c:1513
-++#, c-format
-+ msgid ""
-+ "        -a, --all, --listening   display all sockets (default: connected)\n"
-+ msgstr ""
-+ "         -a, --all, --listening   vyp��e v�echny sokety (implicitn�: "
-+ "spojen�)\n"
-+ 
-+-#: ../netstat.c:1444
-++#: ../netstat.c:1514
-++#, c-format
-+ msgid "        -o, --timers             display timers\n"
-+ msgstr "         -o, --timers             zobraz� �asova�e\n"
-+ 
-+-#: ../netstat.c:1445 ../route.c:89
-++#: ../netstat.c:1515 ../route.c:89
-++#, c-format
-+ msgid ""
-+ "        -F, --fib                display Forwarding Information Base "
-+ "(default)\n"
-+@@ -1165,112 +1138,126 @@ msgstr ""
-+ "         -F, --fib                zobraz� Forwarding Infomation Base\n"
-+ "                                  (implicitn�)\n"
-+ 
-+-#: ../netstat.c:1446 ../route.c:90
-++#: ../netstat.c:1516 ../route.c:90
-++#, c-format
-+ msgid ""
-+ "        -C, --cache              display routing cache instead of FIB\n"
-+ "\n"
-+ msgstr "         -C, --cache              m�sto FIB zobraz� sm�rovac� cache\n"
-+ 
-+-#: ../netstat.c:1448
-++#: ../netstat.c:1518
-++#, c-format
-+ msgid ""
-+-"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
-+-"--netrom\n"
-++"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
-++"netrom\n"
-+ msgstr ""
-+-"  <Soket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
-+-"--netrom\n"
-++"  <Soket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
-++"netrom\n"
-+ 
-+-#: ../netstat.c:1449 ../route.c:92
-+-#, c-format
-+-msgid "  <AF>=Use '-A <af>' or '--<af>' Default: %s\n"
-++#: ../netstat.c:1519
-++#, fuzzy, c-format
-++msgid "  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"
-+ msgstr "   <AF>=Pou�ijte '-A <af>' or '--<af>' Implicitn�: %s\n"
-+ 
-+-#: ../netstat.c:1450 ../route.c:93
-++#: ../netstat.c:1520 ../route.c:93
-++#, c-format
-+ msgid "  List of possible address families (which support routing):\n"
-+ msgstr "  Seznam mo�n�ch t��d adres (podporuj�c�ch sm�rov�n�):\n"
-+ 
-+-#: ../netstat.c:1663
-++#: ../netstat.c:1753
-++#, c-format
-+ msgid "Active Internet connections "
-+ msgstr "Aktivn� Internetov� spojen� "
-+ 
-+-#: ../netstat.c:1673
-++#: ../netstat.c:1763
-++#, c-format
-+ msgid ""
-+ "\n"
-+-"Proto Recv-Q Send-Q Local Address           Foreign Address         State    "
-+-"  "
-++"Proto Recv-Q Send-Q Local Address           Foreign Address         "
-++"State      "
-+ msgstr ""
-+ "\n"
-+ "Proto P��ch-F Odch-F M�stn� Adresa          Vzd�len� Adresa         Stav     "
-+ 
-+-#: ../netstat.c:1675
-++#: ../netstat.c:1765
-++#, c-format
-+ msgid " User       Inode     "
-+ msgstr " U�ivatel   I-uzel    "
-+ 
-+-#: ../netstat.c:1678
-++#: ../netstat.c:1768
-++#, c-format
-+ msgid " Timer"
-+ msgstr " �asova�"
-+ 
-+-#: ../netstat.c:1708
-++#: ../netstat.c:1798
-++#, c-format
-+ msgid "IPv4 Group Memberships\n"
-+ msgstr "�lenstv� v IPv4 skupin�ch\n"
-+ 
-+-#: ../netstat.c:1709
-++#: ../netstat.c:1799
-++#, c-format
-+ msgid "Interface       RefCnt Group\n"
-+ msgstr "Rozhran�        ��ta�  Skupina\n"
-+ 
-+-#: ../rarp.c:43
-++#: ../rarp.c:44
-+ msgid "This kernel does not support RARP.\n"
-+ msgstr "Toto j�dro nepodporuje RARP.\n"
-+ 
-+-#: ../rarp.c:82
-++#: ../rarp.c:83
-+ #, c-format
-+ msgid "no RARP entry for %s.\n"
-+ msgstr "pro %s neexistuje RARP polo�ka.\n"
-+ 
-+-#: ../rarp.c:95
-++#: ../rarp.c:96
-+ #, c-format
-+ msgid "%s: bad hardware address\n"
-+ msgstr "hardwarov� adresa %s je nespr�vn�\n"
-+ 
-+-#: ../rarp.c:127
-++#: ../rarp.c:128
-+ #, c-format
-+ msgid "rarp: cannot open file %s:%s.\n"
-+ msgstr "rarp: soubor %s:%s nelze otev��t.\n"
-+ 
-+-#: ../rarp.c:139
-++#: ../rarp.c:140
-+ #, c-format
-+ msgid "rarp: format error at %s:%u\n"
-+ msgstr "rarp: syntaktick� chyba na ��dku %2$u souboru %1$s\n"
-+ 
-+-#: ../rarp.c:143 ../rarp.c:287
-++#: ../rarp.c:144 ../rarp.c:289
-+ #, c-format
-+ msgid "rarp: %s: unknown host\n"
-+ msgstr "rarp: po��ta� %s nen� zn�m\n"
-+ 
-+-#: ../rarp.c:146
-++#: ../rarp.c:147
-+ #, c-format
-+ msgid "rarp: cannot set entry from %s:%u\n"
-+ msgstr "rarp: nelze nastavit polo�ku z ��dku %2$u souboru %1$s\n"
-+ 
-+-#: ../rarp.c:175
-++#: ../rarp.c:176
-++#, c-format
-+ msgid "Usage: rarp -a                               list entries in cache.\n"
-+ msgstr "Pou�it�: rarp -a                            vyp��e polo�ky z cache.\n"
-+ 
-+-#: ../rarp.c:176
-++#: ../rarp.c:177
-++#, c-format
-+ msgid "       rarp -d <hostname>                    delete entry from cache.\n"
-+ msgstr "         rarp -d <jm�no>                    sma�e polo�ku z cache.\n"
-+ 
-+-#: ../rarp.c:177
-++#: ../rarp.c:178
-++#, c-format
-+ msgid "       rarp [<HW>] -s <hostname> <hwaddr>    add entry to cache.\n"
-+ msgstr ""
-+ "         rarp [<HW>] -s <jm�no> <hwadr>       p�id� polo�ku do cache.\n"
-+ 
-+-#: ../rarp.c:178
-++#: ../rarp.c:179
-++#, c-format
-+ msgid ""
-+ "       rarp -f                               add entries from /etc/ethers.\n"
-+ msgstr ""
-+ "         rarp -f                               p�id� polo�ky z /etc/ethers.\n"
-+ 
-+-#: ../rarp.c:179
-++#: ../rarp.c:180
-++#, c-format
-+ msgid ""
-+ "       rarp -V                               display program version.\n"
-+ "\n"
-+@@ -1279,24 +1266,26 @@ msgstr ""
-+ "programu.\n"
-+ "\n"
-+ 
-+-#: ../rarp.c:236
-++#: ../rarp.c:238
-+ #, c-format
-+ msgid "%s: illegal option mix.\n"
-+ msgstr "Kombinace p�ep�na�� %s je nespr�vn�.\n"
-+ 
-+-#: ../rarp.c:267
-++#: ../rarp.c:269
-+ #, c-format
-+ msgid "rarp: %s: unknown hardware type.\n"
-+ msgstr "rarp: hardwarov� typ %s nen� zn�m.\n"
-+ 
-+-#: ../route.c:79
-++#: ../route.c:80
-++#, c-format
-+ msgid ""
-+ "Usage: route [-nNvee] [-FC] [<AF>]           List kernel routing tables\n"
-+ msgstr ""
-+ "Pou�it�: route [-nNvee] [-FC] [<AF>]         Zobraz� sm�rovac� tabulky v "
-+ "j�dru\n"
-+ 
-+-#: ../route.c:80
-++#: ../route.c:81
-++#, c-format
-+ msgid ""
-+ "       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n"
-+ "\n"
-+@@ -1305,14 +1294,16 @@ msgstr ""
-+ "AF.\n"
-+ "\n"
-+ 
-+-#: ../route.c:82
-++#: ../route.c:83
-++#, c-format
-+ msgid ""
-+ "       route {-h|--help} [<AF>]              Detailed usage syntax for "
-+ "specified AF.\n"
-+ msgstr ""
-+ "       route {-h|--help [<AF>]               N�pov�da pro pou�it� s AF.\n"
-+ 
-+-#: ../route.c:83
-++#: ../route.c:84
-++#, c-format
-+ msgid ""
-+ "       route {-V|--version}                  Display version/author and "
-+ "exit.\n"
-+@@ -1321,15 +1312,23 @@ msgstr ""
-+ "       route {-V|--version}                  Vyp��e ozna�en� verze a autora\n"
-+ "                                             programu.\n"
-+ 
-++#: ../route.c:92
-++#, fuzzy, c-format
-++msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
-++msgstr "   <AF>=Pou�ijte '-A <af>' or '--<af>' Implicitn�: %s\n"
-++
-+ #: ../plipconfig.c:66
-++#, c-format
-+ msgid "Usage: plipconfig [-a] [-i] [-v] interface\n"
-+ msgstr "Pou�it�: plipconfig [-a] [-i] [-v] rozhran�\n"
-+ 
-+ #: ../plipconfig.c:67
-++#, c-format
-+ msgid "                  [nibble NN] [trigger NN]\n"
-+ msgstr "                  [nibble NN] [trigger NN]\n"
-+ 
-+ #: ../plipconfig.c:68
-++#, c-format
-+ msgid "       plipconfig -V | --version\n"
-+ msgstr "       plipconfig -V | --version\n"
-+ 
-+@@ -1338,25 +1337,30 @@ msgstr "       plipconfig -V | --version
-+ msgid "%s\tnibble %lu  trigger %lu\n"
-+ msgstr "%s\tnibble %lu  trigger %lu\n"
-+ 
-+-#: ../iptunnel.c:79
-++#: ../iptunnel.c:85
-++#, c-format
-+ msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
-+ msgstr "Pou�it�: iptunnel { add | change | del | show } [ JM�NO ]\n"
-+ 
-+-#: ../iptunnel.c:80
-++#: ../iptunnel.c:86
-++#, c-format
-+ msgid ""
-+ "          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
-+ msgstr ""
-+ "          [ mode { ipip | gre | sit } ] [ vzd�len� ADR ] [ m�stn� ADR ]\n"
-+ 
-+-#: ../iptunnel.c:81
-++#: ../iptunnel.c:87
-++#, c-format
-+ msgid "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
-+ msgstr "          [ [i|o]seq ] [ [i|o]key KL�� ] [ [i|o]csum ]\n"
-+ 
-+-#: ../iptunnel.c:82
-++#: ../iptunnel.c:88
-++#, c-format
-+ msgid "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
-+ msgstr "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev ZA��ZEN� ]\n"
-+ 
-+-#: ../iptunnel.c:83
-++#: ../iptunnel.c:89
-++#, c-format
-+ msgid ""
-+ "       iptunnel -V | --version\n"
-+ "\n"
-+@@ -1364,450 +1368,737 @@ msgstr ""
-+ "       iptunnel -V | --version\n"
-+ "\n"
-+ 
-+-#: ../iptunnel.c:84
-++#: ../iptunnel.c:90
-++#, c-format
-+ msgid "Where: NAME := STRING\n"
-+ msgstr "Kde: JM�NO := �ET�ZEC\n"
-+ 
-+-#: ../iptunnel.c:85
-++#: ../iptunnel.c:91
-++#, c-format
-+ msgid "       ADDR := { IP_ADDRESS | any }\n"
-+ msgstr "       ADR := { IP-ADRESA | any }\n"
-+ 
-+-#: ../iptunnel.c:86
-++#: ../iptunnel.c:92
-++#, c-format
-+ msgid "       TOS  := { NUMBER | inherit }\n"
-+ msgstr "       TOS  := { ��SLO | inherit }\n"
-+ 
-+-#: ../iptunnel.c:87
-++#: ../iptunnel.c:93
-++#, c-format
-+ msgid "       TTL  := { 1..255 | inherit }\n"
-+ msgstr "       TTL  := { 1..255 | inherit }\n"
-+ 
-+-#: ../iptunnel.c:88
-++#: ../iptunnel.c:94
-++#, c-format
-+ msgid "       KEY  := { DOTTED_QUAD | NUMBER }\n"
-+ msgstr "       KL��  := { DOTTED_QUAD | ��SLO }\n"
-+ 
-+-#: ../iptunnel.c:326
-++#: ../iptunnel.c:332
-++#, c-format
-+ msgid "Keys are not allowed with ipip and sit.\n"
-+ msgstr "S ipip a sit nejsou kl��e povoleny.\n"
-+ 
-+-#: ../iptunnel.c:346
-++#: ../iptunnel.c:352
-++#, c-format
-+ msgid "Broadcast tunnel requires a source address.\n"
-+ msgstr "Tunel se v�esm�rov�m vys�l�n�m vy�aduje zdrojovou adresu.\n"
-+ 
-+-#: ../iptunnel.c:361
-++#: ../iptunnel.c:367
-++#, c-format
-+ msgid "ttl != 0 and noptmudisc are incompatible\n"
-+ msgstr "ttl != 0 a noptmudisc se navz�jem vylu�uj�\n"
-+ 
-+-#: ../iptunnel.c:373
-++#: ../iptunnel.c:379
-++#, c-format
-+ msgid "cannot determine tunnel mode (ipip, gre or sit)\n"
-+ msgstr "re�im tunelu (ipip, gre �i sit) nelze zjistit\n"
-+ 
-+-#: ../iptunnel.c:411
-++#: ../iptunnel.c:417
-+ #, c-format
-+ msgid "%s: %s/ip  remote %s  local %s "
-+ msgstr "%s: %s/ip  vzd�len� %s  m�stn� %s "
-+ 
-+-#: ../iptunnel.c:415
-++#: ../iptunnel.c:421
-+ msgid "unknown"
-+ msgstr "Nezn�m."
-+ 
-+-#: ../iptunnel.c:447
-++#: ../iptunnel.c:453
-++#, c-format
-+ msgid "  Drop packets out of sequence.\n"
-+ msgstr "  Zahazuje pakety mimo po�ad�.\n"
-+ 
-+-#: ../iptunnel.c:449
-++#: ../iptunnel.c:455
-++#, c-format
-+ msgid "  Checksum in received packet is required.\n"
-+ msgstr "  P�ij�man� pakety mus� m�t kontroln� sou�et.\n"
-+ 
-+ # ???
-+-#: ../iptunnel.c:451
-++#: ../iptunnel.c:457
-++#, c-format
-+ msgid "  Sequence packets on output.\n"
-+ msgstr "  �ad� odchoz� pakety.\n"
-+ 
-+-#: ../iptunnel.c:453
-++#: ../iptunnel.c:459
-++#, c-format
-+ msgid "  Checksum output packets.\n"
-+ msgstr "  Odchoz� pakety budou m�t kontroln� sou�et.\n"
-+ 
-+-#: ../iptunnel.c:481
-++#: ../iptunnel.c:487
-++#, c-format
-+ msgid "Wrong format of /proc/net/dev. Sorry.\n"
-+ msgstr "Lituji, form�t /proc/net/dev je chybn�.\n"
-+ 
-+-#: ../iptunnel.c:494
-++#: ../iptunnel.c:500
-+ #, c-format
-+ msgid "Failed to get type of [%s]\n"
-+ msgstr "Typ [%s] se nepoda�ilo zjistit.\n"
-+ 
-+-#: ../iptunnel.c:510
-++#: ../iptunnel.c:516
-++#, c-format
-+ msgid "RX: Packets    Bytes        Errors CsumErrs OutOfSeq Mcasts\n"
-+ msgstr "RX: Pakety     Bajty        Chyby  CsumChyb MimoPo�  Mcasts\n"
-+ 
-+-#: ../iptunnel.c:513
-++#: ../iptunnel.c:519
-++#, c-format
-+ msgid "TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs\n"
-+ msgstr "TX: Pakety     Bajty        Chyby  DeadLoop NoRoute  NoBufs\n"
-+ 
-+-#: ../statistics.c:45
-++#: ../statistics.c:47
-+ msgid "ICMP input histogram:"
-+ msgstr "histogram ICMP vstupu:"
-+ 
-+-#: ../statistics.c:46
-++#: ../statistics.c:48
-+ msgid "ICMP output histogram:"
-+ msgstr "histogram ICMP v�stupu:"
-+ 
-+-#: ../statistics.c:63
-++#: ../statistics.c:65
-+ #, c-format
-+ msgid "Forwarding is %s"
-+ msgstr "P�ed�v�n� je %s"
-+ 
-+-#: ../statistics.c:64
-+-#, c-format
-+-msgid "Default TTL is %d"
-++#: ../statistics.c:66
-++#, fuzzy, c-format
-++msgid "Default TTL is %u"
-+ msgstr "Implicitn� TTL je %d"
-+ 
-+-#: ../statistics.c:65
-+-#, c-format
-+-msgid "%d total packets received"
-++#: ../statistics.c:67
-++#, fuzzy, c-format
-++msgid "%u total packets received"
-+ msgstr "celkem p�ijmut�ch paket�: %d"
-+ 
-+-#: ../statistics.c:66
-+-#, c-format
-+-msgid "%d with invalid headers"
-++#: ../statistics.c:68
-++#, fuzzy, c-format
-++msgid "%u with invalid headers"
-+ msgstr "s nespr�vn�mi hlavi�kami: %d"
-+ 
-+-#: ../statistics.c:67
-+-#, c-format
-+-msgid "%d with invalid addresses"
-++#: ../statistics.c:69
-++#, fuzzy, c-format
-++msgid "%u with invalid addresses"
-+ msgstr "s nespr�vn�mi adresami: %d"
-+ 
-+-#: ../statistics.c:68
-+-#, c-format
-+-msgid "%d forwarded"
-++#: ../statistics.c:70
-++#, fuzzy, c-format
-++msgid "%u forwarded"
-+ msgstr "p�ed�no: %d"
-+ 
-+-#: ../statistics.c:69
-+-#, c-format
-+-msgid "%d with unknown protocol"
-++#: ../statistics.c:71
-++#, fuzzy, c-format
-++msgid "%u with unknown protocol"
-+ msgstr "s nezn�m�m protokolem: %d"
-+ 
-+-#: ../statistics.c:70
-+-#, c-format
-+-msgid "%d incoming packets discarded"
-++#: ../statistics.c:72
-++#, fuzzy, c-format
-++msgid "%u incoming packets discarded"
-+ msgstr "po�et zahozen�ch p��choz�ch paket�: %d"
-+ 
-+-#: ../statistics.c:71
-+-#, c-format
-+-msgid "%d incoming packets delivered"
-++#: ../statistics.c:73
-++#, fuzzy, c-format
-++msgid "%u incoming packets delivered"
-+ msgstr "po�et doru�en�ch p��choz�ch paket�: %d"
-+ 
-+-#: ../statistics.c:72
-+-#, c-format
-+-msgid "%d requests sent out"
-++#: ../statistics.c:74
-++#, fuzzy, c-format
-++msgid "%u requests sent out"
-+ msgstr "po�et odeslan�ch po�adavk�: %d"
-+ 
-+ #. ?
-+-#: ../statistics.c:73
-+-#, c-format
-+-msgid "%d outgoing packets dropped"
-++#: ../statistics.c:75
-++#, fuzzy, c-format
-++msgid "%u outgoing packets dropped"
-+ msgstr "po�et zahozen�ch odchoz�ch paket�: %d"
-+ 
-+-#: ../statistics.c:74
-+-#, c-format
-+-msgid "%d dropped because of missing route"
-++#: ../statistics.c:76
-++#, fuzzy, c-format
-++msgid "%u dropped because of missing route"
-+ msgstr "zahozeno kv�li chyb�j�c� cest�: %d"
-+ 
-+-#: ../statistics.c:75
-+-#, c-format
-+-msgid "%d fragments dropped after timeout"
-++#: ../statistics.c:77
-++#, fuzzy, c-format
-++msgid "%u fragments dropped after timeout"
-+ msgstr "po�et fragment� zahozen�ch po vypr�en� �asu: %d"
-+ 
-+-#: ../statistics.c:76
-+-#, c-format
-+-msgid "%d reassemblies required"
-++#: ../statistics.c:78
-++#, fuzzy, c-format
-++msgid "%u reassemblies required"
-+ msgstr "po�et nutn�ch znovusestaven�: %d"
-+ 
-+ #. ?
-+-#: ../statistics.c:77
-+-#, c-format
-+-msgid "%d packets reassembled ok"
-++#: ../statistics.c:79
-++#, fuzzy, c-format
-++msgid "%u packets reassembled ok"
-+ msgstr "po�et v po��dku znovu sestaven�ch paket�: %d"
-+ 
-+-#: ../statistics.c:78
-+-#, c-format
-+-msgid "%d packet reassembles failed"
-++#: ../statistics.c:80
-++#, fuzzy, c-format
-++msgid "%u packet reassembles failed"
-+ msgstr "po�et paket�, je� se nepoda�ilo znovu sestavit: %d"
-+ 
-+-#: ../statistics.c:79
-+-#, c-format
-+-msgid "%d fragments received ok"
-++#: ../statistics.c:81
-++#, fuzzy, c-format
-++msgid "%u fragments received ok"
-+ msgstr "po�et v po��dku p�ijmut�ch fragment�: %d"
-+ 
-+-#: ../statistics.c:80
-+-#, c-format
-+-msgid "%d fragments failed"
-++#: ../statistics.c:82
-++#, fuzzy, c-format
-++msgid "%u fragments failed"
-+ msgstr "po�et chybn�ch fragment�: %d"
-+ 
-+-#: ../statistics.c:81
-+-#, c-format
-+-msgid "%d fragments created"
-++#: ../statistics.c:83
-++#, fuzzy, c-format
-++msgid "%u fragments created"
-+ msgstr "po�et vytvo�en�ch fragment�: %d"
-+ 
-+-#: ../statistics.c:86
-+-#, c-format
-+-msgid "%d ICMP messages received"
-++#: ../statistics.c:88
-++#, fuzzy, c-format
-++msgid "%u ICMP messages received"
-+ msgstr "po�et p�ijmut�ch ICMP zpr�v: %d"
-+ 
-+-#: ../statistics.c:87
-+-#, c-format
-+-msgid "%d input ICMP message failed."
-++#: ../statistics.c:89
-++#, fuzzy, c-format
-++msgid "%u input ICMP message failed."
-+ msgstr "po�et chybn�ch p��choz�ch ICMP zpr�v: %d"
-+ 
-+-#: ../statistics.c:88 ../statistics.c:101
-+-#, c-format
-+-msgid "destination unreachable: %d"
-++#: ../statistics.c:90 ../statistics.c:103
-++#, fuzzy, c-format
-++msgid "destination unreachable: %u"
-+ msgstr "adres�t nedostupn�: %d"
-+ 
-+-#: ../statistics.c:89
-+-#, c-format
-+-msgid "timeout in transit: %d"
-++#: ../statistics.c:91
-++#, fuzzy, c-format
-++msgid "timeout in transit: %u"
-+ msgstr "vypr�el �as p�i p�enosu: %d"
-+ 
-+-#: ../statistics.c:90 ../statistics.c:103
-+-#, c-format
-+-msgid "wrong parameters: %d"
-++#: ../statistics.c:92 ../statistics.c:105
-++#, fuzzy, c-format
-++msgid "wrong parameters: %u"
-+ msgstr "chybn� parametry: %d"
-+ 
-+ #. ?
-+-#: ../statistics.c:91
-+-#, c-format
-+-msgid "source quenchs: %d"
-++#: ../statistics.c:93
-++#, fuzzy, c-format
-++msgid "source quenches: %u"
-+ msgstr "��zen� toku dat: %d"
-+ 
-+-#: ../statistics.c:92
-+-#, c-format
-+-msgid "redirects: %d"
-++#: ../statistics.c:94
-++#, fuzzy, c-format
-++msgid "redirects: %u"
-+ msgstr "zm�na cesty: %d"
-+ 
-+-#: ../statistics.c:93
-+-#, c-format
-+-msgid "echo requests: %d"
-++#: ../statistics.c:95
-++#, fuzzy, c-format
-++msgid "echo requests: %u"
-+ msgstr "��dost o echo: %d"
-+ 
-+-#: ../statistics.c:94 ../statistics.c:107
-+-#, c-format
-+-msgid "echo replies: %d"
-++#: ../statistics.c:96 ../statistics.c:109
-++#, fuzzy, c-format
-++msgid "echo replies: %u"
-+ msgstr "odpov�� na ��dost o echo: %d"
-+ 
-+-#: ../statistics.c:95
-+-#, c-format
-+-msgid "timestamp request: %d"
-++#: ../statistics.c:97
-++#, fuzzy, c-format
-++msgid "timestamp request: %u"
-+ msgstr "��dost o �as: %d"
-+ 
-+-#: ../statistics.c:96
-+-#, c-format
-+-msgid "timestamp reply: %d"
-++#: ../statistics.c:98
-++#, fuzzy, c-format
-++msgid "timestamp reply: %u"
-+ msgstr "odpov�� na ��dost o �as: %d"
-+ 
-+-#: ../statistics.c:97
-+-#, c-format
-+-msgid "address mask request: %d"
-++#: ../statistics.c:99
-++#, fuzzy, c-format
-++msgid "address mask request: %u"
-+ msgstr "��dost o masku pods�t�: %d"
-+ 
-+ #. ?
-+-#: ../statistics.c:98
-+-msgid "address mask replies"
-+-msgstr "odpov�di na ��dost o masku pods�t�"
-++#: ../statistics.c:100 ../statistics.c:113
-++#, fuzzy, c-format
-++msgid "address mask replies: %u"
-++msgstr "odpov�� na ��dost o masku pods�t�: %d"
-+ 
-+ #. ?
-+-#: ../statistics.c:99
-+-#, c-format
-+-msgid "%d ICMP messages sent"
-++#: ../statistics.c:101
-++#, fuzzy, c-format
-++msgid "%u ICMP messages sent"
-+ msgstr "po�et odeslan�ch ICMP zpr�v: %d"
-+ 
-+-#: ../statistics.c:100
-+-#, c-format
-+-msgid "%d ICMP messages failed"
-++#: ../statistics.c:102
-++#, fuzzy, c-format
-++msgid "%u ICMP messages failed"
-+ msgstr "po�et chybn�ch ICMP zpr�v: %d"
-+ 
-+-#: ../statistics.c:102
-+-#, c-format
-+-msgid "time exceeded: %d"
-++#: ../statistics.c:104
-++#, fuzzy, c-format
-++msgid "time exceeded: %u"
-+ msgstr "vypr�en� �ivotnosti: %d"
-+ 
-+ #. ?
-+-#: ../statistics.c:104
-+-#, c-format
-+-msgid "source quench: %d"
-++#: ../statistics.c:106
-++#, fuzzy, c-format
-++msgid "source quench: %u"
-+ msgstr "��zen� toku dat: %d"
-+ 
-+-#: ../statistics.c:105
-+-#, c-format
-+-msgid "redirect: %d"
-++#: ../statistics.c:107
-++#, fuzzy, c-format
-++msgid "redirect: %u"
-+ msgstr "zm�na cesty: %d"
-+ 
-+-#: ../statistics.c:106
-+-#, c-format
-+-msgid "echo request: %d"
-++#: ../statistics.c:108
-++#, fuzzy, c-format
-++msgid "echo request: %u"
-+ msgstr "��dost o echo: %d"
-+ 
-+-#: ../statistics.c:108
-+-#, c-format
-+-msgid "timestamp requests: %d"
-++#: ../statistics.c:110
-++#, fuzzy, c-format
-++msgid "timestamp requests: %u"
-+ msgstr "��dost o �as: %d"
-+ 
-+-#: ../statistics.c:109
-+-#, c-format
-+-msgid "timestamp replies: %d"
-++#: ../statistics.c:111
-++#, fuzzy, c-format
-++msgid "timestamp replies: %u"
-+ msgstr "odpov�� na ��dost o �as: %d"
-+ 
-+-#: ../statistics.c:110
-+-#, c-format
-+-msgid "address mask requests: %d"
-++#: ../statistics.c:112
-++#, fuzzy, c-format
-++msgid "address mask requests: %u"
-+ msgstr "��dost o masku pods�t�: %d"
-+ 
-+-#: ../statistics.c:111
-+-#, c-format
-+-msgid "address mask replies: %d"
-+-msgstr "odpov�� na ��dost o masku pods�t�: %d"
-+-
-+-#: ../statistics.c:116
-++#: ../statistics.c:118
-+ #, c-format
-+ msgid "RTO algorithm is %s"
-+ msgstr "RTO algoritmus je %s"
-+ 
-+-#: ../statistics.c:120
-+-#, c-format
-+-msgid "%d active connections openings"
-++#: ../statistics.c:122
-++#, fuzzy, c-format
-++msgid "%u active connections openings"
-+ msgstr "po�et aktivn� nav�zan�ch spojen�: %d"
-+ 
-+-#: ../statistics.c:121
-+-#, c-format
-+-msgid "%d passive connection openings"
-++#: ../statistics.c:123
-++#, fuzzy, c-format
-++msgid "%u passive connection openings"
-+ msgstr "po�et pasivn� nav�zan�ch spojen�: %d"
-+ 
-+-#: ../statistics.c:122
-+-#, c-format
-+-msgid "%d failed connection attempts"
-++#: ../statistics.c:124
-++#, fuzzy, c-format
-++msgid "%u failed connection attempts"
-+ msgstr "po�et ne�sp�n�ch pokus� o spojen�: %d"
-+ 
-+-#: ../statistics.c:123
-+-#, c-format
-+-msgid "%d connection resets received"
-++#: ../statistics.c:125
-++#, fuzzy, c-format
-++msgid "%u connection resets received"
-+ msgstr "po�et p�ijmut�ch reset�: %d"
-+ 
-+-#: ../statistics.c:124
-+-#, c-format
-+-msgid "%d connections established"
-++#: ../statistics.c:126
-++#, fuzzy, c-format
-++msgid "%u connections established"
-+ msgstr "po�et nav�zan�ch spojen�: %d"
-+ 
-+-#: ../statistics.c:125
-+-#, c-format
-+-msgid "%d segments received"
-++#: ../statistics.c:127
-++#, fuzzy, c-format
-++msgid "%u segments received"
-+ msgstr "po�et p�ijmut�ch segment�: %d"
-+ 
-+-#: ../statistics.c:126
-+-#, c-format
-+-msgid "%d segments send out"
-++#: ../statistics.c:128
-++#, fuzzy, c-format
-++msgid "%u segments send out"
-+ msgstr "po�et odeslan�ch segment�: %d"
-+ 
-+-#: ../statistics.c:127
-+-#, c-format
-+-msgid "%d segments retransmited"
-++#: ../statistics.c:129
-++#, fuzzy, c-format
-++msgid "%u segments retransmited"
-+ msgstr "po�et p�enesen�ch segment�: %d"
-+ 
-+-#: ../statistics.c:128
-+-#, c-format
-+-msgid "%d bad segments received."
-++#: ../statistics.c:130
-++#, fuzzy, c-format
-++msgid "%u bad segments received."
-+ msgstr "po�et chybn�ch p��choz�ch segment�: %d."
-+ 
-+-#: ../statistics.c:129
-+-#, c-format
-+-msgid "%d resets sent"
-++#: ../statistics.c:131
-++#, fuzzy, c-format
-++msgid "%u resets sent"
-+ msgstr "po�et odeslan�ch reset�: %d"
-+ 
-+-#: ../statistics.c:134
-+-#, c-format
-+-msgid "%d packets received"
-++#: ../statistics.c:136
-++#, fuzzy, c-format
-++msgid "%u packets received"
-+ msgstr "po�et p�ijmut�ch paket�: %d"
-+ 
-+-#: ../statistics.c:135
-+-#, c-format
-+-msgid "%d packets to unknown port received."
-++#: ../statistics.c:137
-++#, fuzzy, c-format
-++msgid "%u packets to unknown port received."
-+ msgstr "po�et paket� p�ijmut�ch pro nezn�m� port: %d."
-+ 
-+-#: ../statistics.c:136
-+-#, c-format
-+-msgid "%d packet receive errors"
-++#: ../statistics.c:138
-++#, fuzzy, c-format
-++msgid "%u packet receive errors"
-+ msgstr "po�et chyb p�i p��jmu paket�: %d"
-+ 
-+-#: ../statistics.c:137
-+-#, c-format
-+-msgid "%d packets sent"
-++#: ../statistics.c:139
-++#, fuzzy, c-format
-++msgid "%u packets sent"
-+ msgstr "po�et odeslan�ch paket�: %d"
-+ 
-+-#: ../statistics.c:142
-+-#, c-format
-+-msgid "%d SYN cookies sent"
-++#: ../statistics.c:144
-++#, fuzzy, c-format
-++msgid "%u SYN cookies sent"
-+ msgstr "po�et odeslan�ch SYN cookies: %d"
-+ 
-+-#: ../statistics.c:143
-+-#, c-format
-+-msgid "%d SYN cookies received"
-++#: ../statistics.c:145
-++#, fuzzy, c-format
-++msgid "%u SYN cookies received"
-+ msgstr "po�et p�ijmut�ch SYN cookies: %d"
-+ 
-+-#: ../statistics.c:144
-+-#, c-format
-+-msgid "%d invalid SYN cookies received"
-++#: ../statistics.c:146
-++#, fuzzy, c-format
-++msgid "%u invalid SYN cookies received"
-+ msgstr "po�et chybn�ch p��choz�ch SYN cookies: %d"
-+ 
-+-#: ../statistics.c:146
-+-#, c-format
-+-msgid "%d resets received for embryonic SYN_RECV sockets"
-++#: ../statistics.c:148
-++#, fuzzy, c-format
-++msgid "%u resets received for embryonic SYN_RECV sockets"
-+ msgstr "po�et reset� p�ijmut�ch pro sokety ve stavu SYN_P��CH: %d"
-+ 
-+-#: ../statistics.c:148
-+-#, c-format
-+-msgid "%d packets pruned from receive queue because of socket buffer overrun"
-++#: ../statistics.c:150
-++#, fuzzy, c-format
-++msgid "%u packets pruned from receive queue because of socket buffer overrun"
-+ msgstr "po�et paket� odstran�n�ch z fronty kv�li p�ete�en� bufferu soketu: %d"
-+ 
-+ #. obsolete: 2.2.0 doesn't do that anymore
-+-#: ../statistics.c:151
-+-#, c-format
-+-msgid "%d packets pruned from out-of-order queue"
-++#: ../statistics.c:153
-++#, fuzzy, c-format
-++msgid "%u packets pruned from receive queue"
-+ msgstr "po�et paket� odstran�n�ch z fronty mimo-po�ad�: %d"
-+ 
-+-#: ../statistics.c:152
-+-#, c-format
-++#: ../statistics.c:154
-++#, fuzzy, c-format
-+ msgid ""
-+-"%d packets dropped from out-of-order queue because of socket buffer overrun"
-++"%u packets dropped from out-of-order queue because of socket buffer overrun"
-+ msgstr ""
-+ "po�et paket� zahozen�ch z fronty mimo-po�ad� kv�li p�ete�en� bufferu soketu: "
-+ "%d"
-+ 
-+-#: ../statistics.c:154
-+-#, c-format
-+-msgid "%d ICMP packets dropped because they were out-of-window"
-++#: ../statistics.c:156
-++#, fuzzy, c-format
-++msgid "%u ICMP packets dropped because they were out-of-window"
-+ msgstr "po�et ICMP paket� zahozen�ch, proto�e byly mimo-okno: %d"
-+ 
-+-#: ../statistics.c:156
-+-#, c-format
-+-msgid "%d ICMP packets dropped because socket was locked"
-++#: ../statistics.c:158
-++#, fuzzy, c-format
-++msgid "%u ICMP packets dropped because socket was locked"
-+ msgstr "po�et ICMP paket� zahozen�ch kv�li zam�en�mu soketu: %d"
-+ 
-++#: ../statistics.c:160
-++#, c-format
-++msgid "%u TCP sockets finished time wait in fast timer"
-++msgstr ""
-++
-++#: ../statistics.c:161
-++#, c-format
-++msgid "%u time wait sockets recycled by time stamp"
-++msgstr ""
-++
-++#: ../statistics.c:162
-++#, c-format
-++msgid "%u TCP sockets finished time wait in slow timer"
-++msgstr ""
-++
-++#: ../statistics.c:163
-++#, c-format
-++msgid "%u passive connections rejected because of time stamp"
-++msgstr ""
-++
-++#: ../statistics.c:165
-++#, c-format
-++msgid "%u active connections rejected because of time stamp"
-++msgstr ""
-++
-++#: ../statistics.c:167
-++#, c-format
-++msgid "%u packets rejects in established connections because of timestamp"
-++msgstr ""
-++
-++#: ../statistics.c:169
-++#, fuzzy, c-format
-++msgid "%u delayed acks sent"
-++msgstr "po�et odeslan�ch paket�: %d"
-++
-++#: ../statistics.c:170
-++#, c-format
-++msgid "%u delayed acks further delayed because of locked socket"
-++msgstr ""
-++
-++#: ../statistics.c:172
-++#, c-format
-++msgid "Quick ack mode was activated %u times"
-++msgstr ""
-++
-++#: ../statistics.c:173
-++#, c-format
-++msgid "%u times the listen queue of a socket overflowed"
-++msgstr ""
-++
-++#: ../statistics.c:175
-++#, c-format
-++msgid "%u SYNs to LISTEN sockets ignored"
-++msgstr ""
-++
-++#: ../statistics.c:176
-++#, c-format
-++msgid "%u packets directly queued to recvmsg prequeue."
-++msgstr ""
-++
-++#: ../statistics.c:178
-++#, c-format
-++msgid "%u of bytes directly received from backlog"
-++msgstr ""
-++
-++#: ../statistics.c:180
-++#, c-format
-++msgid "%u of bytes directly received from prequeue"
-++msgstr ""
-++
-++#: ../statistics.c:182
-++#, fuzzy, c-format
-++msgid "%u packets dropped from prequeue"
-++msgstr "po�et paket� odstran�n�ch z fronty mimo-po�ad�: %d"
-++
-++#: ../statistics.c:183
-++#, fuzzy, c-format
-++msgid "%u packet headers predicted"
-++msgstr "po�et p�ijmut�ch paket�: %d"
-++
-++#: ../statistics.c:184
-++#, c-format
-++msgid "%u packets header predicted and directly queued to user"
-++msgstr ""
-++
-++#: ../statistics.c:186
-++#, c-format
-++msgid "Ran %u times out of system memory during packet sending"
-++msgstr ""
-++
-++#: ../statistics.c:188
-++#, fuzzy, c-format
-++msgid "%u acknowledgments not containing data received"
-++msgstr "po�et paket� p�ijmut�ch pro nezn�m� port: %d."
-++
-++#: ../statistics.c:189
-++#, c-format
-++msgid "%u predicted acknowledgments"
-++msgstr ""
-++
-++#: ../statistics.c:190
-++#, c-format
-++msgid "%u times recovered from packet loss due to fast retransmit"
-++msgstr ""
-++
-++#: ../statistics.c:191
-++#, c-format
-++msgid "%u times recovered from packet loss due to SACK data"
-++msgstr ""
-++
-++#: ../statistics.c:192
-++#, fuzzy, c-format
-++msgid "%u bad SACKs received"
-++msgstr "po�et chybn�ch p��choz�ch segment�: %d."
-++
-++#: ../statistics.c:193
-++#, c-format
-++msgid "Detected reordering %u times using FACK"
-++msgstr ""
-++
-++#: ../statistics.c:194
-++#, c-format
-++msgid "Detected reordering %u times using SACK"
-++msgstr ""
-++
-++#: ../statistics.c:195
-++#, c-format
-++msgid "Detected reordering %u times using time stamp"
-++msgstr ""
-++
-++#: ../statistics.c:196
-++#, c-format
-++msgid "Detected reordering %u times using reno fast retransmit"
-++msgstr ""
-++
-++#: ../statistics.c:197
-++#, c-format
-++msgid "%u congestion windows fully recovered"
-++msgstr ""
-++
-++#: ../statistics.c:198
-++#, c-format
-++msgid "%u congestion windows partially recovered using Hoe heuristic"
-++msgstr ""
-++
-++#: ../statistics.c:199
-++#, c-format
-++msgid "%u congestion window recovered using DSACK"
-++msgstr ""
-++
-++#: ../statistics.c:200
-++#, c-format
-++msgid "%u congestion windows recovered after partial ack"
-++msgstr ""
-++
-++#: ../statistics.c:201
-++#, fuzzy, c-format
-++msgid "%u retransmits lost"
-++msgstr "po�et odeslan�ch reset�: %d"
-++
-++#: ../statistics.c:202
-++#, c-format
-++msgid "%u timeouts after reno fast retransmit"
-++msgstr ""
-++
-++#: ../statistics.c:203
-++#, c-format
-++msgid "%u timeouts after SACK recovery"
-++msgstr ""
-++
-++#: ../statistics.c:204
-++#, c-format
-++msgid "%u timeouts in loss state"
-++msgstr ""
-++
-++#: ../statistics.c:205
-++#, fuzzy, c-format
-++msgid "%u fast retransmits"
-++msgstr "po�et p�enesen�ch segment�: %d"
-++
-++#: ../statistics.c:206
-++#, c-format
-++msgid "%u forward retransmits"
-++msgstr ""
-++
-++#: ../statistics.c:207
-++#, c-format
-++msgid "%u retransmits in slow start"
-++msgstr ""
-++
-++#: ../statistics.c:208
-++#, c-format
-++msgid "%u other TCP timeouts"
-++msgstr ""
-++
-++#: ../statistics.c:209
-++#, fuzzy, c-format
-++msgid "%u reno fast retransmits failed"
-++msgstr "po�et p�enesen�ch segment�: %d"
-++
-++#: ../statistics.c:210
-++#, fuzzy, c-format
-++msgid "%u sack retransmits failed"
-++msgstr "po�et paket�, je� se nepoda�ilo znovu sestavit: %d"
-++
-++#: ../statistics.c:211
-++#, c-format
-++msgid "%u times receiver scheduled too late for direct processing"
-++msgstr ""
-++
-++#: ../statistics.c:212
-++#, fuzzy, c-format
-++msgid "%u packets collapsed in receive queue due to low socket buffer"
-++msgstr "po�et paket� odstran�n�ch z fronty kv�li p�ete�en� bufferu soketu: %d"
-++
-++#: ../statistics.c:213
-++#, c-format
-++msgid "%u DSACKs sent for old packets"
-++msgstr ""
-++
-++#: ../statistics.c:214
-++#, c-format
-++msgid "%u DSACKs sent for out of order packets"
-++msgstr ""
-++
-++#: ../statistics.c:215
-++#, fuzzy, c-format
-++msgid "%u DSACKs received"
-++msgstr "po�et p�ijmut�ch paket�: %d"
-++
-++#: ../statistics.c:216
-++#, fuzzy, c-format
-++msgid "%u DSACKs for out of order packets received"
-++msgstr "celkem p�ijmut�ch paket�: %d"
-++
-++#: ../statistics.c:217
-++#, fuzzy, c-format
-++msgid "%u connections reset due to unexpected SYN"
-++msgstr "po�et p�ijmut�ch reset�: %d"
-++
-++#: ../statistics.c:218
-++#, fuzzy, c-format
-++msgid "%u connections reset due to unexpected data"
-++msgstr "po�et p�ijmut�ch reset�: %d"
-++
-++#: ../statistics.c:219
-++#, fuzzy, c-format
-++msgid "%u connections reset due to early user close"
-++msgstr "po�et p�ijmut�ch reset�: %d"
-++
-++#: ../statistics.c:220
-++#, c-format
-++msgid "%u connections aborted due to memory pressure"
-++msgstr ""
-++
-++#: ../statistics.c:221
-++#, fuzzy, c-format
-++msgid "%u connections aborted due to timeout"
-++msgstr "po�et p�ijmut�ch reset�: %d"
-++
-+ #: ../statistics.c:222
-++#, c-format
-++msgid "%u connections aborted after user close in linger timeout"
-++msgstr ""
-++
-++#: ../statistics.c:223
-++#, c-format
-++msgid "%u times unabled to send RST due to no memory"
-++msgstr ""
-++
-++#: ../statistics.c:224
-++#, c-format
-++msgid "TCP ran low on memory %u times"
-++msgstr ""
-++
-++#: ../statistics.c:225
-++#, c-format
-++msgid "%u TCP data loss events"
-++msgstr ""
-++
-++#: ../statistics.c:292
-+ msgid "enabled"
-+ msgstr "zapnuto"
-+ 
-+-#: ../statistics.c:222
-++#: ../statistics.c:292
-+ msgid "disabled"
-+ msgstr "vypnuto"
-+ 
-+-#: ../statistics.c:272
-+-#, c-format
-+-msgid "unknown title %s\n"
-+-msgstr "titulek %s je nezn�m�\n"
-+-
-+-#: ../statistics.c:298
-++#: ../statistics.c:375
-+ msgid "error parsing /proc/net/snmp"
-+ msgstr "chyba p�i zpracov�n� /proc/net/snmp"
-+ 
-+-#: ../statistics.c:311
-++#: ../statistics.c:388
-+ msgid "cannot open /proc/net/snmp"
-+ msgstr "/proc/net/snmp nelze otev��t"
-+ 
-+@@ -1821,89 +2112,95 @@ msgstr "Hardwarov� typ `%s' nen� podporo
-+ msgid "Cannot change line discipline to `%s'.\n"
-+ msgstr "Linkovou discipl�nu nelze na `%s' zm�nit.\n"
-+ 
-+-#: ../lib/af.c:145 ../lib/hw.c:148
-++#: ../lib/af.c:153 ../lib/hw.c:161
-+ msgid "UNSPEC"
-+ msgstr "NEZN�M"
-+ 
-+-#: ../lib/af.c:147
-++#: ../lib/af.c:155
-+ msgid "UNIX Domain"
-+ msgstr "Dom�na UNIX"
-+ 
-+-#: ../lib/af.c:150
-++#: ../lib/af.c:158
-+ msgid "DARPA Internet"
-+ msgstr "DARPA Internet"
-+ 
-+-#: ../lib/af.c:153
-++#: ../lib/af.c:161
-+ msgid "IPv6"
-+ msgstr "IPv6"
-+ 
-+-#: ../lib/af.c:156 ../lib/hw.c:169
-++#: ../lib/af.c:164 ../lib/hw.c:182
-+ msgid "AMPR AX.25"
-+ msgstr "AMPR AX.25"
-+ 
-+-#: ../lib/af.c:159 ../lib/hw.c:175
-++#: ../lib/af.c:167 ../lib/hw.c:188
-+ msgid "AMPR NET/ROM"
-+ msgstr "AMPR NET/ROM"
-+ 
-+-#: ../lib/af.c:162
-++#: ../lib/af.c:170
-+ msgid "Novell IPX"
-+ msgstr "Novell IPX"
-+ 
-+-#: ../lib/af.c:165
-++#: ../lib/af.c:173
-+ msgid "Appletalk DDP"
-+ msgstr "Appletalk DDP"
-+ 
-+-#: ../lib/af.c:168 ../lib/hw.c:207
-++#: ../lib/af.c:176 ../lib/hw.c:223
-+ msgid "Econet"
-+ msgstr "Econet"
-+ 
-+-#: ../lib/af.c:171 ../lib/hw.c:172
-++#: ../lib/af.c:179
-++msgid "CCITT X.25"
-++msgstr ""
-++
-++#: ../lib/af.c:182 ../lib/hw.c:185
-+ msgid "AMPR ROSE"
-+ msgstr "AMPR ROSE"
-+ 
-+-#: ../lib/af.c:174 ../lib/hw.c:160
-++#: ../lib/af.c:185 ../lib/hw.c:173
-+ msgid "Ash"
-+ msgstr "Ash"
-+ 
-+-#: ../lib/af.c:232
-++#: ../lib/af.c:243
-++#, c-format
-+ msgid "Please don't supply more than one address family.\n"
-+ msgstr "Nezad�vejte v�ce ne� jednu t��du adres.\n"
-+ 
-+-#: ../lib/af.c:293
-++#: ../lib/af.c:304
-++#, c-format
-+ msgid "Too much address family arguments.\n"
-+ msgstr "Bylo zad�no p��li� mnoho t��d adres.\n"
-+ 
-+-#: ../lib/af.c:304
-++#: ../lib/af.c:315
-+ #, c-format
-+ msgid "Unknown address family `%s'.\n"
-+ msgstr "T��da adres `%s' nen� zn�ma.\n"
-+ 
-+-#: ../lib/arcnet.c:53 ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52
-+-#: ../lib/fddi.c:67 ../lib/hippi.c:68 ../lib/inet.c:244 ../lib/inet.c:259
-+-#: ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 ../lib/rose.c:71
-+-#: ../lib/rose.c:126 ../lib/unix.c:56 ../lib/unix.c:76
-+-msgid "[NONE SET]"
-+-msgstr "[NENASTAVENO]"
-+-
-+-#: ../lib/arcnet.c:81 ../lib/arcnet.c:96
-++#: ../lib/arcnet.c:70 ../lib/arcnet.c:85
-+ #, c-format
-+ msgid "in_arcnet(%s): invalid arcnet address!\n"
-+ msgstr "in_arcnet(%s): chybn� arcnet adresa!\n"
-+ 
-+-#: ../lib/arcnet.c:108
-++#: ../lib/arcnet.c:97
-+ #, c-format
-+ msgid "in_arcnet(%s): trailing : ignored!\n"
-+ msgstr "in_arcnet(%s): nadbyte�n� : ignorov�no!\n"
-+ 
-+-#: ../lib/arcnet.c:120
-++#: ../lib/arcnet.c:109
-+ #, c-format
-+ msgid "in_arcnet(%s): trailing junk!\n"
-+ msgstr "in_arcnet(%s): nadbyte�n� znaky!\n"
-+ 
-+ #: ../lib/ash.c:81
-++#, c-format
-+ msgid "Malformed Ash address"
-+ msgstr "Chybn� Ash adresa"
-+ 
-++#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244
-++#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78
-++#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76
-++msgid "[NONE SET]"
-++msgstr "[NENASTAVENO]"
-++
-+ #: ../lib/ax25.c:97 ../lib/netrom.c:100
-+ msgid "Invalid callsign"
-+ msgstr "Nespr�vn� volac� znak"
-+@@ -1913,22 +2210,21 @@ msgid "Callsign too long"
-+ msgstr "Volac� znak je p��li� dlouh�."
-+ 
-+ #: ../lib/ax25_gr.c:47
-++#, c-format
-+ msgid "AX.25 not configured in this system.\n"
-+ msgstr "AX.25 nen� na tomto syst�mu nakonfigurov�no.\n"
-+ 
-+ #: ../lib/ax25_gr.c:50
-++#, c-format
-+ msgid "Kernel AX.25 routing table\n"
-+ msgstr "Sm�rovac� tabulka v j�dru pro AX.25\n"
-+ 
-+ #. xxx
-+ #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55
-++#, c-format
-+ msgid "Destination  Iface    Use\n"
-+ msgstr "Adres�t      Rozhran� U�it�\n"
-+ 
-+-#: ../lib/ddp_gr.c:21
-+-msgid "Routing table for `ddp' not yet supported.\n"
-+-msgstr "Sm�rovac� tabulka pro `ddp' nen� zat�m podporov�na.\n"
-+-
-+ #: ../lib/ether.c:74 ../lib/ether.c:91
-+ #, c-format
-+ msgid "in_ether(%s): invalid ether address!\n"
-+@@ -1944,153 +2240,171 @@ msgstr "in_ether(%s): nadbyte�n� : ignor
-+ msgid "in_ether(%s): trailing junk!\n"
-+ msgstr "in_ether(%s): nadbyte�n� znaky!\n"
-+ 
-+-#: ../lib/fddi.c:95 ../lib/fddi.c:110
-++#: ../lib/fddi.c:84 ../lib/fddi.c:99
-+ #, c-format
-+ msgid "in_fddi(%s): invalid fddi address!\n"
-+ msgstr "in_fddi(%s): chybn� fddi adresa!\n"
-+ 
-+-#: ../lib/fddi.c:122
-++#: ../lib/fddi.c:111
-+ #, c-format
-+ msgid "in_fddi(%s): trailing : ignored!\n"
-+ msgstr "in_fddi(%s): nadbyte�n� : ignorov�no!\n"
-+ 
-+-#: ../lib/fddi.c:134
-++#: ../lib/fddi.c:123
-+ #, c-format
-+ msgid "in_fddi(%s): trailing junk!\n"
-+ msgstr "in_fddi(%s): nadbyte�n� znaky!\n"
-+ 
-+-#: ../lib/getroute.c:97 ../lib/setroute.c:76
-++#: ../lib/getroute.c:101 ../lib/setroute.c:80
-+ #, c-format
-+ msgid "Address family `%s' not supported.\n"
-+ msgstr "T��da adres `%s' nen� podporov�na.\n"
-+ 
-+-#: ../lib/getroute.c:103 ../lib/setroute.c:80
-++#: ../lib/getroute.c:107 ../lib/setroute.c:84
-+ #, c-format
-+ msgid "No routing for address family `%s'.\n"
-+ msgstr "Pro t��du adres `%s' nen� ��dn� sm�rov�n�.\n"
-+ 
-+-#: ../lib/hippi.c:96 ../lib/hippi.c:111
-++#: ../lib/hippi.c:84 ../lib/hippi.c:99
-+ #, c-format
-+ msgid "in_hippi(%s): invalid hippi address!\n"
-+ msgstr "in_hippi(%s): chybn� hippi adresa!\n"
-+ 
-+-#: ../lib/hippi.c:123
-++#: ../lib/hippi.c:111
-+ #, c-format
-+ msgid "in_hippi(%s): trailing : ignored!\n"
-+ msgstr "in_hippi(%s): nadbyte�n� : ignorov�no!\n"
-+ 
-+-#: ../lib/hippi.c:134
-++#: ../lib/hippi.c:122
-+ #, c-format
-+ msgid "in_hippi(%s): trailing junk!\n"
-+ msgstr "in_hippi(%s): nadbyte�n� znaky!\n"
-+ 
-+-#: ../lib/hw.c:147
-++#: ../lib/hw.c:160
-+ msgid "Local Loopback"
-+ msgstr "M�stn� smy�ka"
-+ 
-+-#: ../lib/hw.c:150
-++#: ../lib/hw.c:163
-+ msgid "Serial Line IP"
-+ msgstr "IP po s�riov� lince"
-+ 
-+-#: ../lib/hw.c:151
-++#: ../lib/hw.c:164
-+ msgid "VJ Serial Line IP"
-+ msgstr "Vj IP po s�riov� lince"
-+ 
-+-#: ../lib/hw.c:152
-++#: ../lib/hw.c:165
-+ msgid "6-bit Serial Line IP"
-+ msgstr "6bitov� IP po s�riov� lince"
-+ 
-+-#: ../lib/hw.c:153
-++#: ../lib/hw.c:166
-+ msgid "VJ 6-bit Serial Line IP"
-+ msgstr "6bitov� VJ IP po s�riov� lince"
-+ 
-+-#: ../lib/hw.c:154
-++#: ../lib/hw.c:167
-+ msgid "Adaptive Serial Line IP"
-+ msgstr "Adaptivn� IP po s�riov� lince"
-+ 
-+-#: ../lib/hw.c:157
-++#: ../lib/hw.c:170
-+ msgid "Ethernet"
-+ msgstr "Ethernet"
-+ 
-+-#: ../lib/hw.c:163
-++#: ../lib/hw.c:176
-+ msgid "Fiber Distributed Data Interface"
-+ msgstr "Fiber Distributed Data Interface"
-+ 
-+-#: ../lib/hw.c:166
-++#: ../lib/hw.c:179
-+ msgid "HIPPI"
-+ msgstr "HIPPI"
-+ 
-+-#: ../lib/hw.c:178
-++#: ../lib/hw.c:191
-++msgid "generic X.25"
-++msgstr ""
-++
-++#: ../lib/hw.c:194
-+ msgid "IPIP Tunnel"
-+ msgstr "IPIP Tunnel"
-+ 
-+-#: ../lib/hw.c:181
-++#: ../lib/hw.c:197
-+ msgid "Point-to-Point Protocol"
-+ msgstr "Point-to-Point Protokol"
-+ 
-+-#: ../lib/hw.c:184
-++#: ../lib/hw.c:200
-+ msgid "(Cisco)-HDLC"
-+ msgstr "(Cisco)-HDLC"
-+ 
-+-#: ../lib/hw.c:185
-++#: ../lib/hw.c:201
-+ msgid "LAPB"
-+ msgstr "LAPB"
-+ 
-+-#: ../lib/hw.c:188
-++#: ../lib/hw.c:204
-+ msgid "ARCnet"
-+ msgstr "ARCnet"
-+ 
-+-#: ../lib/hw.c:191
-++#: ../lib/hw.c:207
-+ msgid "Frame Relay DLCI"
-+ msgstr "Frame Relay DLCI"
-+ 
-+-#: ../lib/hw.c:192
-++#: ../lib/hw.c:208
-+ msgid "Frame Relay Access Device"
-+ msgstr "P��stupov� za��zen� Frame Relay"
-+ 
-+-#: ../lib/hw.c:195
-++#: ../lib/hw.c:211
-+ msgid "IPv6-in-IPv4"
-+ msgstr "IPv6-in-IPv4"
-+ 
-+-#: ../lib/hw.c:198
-++#: ../lib/hw.c:214
-+ msgid "IrLAP"
-+ msgstr "IrLAP"
-+ 
-+-#: ../lib/hw.c:201
-++#: ../lib/hw.c:217
-+ msgid "16/4 Mbps Token Ring"
-+ msgstr "Token Ring 16/4 Mb/s"
-+ 
-+-#: ../lib/hw.c:203
-++#: ../lib/hw.c:219
-+ #, fuzzy
-+ msgid "16/4 Mbps Token Ring (New)"
-+ msgstr "Token Ring 16/4 Mb/s"
-+ 
-++#: ../lib/hw.c:226
-++msgid "Generic EUI-64"
-++msgstr ""
-++
-+ #: ../lib/inet.c:153 ../lib/inet6.c:79
-+ #, c-format
-+ msgid "rresolve: unsupport address family %d !\n"
-+ msgstr "rresolve: t��da adres %d nen� podporov�na!\n"
-+ 
-+-#: ../lib/inet6_gr.c:79
-++#: ../lib/inet6.c:131
-++#, fuzzy
-++msgid "[UNKNOWN]"
-++msgstr "NEZN�M"
-++
-++#: ../lib/inet6_gr.c:71
-++#, c-format
-+ msgid "INET6 (IPv6) not configured in this system.\n"
-+ msgstr "INET6 (IPv6) nen� na tomto syst�mu nakonfigurov�no.\n"
-+ 
-+-#: ../lib/inet6_gr.c:82
-++#: ../lib/inet6_gr.c:74
-++#, c-format
-+ msgid "Kernel IPv6 routing table\n"
-+ msgstr "Sm�rovac� tabulka v j�dru pro IPv6\n"
-+ 
-+-#: ../lib/inet6_gr.c:84
-++#: ../lib/inet6_gr.c:76
-++#, c-format
-+ msgid ""
-+-"Destination                                 Next Hop                         "
-+-"       Flags Metric Ref    Use Iface\n"
-++"Destination                                 Next "
-++"Hop                                Flags Metric Ref    Use Iface\n"
-+ msgstr ""
-+-"Adres�t                                     Dal�� Sm�rova�                   "
-+-"       P��zn Metrika Odkaz U�it Rozhran�\n"
-++"Adres�t                                     Dal�� "
-++"Sm�rova�                          P��zn Metrika Odkaz U�it Rozhran�\n"
-+ 
-+-#: ../lib/inet6_gr.c:158
-++#: ../lib/inet6_gr.c:150
-++#, c-format
-+ msgid "Kernel IPv6 Neighbour Cache\n"
-+ msgstr "Cache soused� v j�dru pro IPv6\n"
-+ 
-+-#: ../lib/inet6_gr.c:161
-++#: ../lib/inet6_gr.c:153
-++#, c-format
-+ msgid ""
-+ "Neighbour                                   HW Address        Iface    Flags "
-+ "Ref State\n"
-+@@ -2098,7 +2412,8 @@ msgstr ""
-+ "Soused                                      HW Adresa         Rozhran� P��zn "
-+ "Odkazy Stav\n"
-+ 
-+-#: ../lib/inet6_gr.c:165
-++#: ../lib/inet6_gr.c:157
-++#, c-format
-+ msgid ""
-+ "Neighbour                                   HW Address        Iface    Flags "
-+ "Ref State            Stale(sec) Delete(sec)\n"
-+@@ -2107,30 +2422,37 @@ msgstr ""
-+ "P��znaky Odkazy Stav          Pro�l�(sec) Smazat(sec)\n"
-+ 
-+ #: ../lib/inet6_sr.c:46
-++#, c-format
-+ msgid "Usage: inet6_route [-vF] del Target\n"
-+ msgstr "Pou�it�: inet6_route [-vF] del C�l\n"
-+ 
-+ #: ../lib/inet6_sr.c:47
-++#, c-format
-+ msgid "       inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n"
-+ msgstr "       inet6_route [-vF] add C�l [gw Gw] [metrika M] [[dev] If]\n"
-+ 
-+ #: ../lib/inet6_sr.c:48
-++#, c-format
-+ msgid "       inet6_route [-FC] flush      NOT supported\n"
-+ msgstr "       inet6_route [-FC] flush      NEN� podporov�no\n"
-+ 
-+-#: ../lib/inet6_sr.c:182
-++#: ../lib/inet6_sr.c:188
-++#, c-format
-+ msgid "Flushing `inet6' routing table not supported\n"
-+ msgstr "Sm�rovac� tabulku `inet6' nelze vyprazd�ovat\n"
-+ 
-+ #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220
-++#, c-format
-+ msgid "INET (IPv4) not configured in this system.\n"
-+ msgstr "INET (IPv4) nen� na tomto syst�mu nakonfigurov�no.\n"
-+ 
-+ #: ../lib/inet_gr.c:53
-++#, c-format
-+ msgid "Kernel IP routing table\n"
-+ msgstr "Sm�rovac� tabulka v j�dru pro IP\n"
-+ 
-+ #: ../lib/inet_gr.c:56
-++#, c-format
-+ msgid ""
-+ "Destination     Gateway         Genmask         Flags Metric Ref    Use "
-+ "Iface\n"
-+@@ -2139,6 +2461,7 @@ msgstr ""
-+ "Rozhran�\n"
-+ 
-+ #: ../lib/inet_gr.c:59
-++#, c-format
-+ msgid ""
-+ "Destination     Gateway         Genmask         Flags   MSS Window  irtt "
-+ "Iface\n"
-+@@ -2147,6 +2470,7 @@ msgstr ""
-+ "Rozhran�\n"
-+ 
-+ #: ../lib/inet_gr.c:62
-++#, c-format
-+ msgid ""
-+ "Destination     Gateway         Genmask         Flags Metric Ref    Use "
-+ "Iface    MSS   Window irtt\n"
-+@@ -2155,10 +2479,12 @@ msgstr ""
-+ "Rozhran� MSS   Okno   irtt\n"
-+ 
-+ #: ../lib/inet_gr.c:237
-++#, c-format
-+ msgid "Kernel IP routing cache\n"
-+ msgstr "Sm�rovac� cache v j�dru pro IP\n"
-+ 
-+ #: ../lib/inet_gr.c:258
-++#, c-format
-+ msgid ""
-+ "Source          Destination     Gateway         Flags Metric Ref    Use "
-+ "Iface\n"
-+@@ -2167,6 +2493,7 @@ msgstr ""
-+ "Rozhran�\n"
-+ 
-+ #: ../lib/inet_gr.c:261
-++#, c-format
-+ msgid ""
-+ "Source          Destination     Gateway         Flags   MSS Window  irtt "
-+ "Iface\n"
-+@@ -2175,6 +2502,7 @@ msgstr ""
-+ "Rozhran�\n"
-+ 
-+ #: ../lib/inet_gr.c:266
-++#, c-format
-+ msgid ""
-+ "Source          Destination     Gateway         Flags Metric Ref    Use "
-+ "Iface    MSS   Window irtt  HH  Arp\n"
-+@@ -2183,6 +2511,7 @@ msgstr ""
-+ "Rozhran� MSS   Okno   irtt HH   Arp\n"
-+ 
-+ #: ../lib/inet_gr.c:290
-++#, c-format
-+ msgid ""
-+ "Source          Destination     Gateway         Flags Metric Ref    Use "
-+ "Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
-+@@ -2190,7 +2519,8 @@ msgstr ""
-+ "Odes�latel      Adres�t         Maska           P��zn Metrik Odkazy U�t "
-+ "Rozhran� MSS    Okno irtt   TOS HHOdk HHAktu�l    Zvl�tC�l\n"
-+ 
-+-#: ../lib/inet_sr.c:50
-++#: ../lib/inet_sr.c:51
-++#, c-format
-+ msgid ""
-+ "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] "
-+ "[[dev] If]\n"
-+@@ -2198,29 +2528,34 @@ msgstr ""
-+ "Pou�it�: inet_route [-vF] del {-host|-net} C�l[/prefix] [gw Gw] [metrika M] "
-+ "[[dev] If]\n"
-+ 
-+-#: ../lib/inet_sr.c:51
-++#: ../lib/inet_sr.c:52
-++#, c-format
-+ msgid ""
-+ "       inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n"
-+ msgstr ""
-+ "       inet_route [-vF] add {-host|-net} C�l[/prefix] [gw Gw] [metrika M]\n"
-+ 
-+-#: ../lib/inet_sr.c:52
-++#: ../lib/inet_sr.c:53
-++#, c-format
-+ msgid ""
-+ "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
-+ msgstr ""
-+ "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
-+ 
-+-#: ../lib/inet_sr.c:53
-++#: ../lib/inet_sr.c:54
-++#, c-format
-+ msgid "                              [mod] [dyn] [reinstate] [[dev] If]\n"
-+ msgstr "                              [mod] [dyn] [reinstate] [[dev] If]\n"
-+ 
-+-#: ../lib/inet_sr.c:54
-++#: ../lib/inet_sr.c:55
-++#, c-format
-+ msgid ""
-+ "       inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n"
-+ msgstr ""
-+ "       inet_route [-vF] add {-host|-net} C�l/[prefix] [metrika M] reject\n"
-+ 
-+-#: ../lib/inet_sr.c:55
-++#: ../lib/inet_sr.c:56
-++#, c-format
-+ msgid "       inet_route [-FC] flush      NOT supported\n"
-+ msgstr "       inet_route [-FC] flush      NEN� podporov�no\n"
-+ 
-+@@ -2230,15 +2565,17 @@ msgid "route: %s: cannot use a NETWORK a
-+ msgstr "route: %s: s�� nelze pou��t jako br�nu!\n"
-+ 
-+ #: ../lib/inet_sr.c:174
-+-#, fuzzy
-++#, fuzzy, c-format
-+ msgid "route: Invalid MSS/MTU.\n"
-+ msgstr "route: Nespr�vn� NSS.\n"
-+ 
-+ #: ../lib/inet_sr.c:187
-++#, c-format
-+ msgid "route: Invalid window.\n"
-+ msgstr "route: Nespr�vn� okno.\n"
-+ 
-+ #: ../lib/inet_sr.c:203
-++#, c-format
-+ msgid "route: Invalid initial rtt.\n"
-+ msgstr "route: Nespr�vn� zahajovac� rtt.\n"
-+ 
-+@@ -2253,75 +2590,92 @@ msgid "route: bogus netmask %s\n"
-+ msgstr "route: s��ov� maska %s je nespr�vn�\n"
-+ 
-+ #: ../lib/inet_sr.c:270
-++#, c-format
-+ msgid "route: netmask doesn't match route address\n"
-+ msgstr "route: s��ov� maska nevyhovuje adrese cesty\n"
-+ 
-+ #: ../lib/inet_sr.c:306
-++#, c-format
-+ msgid "Flushing `inet' routing table not supported\n"
-+ msgstr "Sm�rovac� cache `inet' nelze vyprazd�ovat\n"
-+ 
-+ #: ../lib/inet_sr.c:310
-++#, c-format
-+ msgid "Modifying `inet' routing cache not supported\n"
-+ msgstr "Sm�rovac� cache `inet' nelze m�nit\n"
-+ 
-+ #: ../lib/ipx_gr.c:52
-++#, c-format
-+ msgid "IPX not configured in this system.\n"
-+ msgstr "IPX nen� na tomto syst�mu nakonfigurov�no.\n"
-+ 
-+ #: ../lib/ipx_gr.c:56
-++#, c-format
-+ msgid "Kernel IPX routing table\n"
-+ msgstr "Sm�rovac� tabulka v j�dru pro IPX\n"
-+ 
-+ #. xxx
-+ #: ../lib/ipx_gr.c:57
-++#, c-format
-+ msgid "Destination               Router Net                Router Node\n"
-+ msgstr "C�l                       Sm�rova� S��              Sm�rova� Uzel\n"
-+ 
-+ #: ../lib/ipx_sr.c:33
-++#, c-format
-+ msgid "IPX: this needs to be written\n"
-+ msgstr "IPX: toto je t�eba ulo�it\n"
-+ 
-+-#: ../lib/masq_info.c:197
-++#: ../lib/masq_info.c:198
-++#, c-format
-+ msgid "IP masquerading entries\n"
-+ msgstr "IP maskovac� polo�ky\n"
-+ 
-+-#: ../lib/masq_info.c:200
-++#: ../lib/masq_info.c:201
-++#, c-format
-+ msgid "prot   expire source               destination          ports\n"
-+ msgstr "prot   �ivot  zdroj                c�l                  porty\n"
-+ 
-+-#: ../lib/masq_info.c:203
-++#: ../lib/masq_info.c:204
-++#, c-format
-+ msgid ""
-+-"prot   expire    initseq delta prevd source               destination        "
-+-"  ports\n"
-++"prot   expire    initseq delta prevd source               "
-++"destination          ports\n"
-+ msgstr ""
-+-"prot   �ivot     zahajsek delta p�edchd zdroj             c�l                "
-+-"   porty\n"
-++"prot   �ivot     zahajsek delta p�edchd zdroj             "
-++"c�l                   porty\n"
-+ 
-+ #: ../lib/netrom_gr.c:48
-++#, c-format
-+ msgid "NET/ROM not configured in this system.\n"
-+ msgstr "NET/ROM nen� na tomto syst�mu nakonfigurov�no.\n"
-+ 
-+ #: ../lib/netrom_gr.c:51
-++#, c-format
-+ msgid "Kernel NET/ROM routing table\n"
-+ msgstr "Sm�rovac� tabulka v j�dru pro NET/ROM\n"
-+ 
-+ #: ../lib/netrom_gr.c:52
-++#, c-format
-+ msgid "Destination  Mnemonic  Quality  Neighbour  Iface\n"
-+ msgstr "C�l          Mnemonika Kvalita  Soused     Rozhran�\n"
-+ 
-+ #: ../lib/netrom_sr.c:34
-++#, c-format
-+ msgid "netrom usage\n"
-+ msgstr "pou�it� netrom\n"
-+ 
-+ #: ../lib/netrom_sr.c:44
-++#, c-format
-+ msgid "NET/ROM: this needs to be written\n"
-+ msgstr "NET/ROM: toto je pot�eba ulo�it\n"
-+ 
-+ #: ../lib/ppp.c:44
-++#, c-format
-+ msgid "You cannot start PPP with this program.\n"
-+ msgstr "T�mto programem nelze PPP spustit.\n"
-+ 
-+ #: ../lib/ppp_ac.c:38
-++#, c-format
-+ msgid "Sorry, use pppd!\n"
-+ msgstr "Lituji, pou�ijte pppd!\n"
-+ 
-+@@ -2330,49 +2684,319 @@ msgid "Node address must be ten digits"
-+ msgstr "Adresa uzlu mus� m�t 10 ��slic"
-+ 
-+ #: ../lib/rose_gr.c:51
-++#, c-format
-+ msgid "ROSE not configured in this system.\n"
-+ msgstr "ROSE nen� na tomto syst�mu nakonfigurov�no.\n"
-+ 
-+ #: ../lib/rose_gr.c:54
-++#, c-format
-+ msgid "Kernel ROSE routing table\n"
-+ msgstr "Sm�rovac� tabulka v j�dru pro ROSE\n"
-+ 
-+-#: ../lib/tr.c:70 ../lib/tr.c:85
-++#: ../lib/tr.c:86 ../lib/tr.c:101
-+ #, c-format
-+ msgid "in_tr(%s): invalid token ring address!\n"
-+ msgstr "in_tr(%s): nespr�vn� token ring adresa!\n"
-+ 
-+-#: ../lib/tr.c:97
-++#: ../lib/tr.c:113
-+ #, c-format
-+ msgid "in_tr(%s): trailing : ignored!\n"
-+ msgstr "in_tr(%s): nadbyte�n�: ignorov�no!\n"
-+ 
-+-#: ../lib/tr.c:109
-++#: ../lib/tr.c:125
-+ #, c-format
-+ msgid "in_tr(%s): trailing junk!\n"
-+ msgstr "in_tr(%s): nadbyte�n� znaky!\n"
-+ 
-+-#: ../lib/interface.c:124
-++#: ../lib/interface.c:176
-+ #, c-format
-+ msgid "warning: no inet socket available: %s\n"
-+ msgstr "varov�n�: nen� dostupn� ��dn� inet soket: %s\n"
-+ 
-+-#: ../lib/interface.c:270
-++#: ../lib/interface.c:325
-+ #, c-format
-+ msgid "Warning: cannot open %s (%s). Limited output.\n"
-+ msgstr ""
-+ 
-+ #. Give better error message for this case.
-+-#: ../lib/interface.c:504
-++#: ../lib/interface.c:571
-+ msgid "Device not found"
-+ msgstr "Za��zen� nebylo nalezeno"
-+ 
-+-#: ../lib/interface.c:508
-++#: ../lib/interface.c:575
-+ #, c-format
-+ msgid "%s: error fetching interface information: %s\n"
-+ msgstr "%s: chyba p�i z�sk�v�n� informac� o rozhran� %s\n"
-+ 
-+-#: ../lib/sockets.c:59
-++#: ../lib/interface.c:608
-++msgid "     - no statistics available -"
-++msgstr "     - statistick� data nejsou dostupn� -"
-++
-++#: ../lib/interface.c:612
-++#, c-format
-++msgid "[NO FLAGS]"
-++msgstr "[��DN� P��ZNAKY]"
-++
-++#: ../lib/interface.c:688
-++#, c-format
-++msgid "%-9.9s Link encap:%s  "
-++msgstr "%-9.9s Zapouzd�en�:%s  "
-++
-++#: ../lib/interface.c:693
-++#, c-format
-++msgid "HWaddr %s  "
-++msgstr "HWadr %s  "
-++
-++#: ../lib/interface.c:696
-++#, c-format
-++msgid "Media:%s"
-++msgstr "M�dium:%s"
-++
-++#: ../lib/interface.c:698
-++#, c-format
-++msgid "(auto)"
-++msgstr "(auto)"
-++
-++#: ../lib/interface.c:705
-++#, c-format
-++msgid "          %s addr:%s "
-++msgstr "          %s adr:%s "
-++
-++#: ../lib/interface.c:708
-++#, c-format
-++msgid " P-t-P:%s "
-++msgstr " P-t-P:%s "
-++
-++# V ostatn�ch kataloz�ch se p�ekl�d� Broadcast -> v�esm�rov� vys�l�n�.
-++# Tudi� bcast -> V�esm�r :)
-++#: ../lib/interface.c:711
-++#, c-format
-++msgid " Bcast:%s "
-++msgstr " V�esm�r:%s "
-++
-++#: ../lib/interface.c:713
-++#, c-format
-++msgid " Mask:%s\n"
-++msgstr "Maska:%s\n"
-++
-++#: ../lib/interface.c:730
-++#, c-format
-++msgid "          inet6 addr: %s/%d"
-++msgstr "          inet6-adr: %s/%d"
-++
-++#: ../lib/interface.c:732
-++#, c-format
-++msgid " Scope:"
-++msgstr " Rozsah:"
-++
-++#: ../lib/interface.c:735
-++#, c-format
-++msgid "Global"
-++msgstr "Glob�l"
-++
-++#: ../lib/interface.c:738
-++#, c-format
-++msgid "Link"
-++msgstr "Linka"
-++
-++#: ../lib/interface.c:741
-++#, c-format
-++msgid "Site"
-++msgstr "Stanovi�t�"
-++
-++#: ../lib/interface.c:744
-++#, c-format
-++msgid "Compat"
-++msgstr "Kompatibilita"
-++
-++#: ../lib/interface.c:747
-++#, c-format
-++msgid "Host"
-++msgstr "Po��ta�"
-++
-++#: ../lib/interface.c:750
-++#, c-format
-++msgid "Unknown"
-++msgstr "Nezn�m."
-++
-++#: ../lib/interface.c:765
-++#, c-format
-++msgid "          IPX/Ethernet II addr:%s\n"
-++msgstr "          IPX/Ethernet II adr: %s\n"
-++
-++#: ../lib/interface.c:768
-++#, c-format
-++msgid "          IPX/Ethernet SNAP addr:%s\n"
-++msgstr "          IPX/Ethernet SNAP adr:%s\n"
-++
-++#: ../lib/interface.c:771
-++#, c-format
-++msgid "          IPX/Ethernet 802.2 addr:%s\n"
-++msgstr "          IPX/Ethernet 802.2 adr:%s\n"
-++
-++#: ../lib/interface.c:774
-++#, c-format
-++msgid "          IPX/Ethernet 802.3 addr:%s\n"
-++msgstr "          IPX/Ethernet 802.3 adr:%s\n"
-++
-++#: ../lib/interface.c:784
-++#, c-format
-++msgid "          EtherTalk Phase 2 addr:%s\n"
-++msgstr "          EtherTalk Phase 2 adr:%s\n"
-++
-++#: ../lib/interface.c:793
-++#, c-format
-++msgid "          econet addr:%s\n"
-++msgstr "          econet adr:%s\n"
-++
-++# Hic sunt leones ...
-++#: ../lib/interface.c:800
-++#, c-format
-++msgid "[NO FLAGS] "
-++msgstr "[��DN� P��ZNAKY]"
-++
-++#: ../lib/interface.c:802
-++#, c-format
-++msgid "UP "
-++msgstr "AKTIVOV�NO "
-++
-++#: ../lib/interface.c:804
-++#, c-format
-++msgid "BROADCAST "
-++msgstr "V�ESM�ROV�_VYS�L�N� "
-++
-++#: ../lib/interface.c:806
-++#, c-format
-++msgid "DEBUG "
-++msgstr "DEBUG "
-++
-++#: ../lib/interface.c:808
-++#, c-format
-++msgid "LOOPBACK "
-++msgstr "SMY�KA "
-++
-++#: ../lib/interface.c:810
-++#, c-format
-++msgid "POINTOPOINT "
-++msgstr "POINTOPOINT "
-++
-++# ??
-++#: ../lib/interface.c:812
-++#, c-format
-++msgid "NOTRAILERS "
-++msgstr "NOTRAILERS "
-++
-++#: ../lib/interface.c:814
-++#, c-format
-++msgid "RUNNING "
-++msgstr "B̮� "
-++
-++#: ../lib/interface.c:816
-++#, c-format
-++msgid "NOARP "
-++msgstr "NEARP "
-++
-++#: ../lib/interface.c:818
-++#, c-format
-++msgid "PROMISC "
-++msgstr "PROMISK "
-++
-++#: ../lib/interface.c:820
-++#, c-format
-++msgid "ALLMULTI "
-++msgstr "ALLMULTI "
-++
-++#: ../lib/interface.c:822
-++#, c-format
-++msgid "SLAVE "
-++msgstr "SLAVE "
-++
-++#: ../lib/interface.c:824
-++#, c-format
-++msgid "MASTER "
-++msgstr "MASTER "
-++
-++#: ../lib/interface.c:826
-++#, c-format
-++msgid "MULTICAST "
-++msgstr "MULTICAST "
-++
-++#: ../lib/interface.c:829
-++#, c-format
-++msgid "DYNAMIC "
-++msgstr "DYNAMIC "
-++
-++#. DONT FORGET TO ADD THE FLAGS IN ife_print_short
-++#: ../lib/interface.c:832
-++#, c-format
-++msgid " MTU:%d  Metric:%d"
-++msgstr " MTU:%d  Metrika:%d"
-++
-++#: ../lib/interface.c:836
-++#, c-format
-++msgid "  Outfill:%d  Keepalive:%d"
-++msgstr "  Outfill:%d  Keepalive:%d"
-++
-++#: ../lib/interface.c:850
-++#, fuzzy, c-format
-++msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
-++msgstr "p�ijmut�ch paket�:%lu chyb:%lu zahozeno:%lu p�ete�en�:%lu r�mc�:%lu\n"
-++
-++#: ../lib/interface.c:855
-++#, c-format
-++msgid "             compressed:%lu\n"
-++msgstr "             komprimov�no:%lu\n"
-++
-++# carrier?
-++#: ../lib/interface.c:895
-++#, fuzzy, c-format
-++msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
-++msgstr "odeslan�ch paket�:%lu chyb:%lu zahozeno:%lu p�ete�en�:%lu p�enos:%lu\n"
-++
-++#: ../lib/interface.c:899
-++#, c-format
-++msgid "          collisions:%lu "
-++msgstr "          koliz�:%lu "
-++
-++#: ../lib/interface.c:901
-++#, c-format
-++msgid "compressed:%lu "
-++msgstr "komprimov�no:%lu "
-++
-++#: ../lib/interface.c:903
-++#, c-format
-++msgid "txqueuelen:%d "
-++msgstr "d�lka odchoz� fronty:%d "
-++
-++#: ../lib/interface.c:905
-++#, c-format
-++msgid "RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"
-++msgstr ""
-++
-++#: ../lib/interface.c:916
-++#, c-format
-++msgid "Interrupt:%d "
-++msgstr "P�eru�en�:%d "
-++
-++#. Only print devices using it for
-++#. I/O maps
-++#: ../lib/interface.c:919
-++#, c-format
-++msgid "Base address:0x%x "
-++msgstr "Vstupn�/V�stupn� port:0x%x "
-++
-++#: ../lib/interface.c:921
-++#, c-format
-++msgid "Memory:%lx-%lx "
-++msgstr "Pam�:%lx-%lx "
-++
-++#: ../lib/interface.c:924
-++#, c-format
-++msgid "DMA chan:%x "
-++msgstr "Kan�l DMA:%x "
-++
-++#: ../lib/sockets.c:63
-++#, c-format
-+ msgid "No usable address families found.\n"
-+ msgstr "Nebyla nalezena ��dn� pou�iteln� t��da adres.\n"
-+ 
-+@@ -2396,29 +3020,32 @@ msgstr "ip: %s nen� platnou IPv4 adresou
-+ msgid "ip: argument is wrong: %s\n"
-+ msgstr "ip: argument %s je nespr�vn�\n"
-+ 
-+-#: ../ipmaddr.c:56
-++#: ../ipmaddr.c:61
-++#, c-format
-+ msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n"
-+ msgstr " Usage: ipmaddr [ add | del ] MULTIADR dev �ET�ZEC\n"
-+ 
-+-#: ../ipmaddr.c:57
-++#: ../ipmaddr.c:62
-++#, c-format
-+ msgid "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
-+ msgstr "       ipmaddr show [ dev �ET�ZEC ] [ ipv4 | ipv6 | link | all ]\n"
-+ 
-+-#: ../ipmaddr.c:58
-++#: ../ipmaddr.c:63
-++#, c-format
-+ msgid "       ipmaddr -V | -version\n"
-+ msgstr "       ipmaddr -V | -version\n"
-+ 
-+-#: ../ipmaddr.c:258
-++#: ../ipmaddr.c:263
-+ #, c-format
-+ msgid "family %d "
-+ msgstr "t��da %d "
-+ 
-+-#: ../ipmaddr.c:267
-++#: ../ipmaddr.c:272
-+ #, c-format
-+ msgid " users %d"
-+ msgstr " u�ivatel� %d"
-+ 
-+-#: ../ipmaddr.c:353
-++#: ../ipmaddr.c:358
-+ msgid "Cannot create socket"
-+ msgstr "Soket nelze vytvo�it"
-+ 
-+@@ -2433,6 +3060,7 @@ msgid "slattach: tty_lock: (%s): %s\n"
-+ msgstr "slattach: tty_lock: (%s): %s\n"
-+ 
-+ #: ../slattach.c:192
-++#, c-format
-+ msgid "slattach: cannot write PID file\n"
-+ msgstr "slattach: do PID souboru nelze zapisovat\n"
-+ 
-+@@ -2451,44 +3079,77 @@ msgstr "slattach: tty_hangup(DROP): %s\n
-+ msgid "slattach: tty_hangup(RAISE): %s\n"
-+ msgstr "slattach: tty_hangup(RAISE): %s\n"
-+ 
-+-#: ../slattach.c:486
-++#: ../slattach.c:468
-++#, fuzzy, c-format
-++msgid "slattach: tty name too long\n"
-++msgstr "jm�no %s je p��li� dlouh�\n"
-++
-++#: ../slattach.c:498
-++#, c-format
-+ msgid "slattach: tty_open: cannot get current state!\n"
-+ msgstr "slattach: tty_open: aktu�ln� stav nelze zjistit!\n"
-+ 
-+-#: ../slattach.c:493
-++#: ../slattach.c:505
-++#, c-format
-+ msgid "slattach: tty_open: cannot get current line disc!\n"
-+ msgstr "slattach: tty_open: aktu�ln� linkovou discipl�nu nelze zjistit!\n"
-+ 
-+-#: ../slattach.c:501
-++#: ../slattach.c:513
-++#, c-format
-+ msgid "slattach: tty_open: cannot set RAW mode!\n"
-+ msgstr "slattach: tty_open: re�im RAW nelze nastavit!\n"
-+ 
-+-#: ../slattach.c:508
-++#: ../slattach.c:520
-+ #, c-format
-+ msgid "slattach: tty_open: cannot set %s bps!\n"
-+ msgstr "slattach: tty_open: %s bps nelze nastavit!\n"
-+ 
-+-#: ../slattach.c:518
-++#: ../slattach.c:530
-++#, c-format
-+ msgid "slattach: tty_open: cannot set 8N1 mode!\n"
-+ msgstr "slattach: tty_open: re�im 8N1 nelze nastavit!\n"
-+ 
-+-#: ../slattach.c:686
-++#: ../slattach.c:672
-++#, c-format
-++msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n"
-++msgstr ""
-++
-++#: ../slattach.c:704
-+ #, c-format
-+ msgid "%s started"
-+ msgstr "protokol %s spu�t�n"
-+ 
-+-#: ../slattach.c:687
-++#: ../slattach.c:705
-+ #, c-format
-+ msgid " on %s"
-+ msgstr " na %s"
-+ 
-+-#: ../slattach.c:688
-++#: ../slattach.c:706
-+ #, c-format
-+ msgid " interface %s\n"
-+ msgstr " rozhran� %s\n"
-+ 
-+ #~ msgid ""
-+-#~ "   This comand can read or set the hostname or the NIS domainname. You can\n"
-++#~ "  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
-++#~ "<-''-\n"
-++#~ msgstr ""
-++#~ "  arp [-v]   [<HW>] [-i <if>] -s <soubor> <hwadr> [s��mask <��s>]  <-''-\n"
-++
-++#~ msgid "%s: unknown interface: %s\n"
-++#~ msgstr "%s: rozhran� %s nen� zn�mo\n"
-++
-++#~ msgid "address mask replies"
-++#~ msgstr "odpov�di na ��dost o masku pods�t�"
-++
-++#~ msgid "unknown title %s\n"
-++#~ msgstr "titulek %s je nezn�m�\n"
-++
-++#~ msgid "Routing table for `ddp' not yet supported.\n"
-++#~ msgstr "Sm�rovac� tabulka pro `ddp' nen� zat�m podporov�na.\n"
-++
-++#~ msgid ""
-++#~ "   This comand can read or set the hostname or the NIS domainname. You "
-++#~ "can\n"
-+ #~ msgstr ""
-+ #~ "   Tento program zji��uje a nastavuje jm�no po��ta�e �i NIS dom�ny. M��e "
-+ #~ "tak�\n"
-+@@ -2500,7 +3161,8 @@ msgstr " rozhran� %s\n"
-+ #~ msgid ""
-+ #~ "   Unless you are using bind or NIS for host lookups you can change the\n"
-+ #~ msgstr ""
-+-#~ "   Pokud nepou��v�te bind �i NIS pro vyhled�v�n� jmen po��ta��, pak m��ete\n"
-++#~ "   Pokud nepou��v�te bind �i NIS pro vyhled�v�n� jmen po��ta��, pak "
-++#~ "m��ete\n"
-+ 
-+ #~ msgid ""
-+ #~ "   FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n"
-+Index: net-tools/po/Makefile
-+===================================================================
-+--- net-tools.orig/po/Makefile
-++++ net-tools/po/Makefile
-+@@ -3,13 +3,13 @@ INSTALL_PROGRAM= ${INSTALL}
-+ INSTALL_DATA= ${INSTALL} -m 644
-+ INSTALLNLSDIR=${BASEDIR}/usr/share/locale
-+ 
-+-TUPDATE = tupdate
-++TUPDATE = msgmerge
-+ 
-+ NLSPACKAGE = net-tools
-+ 
-+ -include ../config.make
-+ ifeq ($(I18N),1)
-+-CATALOGS = de.mo fr.mo pt_BR.mo et_EE.mo cs.mo
-++CATALOGS = de.mo fr.mo pt_BR.mo et_EE.mo cs.mo ja.mo
-+ else
-+ CATALOGS =
-+ endif
-+@@ -49,7 +49,7 @@ update-po: Makefile
-+ 		lang=`echo $$cat | sed 's/.mo//'`; \
-+ 		mv $$lang.po $$lang.old.po; \
-+ 		echo "$$lang:"; \
-+-		if $(TUPDATE) $(NLSPACKAGE).pot $$lang.old.po > $$lang.po; then \
-++		if $(TUPDATE) $$lang.old.po $(NLSPACKAGE).pot > $$lang.po; then \
-+ 		rm -f $$lang.old.po; \
-+ 	else \
-+ 	 	echo "tupdate for $$cat failed!"; \
-+Index: net-tools/po/de.po
-+===================================================================
-+--- net-tools.orig/po/de.po
-++++ net-tools/po/de.po
-+@@ -1,106 +1,121 @@
-+-# $Id: de.po,v 1.10 2000/08/01 03:19:48 ecki Exp $
-++# $Id: de.po,v 1.11 2003/10/25 21:15:09 ecki Exp $
-+ # German translation for net-tools 1.51
-+ # Copyright (C) 1999 Ralf B�chle <ralf@gnu.org>
-+ msgid ""
-+ msgstr ""
-+ "Project-Id-Version: net-tools 1.51\n"
-+-"POT-Creation-Date: 2000-02-14 02:31+0100\n"
-+-"PO-Revision-Date: 1998-03-01 00:02+0100\n"
-++"Report-Msgid-Bugs-To: \n"
-++"POT-Creation-Date: 2007-06-30 12:28+0900\n"
-++"PO-Revision-Date: 2005-06-13 00:02+0100\n"
-+ "Last-Translator: Ralf B�chle <ralf@gnu.org>\n"
-+ "Language-Team:\n"
-+ "MIME-Version: 1.0\n"
-+-"Content-Type: text/plain; charset=iso8859-1\n"
-++"Content-Type: text/plain; charset=iso-8859-1\n"
-+ "Content-Transfer-Encoding: 8bit\n"
-+ 
-+-#: ../arp.c:110 ../arp.c:269
-++#: ../arp.c:112 ../arp.c:279
-++#, c-format
-+ msgid "arp: need host name\n"
-+-msgstr "arp: Hostname mu� angegeben werden\n"
-++msgstr "arp: Hostname muss angegeben werden\n"
-+ 
-+-#: ../arp.c:207 ../arp.c:221
-++#: ../arp.c:215 ../arp.c:230
-+ #, c-format
-+ msgid "No ARP entry for %s\n"
-+-msgstr "Kein ARP Eintrag f�r %s\n"
-++msgstr "Kein ARP-Eintrag f�r %s\n"
-+ 
-+-#: ../arp.c:239
-++#: ../arp.c:248
-+ #, c-format
-+ msgid "arp: cant get HW-Address for `%s': %s.\n"
-+ msgstr "rarp: Kann Eintrag aus %s : %u nicht setzen.\n"
-+ 
-+-#: ../arp.c:243
-++#: ../arp.c:252
-++#, c-format
-+ msgid "arp: protocol type mismatch.\n"
-+ msgstr "arp: unpassende Protokolltypen.\n"
-+ 
-+-#: ../arp.c:252
-++#: ../arp.c:261
-+ #, c-format
-+ msgid "arp: device `%s' has HW address %s `%s'.\n"
-+-msgstr "arp: Ger�t ,,%s'' hat HW-Adresse %s ,,%s''.\n"
-++msgstr "arp: Ger�t �%s� hat HW-Adresse %s �%s�.\n"
-+ 
-+-#: ../arp.c:282
-++#: ../arp.c:293
-++#, c-format
-+ msgid "arp: need hardware address\n"
-+-msgstr "arp: Hardwareadresse mu� angegeben werden\n"
-++msgstr "arp: Hardwareadresse muss angegeben werden\n"
-+ 
-+-#: ../arp.c:290
-++#: ../arp.c:301
-++#, c-format
-+ msgid "arp: invalid hardware address\n"
-+ msgstr "arp: ung�ltige Hardwareadresse\n"
-+ 
-+-#: ../arp.c:387
-++#: ../arp.c:398
-+ #, c-format
-+ msgid "arp: cannot open etherfile %s !\n"
-+ msgstr "arp: Kann %s nicht �ffnen!\n"
-+ 
-+-#: ../arp.c:403
-++#: ../arp.c:414
-+ #, c-format
-+ msgid "arp: format error on line %u of etherfile %s !\n"
-+ msgstr "arp: Formatfehler in Zeile %u von Etherfile %s.\n"
-+ 
-+-#: ../arp.c:416
-++#: ../arp.c:427
-+ #, c-format
-+ msgid "arp: cannot set entry on line %u of etherfile %s !\n"
-+ msgstr "arp: Kann Eintrag auf Zeile %u von Etherdatei %s nicht setzen!\n"
-+ 
-+-#: ../arp.c:437
-+-msgid "Address\t\t\tHWtype\tHWaddress\t    Flags Mask\t\t  Iface\n"
-++#: ../arp.c:448
-++#, fuzzy, c-format
-++msgid ""
-++"Address                  HWtype  HWaddress           Flags Mask            "
-++"Iface\n"
-+ msgstr "Adresse\t\t\tHWTyp\tHWAdresse\t    Flags   Maske\t\t  Iface\n"
-+ 
-+-#: ../arp.c:467
-++#: ../arp.c:476
-++#, fuzzy
-++msgid "<from_interface>"
-++msgstr " Schnittstelle: %s\n"
-++
-++#: ../arp.c:478
-+ msgid "(incomplete)"
-+-msgstr "(unvolls�ndig)"
-++msgstr "(unvollst�ndig)"
-+ 
-+-#: ../arp.c:484
-++#: ../arp.c:495
-+ #, c-format
-+ msgid "%s (%s) at "
-+ msgstr "%s (%s) auf "
-+ 
-+-#: ../arp.c:490
-++#: ../arp.c:501
-++#, c-format
-+ msgid "<incomplete> "
-+ msgstr "<unvollst�ndig> "
-+ 
-+-#: ../arp.c:496
-++#: ../arp.c:507
-+ #, c-format
-+ msgid "netmask %s "
-+ msgstr "netzmaske %s "
-+ 
-+-#: ../arp.c:513
-++#: ../arp.c:524
-+ #, c-format
-+ msgid "on %s\n"
-+ msgstr "auf %s\n"
-+ 
-+-#: ../arp.c:592
-++#: ../arp.c:605
-+ #, c-format
-+ msgid "Entries: %d\tSkipped: %d\tFound: %d\n"
-+ msgstr "Eintr�ge: %d   Ignoriert: %d   Gefunden: %d\n"
-+ 
-+-#: ../arp.c:596
-++#: ../arp.c:609
-+ #, c-format
-+ msgid "%s (%s) -- no entry\n"
-+ msgstr "%s (%s) -- kein Eintrag\n"
-+ 
-+-#: ../arp.c:598
-++#: ../arp.c:611
-+ #, c-format
-+ msgid "arp: in %d entries no match found.\n"
-+-msgstr "arp: In %d Eintr�gen wurde kein Zutreffender gefunden.\n"
-++msgstr "arp: In %d Eintr�gen wurde kein zutreffender gefunden.\n"
-+ 
-+-#: ../arp.c:613
-++#: ../arp.c:626
-++#, c-format
-+ msgid ""
-+ "Usage:\n"
-+ "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP "
-+@@ -109,157 +124,165 @@ msgstr ""
-+ "Benutzung:\n"
-+ "  arp [-vn]  [<HW>] [-i <if>] [-a] [<Hostname>]\n"
-+ 
-+-#: ../arp.c:614
-++#: ../arp.c:627
-++#, fuzzy, c-format
-+ msgid ""
-+-"  arp [-v]          [-i <if>] -d  <hostname> [pub][nopub]    <-Delete ARP "
-++"  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP "
-+ "entry\n"
-+ msgstr "  arp [-v]          [-i <if>] -d  <Hostname> [pub][nopub]\n"
-+ 
-+-#: ../arp.c:615
-++#: ../arp.c:628
-++#, fuzzy, c-format
-+ msgid ""
-+-"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]              <-Add entry from "
-++"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from "
-+ "file\n"
-+ msgstr "  arp [-vnD] [<HW>] [-i <if>] -f  <Dateiname>           <- Eintrag aus Datei hinzuf�gen\n"
-+ 
-+-#: ../arp.c:616
-++#: ../arp.c:629
-++#, fuzzy, c-format
-+ msgid ""
-+-"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [temp][nopub] <-Add "
-++"  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add "
-+ "entry\n"
-+ msgstr ""
-+ "  arp [-v]   [<HW>] [-i <if>] -s  <Rechnername> <hwaddr> [temp][nopub]\n"
-+ 
-+-#: ../arp.c:617
-+-msgid ""
-+-"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
-+-"<-''-\n"
-+-msgstr ""
-+-"  arp [-v]   [<HW>] [-i <if>] -s  <Hostname> <hwaddr> [netmask <nm>] pub\n"
-+-
-+-#: ../arp.c:618
-++#: ../arp.c:630
-++#, fuzzy, c-format
-+ msgid ""
-+-"  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub      "
-++"  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          "
-+ "<-''-\n"
-+ "\n"
-+ msgstr "  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub\n"
-+ 
-+-#: ../arp.c:620
-++#: ../arp.c:632
-++#, c-format
-+ msgid ""
-+ "        -a                       display (all) hosts in alternative (BSD) "
-+ "style\n"
-+ msgstr "        -a                       Alle Hosts im BSD-Format anzeigen\n"
-+ 
-+-#: ../arp.c:621
-++#: ../arp.c:633
-++#, c-format
-+ msgid "        -s, --set                set a new ARP entry\n"
-+ msgstr "        -s, --set                Neuen ARP-Eintrag setzen\n"
-+ 
-+-#: ../arp.c:622
-++#: ../arp.c:634
-++#, c-format
-+ msgid "        -d, --delete             delete a specified entry\n"
-+ msgstr "        -d, --delete             Einen bestimmten Eintrag l�schen\n"
-+ 
-+-#: ../arp.c:623 ../netstat.c:1436 ../route.c:85
-++#: ../arp.c:635 ../netstat.c:1503 ../route.c:86
-++#, c-format
-+ msgid "        -v, --verbose            be verbose\n"
-+ msgstr "        -v, --verbose            Ausf�hrliche Ausgaben\n"
-+ 
-+-#: ../arp.c:624 ../netstat.c:1437 ../route.c:86
-+-msgid "        -n, --numeric            dont resolve names\n"
-++#: ../arp.c:636 ../netstat.c:1504 ../route.c:87
-++#, fuzzy, c-format
-++msgid "        -n, --numeric            don't resolve names\n"
-+ msgstr "        -n, --numeric            Adressen nicht nach Namen aufl�sen\n"
-+ 
-+-#: ../arp.c:625
-++#: ../arp.c:637
-++#, c-format
-+ msgid ""
-+ "        -i, --device             specify network interface (e.g. eth0)\n"
-+-msgstr "        -i, --device             Netzwerksger�t (z.B. eth0) angeben\n"
-++msgstr "        -i, --device             Netzwerkger�t (z.B. eth0) angeben\n"
-+ 
-+-#: ../arp.c:626
-++#: ../arp.c:638
-++#, c-format
-+ msgid "        -D, --use-device         read <hwaddr> from given device\n"
-+ msgstr "        -D, --use-device         <hwaddr> von gegebenem Ger�t lesen\n"
-+ 
-+-#: ../arp.c:627
-++#: ../arp.c:639
-++#, c-format
-+ msgid "        -A, -p, --protocol       specify protocol family\n"
-+ msgstr "        -A, -p, --protocol              Routentabelle anzeigen\n"
-+ 
-+-#: ../arp.c:628
-++#: ../arp.c:640
-++#, c-format
-+ msgid ""
-+-"        -f, --file               read new entries from file or from "
-+-"/etc/ethers\n"
-++"        -f, --file               read new entries from file or from /etc/"
-++"ethers\n"
-+ "\n"
-+ msgstr ""
-+ "        -f, --file               Neue Eintr�ge aus Datei lesen\n"
-+ "\n"
-+ 
-+-#: ../arp.c:630 ../rarp.c:181
-++#: ../arp.c:642 ../rarp.c:182
-+ #, c-format
-+ msgid "  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"
-+ msgstr "  <HW>='-H <hw>' um Hardwareadresstyp anzugeben.  Standard: %s\n"
-+ 
-+-#: ../arp.c:631 ../rarp.c:182
-++#: ../arp.c:643 ../rarp.c:183
-++#, c-format
-+ msgid "  List of possible hardware types (which support ARP):\n"
-+ msgstr "  Liste m�glicher Hardwaretypen, die ARP unterst�tzen:\n"
-+ 
-+-#: ../arp.c:664
-++#: ../arp.c:677 ../arp.c:762
-+ #, c-format
-+ msgid "%s: hardware type not supported!\n"
-+ msgstr "%s: Hardwaretyp nicht unterst�tzt!\n"
-+ 
-+-#: ../arp.c:668
-++#: ../arp.c:681
-+ #, c-format
-+ msgid "%s: address family not supported!\n"
-+ msgstr "%s: Adressfamilie nicht unterst�tzt!\n"
-+ 
-+-#: ../arp.c:703
-++#: ../arp.c:716
-++#, c-format
-+ msgid "arp: -N not yet supported.\n"
-+ msgstr "arp: -N noch nicht unterst�tzt.\n"
-+ 
-+-#: ../arp.c:713
-++#: ../arp.c:726
-+ #, c-format
-+ msgid "arp: %s: unknown address family.\n"
-+ msgstr "arp: %s: unbekannte Adressfamilie.\n"
-+ 
-+-#: ../arp.c:722
-++#: ../arp.c:735
-+ #, c-format
-+ msgid "arp: %s: unknown hardware type.\n"
-+ msgstr "arp: %s: unbekannter Hardwaretyp.\n"
-+ 
-+-#: ../arp.c:741
-++#: ../arp.c:754
-+ #, c-format
-+ msgid "arp: %s: kernel only supports 'inet'.\n"
-+-msgstr "arp: %s: Kernel unterst�tzt nur ,,inet''.\n"
-++msgstr "arp: %s: Kernel unterst�tzt nur �inet�.\n"
-+ 
-+-#: ../arp.c:746
-++#: ../arp.c:767
-+ #, c-format
-+ msgid "arp: %s: hardware type without ARP support.\n"
-+ msgstr "arp: %s: Hardware unterst�tzt kein ARP.\n"
-+ 
-+-#: ../hostname.c:69
-++#: ../hostname.c:71
-+ #, c-format
-+ msgid "Setting nodename to `%s'\n"
-+-msgstr "Rechnernamen auf ,,%s'' setzen\n"
-++msgstr "Rechnernamen auf �%s� setzen\n"
-+ 
-+-#: ../hostname.c:74
-++#: ../hostname.c:76
-+ #, c-format
-+ msgid "%s: you must be root to change the node name\n"
-+ msgstr "%s: Nur Root darf den Rechnernamen �ndern\n"
-+ 
-+-#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116
-++#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117
-+ #, c-format
-+ msgid "%s: name too long\n"
-+ msgstr "%s: name zu lang\n"
-+ 
-+-#: ../hostname.c:89
-++#: ../hostname.c:91
-+ #, c-format
-+ msgid "Setting hostname to `%s'\n"
-+-msgstr "Setze Hostname auf ,,%s''\n"
-++msgstr "Setze Hostname auf �%s�\n"
-+ 
-+-#: ../hostname.c:94
-++#: ../hostname.c:96
-+ #, c-format
-+ msgid "%s: you must be root to change the host name\n"
-+-msgstr "%s: Nur Root darf then Rechnernamen �ndern\n"
-++msgstr "%s: Nur Root darf den Rechnernamen �ndern\n"
-+ 
-+-#: ../hostname.c:108
-++#: ../hostname.c:109
-+ #, c-format
-+ msgid "Setting domainname to `%s'\n"
-+-msgstr "Setze domainname auf ,,%s''\n"
-++msgstr "Setze domainname auf �%s�\n"
-+ 
-+-#: ../hostname.c:113
-++#: ../hostname.c:114
-+ #, c-format
-+ msgid "%s: you must be root to change the domain name\n"
-+ msgstr "%s: Nur Root darf den Domainnamen �ndern\n"
-+@@ -267,51 +290,56 @@ msgstr "%s: Nur Root darf den Domainname
-+ #: ../hostname.c:131
-+ #, c-format
-+ msgid "Resolving `%s' ...\n"
-+-msgstr "L�se ,,%s'' auf ...\n"
-++msgstr "L�se �%s� auf ...\n"
-+ 
-+ #: ../hostname.c:137
-+ #, c-format
-+ msgid "Result: h_name=`%s'\n"
-+-msgstr "Ergebnis: h_name=,,%s''\n"
-++msgstr "Ergebnis: h_name=�%s�\n"
-+ 
-+ #: ../hostname.c:142
-+ #, c-format
-+ msgid "Result: h_aliases=`%s'\n"
-+-msgstr "Ergebnis: h_aliases=,,%s''\n"
-++msgstr "Ergebnis: h_aliases=�%s�\n"
-+ 
-+ #: ../hostname.c:147
-+ #, c-format
-+ msgid "Result: h_addr_list=`%s'\n"
-+-msgstr "Ergebnis: h_addr_list=,,%s''\n"
-++msgstr "Ergebnis: h_addr_list=�%s�\n"
-+ 
-+-#: ../hostname.c:209
-++#: ../hostname.c:208
-+ #, c-format
-+ msgid "%s: can't open `%s'\n"
-+-msgstr "%s: Kann ,,%s'' nicht �ffnen\n"
-++msgstr "%s: Kann �%s� nicht �ffnen\n"
-+ 
-+-#: ../hostname.c:223
-++#: ../hostname.c:222
-++#, c-format
-+ msgid "Usage: hostname [-v] {hostname|-F file}      set hostname (from file)\n"
-+ msgstr ""
-+ "Benutzung: hostname [-v] {Hostname|-F Datei} Hostname (aus Datei) setzen\n"
-+ 
-+-#: ../hostname.c:224
-++#: ../hostname.c:223
-++#, c-format
-+ msgid ""
-+ "       domainname [-v] {nisdomain|-F file}   set NIS domainname (from file)\n"
-+ msgstr ""
-+-"       domainname [-v] {nisdomain|-F file}   NIS Domainname (aus Datei) "
-++"       domainname [-v] {nisdomain|-F file}   NIS-Domainname (aus Datei) "
-+ "setzen.\n"
-+ 
-+-#: ../hostname.c:226
-++#: ../hostname.c:225
-++#, c-format
-+ msgid ""
-+ "       nodename [-v] {nodename|-F file}      set DECnet node name (from "
-+ "file)\n"
-+ msgstr "       nodename [-v] {Rechnername|-F Datei}\n"
-+ 
-+-#: ../hostname.c:228
-++#: ../hostname.c:227
-++#, c-format
-+ msgid "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  display formatted name\n"
-+ msgstr "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]\n"
-+ 
-+-#: ../hostname.c:229
-++#: ../hostname.c:228
-++#, c-format
-+ msgid ""
-+ "       hostname [-v]                         display hostname\n"
-+ "\n"
-+@@ -319,7 +347,8 @@ msgstr ""
-+ "       hostname [-v]                         Hostnamen anzeigen\n"
-+ "\n"
-+ 
-+-#: ../hostname.c:230
-++#: ../hostname.c:229
-++#, c-format
-+ msgid ""
-+ "       hostname -V|--version|-h|--help       print info and exit\n"
-+ "\n"
-+@@ -328,7 +357,8 @@ msgstr ""
-+ "beenden.\n"
-+ "\n"
-+ 
-+-#: ../hostname.c:231
-++#: ../hostname.c:230
-++#, c-format
-+ msgid ""
-+ "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
-+ "\n"
-+@@ -336,43 +366,52 @@ msgstr ""
-+ "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
-+ "\n"
-+ 
-+-#: ../hostname.c:232
-++#: ../hostname.c:231
-++#, c-format
-+ msgid "    -s, --short           short host name\n"
-+ msgstr "    -s, --short           Kurzer Hostname\n"
-+ 
-+-#: ../hostname.c:233
-++#: ../hostname.c:232
-++#, c-format
-+ msgid "    -a, --alias           alias names\n"
-+ msgstr "    -a, --alias           Namensalias\n"
-+ 
-+-#: ../hostname.c:234
-++#: ../hostname.c:233
-++#, c-format
-+ msgid "    -i, --ip-address      addresses for the hostname\n"
-+ msgstr "    -i, --ip-address      Adressen f�r den Hostnamen\n"
-+ 
-+-#: ../hostname.c:235
-++#: ../hostname.c:234
-++#, c-format
-+ msgid "    -f, --fqdn, --long    long host name (FQDN)\n"
-+ msgstr "    -f, --fqdn, --long    Langer Hostname (FQDN)\n"
-+ 
-+-#: ../hostname.c:236
-++#: ../hostname.c:235
-++#, c-format
-+ msgid "    -d, --domain          DNS domain name\n"
-+-msgstr "    -d, --domain          DNS Domainname\n"
-++msgstr "    -d, --domain          DNS-Domainname\n"
-+ 
-+-#: ../hostname.c:237
-++#: ../hostname.c:236
-++#, c-format
-+ msgid "    -y, --yp, --nis       NIS/YP domainname\n"
-+-msgstr "    -y, --yp, --nis       NIS/YP Domainname\n"
-++msgstr "    -y, --yp, --nis       NIS/YP-Domainname\n"
-+ 
-+-#: ../hostname.c:239
-++#: ../hostname.c:238
-++#, c-format
-+ msgid "    -n, --node            DECnet node name\n"
-+-msgstr "    -n, --node            DECnet Knotennamen\n"
-++msgstr "    -n, --node            DECnet-Knotennamen\n"
-+ 
-+-#: ../hostname.c:241
-++#: ../hostname.c:240
-++#, c-format
-+ msgid ""
-+ "    -F, --file            read hostname or NIS domainname from given file\n"
-+ "\n"
-+ msgstr ""
-+-"    -F, --file            Hostnamen oder NIS Domainnamen aus Datei lesen\n"
-++"    -F, --file            Hostnamen oder NIS-Domainnamen aus Datei lesen\n"
-+ "\n"
-+ 
-+-#: ../hostname.c:243
-++#: ../hostname.c:242
-++#, c-format
-+ msgid ""
-+ "   This command can read or set the hostname or the NIS domainname. You can\n"
-+ "   also read the DNS domain or the FQDN (fully qualified domain name).\n"
-+@@ -380,395 +419,268 @@ msgid ""
-+ "   FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n"
-+ "   part of the FQDN) in the /etc/hosts file.\n"
-+ msgstr ""
-+-"   Dies Kommando setzt oder gibt den Hostnamen oder NIS Domainnamen aus.\n"
-+-"   Es ist ebenfalls m�glich die DNS Domain oder den FQDN (langen Hostnamen)\n"
-++"   Dies Kommando setzt oder gibt den Hostnamen oder NIS-Domainnamen aus.\n"
-++"   Es ist ebenfalls m�glich die DNS-Domain oder den FQDN (langen Hostnamen)\n"
-+ "   ausgeben zu lassen.  Au�er wenn DNS oder NIS als Namensdienst verwendet\n"
-+-"   wird, k�nnen FQDN (Fully Qualified Domain Name) und DNS Domainname (welcher\n"
-++"   wird, k�nnen FQDN (Fully Qualified Domain Name) und DNS-Domainname (welcher\n"
-+ "   Teil des FQDNs ist) in /etc/hosts ge�ndert werden.\n"
-+ 
-+ #: ../hostname.c:338
-+ #, c-format
-+ msgid "%s: You can't change the DNS domain name with this command\n"
-+-msgstr "%s: Mit diesem Program kann der DNS Domainname nicht ge�ndert werden\n"
-++msgstr "%s: Mit diesem Programm kann der DNS-Domainname nicht ge�ndert werden\n"
-+ 
-+ #: ../hostname.c:339
-++#, c-format
-+ msgid ""
-+ "\n"
-+ "Unless you are using bind or NIS for host lookups you can change the DNS\n"
-+ msgstr ""
-+ "\n"
-+-"Wenn Bind oder NIS nicht zur Hostnamensaufl�sung benutzt werden, kann der "
-+-"DNS\n"
-++"Wenn Bind oder NIS nicht zur Hostnamensaufl�sung benutzt werden, kann der DNS\n"
-+ 
-+ #: ../hostname.c:340
-++#, c-format
-+ msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n"
-+-msgstr ""
-+-"Domainname (welcher Teil des FQDN ist) in der Datei /etc/hosts ge�ndert "
-+-"werden.\n"
-++msgstr "Domainname (welcher Teil des FQDN ist) in der Datei /etc/hosts ge�ndert werden.\n"
-+ 
-+ #: ../hostname.c:357
-+ #, c-format
-+ msgid "gethostname()=`%s'\n"
-+-msgstr "gethostname()=,,%s''\n"
-++msgstr "gethostname()=�%s�\n"
-+ 
-+ #: ../hostname.c:374
-+ #, c-format
-+ msgid "getdomainname()=`%s'\n"
-+-msgstr "getdomainname()=,,%s''\n"
-++msgstr "getdomainname()=�%s�\n"
-+ 
-+ #: ../hostname.c:389
-+ #, c-format
-+ msgid "getnodename()=`%s'\n"
-+-msgstr "getnodename()=,,%s''\n"
-++msgstr "getnodename()=�%s�\n"
-+ 
-+-#: ../ifconfig.c:159
-+-#, c-format
-+-msgid "%-9.9s Link encap:%s  "
-+-msgstr "%-9.9s Protokoll:%s  "
-++#: ../ifconfig.c:107
-++#, fuzzy, c-format
-++msgid ""
-++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
-++"Flg\n"
-++msgstr "SStelle MTU Met    RX-OK RX-Feh RX-DRP RX-�lf    TX-OK TX-Feh TX-DRP TX-�b Flg\n"
-+ 
-+-#: ../ifconfig.c:164
-+-#, c-format
-+-msgid "HWaddr %s  "
-+-msgstr "Hardware Adresse %s  "
-++#: ../ifconfig.c:129 ../ifconfig.c:161
-++#, fuzzy, c-format
-++msgid "%s: ERROR while getting interface flags: %s\n"
-++msgstr "%s: Fehler beim Auslesen der Schnittstelleninformation: %s\n"
-+ 
-+-#: ../ifconfig.c:167
-++#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862
-++#: ../ifconfig.c:973
-+ #, c-format
-+-msgid "Media:%s"
-+-msgstr "Medium:%s"
-++msgid "No support for INET on this system.\n"
-++msgstr "INET ist auf diesem System nicht verf�gbar.\n"
-+ 
-+-#: ../ifconfig.c:169
-+-msgid "(auto)"
-+-msgstr "(auto)"
-++#: ../ifconfig.c:193
-++#, fuzzy, c-format
-++msgid "%s: ERROR while testing interface flags: %s\n"
-++msgstr "%s: Fehler beim Auslesen der Schnittstelleninformation: %s\n"
-+ 
-+-#: ../ifconfig.c:176
-+-#, c-format
-+-msgid "          %s addr:%s "
-+-msgstr "          %s Adresse:%s "
-++#: ../ifconfig.c:202
-++#, fuzzy, c-format
-++msgid ""
-++"Usage:\n"
-++"  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"
-++msgstr ""
-++"Syntax:\n"
-++"  ifconfig [-a] [-i] [-v] <Schnittstelle> [[<AF>] <Adresse>]\n"
-+ 
-+-#: ../ifconfig.c:179
-++#: ../ifconfig.c:204
-+ #, c-format
-+-msgid " P-t-P:%s "
-+-msgstr " P-z-P:%s "
-++msgid "  [add <address>[/<prefixlen>]]\n"
-++msgstr "  [add <Adresse>[/<Pr�fixl�nge>]]\n"
-+ 
-+-#: ../ifconfig.c:182
-++#: ../ifconfig.c:205
-+ #, c-format
-+-msgid " Bcast:%s "
-+-msgstr " Bcast:%s "
-++msgid "  [del <address>[/<prefixlen>]]\n"
-++msgstr "  [del <Adresse>[/<Pr�fixl�nge>]]\n"
-+ 
-+-#: ../ifconfig.c:184
-++#: ../ifconfig.c:206
-+ #, c-format
-+-msgid " Mask:%s\n"
-+-msgstr " Maske:%s\n"
-++msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
-++msgstr "  [[-]broadcast [<Adresse>]]  [[-]pointopoint [<Adresse>]]\n"
-+ 
-+-#: ../ifconfig.c:201
-++#: ../ifconfig.c:207
-+ #, c-format
-+-msgid "          inet6 addr: %s/%d"
-+-msgstr "          inet6 Adresse: %s/%d"
-+-
-+-#: ../ifconfig.c:203
-+-msgid " Scope:"
-+-msgstr " G�ltigkeitsbereich:"
-+-
-+-#: ../ifconfig.c:206
-+-msgid "Global"
-+-msgstr "Global"
-++msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
-++msgstr "  [netmask <Adresse>]  [dstaddr <Adresse>]  [tunnel <Adresse>]\n"
-+ 
-+-#: ../ifconfig.c:209
-+-msgid "Link"
-+-msgstr "Verbindung"
-++#: ../ifconfig.c:210
-++#, c-format
-++msgid "  [outfill <NN>] [keepalive <NN>]\n"
-++msgstr "  [outfill <NN>] [keepalive <NN>]\n"
-+ 
-+ #: ../ifconfig.c:212
-+-msgid "Site"
-+-msgstr "Standort"
-+-
-+-#: ../ifconfig.c:215
-+-msgid "Compat"
-+-msgstr "Kompatibilit�t"
-+-
-+-#: ../ifconfig.c:218
-+-msgid "Host"
-+-msgstr "Maschine"
-+-
-+-#: ../ifconfig.c:221
-+-msgid "Unknown"
-+-msgstr "Unbekannt"
-+-
-+-#: ../ifconfig.c:236
-+ #, c-format
-+-msgid "          IPX/Ethernet II addr:%s\n"
-+-msgstr "          IPX/Ethernet II Adresse:%s\n"
-++msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
-++msgstr "  [hw <HW> <Adresse>]  [metric <NN>]  [mtu <NN>]\n"
-+ 
-+-#: ../ifconfig.c:239
-++#: ../ifconfig.c:213
-+ #, c-format
-+-msgid "          IPX/Ethernet SNAP addr:%s\n"
-+-msgstr "          IPX/Ethernet SNAP Adresse:%s\n"
-++msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
-++msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
-+ 
-+-#: ../ifconfig.c:242
-++#: ../ifconfig.c:214
-+ #, c-format
-+-msgid "          IPX/Ethernet 802.2 addr:%s\n"
-+-msgstr "          IPX/Ethernet 802.2 Adresse:%s\n"
-++msgid "  [multicast]  [[-]promisc]\n"
-++msgstr "  [multicast]  [[-]promisc]\n"
-+ 
-+-#: ../ifconfig.c:245
-++#: ../ifconfig.c:215
-+ #, c-format
-+-msgid "          IPX/Ethernet 802.3 addr:%s\n"
-+-msgstr "          IPX/Ethernet 802.3 Adresse:%s\n"
-++msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
-++msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <Typ>]\n"
-+ 
-+-#: ../ifconfig.c:255
-++#: ../ifconfig.c:217
-+ #, c-format
-+-msgid "          EtherTalk Phase 2 addr:%s\n"
-+-msgstr "          EtherTalk Phase 2 Adresse:%s\n"
-++msgid "  [txqueuelen <NN>]\n"
-++msgstr "  [txqueuelen <L�nge>]\n"
-+ 
-+-#: ../ifconfig.c:264
-++#: ../ifconfig.c:220
-+ #, c-format
-+-msgid "          econet addr:%s\n"
-+-msgstr "          econet Adresse:%s\n"
-+-
-+-#: ../ifconfig.c:270
-+-msgid "[NO FLAGS] "
-+-msgstr "[KEINE FLAGS] "
-+-
-+-#: ../ifconfig.c:272
-+-msgid "UP "
-+-msgstr "UP "
-+-
-+-#: ../ifconfig.c:274
-+-msgid "BROADCAST "
-+-msgstr "BROADCAST "
-+-
-+-#: ../ifconfig.c:276
-+-msgid "DEBUG "
-+-msgstr "DEBUG "
-+-
-+-#: ../ifconfig.c:278
-+-msgid "LOOPBACK "
-+-msgstr "LOOPBACK "
-+-
-+-#: ../ifconfig.c:280
-+-msgid "POINTOPOINT "
-+-msgstr "PUNKTZUPUNKT "
-+-
-+-#: ../ifconfig.c:282
-+-msgid "NOTRAILERS "
-+-msgstr "NOTRAILERS "
-++msgid "  [[-]dynamic]\n"
-++msgstr "  [[-]dynamic]\n"
-+ 
-+-#: ../ifconfig.c:284
-+-msgid "RUNNING "
-+-msgstr "RUNNING "
-++#: ../ifconfig.c:222
-++#, c-format
-++msgid ""
-++"  [up|down] ...\n"
-++"\n"
-++msgstr ""
-++"  [up|down] ...\n"
-++"\n"
-+ 
-+-#: ../ifconfig.c:286
-+-msgid "NOARP "
-+-msgstr "NOARP "
-++#: ../ifconfig.c:224
-++#, c-format
-++msgid "  <HW>=Hardware Type.\n"
-++msgstr "  <HW>=Hardwaretyp.\n"
-+ 
-+-#: ../ifconfig.c:288
-+-msgid "PROMISC "
-+-msgstr "PROMISC "
-++#: ../ifconfig.c:225
-++#, c-format
-++msgid "  List of possible hardware types:\n"
-++msgstr "  Liste m�glicher Hardwaretypen:\n"
-+ 
-+-#: ../ifconfig.c:290
-+-msgid "ALLMULTI "
-+-msgstr "ALLMULTI "
-++#. 1 = ARPable
-++#: ../ifconfig.c:227
-++#, c-format
-++msgid "  <AF>=Address family. Default: %s\n"
-++msgstr "  <AF>=Adressfamilie.  Standardwert: %s\n"
-+ 
-+-#: ../ifconfig.c:292
-+-msgid "SLAVE "
-+-msgstr "SLAVE "
-++#: ../ifconfig.c:228
-++#, c-format
-++msgid "  List of possible address families:\n"
-++msgstr "  List der m�glichen Adressfamilien:\n"
-+ 
-+-#: ../ifconfig.c:294
-+-msgid "MASTER "
-+-msgstr "MASTER "
-++#: ../ifconfig.c:303
-++#, c-format
-++msgid "ifconfig: option `%s' not recognised.\n"
-++msgstr ""
-+ 
-+-#: ../ifconfig.c:296
-+-msgid "MULTICAST "
-+-msgstr "MULTICAST "
-++#: ../ifconfig.c:305 ../ifconfig.c:962
-++#, c-format
-++msgid "ifconfig: `--help' gives usage information.\n"
-++msgstr ""
-+ 
-+-#: ../ifconfig.c:299
-+-msgid "DYNAMIC "
-+-msgstr "DYNAMIC "
-++#: ../ifconfig.c:380
-++#, c-format
-++msgid "Unknown media type.\n"
-++msgstr "Typ des Mediums unbekannt.\n"
-+ 
-+-#: ../ifconfig.c:302
-++#: ../ifconfig.c:417
-+ #, c-format
-+-msgid " MTU:%d  Metric:%d"
-+-msgstr " MTU:%d  Metric:%d"
-++msgid ""
-++"Warning: Interface %s still in promisc mode... maybe other application is "
-++"running?\n"
-++msgstr ""
-+ 
-+-#: ../ifconfig.c:306
-++#: ../ifconfig.c:429
-+ #, c-format
-+-msgid "  Outfill:%d  Keepalive:%d"
-+-msgstr "  Outfill:%d  Keepalive:%d"
-++msgid "Warning: Interface %s still in MULTICAST mode.\n"
-++msgstr ""
-+ 
-+-#: ../ifconfig.c:320
-++#: ../ifconfig.c:441
-+ #, c-format
-+-msgid "RX packets:%lu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
-++msgid "Warning: Interface %s still in ALLMULTI mode.\n"
-+ msgstr ""
-+-"Empfangene Pakete:%lu Fehler:%lu Weggeworfen:%lu �berlauf:%lu Rahmen:%lu\n"
-+ 
-+-#: ../ifconfig.c:325
-++#: ../ifconfig.c:465
-+ #, c-format
-+-msgid "             compressed:%lu\n"
-+-msgstr "             komprimiert:%lu\n"
-++msgid "Warning: Interface %s still in DYNAMIC mode.\n"
-++msgstr ""
-+ 
-+-#: ../ifconfig.c:329
-++#: ../ifconfig.c:523
-+ #, c-format
-+-msgid "TX packets:%lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
-++msgid "Warning: Interface %s still in BROADCAST mode.\n"
-+ msgstr ""
-+-"Verschickte Pakete:%lu Fehler:%lu Weggeworfen:%lu �berlauf:%lu Tr�ger:%lu\n"
-+ 
-+-#: ../ifconfig.c:333
-++#: ../ifconfig.c:652
-+ #, c-format
-+-msgid "          collisions:%lu "
-+-msgstr "          Kollisionen:%lu "
-++msgid "Warning: Interface %s still in POINTOPOINT mode.\n"
-++msgstr ""
-+ 
-+-#: ../ifconfig.c:335
-++#: ../ifconfig.c:684
-+ #, c-format
-+-msgid "compressed:%lu "
-+-msgstr "Komprimiert:%lu "
-++msgid "hw address type `%s' has no handler to set address. failed.\n"
-++msgstr ""
-+ 
-+-#: ../ifconfig.c:337
-++#: ../ifconfig.c:693
-+ #, c-format
-+-msgid "txqueuelen:%d "
-+-msgstr "Sendewarteschlangenl�nge:%d "
-++msgid "%s: invalid %s address.\n"
-++msgstr "%s: ung�ltige %s Adresse.\n"
-+ 
-+-#: ../ifconfig.c:345
-++#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913
-+ #, c-format
-+-msgid "Interrupt:%d "
-+-msgstr "Interrupt:%d "
-+-
-+-#. Only print devices using it for
-+-#. I/O maps
-+-#: ../ifconfig.c:348
-+-#, c-format
-+-msgid "Base address:0x%x "
-+-msgstr "Basisadresse:0x%x "
-+-
-+-#: ../ifconfig.c:350
-+-#, c-format
-+-msgid "Memory:%lx-%lx "
-+-msgstr "Speicher:%lx-%lx "
-+-
-+-#: ../ifconfig.c:353
-+-#, c-format
-+-msgid "DMA chan:%x "
-+-msgstr "DMA Kanal:%x "
-++msgid "No support for INET6 on this system.\n"
-++msgstr "INET6 ist auf diesem System nicht verf�gbar.\n"
-+ 
-+-#: ../ifconfig.c:384 ../ifconfig.c:405
-++#: ../ifconfig.c:780 ../ifconfig.c:871
-+ #, c-format
-+-msgid "%s: unknown interface: %s\n"
-+-msgstr "%s: unbekannte Schnittstelle: %s\n"
-+-
-+-#: ../ifconfig.c:421
-+-msgid ""
-+-"Usage:\n"
-+-"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <address>]\n"
-+-msgstr ""
-+-"Syntax:\n"
-+-"  ifconfig [-a] [-i] [-v] <Schnittstelle> [[<AF>] <Adresse>]\n"
-+-
-+-#: ../ifconfig.c:425
-+-msgid "  [add <address>[/<prefixlen>]]\n"
-+-msgstr "  [add <Adresse>[/<Prefixl�nge>]]\n"
-+-
-+-#: ../ifconfig.c:427
-+-msgid "  [del <address>[/<prefixlen>]]\n"
-+-msgstr "  [del <Adresse>[/<Prefixl�nge>]]\n"
-+-
-+-#: ../ifconfig.c:432
-+-msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
-+-msgstr "  [[-]broadcast [<Adresse>]]  [[-]pointopoint [<Adresse>]]\n"
-+-
-+-#: ../ifconfig.c:433
-+-msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
-+-msgstr "  [netmask <Addresse>]  [dstaddr <Adresse>]  [tunnel <Adresse>]\n"
-+-
-+-#: ../ifconfig.c:436
-+-msgid "  [outfill <NN>] [keepalive <NN>]\n"
-+-msgstr "  [outfill <NN>] [keepalive <NN>]\n"
-+-
-+-#: ../ifconfig.c:438
-+-msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
-+-msgstr "  [hw <HW> <Adresse>]  [metric <NN>]  [mtu <NN>]\n"
-+-
-+-#: ../ifconfig.c:439
-+-msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
-+-msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
-+-
-+-#: ../ifconfig.c:440
-+-msgid "  [multicast]  [[-]promisc]\n"
-+-msgstr "  [multicast]  [[-]promisc]\n"
-+-
-+-#: ../ifconfig.c:441
-+-msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
-+-msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <Typ>]\n"
-+-
-+-#: ../ifconfig.c:443
-+-msgid "  [txqueuelen <NN>]\n"
-+-msgstr "  [txqueuelen <L�nge>]\n"
-+-
-+-#: ../ifconfig.c:446
-+-msgid "  [[-]dynamic]\n"
-+-msgstr "  [[-]dynamic]\n"
-+-
-+-#: ../ifconfig.c:448
-+-msgid ""
-+-"  [up|down] ...\n"
-+-"\n"
-++msgid "Interface %s not initialized\n"
-+ msgstr ""
-+-"  [up|down] ...\n"
-+-"\n"
-+-
-+-#: ../ifconfig.c:450
-+-msgid "  <HW>=Hardware Type.\n"
-+-msgstr "  <HW>=Hardwaretyp.\n"
-+-
-+-#: ../ifconfig.c:451
-+-msgid "  List of possible hardware types:\n"
-+-msgstr "  Liste m�glicher Hardwaretypen:\n"
-+-
-+-#. 1 = ARPable
-+-#: ../ifconfig.c:453
-+-#, c-format
-+-msgid "  <AF>=Address family. Default: %s\n"
-+-msgstr "  <AF>=Adressfamilie.  Standardwert: %s\n"
-+-
-+-#: ../ifconfig.c:454
-+-msgid "  List of possible address families:\n"
-+-msgstr "  List der m�glichen Adressfamilien:\n"
-+-
-+-#: ../ifconfig.c:593
-+-msgid "Unknown media type.\n"
-+-msgstr "Typ des Mediums unbekannt.\n"
-+ 
-+-#: ../ifconfig.c:881
-+-#, c-format
-+-msgid "%s: invalid %s address.\n"
-++#: ../ifconfig.c:792 ../ifconfig.c:882
-++#, fuzzy, c-format
-++msgid "Bad address.\n"
-+ msgstr "%s: ung�ltige %s Adresse.\n"
-+ 
-+-#: ../ifconfig.c:920 ../ifconfig.c:963 ../ifconfig.c:1011
-+-msgid "No support for INET6 on this system.\n"
-+-msgstr "INET6 ist auf diesem System nicht verf�gbar.\n"
-+-
-+-#: ../ifconfig.c:983
-++#: ../ifconfig.c:885
-++#, c-format
-+ msgid "Address deletion not supported on this system.\n"
-+-msgstr "Das L�schen von Adressen ist auf diesem System nicht unterst�tzt.\n"
-++msgstr "Das L�schen von Adressen wird auf diesem System nicht unterst�tzt.\n"
-+ 
-+-#: ../ifconfig.c:1066
-+-msgid "No support for INET on this system.\n"
-+-msgstr "INET ist auf diesem System nicht verf�gbar.\n"
-++#: ../ifconfig.c:957
-++#, fuzzy, c-format
-++msgid "ifconfig: Cannot set address for this protocol family.\n"
-++msgstr "Kann die Adressen der Familie %d nicht setzen.\n"
-+ 
-+-#: ../ifconfig.c:1076
-++#: ../ifconfig.c:983
-++#, c-format
-+ msgid "No support for ECONET on this system.\n"
-+ msgstr "ECONET wird auf diesem System nicht unterst�tzt.\n"
-+ 
-+-#: ../ifconfig.c:1084
-++#: ../ifconfig.c:991
-+ #, c-format
-+ msgid "Don't know how to set addresses for family %d.\n"
-+ msgstr "Kann die Adressen der Familie %d nicht setzen.\n"
-+ 
-+-#: ../netstat.c:383
-++#: ../ifconfig.c:1021
-++#, c-format
-++msgid "WARNING: at least one error occured. (%d)\n"
-++msgstr ""
-++
-++#: ../netstat.c:434
-+ #, c-format
-+ msgid ""
-+ "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n"
-+-msgstr ""
-+-"(F�r \"-p\": geteuid()=%d konnte keine Information gelesen werden; sie "
-+-"sollten Root sein.)\n"
-++msgstr "(F�r \"-p\": geteuid()=%d konnte keine Information gelesen werden; sie sollten Root sein.)\n"
-+ 
-+-#: ../netstat.c:387
-++#: ../netstat.c:438
-++#, c-format
-+ msgid ""
-+ "(Not all processes could be identified, non-owned process info\n"
-+ " will not be shown, you would have to be root to see it all.)\n"
-+@@ -776,198 +688,220 @@ msgstr ""
-+ "(Es konnten nicht alle Prozesse identifiziert werden; Informationen �ber\n"
-+ "nicht-eigene Processe werden nicht angezeigt; Root kann sie anzeigen.)\n"
-+ 
-+-#: ../netstat.c:394 ../netstat.c:1089 ../netstat.c:1166
-++#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266
-+ msgid "LISTENING"
-+ msgstr "H�RT"
-+ 
-+-#: ../netstat.c:395
-++#: ../netstat.c:446
-+ msgid "CONN SENT"
-+ msgstr "VERBINGSAUFBAU GESCHICKT"
-+ 
-+-#: ../netstat.c:396 ../netstat.c:1168
-++#: ../netstat.c:447 ../netstat.c:1268
-+ msgid "DISC SENT"
-+ msgstr "VERBINDUNGSABBAU GESCHICKT"
-+ 
-+-#: ../netstat.c:397 ../netstat.c:464 ../netstat.c:809 ../netstat.c:1169
-++#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269
-+ msgid "ESTABLISHED"
-+ msgstr "VERBUNDEN"
-+ 
-+-#: ../netstat.c:419
-++#: ../netstat.c:470
-++#, c-format
-+ msgid "Active NET/ROM sockets\n"
-+ msgstr "Aktive NET/ROM Sockets\n"
-+ 
-+-#: ../netstat.c:420
-++#: ../netstat.c:471
-++#, c-format
-+ msgid ""
-+-"User       Dest       Source     Device  State        Vr/Vs    Send-Q  "
-+-"Recv-Q\n"
-+-msgstr ""
-+-"Benutzer   Ziel       Quelle     Ger�t   Zustand      Vr/Vs    Send-Q  "
-+-"Recv-Q\n"
-++"User       Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-"
-++"Q\n"
-++msgstr "Benutzer   Ziel       Quelle     Ger�t   Zustand      Vr/Vs    Send-Q  Recv-Q\n"
-+ 
-+-#: ../netstat.c:430 ../netstat.c:1208
-++#: ../netstat.c:481 ../netstat.c:1308
-+ #, c-format
-+ msgid "Problem reading data from %s\n"
-+ msgstr "Probleme beim Lesen von %s\n"
-+ 
-+-#: ../netstat.c:465
-++#: ../netstat.c:516
-+ msgid "SYN_SENT"
-+ msgstr "SYN_SENT"
-+ 
-+-#: ../netstat.c:466
-++#: ../netstat.c:517
-+ msgid "SYN_RECV"
-+ msgstr "SYN_RECV"
-+ 
-+-#: ../netstat.c:467
-++#: ../netstat.c:518
-+ msgid "FIN_WAIT1"
-+ msgstr "FIN_WAIT1"
-+ 
-+-#: ../netstat.c:468
-++#: ../netstat.c:519
-+ msgid "FIN_WAIT2"
-+ msgstr "FIN_WAIT2"
-+ 
-+-#: ../netstat.c:469
-++#: ../netstat.c:520
-+ msgid "TIME_WAIT"
-+ msgstr "TIME_WAIT"
-+ 
-+-#: ../netstat.c:470
-++#: ../netstat.c:521
-+ msgid "CLOSE"
-+ msgstr "CLOSE"
-+ 
-+-#: ../netstat.c:471
-++#: ../netstat.c:522
-+ msgid "CLOSE_WAIT"
-+ msgstr "CLOSE_WAIT"
-+ 
-+-#: ../netstat.c:472
-++#: ../netstat.c:523
-+ msgid "LAST_ACK"
-+ msgstr "LAST_ACK"
-+ 
-+-#: ../netstat.c:473
-++#: ../netstat.c:524
-+ msgid "LISTEN"
-+ msgstr "LISTEN"
-+ 
-+-#: ../netstat.c:474
-++#: ../netstat.c:525
-+ msgid "CLOSING"
-+ msgstr "CLOSING"
-+ 
-+-#: ../netstat.c:544
-++#: ../netstat.c:596
-+ #, c-format
-+ msgid "warning, got bogus igmp6 line %d.\n"
-+ msgstr "Warnung, fehlerhafte igmp6 line %d.\n"
-+ 
-+-#: ../netstat.c:549 ../netstat.c:587 ../netstat.c:670 ../netstat.c:803
-+-#: ../netstat.c:935 ../netstat.c:940
-++#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898
-++#: ../netstat.c:1032 ../netstat.c:1037
-+ #, c-format
-+ msgid "netstat: unsupported address family %d !\n"
-+ msgstr "netstat: Nicht unterst�tzte Adressfamilie %d!\n"
-+ 
-+-#: ../netstat.c:562 ../netstat.c:567 ../netstat.c:575 ../netstat.c:582
-++#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634
-+ #, c-format
-+ msgid "warning, got bogus igmp line %d.\n"
-+ msgstr "Warnung, fehlerhafte igmp-Zeile %d.\n"
-+ 
-+-#: ../netstat.c:666
-++#: ../netstat.c:677
-++#, fuzzy, c-format
-++msgid "Active X.25 sockets\n"
-++msgstr "Aktive AX.25 Sockets\n"
-++
-++#. IMHO, Vr/Vs is not very usefull --SF
-++#: ../netstat.c:679
-++#, fuzzy, c-format
-++msgid ""
-++"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  Recv-"
-++"Q\n"
-++msgstr "Ziel       Quelle     Ger�t   Zustand      Vr/Vs    Send-Q  Empf-Q\n"
-++
-++#: ../netstat.c:759
-++#, c-format
-+ msgid "warning, got bogus tcp line.\n"
-+ msgstr "Warnung, fehlerhafte TCP Zeile.\n"
-+ 
-+-#: ../netstat.c:704 ../netstat.c:855 ../netstat.c:975
-++#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075
-+ #, c-format
-+ msgid "off (0.00/%ld/%d)"
-+ msgstr "aus (0.00/%ld/%d)"
-+ 
-+-#: ../netstat.c:708
-++#: ../netstat.c:804
-+ #, c-format
-+ msgid "on (%2.2f/%ld/%d)"
-+ msgstr "ein (%2.2f/%ld/%d)"
-+ 
-+-#: ../netstat.c:713
-++#: ../netstat.c:809
-+ #, fuzzy, c-format
-+ msgid "keepalive (%2.2f/%ld/%d)"
-+ msgstr "ein%d (%2.2f/%ld/%d)"
-+ 
-+-#: ../netstat.c:718
-++#: ../netstat.c:814
-+ #, fuzzy, c-format
-+ msgid "timewait (%2.2f/%ld/%d)"
-+ msgstr "ein%d (%2.2f/%ld/%d)"
-+ 
-+-#: ../netstat.c:723 ../netstat.c:864 ../netstat.c:985
-++#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085
-+ #, c-format
-+ msgid "unkn-%d (%2.2f/%ld/%d)"
-+ msgstr "unkn-%d (%2.2f/%ld/%d)"
-+ 
-+-#: ../netstat.c:799
-++#: ../netstat.c:894
-++#, c-format
-+ msgid "warning, got bogus udp line.\n"
-+ msgstr "Warnung, fehlerhafe UDP-Zeile.\n"
-+ 
-+-#: ../netstat.c:817 ../netstat.c:1075 ../netstat.c:1108
-++#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208
-+ msgid "UNKNOWN"
-+ msgstr "UNBEKANNT"
-+ 
-+-#: ../netstat.c:860 ../netstat.c:980
-++#: ../netstat.c:958 ../netstat.c:1080
-+ #, c-format
-+ msgid "on%d (%2.2f/%ld/%d)"
-+ msgstr "ein%d (%2.2f/%ld/%d)"
-+ 
-+-#: ../netstat.c:949
-++#: ../netstat.c:1046
-++#, c-format
-+ msgid "warning, got bogus raw line.\n"
-+ msgstr "Warnung, fehlerhafte raw-Zeile.\n"
-+ 
-+-#: ../netstat.c:1028
-++#: ../netstat.c:1128
-++#, c-format
-+ msgid "warning, got bogus unix line.\n"
-+ msgstr "Warnung, fehlerhafte UNIX-Zeile.\n"
-+ 
-+-#: ../netstat.c:1055
-++#: ../netstat.c:1155
-+ msgid "STREAM"
-+ msgstr "STREAM"
-+ 
-+-#: ../netstat.c:1059
-++#: ../netstat.c:1159
-+ msgid "DGRAM"
-+ msgstr "DGRAM"
-+ 
-+-#: ../netstat.c:1063
-++#: ../netstat.c:1163
-+ msgid "RAW"
-+ msgstr "RAW"
-+ 
-+-#: ../netstat.c:1067
-++#: ../netstat.c:1167
-+ msgid "RDM"
-+ msgstr "RDM"
-+ 
-+-#: ../netstat.c:1071
-++#: ../netstat.c:1171
-+ msgid "SEQPACKET"
-+-msgstr "SEQPACKET"
-++msgstr "SEQPAKET"
-+ 
-+-#: ../netstat.c:1080
-++#: ../netstat.c:1180
-+ msgid "FREE"
-+ msgstr "FREI"
-+ 
-+-#: ../netstat.c:1096
-++#: ../netstat.c:1196
-+ msgid "CONNECTING"
-+ msgstr "VERBINDUNGSAUFBAU"
-+ 
-+-#: ../netstat.c:1100
-++#: ../netstat.c:1200
-+ msgid "CONNECTED"
-+ msgstr "VERBUNDEN"
-+ 
-+-#: ../netstat.c:1104
-++#: ../netstat.c:1204
-+ msgid "DISCONNECTING"
-+ msgstr "VERBINDUNGSABBAU"
-+ 
-+-#: ../netstat.c:1135
-++#: ../netstat.c:1235
-++#, c-format
-+ msgid "Active UNIX domain sockets "
-+-msgstr "Aktive Sockets in der UNIX Dom�ne "
-++msgstr "Aktive Sockets in der UNIX-Dom�ne "
-+ 
-+-#: ../netstat.c:1137 ../netstat.c:1666
-++#: ../netstat.c:1237 ../netstat.c:1756
-++#, c-format
-+ msgid "(servers and established)"
-+ msgstr "(Server und stehende Verbindungen)"
-+ 
-+-#: ../netstat.c:1140 ../netstat.c:1669
-++#: ../netstat.c:1240 ../netstat.c:1759
-++#, c-format
-+ msgid "(only servers)"
-+ msgstr "(Nur Server)"
-+ 
-+-#: ../netstat.c:1142 ../netstat.c:1671
-++#: ../netstat.c:1242 ../netstat.c:1761
-++#, c-format
-+ msgid "(w/o servers)"
-+ msgstr "(ohne Server)"
-+ 
-+-#: ../netstat.c:1145
-++#: ../netstat.c:1245
-++#, c-format
-+ msgid ""
-+ "\n"
-+ "Proto RefCnt Flags       Type       State         I-Node"
-+@@ -975,90 +909,90 @@ msgstr ""
-+ "\n"
-+ "Proto RefZ�h Flaggen     Typ        Zustand       I-Node"
-+ 
-+-#: ../netstat.c:1147
-++#: ../netstat.c:1247
-++#, c-format
-+ msgid " Path\n"
-+ msgstr " Pfad\n"
-+ 
-+-#: ../netstat.c:1167
-++#: ../netstat.c:1267
-+ msgid "SABM SENT"
-+ msgstr "SABM GESCHICKT"
-+ 
-+-#: ../netstat.c:1170
-++#: ../netstat.c:1270
-+ msgid "RECOVERY"
-+ msgstr "WIEDERHERSTELLUNG"
-+ 
-+-#: ../netstat.c:1184
-++#: ../netstat.c:1284
-++#, c-format
-+ msgid "Active AX.25 sockets\n"
-+ msgstr "Aktive AX.25 Sockets\n"
-+ 
-+-#: ../netstat.c:1185
-++#: ../netstat.c:1285
-++#, c-format
-+ msgid "Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-Q\n"
-+ msgstr "Ziel       Quelle     Ger�t   Zustand      Vr/Vs    Send-Q  Empf-Q\n"
-+ 
-+-#: ../netstat.c:1228
-++#: ../netstat.c:1328
-+ #, c-format
-+ msgid "problem reading data from %s\n"
-+ msgstr "Problem beim Lesen von Daten von %s\n"
-+ 
-+-#: ../netstat.c:1279
-++#: ../netstat.c:1379
-++#, c-format
-+ msgid ""
-+ "Active IPX sockets\n"
-+ "Proto Recv-Q Send-Q Local Address              Foreign Address            "
-+ "State"
-+ msgstr ""
-+ "Aktive IPX Sockets\n"
-+-"Proto Recv-Q Send-Q Lokale Adresse             Gegenaddress               "
-++"Proto Recv-Q Send-Q Lokale Adresse             Gegenadresse               "
-+ "Zustand"
-+ 
-+-#: ../netstat.c:1281
-++#: ../netstat.c:1381
-++#, c-format
-+ msgid " User"
-+ msgstr " Benutzer"
-+ 
-+-#: ../netstat.c:1315
-++#: ../netstat.c:1415
-+ msgid "ESTAB"
-+ msgstr "VERBUNDEN"
-+ 
-+-#: ../netstat.c:1323
-++#: ../netstat.c:1423
-+ msgid "UNK."
-+ msgstr "UNB."
-+ 
-+-#: ../netstat.c:1367
-+-msgid "     - no statistics available -"
-+-msgstr "     - keine Statistiken verf�gbar -"
-+-
-+-#: ../netstat.c:1370
-+-msgid "[NO FLAGS]"
-+-msgstr "[KEINE FLAGS]"
-+-
-+-#: ../netstat.c:1400
-++#: ../netstat.c:1461
-++#, c-format
-+ msgid "Kernel Interface table\n"
-+-msgstr "Kernel Schnittstellentabelle\n"
-++msgstr "Kernel-Schnittstellentabelle\n"
-+ 
-+-#: ../netstat.c:1401
-++#: ../netstat.c:1465
-++#, fuzzy, c-format
-+ msgid ""
-+-"Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
-+-"Flg\n"
-+-msgstr ""
-+-"SStelle MTU Met    RX-OK RX-Feh RX-DRP RX-�lf    TX-OK TX-Feh TX-DRP TX-�b "
-++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
-+ "Flg\n"
-++msgstr "SStelle MTU Met    RX-OK RX-Feh RX-DRP RX-�lf    TX-OK TX-Feh TX-DRP TX-�b Flg\n"
-+ 
-+-#: ../netstat.c:1404
-++#: ../netstat.c:1469
-+ msgid "missing interface information"
-+-msgstr "Fehlende Interfaceinformation"
-++msgstr "Fehlende Interfaceinformationen"
-+ 
-+-#: ../netstat.c:1425
-++#: ../netstat.c:1492
-++#, c-format
-+ msgid ""
-+-"usage: netstat [-veenNcCF] [<Af>] -r         netstat "
-+-"{-V|--version|-h|--help}\n"
-++"usage: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
-++"help}\n"
-+ msgstr ""
-+ "Benutzung: netstat [-veenNcCF] [<Af>] -r\n"
-+ "           netstat {-V|--version|-h|--help}\n"
-+ 
-+-#: ../netstat.c:1426
-++#: ../netstat.c:1493
-++#, c-format
-+ msgid "       netstat [-vnNcaeol] [<Socket> ...]\n"
-+ msgstr "       netstat [-vnNcaeol] [<Socket> ...]\n"
-+ 
-+-#: ../netstat.c:1427
-++#: ../netstat.c:1494
-++#, c-format
-+ msgid ""
-+ "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
-+ "\n"
-+@@ -1066,27 +1000,32 @@ msgstr ""
-+ "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
-+ "\n"
-+ 
-+-#: ../netstat.c:1429
-++#: ../netstat.c:1496
-++#, c-format
-+ msgid "        -r, --route              display routing table\n"
-+ msgstr "        -r, --route              Routentabelle anzeigen\n"
-+ 
-+-#: ../netstat.c:1430
-++#: ../netstat.c:1497
-++#, c-format
-+ msgid "        -i, --interfaces         display interface table\n"
-+ msgstr "        -i, --interfaces         Schnittstellentabelle auflisten\n"
-+ 
-+-#: ../netstat.c:1431
-++#: ../netstat.c:1498
-++#, c-format
-+ msgid "        -g, --groups             display multicast group memberships\n"
-+ msgstr ""
-+ "        -g, --groups             Mitgliedschaft in Multicastgruppen "
-+ "anzeigen\n"
-+ 
-+-#: ../netstat.c:1432
-++#: ../netstat.c:1499
-++#, c-format
-+ msgid ""
-+ "        -s, --statistics         display networking statistics (like SNMP)\n"
-+ msgstr ""
-+ "        -s, --statistics         Netzwerksstatistiken anzeigen (wie SNMP)\n"
-+ 
-+-#: ../netstat.c:1434
-++#: ../netstat.c:1501
-++#, c-format
-+ msgid ""
-+ "        -M, --masquerade         display masqueraded connections\n"
-+ "\n"
-+@@ -1094,23 +1033,38 @@ msgstr ""
-+ "        -M, --masquerade         Maskierte Verbindungen auflisten\n"
-+ "\n"
-+ 
-+-#: ../netstat.c:1438 ../route.c:87
-++#: ../netstat.c:1505
-++#, fuzzy, c-format
-++msgid "        --numeric-hosts          don't resolve host names\n"
-++msgstr "        -n, --numeric            Adressen nicht nach Namen aufl�sen\n"
-++
-++#: ../netstat.c:1506
-++#, fuzzy, c-format
-++msgid "        --numeric-ports          don't resolve port names\n"
-++msgstr "        -n, --numeric            Adressen nicht nach Namen aufl�sen\n"
-++
-++#: ../netstat.c:1507
-++#, fuzzy, c-format
-++msgid "        --numeric-users          don't resolve user names\n"
-++msgstr "        -n, --numeric            Adressen nicht nach Namen aufl�sen\n"
-++
-++#: ../netstat.c:1508
-++#, c-format
-+ msgid "        -N, --symbolic           resolve hardware names\n"
-+ msgstr "        -N, --symbolic           Hardwarenamen aufl�sen\n"
-+ 
-+-#: ../netstat.c:1439 ../route.c:88
-+-#, fuzzy
-++#: ../netstat.c:1509 ../route.c:88
-++#, fuzzy, c-format
-+ msgid "        -e, --extend             display other/more information\n"
-+-msgstr ""
-+-"        -e, --extend             Weitere / zus�tzliche Informationen "
-+-"anzeigen\n"
-++msgstr "        -e, --extend             Weitere / zus�tzliche Informationen anzeigen\n"
-+ 
-+-#: ../netstat.c:1440
-++#: ../netstat.c:1510
-++#, c-format
-+ msgid "        -p, --programs           display PID/Program name for sockets\n"
-+-msgstr ""
-+-"        -p, --programs           PID/Programmnamen f�r Sockets anzeigen\n"
-++msgstr "        -p, --programs           PID/Programmnamen f�r Sockets anzeigen\n"
-+ 
-+-#: ../netstat.c:1441
-++#: ../netstat.c:1511
-++#, c-format
-+ msgid ""
-+ "        -c, --continuous         continuous listing\n"
-+ "\n"
-+@@ -1118,24 +1072,27 @@ msgstr ""
-+ "        -c, --continuous         Anzeige laufend aktualisieren\n"
-+ "\n"
-+ 
-+-#: ../netstat.c:1442
-++#: ../netstat.c:1512
-++#, c-format
-+ msgid "        -l, --listening          display listening server sockets\n"
-+ msgstr ""
-+ "        -l, --listening          Empfangsbereite Serversockets auflisten\n"
-+ 
-+-#: ../netstat.c:1443
-++#: ../netstat.c:1513
-++#, c-format
-+ msgid ""
-+ "        -a, --all, --listening   display all sockets (default: connected)\n"
-+ msgstr ""
-+ "        -a, --all, --listening   Alle Sockets anzeigen (normal: nur "
-+ "verbundene)\n"
-+ 
-+-#: ../netstat.c:1444
-++#: ../netstat.c:1514
-++#, c-format
-+ msgid "        -o, --timers             display timers\n"
-+ msgstr "        -o, --timers             Timer auflisten\n"
-+ 
-+-#: ../netstat.c:1445 ../route.c:89
-+-#, fuzzy
-++#: ../netstat.c:1515 ../route.c:89
-++#, fuzzy, c-format
-+ msgid ""
-+ "        -F, --fib                display Forwarding Information Base "
-+ "(default)\n"
-+@@ -1143,7 +1100,8 @@ msgstr ""
-+ "        -F, --fib                Forwarding Infomation Base anzeigen "
-+ "(Standard)\n"
-+ 
-+-#: ../netstat.c:1446 ../route.c:90
-++#: ../netstat.c:1516 ../route.c:90
-++#, c-format
-+ msgid ""
-+ "        -C, --cache              display routing cache instead of FIB\n"
-+ "\n"
-+@@ -1151,110 +1109,118 @@ msgstr ""
-+ "        -C, --cache              Routencache statt FIB anzeigen\n"
-+ "\n"
-+ 
-+-#: ../netstat.c:1448
-++#: ../netstat.c:1518
-++#, c-format
-+ msgid ""
-+-"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
-+-"--netrom\n"
-++"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
-++"netrom\n"
-+ msgstr ""
-+-"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
-+-"--netrom\n"
-++"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
-++"netrom\n"
-+ 
-+-#: ../netstat.c:1449 ../route.c:92
-+-#, c-format
-+-msgid "  <AF>=Use '-A <af>' or '--<af>' Default: %s\n"
-++#: ../netstat.c:1519
-++#, fuzzy, c-format
-++msgid "  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"
-+ msgstr "  <AF>=,,-A <af>'' or ,,--<af>'' benutzen. Standard: %s\n"
-+ 
-+-#: ../netstat.c:1450 ../route.c:93
-++#: ../netstat.c:1520 ../route.c:93
-++#, c-format
-+ msgid "  List of possible address families (which support routing):\n"
-+ msgstr "  Liste m�glicher Adressfamilien, die Routen unterst�tzen:\n"
-+ 
-+-#: ../netstat.c:1663
-++#: ../netstat.c:1753
-++#, c-format
-+ msgid "Active Internet connections "
-+ msgstr "Aktive Internetverbindungen "
-+ 
-+-#: ../netstat.c:1673
-++#: ../netstat.c:1763
-++#, c-format
-+ msgid ""
-+ "\n"
-+-"Proto Recv-Q Send-Q Local Address           Foreign Address         State    "
-+-"  "
-++"Proto Recv-Q Send-Q Local Address           Foreign Address         "
-++"State      "
-+ msgstr ""
-+ "\n"
-+-"Proto Recv-Q Send-Q Local Address           Foreign Address         State    "
-+-"  "
-++"Proto Recv-Q Send-Q Local Address           Foreign Address         "
-++"State      "
-+ 
-+-#: ../netstat.c:1675
-++#: ../netstat.c:1765
-++#, c-format
-+ msgid " User       Inode     "
-+ msgstr " Benutzer   Inode     "
-+ 
-+-#: ../netstat.c:1678
-++#: ../netstat.c:1768
-++#, c-format
-+ msgid " Timer"
-+ msgstr " Timer"
-+ 
-+-#: ../netstat.c:1708
-++#: ../netstat.c:1798
-++#, c-format
-+ msgid "IPv4 Group Memberships\n"
-+-msgstr "IPv4 Gruppenmitgliedschaften\n"
-++msgstr "IPv4-Gruppenmitgliedschaften\n"
-+ 
-+-#: ../netstat.c:1709
-++#: ../netstat.c:1799
-++#, c-format
-+ msgid "Interface       RefCnt Group\n"
-+ msgstr "Schnittstelle   RefZ�h Grupp\n"
-+ 
-+-#: ../rarp.c:43
-++#: ../rarp.c:44
-+ msgid "This kernel does not support RARP.\n"
-+ msgstr "Dieser Kernel unterst�tzt kein RARP.\n"
-+ 
-+-#: ../rarp.c:82
-++#: ../rarp.c:83
-+ #, c-format
-+ msgid "no RARP entry for %s.\n"
-+-msgstr "Kein RARP Eintrag f�r %s.\n"
-++msgstr "Kein RARP-Eintrag f�r %s.\n"
-+ 
-+-#: ../rarp.c:95
-++#: ../rarp.c:96
-+ #, c-format
-+ msgid "%s: bad hardware address\n"
-+ msgstr "%s: fehlerhafte Hardwareadresse\n"
-+ 
-+-#: ../rarp.c:127
-++#: ../rarp.c:128
-+ #, c-format
-+ msgid "rarp: cannot open file %s:%s.\n"
-+ msgstr "rarp: kann Datei %s:%s nicht �ffnen.\n"
-+ 
-+-#: ../rarp.c:139
-++#: ../rarp.c:140
-+ #, c-format
-+ msgid "rarp: format error at %s:%u\n"
-+ msgstr "rarp: Formatfehler bei %s:%u\n"
-+ 
-+-#: ../rarp.c:143 ../rarp.c:287
-++#: ../rarp.c:144 ../rarp.c:289
-+ #, c-format
-+ msgid "rarp: %s: unknown host\n"
-+ msgstr "rarp: %s: Unbekannter Host\n"
-+ 
-+-#: ../rarp.c:146
-++#: ../rarp.c:147
-+ #, c-format
-+ msgid "rarp: cannot set entry from %s:%u\n"
-+ msgstr "rarp: Kann Eintrag aus %s:%u nicht setzen.\n"
-+ 
-+-#: ../rarp.c:175
-++#: ../rarp.c:176
-++#, c-format
-+ msgid "Usage: rarp -a                               list entries in cache.\n"
-+-msgstr ""
-+-"Benutzung: rarp -a                               Eintr�ge im Cache listen.\n"
-++msgstr "Benutzung: rarp -a                               Eintr�ge im Cache listen.\n"
-+ 
-+-#: ../rarp.c:176
-++#: ../rarp.c:177
-++#, c-format
-+ msgid "       rarp -d <hostname>                    delete entry from cache.\n"
-+-msgstr ""
-+-"       rarp -d <hostname>                    Eintrag aus dem Cache l�schen.\n"
-++msgstr "       rarp -d <hostname>                    Eintrag aus dem Cache l�schen.\n"
-+ 
-+-#: ../rarp.c:177
-++#: ../rarp.c:178
-++#, c-format
-+ msgid "       rarp [<HW>] -s <hostname> <hwaddr>    add entry to cache.\n"
-+-msgstr ""
-+-"       rarp [<HW>] -s <hostname> <hwaddr>    Eintrag zum Cache zuf�gen.\n"
-++msgstr "       rarp [<HW>] -s <hostname> <hwaddr>    Eintrag zum Cache zuf�gen.\n"
-+ 
-+-#: ../rarp.c:178
-++#: ../rarp.c:179
-++#, c-format
-+ msgid ""
-+ "       rarp -f                               add entries from /etc/ethers.\n"
-+-msgstr ""
-+-"       rarp -f                               Eintr�ge aus /etc/ethers "
-+-"zuf�gen.\n"
-++msgstr "       rarp -f                               Eintr�ge aus /etc/ethers zuf�gen.\n"
-+ 
-+-#: ../rarp.c:179
-++#: ../rarp.c:180
-++#, c-format
-+ msgid ""
-+ "       rarp -V                               display program version.\n"
-+ "\n"
-+@@ -1262,24 +1228,26 @@ msgstr ""
-+ "       rarp -V                               Programmversion anzeigen.\n"
-+ "\n"
-+ 
-+-#: ../rarp.c:236
-++#: ../rarp.c:238
-+ #, c-format
-+ msgid "%s: illegal option mix.\n"
-+ msgstr "%s: Unerlaubte Mischung von Optionen.\n"
-+ 
-+-#: ../rarp.c:267
-++#: ../rarp.c:269
-+ #, c-format
-+ msgid "rarp: %s: unknown hardware type.\n"
-+-msgstr "rarp: %s: unknown hardware type.\n"
-++msgstr "rarp: %s: unbekannter Hardwaretyp.\n"
-+ 
-+-#: ../route.c:79
-++#: ../route.c:80
-++#, c-format
-+ msgid ""
-+ "Usage: route [-nNvee] [-FC] [<AF>]           List kernel routing tables\n"
-+ msgstr ""
-+ "Benutzung: route [-nNvee] [-FC] [<AF>]           Kernelroutentabelle "
-+ "anzeigen\n"
-+ 
-+-#: ../route.c:80
-++#: ../route.c:81
-++#, c-format
-+ msgid ""
-+ "       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n"
-+ "\n"
-+@@ -1287,14 +1255,15 @@ msgstr ""
-+ "       route [-v] [-FC] {add|del|flush} ...  Routentabelle f�r AF �ndern.\n"
-+ "\n"
-+ 
-+-#: ../route.c:82
-++#: ../route.c:83
-++#, c-format
-+ msgid ""
-+ "       route {-h|--help} [<AF>]              Detailed usage syntax for "
-+ "specified AF.\n"
-+-msgstr ""
-+-"       route {-h|--help} [<AF>]              Genaue Syntax f�r AF anzeigen.\n"
-++msgstr "       route {-h|--help} [<AF>]              Genaue Syntax f�r AF anzeigen.\n"
-+ 
-+-#: ../route.c:83
-++#: ../route.c:84
-++#, c-format
-+ msgid ""
-+ "       route {-V|--version}                  Display version/author and "
-+ "exit.\n"
-+@@ -1304,590 +1273,891 @@ msgstr ""
-+ "Ende.\n"
-+ "\n"
-+ 
-++#: ../route.c:92
-++#, fuzzy, c-format
-++msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
-++msgstr "  <AF>=,,-A <af>'' or ,,--<af>'' benutzen. Standard: %s\n"
-++
-+ #: ../plipconfig.c:66
-++#, c-format
-+ msgid "Usage: plipconfig [-a] [-i] [-v] interface\n"
-+ msgstr "Benutzung: plipconfig [-a] [-i] [-v] Interface\n"
-+ 
-+ #: ../plipconfig.c:67
-++#, c-format
-+ msgid "                  [nibble NN] [trigger NN]\n"
-+ msgstr "                  [nibble NN] [trigger NN]\n"
-+ 
-+ #: ../plipconfig.c:68
-+-#, fuzzy
-++#, c-format
-+ msgid "       plipconfig -V | --version\n"
-+-msgstr "       plipconfig -V\n"
-++msgstr "       plipconfig -V | --version\n"
-+ 
-+ #: ../plipconfig.c:74
-+ #, c-format
-+ msgid "%s\tnibble %lu  trigger %lu\n"
-+ msgstr "%s\tnibble %lu  trigger %lu\n"
-+ 
-+-#: ../iptunnel.c:79
-++#: ../iptunnel.c:85
-++#, c-format
-+ msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
-+ msgstr "Benutzung: iptunnel { add | change | del | show } [ NAME ]\n"
-+ 
-+-#: ../iptunnel.c:80
-++#: ../iptunnel.c:86
-++#, c-format
-+ msgid ""
-+ "          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
-+ msgstr "          [ mode { ipip | gre | sit } ] [ remote ADR ] [ local ADR ]\n"
-+ 
-+-#: ../iptunnel.c:81
-++#: ../iptunnel.c:87
-++#, c-format
-+ msgid "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
-+ msgstr "          [ [i|o]seq ] [ [i|o]key SCHL�SSEL ] [ [i|o]csum ]\n"
-+ 
-+-#: ../iptunnel.c:82
-+-#, fuzzy
-++#: ../iptunnel.c:88
-++#, c-format
-+ msgid "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
-+-msgstr ""
-+-"          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_GER�t ]\n"
-+-"\n"
-++msgstr "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_GER�t ]\n"
-+ 
-+-#: ../iptunnel.c:83
-++#: ../iptunnel.c:89
-++#, c-format
-+ msgid ""
-+ "       iptunnel -V | --version\n"
-+ "\n"
-+ msgstr ""
-++"       iptunnel -V | --version\n"
-++"\n"
-+ 
-+-#: ../iptunnel.c:84
-++#: ../iptunnel.c:90
-++#, c-format
-+ msgid "Where: NAME := STRING\n"
-+ msgstr "Wobei: NAME := ZEICHENKETTE\n"
-+ 
-+-#: ../iptunnel.c:85
-++#: ../iptunnel.c:91
-++#, c-format
-+ msgid "       ADDR := { IP_ADDRESS | any }\n"
-+ msgstr "       ADR := { IP_ADRESSE | any }\n"
-+ 
-+-#: ../iptunnel.c:86
-++#: ../iptunnel.c:92
-++#, c-format
-+ msgid "       TOS  := { NUMBER | inherit }\n"
-+ msgstr "       TOS  := { NUMBER | inherit }\n"
-+ 
-+-#: ../iptunnel.c:87
-++#: ../iptunnel.c:93
-++#, c-format
-+ msgid "       TTL  := { 1..255 | inherit }\n"
-+ msgstr "       TTL  := { 1..255 | inherit }\n"
-+ 
-+-#: ../iptunnel.c:88
-++#: ../iptunnel.c:94
-++#, c-format
-+ msgid "       KEY  := { DOTTED_QUAD | NUMBER }\n"
-+ msgstr "       KEY  := { DOTTED_QUAD | ZAHL }\n"
-+ 
-+-#: ../iptunnel.c:326
-++#: ../iptunnel.c:332
-++#, c-format
-+ msgid "Keys are not allowed with ipip and sit.\n"
-+ msgstr "Schl�ssel sind mit ipip und sit nicht erlaubt.\n"
-+ 
-+-#: ../iptunnel.c:346
-++#: ../iptunnel.c:352
-++#, c-format
-+ msgid "Broadcast tunnel requires a source address.\n"
-+ msgstr "Ein Broadcasttunnel ist nur mit einer Quelladresse m�glich\n"
-+ 
-+-#: ../iptunnel.c:361
-++#: ../iptunnel.c:367
-++#, c-format
-+ msgid "ttl != 0 and noptmudisc are incompatible\n"
-+ msgstr "ttl != 0 und noptmudisc sind inkompatibel\n"
-+ 
-+-#: ../iptunnel.c:373
-++#: ../iptunnel.c:379
-++#, c-format
-+ msgid "cannot determine tunnel mode (ipip, gre or sit)\n"
-+ msgstr ""
-+ "Die Tunnelbetriebsart (ipip, fre oder sit) kann nicht festgestellt werden\n"
-+ 
-+-#: ../iptunnel.c:411
-++#: ../iptunnel.c:417
-+ #, c-format
-+ msgid "%s: %s/ip  remote %s  local %s "
-+ msgstr "%s: %s/ip  Gegenseite %s  lokal %s "
-+ 
-+-#: ../iptunnel.c:415
-++#: ../iptunnel.c:421
-+ msgid "unknown"
-+ msgstr "Unbekannt"
-+ 
-+-#: ../iptunnel.c:447
-++#: ../iptunnel.c:453
-++#, c-format
-+ msgid "  Drop packets out of sequence.\n"
-+ msgstr "  Pakete au�er der Reihenfolge fallenlassen.\n"
-+ 
-+-#: ../iptunnel.c:449
-++#: ../iptunnel.c:455
-++#, c-format
-+ msgid "  Checksum in received packet is required.\n"
-+ msgstr "  Pr�fsumme im empfangenen Paket wird ben�tigt.\n"
-+ 
-+-#: ../iptunnel.c:451
-++#: ../iptunnel.c:457
-++#, c-format
-+ msgid "  Sequence packets on output.\n"
-+ msgstr "  Pakete in Reihenfolge ausgeben.\n"
-+ 
-+-#: ../iptunnel.c:453
-++#: ../iptunnel.c:459
-++#, c-format
-+ msgid "  Checksum output packets.\n"
-+ msgstr "  Pr�fsumme f�r ausgegebene Pakete berechnen.\n"
-+ 
-+-#: ../iptunnel.c:481
-++#: ../iptunnel.c:487
-++#, c-format
-+ msgid "Wrong format of /proc/net/dev. Sorry.\n"
-+-msgstr "Falsches Format von /proc/net/dev. Tut mir leid\n"
-++msgstr "Falsches Format von /proc/net/dev. Tut mir leid.\n"
-+ 
-+-#: ../iptunnel.c:494
-++#: ../iptunnel.c:500
-+ #, c-format
-+ msgid "Failed to get type of [%s]\n"
-+ msgstr "Kann den Typ von [%s] nicht holen\n"
-+ 
-+-#: ../iptunnel.c:510
-++#: ../iptunnel.c:516
-++#, c-format
-+ msgid "RX: Packets    Bytes        Errors CsumErrs OutOfSeq Mcasts\n"
-+ msgstr "RX: Pakete     Bytes        Fehler CsumErrs OutOfSeq Mcasts\n"
-+ 
-+-#: ../iptunnel.c:513
-++#: ../iptunnel.c:519
-++#, c-format
-+ msgid "TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs\n"
-+ msgstr "TX: Pakete     Bytes        Fehler DeadLoop NoRoute  NoBufs\n"
-+ 
-+-#: ../statistics.c:45
-++#: ../statistics.c:47
-+ msgid "ICMP input histogram:"
-+-msgstr "ICMP Eingabehistogramm:"
-++msgstr "ICMP-Eingabehistogramm:"
-+ 
-+-#: ../statistics.c:46
-++#: ../statistics.c:48
-+ msgid "ICMP output histogram:"
-+-msgstr "ICMP Ausgabehistogramm:"
-++msgstr "ICMP-Ausgabehistogramm:"
-+ 
-+-#: ../statistics.c:63
-++#: ../statistics.c:65
-+ #, c-format
-+ msgid "Forwarding is %s"
-+ msgstr "Weiterleitung ist %s"
-+ 
-+-#: ../statistics.c:64
-+-#, c-format
-+-msgid "Default TTL is %d"
-++#: ../statistics.c:66
-++#, fuzzy, c-format
-++msgid "Default TTL is %u"
-+ msgstr "Standard-TTL ist %d"
-+ 
-+-#: ../statistics.c:65
-+-#, c-format
-+-msgid "%d total packets received"
-+-msgstr "%d Pakete insgesamt empfangen"
-++#: ../statistics.c:67
-++#, fuzzy, c-format
-++msgid "%u total packets received"
-++msgstr "%d Pakete insgesamt empfangen"
-+ 
-+-#: ../statistics.c:66
-+-#, c-format
-+-msgid "%d with invalid headers"
-+-msgstr "%d with ung�ltigen Headern"
-++#: ../statistics.c:68
-++#, fuzzy, c-format
-++msgid "%u with invalid headers"
-++msgstr "%d mit ung�ltigen Headern"
-+ 
-+-#: ../statistics.c:67
-+-#, c-format
-+-msgid "%d with invalid addresses"
-++#: ../statistics.c:69
-++#, fuzzy, c-format
-++msgid "%u with invalid addresses"
-+ msgstr "%d mit ung�ltigen Adressen"
-+ 
-+-#: ../statistics.c:68
-+-#, c-format
-+-msgid "%d forwarded"
-++#: ../statistics.c:70
-++#, fuzzy, c-format
-++msgid "%u forwarded"
-+ msgstr "%d weitergeleitet"
-+ 
-+-#: ../statistics.c:69
-+-#, c-format
-+-msgid "%d with unknown protocol"
-++#: ../statistics.c:71
-++#, fuzzy, c-format
-++msgid "%u with unknown protocol"
-+ msgstr "%d mit unbekanntem Protokoll"
-+ 
-+-#: ../statistics.c:70
-+-#, c-format
-+-msgid "%d incoming packets discarded"
-++#: ../statistics.c:72
-++#, fuzzy, c-format
-++msgid "%u incoming packets discarded"
-+ msgstr "%d eingehende Pakete weggeworfen"
-+ 
-+-#: ../statistics.c:71
-+-#, c-format
-+-msgid "%d incoming packets delivered"
-++#: ../statistics.c:73
-++#, fuzzy, c-format
-++msgid "%u incoming packets delivered"
-+ msgstr "%d eingehende Pakete zugestellt"
-+ 
-+-#: ../statistics.c:72
-+-#, c-format
-+-msgid "%d requests sent out"
-++#: ../statistics.c:74
-++#, fuzzy, c-format
-++msgid "%u requests sent out"
-+ msgstr "%d Anfragen ausgesandt"
-+ 
-+ #. ?
-+-#: ../statistics.c:73
-+-#, c-format
-+-msgid "%d outgoing packets dropped"
-++#: ../statistics.c:75
-++#, fuzzy, c-format
-++msgid "%u outgoing packets dropped"
-+ msgstr "%d ausgehende Pakete weggeworfen"
-+ 
-+-#: ../statistics.c:74
-+-#, c-format
-+-msgid "%d dropped because of missing route"
-++#: ../statistics.c:76
-++#, fuzzy, c-format
-++msgid "%u dropped because of missing route"
-+ msgstr "%d weggeworfen wegen fehlender Route"
-+ 
-+-#: ../statistics.c:75
-+-#, c-format
-+-msgid "%d fragments dropped after timeout"
-++#: ../statistics.c:77
-++#, fuzzy, c-format
-++msgid "%u fragments dropped after timeout"
-+ msgstr "%d Fragmente nach Timeout weggeworfen"
-+ 
-+-#: ../statistics.c:76
-+-#, c-format
-+-msgid "%d reassemblies required"
-++#: ../statistics.c:78
-++#, fuzzy, c-format
-++msgid "%u reassemblies required"
-+ msgstr "%d Wiederzusammenstellungen n�tig"
-+ 
-+ #. ?
-+-#: ../statistics.c:77
-+-#, c-format
-+-msgid "%d packets reassembled ok"
-++#: ../statistics.c:79
-++#, fuzzy, c-format
-++msgid "%u packets reassembled ok"
-+ msgstr "%d Fragmente korrekt empfangen"
-+ 
-+-#: ../statistics.c:78
-+-#, c-format
-+-msgid "%d packet reassembles failed"
-++#: ../statistics.c:80
-++#, fuzzy, c-format
-++msgid "%u packet reassembles failed"
-+ msgstr "%d fehlgeschlagene Paketdefragmentierungen"
-+ 
-+-#: ../statistics.c:79
-+-#, c-format
-+-msgid "%d fragments received ok"
-++#: ../statistics.c:81
-++#, fuzzy, c-format
-++msgid "%u fragments received ok"
-+ msgstr "%d Fragmente korrekt empfangen"
-+ 
-+-#: ../statistics.c:80
-+-#, c-format
-+-msgid "%d fragments failed"
-+-msgstr "%d Fragmente Fehlgeschlagen"
-++#: ../statistics.c:82
-++#, fuzzy, c-format
-++msgid "%u fragments failed"
-++msgstr "%d Fragmente fehlgeschlagen"
-+ 
-+-#: ../statistics.c:81
-+-#, c-format
-+-msgid "%d fragments created"
-++#: ../statistics.c:83
-++#, fuzzy, c-format
-++msgid "%u fragments created"
-+ msgstr "%d Fragmente erzeugt"
-+ 
-+-#: ../statistics.c:86
-+-#, c-format
-+-msgid "%d ICMP messages received"
-+-msgstr "%d ICMP Nachrichten empfangen"
-++#: ../statistics.c:88
-++#, fuzzy, c-format
-++msgid "%u ICMP messages received"
-++msgstr "%d ICMP-Nachrichten empfangen"
-+ 
-+-#: ../statistics.c:87
-+-#, c-format
-+-msgid "%d input ICMP message failed."
-+-msgstr "%d eingegangene ICMP Nachrichten fehlgeschlagen"
-++#: ../statistics.c:89
-++#, fuzzy, c-format
-++msgid "%u input ICMP message failed."
-++msgstr "%d eingegangene ICMP-Nachrichten fehlgeschlagen"
-+ 
-+-#: ../statistics.c:88 ../statistics.c:101
-+-#, c-format
-+-msgid "destination unreachable: %d"
-++#: ../statistics.c:90 ../statistics.c:103
-++#, fuzzy, c-format
-++msgid "destination unreachable: %u"
-+ msgstr "Ziel unerreichbar: %d"
-+ 
-+-#: ../statistics.c:89
-+-#, c-format
-+-msgid "timeout in transit: %d"
-++#: ../statistics.c:91
-++#, fuzzy, c-format
-++msgid "timeout in transit: %u"
-+ msgstr "Timeout beim Transit: %d"
-+ 
-+-#: ../statistics.c:90 ../statistics.c:103
-+-#, c-format
-+-msgid "wrong parameters: %d"
-++#: ../statistics.c:92 ../statistics.c:105
-++#, fuzzy, c-format
-++msgid "wrong parameters: %u"
-+ msgstr "Fehlerhafte Parameter: %d"
-+ 
-+ #. ?
-+-#: ../statistics.c:91
-+-#, c-format
-+-msgid "source quenchs: %d"
-++#: ../statistics.c:93
-++#, fuzzy, c-format
-++msgid "source quenches: %u"
-+ msgstr "Source Quenchs: %d"
-+ 
-+-#: ../statistics.c:92
-+-#, c-format
-+-msgid "redirects: %d"
-++#: ../statistics.c:94
-++#, fuzzy, c-format
-++msgid "redirects: %u"
-+ msgstr "Umleitungen: %d"
-+ 
-+-#: ../statistics.c:93
-+-#, c-format
-+-msgid "echo requests: %d"
-+-msgstr "Echo Requests: %d"
-++#: ../statistics.c:95
-++#, fuzzy, c-format
-++msgid "echo requests: %u"
-++msgstr "Echo Anfragen: %d"
-+ 
-+-#: ../statistics.c:94 ../statistics.c:107
-+-#, c-format
-+-msgid "echo replies: %d"
-++#: ../statistics.c:96 ../statistics.c:109
-++#, fuzzy, c-format
-++msgid "echo replies: %u"
-+ msgstr "Echo Antworten: %d"
-+ 
-+-#: ../statistics.c:95
-+-#, c-format
-+-msgid "timestamp request: %d"
-++#: ../statistics.c:97
-++#, fuzzy, c-format
-++msgid "timestamp request: %u"
-+ msgstr "Zeitstempelanfragen: %d"
-+ 
-+-#: ../statistics.c:96
-+-#, c-format
-+-msgid "timestamp reply: %d"
-++#: ../statistics.c:98
-++#, fuzzy, c-format
-++msgid "timestamp reply: %u"
-+ msgstr "Zeitstempelantworten: %d"
-+ 
-+-#: ../statistics.c:97
-+-#, c-format
-+-msgid "address mask request: %d"
-++#: ../statistics.c:99
-++#, fuzzy, c-format
-++msgid "address mask request: %u"
-+ msgstr "Adressmaskenanfragen: %d"
-+ 
-+ #. ?
-+-#: ../statistics.c:98
-+-msgid "address mask replies"
-+-msgstr "Adressmaskenantworten"
-++#: ../statistics.c:100 ../statistics.c:113
-++#, fuzzy, c-format
-++msgid "address mask replies: %u"
-++msgstr "Adressmaskenantworten: %d"
-+ 
-+ #. ?
-+-#: ../statistics.c:99
-+-#, c-format
-+-msgid "%d ICMP messages sent"
-++#: ../statistics.c:101
-++#, fuzzy, c-format
-++msgid "%u ICMP messages sent"
-+ msgstr "%d ICMP-Nachrichten geschickt"
-+ 
-+-#: ../statistics.c:100
-+-#, c-format
-+-msgid "%d ICMP messages failed"
-+-msgstr "%d ICMP Nachrichten fehlgeschlagen"
-+-
-+ #: ../statistics.c:102
-+-#, c-format
-+-msgid "time exceeded: %d"
-++#, fuzzy, c-format
-++msgid "%u ICMP messages failed"
-++msgstr "%d ICMP-Nachrichten fehlgeschlagen"
-++
-++#: ../statistics.c:104
-++#, fuzzy, c-format
-++msgid "time exceeded: %u"
-+ msgstr "Zeit�berschreitung: %d"
-+ 
-+ #. ?
-+-#: ../statistics.c:104
-+-#, c-format
-+-msgid "source quench: %d"
-++#: ../statistics.c:106
-++#, fuzzy, c-format
-++msgid "source quench: %u"
-+ msgstr "Source Quench: %d"
-+ 
-+-#: ../statistics.c:105
-+-#, c-format
-+-msgid "redirect: %d"
-++#: ../statistics.c:107
-++#, fuzzy, c-format
-++msgid "redirect: %u"
-+ msgstr "Umleitungen: %d"
-+ 
-+-#: ../statistics.c:106
-+-#, c-format
-+-msgid "echo request: %d"
-++#: ../statistics.c:108
-++#, fuzzy, c-format
-++msgid "echo request: %u"
-+ msgstr "Echo Anfragen: %d"
-+ 
-+-#: ../statistics.c:108
-+-#, c-format
-+-msgid "timestamp requests: %d"
-++#: ../statistics.c:110
-++#, fuzzy, c-format
-++msgid "timestamp requests: %u"
-+ msgstr "Zeitstempel Anfragen: %d"
-+ 
-+-#: ../statistics.c:109
-+-#, c-format
-+-msgid "timestamp replies: %d"
-++#: ../statistics.c:111
-++#, fuzzy, c-format
-++msgid "timestamp replies: %u"
-+ msgstr "Zeitstempel Antworten: %d"
-+ 
-+-#: ../statistics.c:110
-+-#, c-format
-+-msgid "address mask requests: %d"
-++#: ../statistics.c:112
-++#, fuzzy, c-format
-++msgid "address mask requests: %u"
-+ msgstr "Adressmaskenanfragen: %d"
-+ 
-+-#: ../statistics.c:111
-++#: ../statistics.c:118
-+ #, c-format
-+-msgid "address mask replies: %d"
-+-msgstr "Adressmaskenantworten: %d"
-++msgid "RTO algorithm is %s"
-++msgstr "RTO-Algorithmus ist %s"
-++
-++#: ../statistics.c:122
-++#, fuzzy, c-format
-++msgid "%u active connections openings"
-++msgstr "%d Verbindungen aktiv ge�ffnet"
-++
-++#: ../statistics.c:123
-++#, fuzzy, c-format
-++msgid "%u passive connection openings"
-++msgstr "%d Verbindungen passiv ge�ffnet"
-++
-++#: ../statistics.c:124
-++#, fuzzy, c-format
-++msgid "%u failed connection attempts"
-++msgstr "%d fehlerhafte Verbindungsversuche"
-++
-++#: ../statistics.c:125
-++#, fuzzy, c-format
-++msgid "%u connection resets received"
-++msgstr "%d Verbindungsr�cksetzungen empfangen"
-++
-++#: ../statistics.c:126
-++#, fuzzy, c-format
-++msgid "%u connections established"
-++msgstr "%d Verbindungen aufgebaut"
-++
-++#: ../statistics.c:127
-++#, fuzzy, c-format
-++msgid "%u segments received"
-++msgstr "%d Segmente empfangen"
-++
-++#: ../statistics.c:128
-++#, fuzzy, c-format
-++msgid "%u segments send out"
-++msgstr "%d Segmente abgeschickt"
-++
-++#: ../statistics.c:129
-++#, fuzzy, c-format
-++msgid "%u segments retransmited"
-++msgstr "%d Segmente erneut geschickt"
-++
-++#: ../statistics.c:130
-++#, fuzzy, c-format
-++msgid "%u bad segments received."
-++msgstr "%d fehlerhafte Segmente empfangen."
-++
-++#: ../statistics.c:131
-++#, fuzzy, c-format
-++msgid "%u resets sent"
-++msgstr "%d R�cksetzungen geschickt"
-++
-++#: ../statistics.c:136
-++#, fuzzy, c-format
-++msgid "%u packets received"
-++msgstr "%d Pakete empfangen"
-++
-++#: ../statistics.c:137
-++#, fuzzy, c-format
-++msgid "%u packets to unknown port received."
-++msgstr "%d Pakete f�r unbekannte Ports empfangen."
-++
-++#: ../statistics.c:138
-++#, fuzzy, c-format
-++msgid "%u packet receive errors"
-++msgstr "%d Paketempfangsfehler"
-++
-++#: ../statistics.c:139
-++#, fuzzy, c-format
-++msgid "%u packets sent"
-++msgstr "%d Pakete geschickt"
-++
-++#: ../statistics.c:144
-++#, fuzzy, c-format
-++msgid "%u SYN cookies sent"
-++msgstr "%d SYN-Cookies verschickt"
-++
-++#: ../statistics.c:145
-++#, fuzzy, c-format
-++msgid "%u SYN cookies received"
-++msgstr "%d SYN-Cookies empfangen"
-+ 
-+-#: ../statistics.c:116
-++#: ../statistics.c:146
-++#, fuzzy, c-format
-++msgid "%u invalid SYN cookies received"
-++msgstr "%d ung�ltige SYN-Cookies empfangen"
-++
-++#: ../statistics.c:148
-++#, fuzzy, c-format
-++msgid "%u resets received for embryonic SYN_RECV sockets"
-++msgstr "%d R�cksetzungen f�r embrionische SYN_RECV-Sockets"
-++
-++#: ../statistics.c:150
-++#, fuzzy, c-format
-++msgid "%u packets pruned from receive queue because of socket buffer overrun"
-++msgstr "%d Pakete wegen Socketpuffer�berlauf aus der Empfangswarteschlange weggeworfen"
-++
-++#. obsolete: 2.2.0 doesn't do that anymore
-++#: ../statistics.c:153
-++#, fuzzy, c-format
-++msgid "%u packets pruned from receive queue"
-++msgstr "%d Pakete aus der ungeordneten Warteschlange weggeworfen"
-++
-++#: ../statistics.c:154
-++#, fuzzy, c-format
-++msgid ""
-++"%u packets dropped from out-of-order queue because of socket buffer overrun"
-++msgstr "%d Pakete aus der ungeordneten Warteschlange wegen Puffer�berlauf weggeworfen"
-++
-++#: ../statistics.c:156
-++#, fuzzy, c-format
-++msgid "%u ICMP packets dropped because they were out-of-window"
-++msgstr "%d ICMP-Pakete weggeworfen die au�erhalb des Fensters waren"
-++
-++#: ../statistics.c:158
-++#, fuzzy, c-format
-++msgid "%u ICMP packets dropped because socket was locked"
-++msgstr "%d ICMP-Pakete verworfen weil Socket gesperrt war"
-++
-++#: ../statistics.c:160
-+ #, c-format
-+-msgid "RTO algorithm is %s"
-+-msgstr "RTO Algorithmus is %s"
-++msgid "%u TCP sockets finished time wait in fast timer"
-++msgstr ""
-+ 
-+-#: ../statistics.c:120
-++#: ../statistics.c:161
-+ #, c-format
-+-msgid "%d active connections openings"
-+-msgstr "%d Verbindungen aktiv ge�ffnet"
-++msgid "%u time wait sockets recycled by time stamp"
-++msgstr ""
-+ 
-+-#: ../statistics.c:121
-++#: ../statistics.c:162
-+ #, c-format
-+-msgid "%d passive connection openings"
-+-msgstr "%d Verbindungen passiv ge�ffnet"
-++msgid "%u TCP sockets finished time wait in slow timer"
-++msgstr ""
-+ 
-+-#: ../statistics.c:122
-++#: ../statistics.c:163
-+ #, c-format
-+-msgid "%d failed connection attempts"
-+-msgstr "%d fehlerhafte Verbindungsversuche"
-++msgid "%u passive connections rejected because of time stamp"
-++msgstr ""
-+ 
-+-#: ../statistics.c:123
-++#: ../statistics.c:165
-+ #, c-format
-+-msgid "%d connection resets received"
-+-msgstr "%d Verbindungsr�cksetzungen empfangen"
-++msgid "%u active connections rejected because of time stamp"
-++msgstr ""
-+ 
-+-#: ../statistics.c:124
-++#: ../statistics.c:167
-+ #, c-format
-+-msgid "%d connections established"
-+-msgstr "%d Verbindungen aufgebaut"
-++msgid "%u packets rejects in established connections because of timestamp"
-++msgstr ""
-+ 
-+-#: ../statistics.c:125
-++#: ../statistics.c:169
-++#, fuzzy, c-format
-++msgid "%u delayed acks sent"
-++msgstr "%d Pakete geschickt"
-++
-++#: ../statistics.c:170
-+ #, c-format
-+-msgid "%d segments received"
-+-msgstr "%d Segmente empfangen"
-++msgid "%u delayed acks further delayed because of locked socket"
-++msgstr ""
-+ 
-+-#: ../statistics.c:126
-++#: ../statistics.c:172
-+ #, c-format
-+-msgid "%d segments send out"
-+-msgstr "%d Segmente abgeschickt"
-++msgid "Quick ack mode was activated %u times"
-++msgstr ""
-+ 
-+-#: ../statistics.c:127
-++#: ../statistics.c:173
-+ #, c-format
-+-msgid "%d segments retransmited"
-+-msgstr "%d Segmente erneut geschickt"
-++msgid "%u times the listen queue of a socket overflowed"
-++msgstr ""
-+ 
-+-#: ../statistics.c:128
-++#: ../statistics.c:175
-+ #, c-format
-+-msgid "%d bad segments received."
-+-msgstr "%d fehlerhafte Segmente empfangen."
-++msgid "%u SYNs to LISTEN sockets ignored"
-++msgstr ""
-+ 
-+-#: ../statistics.c:129
-++#: ../statistics.c:176
-+ #, c-format
-+-msgid "%d resets sent"
-+-msgstr "%d R�cksetzungen geschickt"
-++msgid "%u packets directly queued to recvmsg prequeue."
-++msgstr ""
-+ 
-+-#: ../statistics.c:134
-++#: ../statistics.c:178
-+ #, c-format
-+-msgid "%d packets received"
-++msgid "%u of bytes directly received from backlog"
-++msgstr ""
-++
-++#: ../statistics.c:180
-++#, c-format
-++msgid "%u of bytes directly received from prequeue"
-++msgstr ""
-++
-++#: ../statistics.c:182
-++#, fuzzy, c-format
-++msgid "%u packets dropped from prequeue"
-++msgstr "%d Pakete aus der ungeordneten Warteschlange weggeworfen"
-++
-++#: ../statistics.c:183
-++#, fuzzy, c-format
-++msgid "%u packet headers predicted"
-+ msgstr "%d Pakete empfangen"
-+ 
-+-#: ../statistics.c:135
-++#: ../statistics.c:184
-+ #, c-format
-+-msgid "%d packets to unknown port received."
-++msgid "%u packets header predicted and directly queued to user"
-++msgstr ""
-++
-++#: ../statistics.c:186
-++#, c-format
-++msgid "Ran %u times out of system memory during packet sending"
-++msgstr ""
-++
-++#: ../statistics.c:188
-++#, fuzzy, c-format
-++msgid "%u acknowledgments not containing data received"
-+ msgstr "%d Pakete f�r unbekannte Ports empfangen."
-+ 
-+-#: ../statistics.c:136
-++#: ../statistics.c:189
-+ #, c-format
-+-msgid "%d packet receive errors"
-+-msgstr "%d Paketempfangsfehler"
-++msgid "%u predicted acknowledgments"
-++msgstr ""
-+ 
-+-#: ../statistics.c:137
-++#: ../statistics.c:190
-+ #, c-format
-+-msgid "%d packets sent"
-+-msgstr "%d Pakete geschickt"
-++msgid "%u times recovered from packet loss due to fast retransmit"
-++msgstr ""
-+ 
-+-#: ../statistics.c:142
-++#: ../statistics.c:191
-+ #, c-format
-+-msgid "%d SYN cookies sent"
-+-msgstr "%d SYN-Cookies verschickt"
-++msgid "%u times recovered from packet loss due to SACK data"
-++msgstr ""
-+ 
-+-#: ../statistics.c:143
-++#: ../statistics.c:192
-++#, fuzzy, c-format
-++msgid "%u bad SACKs received"
-++msgstr "%d fehlerhafte Segmente empfangen."
-++
-++#: ../statistics.c:193
-+ #, c-format
-+-msgid "%d SYN cookies received"
-+-msgstr "%d SYN-Cookies empfangen"
-++msgid "Detected reordering %u times using FACK"
-++msgstr ""
-+ 
-+-#: ../statistics.c:144
-++#: ../statistics.c:194
-+ #, c-format
-+-msgid "%d invalid SYN cookies received"
-+-msgstr "%d ung�ltige SYN-Cookies empfangen"
-++msgid "Detected reordering %u times using SACK"
-++msgstr ""
-+ 
-+-#: ../statistics.c:146
-++#: ../statistics.c:195
-+ #, c-format
-+-msgid "%d resets received for embryonic SYN_RECV sockets"
-+-msgstr "%d R�cksetzungen fuer embrionische SYN_RECV Sockets"
-++msgid "Detected reordering %u times using time stamp"
-++msgstr ""
-+ 
-+-#: ../statistics.c:148
-++#: ../statistics.c:196
-+ #, c-format
-+-msgid "%d packets pruned from receive queue because of socket buffer overrun"
-++msgid "Detected reordering %u times using reno fast retransmit"
-+ msgstr ""
-+-"%d Pakete wegen Socketpuffer�berlauf aus der Empfangswarteschlange "
-+-"weggeworfen"
-+ 
-+-#. obsolete: 2.2.0 doesn't do that anymore
-+-#: ../statistics.c:151
-++#: ../statistics.c:197
-+ #, c-format
-+-msgid "%d packets pruned from out-of-order queue"
-+-msgstr "%d Pakete aus der ungeordneten Warteschlange weggeworfen"
-++msgid "%u congestion windows fully recovered"
-++msgstr ""
-+ 
-+-#: ../statistics.c:152
-++#: ../statistics.c:198
-+ #, c-format
-+-msgid ""
-+-"%d packets dropped from out-of-order queue because of socket buffer overrun"
-++msgid "%u congestion windows partially recovered using Hoe heuristic"
-+ msgstr ""
-+-"%d Pakete aus der ungeordneten Warteschlange wegen Puffer�berlauf weggeworfen"
-+ 
-+-#: ../statistics.c:154
-++#: ../statistics.c:199
-+ #, c-format
-+-msgid "%d ICMP packets dropped because they were out-of-window"
-+-msgstr "%d ICMP Pakete weggeworfen die auserhalb des Fensters waren"
-++msgid "%u congestion window recovered using DSACK"
-++msgstr ""
-+ 
-+-#: ../statistics.c:156
-++#: ../statistics.c:200
-++#, c-format
-++msgid "%u congestion windows recovered after partial ack"
-++msgstr ""
-++
-++#: ../statistics.c:201
-++#, fuzzy, c-format
-++msgid "%u retransmits lost"
-++msgstr "%d R�cksetzungen geschickt"
-++
-++#: ../statistics.c:202
-++#, c-format
-++msgid "%u timeouts after reno fast retransmit"
-++msgstr ""
-++
-++#: ../statistics.c:203
-++#, c-format
-++msgid "%u timeouts after SACK recovery"
-++msgstr ""
-++
-++#: ../statistics.c:204
-++#, c-format
-++msgid "%u timeouts in loss state"
-++msgstr ""
-++
-++#: ../statistics.c:205
-++#, fuzzy, c-format
-++msgid "%u fast retransmits"
-++msgstr "%d Segmente erneut geschickt"
-++
-++#: ../statistics.c:206
-++#, c-format
-++msgid "%u forward retransmits"
-++msgstr ""
-++
-++#: ../statistics.c:207
-++#, c-format
-++msgid "%u retransmits in slow start"
-++msgstr ""
-++
-++#: ../statistics.c:208
-++#, c-format
-++msgid "%u other TCP timeouts"
-++msgstr ""
-++
-++#: ../statistics.c:209
-++#, fuzzy, c-format
-++msgid "%u reno fast retransmits failed"
-++msgstr "%d Segmente erneut geschickt"
-++
-++#: ../statistics.c:210
-++#, fuzzy, c-format
-++msgid "%u sack retransmits failed"
-++msgstr "%d fehlgeschlagene Paketdefragmentierungen"
-++
-++#: ../statistics.c:211
-++#, c-format
-++msgid "%u times receiver scheduled too late for direct processing"
-++msgstr ""
-++
-++#: ../statistics.c:212
-++#, fuzzy, c-format
-++msgid "%u packets collapsed in receive queue due to low socket buffer"
-++msgstr "%d Pakete wegen Socketpuffer�berlauf aus der Empfangswarteschlange weggeworfen"
-++
-++#: ../statistics.c:213
-++#, c-format
-++msgid "%u DSACKs sent for old packets"
-++msgstr ""
-++
-++#: ../statistics.c:214
-++#, c-format
-++msgid "%u DSACKs sent for out of order packets"
-++msgstr ""
-++
-++#: ../statistics.c:215
-++#, fuzzy, c-format
-++msgid "%u DSACKs received"
-++msgstr "%d Pakete empfangen"
-++
-++#: ../statistics.c:216
-++#, fuzzy, c-format
-++msgid "%u DSACKs for out of order packets received"
-++msgstr "%d Pakete insgesamt empfangen"
-++
-++#: ../statistics.c:217
-++#, fuzzy, c-format
-++msgid "%u connections reset due to unexpected SYN"
-++msgstr "%d Verbindungsr�cksetzungen empfangen"
-++
-++#: ../statistics.c:218
-++#, fuzzy, c-format
-++msgid "%u connections reset due to unexpected data"
-++msgstr "%d Verbindungsr�cksetzungen empfangen"
-++
-++#: ../statistics.c:219
-++#, fuzzy, c-format
-++msgid "%u connections reset due to early user close"
-++msgstr "%d Verbindungsr�cksetzungen empfangen"
-++
-++#: ../statistics.c:220
-+ #, c-format
-+-msgid "%d ICMP packets dropped because socket was locked"
-+-msgstr "%d ICMP Pakete verworfen weil Socket gesperrt war"
-++msgid "%u connections aborted due to memory pressure"
-++msgstr ""
-++
-++#: ../statistics.c:221
-++#, fuzzy, c-format
-++msgid "%u connections aborted due to timeout"
-++msgstr "%d Verbindungsr�cksetzungen empfangen"
-+ 
-+ #: ../statistics.c:222
-++#, c-format
-++msgid "%u connections aborted after user close in linger timeout"
-++msgstr ""
-++
-++#: ../statistics.c:223
-++#, c-format
-++msgid "%u times unabled to send RST due to no memory"
-++msgstr ""
-++
-++#: ../statistics.c:224
-++#, c-format
-++msgid "TCP ran low on memory %u times"
-++msgstr ""
-++
-++#: ../statistics.c:225
-++#, c-format
-++msgid "%u TCP data loss events"
-++msgstr ""
-++
-++#: ../statistics.c:292
-+ msgid "enabled"
-+ msgstr "aktiviert"
-+ 
-+-#: ../statistics.c:222
-++#: ../statistics.c:292
-+ msgid "disabled"
-+ msgstr "deaktiviert"
-+ 
-+-#: ../statistics.c:272
-+-#, c-format
-+-msgid "unknown title %s\n"
-+-msgstr "Unbekannter Titel %s\n"
-+-
-+-#: ../statistics.c:298
-++#: ../statistics.c:375
-+ msgid "error parsing /proc/net/snmp"
-+ msgstr "Fehler beim Parsen von /proc/net/snmp"
-+ 
-+-#: ../statistics.c:311
-++#: ../statistics.c:388
-+ msgid "cannot open /proc/net/snmp"
-+ msgstr "Kann /proc/net/snmp nicht �ffnen"
-+ 
-+ #: ../lib/activate.c:69
-+ #, c-format
-+ msgid "Hardware type `%s' not supported.\n"
-+-msgstr "Hardwaretyp ,,%s'' nicht unterst�tzt.\n"
-++msgstr "Hardwaretyp �%s� nicht unterst�tzt.\n"
-+ 
-+ #: ../lib/activate.c:73
-+ #, c-format
-+ msgid "Cannot change line discipline to `%s'.\n"
-+-msgstr "Kann line discipline nicht auf ``%s'' setzen.\n"
-++msgstr "Kann line discipline nicht auf �%s� setzen.\n"
-+ 
-+-#: ../lib/af.c:145 ../lib/hw.c:148
-++#: ../lib/af.c:153 ../lib/hw.c:161
-+ msgid "UNSPEC"
-+ msgstr "UNSPEC"
-+ 
-+-#: ../lib/af.c:147
-++#: ../lib/af.c:155
-+ msgid "UNIX Domain"
-+-msgstr "UNIX Domain"
-++msgstr "UNIX-Domain"
-+ 
-+-#: ../lib/af.c:150
-++#: ../lib/af.c:158
-+ msgid "DARPA Internet"
-+-msgstr "DARPA Internet"
-++msgstr "DARPA-Internet"
-+ 
-+-#: ../lib/af.c:153
-++#: ../lib/af.c:161
-+ msgid "IPv6"
-+ msgstr "IPv6"
-+ 
-+-#: ../lib/af.c:156 ../lib/hw.c:169
-++#: ../lib/af.c:164 ../lib/hw.c:182
-+ msgid "AMPR AX.25"
-+ msgstr "AMPR AX.25"
-+ 
-+-#: ../lib/af.c:159 ../lib/hw.c:175
-++#: ../lib/af.c:167 ../lib/hw.c:188
-+ msgid "AMPR NET/ROM"
-+ msgstr "AMPR NET/ROM"
-+ 
-+-#: ../lib/af.c:162
-++#: ../lib/af.c:170
-+ msgid "Novell IPX"
-+ msgstr ""
-+ 
-+-#: ../lib/af.c:165
-++#: ../lib/af.c:173
-+ msgid "Appletalk DDP"
-+ msgstr "Appletalk DDP"
-+ 
-+-#: ../lib/af.c:168 ../lib/hw.c:207
-++#: ../lib/af.c:176 ../lib/hw.c:223
-+ msgid "Econet"
-+ msgstr "Econet"
-+ 
-+-#: ../lib/af.c:171 ../lib/hw.c:172
-++#: ../lib/af.c:179
-++msgid "CCITT X.25"
-++msgstr ""
-++
-++#: ../lib/af.c:182 ../lib/hw.c:185
-+ msgid "AMPR ROSE"
-+ msgstr "AMPR ROSE"
-+ 
-+-#: ../lib/af.c:174 ../lib/hw.c:160
-++#: ../lib/af.c:185 ../lib/hw.c:173
-+ msgid "Ash"
-+ msgstr "Ash"
-+ 
-+-#: ../lib/af.c:232
-++#: ../lib/af.c:243
-++#, c-format
-+ msgid "Please don't supply more than one address family.\n"
-+ msgstr "Bitte nur eine Adressfamilie angeben.\n"
-+ 
-+-#: ../lib/af.c:293
-++#: ../lib/af.c:304
-++#, c-format
-+ msgid "Too much address family arguments.\n"
-+ msgstr "Zu viele Adressfamilien angegeben.\n"
-+ 
-+-#: ../lib/af.c:304
-++#: ../lib/af.c:315
-+ #, c-format
-+ msgid "Unknown address family `%s'.\n"
-+-msgstr "Unbekannte Adressfamilie `%s'.\n"
-+-
-+-#: ../lib/arcnet.c:53 ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52
-+-#: ../lib/fddi.c:67 ../lib/hippi.c:68 ../lib/inet.c:244 ../lib/inet.c:259
-+-#: ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 ../lib/rose.c:71
-+-#: ../lib/rose.c:126 ../lib/unix.c:56 ../lib/unix.c:76
-+-msgid "[NONE SET]"
-+-msgstr "[NICHT GESETZT]"
-++msgstr "Unbekannte Adressfamilie �%s�.\n"
-+ 
-+-#: ../lib/arcnet.c:81 ../lib/arcnet.c:96
-++#: ../lib/arcnet.c:70 ../lib/arcnet.c:85
-+ #, c-format
-+ msgid "in_arcnet(%s): invalid arcnet address!\n"
-+ msgstr "in_arcnet(%s): Ung�ltige ARCnet-Adresse!\n"
-+ 
-+-#: ../lib/arcnet.c:108
-++#: ../lib/arcnet.c:97
-+ #, c-format
-+ msgid "in_arcnet(%s): trailing : ignored!\n"
-+ msgstr "in_arcnet(%s): angeh�ngt : ignoriert!\n"
-+ 
-+-#: ../lib/arcnet.c:120
-++#: ../lib/arcnet.c:109
-+ #, c-format
-+ msgid "in_arcnet(%s): trailing junk!\n"
-+ msgstr "in_arcnet(%s): Nachfolgender M�ll!\n"
-+ 
-+ #: ../lib/ash.c:81
-++#, c-format
-+ msgid "Malformed Ash address"
-+-msgstr "Fehlerhafte Ash Adresse"
-++msgstr "Fehlerhafte Ash-Adresse"
-++
-++#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244
-++#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78
-++#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76
-++msgid "[NONE SET]"
-++msgstr "[NICHT GESETZT]"
-+ 
-+ #: ../lib/ax25.c:97 ../lib/netrom.c:100
-+ msgid "Invalid callsign"
-+@@ -1898,22 +2168,21 @@ msgid "Callsign too long"
-+ msgstr "Rufzeichen zu lang"
-+ 
-+ #: ../lib/ax25_gr.c:47
-++#, c-format
-+ msgid "AX.25 not configured in this system.\n"
-+ msgstr "AX.25 ist auf diesem System nicht konfiguriert.\n"
-+ 
-+ #: ../lib/ax25_gr.c:50
-++#, c-format
-+ msgid "Kernel AX.25 routing table\n"
-+ msgstr "Kernel AX.25 Routentabelle\n"
-+ 
-+ #. xxx
-+ #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55
-++#, c-format
-+ msgid "Destination  Iface    Use\n"
-+ msgstr "Ziel         SStelle  Benutzer\n"
-+ 
-+-#: ../lib/ddp_gr.c:21
-+-msgid "Routing table for `ddp' not yet supported.\n"
-+-msgstr "DDP-Routentabelle wird noch nicht unterst�tzt.\n"
-+-
-+ #: ../lib/ether.c:74 ../lib/ether.c:91
-+ #, c-format
-+ msgid "in_ether(%s): invalid ether address!\n"
-+@@ -1929,153 +2198,168 @@ msgstr "in_ether(%s): angeh�ngt : ignori
-+ msgid "in_ether(%s): trailing junk!\n"
-+ msgstr "in_ether(%s): Nachfolgender M�ll!\n"
-+ 
-+-#: ../lib/fddi.c:95 ../lib/fddi.c:110
-++#: ../lib/fddi.c:84 ../lib/fddi.c:99
-+ #, c-format
-+ msgid "in_fddi(%s): invalid fddi address!\n"
-+ msgstr "in_fddi(%s): Ung�ltige FDDI-Adresse!\n"
-+ 
-+-#: ../lib/fddi.c:122
-++#: ../lib/fddi.c:111
-+ #, c-format
-+ msgid "in_fddi(%s): trailing : ignored!\n"
-+ msgstr "in_fddi(%s): nachfolgend : ignoriert!\n"
-+ 
-+-#: ../lib/fddi.c:134
-++#: ../lib/fddi.c:123
-+ #, c-format
-+ msgid "in_fddi(%s): trailing junk!\n"
-+ msgstr "in_fddi(%s): Nachfolgender M�ll!\n"
-+ 
-+-#: ../lib/getroute.c:97 ../lib/setroute.c:76
-++#: ../lib/getroute.c:101 ../lib/setroute.c:80
-+ #, c-format
-+ msgid "Address family `%s' not supported.\n"
-+ msgstr "Adressfamilie `%s' wird nicht unterst�tzt.\n"
-+ 
-+-#: ../lib/getroute.c:103 ../lib/setroute.c:80
-++#: ../lib/getroute.c:107 ../lib/setroute.c:84
-+ #, c-format
-+ msgid "No routing for address family `%s'.\n"
-+ msgstr "Kein Routen f�r Adressfamilie `%s'.\n"
-+ 
-+-#: ../lib/hippi.c:96 ../lib/hippi.c:111
-++#: ../lib/hippi.c:84 ../lib/hippi.c:99
-+ #, c-format
-+ msgid "in_hippi(%s): invalid hippi address!\n"
-+ msgstr "in_hippi(%s): Ung�ltige HIPPI-Adresse!\n"
-+ 
-+-#: ../lib/hippi.c:123
-++#: ../lib/hippi.c:111
-+ #, c-format
-+ msgid "in_hippi(%s): trailing : ignored!\n"
-+ msgstr "in_hippi(%s): nachfolgend : ignoriert!\n"
-+ 
-+-#: ../lib/hippi.c:134
-++#: ../lib/hippi.c:122
-+ #, c-format
-+ msgid "in_hippi(%s): trailing junk!\n"
-+ msgstr "in_hippi(%s): Nachfolgender M�ll!\n"
-+ 
-+-#: ../lib/hw.c:147
-++#: ../lib/hw.c:160
-+ msgid "Local Loopback"
-+ msgstr "Lokale Schleife"
-+ 
-+-#: ../lib/hw.c:150
-++#: ../lib/hw.c:163
-+ msgid "Serial Line IP"
-+ msgstr "Serielle IP"
-+ 
-+-#: ../lib/hw.c:151
-++#: ../lib/hw.c:164
-+ msgid "VJ Serial Line IP"
-+ msgstr "Serielle VJ-IP"
-+ 
-+-#: ../lib/hw.c:152
-++#: ../lib/hw.c:165
-+ msgid "6-bit Serial Line IP"
-+ msgstr "6-bit Serielle IP"
-+ 
-+-#: ../lib/hw.c:153
-++#: ../lib/hw.c:166
-+ msgid "VJ 6-bit Serial Line IP"
-+ msgstr "VJ 6-bit Serielle IP"
-+ 
-+-#: ../lib/hw.c:154
-++#: ../lib/hw.c:167
-+ msgid "Adaptive Serial Line IP"
-+ msgstr "Adaptive Serielle IP"
-+ 
-+-#: ../lib/hw.c:157
-++#: ../lib/hw.c:170
-+ msgid "Ethernet"
-+ msgstr "Ethernet"
-+ 
-+-#: ../lib/hw.c:163
-++#: ../lib/hw.c:176
-+ msgid "Fiber Distributed Data Interface"
-+ msgstr "Fiber Distributed Data Interface"
-+ 
-+-#: ../lib/hw.c:166
-++#: ../lib/hw.c:179
-+ msgid "HIPPI"
-+ msgstr "HIPPI"
-+ 
-+-#: ../lib/hw.c:178
-++#: ../lib/hw.c:191
-++msgid "generic X.25"
-++msgstr ""
-++
-++#: ../lib/hw.c:194
-+ msgid "IPIP Tunnel"
-+ msgstr "IPIP Tunnel"
-+ 
-+-#: ../lib/hw.c:181
-++#: ../lib/hw.c:197
-+ msgid "Point-to-Point Protocol"
-+-msgstr "Punkt-zu-Punkt Verbindung"
-++msgstr "Punkt-zu-Punkt-Verbindung"
-+ 
-+-#: ../lib/hw.c:184
-++#: ../lib/hw.c:200
-+ msgid "(Cisco)-HDLC"
-+ msgstr "(Cisco)-HDLC"
-+ 
-+-#: ../lib/hw.c:185
-++#: ../lib/hw.c:201
-+ msgid "LAPB"
-+ msgstr "LAPB"
-+ 
-+-#: ../lib/hw.c:188
-++#: ../lib/hw.c:204
-+ msgid "ARCnet"
-+ msgstr "ARCnet"
-+ 
-+-#: ../lib/hw.c:191
-++#: ../lib/hw.c:207
-+ msgid "Frame Relay DLCI"
-+ msgstr "Frame Relay DLCI"
-+ 
-+-#: ../lib/hw.c:192
-++#: ../lib/hw.c:208
-+ msgid "Frame Relay Access Device"
-+ msgstr "Frame Relay Access Device"
-+ 
-+-#: ../lib/hw.c:195
-++#: ../lib/hw.c:211
-+ msgid "IPv6-in-IPv4"
-+ msgstr "IPv6-nach-IPv4"
-+ 
-+-#: ../lib/hw.c:198
-+-#, fuzzy
-++#: ../lib/hw.c:214
-+ msgid "IrLAP"
-+-msgstr "LAPB"
-++msgstr "IrLAP"
-+ 
-+-#: ../lib/hw.c:201
-++#: ../lib/hw.c:217
-+ msgid "16/4 Mbps Token Ring"
-+ msgstr ""
-+ 
-+-#: ../lib/hw.c:203
-++#: ../lib/hw.c:219
-+ msgid "16/4 Mbps Token Ring (New)"
-+ msgstr ""
-+ 
-++#: ../lib/hw.c:226
-++msgid "Generic EUI-64"
-++msgstr ""
-++
-+ #: ../lib/inet.c:153 ../lib/inet6.c:79
-+ #, c-format
-+ msgid "rresolve: unsupport address family %d !\n"
-+ msgstr "rresolve: nicht unterst�tzte Adressfamilie %d !\n"
-+ 
-+-#: ../lib/inet6_gr.c:79
-++#: ../lib/inet6.c:131
-++#, fuzzy
-++msgid "[UNKNOWN]"
-++msgstr "UNBEKANNT"
-++
-++#: ../lib/inet6_gr.c:71
-++#, c-format
-+ msgid "INET6 (IPv6) not configured in this system.\n"
-+ msgstr "INET6 (IPv6) ist auf diesem System nicht konfiguriert.\n"
-+ 
-+-#: ../lib/inet6_gr.c:82
-++#: ../lib/inet6_gr.c:74
-++#, c-format
-+ msgid "Kernel IPv6 routing table\n"
-+-msgstr "Kernel IPv6 Routentabelle\n"
-++msgstr "Kernel-IPv6-Routentabelle\n"
-+ 
-+-#: ../lib/inet6_gr.c:84
-++#: ../lib/inet6_gr.c:76
-++#, c-format
-+ msgid ""
-+-"Destination                                 Next Hop                         "
-+-"       Flags Metric Ref    Use Iface\n"
-+-msgstr ""
-+-"Ziel                                        N�chster Hop                     "
-+-"            Flags Metric Ref    Benutzer Iface\n"
-++"Destination                                 Next "
-++"Hop                                Flags Metric Ref    Use Iface\n"
-++msgstr "Ziel                                        N�chster Hop                                 Flags Metric Ref    Benutzer Iface\n"
-+ 
-+-#: ../lib/inet6_gr.c:158
-++#: ../lib/inet6_gr.c:150
-++#, c-format
-+ msgid "Kernel IPv6 Neighbour Cache\n"
-+ msgstr "Kernel IPv6 Nachbarcache\n"
-+ 
-+-#: ../lib/inet6_gr.c:161
-++#: ../lib/inet6_gr.c:153
-++#, c-format
-+ msgid ""
-+ "Neighbour                                   HW Address        Iface    Flags "
-+ "Ref State\n"
-+@@ -2083,39 +2367,45 @@ msgstr ""
-+ "Nachbar                                     HW-Adresse        Iface    Flags "
-+ "Ref Zustand\n"
-+ 
-+-#: ../lib/inet6_gr.c:165
-++#: ../lib/inet6_gr.c:157
-++#, c-format
-+ msgid ""
-+ "Neighbour                                   HW Address        Iface    Flags "
-+ "Ref State            Stale(sec) Delete(sec)\n"
-+-msgstr ""
-+-"Nachbar                                     HW-Adresse        Iface    Flags "
-+-"Ref Zustand          Stale(sec) L�schen(sec)\n"
-++msgstr "Nachbar                                     HW-Adresse        Iface    Flags Ref Zustand          Stale(sec) L�schen(sec)\n"
-+ 
-+ #: ../lib/inet6_sr.c:46
-++#, c-format
-+ msgid "Usage: inet6_route [-vF] del Target\n"
-+ msgstr "Benutzung: inet6_route [-vF] del Ziel\n"
-+ 
-+ #: ../lib/inet6_sr.c:47
-++#, c-format
-+ msgid "       inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n"
-+ msgstr "       inet6_route [-vF] add Ziel [gw Gateway] [metric M] [[dev] If]\n"
-+ 
-+ #: ../lib/inet6_sr.c:48
-++#, c-format
-+ msgid "       inet6_route [-FC] flush      NOT supported\n"
-+ msgstr "       inet6_route [-FC] flush      NICHT unterst�tzt\n"
-+ 
-+-#: ../lib/inet6_sr.c:182
-++#: ../lib/inet6_sr.c:188
-++#, c-format
-+ msgid "Flushing `inet6' routing table not supported\n"
-+-msgstr ",,Flush'' f�r IPv6 Routentabelle nicht unterst�tzt\n"
-++msgstr "�Flush� f�r IPv6-Routentabelle nicht unterst�tzt\n"
-+ 
-+ #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220
-++#, c-format
-+ msgid "INET (IPv4) not configured in this system.\n"
-+ msgstr "INET (IPv4) ist auf diesem System nicht konfiguriert.\n"
-+ 
-+ #: ../lib/inet_gr.c:53
-++#, c-format
-+ msgid "Kernel IP routing table\n"
-+-msgstr "Kernel IP Routentabelle\n"
-++msgstr "Kernel-IP-Routentabelle\n"
-+ 
-+ #: ../lib/inet_gr.c:56
-++#, c-format
-+ msgid ""
-+ "Destination     Gateway         Genmask         Flags Metric Ref    Use "
-+ "Iface\n"
-+@@ -2124,6 +2414,7 @@ msgstr ""
-+ "Iface\n"
-+ 
-+ #: ../lib/inet_gr.c:59
-++#, c-format
-+ msgid ""
-+ "Destination     Gateway         Genmask         Flags   MSS Window  irtt "
-+ "Iface\n"
-+@@ -2132,6 +2423,7 @@ msgstr ""
-+ "Iface\n"
-+ 
-+ #: ../lib/inet_gr.c:62
-++#, c-format
-+ msgid ""
-+ "Destination     Gateway         Genmask         Flags Metric Ref    Use "
-+ "Iface    MSS   Window irtt\n"
-+@@ -2140,10 +2432,12 @@ msgstr ""
-+ "Iface    MSS   Fenster irtt\n"
-+ 
-+ #: ../lib/inet_gr.c:237
-++#, c-format
-+ msgid "Kernel IP routing cache\n"
-+-msgstr "Kernel IP Routencache\n"
-++msgstr "Kernel-IP-Routencache\n"
-+ 
-+ #: ../lib/inet_gr.c:258
-++#, c-format
-+ msgid ""
-+ "Source          Destination     Gateway         Flags Metric Ref    Use "
-+ "Iface\n"
-+@@ -2152,6 +2446,7 @@ msgstr ""
-+ "Iface\n"
-+ 
-+ #: ../lib/inet_gr.c:261
-++#, c-format
-+ msgid ""
-+ "Source          Destination     Gateway         Flags   MSS Window  irtt "
-+ "Iface\n"
-+@@ -2160,6 +2455,7 @@ msgstr ""
-+ "Iface\n"
-+ 
-+ #: ../lib/inet_gr.c:266
-++#, c-format
-+ msgid ""
-+ "Source          Destination     Gateway         Flags Metric Ref    Use "
-+ "Iface    MSS   Window irtt  HH  Arp\n"
-+@@ -2168,6 +2464,7 @@ msgstr ""
-+ "Iface    MSS   Fenster irtt   HH  Arp\n"
-+ 
-+ #: ../lib/inet_gr.c:290
-++#, c-format
-+ msgid ""
-+ "Source          Destination     Gateway         Flags Metric Ref    Use "
-+ "Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
-+@@ -2175,37 +2472,39 @@ msgstr ""
-+ "Quelle          Ziel            Gateway         Flags Metrik Ref    Ben "
-+ "Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
-+ 
-+-#: ../lib/inet_sr.c:50
-++#: ../lib/inet_sr.c:51
-++#, c-format
-+ msgid ""
-+ "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] "
-+ "[[dev] If]\n"
-+-msgstr ""
-+-"Benutzung: inet_route [-vF] del {-host|-net} Ziel[/prefix] [gw Gw] [metric "
-+-"M] [[dev] If]\n"
-++msgstr "Benutzung: inet_route [-vF] del {-host|-net} Ziel[/Pr�fix] [gw Gw] [metric M] [[dev] If]\n"
-+ 
-+-#: ../lib/inet_sr.c:51
-++#: ../lib/inet_sr.c:52
-++#, c-format
-+ msgid ""
-+ "       inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n"
-+-msgstr ""
-+-"       inet_route [-vF] add {-host|-net} Ziel[/Prefix] [gw Gw] [metric M]\n"
-++msgstr "       inet_route [-vF] add {-host|-net} Ziel[/Pr�fix] [gw Gw] [metric M]\n"
-+ 
-+-#: ../lib/inet_sr.c:52
-++#: ../lib/inet_sr.c:53
-++#, c-format
-+ msgid ""
-+ "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
-+ msgstr ""
-+ "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
-+ 
-+-#: ../lib/inet_sr.c:53
-++#: ../lib/inet_sr.c:54
-++#, c-format
-+ msgid "                              [mod] [dyn] [reinstate] [[dev] If]\n"
-+ msgstr "                              [mod] [dyn] [reinstate] [[dev] If]\n"
-+ 
-+-#: ../lib/inet_sr.c:54
-++#: ../lib/inet_sr.c:55
-++#, c-format
-+ msgid ""
-+ "       inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n"
-+-msgstr ""
-+-"       inet_route [-vF] add {-host|-net} Ziel[/Pr�fix] [metric M] reject\n"
-++msgstr "       inet_route [-vF] add {-host|-net} Ziel[/Pr�fix] [metric M] reject\n"
-+ 
-+-#: ../lib/inet_sr.c:55
-++#: ../lib/inet_sr.c:56
-++#, c-format
-+ msgid "       inet_route [-FC] flush      NOT supported\n"
-+ msgstr "       inet_route [-FC] flush      NICHT unterst�tzt\n"
-+ 
-+@@ -2215,15 +2514,17 @@ msgid "route: %s: cannot use a NETWORK a
-+ msgstr "route: %s: Netzadresse als Gateway ung�ltig!\n"
-+ 
-+ #: ../lib/inet_sr.c:174
-+-#, fuzzy
-++#, fuzzy, c-format
-+ msgid "route: Invalid MSS/MTU.\n"
-+ msgstr "route: Ung�ltige MSS.\n"
-+ 
-+ #: ../lib/inet_sr.c:187
-++#, c-format
-+ msgid "route: Invalid window.\n"
-+ msgstr "route: Ung�ltige Fenstergr��e.\n"
-+ 
-+ #: ../lib/inet_sr.c:203
-++#, c-format
-+ msgid "route: Invalid initial rtt.\n"
-+ msgstr "route: Ung�ltige Start-RTT.\n"
-+ 
-+@@ -2238,126 +2539,408 @@ msgid "route: bogus netmask %s\n"
-+ msgstr "Route: Fehlerhafte Netzmaske %s\n"
-+ 
-+ #: ../lib/inet_sr.c:270
-++#, c-format
-+ msgid "route: netmask doesn't match route address\n"
-+ msgstr "route: Netzmaske passt nicht zur Routenadresse\n"
-+ 
-+ #: ../lib/inet_sr.c:306
-++#, c-format
-+ msgid "Flushing `inet' routing table not supported\n"
-+-msgstr ",,Flush'' der Inet-Routentabelle nicht unterst�tzt\n"
-++msgstr "�Flush� der Inet-Routentabelle nicht unterst�tzt\n"
-+ 
-+ #: ../lib/inet_sr.c:310
-++#, c-format
-+ msgid "Modifying `inet' routing cache not supported\n"
-+-msgstr "�nderung des ,,Inet'' Routencaches nicht unterst�tzt\n"
-++msgstr "�nderung des �Inet� Routencaches nicht unterst�tzt\n"
-+ 
-+ #: ../lib/ipx_gr.c:52
-++#, c-format
-+ msgid "IPX not configured in this system.\n"
-+ msgstr "IPX ist auf diesem System nicht konfiguriert.\n"
-+ 
-+ #: ../lib/ipx_gr.c:56
-++#, c-format
-+ msgid "Kernel IPX routing table\n"
-+-msgstr "Kernel IPX Routentabelle\n"
-++msgstr "Kernel-IPX-Routentabelle\n"
-+ 
-+ #. xxx
-+ #: ../lib/ipx_gr.c:57
-++#, c-format
-+ msgid "Destination               Router Net                Router Node\n"
-+-msgstr "Ziel                      Router Netz               Router Knoten\n"
-++msgstr "Ziel                      Router-Netz               Router-Knoten\n"
-+ 
-+ #: ../lib/ipx_sr.c:33
-++#, c-format
-+ msgid "IPX: this needs to be written\n"
-+-msgstr "IPX: dies mu� noch geschrieben werden\n"
-++msgstr "IPX: dies muss noch geschrieben werden\n"
-+ 
-+-#: ../lib/masq_info.c:197
-++#: ../lib/masq_info.c:198
-++#, c-format
-+ msgid "IP masquerading entries\n"
-+ msgstr "IP-Maskierungseintr�ge\n"
-+ 
-+-#: ../lib/masq_info.c:200
-++#: ../lib/masq_info.c:201
-++#, c-format
-+ msgid "prot   expire source               destination          ports\n"
-+ msgstr "Prot   expire Quelle               Ziel                 Ports\n"
-+ 
-+-#: ../lib/masq_info.c:203
-++#: ../lib/masq_info.c:204
-++#, c-format
-+ msgid ""
-+-"prot   expire    initseq delta prevd source               destination        "
-+-"  ports\n"
-++"prot   expire    initseq delta prevd source               "
-++"destination          ports\n"
-+ msgstr ""
-+-"Prot   Ablauf    Anf-Seq Delta Prevd Quelle               Ziel               "
-+-"  Ports\n"
-++"Prot   Ablauf    Anf-Seq Delta Prevd Quelle               "
-++"Ziel                 Ports\n"
-+ 
-+ #: ../lib/netrom_gr.c:48
-++#, c-format
-+ msgid "NET/ROM not configured in this system.\n"
-+ msgstr "NET/ROM ist auf diesem System nicht verf�gbar.\n"
-+ 
-+ #: ../lib/netrom_gr.c:51
-++#, c-format
-+ msgid "Kernel NET/ROM routing table\n"
-+-msgstr "Kernel NET/ROM Routentabelle\n"
-++msgstr "Kernel-NET/ROM-Routentabelle\n"
-+ 
-+ #: ../lib/netrom_gr.c:52
-++#, c-format
-+ msgid "Destination  Mnemonic  Quality  Neighbour  Iface\n"
-+ msgstr "Ziel         Mnemonic  Qualit�t  Nachbar  Iface\n"
-+ 
-+ #: ../lib/netrom_sr.c:34
-++#, c-format
-+ msgid "netrom usage\n"
-+-msgstr "NET/ROM Benutzung\n"
-++msgstr "NET/ROM-Benutzung\n"
-+ 
-+ #: ../lib/netrom_sr.c:44
-++#, c-format
-+ msgid "NET/ROM: this needs to be written\n"
-+-msgstr "NET/ROM: Dies mu� noch geschrieben werden\n"
-++msgstr "NET/ROM: Dies muss noch geschrieben werden\n"
-+ 
-+ #: ../lib/ppp.c:44
-++#, c-format
-+ msgid "You cannot start PPP with this program.\n"
-+ msgstr "Mit diesem Programm kann PPP nicht gestartet werden.\n"
-+ 
-+ #: ../lib/ppp_ac.c:38
-++#, c-format
-+ msgid "Sorry, use pppd!\n"
-+-msgstr "Bitte benutzen sie pppd.\n"
-++msgstr "Bitte benutzen Sie pppd.\n"
-+ 
-+ #: ../lib/rose.c:87
-+ msgid "Node address must be ten digits"
-+-msgstr "Knotenadresse mu� zehn Ziffern haben"
-++msgstr "Knotenadresse muss zehn Ziffern haben"
-+ 
-+ #: ../lib/rose_gr.c:51
-++#, c-format
-+ msgid "ROSE not configured in this system.\n"
-+ msgstr "ROSE ist auf diesem System nicht verf�gbar.\n"
-+ 
-+ #: ../lib/rose_gr.c:54
-++#, c-format
-+ msgid "Kernel ROSE routing table\n"
-+-msgstr "ROSE Kernel Routentabelle\n"
-++msgstr "ROSE-Kernel-Routentabelle\n"
-+ 
-+-#: ../lib/tr.c:70 ../lib/tr.c:85
-++#: ../lib/tr.c:86 ../lib/tr.c:101
-+ #, c-format
-+ msgid "in_tr(%s): invalid token ring address!\n"
-+ msgstr "in_tr(%s): ung�ltige Tokenringadresse!\n"
-+ 
-+-#: ../lib/tr.c:97
-++#: ../lib/tr.c:113
-+ #, c-format
-+ msgid "in_tr(%s): trailing : ignored!\n"
-+ msgstr "in_tr(%s): nachfolgend : ignoriert!\n"
-+ 
-+-#: ../lib/tr.c:109
-++#: ../lib/tr.c:125
-+ #, c-format
-+ msgid "in_tr(%s): trailing junk!\n"
-+ msgstr "in_tr(%s): nachfolgender M�ll!\n"
-+ 
-+-#: ../lib/interface.c:124
-++#: ../lib/interface.c:176
-+ #, c-format
-+ msgid "warning: no inet socket available: %s\n"
-+-msgstr "Warnung: Keine INET Sockets verf�gbar: %s\n"
-++msgstr "Warnung: Keine INET-Sockets verf�gbar: %s\n"
-+ 
-+-#: ../lib/interface.c:270
-++#: ../lib/interface.c:325
-+ #, c-format
-+ msgid "Warning: cannot open %s (%s). Limited output.\n"
-+ msgstr ""
-+ 
-+ #. Give better error message for this case.
-+-#: ../lib/interface.c:504
-++#: ../lib/interface.c:571
-+ msgid "Device not found"
-+ msgstr "Ger�t nicht gefunden"
-+ 
-+-#: ../lib/interface.c:508
-++#: ../lib/interface.c:575
-+ #, c-format
-+ msgid "%s: error fetching interface information: %s\n"
-+ msgstr "%s: Fehler beim Auslesen der Schnittstelleninformation: %s\n"
-+ 
-+-#: ../lib/sockets.c:59
-++#: ../lib/interface.c:608
-++msgid "     - no statistics available -"
-++msgstr "     - keine Statistiken verf�gbar -"
-++
-++#: ../lib/interface.c:612
-++#, c-format
-++msgid "[NO FLAGS]"
-++msgstr "[KEINE FLAGS]"
-++
-++#: ../lib/interface.c:688
-++#, c-format
-++msgid "%-9.9s Link encap:%s  "
-++msgstr "%-9.9s Protokoll:%s  "
-++
-++#: ../lib/interface.c:693
-++#, c-format
-++msgid "HWaddr %s  "
-++msgstr "Hardware Adresse %s  "
-++
-++#: ../lib/interface.c:696
-++#, c-format
-++msgid "Media:%s"
-++msgstr "Medium:%s"
-++
-++#: ../lib/interface.c:698
-++#, c-format
-++msgid "(auto)"
-++msgstr "(auto)"
-++
-++#: ../lib/interface.c:705
-++#, c-format
-++msgid "          %s addr:%s "
-++msgstr "          %s Adresse:%s "
-++
-++#: ../lib/interface.c:708
-++#, c-format
-++msgid " P-t-P:%s "
-++msgstr " P-z-P:%s "
-++
-++#: ../lib/interface.c:711
-++#, c-format
-++msgid " Bcast:%s "
-++msgstr " Bcast:%s "
-++
-++#: ../lib/interface.c:713
-++#, c-format
-++msgid " Mask:%s\n"
-++msgstr " Maske:%s\n"
-++
-++#: ../lib/interface.c:730
-++#, c-format
-++msgid "          inet6 addr: %s/%d"
-++msgstr "          inet6-Adresse: %s/%d"
-++
-++#: ../lib/interface.c:732
-++#, c-format
-++msgid " Scope:"
-++msgstr " G�ltigkeitsbereich:"
-++
-++#: ../lib/interface.c:735
-++#, c-format
-++msgid "Global"
-++msgstr "Global"
-++
-++#: ../lib/interface.c:738
-++#, c-format
-++msgid "Link"
-++msgstr "Verbindung"
-++
-++#: ../lib/interface.c:741
-++#, c-format
-++msgid "Site"
-++msgstr "Standort"
-++
-++#: ../lib/interface.c:744
-++#, c-format
-++msgid "Compat"
-++msgstr "Kompatibilit�t"
-++
-++#: ../lib/interface.c:747
-++#, c-format
-++msgid "Host"
-++msgstr "Maschine"
-++
-++#: ../lib/interface.c:750
-++#, c-format
-++msgid "Unknown"
-++msgstr "Unbekannt"
-++
-++#: ../lib/interface.c:765
-++#, c-format
-++msgid "          IPX/Ethernet II addr:%s\n"
-++msgstr "          IPX/Ethernet II Adresse:%s\n"
-++
-++#: ../lib/interface.c:768
-++#, c-format
-++msgid "          IPX/Ethernet SNAP addr:%s\n"
-++msgstr "          IPX/Ethernet SNAP Adresse:%s\n"
-++
-++#: ../lib/interface.c:771
-++#, c-format
-++msgid "          IPX/Ethernet 802.2 addr:%s\n"
-++msgstr "          IPX/Ethernet 802.2 Adresse:%s\n"
-++
-++#: ../lib/interface.c:774
-++#, c-format
-++msgid "          IPX/Ethernet 802.3 addr:%s\n"
-++msgstr "          IPX/Ethernet 802.3 Adresse:%s\n"
-++
-++#: ../lib/interface.c:784
-++#, c-format
-++msgid "          EtherTalk Phase 2 addr:%s\n"
-++msgstr "          EtherTalk Phase 2 Adresse:%s\n"
-++
-++#: ../lib/interface.c:793
-++#, c-format
-++msgid "          econet addr:%s\n"
-++msgstr "          econet Adresse:%s\n"
-++
-++#: ../lib/interface.c:800
-++#, c-format
-++msgid "[NO FLAGS] "
-++msgstr "[KEINE FLAGS] "
-++
-++#: ../lib/interface.c:802
-++#, c-format
-++msgid "UP "
-++msgstr "UP "
-++
-++#: ../lib/interface.c:804
-++#, c-format
-++msgid "BROADCAST "
-++msgstr "BROADCAST "
-++
-++#: ../lib/interface.c:806
-++#, c-format
-++msgid "DEBUG "
-++msgstr "DEBUG "
-++
-++#: ../lib/interface.c:808
-++#, c-format
-++msgid "LOOPBACK "
-++msgstr "LOOPBACK "
-++
-++#: ../lib/interface.c:810
-++#, c-format
-++msgid "POINTOPOINT "
-++msgstr "PUNKTZUPUNKT "
-++
-++#: ../lib/interface.c:812
-++#, c-format
-++msgid "NOTRAILERS "
-++msgstr "NOTRAILERS "
-++
-++#: ../lib/interface.c:814
-++#, c-format
-++msgid "RUNNING "
-++msgstr "RUNNING "
-++
-++#: ../lib/interface.c:816
-++#, c-format
-++msgid "NOARP "
-++msgstr "NOARP "
-++
-++#: ../lib/interface.c:818
-++#, c-format
-++msgid "PROMISC "
-++msgstr "PROMISC "
-++
-++#: ../lib/interface.c:820
-++#, c-format
-++msgid "ALLMULTI "
-++msgstr "ALLMULTI "
-++
-++#: ../lib/interface.c:822
-++#, c-format
-++msgid "SLAVE "
-++msgstr "SLAVE "
-++
-++#: ../lib/interface.c:824
-++#, c-format
-++msgid "MASTER "
-++msgstr "MASTER "
-++
-++#: ../lib/interface.c:826
-++#, c-format
-++msgid "MULTICAST "
-++msgstr "MULTICAST "
-++
-++#: ../lib/interface.c:829
-++#, c-format
-++msgid "DYNAMIC "
-++msgstr "DYNAMIC "
-++
-++#. DONT FORGET TO ADD THE FLAGS IN ife_print_short
-++#: ../lib/interface.c:832
-++#, c-format
-++msgid " MTU:%d  Metric:%d"
-++msgstr " MTU:%d  Metrik:%d"
-++
-++#: ../lib/interface.c:836
-++#, c-format
-++msgid "  Outfill:%d  Keepalive:%d"
-++msgstr "  Outfill:%d  Keepalive:%d"
-++
-++#: ../lib/interface.c:850
-++#, fuzzy, c-format
-++msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
-++msgstr "Empfangene Pakete:%lu Fehler:%lu Weggeworfen:%lu �berlauf:%lu Rahmen:%lu\n"
-++
-++#: ../lib/interface.c:855
-++#, c-format
-++msgid "             compressed:%lu\n"
-++msgstr "             komprimiert:%lu\n"
-++
-++#: ../lib/interface.c:895
-++#, fuzzy, c-format
-++msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
-++msgstr "Verschickte Pakete:%lu Fehler:%lu Weggeworfen:%lu �berlauf:%lu Tr�ger:%lu\n"
-++
-++#: ../lib/interface.c:899
-++#, c-format
-++msgid "          collisions:%lu "
-++msgstr "          Kollisionen:%lu "
-++
-++#: ../lib/interface.c:901
-++#, c-format
-++msgid "compressed:%lu "
-++msgstr "Komprimiert:%lu "
-++
-++#: ../lib/interface.c:903
-++#, c-format
-++msgid "txqueuelen:%d "
-++msgstr "Sendewarteschlangenl�nge:%d "
-++
-++#: ../lib/interface.c:905
-++#, c-format
-++msgid "RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"
-++msgstr ""
-++
-++#: ../lib/interface.c:916
-++#, c-format
-++msgid "Interrupt:%d "
-++msgstr "Interrupt:%d "
-++
-++#. Only print devices using it for
-++#. I/O maps
-++#: ../lib/interface.c:919
-++#, c-format
-++msgid "Base address:0x%x "
-++msgstr "Basisadresse:0x%x "
-++
-++#: ../lib/interface.c:921
-++#, c-format
-++msgid "Memory:%lx-%lx "
-++msgstr "Speicher:%lx-%lx "
-++
-++#: ../lib/interface.c:924
-++#, c-format
-++msgid "DMA chan:%x "
-++msgstr "DMA Kanal:%x "
-++
-++#: ../lib/sockets.c:63
-++#, c-format
-+ msgid "No usable address families found.\n"
-+ msgstr "Keine benutzbaren Adressfamilien gefunden.\n"
-+ 
-+@@ -2369,41 +2952,44 @@ msgstr "ip: %s ist eine ung�ltige INET-A
-+ #: ../lib/util-ank.c:238
-+ #, c-format
-+ msgid "ip: %s is invalid inet prefix\n"
-+-msgstr "ip: %s ist ein ung�ltiges INET-Prefix\n"
-++msgstr "ip: %s ist ein ung�ltiges INET-Pr�fix\n"
-+ 
-+ #: ../lib/util-ank.c:248
-+ #, c-format
-+ msgid "ip: %s is invalid IPv4 address\n"
-+-msgstr "ip: %s ist eine ung�ltige IPv4 Adresse\n"
-++msgstr "ip: %s ist eine ung�ltige IPv4-Adresse\n"
-+ 
-+ #: ../lib/util-ank.c:256
-+ #, c-format
-+ msgid "ip: argument is wrong: %s\n"
-+ msgstr "ip: Fehlerhaftes Argument: %s\n"
-+ 
-+-#: ../ipmaddr.c:56
-++#: ../ipmaddr.c:61
-++#, c-format
-+ msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n"
-+ msgstr "Benutzung: ipmaddr [ add | del ] MULTIADR dev NAME\n"
-+ 
-+-#: ../ipmaddr.c:57
-++#: ../ipmaddr.c:62
-++#, c-format
-+ msgid "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
-+ msgstr "       ipmaddr show [ dev NAME ] [ ipv4 | ipv6 | link | all ]\n"
-+ 
-+-#: ../ipmaddr.c:58
-++#: ../ipmaddr.c:63
-++#, c-format
-+ msgid "       ipmaddr -V | -version\n"
-+ msgstr ""
-+ 
-+-#: ../ipmaddr.c:258
-++#: ../ipmaddr.c:263
-+ #, c-format
-+ msgid "family %d "
-+ msgstr "familie %d "
-+ 
-+-#: ../ipmaddr.c:267
-++#: ../ipmaddr.c:272
-+ #, c-format
-+ msgid " users %d"
-+ msgstr " Benutzer %d"
-+ 
-+-#: ../ipmaddr.c:353
-++#: ../ipmaddr.c:358
-+ msgid "Cannot create socket"
-+ msgstr "Kann Socket nicht �ffnen"
-+ 
-+@@ -2418,13 +3004,14 @@ msgid "slattach: tty_lock: (%s): %s\n"
-+ msgstr "slattach: tty_lock: (%s): %s\n"
-+ 
-+ #: ../slattach.c:192
-++#, c-format
-+ msgid "slattach: cannot write PID file\n"
-+ msgstr "slattach: Kann PID-Datei nicht schreiben\n"
-+ 
-+ #: ../slattach.c:202
-+ #, c-format
-+ msgid "slattach: tty_lock: UUCP user %s unknown!\n"
-+-msgstr "slattach: tty_lock: UUCP Benutzer %s unbekannt!\n"
-++msgstr "slattach: tty_lock: UUCP-Benutzer %s unbekannt!\n"
-+ 
-+ #: ../slattach.c:430
-+ #, c-format
-+@@ -2436,39 +3023,71 @@ msgstr "slattach: tty_hangup(DROP): %s\n
-+ msgid "slattach: tty_hangup(RAISE): %s\n"
-+ msgstr "slattach: tty_hangup(RAISE): %s\n"
-+ 
-+-#: ../slattach.c:486
-++#: ../slattach.c:468
-++#, fuzzy, c-format
-++msgid "slattach: tty name too long\n"
-++msgstr "%s: name zu lang\n"
-++
-++#: ../slattach.c:498
-++#, c-format
-+ msgid "slattach: tty_open: cannot get current state!\n"
-+ msgstr "slattach: tty_open: kann aktuellen Zustand nicht auslesen!\n"
-+ 
-+-#: ../slattach.c:493
-++#: ../slattach.c:505
-++#, c-format
-+ msgid "slattach: tty_open: cannot get current line disc!\n"
-+ msgstr ""
-+ "slattach: tty_open: Kann augenblicklichen Leitungszustand nicht auslesen!\n"
-+ 
-+-#: ../slattach.c:501
-++#: ../slattach.c:513
-++#, c-format
-+ msgid "slattach: tty_open: cannot set RAW mode!\n"
-+ msgstr "slattach: tty_open: Kann RAW-Modus nicht setzen!\n"
-+ 
-+-#: ../slattach.c:508
-++#: ../slattach.c:520
-+ #, c-format
-+ msgid "slattach: tty_open: cannot set %s bps!\n"
-+ msgstr "slattach: tty_open: Kann %s bps nicht setzen!\n"
-+ 
-+-#: ../slattach.c:518
-++#: ../slattach.c:530
-++#, c-format
-+ msgid "slattach: tty_open: cannot set 8N1 mode!\n"
-+ msgstr "slattach: tty_open: Kann 8N1-Modus nicht setzen!\n"
-+ 
-+-#: ../slattach.c:686
-++#: ../slattach.c:672
-++#, c-format
-++msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n"
-++msgstr ""
-++
-++#: ../slattach.c:704
-+ #, c-format
-+ msgid "%s started"
-+ msgstr "%s gestartet"
-+ 
-+-#: ../slattach.c:687
-++#: ../slattach.c:705
-+ #, c-format
-+ msgid " on %s"
-+ msgstr " auf %s"
-+ 
-+-#: ../slattach.c:688
-++#: ../slattach.c:706
-+ #, c-format
-+ msgid " interface %s\n"
-+ msgstr " Schnittstelle: %s\n"
-++
-++msgid ""
-++"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
-++"<-''-\n"
-++msgstr ""
-++"  arp [-v]   [<HW>] [-i <if>] -s  <Hostname> <hwaddr> [netmask <nm>] pub\n"
-++
-++msgid "%s: unknown interface: %s\n"
-++msgstr "%s: unbekannte Schnittstelle: %s\n"
-++
-++msgid "address mask replies"
-++msgstr "Adressmaskenantworten"
-++
-++msgid "unknown title %s\n"
-++msgstr "Unbekannter Titel %s\n"
-++
-++msgid "Routing table for `ddp' not yet supported.\n"
-++msgstr "DDP-Routentabelle wird noch nicht unterst�tzt.\n"
-+Index: net-tools/po/ja.po
-+===================================================================
-+--- /dev/null
-++++ net-tools/po/ja.po
-+@@ -0,0 +1,3133 @@
-++# Net-tool Japanese locale data
-++# Kenshi Muto <kmuto@debian.org>, 2007.
-++# Yasuyuki Furukawa <yasu@on.cs.keio.ac.jp>, 1999.
-++#
-++msgid ""
-++msgstr ""
-++"Report-Msgid-Bugs-To: \n"
-++"POT-Creation-Date: 2007-06-30 12:28+0900\n"
-++"PO-Revision-Date: 2007-07-04 20:47+0900\n"
-++"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
-++"Language-Team: Japanese\n"
-++"MIME-Version: 1.0\n"
-++"Content-Type: text/plain; charset=UTF-8\n"
-++"Content-Transfer-Encoding: 8-bit\n"
-++
-++#: ../arp.c:112 ../arp.c:279
-++#, c-format
-++msgid "arp: need host name\n"
-++msgstr "arp: ホスト名が必要です\n"
-++
-++#: ../arp.c:215 ../arp.c:230
-++#, c-format
-++msgid "No ARP entry for %s\n"
-++msgstr "%sのARPエントリがありません\n"
-++
-++#: ../arp.c:248
-++#, c-format
-++msgid "arp: cant get HW-Address for `%s': %s.\n"
-++msgstr "arp: '%s'のハードウェアアドレスを取得できません: %s.\n"
-++
-++#: ../arp.c:252
-++#, c-format
-++msgid "arp: protocol type mismatch.\n"
-++msgstr "arp: プロトコルタイプが適合しません.\n"
-++
-++#: ../arp.c:261
-++#, c-format
-++msgid "arp: device `%s' has HW address %s `%s'.\n"
-++msgstr "arp: デバイス`%s'はハードウェアアドレス%s `%s'です.\n"
-++
-++#: ../arp.c:293
-++#, c-format
-++msgid "arp: need hardware address\n"
-++msgstr "arp: ハードウェアアドレスが必要です\n"
-++
-++#: ../arp.c:301
-++#, c-format
-++msgid "arp: invalid hardware address\n"
-++msgstr "arp: ハードウェアアドレスが不適当です\n"
-++
-++#: ../arp.c:398
-++#, c-format
-++msgid "arp: cannot open etherfile %s !\n"
-++msgstr "arp: etherファイル%sが開けません!\n"
-++
-++#: ../arp.c:414
-++#, c-format
-++msgid "arp: format error on line %u of etherfile %s !\n"
-++msgstr "arp: %u行(ファイル%s)にフォーマットエラーがあります!\n"
-++
-++#: ../arp.c:427
-++#, c-format
-++msgid "arp: cannot set entry on line %u of etherfile %s !\n"
-++msgstr "arp: etherファイル%u行(%s)のエントリを設定できません!\n"
-++
-++#: ../arp.c:448
-++#, c-format
-++msgid ""
-++"Address                  HWtype  HWaddress           Flags Mask            "
-++"Iface\n"
-++msgstr "アドレス               HWタイプ  HWアドレス         フラグ マスク インタフェース\n"
-++
-++#: ../arp.c:476
-++msgid "<from_interface>"
-++msgstr "<起点インタフェース>"
-++
-++#: ../arp.c:478
-++msgid "(incomplete)"
-++msgstr "(不完全)"
-++
-++# translatable?
-++#: ../arp.c:495
-++#, c-format
-++msgid "%s (%s) at "
-++msgstr "%s (%s) at "
-++
-++#: ../arp.c:501
-++#, c-format
-++msgid "<incomplete> "
-++msgstr "<不完全> "
-++
-++#: ../arp.c:507
-++#, c-format
-++msgid "netmask %s "
-++msgstr "ネットマスク %s "
-++
-++# translatable?
-++#: ../arp.c:524
-++#, c-format
-++msgid "on %s\n"
-++msgstr "on %s\n"
-++
-++#: ../arp.c:605
-++#, c-format
-++msgid "Entries: %d\tSkipped: %d\tFound: %d\n"
-++msgstr "エントリ: %d\tスキップ: %d\t発見: %d\n"
-++
-++#: ../arp.c:609
-++#, c-format
-++msgid "%s (%s) -- no entry\n"
-++msgstr "%s (%s) -- エントリなし\n"
-++
-++#: ../arp.c:611
-++#, c-format
-++msgid "arp: in %d entries no match found.\n"
-++msgstr "arp: %dのエントリ中, 一致するものが見つかりません.\n"
-++
-++#: ../arp.c:626
-++#, c-format
-++msgid ""
-++"Usage:\n"
-++"  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP "
-++"cache\n"
-++msgstr ""
-++"使用法:\n"
-++"  arp [-vn]  [<HW>] [-i <インタフェース>]\n"
-++"                                [-a] [<ホスト名>]   ‥‥ ARPキャッシュの表"
-++"示\n"
-++
-++#: ../arp.c:627
-++#, c-format
-++msgid ""
-++"  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP "
-++"entry\n"
-++msgstr "  arp [-v]    [-i <インタフェース>]  -d  <ホスト名> [pub] ‥‥ARPエントリを削除\n"
-++
-++#: ../arp.c:628
-++#, c-format
-++msgid ""
-++"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from "
-++"file\n"
-++msgstr ""
-++"  arp [-vnD] [<HW>] [-i <インタフェース>] \n"
-++"                              -f  <ファイル名>  ‥‥ファイルからエントリを追加\n"
-++
-++#: ../arp.c:629
-++#, c-format
-++msgid ""
-++"  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add "
-++"entry\n"
-++msgstr ""
-++"  arp [-v]   [<HW>] [-i <インタフェース>]\n"
-++"             -s <ホスト名> <ハードウェアアドレス> [temp] ‥‥エントリを追加\n"
-++
-++# FIXME:What does '' mean?
-++#: ../arp.c:630
-++#, c-format
-++msgid ""
-++"  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          "
-++"<-''-\n"
-++"\n"
-++msgstr ""
-++"  arp [-v]   [<HW>] [-i <インタフェース>] -Ds <ホスト名>\n"
-++"              <インタフェース> [netmask <ネットマスク>] pub     ‥‥     〃\n"
-++
-++#: ../arp.c:632
-++#, c-format
-++msgid ""
-++"        -a                       display (all) hosts in alternative (BSD) "
-++"style\n"
-++msgstr ""
-++"        -a                 新しい(BSD)スタイルでエントリされた全ホストを表示"
-++"する\n"
-++
-++#: ../arp.c:633
-++#, c-format
-++msgid "        -s, --set                set a new ARP entry\n"
-++msgstr "        -s, --set          新規ARPエントリを設定する\n"
-++
-++#: ../arp.c:634
-++#, c-format
-++msgid "        -d, --delete             delete a specified entry\n"
-++msgstr "        -d, --delete       指定エントリを削除する\n"
-++
-++#: ../arp.c:635 ../netstat.c:1503 ../route.c:86
-++#, c-format
-++msgid "        -v, --verbose            be verbose\n"
-++msgstr "        -v, --verbose            詳細表示を行なう\n"
-++
-++#: ../arp.c:636 ../netstat.c:1504 ../route.c:87
-++#, c-format
-++msgid "        -n, --numeric            don't resolve names\n"
-++msgstr "        -n, --numeric            名前のレゾルブをしない\n"
-++
-++#: ../arp.c:637
-++#, c-format
-++msgid ""
-++"        -i, --device             specify network interface (e.g. eth0)\n"
-++msgstr "        -i, --device       ネットワークインタフェースの指定(例 eth0)\n"
-++
-++#: ../arp.c:638
-++#, c-format
-++msgid "        -D, --use-device         read <hwaddr> from given device\n"
-++msgstr ""
-++"        -D, --use-device   与えられたデバイスから\n"
-++"                                    <HWアドレス>を読み込む\n"
-++
-++#: ../arp.c:639
-++#, c-format
-++msgid "        -A, -p, --protocol       specify protocol family\n"
-++msgstr "        -A, -p, --protocol       プロトコルファミリを指定する\n"
-++
-++#: ../arp.c:640
-++#, c-format
-++msgid ""
-++"        -f, --file               read new entries from file or from /etc/"
-++"ethers\n"
-++"\n"
-++msgstr "        -f, --file         /etc/ethersファイルから新規エントリを読み込む\n\n"
-++
-++#: ../arp.c:642 ../rarp.c:182
-++#, c-format
-++msgid "  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"
-++msgstr "  <HW>=ハードウェアアドレスタイプを指定するには'-H <hw>'を使って下さい。標準: %s\n"
-++
-++#: ../arp.c:643 ../rarp.c:183
-++#, c-format
-++msgid "  List of possible hardware types (which support ARP):\n"
-++msgstr "  (ARPをサポートした)指定可能なハードウェアタイプのリスト:\n"
-++
-++#: ../arp.c:677 ../arp.c:762
-++#, c-format
-++msgid "%s: hardware type not supported!\n"
-++msgstr "%s: ハードウェアタイプがサポートされていません!\n"
-++
-++#: ../arp.c:681
-++#, c-format
-++msgid "%s: address family not supported!\n"
-++msgstr "%s: アドレスファミリがサポートされていません!\n"
-++
-++#: ../arp.c:716
-++#, c-format
-++msgid "arp: -N not yet supported.\n"
-++msgstr "arp: -Nはまだサポートしていません.\n"
-++
-++#: ../arp.c:726
-++#, c-format
-++msgid "arp: %s: unknown address family.\n"
-++msgstr "arp: %s: 不明なアドレスファミリです.\n"
-++
-++#: ../arp.c:735
-++#, c-format
-++msgid "arp: %s: unknown hardware type.\n"
-++msgstr "arp: %s: 不明なハードウェアタイプです.\n"
-++
-++#: ../arp.c:754
-++#, c-format
-++msgid "arp: %s: kernel only supports 'inet'.\n"
-++msgstr "arp: %s: カーネルは'inet'以外はサポートしていません.\n"
-++
-++#: ../arp.c:767
-++#, c-format
-++msgid "arp: %s: hardware type without ARP support.\n"
-++msgstr "arp: %s: ARPサポートのないハードウェアタイプです.\n"
-++
-++#: ../hostname.c:71
-++#, c-format
-++msgid "Setting nodename to `%s'\n"
-++msgstr "ノード名を`%s'へ設定しました\n"
-++
-++#: ../hostname.c:76
-++#, c-format
-++msgid "%s: you must be root to change the node name\n"
-++msgstr "%s: ノード名の変更はルートでなければなりません\n"
-++
-++#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117
-++#, c-format
-++msgid "%s: name too long\n"
-++msgstr "%s: 名前が長すぎます\n"
-++
-++#: ../hostname.c:91
-++#, c-format
-++msgid "Setting hostname to `%s'\n"
-++msgstr "ホスト名を`%s'へ設定しました\n"
-++
-++#: ../hostname.c:96
-++#, c-format
-++msgid "%s: you must be root to change the host name\n"
-++msgstr "%s: ホスト名の変更はルートでなければなりません\n"
-++
-++#: ../hostname.c:109
-++#, c-format
-++msgid "Setting domainname to `%s'\n"
-++msgstr "ドメインを`%s'へ設定しました\n"
-++
-++#: ../hostname.c:114
-++#, c-format
-++msgid "%s: you must be root to change the domain name\n"
-++msgstr "%s: ドメイン名の変更はルートでなければなりません\n"
-++
-++#: ../hostname.c:131
-++#, c-format
-++msgid "Resolving `%s' ...\n"
-++msgstr "`%s'をレゾルブ中 ...\n"
-++
-++#: ../hostname.c:137
-++#, c-format
-++msgid "Result: h_name=`%s'\n"
-++msgstr "結果: h_name=`%s'\n"
-++
-++#: ../hostname.c:142
-++#, c-format
-++msgid "Result: h_aliases=`%s'\n"
-++msgstr "結果: h_aliases=`%s'\n"
-++
-++#: ../hostname.c:147
-++#, c-format
-++msgid "Result: h_addr_list=`%s'\n"
-++msgstr "結果: h_addr_list=`%s'\n"
-++
-++#: ../hostname.c:208
-++#, c-format
-++msgid "%s: can't open `%s'\n"
-++msgstr "%s: `%s'を開けません\n"
-++
-++#: ../hostname.c:222
-++#, c-format
-++msgid "Usage: hostname [-v] {hostname|-F file}      set hostname (from file)\n"
-++msgstr "使用法: hostname   [-v] {ホスト名|-F ファイル}    (ファイルによる)ホスト名の設定\n"
-++
-++#: ../hostname.c:223
-++#, c-format
-++msgid ""
-++"       domainname [-v] {nisdomain|-F file}   set NIS domainname (from file)\n"
-++msgstr "        domainname [-v] {NISドメイン|-F ファイル} (ファイルによる)NISドメイン名の設定\n"
-++
-++#: ../hostname.c:225
-++#, c-format
-++msgid ""
-++"       nodename [-v] {nodename|-F file}      set DECnet node name (from "
-++"file)\n"
-++msgstr ""
-++"nodename [-v] {ノード名|-F ファイル}  (ファイルによる)DECnetノード名の設定\n"
-++
-++#: ../hostname.c:227
-++#, c-format
-++msgid "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  display formatted name\n"
-++msgstr "        hostname [-v] [-d|-f|-s|-a|-i|-y]     形式を指定して表示\n"
-++
-++#: ../hostname.c:228
-++#, c-format
-++msgid ""
-++"       hostname [-v]                         display hostname\n"
-++"\n"
-++msgstr ""
-++"        hostname [-v]                         ホスト名の出力\n"
-++"\n"
-++
-++#: ../hostname.c:229
-++#, c-format
-++msgid ""
-++"       hostname -V|--version|-h|--help       print info and exit\n"
-++"\n"
-++msgstr ""
-++"        hostname -V|--version|-h|--help       諸情報を出力して終了\n"
-++"\n"
-++"\n"
-++
-++#: ../hostname.c:230
-++#, c-format
-++msgid ""
-++"    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
-++"\n"
-++msgstr "    dnsdomainname=ホスト名 -d, {yp,nis,}domainname=ホスト名 -y\n\n"
-++
-++#: ../hostname.c:231
-++#, c-format
-++msgid "    -s, --short           short host name\n"
-++msgstr "    -s, --short           短縮ホスト名\n"
-++
-++#: ../hostname.c:232
-++#, c-format
-++msgid "    -a, --alias           alias names\n"
-++msgstr "    -a, --alias           エイリアス名\n"
-++
-++#: ../hostname.c:233
-++#, c-format
-++msgid "    -i, --ip-address      addresses for the hostname\n"
-++msgstr "    -i, --ip-address      ホスト名に対するアドレス\n"
-++
-++#: ../hostname.c:234
-++#, c-format
-++msgid "    -f, --fqdn, --long    long host name (FQDN)\n"
-++msgstr "    -f, --fqdn, --long    ロングホスト名(FQDN)\n"
-++
-++#: ../hostname.c:235
-++#, c-format
-++msgid "    -d, --domain          DNS domain name\n"
-++msgstr "    -d, --domain          DNSドメイン名\n"
-++
-++#: ../hostname.c:236
-++#, c-format
-++msgid "    -y, --yp, --nis       NIS/YP domainname\n"
-++msgstr "    -y, --yp, --nis       NIS/YPドメイン名\n"
-++
-++#: ../hostname.c:238
-++#, c-format
-++msgid "    -n, --node            DECnet node name\n"
-++msgstr "    -n, --node            DECnetノード名\n"
-++
-++#: ../hostname.c:240
-++#, c-format
-++msgid ""
-++"    -F, --file            read hostname or NIS domainname from given file\n"
-++"\n"
-++msgstr "    -F, --file            指定のファイルからホスト名かNISドメイン名を読み込む\n\n"
-++
-++#: ../hostname.c:242
-++#, c-format
-++msgid ""
-++"   This command can read or set the hostname or the NIS domainname. You can\n"
-++"   also read the DNS domain or the FQDN (fully qualified domain name).\n"
-++"   Unless you are using bind or NIS for host lookups you can change the\n"
-++"   FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n"
-++"   part of the FQDN) in the /etc/hosts file.\n"
-++msgstr ""
-++"   このコマンドでは、ホスト名またはNISドメイン名を読み込みまたは設定できます。\n"
-++"   DNSドメインまたはFDN(完全修飾ドメイン名)を読み込むこともできます。\n"
-++"   ホスト名の参照にBindおよび, NISも使わない場合, /etc/hostsファイルにある\n"
-++"   FQDNや, (FQDNの一部分の)ドメイン名を変更できます.\n"
-++
-++#: ../hostname.c:338
-++#, c-format
-++msgid "%s: You can't change the DNS domain name with this command\n"
-++msgstr "%s: このコマンドではDNSドメイン名は変更できません.\n"
-++
-++#: ../hostname.c:339
-++#, c-format
-++msgid ""
-++"\n"
-++"Unless you are using bind or NIS for host lookups you can change the DNS\n"
-++msgstr ""
-++"\n"
-++"ホスト名の参照にBindおよび, NISも使わない場合、/etc/hostsファイル\n"
-++
-++#: ../hostname.c:340
-++#, c-format
-++msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n"
-++msgstr "にあるFQDNや, (FQDNの一部分の)ドメイン名を変更できます.\n"
-++
-++#: ../hostname.c:357
-++#, c-format
-++msgid "gethostname()=`%s'\n"
-++msgstr "gethostname()=`%s'\n"
-++
-++#: ../hostname.c:374
-++#, c-format
-++msgid "getdomainname()=`%s'\n"
-++msgstr "getdomainname()=`%s'\n"
-++
-++#: ../hostname.c:389
-++#, c-format
-++msgid "getnodename()=`%s'\n"
-++msgstr "getnodename()=`%s'\n"
-++
-++#: ../ifconfig.c:107
-++#, c-format
-++msgid ""
-++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
-++"Flg\n"
-++msgstr "Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR フラグ\n"
-++
-++#: ../ifconfig.c:129 ../ifconfig.c:161
-++#, c-format
-++msgid "%s: ERROR while getting interface flags: %s\n"
-++msgstr "%s: インタフェースフラグの取得中にエラーが発生しました:%s\n"
-++
-++#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862
-++#: ../ifconfig.c:973
-++#, c-format
-++msgid "No support for INET on this system.\n"
-++msgstr "INETはこのシステムではサポートされていません.\n"
-++
-++#: ../ifconfig.c:193
-++#, c-format
-++msgid "%s: ERROR while testing interface flags: %s\n"
-++msgstr "%s: インタフェースフラグのテスト中にエラーが発生しました: %s\n"
-++
-++#: ../ifconfig.c:202
-++#, c-format
-++msgid ""
-++"Usage:\n"
-++"  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"
-++msgstr ""
-++"使用法:\n"
-++"  ifconfig [-a] [-v] [-s] <インタフェース> [[<AF>] <アドレス>]\n"
-++
-++#: ../ifconfig.c:204
-++#, c-format
-++msgid "  [add <address>[/<prefixlen>]]\n"
-++msgstr "  [add <アドレス>[/<プレフィックス長>]]\n"
-++
-++#: ../ifconfig.c:205
-++#, c-format
-++msgid "  [del <address>[/<prefixlen>]]\n"
-++msgstr "   [del <アドレス>[/<プレフィックス長>]]\n"
-++
-++#: ../ifconfig.c:206
-++#, c-format
-++msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
-++msgstr "  [[-]broadcast [<アドレス>]]  [[-]pointopoint [<アドレス>]]\n"
-++
-++#: ../ifconfig.c:207
-++#, c-format
-++msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
-++msgstr "  [netmask <アドレス>]  [dstaddr <アドレス>]  [tunnel <アドレス>]\n"
-++
-++#: ../ifconfig.c:210
-++#, c-format
-++msgid "  [outfill <NN>] [keepalive <NN>]\n"
-++msgstr "  [outfill <数値>] [keepalive <数値>]\n"
-++
-++#: ../ifconfig.c:212
-++#, c-format
-++msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
-++msgstr "  [hw <HW> <アドレス>]  [metric <数値>]  [mtu <数値>]\n"
-++
-++#: ../ifconfig.c:213
-++#, c-format
-++msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
-++msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
-++
-++#: ../ifconfig.c:214
-++#, c-format
-++msgid "  [multicast]  [[-]promisc]\n"
-++msgstr "  [multicast]  [[-]promisc]\n"
-++
-++#: ../ifconfig.c:215
-++#, c-format
-++msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
-++msgstr "  [mem_start <開始アドレス>] [io_addr <IOアドレス>] [irq <番号>] [media <タイプ>]\n"
-++
-++#: ../ifconfig.c:217
-++#, c-format
-++msgid "  [txqueuelen <NN>]\n"
-++msgstr "   [txqueuelen <TXキュー長>]\n"
-++
-++#: ../ifconfig.c:220
-++#, c-format
-++msgid "  [[-]dynamic]\n"
-++msgstr "  [[-]dynamic]\n"
-++
-++#: ../ifconfig.c:222
-++#, c-format
-++msgid ""
-++"  [up|down] ...\n"
-++"\n"
-++msgstr "  [up|down] ...\n\n"
-++
-++#: ../ifconfig.c:224
-++#, c-format
-++msgid "  <HW>=Hardware Type.\n"
-++msgstr "  <HW>=ハードウェアタイプ.\n"
-++
-++#: ../ifconfig.c:225
-++#, c-format
-++msgid "  List of possible hardware types:\n"
-++msgstr "  利用可能なハードウェアタイプのリスト:\n"
-++
-++#. 1 = ARPable
-++#: ../ifconfig.c:227
-++#, c-format
-++msgid "  <AF>=Address family. Default: %s\n"
-++msgstr "  <AF>=アドレスファミリ. 標準: %s\n"
-++
-++#: ../ifconfig.c:228
-++#, c-format
-++msgid "  List of possible address families:\n"
-++msgstr "  利用可能なアドレスファミリのリスト:\n"
-++
-++#: ../ifconfig.c:303
-++#, c-format
-++msgid "ifconfig: option `%s' not recognised.\n"
-++msgstr "ifconfig: オプション`%s'を解釈できません.\n"
-++
-++#: ../ifconfig.c:305 ../ifconfig.c:962
-++#, c-format
-++msgid "ifconfig: `--help' gives usage information.\n"
-++msgstr "ifconfig: `--help'で使用法を見られます.\n"
-++
-++#: ../ifconfig.c:380
-++#, c-format
-++msgid "Unknown media type.\n"
-++msgstr "不明なメディアタイプです.\n"
-++
-++#: ../ifconfig.c:417
-++#, c-format
-++msgid ""
-++"Warning: Interface %s still in promisc mode... maybe other application is "
-++"running?\n"
-++msgstr "警告: インタフェース%sはまだpromiscモードです...恐らく他のアプリケーションが実行中ではありませんか?\n"
-++
-++#: ../ifconfig.c:429
-++#, c-format
-++msgid "Warning: Interface %s still in MULTICAST mode.\n"
-++msgstr "警告: インタフェース%sはまだMULTICASTモードです.\n"
-++
-++#: ../ifconfig.c:441
-++#, c-format
-++msgid "Warning: Interface %s still in ALLMULTI mode.\n"
-++msgstr "警告: インタフェース%sはまだALLMULTIモードです.\n"
-++
-++#: ../ifconfig.c:465
-++#, c-format
-++msgid "Warning: Interface %s still in DYNAMIC mode.\n"
-++msgstr "警告: インタフェース%sはまだDYNAMICモードです.\n"
-++
-++#: ../ifconfig.c:523
-++#, c-format
-++msgid "Warning: Interface %s still in BROADCAST mode.\n"
-++msgstr "警告: インタフェース%sはまだBROADCASTモードです.\n"
-++
-++#: ../ifconfig.c:652
-++#, c-format
-++msgid "Warning: Interface %s still in POINTOPOINT mode.\n"
-++msgstr "警告: インタフェース%sはまだPOINTOPOINTモードです.\n"
-++
-++#: ../ifconfig.c:684
-++#, c-format
-++msgid "hw address type `%s' has no handler to set address. failed.\n"
-++msgstr "ハードウェアアドレスタイプ`%s'はアドレスを設定するハンドラを持っていません. 失敗しました.\n"
-++
-++#: ../ifconfig.c:693
-++#, c-format
-++msgid "%s: invalid %s address.\n"
-++msgstr "%s: 不適切なアドレスです(%s).\n"
-++
-++#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913
-++#, c-format
-++msgid "No support for INET6 on this system.\n"
-++msgstr "INET6はこのシステムではサポートされていません.\n"
-++
-++#: ../ifconfig.c:780 ../ifconfig.c:871
-++#, c-format
-++msgid "Interface %s not initialized\n"
-++msgstr "インタフェース%sは初期化されていません.\n"
-++
-++#: ../ifconfig.c:792 ../ifconfig.c:882
-++#, c-format
-++msgid "Bad address.\n"
-++msgstr "不適切なアドレスです.\n"
-++
-++#: ../ifconfig.c:885
-++#, c-format
-++msgid "Address deletion not supported on this system.\n"
-++msgstr "アドレス削除はこのシステムではサポートされていません.\n"
-++
-++#: ../ifconfig.c:957
-++#, c-format
-++msgid "ifconfig: Cannot set address for this protocol family.\n"
-++msgstr "ifconfig:このプロトコルファミリにアドレスを設定できません.\n"
-++
-++#: ../ifconfig.c:983
-++#, c-format
-++msgid "No support for ECONET on this system.\n"
-++msgstr "ECONETはこのシステムではサポートされていません.\n"
-++
-++#: ../ifconfig.c:991
-++#, c-format
-++msgid "Don't know how to set addresses for family %d.\n"
-++msgstr "ファミリ%dのアドレスの設定方法が不明です.\n"
-++
-++#: ../ifconfig.c:1021
-++#, c-format
-++msgid "WARNING: at least one error occured. (%d)\n"
-++msgstr "警告: 少なくとも1つのエラーが発生しました. (%d)\n"
-++
-++#: ../netstat.c:434
-++#, c-format
-++msgid ""
-++"(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n"
-++msgstr "(\"-p\"の情報を読み込めませんでした: geteuid()=%d しかしルートであるべきです.)\n"
-++
-++#: ../netstat.c:438
-++#, c-format
-++msgid ""
-++"(Not all processes could be identified, non-owned process info\n"
-++" will not be shown, you would have to be root to see it all.)\n"
-++msgstr ""
-++"(一部のプロセスが識別されますが, 所有していないプロセスの情報は\n"
-++"表示されません。それら全てを見るにはルートになる必要があります.)\n"
-++
-++# translatable?
-++#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266
-++msgid "LISTENING"
-++msgstr "LISTENING"
-++
-++# translatable?
-++#: ../netstat.c:446
-++msgid "CONN SENT"
-++msgstr "CONN SENT"
-++
-++# translatable?
-++#: ../netstat.c:447 ../netstat.c:1268
-++msgid "DISC SENT"
-++msgstr "DISC SENT"
-++
-++# translatable?
-++#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269
-++msgid "ESTABLISHED"
-++msgstr "ESTABLISHED"
-++
-++#: ../netstat.c:470
-++#, c-format
-++msgid "Active NET/ROM sockets\n"
-++msgstr "稼働中のNET/ROMソケット\n"
-++
-++#: ../netstat.c:471
-++#, c-format
-++msgid ""
-++"User       Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-"
-++"Q\n"
-++msgstr "ユーザ     受信先     発信元    デバイス  状態        Vr/Vs    送信-Q  受信-Q\n"
-++
-++#: ../netstat.c:481 ../netstat.c:1308
-++#, c-format
-++msgid "Problem reading data from %s\n"
-++msgstr "%sからのデータの読み込みに問題\n"
-++
-++# translatable?
-++#: ../netstat.c:516
-++msgid "SYN_SENT"
-++msgstr "SYN_SENT"
-++
-++# translatable?
-++#: ../netstat.c:517
-++msgid "SYN_RECV"
-++msgstr "SYN_RECV"
-++
-++# translatable?
-++#: ../netstat.c:518
-++msgid "FIN_WAIT1"
-++msgstr "FIN_WAIT1"
-++
-++# translatable?
-++#: ../netstat.c:519
-++msgid "FIN_WAIT2"
-++msgstr "FIN_WAIT2"
-++
-++# translatable?
-++#: ../netstat.c:520
-++msgid "TIME_WAIT"
-++msgstr "TIME_WAIT"
-++
-++# translatable?
-++#: ../netstat.c:521
-++msgid "CLOSE"
-++msgstr "CLOSE"
-++
-++# translatable?
-++#: ../netstat.c:522
-++msgid "CLOSE_WAIT"
-++msgstr "CLOSE_WAIT"
-++
-++# translatable?
-++#: ../netstat.c:523
-++msgid "LAST_ACK"
-++msgstr "LAST_ACK"
-++
-++# translatable?
-++#: ../netstat.c:524
-++msgid "LISTEN"
-++msgstr "LISTEN"
-++
-++# translatable?
-++#: ../netstat.c:525
-++msgid "CLOSING"
-++msgstr "CLOSING"
-++
-++#: ../netstat.c:596
-++#, c-format
-++msgid "warning, got bogus igmp6 line %d.\n"
-++msgstr "警告, 偽のigmp6ライン%dを得ました.\n"
-++
-++#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898
-++#: ../netstat.c:1032 ../netstat.c:1037
-++#, c-format
-++msgid "netstat: unsupported address family %d !\n"
-++msgstr "netstat: サポートしてないアドレスファミリ%dです!\n"
-++
-++# c-format
-++#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634
-++#, c-format
-++msgid "warning, got bogus igmp line %d.\n"
-++msgstr "警告, 偽のigmpライン%dを得ました.\n"
-++
-++#: ../netstat.c:677
-++#, c-format
-++msgid "Active X.25 sockets\n"
-++msgstr "稼働中のX.25ソケット\n"
-++
-++#. IMHO, Vr/Vs is not very usefull --SF
-++#: ../netstat.c:679
-++#, c-format
-++msgid ""
-++"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  Recv-"
-++"Q\n"
-++msgstr "受信先       発信元        デバイス  LCI  状態         Vr/Vs  送信-Q  受信-Q\n"
-++
-++#: ../netstat.c:759
-++#, c-format
-++msgid "warning, got bogus tcp line.\n"
-++msgstr "警告, 偽のTCPラインを得ました.\n"
-++
-++#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075
-++#, c-format
-++msgid "off (0.00/%ld/%d)"
-++msgstr "オフ (0.00/%ld/%d)"
-++
-++#: ../netstat.c:804
-++#, c-format
-++msgid "on (%2.2f/%ld/%d)"
-++msgstr "オン (%2.2f/%ld/%d)"
-++
-++#: ../netstat.c:809
-++#, c-format
-++msgid "keepalive (%2.2f/%ld/%d)"
-++msgstr "キープアライブ (%2.2f/%ld/%d)"
-++
-++#: ../netstat.c:814
-++#, c-format
-++msgid "timewait (%2.2f/%ld/%d)"
-++msgstr "時間待ち (%2.2f/%ld/%d)"
-++
-++#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085
-++#, c-format
-++msgid "unkn-%d (%2.2f/%ld/%d)"
-++msgstr "不明-%d (%2.2f/%ld/%d)"
-++
-++#: ../netstat.c:894
-++#, c-format
-++msgid "warning, got bogus udp line.\n"
-++msgstr "警告, 偽のUDPラインを得ました.\n"
-++
-++#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208
-++msgid "UNKNOWN"
-++msgstr "不明"
-++
-++#: ../netstat.c:958 ../netstat.c:1080
-++#, c-format
-++msgid "on%d (%2.2f/%ld/%d)"
-++msgstr "オン%d (%2.2f/%ld/%d)"
-++
-++#: ../netstat.c:1046
-++#, c-format
-++msgid "warning, got bogus raw line.\n"
-++msgstr "警告, 偽のRawラインを得ました.\n"
-++
-++#: ../netstat.c:1128
-++#, c-format
-++msgid "warning, got bogus unix line.\n"
-++msgstr "警告, 偽のunixラインを得ました.\n"
-++
-++# translatable?
-++#: ../netstat.c:1155
-++msgid "STREAM"
-++msgstr "STREAM"
-++
-++# translatable?
-++#: ../netstat.c:1159
-++msgid "DGRAM"
-++msgstr "DGRAM"
-++
-++# translatable?
-++#: ../netstat.c:1163
-++msgid "RAW"
-++msgstr "RAW"
-++
-++# translatable?
-++#: ../netstat.c:1167
-++msgid "RDM"
-++msgstr "RDM"
-++
-++# translatable?
-++#: ../netstat.c:1171
-++msgid "SEQPACKET"
-++msgstr "SEQPACKET"
-++
-++# translatable?
-++#: ../netstat.c:1180
-++msgid "FREE"
-++msgstr "FREE"
-++
-++# translatable?
-++#: ../netstat.c:1196
-++msgid "CONNECTING"
-++msgstr "CONNECTING"
-++
-++# translatable?
-++#: ../netstat.c:1200
-++msgid "CONNECTED"
-++msgstr "CONNECTED"
-++
-++# translatable?
-++#: ../netstat.c:1204
-++msgid "DISCONNECTING"
-++msgstr "DISCONNECTING"
-++
-++#: ../netstat.c:1235
-++#, c-format
-++msgid "Active UNIX domain sockets "
-++msgstr "稼働中のUNIXドメインソケット "
-++
-++#: ../netstat.c:1237 ../netstat.c:1756
-++#, c-format
-++msgid "(servers and established)"
-++msgstr "(サーバと確立)"
-++
-++#: ../netstat.c:1240 ../netstat.c:1759
-++#, c-format
-++msgid "(only servers)"
-++msgstr "(サーバのみ)"
-++
-++#: ../netstat.c:1242 ../netstat.c:1761
-++#, c-format
-++msgid "(w/o servers)"
-++msgstr "(w/oサーバ)"
-++
-++#: ../netstat.c:1245
-++#, c-format
-++msgid ""
-++"\n"
-++"Proto RefCnt Flags       Type       State         I-Node"
-++msgstr ""
-++"\n"
-++"Proto RefCnt フラグ      タイプ     状態         Iノード"
-++
-++#: ../netstat.c:1247
-++#, c-format
-++msgid " Path\n"
-++msgstr " パス\n"
-++
-++# translatable?
-++#: ../netstat.c:1267
-++msgid "SABM SENT"
-++msgstr "SABM SENT"
-++
-++# translatable?
-++#: ../netstat.c:1270
-++msgid "RECOVERY"
-++msgstr "RECOVERY"
-++
-++#: ../netstat.c:1284
-++#, c-format
-++msgid "Active AX.25 sockets\n"
-++msgstr "稼働中のAX.25ソケット\n"
-++
-++#: ../netstat.c:1285
-++#, c-format
-++msgid "Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-Q\n"
-++msgstr "受信先     発信元     デバイス 状態        Vr/Vs    送信-Q  受信-Q\n"
-++
-++#: ../netstat.c:1328
-++#, c-format
-++msgid "problem reading data from %s\n"
-++msgstr "%sからのデータ読み込み中に問題\n"
-++
-++#: ../netstat.c:1379
-++#, c-format
-++msgid ""
-++"Active IPX sockets\n"
-++"Proto Recv-Q Send-Q Local Address              Foreign Address            "
-++"State"
-++msgstr ""
-++"稼働中のIPXソケット\n"
-++"Proto 受信-Q 送信-Q 内部アドレス               外部アドレス               状"
-++"態"
-++
-++#: ../netstat.c:1381
-++#, c-format
-++msgid " User"
-++msgstr " ユーザ"
-++
-++# translatable?
-++#: ../netstat.c:1415
-++msgid "ESTAB"
-++msgstr "ESTAB"
-++
-++# translatable?
-++#: ../netstat.c:1423
-++msgid "UNK."
-++msgstr "UNK."
-++
-++#: ../netstat.c:1461
-++#, c-format
-++msgid "Kernel Interface table\n"
-++msgstr "カーネルインタフェーステーブル\n"
-++
-++#: ../netstat.c:1465
-++#, c-format
-++msgid ""
-++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
-++"Flg\n"
-++msgstr "Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR フラグ\n"
-++
-++#: ../netstat.c:1469
-++msgid "missing interface information"
-++msgstr "インタフェース情報が足りません"
-++
-++#: ../netstat.c:1492
-++#, c-format
-++msgid ""
-++"usage: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
-++"help}\n"
-++msgstr ""
-++"使用法: netstat [-veenNcCF] [<アドレスファミリ>] -r\n"
-++"        netstat {-V|--version|-h|--help}\n"
-++
-++#: ../netstat.c:1493
-++#, c-format
-++msgid "       netstat [-vnNcaeol] [<Socket> ...]\n"
-++msgstr "        netstat [-vnNcaeol] [<ソケット> ...]\n"
-++
-++#: ../netstat.c:1494
-++#, c-format
-++msgid ""
-++"       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
-++"\n"
-++msgstr "        netstat { [-veenNac] -i | [-cnNe] -M | -s }\n\n"
-++
-++#: ../netstat.c:1496
-++#, c-format
-++msgid "        -r, --route              display routing table\n"
-++msgstr "        -r, --routing            経路テーブルの表示\n"
-++
-++#: ../netstat.c:1497
-++#, c-format
-++msgid "        -i, --interfaces         display interface table\n"
-++msgstr "        -i, --interfaces         インタフェーステーブルの表示\n"
-++
-++#: ../netstat.c:1498
-++#, c-format
-++msgid "        -g, --groups             display multicast group memberships\n"
-++msgstr "        -g, --groups             マルチキャスト・グループメンバシップの表示\n"
-++
-++#: ../netstat.c:1499
-++#, c-format
-++msgid ""
-++"        -s, --statistics         display networking statistics (like SNMP)\n"
-++msgstr ""
-++"        -s, --statistics         (SNMPのように)ネットワーク統計を表示\n"
-++
-++#: ../netstat.c:1501
-++#, c-format
-++msgid ""
-++"        -M, --masquerade         display masqueraded connections\n"
-++"\n"
-++msgstr ""
-++"        -M, --masquerade         マスカレード接続の表示\n"
-++"\n"
-++
-++#: ../netstat.c:1505
-++#, c-format
-++msgid "        --numeric-hosts          don't resolve host names\n"
-++msgstr "        --numeric-hosts          ホスト名をレゾルブしない\n"
-++
-++#: ../netstat.c:1506
-++#, c-format
-++msgid "        --numeric-ports          don't resolve port names\n"
-++msgstr "        --numeric-ports          ポート名をレゾルブしない\n"
-++
-++#: ../netstat.c:1507
-++#, c-format
-++msgid "        --numeric-users          don't resolve user names\n"
-++msgstr "        --numeric-users          ユーザ名をレゾルブしない\n"
-++
-++#: ../netstat.c:1508
-++#, c-format
-++msgid "        -N, --symbolic           resolve hardware names\n"
-++msgstr "        -N, --symbolic           ハードウェア名をレゾルブする\n"
-++
-++#: ../netstat.c:1509 ../route.c:88
-++#, c-format
-++msgid "        -e, --extend             display other/more information\n"
-++msgstr "        -e, --extend             他の情報や多くの情報を表示する\n"
-++
-++#: ../netstat.c:1510
-++#, c-format
-++msgid "        -p, --programs           display PID/Program name for sockets\n"
-++msgstr "        -p, --programs           ソケットのPID/プログラム名を表示する\n"
-++
-++#: ../netstat.c:1511
-++#, c-format
-++msgid ""
-++"        -c, --continuous         continuous listing\n"
-++"\n"
-++msgstr ""
-++"        -c, --continous          継続的な表示\n"
-++"\n"
-++
-++#: ../netstat.c:1512
-++#, c-format
-++msgid "        -l, --listening          display listening server sockets\n"
-++msgstr "        -l, --listening          サーバのlistenソケットの表示\n"
-++
-++#: ../netstat.c:1513
-++#, c-format
-++msgid ""
-++"        -a, --all, --listening   display all sockets (default: connected)\n"
-++msgstr "        -a, --all, --listening   全ての情報を表示 (標準: connected)\n"
-++
-++#: ../netstat.c:1514
-++#, c-format
-++msgid "        -o, --timers             display timers\n"
-++msgstr "        -o, --timers             タイマの表示\n"
-++
-++#: ../netstat.c:1515 ../route.c:89
-++#, c-format
-++msgid ""
-++"        -F, --fib                display Forwarding Information Base "
-++"(default)\n"
-++msgstr "        -F, --fib                フォワード情報ベースを表示する(標準)\n"
-++
-++#: ../netstat.c:1516 ../route.c:90
-++#, c-format
-++msgid ""
-++"        -C, --cache              display routing cache instead of FIB\n"
-++"\n"
-++msgstr "        -C, --cache              FIBのかわりに経路キャッシュを表示する\n\n"
-++
-++#: ../netstat.c:1518
-++#, c-format
-++msgid ""
-++"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
-++"netrom\n"
-++msgstr ""
-++"  <ソケット>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
-++"netrom\n"
-++
-++#: ../netstat.c:1519
-++#, c-format
-++msgid "  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"
-++msgstr "  <AF>='-6|-4'または'-A <af>'または'--<af>'を利用; 標準: %s\n"
-++
-++#: ../netstat.c:1520 ../route.c:93
-++#, c-format
-++msgid "  List of possible address families (which support routing):\n"
-++msgstr "  (ルーティングをサポートした)利用可能なアドレスファミリのリスト:\n"
-++
-++#: ../netstat.c:1753
-++#, c-format
-++msgid "Active Internet connections "
-++msgstr "稼働中のインターネット接続 "
-++
-++#: ../netstat.c:1763
-++#, c-format
-++msgid ""
-++"\n"
-++"Proto Recv-Q Send-Q Local Address           Foreign Address         "
-++"State      "
-++msgstr ""
-++"\n"
-++"Proto 受信-Q 送信-Q 内部アドレス            外部アドレス            状"
-++"態       "
-++
-++#: ../netstat.c:1765
-++#, c-format
-++msgid " User       Inode     "
-++msgstr " ユーザ    Iノード    "
-++
-++#: ../netstat.c:1768
-++#, c-format
-++msgid " Timer"
-++msgstr "タイマ"
-++
-++#: ../netstat.c:1798
-++#, c-format
-++msgid "IPv4 Group Memberships\n"
-++msgstr "IPv4グループメンバシップ\n"
-++
-++#: ../netstat.c:1799
-++#, c-format
-++msgid "Interface       RefCnt Group\n"
-++msgstr "インタフェース 参照Cnt グループ\n"
-++
-++#: ../rarp.c:44
-++msgid "This kernel does not support RARP.\n"
-++msgstr "このカーネルはRARPをサポートしていません.\n"
-++
-++#: ../rarp.c:83
-++#, c-format
-++msgid "no RARP entry for %s.\n"
-++msgstr "%sのRARPエントリがありません.\n"
-++
-++#: ../rarp.c:96
-++#, c-format
-++msgid "%s: bad hardware address\n"
-++msgstr "%s: 不正なハードウェアアドレスです\n"
-++
-++#: ../rarp.c:128
-++#, c-format
-++msgid "rarp: cannot open file %s:%s.\n"
-++msgstr "rarp: ファイル%sを開けません:%s.\n"
-++
-++#: ../rarp.c:140
-++#, c-format
-++msgid "rarp: format error at %s:%u\n"
-++msgstr "rarp: %s:%u行にフォーマットエラーがあります\n"
-++
-++#: ../rarp.c:144 ../rarp.c:289
-++#, c-format
-++msgid "rarp: %s: unknown host\n"
-++msgstr "rarp: %s: 不明なホストです\n"
-++
-++#: ../rarp.c:147
-++#, c-format
-++msgid "rarp: cannot set entry from %s:%u\n"
-++msgstr "rarp: %s:%u行からエントリを設定できません\n"
-++
-++#: ../rarp.c:176
-++#, c-format
-++msgid "Usage: rarp -a                               list entries in cache.\n"
-++msgstr ""
-++"使用法: rarp -a                              キャッシュエントリの表示.\n"
-++
-++#: ../rarp.c:177
-++#, c-format
-++msgid "       rarp -d <hostname>                    delete entry from cache.\n"
-++msgstr ""
-++"       rarp -d <ホスト名>                    キャッシュからエントリを削除す"
-++"る.\n"
-++
-++#: ../rarp.c:178
-++#, c-format
-++msgid "       rarp [<HW>] -s <hostname> <hwaddr>    add entry to cache.\n"
-++msgstr ""
-++"       rarp [<HW>] -s <ホスト名> <ハードウェアアドレス>\n"
-++"                                             キャッシュへエントリを追加.\n"
-++
-++#: ../rarp.c:179
-++#, c-format
-++msgid ""
-++"       rarp -f                               add entries from /etc/ethers.\n"
-++msgstr ""
-++"       rarp -f                               /etc/ethersからエントリ追加.\n"
-++
-++#: ../rarp.c:180
-++#, c-format
-++msgid ""
-++"       rarp -V                               display program version.\n"
-++"\n"
-++msgstr "       rarp -V                               バージョン情報の出力.\n"
-++
-++#: ../rarp.c:238
-++#, c-format
-++msgid "%s: illegal option mix.\n"
-++msgstr "%s: オプションの組合せが間違っています.\n"
-++
-++#: ../rarp.c:269
-++#, c-format
-++msgid "rarp: %s: unknown hardware type.\n"
-++msgstr "rarp: %s: ハードウェアタイプが不明です.\n"
-++
-++#: ../route.c:80
-++#, c-format
-++msgid ""
-++"Usage: route [-nNvee] [-FC] [<AF>]           List kernel routing tables\n"
-++msgstr "使用法:route [-nNvee] [-FC] [アドレスファミリ]  カーネル経路テーブルの表示.\n"
-++
-++#: ../route.c:81
-++#, c-format
-++msgid ""
-++"       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n"
-++"\n"
-++msgstr ""
-++"       route [-v] [-FC] {add|del|flush}‥‥\n"
-++"\t\t\t\t   アドレスファミリの経路テーブルの設定.\n"
-++"\n"
-++
-++#: ../route.c:83
-++#, c-format
-++msgid ""
-++"       route {-h|--help} [<AF>]              Detailed usage syntax for "
-++"specified AF.\n"
-++msgstr ""
-++"       route {-h|--help} [アドレスファミリ]\n"
-++"                                     アドレスファミリ特定の文法の説明.\n"
-++
-++#: ../route.c:84
-++#, c-format
-++msgid ""
-++"       route {-V|--version}                  Display version/author and "
-++"exit.\n"
-++"\n"
-++msgstr "       route {-V|--version}          バージョン/作者情報の出力と終了.\n\n"
-++
-++#: ../route.c:92
-++#, c-format
-++msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
-++msgstr "  <AF>='-A <af>'または'--<af>'を利用; 標準: %s\n"
-++
-++#: ../plipconfig.c:66
-++#, c-format
-++msgid "Usage: plipconfig [-a] [-i] [-v] interface\n"
-++msgstr "使用法: plipconfig [-a] [-i] [-v] インタフェース\n"
-++
-++#: ../plipconfig.c:67
-++#, c-format
-++msgid "                  [nibble NN] [trigger NN]\n"
-++msgstr "                  [nibble 数値] [trigger 数値]\n"
-++
-++#: ../plipconfig.c:68
-++#, c-format
-++msgid "       plipconfig -V | --version\n"
-++msgstr "       plipconfig -V | --version\n"
-++
-++# translatable?
-++#: ../plipconfig.c:74
-++#, c-format
-++msgid "%s\tnibble %lu  trigger %lu\n"
-++msgstr "%s\tnibble %lu  trigger %lu\n"
-++
-++#: ../iptunnel.c:85
-++#, c-format
-++msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
-++msgstr "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
-++
-++#: ../iptunnel.c:86
-++#, c-format
-++msgid ""
-++"          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
-++msgstr "          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
-++
-++#: ../iptunnel.c:87
-++#, c-format
-++msgid "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
-++msgstr "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
-++
-++#: ../iptunnel.c:88
-++#, c-format
-++msgid "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
-++msgstr "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
-++
-++#: ../iptunnel.c:89
-++#, c-format
-++msgid ""
-++"       iptunnel -V | --version\n"
-++"\n"
-++msgstr "       iptunnel -V | --version\n\n"
-++
-++#: ../iptunnel.c:90
-++#, c-format
-++msgid "Where: NAME := STRING\n"
-++msgstr "意味: NAME := STRING\n"
-++
-++#: ../iptunnel.c:91
-++#, c-format
-++msgid "       ADDR := { IP_ADDRESS | any }\n"
-++msgstr "       ADDR := { IP_ADDRESS | any }\n"
-++
-++#: ../iptunnel.c:92
-++#, c-format
-++msgid "       TOS  := { NUMBER | inherit }\n"
-++msgstr "       TOS  := { NUMBER | inherit }\n"
-++
-++#: ../iptunnel.c:93
-++#, c-format
-++msgid "       TTL  := { 1..255 | inherit }\n"
-++msgstr "       TTL  := { 1..255 | inherit }\n"
-++
-++#: ../iptunnel.c:94
-++#, c-format
-++msgid "       KEY  := { DOTTED_QUAD | NUMBER }\n"
-++msgstr "       KEY  := { DOTTED_QUAD | NUMBER }\n"
-++
-++#: ../iptunnel.c:332
-++#, c-format
-++msgid "Keys are not allowed with ipip and sit.\n"
-++msgstr "キーはipipおよびsitでは許可されません.\n"
-++
-++#: ../iptunnel.c:352
-++#, c-format
-++msgid "Broadcast tunnel requires a source address.\n"
-++msgstr "ブロードキャストトンネルは発信元アドレスが必要です.\n"
-++
-++#: ../iptunnel.c:367
-++#, c-format
-++msgid "ttl != 0 and noptmudisc are incompatible\n"
-++msgstr "ttl != 0およびnoptmudiscは矛盾します\n"
-++
-++#: ../iptunnel.c:379
-++#, c-format
-++msgid "cannot determine tunnel mode (ipip, gre or sit)\n"
-++msgstr "トンネルモードを決定できません(ipip, greまたはsit)\n"
-++
-++#: ../iptunnel.c:417
-++#, c-format
-++msgid "%s: %s/ip  remote %s  local %s "
-++msgstr "%s: %s/ip  リモート%s  ローカル%s "
-++
-++#: ../iptunnel.c:421
-++msgid "unknown"
-++msgstr "不明"
-++
-++# FIXME: what does it mean?
-++#: ../iptunnel.c:453
-++#, c-format
-++msgid "  Drop packets out of sequence.\n"
-++msgstr "  シーケンスから外れたパケットをドロップ.\n"
-++
-++#: ../iptunnel.c:455
-++#, c-format
-++msgid "  Checksum in received packet is required.\n"
-++msgstr "  受信パケットのチェックサムは必須です.\n"
-++
-++# FIXME: what does it mean?
-++#: ../iptunnel.c:457
-++#, c-format
-++msgid "  Sequence packets on output.\n"
-++msgstr "  送信のシーケンスパケット.\n"
-++
-++# FIXME: what does it mean?
-++#: ../iptunnel.c:459
-++#, c-format
-++msgid "  Checksum output packets.\n"
-++msgstr "  送信パケットのチェックサム.\n"
-++
-++#: ../iptunnel.c:487
-++#, c-format
-++msgid "Wrong format of /proc/net/dev. Sorry.\n"
-++msgstr "/proc/net/devが不正なフォーマットです. すみません.\n"
-++
-++#: ../iptunnel.c:500
-++#, c-format
-++msgid "Failed to get type of [%s]\n"
-++msgstr "[%s]のタイプの取得に失敗\n"
-++
-++#: ../iptunnel.c:516
-++#, c-format
-++msgid "RX: Packets    Bytes        Errors CsumErrs OutOfSeq Mcasts\n"
-++msgstr "RX: パケット   バイト      エラー  CsumErrs outOfSeq マルチキャスト\n"
-++
-++#: ../iptunnel.c:519
-++#, c-format
-++msgid "TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs\n"
-++msgstr "TX: パケット   バイト       エラー DeadLoop NoRoute  バッファなし\n"
-++
-++#: ../statistics.c:47
-++msgid "ICMP input histogram:"
-++msgstr "ICMP入力ヒストグラム:"
-++
-++#: ../statistics.c:48
-++msgid "ICMP output histogram:"
-++msgstr "ICMP出力ヒストグラム:"
-++
-++#: ../statistics.c:65
-++#, c-format
-++msgid "Forwarding is %s"
-++msgstr "フォワードは%sです"
-++
-++#: ../statistics.c:66
-++#, c-format
-++msgid "Default TTL is %u"
-++msgstr "標準TTLは%uです"
-++
-++#: ../statistics.c:67
-++#, c-format
-++msgid "%u total packets received"
-++msgstr "合計%uパケットを受信"
-++
-++#: ../statistics.c:68
-++#, c-format
-++msgid "%u with invalid headers"
-++msgstr "不適当なヘッダが%u"
-++
-++#: ../statistics.c:69
-++#, c-format
-++msgid "%u with invalid addresses"
-++msgstr "不適当なアドレスが%u"
-++
-++#: ../statistics.c:70
-++#, c-format
-++msgid "%u forwarded"
-++msgstr "%uの転送"
-++
-++#: ../statistics.c:71
-++#, c-format
-++msgid "%u with unknown protocol"
-++msgstr "%uの不明なプロトコル"
-++
-++#: ../statistics.c:72
-++#, c-format
-++msgid "%u incoming packets discarded"
-++msgstr "%uの受信パケットを破棄"
-++
-++#: ../statistics.c:73
-++#, c-format
-++msgid "%u incoming packets delivered"
-++msgstr "%uの受信パケットを配送"
-++
-++#: ../statistics.c:74
-++#, c-format
-++msgid "%u requests sent out"
-++msgstr "%uの要求を送信"
-++
-++#. ?
-++#: ../statistics.c:75
-++#, c-format
-++msgid "%u outgoing packets dropped"
-++msgstr "%uの送信パケットをドロップ"
-++
-++#: ../statistics.c:76
-++#, c-format
-++msgid "%u dropped because of missing route"
-++msgstr "不明な経路で%uをドロップ"
-++
-++#: ../statistics.c:77
-++#, c-format
-++msgid "%u fragments dropped after timeout"
-++msgstr "タイムアウト後に%uのフラグメントをドロップ"
-++
-++#: ../statistics.c:78
-++#, c-format
-++msgid "%u reassemblies required"
-++msgstr "%uの再構築が必要"
-++
-++#. ?
-++#: ../statistics.c:79
-++#, c-format
-++msgid "%u packets reassembled ok"
-++msgstr "%uパケットの再構築に成功"
-++
-++#: ../statistics.c:80
-++#, c-format
-++msgid "%u packet reassembles failed"
-++msgstr "%uパケットの再構築に失敗"
-++
-++#: ../statistics.c:81
-++#, c-format
-++msgid "%u fragments received ok"
-++msgstr "%uフラグメントの受信に成功"
-++
-++#: ../statistics.c:82
-++#, c-format
-++msgid "%u fragments failed"
-++msgstr "%uフラグメントで失敗"
-++
-++#: ../statistics.c:83
-++#, c-format
-++msgid "%u fragments created"
-++msgstr "%uフラグメントを生成"
-++
-++#: ../statistics.c:88
-++#, c-format
-++msgid "%u ICMP messages received"
-++msgstr "%uのICMPメッセージ受信"
-++
-++#: ../statistics.c:89
-++#, c-format
-++msgid "%u input ICMP message failed."
-++msgstr "%uのICMPメッセージ入力失敗."
-++
-++#: ../statistics.c:90 ../statistics.c:103
-++#, c-format
-++msgid "destination unreachable: %u"
-++msgstr "送信先到達不可: %u"
-++
-++#: ../statistics.c:91
-++#, c-format
-++msgid "timeout in transit: %u"
-++msgstr "送信時間オーバ: %u"
-++
-++#: ../statistics.c:92 ../statistics.c:105
-++#, c-format
-++msgid "wrong parameters: %u"
-++msgstr "謝ったパラメータ: %u"
-++
-++#. ?
-++#: ../statistics.c:93
-++#, c-format
-++msgid "source quenches: %u"
-++msgstr "発信元消滅: %u"
-++
-++#: ../statistics.c:94
-++#, c-format
-++msgid "redirects: %u"
-++msgstr "リダイレクト: %u"
-++
-++#: ../statistics.c:95
-++#, c-format
-++msgid "echo requests: %u"
-++msgstr "エコー要求: %u"
-++
-++#: ../statistics.c:96 ../statistics.c:109
-++#, c-format
-++msgid "echo replies: %u"
-++msgstr "エコー応答: %u"
-++
-++#: ../statistics.c:97
-++#, c-format
-++msgid "timestamp request: %u"
-++msgstr "タイムスタンプ要求: %u"
-++
-++#: ../statistics.c:98
-++#, c-format
-++msgid "timestamp reply: %u"
-++msgstr "タイムスタンプ応答: %u"
-++
-++#: ../statistics.c:99
-++#, c-format
-++msgid "address mask request: %u"
-++msgstr "アドレスマスク要求: %u"
-++
-++#. ?
-++#: ../statistics.c:100 ../statistics.c:113
-++#, c-format
-++msgid "address mask replies: %u"
-++msgstr "アドレスマスク応答: %u"
-++
-++#. ?
-++#: ../statistics.c:101
-++#, c-format
-++msgid "%u ICMP messages sent"
-++msgstr "%uのICMPメッセージ送信"
-++
-++#: ../statistics.c:102
-++#, c-format
-++msgid "%u ICMP messages failed"
-++msgstr "%uのICMPメッセージ失敗"
-++
-++#: ../statistics.c:104
-++#, c-format
-++msgid "time exceeded: %u"
-++msgstr "時間切れ: %u"
-++
-++#. ?
-++#: ../statistics.c:106
-++#, c-format
-++msgid "source quench: %u"
-++msgstr "発信元消滅: %u"
-++
-++#: ../statistics.c:107
-++#, c-format
-++msgid "redirect: %u"
-++msgstr "リダイレクト: %u"
-++
-++#: ../statistics.c:108
-++#, c-format
-++msgid "echo request: %u"
-++msgstr "エコー要求: %u"
-++
-++#: ../statistics.c:110
-++#, c-format
-++msgid "timestamp requests: %u"
-++msgstr "タイムスタンプ要求: %u"
-++
-++#: ../statistics.c:111
-++#, c-format
-++msgid "timestamp replies: %u"
-++msgstr "タイムスタンプ応答: %u"
-++
-++#: ../statistics.c:112
-++#, c-format
-++msgid "address mask requests: %u"
-++msgstr "アドレスマスク要求: %u"
-++
-++#: ../statistics.c:118
-++#, c-format
-++msgid "RTO algorithm is %s"
-++msgstr "RTOアルゴリズムは%sです"
-++
-++#: ../statistics.c:122
-++#, c-format
-++msgid "%u active connections openings"
-++msgstr "%uの能動接続開始"
-++
-++#: ../statistics.c:123
-++#, c-format
-++msgid "%u passive connection openings"
-++msgstr "%uの受動接続開始"
-++
-++#: ../statistics.c:124
-++#, c-format
-++msgid "%u failed connection attempts"
-++msgstr "%uの接続試行失敗"
-++
-++#: ../statistics.c:125
-++#, c-format
-++msgid "%u connection resets received"
-++msgstr "%uの接続リセット受信"
-++
-++#: ../statistics.c:126
-++#, c-format
-++msgid "%u connections established"
-++msgstr "%uの接続確立"
-++
-++#: ../statistics.c:127
-++#, c-format
-++msgid "%u segments received"
-++msgstr "%uセグメントの受信"
-++
-++#: ../statistics.c:128
-++#, c-format
-++msgid "%u segments send out"
-++msgstr "%uセグメントの送信"
-++
-++#: ../statistics.c:129
-++#, c-format
-++msgid "%u segments retransmited"
-++msgstr "%uセグメントの再転送"
-++
-++#: ../statistics.c:130
-++#, c-format
-++msgid "%u bad segments received."
-++msgstr "%uの不正セグメント受信."
-++
-++#: ../statistics.c:131
-++#, c-format
-++msgid "%u resets sent"
-++msgstr "%uのリセット送信"
-++
-++#: ../statistics.c:136
-++#, c-format
-++msgid "%u packets received"
-++msgstr "%uパケット受信"
-++
-++#: ../statistics.c:137
-++#, c-format
-++msgid "%u packets to unknown port received."
-++msgstr "不明なポートからの%uパケットの受信."
-++
-++#: ../statistics.c:138
-++#, c-format
-++msgid "%u packet receive errors"
-++msgstr "%uのパケット受信エラー"
-++
-++#: ../statistics.c:139
-++#, c-format
-++msgid "%u packets sent"
-++msgstr "%uのパケットを送信"
-++
-++#: ../statistics.c:144
-++#, c-format
-++msgid "%u SYN cookies sent"
-++msgstr "%uのSYNクッキーを送信"
-++
-++#: ../statistics.c:145
-++#, c-format
-++msgid "%u SYN cookies received"
-++msgstr "%uのSYNクッキーを受信"
-++
-++#: ../statistics.c:146
-++#, c-format
-++msgid "%u invalid SYN cookies received"
-++msgstr "%uの不適当なSYNクッキーを受信"
-++
-++#: ../statistics.c:148
-++#, c-format
-++msgid "%u resets received for embryonic SYN_RECV sockets"
-++msgstr "%uの未完成のSYN_RECVソケットに対するリセットを受信"
-++
-++#: ../statistics.c:150
-++#, c-format
-++msgid "%u packets pruned from receive queue because of socket buffer overrun"
-++msgstr "%uのパケットをソケットバッファオーバランのため受信キューから除外"
-++
-++#. obsolete: 2.2.0 doesn't do that anymore
-++#: ../statistics.c:153
-++#, c-format
-++msgid "%u packets pruned from receive queue"
-++msgstr "%uのパケットを受信キューから除外"
-++
-++#: ../statistics.c:154
-++#, c-format
-++msgid ""
-++"%u packets dropped from out-of-order queue because of socket buffer overrun"
-++msgstr "%uのパケットがソケットバッファオーバーランのためout-of-orderキューからドロップ"
-++
-++#: ../statistics.c:156
-++#, c-format
-++msgid "%u ICMP packets dropped because they were out-of-window"
-++msgstr "%uのICMPパケットがout-of-windowのためドロップ"
-++
-++#: ../statistics.c:158
-++#, c-format
-++msgid "%u ICMP packets dropped because socket was locked"
-++msgstr "%uのICMPパケットをソケットのロックによってドロップ"
-++
-++# FIXME: what does it mean?
-++#: ../statistics.c:160
-++#, c-format
-++msgid "%u TCP sockets finished time wait in fast timer"
-++msgstr "%uのTCPソケットがファーストタイマでの時間待ちを完了"
-++
-++# FIXME
-++#: ../statistics.c:161
-++#, c-format
-++msgid "%u time wait sockets recycled by time stamp"
-++msgstr "%uの時間待ちソケットがタイムスタンプで再利用"
-++
-++# FIXME
-++#: ../statistics.c:162
-++#, c-format
-++msgid "%u TCP sockets finished time wait in slow timer"
-++msgstr "%uのTCPソケットがスロータイマでの時間待ちを完了"
-++
-++#: ../statistics.c:163
-++#, c-format
-++msgid "%u passive connections rejected because of time stamp"
-++msgstr "%uの受動的接続がタイムスタンプのために拒否"
-++
-++#: ../statistics.c:165
-++#, c-format
-++msgid "%u active connections rejected because of time stamp"
-++msgstr "%uの能動的接続がタイムスタンプのために拒否"
-++
-++#: ../statistics.c:167
-++#, c-format
-++msgid "%u packets rejects in established connections because of timestamp"
-++msgstr "%uのパケットがタイムスタンプのために接続確立を拒否"
-++
-++#: ../statistics.c:169
-++#, c-format
-++msgid "%u delayed acks sent"
-++msgstr "%uの遅延ackを送信"
-++
-++# FIXME
-++#: ../statistics.c:170
-++#, c-format
-++msgid "%u delayed acks further delayed because of locked socket"
-++msgstr "%uの遅延ackがロックされたソケットのためにさらに遅延"
-++
-++#: ../statistics.c:172
-++#, c-format
-++msgid "Quick ack mode was activated %u times"
-++msgstr "クイックackモードが%u回稼働"
-++
-++# FIXME
-++#: ../statistics.c:173
-++#, c-format
-++msgid "%u times the listen queue of a socket overflowed"
-++msgstr "ソケットのリスンキューが%u回オーバフロー"
-++
-++# FIXME
-++#: ../statistics.c:175
-++#, c-format
-++msgid "%u SYNs to LISTEN sockets ignored"
-++msgstr "%uのソケットリスンSYNが無視"
-++
-++#: ../statistics.c:176
-++#, c-format
-++msgid "%u packets directly queued to recvmsg prequeue."
-++msgstr "%uパケットをrecvmsgプレキューに直接キュー."
-++
-++#: ../statistics.c:178
-++#, c-format
-++msgid "%u of bytes directly received from backlog"
-++msgstr "%uバイトをバックログから直接受信"
-++
-++#: ../statistics.c:180
-++#, c-format
-++msgid "%u of bytes directly received from prequeue"
-++msgstr "%uバイトをプレキューから直接受信"
-++
-++#: ../statistics.c:182
-++#, c-format
-++msgid "%u packets dropped from prequeue"
-++msgstr "%uのパケットをプレキューからドロップ"
-++
-++#: ../statistics.c:183
-++#, c-format
-++msgid "%u packet headers predicted"
-++msgstr "%uのパケットヘッダを予測"
-++
-++#: ../statistics.c:184
-++#, c-format
-++msgid "%u packets header predicted and directly queued to user"
-++msgstr "%uのパケットヘッダを予測してユーザに直接キュー"
-++
-++#: ../statistics.c:186
-++#, c-format
-++msgid "Ran %u times out of system memory during packet sending"
-++msgstr "%u回のパケット送信中のシステムメモリあふれ"
-++
-++#: ../statistics.c:188
-++#, c-format
-++msgid "%u acknowledgments not containing data received"
-++msgstr "データを含まない%uの承認の受信"
-++
-++#: ../statistics.c:189
-++#, c-format
-++msgid "%u predicted acknowledgments"
-++msgstr "%uの予測承認"
-++
-++#: ../statistics.c:190
-++#, c-format
-++msgid "%u times recovered from packet loss due to fast retransmit"
-++msgstr "高速な再送によるパケットロスの%u回の回復"
-++
-++#: ../statistics.c:191
-++#, c-format
-++msgid "%u times recovered from packet loss due to SACK data"
-++msgstr "SACKデータによるパケットロスの%u回の回復"
-++
-++#: ../statistics.c:192
-++#, c-format
-++msgid "%u bad SACKs received"
-++msgstr "%uの不正なSACKを受信"
-++
-++#: ../statistics.c:193
-++#, c-format
-++msgid "Detected reordering %u times using FACK"
-++msgstr "FACKを使った%u回の検出された並べ替え"
-++
-++#: ../statistics.c:194
-++#, c-format
-++msgid "Detected reordering %u times using SACK"
-++msgstr "SACKを使った%u回の検出された並べ替え"
-++
-++#: ../statistics.c:195
-++#, c-format
-++msgid "Detected reordering %u times using time stamp"
-++msgstr "タイムスタンプを使った%u回の検出された並べ替え"
-++
-++# FIXME:what does it mean?
-++#: ../statistics.c:196
-++#, c-format
-++msgid "Detected reordering %u times using reno fast retransmit"
-++msgstr "高速再送を使った%u回の検出された並べ替え"
-++
-++#: ../statistics.c:197
-++#, c-format
-++msgid "%u congestion windows fully recovered"
-++msgstr "%uの輻輳ウィンドウを完全に回復"
-++
-++#: ../statistics.c:198
-++#, c-format
-++msgid "%u congestion windows partially recovered using Hoe heuristic"
-++msgstr "Hoeヒューリスティックを使って%uの輻輳ウィンドウを部分的に回復"
-++
-++#: ../statistics.c:199
-++#, c-format
-++msgid "%u congestion window recovered using DSACK"
-++msgstr "DSACKを使って%uの輻輳ウィンドウを回復"
-++
-++#: ../statistics.c:200
-++#, c-format
-++msgid "%u congestion windows recovered after partial ack"
-++msgstr "部分ack後に%uの輻輳ウィンドウを回復"
-++
-++#: ../statistics.c:201
-++#, c-format
-++msgid "%u retransmits lost"
-++msgstr "%uの再送ロスト"
-++
-++# FIXME
-++#: ../statistics.c:202
-++#, c-format
-++msgid "%u timeouts after reno fast retransmit"
-++msgstr "高速再送後の%uのタイムアウト"
-++
-++#: ../statistics.c:203
-++#, c-format
-++msgid "%u timeouts after SACK recovery"
-++msgstr "SACK復元後の%uのタイムアウト"
-++
-++#: ../statistics.c:204
-++#, c-format
-++msgid "%u timeouts in loss state"
-++msgstr "状態ロスでの%uのタイムアウト"
-++
-++#: ../statistics.c:205
-++#, c-format
-++msgid "%u fast retransmits"
-++msgstr "%uの高速再送"
-++
-++#: ../statistics.c:206
-++#, c-format
-++msgid "%u forward retransmits"
-++msgstr "%uの転送再送"
-++
-++#: ../statistics.c:207
-++#, c-format
-++msgid "%u retransmits in slow start"
-++msgstr "スロースタートでの%uの再送"
-++
-++#: ../statistics.c:208
-++#, c-format
-++msgid "%u other TCP timeouts"
-++msgstr "%uのその他のTCPタイムアウト"
-++
-++# FIXME
-++#: ../statistics.c:209
-++#, c-format
-++msgid "%u reno fast retransmits failed"
-++msgstr "%dの高速再送失敗"
-++
-++#: ../statistics.c:210
-++#, c-format
-++msgid "%u sack retransmits failed"
-++msgstr "%uのsack再送失敗"
-++
-++# FIXME
-++#: ../statistics.c:211
-++#, c-format
-++msgid "%u times receiver scheduled too late for direct processing"
-++msgstr "直接処理には遅すぎるとスケジュールされた%u回のレシーバ"
-++
-++# FIXME
-++#: ../statistics.c:212
-++#, c-format
-++msgid "%u packets collapsed in receive queue due to low socket buffer"
-++msgstr "%uのパケットを低ソケットバッファのために受信キューから除外"
-++
-++#: ../statistics.c:213
-++#, c-format
-++msgid "%u DSACKs sent for old packets"
-++msgstr "%uのDSACKを古いパケットとして送信"
-++
-++#: ../statistics.c:214
-++#, c-format
-++msgid "%u DSACKs sent for out of order packets"
-++msgstr "%uのDSACKを順序外パケットとして送信"
-++
-++#: ../statistics.c:215
-++#, c-format
-++msgid "%u DSACKs received"
-++msgstr "%uのDSACKを受信"
-++
-++#: ../statistics.c:216
-++#, c-format
-++msgid "%u DSACKs for out of order packets received"
-++msgstr "%uのDSACKを順序外パケットとして受信"
-++
-++#: ../statistics.c:217
-++#, c-format
-++msgid "%u connections reset due to unexpected SYN"
-++msgstr "予期せぬSYNのために%uの接続をリセット"
-++
-++#: ../statistics.c:218
-++#, c-format
-++msgid "%u connections reset due to unexpected data"
-++msgstr "予期せぬデータのために%uの接続をリセット"
-++
-++#: ../statistics.c:219
-++#, c-format
-++msgid "%u connections reset due to early user close"
-++msgstr "早期のユーザのクローズのために%uの接続をリセット"
-++
-++#: ../statistics.c:220
-++#, c-format
-++msgid "%u connections aborted due to memory pressure"
-++msgstr "メモリの制約のために%uの接続を中止"
-++
-++#: ../statistics.c:221
-++#, c-format
-++msgid "%u connections aborted due to timeout"
-++msgstr "タイムアウトのために%uの接続を中止"
-++
-++# FIXME
-++#: ../statistics.c:222
-++#, c-format
-++msgid "%u connections aborted after user close in linger timeout"
-++msgstr "ユーザの長期タイムアウトでのクローズ後に%uの接続が中止"
-++
-++#: ../statistics.c:223
-++#, c-format
-++msgid "%u times unabled to send RST due to no memory"
-++msgstr "メモリ不足のためにRSTの送信が%u回不能"
-++
-++# FIXME
-++#: ../statistics.c:224
-++#, c-format
-++msgid "TCP ran low on memory %u times"
-++msgstr "TCPが少ないメモリで%u回実行"
-++
-++#: ../statistics.c:225
-++#, c-format
-++msgid "%u TCP data loss events"
-++msgstr "%uのTCPデータがイベントをロス"
-++
-++#: ../statistics.c:292
-++msgid "enabled"
-++msgstr "有効"
-++
-++#: ../statistics.c:292
-++msgid "disabled"
-++msgstr "無効"
-++
-++#: ../statistics.c:375
-++msgid "error parsing /proc/net/snmp"
-++msgstr "/proc/net/snmpの処理中にエラーが発生しました"
-++
-++#: ../statistics.c:388
-++msgid "cannot open /proc/net/snmp"
-++msgstr "/proc/net/snmpを開けません"
-++
-++#: ../lib/activate.c:69
-++#, c-format
-++msgid "Hardware type `%s' not supported.\n"
-++msgstr "ハードウェアタイプ`%s'はサポートされていません.\n"
-++
-++#: ../lib/activate.c:73
-++#, c-format
-++msgid "Cannot change line discipline to `%s'.\n"
-++msgstr "`%s'のline disciplineを変更できません.\n"
-++
-++#: ../lib/af.c:153 ../lib/hw.c:161
-++msgid "UNSPEC"
-++msgstr "不明なネット"
-++
-++#: ../lib/af.c:155
-++msgid "UNIX Domain"
-++msgstr "UNIXドメイン"
-++
-++#: ../lib/af.c:158
-++msgid "DARPA Internet"
-++msgstr "DARPAインターネット"
-++
-++#: ../lib/af.c:161
-++msgid "IPv6"
-++msgstr "IPv6"
-++
-++#: ../lib/af.c:164 ../lib/hw.c:182
-++msgid "AMPR AX.25"
-++msgstr "AMPR AX.25"
-++
-++#: ../lib/af.c:167 ../lib/hw.c:188
-++msgid "AMPR NET/ROM"
-++msgstr "AMPR NET/ROM"
-++
-++#: ../lib/af.c:170
-++msgid "Novell IPX"
-++msgstr "Novell IPX"
-++
-++#: ../lib/af.c:173
-++msgid "Appletalk DDP"
-++msgstr "アップルトークDDP"
-++
-++#: ../lib/af.c:176 ../lib/hw.c:223
-++msgid "Econet"
-++msgstr "エコネット"
-++
-++#: ../lib/af.c:179
-++msgid "CCITT X.25"
-++msgstr "CCITT X.25"
-++
-++#: ../lib/af.c:182 ../lib/hw.c:185
-++msgid "AMPR ROSE"
-++msgstr "AMPR ROSE"
-++
-++#: ../lib/af.c:185 ../lib/hw.c:173
-++msgid "Ash"
-++msgstr "Ash"
-++
-++#: ../lib/af.c:243
-++#, c-format
-++msgid "Please don't supply more than one address family.\n"
-++msgstr "複数のアドレスファミリをしないで下さい.\n"
-++
-++#: ../lib/af.c:304
-++#, c-format
-++msgid "Too much address family arguments.\n"
-++msgstr "アドレスファミリの引数が多すぎます.\n"
-++
-++#: ../lib/af.c:315
-++#, c-format
-++msgid "Unknown address family `%s'.\n"
-++msgstr "不明なアドレスファミリです `%s'.\n"
-++
-++#: ../lib/arcnet.c:70 ../lib/arcnet.c:85
-++#, c-format
-++msgid "in_arcnet(%s): invalid arcnet address!\n"
-++msgstr "in_arcnet(%s): 不適当なARCNETアドレスです!\n"
-++
-++#: ../lib/arcnet.c:97
-++#, c-format
-++msgid "in_arcnet(%s): trailing : ignored!\n"
-++msgstr "in_arcnet(%s): trailing : 無効!\n"
-++
-++# translatable?
-++#: ../lib/arcnet.c:109
-++#, c-format
-++msgid "in_arcnet(%s): trailing junk!\n"
-++msgstr "in_arcnet(%s): trailing junk!\n"
-++
-++#: ../lib/ash.c:81
-++#, c-format
-++msgid "Malformed Ash address"
-++msgstr "異常なAshアドレスです"
-++
-++#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244
-++#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78
-++#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76
-++msgid "[NONE SET]"
-++msgstr "[設定なし]"
-++
-++#: ../lib/ax25.c:97 ../lib/netrom.c:100
-++msgid "Invalid callsign"
-++msgstr "不適当なコールサインです"
-++
-++#: ../lib/ax25.c:110 ../lib/netrom.c:113
-++msgid "Callsign too long"
-++msgstr "コールサインが長すぎます"
-++
-++#: ../lib/ax25_gr.c:47
-++#, c-format
-++msgid "AX.25 not configured in this system.\n"
-++msgstr "AX.25はこのシステムでは設定されていません.\n"
-++
-++#: ../lib/ax25_gr.c:50
-++#, c-format
-++msgid "Kernel AX.25 routing table\n"
-++msgstr "カーネル AX.25経路テーブル\n"
-++
-++#. xxx
-++#: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55
-++#, c-format
-++msgid "Destination  Iface    Use\n"
-++msgstr "送信先サイト Iface    使用数\n"
-++
-++#: ../lib/ether.c:74 ../lib/ether.c:91
-++#, c-format
-++msgid "in_ether(%s): invalid ether address!\n"
-++msgstr "in_ether(%s): 不適当なイーサアドレス!\n"
-++
-++#: ../lib/ether.c:105
-++#, c-format
-++msgid "in_ether(%s): trailing : ignored!\n"
-++msgstr "in_ether(%s): trailing : 無効!\n"
-++
-++# translatable?
-++#: ../lib/ether.c:117
-++#, c-format
-++msgid "in_ether(%s): trailing junk!\n"
-++msgstr "in_ether(%s): trailing junk!\n"
-++
-++#: ../lib/fddi.c:84 ../lib/fddi.c:99
-++#, c-format
-++msgid "in_fddi(%s): invalid fddi address!\n"
-++msgstr "in_fddi(%s): 不適当なfddiアドレス!\n"
-++
-++#: ../lib/fddi.c:111
-++#, c-format
-++msgid "in_fddi(%s): trailing : ignored!\n"
-++msgstr "in_fddi(%s): trailing : 無効!\n"
-++
-++# translatable?
-++#: ../lib/fddi.c:123
-++#, c-format
-++msgid "in_fddi(%s): trailing junk!\n"
-++msgstr "in_fddi(%s): trailing junk!\n"
-++
-++#: ../lib/getroute.c:101 ../lib/setroute.c:80
-++#, c-format
-++msgid "Address family `%s' not supported.\n"
-++msgstr "アドレスファミリ`%s'はサポートされていません.\n"
-++
-++#: ../lib/getroute.c:107 ../lib/setroute.c:84
-++#, c-format
-++msgid "No routing for address family `%s'.\n"
-++msgstr "アドレスファミリ`%s'への経路が見つかりません.\n"
-++
-++#: ../lib/hippi.c:84 ../lib/hippi.c:99
-++#, c-format
-++msgid "in_hippi(%s): invalid hippi address!\n"
-++msgstr "in_hippi(%s): 不適当なhippiアドレスです!\n"
-++
-++#: ../lib/hippi.c:111
-++#, c-format
-++msgid "in_hippi(%s): trailing : ignored!\n"
-++msgstr "in_hippi(%s): trailing : 無効!\n"
-++
-++# translatable?
-++#: ../lib/hippi.c:122
-++#, c-format
-++msgid "in_hippi(%s): trailing junk!\n"
-++msgstr "in_hippi(%s): trailing junk!\n"
-++
-++#: ../lib/hw.c:160
-++msgid "Local Loopback"
-++msgstr "ローカルループバック"
-++
-++#: ../lib/hw.c:163
-++msgid "Serial Line IP"
-++msgstr "シリアルラインIP"
-++
-++#: ../lib/hw.c:164
-++msgid "VJ Serial Line IP"
-++msgstr "VJシリアルラインIP"
-++
-++#: ../lib/hw.c:165
-++msgid "6-bit Serial Line IP"
-++msgstr "6ビットシリアルラインIP"
-++
-++#: ../lib/hw.c:166
-++msgid "VJ 6-bit Serial Line IP"
-++msgstr "VJ 6ビットシリアルラインIP"
-++
-++#: ../lib/hw.c:167
-++msgid "Adaptive Serial Line IP"
-++msgstr "AdaptiveシリアルラインIP"
-++
-++#: ../lib/hw.c:170
-++msgid "Ethernet"
-++msgstr "イーサネット"
-++
-++# translatable?
-++#: ../lib/hw.c:176
-++msgid "Fiber Distributed Data Interface"
-++msgstr "Fiber Distributed Data Interface"
-++
-++#: ../lib/hw.c:179
-++msgid "HIPPI"
-++msgstr "HIPPI"
-++
-++#: ../lib/hw.c:191
-++msgid "generic X.25"
-++msgstr "ジェネリックX.25"
-++
-++#: ../lib/hw.c:194
-++msgid "IPIP Tunnel"
-++msgstr "IPIPトンネル"
-++
-++#: ../lib/hw.c:197
-++msgid "Point-to-Point Protocol"
-++msgstr "Point-to-Pointプロトコル"
-++
-++#: ../lib/hw.c:200
-++msgid "(Cisco)-HDLC"
-++msgstr "(Cisco)-HDLC"
-++
-++#: ../lib/hw.c:201
-++msgid "LAPB"
-++msgstr "LAPB"
-++
-++#: ../lib/hw.c:204
-++msgid "ARCnet"
-++msgstr "ARCネット"
-++
-++#: ../lib/hw.c:207
-++msgid "Frame Relay DLCI"
-++msgstr "フレームリレーDLCI"
-++
-++#: ../lib/hw.c:208
-++msgid "Frame Relay Access Device"
-++msgstr "フレームリレーアクセスデバイス"
-++
-++#: ../lib/hw.c:211
-++msgid "IPv6-in-IPv4"
-++msgstr "IPv6-in-IPv4"
-++
-++#: ../lib/hw.c:214
-++msgid "IrLAP"
-++msgstr "IrLAP"
-++
-++#: ../lib/hw.c:217
-++msgid "16/4 Mbps Token Ring"
-++msgstr "16/4 Mbpsトークンリング"
-++
-++#: ../lib/hw.c:219
-++msgid "16/4 Mbps Token Ring (New)"
-++msgstr "16/4 Mbpsトークンリング(新)"
-++
-++#: ../lib/hw.c:226
-++msgid "Generic EUI-64"
-++msgstr "ジェネリックEUI-64"
-++
-++#: ../lib/inet.c:153 ../lib/inet6.c:79
-++#, c-format
-++msgid "rresolve: unsupport address family %d !\n"
-++msgstr "rresolve: アドレスファミリ%dをサポートしていません!\n"
-++
-++#: ../lib/inet6.c:131
-++msgid "[UNKNOWN]"
-++msgstr "[不明]"
-++
-++#: ../lib/inet6_gr.c:71
-++#, c-format
-++msgid "INET6 (IPv6) not configured in this system.\n"
-++msgstr "INET6(IPv6)はこのシステムでは利用できるよう設定されていません.\n"
-++
-++#: ../lib/inet6_gr.c:74
-++#, c-format
-++msgid "Kernel IPv6 routing table\n"
-++msgstr "カーネルIPv6 経路テーブル\n"
-++
-++#: ../lib/inet6_gr.c:76
-++#, c-format
-++msgid ""
-++"Destination                                 Next "
-++"Hop                                Flags Metric Ref    Use Iface\n"
-++msgstr "送信先サイト                                次回ホップ                             フラグ Metric Ref 使用数 インタフェース\n"
-++
-++#: ../lib/inet6_gr.c:150
-++#, c-format
-++msgid "Kernel IPv6 Neighbour Cache\n"
-++msgstr "カーネルIPv6 近隣ネットワークのキャッシュ\n"
-++
-++#: ../lib/inet6_gr.c:153
-++#, c-format
-++msgid ""
-++"Neighbour                                   HW Address        Iface    Flags "
-++"Ref State\n"
-++msgstr ""
-++"近隣サイト                               ハードウェアアドレス Iface   フラグ "
-++"Ref 状態\n"
-++
-++#: ../lib/inet6_gr.c:157
-++#, c-format
-++msgid ""
-++"Neighbour                                   HW Address        Iface    Flags "
-++"Ref State            Stale(sec) Delete(sec)\n"
-++msgstr ""
-++"近隣サイト                               ハードウェアアドレス Iface   フラグ "
-++"Ref 状態             Stale[秒]  Delete[秒]\n"
-++
-++#: ../lib/inet6_sr.c:46
-++#, c-format
-++msgid "Usage: inet6_route [-vF] del Target\n"
-++msgstr "使用法: inet6_route [-vF] del ターゲット\n"
-++
-++#: ../lib/inet6_sr.c:47
-++#, c-format
-++msgid "       inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n"
-++msgstr ""
-++"        inet6_route [-vF] add ターゲット \n"
-++"                    [gw ゲートウェイ] [metric メトリック]\n"
-++"                    [[dev] インタフェース]\n"
-++
-++#: ../lib/inet6_sr.c:48
-++#, c-format
-++msgid "       inet6_route [-FC] flush      NOT supported\n"
-++msgstr "        inet6_route [-FC] flush      サポートしていません\n"
-++
-++#: ../lib/inet6_sr.c:188
-++#, c-format
-++msgid "Flushing `inet6' routing table not supported\n"
-++msgstr "`inet6'経路テーブルのフラッシュはサポートしていません\n"
-++
-++#: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220
-++#, c-format
-++msgid "INET (IPv4) not configured in this system.\n"
-++msgstr "INET(IPv4)はこのシステムでは利用できるように設定されていません.\n"
-++
-++#: ../lib/inet_gr.c:53
-++#, c-format
-++msgid "Kernel IP routing table\n"
-++msgstr "カーネルIP経路テーブル\n"
-++
-++#: ../lib/inet_gr.c:56
-++#, c-format
-++msgid ""
-++"Destination     Gateway         Genmask         Flags Metric Ref    Use "
-++"Iface\n"
-++msgstr "受信先サイト    ゲートウェイ    ネットマスク   フラグ Metric Ref 使用数 インタフェース\n"
-++
-++#: ../lib/inet_gr.c:59
-++#, c-format
-++msgid ""
-++"Destination     Gateway         Genmask         Flags   MSS Window  irtt "
-++"Iface\n"
-++msgstr "受信先サイト    ゲートウェイ    ネットマスク   フラグ   MSS Window  irtt インタフェース\n"
-++
-++#: ../lib/inet_gr.c:62
-++#, c-format
-++msgid ""
-++"Destination     Gateway         Genmask         Flags Metric Ref    Use "
-++"Iface    MSS   Window irtt\n"
-++msgstr ""
-++"受信先サイト   ゲートウェイ    ネットマスク    フラグ Metric Ref 使用数 "
-++"Iface    MSS   Window irtt\n"
-++
-++#: ../lib/inet_gr.c:237
-++#, c-format
-++msgid "Kernel IP routing cache\n"
-++msgstr "カーネルIP経路キャッシュ\n"
-++
-++#: ../lib/inet_gr.c:258
-++#, c-format
-++msgid ""
-++"Source          Destination     Gateway         Flags Metric Ref    Use "
-++"Iface\n"
-++msgstr "発信元サイト   受信先サイト    ゲートウェイ    フラグ Metric Ref 使用数 インタフェース\n"
-++
-++#: ../lib/inet_gr.c:261
-++#, c-format
-++msgid ""
-++"Source          Destination     Gateway         Flags   MSS Window  irtt "
-++"Iface\n"
-++msgstr "発信元サイト    受信先サイト    ゲートウェイ   フラグ   MSS Window  irtt インタフェース\n"
-++
-++#: ../lib/inet_gr.c:266
-++#, c-format
-++msgid ""
-++"Source          Destination     Gateway         Flags Metric Ref    Use "
-++"Iface    MSS   Window irtt  HH  Arp\n"
-++msgstr ""
-++"発信元サイト    受信先サイト    ゲートウェイ   フラグ Metric Ref 使用数 "
-++"Iface    MSS   Window irtt   HH  Arp\n"
-++
-++#: ../lib/inet_gr.c:290
-++#, c-format
-++msgid ""
-++"Source          Destination     Gateway         Flags Metric Ref    Use "
-++"Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
-++msgstr ""
-++"発信元サイト   受信先サイト     ゲートウェイ   フラグ Metric Ref 使用数 "
-++"Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
-++
-++#: ../lib/inet_sr.c:51
-++#, c-format
-++msgid ""
-++"Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] "
-++"[[dev] If]\n"
-++msgstr ""
-++"使用法:inet_route [-vF] del {-host|-net} 受信先[/プレフィックス]\n"
-++"                   [gw ゲートウェイ] [metric メトリック]\n"
-++"                   [[dev] インタフェース]\n"
-++
-++#: ../lib/inet_sr.c:52
-++#, c-format
-++msgid ""
-++"       inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n"
-++msgstr ""
-++"       inet_route [-vF] add {-host|-net} 受信先[/プレフィックス]\n"
-++"                   [gw ゲートウェイ] [metric メトリック]\n"
-++
-++#: ../lib/inet_sr.c:53
-++#, c-format
-++msgid ""
-++"                              [netmask N] [mss Mss] [window W] [irtt I]\n"
-++msgstr "            [netmask ネットマスク] [mss Mss] [window W] [irtt I]\n"
-++
-++#: ../lib/inet_sr.c:54
-++#, c-format
-++msgid "                              [mod] [dyn] [reinstate] [[dev] If]\n"
-++msgstr "            [mod] [dyn] [reinstate] [[dev] インタフェース]\n"
-++
-++#: ../lib/inet_sr.c:55
-++#, c-format
-++msgid ""
-++"       inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n"
-++msgstr ""
-++"       inet_route [-vF] add {-host|-net} 受信先[/プレフィックス]\n"
-++"                   [metric メトリック] reject\n"
-++
-++#: ../lib/inet_sr.c:56
-++#, c-format
-++msgid "       inet_route [-FC] flush      NOT supported\n"
-++msgstr "        inet_route [-FC] flush      サポートしていません\n"
-++
-++#: ../lib/inet_sr.c:158
-++#, c-format
-++msgid "route: %s: cannot use a NETWORK as gateway!\n"
-++msgstr "route: %s: NETWORKをゲートウェイとして使えません!\n"
-++
-++#: ../lib/inet_sr.c:174
-++#, c-format
-++msgid "route: Invalid MSS/MTU.\n"
-++msgstr "route: MSS/MTUが不適当です.\n"
-++
-++#: ../lib/inet_sr.c:187
-++#, c-format
-++msgid "route: Invalid window.\n"
-++msgstr "route: windowが不適当です.\n"
-++
-++#: ../lib/inet_sr.c:203
-++#, c-format
-++msgid "route: Invalid initial rtt.\n"
-++msgstr "route: 初期rttが不適当です.\n"
-++
-++#: ../lib/inet_sr.c:261
-++#, c-format
-++msgid "route: netmask %.8x doesn't make sense with host route\n"
-++msgstr "route: ネットマスク%.8xがホスト経路を検出しません\n"
-++
-++#: ../lib/inet_sr.c:265
-++#, c-format
-++msgid "route: bogus netmask %s\n"
-++msgstr "route: 偽のネットマスク`%s'です\n"
-++
-++#: ../lib/inet_sr.c:270
-++#, c-format
-++msgid "route: netmask doesn't match route address\n"
-++msgstr "route: ネットマスクが経路アドレスと一致しません\n"
-++
-++#: ../lib/inet_sr.c:306
-++#, c-format
-++msgid "Flushing `inet' routing table not supported\n"
-++msgstr "`inet'経路テーブルのフラッシュはサポートしていません\n"
-++
-++#: ../lib/inet_sr.c:310
-++#, c-format
-++msgid "Modifying `inet' routing cache not supported\n"
-++msgstr "`inet'経路テーブルの変更はサポートしていません\n"
-++
-++#: ../lib/ipx_gr.c:52
-++#, c-format
-++msgid "IPX not configured in this system.\n"
-++msgstr "IPXはこのシステムでは設定されていません.\n"
-++
-++#: ../lib/ipx_gr.c:56
-++#, c-format
-++msgid "Kernel IPX routing table\n"
-++msgstr "カーネルIPX経路テーブル\n"
-++
-++#. xxx
-++#: ../lib/ipx_gr.c:57
-++#, c-format
-++msgid "Destination               Router Net                Router Node\n"
-++msgstr "送信先サイト              ルータ ネット             ルータノード\n"
-++
-++#: ../lib/ipx_sr.c:33
-++#, c-format
-++msgid "IPX: this needs to be written\n"
-++msgstr "IPX: これは書き込みが必要です\n"
-++
-++#: ../lib/masq_info.c:198
-++#, c-format
-++msgid "IP masquerading entries\n"
-++msgstr "IPマスカレード エントリ\n"
-++
-++#: ../lib/masq_info.c:201
-++#, c-format
-++msgid "prot   expire source               destination          ports\n"
-++msgstr "プロト expire 発信元サイト         送信先サイト         ポート\n"
-++
-++#: ../lib/masq_info.c:204
-++#, c-format
-++msgid ""
-++"prot   expire    initseq delta prevd source               "
-++"destination          ports\n"
-++msgstr ""
-++"プロト expire    初期seq delta prevd 発信元サイト         受信先サイ"
-++"ト         ポート\n"
-++
-++#: ../lib/netrom_gr.c:48
-++#, c-format
-++msgid "NET/ROM not configured in this system.\n"
-++msgstr "NET/ROMはこのシステムでは利用可能なように設定されていません.\n"
-++
-++#: ../lib/netrom_gr.c:51
-++#, c-format
-++msgid "Kernel NET/ROM routing table\n"
-++msgstr "カーネルNET/ROM経路テーブル\n"
-++
-++#: ../lib/netrom_gr.c:52
-++#, c-format
-++msgid "Destination  Mnemonic  Quality  Neighbour  Iface\n"
-++msgstr "受信先サイト ニーモニック 品質  近隣サイト インタフェース\n"
-++
-++#: ../lib/netrom_sr.c:34
-++#, c-format
-++msgid "netrom usage\n"
-++msgstr "netrom使用法\n"
-++
-++#: ../lib/netrom_sr.c:44
-++#, c-format
-++msgid "NET/ROM: this needs to be written\n"
-++msgstr "NET/ROM: これは書き込みが必要です\n"
-++
-++#: ../lib/ppp.c:44
-++#, c-format
-++msgid "You cannot start PPP with this program.\n"
-++msgstr "このプログラムではPPPを開始できません. \n"
-++
-++#: ../lib/ppp_ac.c:38
-++#, c-format
-++msgid "Sorry, use pppd!\n"
-++msgstr "申し訳ありませんが, pppdを使って下さい!\n"
-++
-++#: ../lib/rose.c:87
-++msgid "Node address must be ten digits"
-++msgstr "ノードアドレスは10進数でなければなりません"
-++
-++#: ../lib/rose_gr.c:51
-++#, c-format
-++msgid "ROSE not configured in this system.\n"
-++msgstr "ROSEはこのシステムでは利用可能なように設定されていません\n"
-++
-++#: ../lib/rose_gr.c:54
-++#, c-format
-++msgid "Kernel ROSE routing table\n"
-++msgstr "カーネルROSE経路テーブル\n"
-++
-++#: ../lib/tr.c:86 ../lib/tr.c:101
-++#, c-format
-++msgid "in_tr(%s): invalid token ring address!\n"
-++msgstr "in_tr(%s): 不適当なトークンリングアドレスです!\n"
-++
-++#: ../lib/tr.c:113
-++#, c-format
-++msgid "in_tr(%s): trailing : ignored!\n"
-++msgstr "in_tr(%s): trailing : 無効!\n"
-++
-++# translatable?
-++#: ../lib/tr.c:125
-++#, c-format
-++msgid "in_tr(%s): trailing junk!\n"
-++msgstr "in_tr(%s): trailing junk!\n"
-++
-++#: ../lib/interface.c:176
-++#, c-format
-++msgid "warning: no inet socket available: %s\n"
-++msgstr "警告: Inetソケットは利用できません: %s\n"
-++
-++#: ../lib/interface.c:325
-++#, c-format
-++msgid "Warning: cannot open %s (%s). Limited output.\n"
-++msgstr "警告: %sを開けません(%s). 限定された出力です.\n"
-++
-++#. Give better error message for this case.
-++#: ../lib/interface.c:571
-++msgid "Device not found"
-++msgstr "デバイスが見つかりません"
-++
-++#: ../lib/interface.c:575
-++#, c-format
-++msgid "%s: error fetching interface information: %s\n"
-++msgstr "%s: インタフェース情報を取得中にエラーが発生しました: %s\n"
-++
-++#: ../lib/interface.c:608
-++msgid "     - no statistics available -"
-++msgstr "     - 統計情報を利用できません -"
-++
-++#: ../lib/interface.c:612
-++#, c-format
-++msgid "[NO FLAGS]"
-++msgstr "[フラグなし]"
-++
-++#: ../lib/interface.c:688
-++#, c-format
-++msgid "%-9.9s Link encap:%s  "
-++msgstr "%-9.9s リンク方法:%s  "
-++
-++#: ../lib/interface.c:693
-++#, c-format
-++msgid "HWaddr %s  "
-++msgstr "ハードウェアアドレス %s "
-++
-++#: ../lib/interface.c:696
-++#, c-format
-++msgid "Media:%s"
-++msgstr "メディア:%s"
-++
-++#: ../lib/interface.c:698
-++#, c-format
-++msgid "(auto)"
-++msgstr "(自動)"
-++
-++#: ../lib/interface.c:705
-++#, c-format
-++msgid "          %s addr:%s "
-++msgstr "          %sアドレス:%s"
-++
-++#: ../lib/interface.c:708
-++#, c-format
-++msgid " P-t-P:%s "
-++msgstr " P-t-P:%s "
-++
-++#: ../lib/interface.c:711
-++#, c-format
-++msgid " Bcast:%s "
-++msgstr " ブロードキャスト:%s "
-++
-++#: ../lib/interface.c:713
-++#, c-format
-++msgid " Mask:%s\n"
-++msgstr " マスク:%s\n"
-++
-++#: ../lib/interface.c:730
-++#, c-format
-++msgid "          inet6 addr: %s/%d"
-++msgstr "          inet6アドレス: %s/%d"
-++
-++#: ../lib/interface.c:732
-++#, c-format
-++msgid " Scope:"
-++msgstr " 範囲:"
-++
-++#: ../lib/interface.c:735
-++#, c-format
-++msgid "Global"
-++msgstr "グローバル"
-++
-++#: ../lib/interface.c:738
-++#, c-format
-++msgid "Link"
-++msgstr "リンク"
-++
-++#: ../lib/interface.c:741
-++#, c-format
-++msgid "Site"
-++msgstr "サイト"
-++
-++# translatable?
-++#: ../lib/interface.c:744
-++#, c-format
-++msgid "Compat"
-++msgstr "Compat"
-++
-++#: ../lib/interface.c:747
-++#, c-format
-++msgid "Host"
-++msgstr "ホスト"
-++
-++#: ../lib/interface.c:750
-++#, c-format
-++msgid "Unknown"
-++msgstr "不明"
-++
-++#: ../lib/interface.c:765
-++#, c-format
-++msgid "          IPX/Ethernet II addr:%s\n"
-++msgstr "          IPX/イーサネットIIアドレス:%s\n"
-++
-++#: ../lib/interface.c:768
-++#, c-format
-++msgid "          IPX/Ethernet SNAP addr:%s\n"
-++msgstr "          IPX/イーサネットSNAPアドレス:%s\n"
-++
-++#: ../lib/interface.c:771
-++#, c-format
-++msgid "          IPX/Ethernet 802.2 addr:%s\n"
-++msgstr "          IPX/イーサネット802.2アドレス:%s\n"
-++
-++#: ../lib/interface.c:774
-++#, c-format
-++msgid "          IPX/Ethernet 802.3 addr:%s\n"
-++msgstr "          IPX/イーサネット802.3アドレス:%s\n"
-++
-++#: ../lib/interface.c:784
-++#, c-format
-++msgid "          EtherTalk Phase 2 addr:%s\n"
-++msgstr "          イーサトーク フェーズ2アドレス:%s\n"
-++
-++#: ../lib/interface.c:793
-++#, c-format
-++msgid "          econet addr:%s\n"
-++msgstr "          エコネットアドレス:%s\n"
-++
-++#: ../lib/interface.c:800
-++#, c-format
-++msgid "[NO FLAGS] "
-++msgstr "[フラグなし]"
-++
-++# translatable?
-++#: ../lib/interface.c:802
-++#, c-format
-++msgid "UP "
-++msgstr "UP "
-++
-++# translatable?
-++#: ../lib/interface.c:804
-++#, c-format
-++msgid "BROADCAST "
-++msgstr "BROADCAST "
-++
-++# translatable?
-++#: ../lib/interface.c:806
-++#, c-format
-++msgid "DEBUG "
-++msgstr "DEBUG "
-++
-++# translatable?
-++#: ../lib/interface.c:808
-++#, c-format
-++msgid "LOOPBACK "
-++msgstr "LOOPBACK "
-++
-++# translatable?
-++#: ../lib/interface.c:810
-++#, c-format
-++msgid "POINTOPOINT "
-++msgstr "POINTOPOINT "
-++
-++# translatable?
-++#: ../lib/interface.c:812
-++#, c-format
-++msgid "NOTRAILERS "
-++msgstr "NOTRAILERS "
-++
-++# translatable?
-++#: ../lib/interface.c:814
-++#, c-format
-++msgid "RUNNING "
-++msgstr "RUNNING "
-++
-++# translatable?
-++#: ../lib/interface.c:816
-++#, c-format
-++msgid "NOARP "
-++msgstr "NOARP "
-++
-++# translatable?
-++#: ../lib/interface.c:818
-++#, c-format
-++msgid "PROMISC "
-++msgstr "PROMISC "
-++
-++# translatable?
-++#: ../lib/interface.c:820
-++#, c-format
-++msgid "ALLMULTI "
-++msgstr "ALLMULTI "
-++
-++# translatable?
-++#: ../lib/interface.c:822
-++#, c-format
-++msgid "SLAVE "
-++msgstr "SLAVE "
-++
-++# translatable?
-++#: ../lib/interface.c:824
-++#, c-format
-++msgid "MASTER "
-++msgstr "MASTER "
-++
-++# translatable?
-++#: ../lib/interface.c:826
-++#, c-format
-++msgid "MULTICAST "
-++msgstr "MULTICAST "
-++
-++# translatable?
-++#: ../lib/interface.c:829
-++#, c-format
-++msgid "DYNAMIC "
-++msgstr "DYNAMIC "
-++
-++#. DONT FORGET TO ADD THE FLAGS IN ife_print_short
-++#: ../lib/interface.c:832
-++#, c-format
-++msgid " MTU:%d  Metric:%d"
-++msgstr " MTU:%d  メトリック:%d"
-++
-++# translatable?
-++#: ../lib/interface.c:836
-++#, c-format
-++msgid "  Outfill:%d  Keepalive:%d"
-++msgstr "  Outfill:%d  キープアライブ:%d"
-++
-++#: ../lib/interface.c:850
-++#, c-format
-++msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
-++msgstr "RXパケット:%llu エラー:%lu 損失:%lu オーバラン:%lu フレーム:%lu\n"
-++
-++#: ../lib/interface.c:855
-++#, c-format
-++msgid "             compressed:%lu\n"
-++msgstr "             圧縮:%lu\n"
-++
-++#: ../lib/interface.c:895
-++#, c-format
-++msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
-++msgstr "TXパケット:%llu エラー:%lu 損失:%lu オーバラン:%lu キャリア:%lu\n"
-++
-++#: ../lib/interface.c:899
-++#, c-format
-++msgid "          collisions:%lu "
-++msgstr "      衝突(Collisions):%lu "
-++
-++#: ../lib/interface.c:901
-++#, c-format
-++msgid "compressed:%lu "
-++msgstr "圧縮:%lu "
-++
-++#: ../lib/interface.c:903
-++#, c-format
-++msgid "txqueuelen:%d "
-++msgstr "TXキュー長:%d "
-++
-++#: ../lib/interface.c:905
-++#, c-format
-++msgid "RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"
-++msgstr "RXバイト:%llu (%lu.%lu %s)  TXバイト:%llu (%lu.%lu %s)\n"
-++
-++#: ../lib/interface.c:916
-++#, c-format
-++msgid "Interrupt:%d "
-++msgstr "割り込み:%d "
-++
-++#. Only print devices using it for
-++#. I/O maps
-++#: ../lib/interface.c:919
-++#, c-format
-++msgid "Base address:0x%x "
-++msgstr "ベースアドレス:0x%x "
-++
-++#: ../lib/interface.c:921
-++#, c-format
-++msgid "Memory:%lx-%lx "
-++msgstr "メモリ:%lx-%lx "
-++
-++#: ../lib/interface.c:924
-++#, c-format
-++msgid "DMA chan:%x "
-++msgstr "DMAチェイン:%x "
-++
-++#: ../lib/sockets.c:63
-++#, c-format
-++msgid "No usable address families found.\n"
-++msgstr "利用可能なアドレスファミリが見つかりません.\n"
-++
-++#: ../lib/util-ank.c:229
-++#, c-format
-++msgid "ip: %s is invalid inet address\n"
-++msgstr "ip: %sは不適切なInetアドレスです.\n"
-++
-++#: ../lib/util-ank.c:238
-++#, c-format
-++msgid "ip: %s is invalid inet prefix\n"
-++msgstr "ip: %sは不適切なInetプレフィックスです\n"
-++
-++#: ../lib/util-ank.c:248
-++#, c-format
-++msgid "ip: %s is invalid IPv4 address\n"
-++msgstr "ip: %sは不適切なIPv4アドレスです.\n"
-++
-++#: ../lib/util-ank.c:256
-++#, c-format
-++msgid "ip: argument is wrong: %s\n"
-++msgstr "ip: 引数が間違っています: %s\n"
-++
-++#: ../ipmaddr.c:61
-++#, c-format
-++msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n"
-++msgstr "使用法: ipmaddr [ add | del ] マルチキャストアドレス dev 文字列\n"
-++
-++#: ../ipmaddr.c:62
-++#, c-format
-++msgid "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
-++msgstr "        ipmaddr show [ dev 文字列 ] [ ipv4 | ipv6 | link | all ]\n"
-++
-++#: ../ipmaddr.c:63
-++#, c-format
-++msgid "       ipmaddr -V | -version\n"
-++msgstr "       ipmaddr -V | -version\n"
-++
-++#: ../ipmaddr.c:263
-++#, c-format
-++msgid "family %d "
-++msgstr "ファミリ %d "
-++
-++#: ../ipmaddr.c:272
-++#, c-format
-++msgid " users %d"
-++msgstr " ユーザ %d"
-++
-++#: ../ipmaddr.c:358
-++msgid "Cannot create socket"
-++msgstr "ソケットを作成できません"
-++
-++#: ../slattach.c:180
-++#, c-format
-++msgid "slattach: /dev/%s already locked!\n"
-++msgstr "slattach: /dev/%s はすでにロックされています!\n"
-++
-++#: ../slattach.c:186
-++#, c-format
-++msgid "slattach: tty_lock: (%s): %s\n"
-++msgstr "slattach: tty_lock: (%s): %s\n"
-++
-++#: ../slattach.c:192
-++#, c-format
-++msgid "slattach: cannot write PID file\n"
-++msgstr "slattach: PIDファイルを書き込めません\n"
-++
-++#: ../slattach.c:202
-++#, c-format
-++msgid "slattach: tty_lock: UUCP user %s unknown!\n"
-++msgstr "slattach: tty_lock: UUCPユーザ%sは不明です!\n"
-++
-++#: ../slattach.c:430
-++#, c-format
-++msgid "slattach: tty_hangup(DROP): %s\n"
-++msgstr "slattach: tty_hangup(DROP): %s\n"
-++
-++#: ../slattach.c:437
-++#, c-format
-++msgid "slattach: tty_hangup(RAISE): %s\n"
-++msgstr "slattach: tty_hangup(RAISE): %s\n"
-++
-++#: ../slattach.c:468
-++#, c-format
-++msgid "slattach: tty name too long\n"
-++msgstr "slattach: tty名が長すぎます\n"
-++
-++#: ../slattach.c:498
-++#, c-format
-++msgid "slattach: tty_open: cannot get current state!\n"
-++msgstr "slattach: tty_open: 現在の状態を得られません!\n"
-++
-++#: ../slattach.c:505
-++#, c-format
-++msgid "slattach: tty_open: cannot get current line disc!\n"
-++msgstr "slattach: tty_open: 現在のライン・ディスクを得られません!\n"
-++
-++#: ../slattach.c:513
-++#, c-format
-++msgid "slattach: tty_open: cannot set RAW mode!\n"
-++msgstr "slattach: tty_open: RAWモードを設定できません!\n"
-++
-++#: ../slattach.c:520
-++#, c-format
-++msgid "slattach: tty_open: cannot set %s bps!\n"
-++msgstr "slattach: tty_open: %s bpsを設定できません!\n"
-++
-++#: ../slattach.c:530
-++#, c-format
-++msgid "slattach: tty_open: cannot set 8N1 mode!\n"
-++msgstr "slattach: tty_open: 8N1モードへ設定できません!\n"
-++
-++#: ../slattach.c:672
-++#, c-format
-++msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n"
-++msgstr "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n"
-++
-++#: ../slattach.c:704
-++#, c-format
-++msgid "%s started"
-++msgstr "%sを開始しました"
-++
-++#: ../slattach.c:705
-++#, c-format
-++msgid " on %s"
-++msgstr "(%s上)"
-++
-++#: ../slattach.c:706
-++#, c-format
-++msgid " interface %s\n"
-++msgstr " インタフェース %s\n"
-+Index: net-tools/po/fr.po
-+===================================================================
-+--- net-tools.orig/po/fr.po
-++++ net-tools/po/fr.po
-+@@ -4,281 +4,286 @@
-+ msgid ""
-+ msgstr ""
-+ "Project-Id-Version: net-tools 1.51\n"
-+-"POT-Creation-Date: 2000-02-14 02:31+0100\n"
-++"Report-Msgid-Bugs-To: \n"
-++"POT-Creation-Date: 2007-06-30 12:28+0900\n"
-+ "PO-Revision-Date: 1998-03-01 00:02+0100\n"
-+ "Last-Translator: J.M.Vansteene <vanstee@worldnet.fr>\n"
-+ "Language-Team:\n"
-+ "MIME-Version: 1.0\n"
-+-"Content-Type: text/plain; charset=iso8859-1\n"
-++"Content-Type: text/plain; charset=iso-8859-1\n"
-+ "Content-Transfer-Encoding: 8bit\n"
-+ 
-+-#: ../arp.c:110 ../arp.c:269
-++#: ../arp.c:112 ../arp.c:279
-++#, c-format
-+ msgid "arp: need host name\n"
-+ msgstr "arp: n�cessite un nom d'h�te\n"
-+ 
-+-#: ../arp.c:207 ../arp.c:221
-++#: ../arp.c:215 ../arp.c:230
-+ #, c-format
-+ msgid "No ARP entry for %s\n"
-+ msgstr "Pas d'entr�e ARP pour %s\n"
-+ 
-+-#: ../arp.c:239
-++#: ../arp.c:248
-+ #, fuzzy, c-format
-+ msgid "arp: cant get HW-Address for `%s': %s.\n"
-+ msgstr "rarp: ne peut d�finir l'entr�e depuis %s:%u\n"
-+ 
-+-#: ../arp.c:243
-++#: ../arp.c:252
-++#, c-format
-+ msgid "arp: protocol type mismatch.\n"
-+ msgstr ""
-+ 
-+-#: ../arp.c:252
-++#: ../arp.c:261
-+ #, c-format
-+ msgid "arp: device `%s' has HW address %s `%s'.\n"
-+ msgstr ""
-+ 
-+-#: ../arp.c:282
-++#: ../arp.c:293
-++#, c-format
-+ msgid "arp: need hardware address\n"
-+ msgstr "arp: n�cessite une adresse mat�riel\n"
-+ 
-+-#: ../arp.c:290
-++#: ../arp.c:301
-++#, c-format
-+ msgid "arp: invalid hardware address\n"
-+ msgstr "arp: adresse mat�riel invalide\n"
-+ 
-+-#: ../arp.c:387
-++#: ../arp.c:398
-+ #, c-format
-+ msgid "arp: cannot open etherfile %s !\n"
-+ msgstr "arp: ne peut ouvrir le fichier ether %s !\n"
-+ 
-+-#: ../arp.c:403
-++#: ../arp.c:414
-+ #, c-format
-+ msgid "arp: format error on line %u of etherfile %s !\n"
-+ msgstr "arp: erreur de format ligne %u du fichier ether %s !\n"
-+ 
-+-#: ../arp.c:416
-++#: ../arp.c:427
-+ #, c-format
-+ msgid "arp: cannot set entry on line %u of etherfile %s !\n"
-+ msgstr "arp: ne peut d�finir l'entr�e en ligne %u du fichier ether %s !\n"
-+ 
-+-#: ../arp.c:437
-+-msgid "Address\t\t\tHWtype\tHWaddress\t    Flags Mask\t\t  Iface\n"
-++#: ../arp.c:448
-++#, fuzzy, c-format
-++msgid ""
-++"Address                  HWtype  HWaddress           Flags Mask            "
-++"Iface\n"
-+ msgstr "Adresse\t\t\tTypeMap\tAdresseMat\t   Indicateurs\t\t  Iface\n"
-+ 
-+-#: ../arp.c:467
-++#: ../arp.c:476
-++#, fuzzy
-++msgid "<from_interface>"
-++msgstr "%s: interface inconnue: %s\n"
-++
-++#: ../arp.c:478
-+ msgid "(incomplete)"
-+ msgstr ""
-+ 
-+-#: ../arp.c:484
-++#: ../arp.c:495
-+ #, c-format
-+ msgid "%s (%s) at "
-+ msgstr ""
-+ 
-+-#: ../arp.c:490
-++#: ../arp.c:501
-++#, c-format
-+ msgid "<incomplete> "
-+ msgstr ""
-+ 
-+-#: ../arp.c:496
-++#: ../arp.c:507
-+ #, c-format
-+ msgid "netmask %s "
-+ msgstr ""
-+ 
-+-#: ../arp.c:513
-++#: ../arp.c:524
-+ #, c-format
-+ msgid "on %s\n"
-+ msgstr ""
-+ 
-+-#: ../arp.c:592
-++#: ../arp.c:605
-+ #, c-format
-+ msgid "Entries: %d\tSkipped: %d\tFound: %d\n"
-+ msgstr "Entr�es: %d\tIgnor�es: %d\tTrouv�es: %d\n"
-+ 
-+-#: ../arp.c:596
-++#: ../arp.c:609
-+ #, c-format
-+ msgid "%s (%s) -- no entry\n"
-+ msgstr ""
-+ 
-+-#: ../arp.c:598
-++#: ../arp.c:611
-+ #, c-format
-+ msgid "arp: in %d entries no match found.\n"
-+ msgstr "arp: aucune correspondance trouv�e dans %d entr�es\n"
-+ 
-+-#: ../arp.c:613
-++#: ../arp.c:626
-++#, c-format
-+ msgid ""
-+ "Usage:\n"
-+ "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP "
-+ "cache\n"
-+ msgstr ""
-+ "Syntaxe:\n"
-+-"  arp [-vn]  [<MAT>] [-i <if>] [-a] [<h�te>]              <-Affiche cache "
-+-"ARP\n"
-++"  arp [-vn]  [<MAT>] [-i <if>] [-a] [<h�te>]              <-Affiche cache ARP\n"
-+ 
-+-#: ../arp.c:614
-++#: ../arp.c:627
-++#, fuzzy, c-format
-+ msgid ""
-+-"  arp [-v]          [-i <if>] -d  <hostname> [pub][nopub]    <-Delete ARP "
-++"  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP "
-+ "entry\n"
-+-msgstr ""
-+-"  arp [-v]          [-i <if>] -d  <h�te> [pub][nopub]     <-Supprime entr�e "
-+-"ARP\n"
-++msgstr "  arp [-v]          [-i <if>] -d  <h�te> [pub][nopub]     <-Supprime entr�e ARP\n"
-+ 
-+-#: ../arp.c:615
-+-#, fuzzy
-++#: ../arp.c:628
-++#, fuzzy, c-format
-+ msgid ""
-+-"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]              <-Add entry from "
-++"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from "
-+ "file\n"
-+-msgstr ""
-+-"  arp [-vnD] [<MAT>] [-i <if>] -f  <fichier>              <-Ajout entr�e "
-+-"depuis fichier\n"
-++msgstr "  arp [-vnD] [<MAT>] [-i <if>] -f  <fichier>              <-Ajout entr�e depuis fichier\n"
-+ 
-+-#: ../arp.c:616
-++#: ../arp.c:629
-++#, fuzzy, c-format
-+ msgid ""
-+-"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [temp][nopub] <-Add "
-++"  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add "
-+ "entry\n"
-+-msgstr ""
-+-"  arp [-v]   [<MAT>] [-i <if>] -s  <h�te> <adrmat> [temp][nopub] <-Ajout "
-+-"entr�e\n"
-++msgstr "  arp [-v]   [<MAT>] [-i <if>] -s  <h�te> <adrmat> [temp][nopub] <-Ajout entr�e\n"
-+ 
-+-#: ../arp.c:617
-+-msgid ""
-+-"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
-+-"<-''-\n"
-+-msgstr ""
-+-"  arp [-v]   [<MAT>] [-i <if>] -s  <h�te> <adrmat> [netmask <nm>] pub  "
-+-"<-''-\n"
-+-
-+-#: ../arp.c:618
-++#: ../arp.c:630
-++#, fuzzy, c-format
-+ msgid ""
-+-"  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub      "
-++"  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          "
-+ "<-''-\n"
-+ "\n"
-+ msgstr ""
-+-"  arp [-v]   [<MAT>] [-i <if>] -Ds <h�te> <if> [netmask <nm>] pub      "
-+-"<-''-\n"
-++"  arp [-v]   [<MAT>] [-i <if>] -Ds <h�te> <if> [netmask <nm>] pub      <-''-\n"
-+ "\n"
-+ 
-+-#: ../arp.c:620
-++#: ../arp.c:632
-++#, c-format
-+ msgid ""
-+ "        -a                       display (all) hosts in alternative (BSD) "
-+ "style\n"
-+-msgstr ""
-+-"        -a                       affiche (tous) les h�tes en style BSD\n"
-++msgstr "        -a                       affiche (tous) les h�tes en style BSD\n"
-+ 
-+-#: ../arp.c:621
-++#: ../arp.c:633
-++#, c-format
-+ msgid "        -s, --set                set a new ARP entry\n"
-+ msgstr "        -s, --set                d�finit une nouvelle entr�e ARP\n"
-+ 
-+-#: ../arp.c:622
-++#: ../arp.c:634
-++#, c-format
-+ msgid "        -d, --delete             delete a specified entry\n"
-+ msgstr "        -d, --delete             supprime une entr�e\n"
-+ 
-+-#: ../arp.c:623 ../netstat.c:1436 ../route.c:85
-++#: ../arp.c:635 ../netstat.c:1503 ../route.c:86
-++#, c-format
-+ msgid "        -v, --verbose            be verbose\n"
-+ msgstr "        -v, --verbose            mode verbeux\n"
-+ 
-+-#: ../arp.c:624 ../netstat.c:1437 ../route.c:86
-+-msgid "        -n, --numeric            dont resolve names\n"
-++#: ../arp.c:636 ../netstat.c:1504 ../route.c:87
-++#, fuzzy, c-format
-++msgid "        -n, --numeric            don't resolve names\n"
-+ msgstr "        -n, --numeric            ne r�sout pas les noms\n"
-+ 
-+-#: ../arp.c:625
-++#: ../arp.c:637
-++#, c-format
-+ msgid ""
-+ "        -i, --device             specify network interface (e.g. eth0)\n"
-+-msgstr ""
-+-"        -i, --device             sp�cifie l'interface r�seau (p.ex. eth0)\n"
-++msgstr "        -i, --device             sp�cifie l'interface r�seau (p.ex. eth0)\n"
-+ 
-+-#: ../arp.c:626
-++#: ../arp.c:638
-++#, c-format
-+ msgid "        -D, --use-device         read <hwaddr> from given device\n"
-+-msgstr ""
-+-"        -D, --use-device         lit l'<adrmat> depuis le p�riph�rique\n"
-++msgstr "        -D, --use-device         lit l'<adrmat> depuis le p�riph�rique\n"
-+ 
-+-#: ../arp.c:627
-+-#, fuzzy
-++#: ../arp.c:639
-++#, fuzzy, c-format
-+ msgid "        -A, -p, --protocol       specify protocol family\n"
-+ msgstr "        -r, --route              affiche la table de routage\n"
-+ 
-+-#: ../arp.c:628
-+-#, fuzzy
-++#: ../arp.c:640
-++#, fuzzy, c-format
-+ msgid ""
-+-"        -f, --file               read new entries from file or from "
-+-"/etc/ethers\n"
-++"        -f, --file               read new entries from file or from /etc/"
-++"ethers\n"
-+ "\n"
-+ msgstr ""
-+ "        -f, --file               lit les nouvelles entr�es dans le fichier\n"
-+ "\n"
-+ 
-+-#: ../arp.c:630 ../rarp.c:181
-++#: ../arp.c:642 ../rarp.c:182
-+ #, c-format
-+ msgid "  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"
-+-msgstr ""
-+-"  <HW>=Utilisez '-H <hw>' pour sp�cifier le type d'adresse mat�riel. D�faut: "
-+-"%s\n"
-++msgstr "  <HW>=Utilisez '-H <hw>' pour sp�cifier le type d'adresse mat�riel. D�faut: %s\n"
-+ 
-+-#: ../arp.c:631 ../rarp.c:182
-++#: ../arp.c:643 ../rarp.c:183
-++#, c-format
-+ msgid "  List of possible hardware types (which support ARP):\n"
-+ msgstr "  Liste les types de mat�riels supportant ARP:\n"
-+ 
-+-#: ../arp.c:664
-++#: ../arp.c:677 ../arp.c:762
-+ #, c-format
-+ msgid "%s: hardware type not supported!\n"
-+ msgstr "%s: type de mat�tiel non support� !\n"
-+ 
-+-#: ../arp.c:668
-++#: ../arp.c:681
-+ #, c-format
-+ msgid "%s: address family not supported!\n"
-+ msgstr "%s: famille d'adresses non support�e !\n"
-+ 
-+-#: ../arp.c:703
-+-#, fuzzy
-++#: ../arp.c:716
-++#, fuzzy, c-format
-+ msgid "arp: -N not yet supported.\n"
-+ msgstr "Table de routage pour `ddp' pas encore support�.\n"
-+ 
-+-#: ../arp.c:713
-++#: ../arp.c:726
-+ #, c-format
-+ msgid "arp: %s: unknown address family.\n"
-+ msgstr "arp: %s: famille d'adresses inconnue.\n"
-+ 
-+-#: ../arp.c:722
-++#: ../arp.c:735
-+ #, c-format
-+ msgid "arp: %s: unknown hardware type.\n"
-+ msgstr "arp: %s: type de mat�riel inconnu.\n"
-+ 
-+-#: ../arp.c:741
-++#: ../arp.c:754
-+ #, c-format
-+ msgid "arp: %s: kernel only supports 'inet'.\n"
-+ msgstr "arp: %s: le noyau ne supporte que 'inet'.\n"
-+ 
-+-#: ../arp.c:746
-++#: ../arp.c:767
-+ #, c-format
-+ msgid "arp: %s: hardware type without ARP support.\n"
-+ msgstr "arp: %s: type de mat�riel sans support ARP.\n"
-+ 
-+-#: ../hostname.c:69
-++#: ../hostname.c:71
-+ #, c-format
-+ msgid "Setting nodename to `%s'\n"
-+ msgstr "D�finit le nom de noeud � `%s'\n"
-+ 
-+-#: ../hostname.c:74
-++#: ../hostname.c:76
-+ #, c-format
-+ msgid "%s: you must be root to change the node name\n"
-+ msgstr "%s: vous devez �tre root pour changer le nom de noeud\n"
-+ 
-+-#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116
-++#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117
-+ #, c-format
-+ msgid "%s: name too long\n"
-+ msgstr "%s: nom trop long\n"
-+ 
-+-#: ../hostname.c:89
-++#: ../hostname.c:91
-+ #, c-format
-+ msgid "Setting hostname to `%s'\n"
-+ msgstr "D�finit le nom d'h�te � `%s'\n"
-+ 
-+-#: ../hostname.c:94
-++#: ../hostname.c:96
-+ #, c-format
-+ msgid "%s: you must be root to change the host name\n"
-+ msgstr "%s: vous devez �tre root pour changer le nom d'h�te\n"
-+ 
-+-#: ../hostname.c:108
-++#: ../hostname.c:109
-+ #, c-format
-+ msgid "Setting domainname to `%s'\n"
-+ msgstr "D�finit le nom de domaine � `%s'\n"
-+ 
-+-#: ../hostname.c:113
-++#: ../hostname.c:114
-+ #, c-format
-+ msgid "%s: you must be root to change the domain name\n"
-+ msgstr "%s: vous devez �tre root pour changer le nom de domaine\n"
-+@@ -303,38 +308,36 @@ msgstr "R�sultat : h_aliases=`%s'\n"
-+ msgid "Result: h_addr_list=`%s'\n"
-+ msgstr "R�sultat : h_addr_list=`%s'\n"
-+ 
-+-#: ../hostname.c:209
-++#: ../hostname.c:208
-+ #, c-format
-+ msgid "%s: can't open `%s'\n"
-+ msgstr "%s: ne peut ouvrir `%s'\n"
-+ 
-+-#: ../hostname.c:223
-++#: ../hostname.c:222
-++#, c-format
-+ msgid "Usage: hostname [-v] {hostname|-F file}      set hostname (from file)\n"
-+-msgstr ""
-+-"Syntaxe : hostname [-v] {h�te|-F fichier}      d�finit le nom d'h�te (depuis "
-+-"le fichier)\n"
-++msgstr "Syntaxe : hostname [-v] {h�te|-F fichier}      d�finit le nom d'h�te (depuis le fichier)\n"
-+ 
-+-#: ../hostname.c:224
-++#: ../hostname.c:223
-++#, c-format
-+ msgid ""
-+ "       domainname [-v] {nisdomain|-F file}   set NIS domainname (from file)\n"
-+-msgstr ""
-+-"       domainname [-v] {domaine_nis|-F fichier}   d�finit le domaine NIS "
-+-"(depuis le fichier)\n"
-++msgstr "       domainname [-v] {domaine_nis|-F fichier}   d�finit le domaine NIS (depuis le fichier)\n"
-+ 
-+-#: ../hostname.c:226
-+-#, fuzzy
-++#: ../hostname.c:225
-++#, fuzzy, c-format
-+ msgid ""
-+ "       nodename [-v] {nodename|-F file}      set DECnet node name (from "
-+ "file)\n"
-+-msgstr ""
-+-"       nodename [-v] {nom_noeud|-F fichier}      D�finit le nom de noeud "
-+-"DECnet (depuis le fichier)\n"
-++msgstr "       nodename [-v] {nom_noeud|-F fichier}      D�finit le nom de noeud DECnet (depuis le fichier)\n"
-+ 
-+-#: ../hostname.c:228
-++#: ../hostname.c:227
-++#, c-format
-+ msgid "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  display formatted name\n"
-+ msgstr "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  affiche le nom formatt�\n"
-+ 
-+-#: ../hostname.c:229
-++#: ../hostname.c:228
-++#, c-format
-+ msgid ""
-+ "       hostname [-v]                         display hostname\n"
-+ "\n"
-+@@ -342,7 +345,8 @@ msgstr ""
-+ "       hostname [-v]                         affiche le nom d'h�te\n"
-+ "\n"
-+ 
-+-#: ../hostname.c:230
-++#: ../hostname.c:229
-++#, c-format
-+ msgid ""
-+ "       hostname -V|--version|-h|--help       print info and exit\n"
-+ "\n"
-+@@ -350,7 +354,8 @@ msgstr ""
-+ "       hostname -V|--version|-h|--help       affiche des infos et termine\n"
-+ "\n"
-+ 
-+-#: ../hostname.c:231
-++#: ../hostname.c:230
-++#, c-format
-+ msgid ""
-+ "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
-+ "\n"
-+@@ -358,45 +363,52 @@ msgstr ""
-+ "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
-+ "\n"
-+ 
-+-#: ../hostname.c:232
-++#: ../hostname.c:231
-++#, c-format
-+ msgid "    -s, --short           short host name\n"
-+ msgstr "    -s, --short           nom d'h�te court\n"
-+ 
-+-#: ../hostname.c:233
-++#: ../hostname.c:232
-++#, c-format
-+ msgid "    -a, --alias           alias names\n"
-+ msgstr "    -a, --alias           noms d'alias\n"
-+ 
-+-#: ../hostname.c:234
-++#: ../hostname.c:233
-++#, c-format
-+ msgid "    -i, --ip-address      addresses for the hostname\n"
-+ msgstr "    -i, --ip-address      adresses de l'h�te\n"
-+ 
-+-#: ../hostname.c:235
-++#: ../hostname.c:234
-++#, c-format
-+ msgid "    -f, --fqdn, --long    long host name (FQDN)\n"
-+ msgstr "    -f, --fqdn, --long    nom d'h�te long (FQDN)\n"
-+ 
-+-#: ../hostname.c:236
-++#: ../hostname.c:235
-++#, c-format
-+ msgid "    -d, --domain          DNS domain name\n"
-+ msgstr "    -d, --domain          nom de domaine DNS\n"
-+ 
-+-#: ../hostname.c:237
-++#: ../hostname.c:236
-++#, c-format
-+ msgid "    -y, --yp, --nis       NIS/YP domainname\n"
-+ msgstr "    -y, --yp, --nis       nom de domaine NIS/YP\n"
-+ 
-+-#: ../hostname.c:239
-++#: ../hostname.c:238
-++#, c-format
-+ msgid "    -n, --node            DECnet node name\n"
-+ msgstr "    -n, --node            nom de noeud DECnet\n"
-+ 
-+-#: ../hostname.c:241
-+-#, fuzzy
-++#: ../hostname.c:240
-++#, fuzzy, c-format
-+ msgid ""
-+ "    -F, --file            read hostname or NIS domainname from given file\n"
-+ "\n"
-+ msgstr ""
-+-"    -F, --file            lit le nom d'h�te ou le nom de domaine NIS depuis "
-+-"le fichier\n"
-++"    -F, --file            lit le nom d'h�te ou le nom de domaine NIS depuis le fichier\n"
-+ "\n"
-+ 
-+-#: ../hostname.c:243
-++#: ../hostname.c:242
-++#, c-format
-+ msgid ""
-+ "   This command can read or set the hostname or the NIS domainname. You can\n"
-+ "   also read the DNS domain or the FQDN (fully qualified domain name).\n"
-+@@ -411,15 +423,16 @@ msgid "%s: You can't change the DNS doma
-+ msgstr "%s: Vous ne pouvez changer le nom de domaine DNS avec cette commande\n"
-+ 
-+ #: ../hostname.c:339
-++#, c-format
-+ msgid ""
-+ "\n"
-+ "Unless you are using bind or NIS for host lookups you can change the DNS\n"
-+ msgstr ""
-+ "\n"
-+-"Sauf si vous utilisez bind ou NIS pour les recherches d'h�tes, vous pouvez "
-+-"changer le\n"
-++"Sauf si vous utilisez bind ou NIS pour les recherches d'h�tes, vous pouvez changer le\n"
-+ 
-+ #: ../hostname.c:340
-++#, c-format
-+ msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n"
-+ msgstr ""
-+ "nom de domaine DNS (qui fait partie du FQDN) dans le fichier /etc/hosts.\n"
-+@@ -439,554 +452,453 @@ msgstr "getdomainname()=`%s'\n"
-+ msgid "getnodename()=`%s'\n"
-+ msgstr "getnodename()=`%s'\n"
-+ 
-+-#: ../ifconfig.c:159
-+-#, c-format
-+-msgid "%-9.9s Link encap:%s  "
-+-msgstr "%-9.9s Lien encap:%s  "
-++#: ../ifconfig.c:107
-++#, fuzzy, c-format
-++msgid ""
-++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
-++"Flg\n"
-++msgstr ""
-++"Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
-++"Indic\n"
-+ 
-+-#: ../ifconfig.c:164
-+-#, c-format
-+-msgid "HWaddr %s  "
-+-msgstr "HWaddr %s  "
-++#: ../ifconfig.c:129 ../ifconfig.c:161
-++#, fuzzy, c-format
-++msgid "%s: ERROR while getting interface flags: %s\n"
-++msgstr "%s: erreur lors de la recherche d'infos sur l'interface: %s\n"
-+ 
-+-#: ../ifconfig.c:167
-++#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862
-++#: ../ifconfig.c:973
-+ #, c-format
-+-msgid "Media:%s"
-+-msgstr "Media:%s"
-++msgid "No support for INET on this system.\n"
-++msgstr "Pas de support de INET sur ce syst�me.\n"
-+ 
-+-#: ../ifconfig.c:169
-+-msgid "(auto)"
-+-msgstr "(auto)"
-++#: ../ifconfig.c:193
-++#, fuzzy, c-format
-++msgid "%s: ERROR while testing interface flags: %s\n"
-++msgstr "%s: erreur lors de la recherche d'infos sur l'interface: %s\n"
-+ 
-+-#: ../ifconfig.c:176
-+-#, c-format
-+-msgid "          %s addr:%s "
-+-msgstr "          %s adr:%s "
-++#: ../ifconfig.c:202
-++#, fuzzy, c-format
-++msgid ""
-++"Usage:\n"
-++"  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"
-++msgstr ""
-++"Syntaxe:\n"
-++"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <adresse>]\n"
-+ 
-+-#: ../ifconfig.c:179
-++#: ../ifconfig.c:204
-+ #, c-format
-+-msgid " P-t-P:%s "
-+-msgstr " P-t-P:%s "
-++msgid "  [add <address>[/<prefixlen>]]\n"
-++msgstr "  [add <adresse>[/<lg_prefixe>]]\n"
-+ 
-+-#: ../ifconfig.c:182
-++#: ../ifconfig.c:205
-+ #, c-format
-+-msgid " Bcast:%s "
-+-msgstr " Bcast:%s "
-++msgid "  [del <address>[/<prefixlen>]]\n"
-++msgstr "  [del <adresse>[/<lg_prefixe>]]\n"
-+ 
-+-#: ../ifconfig.c:184
-++#: ../ifconfig.c:206
-+ #, c-format
-+-msgid " Mask:%s\n"
-+-msgstr " Masque:%s\n"
-++msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
-++msgstr "  [[-]broadcast [<adresse>]]  [[-]pointopoint [<adresse>]]\n"
-+ 
-+-#: ../ifconfig.c:201
-+-#, c-format
-+-msgid "          inet6 addr: %s/%d"
-+-msgstr "          adr inet6: %s/%d"
-++#: ../ifconfig.c:207
-++#, fuzzy, c-format
-++msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
-++msgstr "  [netmask <adresse>]  [dstaddr <adresse>]  [tunnel <adresse>]\n"
-+ 
-+-#: ../ifconfig.c:203
-+-msgid " Scope:"
-+-msgstr " Scope:"
-++#: ../ifconfig.c:210
-++#, c-format
-++msgid "  [outfill <NN>] [keepalive <NN>]\n"
-++msgstr "  [outfill <NN>] [keepalive <NN>]\n"
-+ 
-+-#: ../ifconfig.c:206
-+-msgid "Global"
-+-msgstr "Global"
-++#: ../ifconfig.c:212
-++#, c-format
-++msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
-++msgstr "  [hw <HW> <adresse>]  [metric <NN>]  [mtu <NN>]\n"
-+ 
-+-#: ../ifconfig.c:209
-+-msgid "Link"
-+-msgstr "Lien"
-++#: ../ifconfig.c:213
-++#, c-format
-++msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
-++msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
-+ 
-+-#: ../ifconfig.c:212
-+-msgid "Site"
-+-msgstr "Site"
-++#: ../ifconfig.c:214
-++#, c-format
-++msgid "  [multicast]  [[-]promisc]\n"
-++msgstr "  [multicast]  [[-]promisc]\n"
-+ 
-+ #: ../ifconfig.c:215
-+-msgid "Compat"
-+-msgstr "Compat"
-++#, c-format
-++msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
-++msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
-+ 
-+-#: ../ifconfig.c:218
-+-msgid "Host"
-+-msgstr "H�te"
-++#: ../ifconfig.c:217
-++#, fuzzy, c-format
-++msgid "  [txqueuelen <NN>]\n"
-++msgstr "  [txqueuelen longueur]\n"
-+ 
-+-#: ../ifconfig.c:221
-+-msgid "Unknown"
-+-msgstr "Inconnu"
-++#: ../ifconfig.c:220
-++#, c-format
-++msgid "  [[-]dynamic]\n"
-++msgstr "  [[-]dynamic]\n"
-+ 
-+-#: ../ifconfig.c:236
-++#: ../ifconfig.c:222
-+ #, c-format
-+-msgid "          IPX/Ethernet II addr:%s\n"
-+-msgstr "          adr IPX/Ethernet II:%s\n"
-++msgid ""
-++"  [up|down] ...\n"
-++"\n"
-++msgstr ""
-++"  [up|down] ...\n"
-++"\n"
-+ 
-+-#: ../ifconfig.c:239
-++#: ../ifconfig.c:224
-+ #, c-format
-+-msgid "          IPX/Ethernet SNAP addr:%s\n"
-+-msgstr "          adr IPX/Ethernet SNAP:%s\n"
-++msgid "  <HW>=Hardware Type.\n"
-++msgstr "  <HW>=Type de mat�riel.\n"
-+ 
-+-#: ../ifconfig.c:242
-++#: ../ifconfig.c:225
-+ #, c-format
-+-msgid "          IPX/Ethernet 802.2 addr:%s\n"
-+-msgstr "          adr IPX/Ethernet 802.2:%s\n"
-++msgid "  List of possible hardware types:\n"
-++msgstr "  Liste des types de mat�riels possibles:\n"
-+ 
-+-#: ../ifconfig.c:245
-++#. 1 = ARPable
-++#: ../ifconfig.c:227
-+ #, c-format
-+-msgid "          IPX/Ethernet 802.3 addr:%s\n"
-+-msgstr "          adr IPX/Ethernet 802.3:%s\n"
-++msgid "  <AF>=Address family. Default: %s\n"
-++msgstr "  <AF>=famille d'Adresses. D�faut: %s\n"
-+ 
-+-#: ../ifconfig.c:255
-++#: ../ifconfig.c:228
-+ #, c-format
-+-msgid "          EtherTalk Phase 2 addr:%s\n"
-+-msgstr "          adr EtherTalk Phase 2:%s\n"
-++msgid "  List of possible address families:\n"
-++msgstr "  Liste des familles d'adresses possibles:\n"
-+ 
-+-#: ../ifconfig.c:264
-++#: ../ifconfig.c:303
-+ #, c-format
-+-msgid "          econet addr:%s\n"
-+-msgstr "          adr econet:%s\n"
-++msgid "ifconfig: option `%s' not recognised.\n"
-++msgstr ""
-+ 
-+-#: ../ifconfig.c:270
-+-msgid "[NO FLAGS] "
-+-msgstr "[PAS INDICATEURS] "
-++#: ../ifconfig.c:305 ../ifconfig.c:962
-++#, c-format
-++msgid "ifconfig: `--help' gives usage information.\n"
-++msgstr ""
-+ 
-+-#: ../ifconfig.c:272
-+-msgid "UP "
-+-msgstr "UP "
-++#: ../ifconfig.c:380
-++#, c-format
-++msgid "Unknown media type.\n"
-++msgstr "Type de m�dia inconnu.\n"
-+ 
-+-#: ../ifconfig.c:274
-+-msgid "BROADCAST "
-+-msgstr "BROADCAST "
-++#: ../ifconfig.c:417
-++#, c-format
-++msgid ""
-++"Warning: Interface %s still in promisc mode... maybe other application is "
-++"running?\n"
-++msgstr ""
-+ 
-+-#: ../ifconfig.c:276
-+-msgid "DEBUG "
-+-msgstr "DEBUG "
-++#: ../ifconfig.c:429
-++#, c-format
-++msgid "Warning: Interface %s still in MULTICAST mode.\n"
-++msgstr ""
-+ 
-+-#: ../ifconfig.c:278
-+-msgid "LOOPBACK "
-+-msgstr "LOOPBACK "
-++#: ../ifconfig.c:441
-++#, c-format
-++msgid "Warning: Interface %s still in ALLMULTI mode.\n"
-++msgstr ""
-+ 
-+-#: ../ifconfig.c:280
-+-msgid "POINTOPOINT "
-+-msgstr "POINTOPOINT "
-++#: ../ifconfig.c:465
-++#, c-format
-++msgid "Warning: Interface %s still in DYNAMIC mode.\n"
-++msgstr ""
-+ 
-+-#: ../ifconfig.c:282
-+-msgid "NOTRAILERS "
-+-msgstr "NOTRAILERS "
-++#: ../ifconfig.c:523
-++#, c-format
-++msgid "Warning: Interface %s still in BROADCAST mode.\n"
-++msgstr ""
-+ 
-+-#: ../ifconfig.c:284
-+-msgid "RUNNING "
-+-msgstr "RUNNING "
-++#: ../ifconfig.c:652
-++#, c-format
-++msgid "Warning: Interface %s still in POINTOPOINT mode.\n"
-++msgstr ""
-+ 
-+-#: ../ifconfig.c:286
-+-msgid "NOARP "
-+-msgstr "NOARP "
-++#: ../ifconfig.c:684
-++#, c-format
-++msgid "hw address type `%s' has no handler to set address. failed.\n"
-++msgstr ""
-+ 
-+-#: ../ifconfig.c:288
-+-msgid "PROMISC "
-+-msgstr "PROMISC "
-++#: ../ifconfig.c:693
-++#, c-format
-++msgid "%s: invalid %s address.\n"
-++msgstr "%s: adresse %s invalide.\n"
-+ 
-+-#: ../ifconfig.c:290
-+-msgid "ALLMULTI "
-+-msgstr "ALLMULTI "
-+-
-+-#: ../ifconfig.c:292
-+-msgid "SLAVE "
-+-msgstr "SLAVE "
-+-
-+-#: ../ifconfig.c:294
-+-msgid "MASTER "
-+-msgstr "MASTER "
-+-
-+-#: ../ifconfig.c:296
-+-msgid "MULTICAST "
-+-msgstr "MULTICAST "
-+-
-+-#: ../ifconfig.c:299
-+-msgid "DYNAMIC "
-+-msgstr "DYNAMIC "
-+-
-+-#: ../ifconfig.c:302
-+-#, c-format
-+-msgid " MTU:%d  Metric:%d"
-+-msgstr " MTU:%d  Metric:%d"
-+-
-+-#: ../ifconfig.c:306
-+-#, c-format
-+-msgid "  Outfill:%d  Keepalive:%d"
-+-msgstr "  Outfill:%d  Keepalive:%d"
-+-
-+-#: ../ifconfig.c:320
-+-#, c-format
-+-msgid "RX packets:%lu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
-+-msgstr "Paquets Re�us:%lu erreurs:%lu jet�s:%lu d�bordements:%lu trames:%lu\n"
-+-
-+-#: ../ifconfig.c:325
-+-#, c-format
-+-msgid "             compressed:%lu\n"
-+-msgstr "             compress�s:%lu\n"
-+-
-+-#: ../ifconfig.c:329
-+-#, c-format
-+-msgid "TX packets:%lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
-+-msgstr ""
-+-"Paquets transmis:%lu erreurs:%lu jet�s:%lu d�bordements:%lu carrier:%lu\n"
-+-
-+-#: ../ifconfig.c:333
-++#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913
-+ #, c-format
-+-msgid "          collisions:%lu "
-+-msgstr "          collisions:%lu "
-+-
-+-#: ../ifconfig.c:335
-+-#, c-format
-+-msgid "compressed:%lu "
-+-msgstr "compress�s:%lu "
-+-
-+-#: ../ifconfig.c:337
-+-#, c-format
-+-msgid "txqueuelen:%d "
-+-msgstr "lg file transmission:%d "
-+-
-+-#: ../ifconfig.c:345
-+-#, c-format
-+-msgid "Interrupt:%d "
-+-msgstr "Interruption:%d "
-+-
-+-#. Only print devices using it for
-+-#. I/O maps
-+-#: ../ifconfig.c:348
-+-#, c-format
-+-msgid "Base address:0x%x "
-+-msgstr "Adresse de base:0x%x "
-+-
-+-#: ../ifconfig.c:350
-+-#, c-format
-+-msgid "Memory:%lx-%lx "
-+-msgstr "M�moire:%lx-%lx "
-+-
-+-#: ../ifconfig.c:353
-+-#, c-format
-+-msgid "DMA chan:%x "
-+-msgstr "Canal DMA:%x "
-++msgid "No support for INET6 on this system.\n"
-++msgstr "Pas de support de INET6 sur ce syst�me.\n"
-+ 
-+-#: ../ifconfig.c:384 ../ifconfig.c:405
-++#: ../ifconfig.c:780 ../ifconfig.c:871
-+ #, c-format
-+-msgid "%s: unknown interface: %s\n"
-+-msgstr "%s: interface inconnue: %s\n"
-+-
-+-#: ../ifconfig.c:421
-+-msgid ""
-+-"Usage:\n"
-+-"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <address>]\n"
-+-msgstr ""
-+-"Syntaxe:\n"
-+-"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <adresse>]\n"
-+-
-+-#: ../ifconfig.c:425
-+-msgid "  [add <address>[/<prefixlen>]]\n"
-+-msgstr "  [add <adresse>[/<lg_prefixe>]]\n"
-+-
-+-#: ../ifconfig.c:427
-+-msgid "  [del <address>[/<prefixlen>]]\n"
-+-msgstr "  [del <adresse>[/<lg_prefixe>]]\n"
-+-
-+-#: ../ifconfig.c:432
-+-msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
-+-msgstr "  [[-]broadcast [<adresse>]]  [[-]pointopoint [<adresse>]]\n"
-+-
-+-#: ../ifconfig.c:433
-+-#, fuzzy
-+-msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
-+-msgstr "  [netmask <adresse>]  [dstaddr <adresse>]  [tunnel <adresse>]\n"
-+-
-+-#: ../ifconfig.c:436
-+-msgid "  [outfill <NN>] [keepalive <NN>]\n"
-+-msgstr "  [outfill <NN>] [keepalive <NN>]\n"
-+-
-+-#: ../ifconfig.c:438
-+-msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
-+-msgstr "  [hw <HW> <adresse>]  [metric <NN>]  [mtu <NN>]\n"
-+-
-+-#: ../ifconfig.c:439
-+-msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
-+-msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
-+-
-+-#: ../ifconfig.c:440
-+-msgid "  [multicast]  [[-]promisc]\n"
-+-msgstr "  [multicast]  [[-]promisc]\n"
-+-
-+-#: ../ifconfig.c:441
-+-msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
-+-msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
-+-
-+-#: ../ifconfig.c:443
-+-#, fuzzy
-+-msgid "  [txqueuelen <NN>]\n"
-+-msgstr "  [txqueuelen longueur]\n"
-+-
-+-#: ../ifconfig.c:446
-+-msgid "  [[-]dynamic]\n"
-+-msgstr "  [[-]dynamic]\n"
-+-
-+-#: ../ifconfig.c:448
-+-msgid ""
-+-"  [up|down] ...\n"
-+-"\n"
-++msgid "Interface %s not initialized\n"
-+ msgstr ""
-+-"  [up|down] ...\n"
-+-"\n"
-+-
-+-#: ../ifconfig.c:450
-+-msgid "  <HW>=Hardware Type.\n"
-+-msgstr "  <HW>=Type de mat�riel.\n"
-+-
-+-#: ../ifconfig.c:451
-+-msgid "  List of possible hardware types:\n"
-+-msgstr "  Liste des types de mat�riels possibles:\n"
-+-
-+-#. 1 = ARPable
-+-#: ../ifconfig.c:453
-+-#, c-format
-+-msgid "  <AF>=Address family. Default: %s\n"
-+-msgstr "  <AF>=famille d'Adresses. D�faut: %s\n"
-+-
-+-#: ../ifconfig.c:454
-+-msgid "  List of possible address families:\n"
-+-msgstr "  Liste des familles d'adresses possibles:\n"
-+-
-+-#: ../ifconfig.c:593
-+-msgid "Unknown media type.\n"
-+-msgstr "Type de m�dia inconnu.\n"
-+ 
-+-#: ../ifconfig.c:881
-+-#, c-format
-+-msgid "%s: invalid %s address.\n"
-++#: ../ifconfig.c:792 ../ifconfig.c:882
-++#, fuzzy, c-format
-++msgid "Bad address.\n"
-+ msgstr "%s: adresse %s invalide.\n"
-+ 
-+-#: ../ifconfig.c:920 ../ifconfig.c:963 ../ifconfig.c:1011
-+-msgid "No support for INET6 on this system.\n"
-+-msgstr "Pas de support de INET6 sur ce syst�me.\n"
-+-
-+-#: ../ifconfig.c:983
-++#: ../ifconfig.c:885
-++#, c-format
-+ msgid "Address deletion not supported on this system.\n"
-+ msgstr "Suppression d'adresses pas support� par ce syst�me.\n"
-+ 
-+-#: ../ifconfig.c:1066
-+-msgid "No support for INET on this system.\n"
-+-msgstr "Pas de support de INET sur ce syst�me.\n"
-++#: ../ifconfig.c:957
-++#, fuzzy, c-format
-++msgid "ifconfig: Cannot set address for this protocol family.\n"
-++msgstr "Ne sait pas comment d�finir les adresses pour la famille %d.\n"
-+ 
-+-#: ../ifconfig.c:1076
-++#: ../ifconfig.c:983
-++#, c-format
-+ msgid "No support for ECONET on this system.\n"
-+ msgstr "Pas de support de ECONET sur ce syst�me.\n"
-+ 
-+-#: ../ifconfig.c:1084
-++#: ../ifconfig.c:991
-+ #, c-format
-+ msgid "Don't know how to set addresses for family %d.\n"
-+ msgstr "Ne sait pas comment d�finir les adresses pour la famille %d.\n"
-+ 
-+-#: ../netstat.c:383
-++#: ../ifconfig.c:1021
-++#, c-format
-++msgid "WARNING: at least one error occured. (%d)\n"
-++msgstr ""
-++
-++#: ../netstat.c:434
-+ #, c-format
-+ msgid ""
-+ "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n"
-+-msgstr ""
-+-"(Pas d'infos lues pour \"-p\": geteuid()=%d mais vous devez �tre root.)\n"
-++msgstr "(Pas d'infos lues pour \"-p\": geteuid()=%d mais vous devez �tre root.)\n"
-+ 
-+-#: ../netstat.c:387
-++#: ../netstat.c:438
-++#, c-format
-+ msgid ""
-+ "(Not all processes could be identified, non-owned process info\n"
-+ " will not be shown, you would have to be root to see it all.)\n"
-+ msgstr ""
-+ "(Tous les processus ne peuvent �tre identifi�s, les infos sur les processus\n"
-+-"non poss�d�s ne seront pas affich�es, vous devez �tre root pour les voir "
-+-"toutes.)\n"
-++"non poss�d�s ne seront pas affich�es, vous devez �tre root pour les voir toutes.)\n"
-+ 
-+-#: ../netstat.c:394 ../netstat.c:1089 ../netstat.c:1166
-++#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266
-+ msgid "LISTENING"
-+ msgstr "LISTENING"
-+ 
-+-#: ../netstat.c:395
-++#: ../netstat.c:446
-+ msgid "CONN SENT"
-+ msgstr "CONN SENT"
-+ 
-+-#: ../netstat.c:396 ../netstat.c:1168
-++#: ../netstat.c:447 ../netstat.c:1268
-+ msgid "DISC SENT"
-+ msgstr "DISC SENT"
-+ 
-+-#: ../netstat.c:397 ../netstat.c:464 ../netstat.c:809 ../netstat.c:1169
-++#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269
-+ msgid "ESTABLISHED"
-+ msgstr "ESTABLISHED"
-+ 
-+-#: ../netstat.c:419
-++#: ../netstat.c:470
-++#, c-format
-+ msgid "Active NET/ROM sockets\n"
-+ msgstr "sockets NET/ROM actives\n"
-+ 
-+-#: ../netstat.c:420
-++#: ../netstat.c:471
-++#, c-format
-+ msgid ""
-+-"User       Dest       Source     Device  State        Vr/Vs    Send-Q  "
-+-"Recv-Q\n"
-++"User       Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-"
-++"Q\n"
-+ msgstr ""
-+-"Utilisatr  Dest       Source     Periph  Etat         Vr/Vs    Send-Q  "
-+-"Recv-Q\n"
-++"Utilisatr  Dest       Source     Periph  Etat         Vr/Vs    Send-Q  Recv-"
-++"Q\n"
-+ 
-+-#: ../netstat.c:430 ../netstat.c:1208
-++#: ../netstat.c:481 ../netstat.c:1308
-+ #, c-format
-+ msgid "Problem reading data from %s\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:465
-++#: ../netstat.c:516
-+ msgid "SYN_SENT"
-+ msgstr "SYN_SENT"
-+ 
-+-#: ../netstat.c:466
-++#: ../netstat.c:517
-+ msgid "SYN_RECV"
-+ msgstr "SYN_RECV"
-+ 
-+-#: ../netstat.c:467
-++#: ../netstat.c:518
-+ msgid "FIN_WAIT1"
-+ msgstr "FIN_WAIT1"
-+ 
-+-#: ../netstat.c:468
-++#: ../netstat.c:519
-+ msgid "FIN_WAIT2"
-+ msgstr "FIN_WAIT2"
-+ 
-+-#: ../netstat.c:469
-++#: ../netstat.c:520
-+ msgid "TIME_WAIT"
-+ msgstr "TIME_WAIT"
-+ 
-+-#: ../netstat.c:470
-++#: ../netstat.c:521
-+ msgid "CLOSE"
-+ msgstr "CLOSE"
-+ 
-+-#: ../netstat.c:471
-++#: ../netstat.c:522
-+ msgid "CLOSE_WAIT"
-+ msgstr "CLOSE_WAIT"
-+ 
-+-#: ../netstat.c:472
-++#: ../netstat.c:523
-+ msgid "LAST_ACK"
-+ msgstr "LAST_ACK"
-+ 
-+-#: ../netstat.c:473
-++#: ../netstat.c:524
-+ msgid "LISTEN"
-+ msgstr "LISTEN"
-+ 
-+-#: ../netstat.c:474
-++#: ../netstat.c:525
-+ msgid "CLOSING"
-+ msgstr "CLOSING"
-+ 
-+-#: ../netstat.c:544
-++#: ../netstat.c:596
-+ #, c-format
-+ msgid "warning, got bogus igmp6 line %d.\n"
-+ msgstr "attention, ligne igmp6 en erreur %d.\n"
-+ 
-+-#: ../netstat.c:549 ../netstat.c:587 ../netstat.c:670 ../netstat.c:803
-+-#: ../netstat.c:935 ../netstat.c:940
-++#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898
-++#: ../netstat.c:1032 ../netstat.c:1037
-+ #, c-format
-+ msgid "netstat: unsupported address family %d !\n"
-+ msgstr "netstat: famille d'adresses pas support�e %d !\n"
-+ 
-+-#: ../netstat.c:562 ../netstat.c:567 ../netstat.c:575 ../netstat.c:582
-++#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634
-+ #, c-format
-+ msgid "warning, got bogus igmp line %d.\n"
-+ msgstr "attention, ligne igmp6 en erreur %d.\n"
-+ 
-+-#: ../netstat.c:666
-++#: ../netstat.c:677
-++#, fuzzy, c-format
-++msgid "Active X.25 sockets\n"
-++msgstr "Sockets AX.25 actives\n"
-++
-++#. IMHO, Vr/Vs is not very usefull --SF
-++#: ../netstat.c:679
-++#, fuzzy, c-format
-++msgid ""
-++"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  Recv-"
-++"Q\n"
-++msgstr "Dest       Source     Periph  Etat         Vr/Vs    Send-Q  Recv-Q\n"
-++
-++#: ../netstat.c:759
-++#, c-format
-+ msgid "warning, got bogus tcp line.\n"
-+ msgstr "attention, ligne tcp en erreur.\n"
-+ 
-+-#: ../netstat.c:704 ../netstat.c:855 ../netstat.c:975
-++#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075
-+ #, c-format
-+ msgid "off (0.00/%ld/%d)"
-+ msgstr "off (0.00/%ld/%d)"
-+ 
-+-#: ../netstat.c:708
-++#: ../netstat.c:804
-+ #, fuzzy, c-format
-+ msgid "on (%2.2f/%ld/%d)"
-+ msgstr "on%d (%2.2f/%ld/%d)"
-+ 
-+-#: ../netstat.c:713
-++#: ../netstat.c:809
-+ #, fuzzy, c-format
-+ msgid "keepalive (%2.2f/%ld/%d)"
-+ msgstr "on%d (%2.2f/%ld/%d)"
-+ 
-+-#: ../netstat.c:718
-++#: ../netstat.c:814
-+ #, fuzzy, c-format
-+ msgid "timewait (%2.2f/%ld/%d)"
-+ msgstr "on%d (%2.2f/%ld/%d)"
-+ 
-+-#: ../netstat.c:723 ../netstat.c:864 ../netstat.c:985
-++#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085
-+ #, c-format
-+ msgid "unkn-%d (%2.2f/%ld/%d)"
-+ msgstr "unkn-%d (%2.2f/%ld/%d)"
-+ 
-+-#: ../netstat.c:799
-++#: ../netstat.c:894
-++#, c-format
-+ msgid "warning, got bogus udp line.\n"
-+ msgstr "attention, ligne udp en erreur.\n"
-+ 
-+-#: ../netstat.c:817 ../netstat.c:1075 ../netstat.c:1108
-++#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208
-+ msgid "UNKNOWN"
-+ msgstr "INCONNU"
-+ 
-+-#: ../netstat.c:860 ../netstat.c:980
-++#: ../netstat.c:958 ../netstat.c:1080
-+ #, c-format
-+ msgid "on%d (%2.2f/%ld/%d)"
-+ msgstr "on%d (%2.2f/%ld/%d)"
-+ 
-+-#: ../netstat.c:949
-++#: ../netstat.c:1046
-++#, c-format
-+ msgid "warning, got bogus raw line.\n"
-+ msgstr "attention, ligne raw en erreur.\n"
-+ 
-+-#: ../netstat.c:1028
-++#: ../netstat.c:1128
-++#, c-format
-+ msgid "warning, got bogus unix line.\n"
-+ msgstr "attention, ligne unix en erreur.\n"
-+ 
-+-#: ../netstat.c:1055
-++#: ../netstat.c:1155
-+ msgid "STREAM"
-+ msgstr "STREAM"
-+ 
-+-#: ../netstat.c:1059
-++#: ../netstat.c:1159
-+ msgid "DGRAM"
-+ msgstr "DGRAM"
-+ 
-+-#: ../netstat.c:1063
-++#: ../netstat.c:1163
-+ msgid "RAW"
-+ msgstr "RAW"
-+ 
-+-#: ../netstat.c:1067
-++#: ../netstat.c:1167
-+ msgid "RDM"
-+ msgstr "RDM"
-+ 
-+-#: ../netstat.c:1071
-++#: ../netstat.c:1171
-+ msgid "SEQPACKET"
-+ msgstr "SEQPACKET"
-+ 
-+-#: ../netstat.c:1080
-++#: ../netstat.c:1180
-+ msgid "FREE"
-+ msgstr "LIBRE"
-+ 
-+-#: ../netstat.c:1096
-++#: ../netstat.c:1196
-+ msgid "CONNECTING"
-+ msgstr "ENCONNEXION"
-+ 
-+-#: ../netstat.c:1100
-++#: ../netstat.c:1200
-+ msgid "CONNECTED"
-+ msgstr "CONNECTE"
-+ 
-+-#: ../netstat.c:1104
-++#: ../netstat.c:1204
-+ msgid "DISCONNECTING"
-+ msgstr "ENDECONNEXION"
-+ 
-+-#: ../netstat.c:1135
-++#: ../netstat.c:1235
-++#, c-format
-+ msgid "Active UNIX domain sockets "
-+ msgstr "Sockets du domaine UNIX actives"
-+ 
-+-#: ../netstat.c:1137 ../netstat.c:1666
-++#: ../netstat.c:1237 ../netstat.c:1756
-++#, c-format
-+ msgid "(servers and established)"
-+ msgstr "(serveurs et �tablies)"
-+ 
-+-#: ../netstat.c:1140 ../netstat.c:1669
-++#: ../netstat.c:1240 ../netstat.c:1759
-++#, c-format
-+ msgid "(only servers)"
-+ msgstr "(seulement serveurs)"
-+ 
-+-#: ../netstat.c:1142 ../netstat.c:1671
-++#: ../netstat.c:1242 ../netstat.c:1761
-++#, c-format
-+ msgid "(w/o servers)"
-+ msgstr "(sans serveurs)"
-+ 
-+-#: ../netstat.c:1145
-++#: ../netstat.c:1245
-++#, c-format
-+ msgid ""
-+ "\n"
-+ "Proto RefCnt Flags       Type       State         I-Node"
-+@@ -994,32 +906,36 @@ msgstr ""
-+ "\n"
-+ "Proto RefCpt Indicatrs   Type       Etat          I-Node"
-+ 
-+-#: ../netstat.c:1147
-++#: ../netstat.c:1247
-++#, c-format
-+ msgid " Path\n"
-+ msgstr " Chemin\n"
-+ 
-+-#: ../netstat.c:1167
-++#: ../netstat.c:1267
-+ msgid "SABM SENT"
-+ msgstr "SABM SENT"
-+ 
-+-#: ../netstat.c:1170
-++#: ../netstat.c:1270
-+ msgid "RECOVERY"
-+ msgstr "RECOVERY"
-+ 
-+-#: ../netstat.c:1184
-++#: ../netstat.c:1284
-++#, c-format
-+ msgid "Active AX.25 sockets\n"
-+ msgstr "Sockets AX.25 actives\n"
-+ 
-+-#: ../netstat.c:1185
-++#: ../netstat.c:1285
-++#, c-format
-+ msgid "Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-Q\n"
-+ msgstr "Dest       Source     Periph  Etat         Vr/Vs    Send-Q  Recv-Q\n"
-+ 
-+-#: ../netstat.c:1228
-++#: ../netstat.c:1328
-+ #, c-format
-+ msgid "problem reading data from %s\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1279
-++#: ../netstat.c:1379
-++#, c-format
-+ msgid ""
-+ "Active IPX sockets\n"
-+ "Proto Recv-Q Send-Q Local Address              Foreign Address            "
-+@@ -1029,55 +945,53 @@ msgstr ""
-+ "Proto Recv-Q Send-Q Adresse locale             Adresse distante           "
-+ "Etat"
-+ 
-+-#: ../netstat.c:1281
-++#: ../netstat.c:1381
-++#, c-format
-+ msgid " User"
-+ msgstr "Utilisatr"
-+ 
-+-#: ../netstat.c:1315
-++#: ../netstat.c:1415
-+ msgid "ESTAB"
-+ msgstr "ESTAB"
-+ 
-+-#: ../netstat.c:1323
-++#: ../netstat.c:1423
-+ msgid "UNK."
-+ msgstr "UNK."
-+ 
-+-#: ../netstat.c:1367
-+-msgid "     - no statistics available -"
-+-msgstr ""
-+-
-+-#: ../netstat.c:1370
-+-msgid "[NO FLAGS]"
-+-msgstr "[PAS INDICATEURS]"
-+-
-+-#: ../netstat.c:1400
-++#: ../netstat.c:1461
-++#, c-format
-+ msgid "Kernel Interface table\n"
-+ msgstr "Table d'interfaces noyau\n"
-+ 
-+-#: ../netstat.c:1401
-++#: ../netstat.c:1465
-++#, fuzzy, c-format
-+ msgid ""
-+-"Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
-++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
-+ "Flg\n"
-+ msgstr ""
-+ "Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
-+ "Indic\n"
-+ 
-+-#: ../netstat.c:1404
-++#: ../netstat.c:1469
-+ msgid "missing interface information"
-+ msgstr "informations d'interface manquantes"
-+ 
-+-#: ../netstat.c:1425
-++#: ../netstat.c:1492
-++#, c-format
-+ msgid ""
-+-"usage: netstat [-veenNcCF] [<Af>] -r         netstat "
-+-"{-V|--version|-h|--help}\n"
-++"usage: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
-++"help}\n"
-+ msgstr ""
-+-"syntaxe: netstat [-veenNcCF] [<Af>] -r         netstat "
-+-"{-V|--version|-h|--help}\n"
-++"syntaxe: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
-++"help}\n"
-+ 
-+-#: ../netstat.c:1426
-++#: ../netstat.c:1493
-++#, c-format
-+ msgid "       netstat [-vnNcaeol] [<Socket> ...]\n"
-+ msgstr "       netstat [-vnNcaeol] [<Socket> ...]\n"
-+ 
-+-#: ../netstat.c:1427
-++#: ../netstat.c:1494
-++#, c-format
-+ msgid ""
-+ "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
-+ "\n"
-+@@ -1085,27 +999,30 @@ msgstr ""
-+ "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
-+ "\n"
-+ 
-+-#: ../netstat.c:1429
-++#: ../netstat.c:1496
-++#, c-format
-+ msgid "        -r, --route              display routing table\n"
-+ msgstr "        -r, --route              affiche la table de routage\n"
-+ 
-+-#: ../netstat.c:1430
-++#: ../netstat.c:1497
-++#, c-format
-+ msgid "        -i, --interfaces         display interface table\n"
-+ msgstr "        -i, --interfaces         affiche la table d'interfaces\n"
-+ 
-+-#: ../netstat.c:1431
-++#: ../netstat.c:1498
-++#, c-format
-+ msgid "        -g, --groups             display multicast group memberships\n"
-+ msgstr ""
-+ "        -g, --groups             affiche les membres d'un groupe multicast\n"
-+ 
-+-#: ../netstat.c:1432
-++#: ../netstat.c:1499
-++#, c-format
-+ msgid ""
-+ "        -s, --statistics         display networking statistics (like SNMP)\n"
-+-msgstr ""
-+-"        -s, --statistics         affiche les statistiques r�seau (comme "
-+-"SNMP)\n"
-++msgstr "        -s, --statistics         affiche les statistiques r�seau (comme SNMP)\n"
-+ 
-+-#: ../netstat.c:1434
-++#: ../netstat.c:1501
-++#, c-format
-+ msgid ""
-+ "        -M, --masquerade         display masqueraded connections\n"
-+ "\n"
-+@@ -1113,23 +1030,41 @@ msgstr ""
-+ "        -M, --masquerade         affiche les connexions masqu�es\n"
-+ "\n"
-+ 
-+-#: ../netstat.c:1438 ../route.c:87
-++#: ../netstat.c:1505
-++#, fuzzy, c-format
-++msgid "        --numeric-hosts          don't resolve host names\n"
-++msgstr "        -n, --numeric            ne r�sout pas les noms\n"
-++
-++#: ../netstat.c:1506
-++#, fuzzy, c-format
-++msgid "        --numeric-ports          don't resolve port names\n"
-++msgstr "        -n, --numeric            ne r�sout pas les noms\n"
-++
-++#: ../netstat.c:1507
-++#, fuzzy, c-format
-++msgid "        --numeric-users          don't resolve user names\n"
-++msgstr "        -n, --numeric            ne r�sout pas les noms\n"
-++
-++#: ../netstat.c:1508
-++#, c-format
-+ msgid "        -N, --symbolic           resolve hardware names\n"
-+ msgstr "        -N, --symbolic           r�soud les noms mat�riels\n"
-+ 
-+-#: ../netstat.c:1439 ../route.c:88
-+-#, fuzzy
-++#: ../netstat.c:1509 ../route.c:88
-++#, fuzzy, c-format
-+ msgid "        -e, --extend             display other/more information\n"
-+ msgstr ""
-+ "        -e, --extend             affiche d'autres/plus d'informations\n"
-+ 
-+-#: ../netstat.c:1440
-++#: ../netstat.c:1510
-++#, c-format
-+ msgid "        -p, --programs           display PID/Program name for sockets\n"
-+ msgstr ""
-+ "        -p, --programs           affiche le nom du programme/PID des "
-+ "sockets\n"
-+ 
-+-#: ../netstat.c:1441
-++#: ../netstat.c:1511
-++#, c-format
-+ msgid ""
-+ "        -c, --continuous         continuous listing\n"
-+ "\n"
-+@@ -1137,32 +1072,31 @@ msgstr ""
-+ "        -c, --continuous         listing continu\n"
-+ "\n"
-+ 
-+-#: ../netstat.c:1442
-++#: ../netstat.c:1512
-++#, c-format
-+ msgid "        -l, --listening          display listening server sockets\n"
-+-msgstr ""
-+-"        -l, --listening          affiche les sockets du serveur � l'�coute\n"
-++msgstr "        -l, --listening          affiche les sockets du serveur � l'�coute\n"
-+ 
-+-#: ../netstat.c:1443
-++#: ../netstat.c:1513
-++#, c-format
-+ msgid ""
-+ "        -a, --all, --listening   display all sockets (default: connected)\n"
-+-msgstr ""
-+-"        -a, --all, --listening   affiche toutes les prises (d�faut: "
-+-"connect�s)\n"
-++msgstr "        -a, --all, --listening   affiche toutes les prises (d�faut: connect�s)\n"
-+ 
-+-#: ../netstat.c:1444
-++#: ../netstat.c:1514
-++#, c-format
-+ msgid "        -o, --timers             display timers\n"
-+ msgstr "        -o, --timers             affiche les timers\n"
-+ 
-+-#: ../netstat.c:1445 ../route.c:89
-+-#, fuzzy
-++#: ../netstat.c:1515 ../route.c:89
-++#, fuzzy, c-format
-+ msgid ""
-+ "        -F, --fib                display Forwarding Information Base "
-+ "(default)\n"
-+-msgstr ""
-+-"        -F, --fib                affiche la Forwarding Infomation Base "
-+-"(d�faut)\n"
-++msgstr "        -F, --fib                affiche la Forwarding Infomation Base (d�faut)\n"
-+ 
-+-#: ../netstat.c:1446 ../route.c:90
-++#: ../netstat.c:1516 ../route.c:90
-++#, c-format
-+ msgid ""
-+ "        -C, --cache              display routing cache instead of FIB\n"
-+ "\n"
-+@@ -1170,110 +1104,118 @@ msgstr ""
-+ "        -C, --cache              affiche le cache de routage au lieu de FIB\n"
-+ "\n"
-+ 
-+-#: ../netstat.c:1448
-++#: ../netstat.c:1518
-++#, c-format
-+ msgid ""
-+-"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
-+-"--netrom\n"
-++"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
-++"netrom\n"
-+ msgstr ""
-+-"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
-+-"--netrom\n"
-++"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
-++"netrom\n"
-+ 
-+-#: ../netstat.c:1449 ../route.c:92
-+-#, c-format
-+-msgid "  <AF>=Use '-A <af>' or '--<af>' Default: %s\n"
-++#: ../netstat.c:1519
-++#, fuzzy, c-format
-++msgid "  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"
-+ msgstr "  <AF>=Utiliser '-A <af>' ou '--<af>' D�faut: %s\n"
-+ 
-+-#: ../netstat.c:1450 ../route.c:93
-++#: ../netstat.c:1520 ../route.c:93
-++#, c-format
-+ msgid "  List of possible address families (which support routing):\n"
-+ msgstr "  Liste les familles d'adresses possibles (supportant le routage):\n"
-+ 
-+-#: ../netstat.c:1663
-++#: ../netstat.c:1753
-++#, c-format
-+ msgid "Active Internet connections "
-+ msgstr "Connexions Internet actives "
-+ 
-+-#: ../netstat.c:1673
-++#: ../netstat.c:1763
-++#, c-format
-+ msgid ""
-+ "\n"
-+-"Proto Recv-Q Send-Q Local Address           Foreign Address         State    "
-+-"  "
-++"Proto Recv-Q Send-Q Local Address           Foreign Address         "
-++"State      "
-+ msgstr ""
-+ "\n"
-+-"Proto Recv-Q Send-Q Adresse locale          Adresse distante        Etat     "
-+-"  "
-++"Proto Recv-Q Send-Q Adresse locale          Adresse distante        "
-++"Etat       "
-+ 
-+-#: ../netstat.c:1675
-++#: ../netstat.c:1765
-++#, c-format
-+ msgid " User       Inode     "
-+ msgstr " Utilisatr  Inode     "
-+ 
-+-#: ../netstat.c:1678
-++#: ../netstat.c:1768
-++#, c-format
-+ msgid " Timer"
-+ msgstr " Timer"
-+ 
-+-#: ../netstat.c:1708
-++#: ../netstat.c:1798
-++#, c-format
-+ msgid "IPv4 Group Memberships\n"
-+ msgstr ""
-+ 
-+-#: ../netstat.c:1709
-++#: ../netstat.c:1799
-++#, c-format
-+ msgid "Interface       RefCnt Group\n"
-+ msgstr ""
-+ 
-+-#: ../rarp.c:43
-++#: ../rarp.c:44
-+ msgid "This kernel does not support RARP.\n"
-+ msgstr "Ce noyau ne supporte pas RARP.\n"
-+ 
-+-#: ../rarp.c:82
-++#: ../rarp.c:83
-+ #, c-format
-+ msgid "no RARP entry for %s.\n"
-+ msgstr "pas d'entr�e RARP pour %s.\n"
-+ 
-+-#: ../rarp.c:95
-++#: ../rarp.c:96
-+ #, c-format
-+ msgid "%s: bad hardware address\n"
-+ msgstr "%s: mauvaise adresse mat�riel\n"
-+ 
-+-#: ../rarp.c:127
-++#: ../rarp.c:128
-+ #, c-format
-+ msgid "rarp: cannot open file %s:%s.\n"
-+ msgstr "rarp: ne peut ouvrir le fichier %s:%s.\n"
-+ 
-+-#: ../rarp.c:139
-++#: ../rarp.c:140
-+ #, c-format
-+ msgid "rarp: format error at %s:%u\n"
-+ msgstr "rarp: erreur de format � %s:%u\n"
-+ 
-+-#: ../rarp.c:143 ../rarp.c:287
-++#: ../rarp.c:144 ../rarp.c:289
-+ #, c-format
-+ msgid "rarp: %s: unknown host\n"
-+ msgstr "rarp: %s: h�te inconnu\n"
-+ 
-+-#: ../rarp.c:146
-++#: ../rarp.c:147
-+ #, c-format
-+ msgid "rarp: cannot set entry from %s:%u\n"
-+ msgstr "rarp: ne peut d�finir l'entr�e depuis %s:%u\n"
-+ 
-+-#: ../rarp.c:175
-++#: ../rarp.c:176
-++#, c-format
-+ msgid "Usage: rarp -a                               list entries in cache.\n"
-+-msgstr ""
-+-"Usage: rarp -a                               liste les entr�es en cache.\n"
-++msgstr "Usage: rarp -a                               liste les entr�es en cache.\n"
-+ 
-+-#: ../rarp.c:176
-++#: ../rarp.c:177
-++#, c-format
-+ msgid "       rarp -d <hostname>                    delete entry from cache.\n"
-+-msgstr ""
-+-"       rarp -d <hostname>                    supprime l'entr�e du cache.\n"
-++msgstr "       rarp -d <hostname>                    supprime l'entr�e du cache.\n"
-+ 
-+-#: ../rarp.c:177
-++#: ../rarp.c:178
-++#, c-format
-+ msgid "       rarp [<HW>] -s <hostname> <hwaddr>    add entry to cache.\n"
-+-msgstr ""
-+-"       rarp [<HW>] -s <hostname> <adrmat>    ajoute l'entr�e au cache.\n"
-++msgstr "       rarp [<HW>] -s <hostname> <adrmat>    ajoute l'entr�e au cache.\n"
-+ 
-+-#: ../rarp.c:178
-++#: ../rarp.c:179
-++#, c-format
-+ msgid ""
-+ "       rarp -f                               add entries from /etc/ethers.\n"
-+-msgstr ""
-+-"       rarp -f                               ajoute les entr�es depuis "
-+-"/etc/ethers.\n"
-++msgstr "       rarp -f                               ajoute les entr�es depuis /etc/ethers.\n"
-+ 
-+-#: ../rarp.c:179
-++#: ../rarp.c:180
-++#, c-format
-+ msgid ""
-+ "       rarp -V                               display program version.\n"
-+ "\n"
-+@@ -1281,24 +1223,26 @@ msgstr ""
-+ "       rarp -V                               affiche la version.\n"
-+ "\n"
-+ 
-+-#: ../rarp.c:236
-++#: ../rarp.c:238
-+ #, c-format
-+ msgid "%s: illegal option mix.\n"
-+ msgstr "%s: combinaison d'options ill�gales.\n"
-+ 
-+-#: ../rarp.c:267
-++#: ../rarp.c:269
-+ #, c-format
-+ msgid "rarp: %s: unknown hardware type.\n"
-+ msgstr "rarp: %s: type de mat�riel inconnu.\n"
-+ 
-+-#: ../route.c:79
-++#: ../route.c:80
-++#, c-format
-+ msgid ""
-+ "Usage: route [-nNvee] [-FC] [<AF>]           List kernel routing tables\n"
-+ msgstr ""
-+ "Syntaxe: route [-nNvee] [-FC] [<AF>]           Liste les tables de routage "
-+ "noyau\n"
-+ 
-+-#: ../route.c:80
-++#: ../route.c:81
-++#, c-format
-+ msgid ""
-+ "       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n"
-+ "\n"
-+@@ -1307,15 +1251,15 @@ msgstr ""
-+ "pour AF.\n"
-+ "\n"
-+ 
-+-#: ../route.c:82
-++#: ../route.c:83
-++#, c-format
-+ msgid ""
-+ "       route {-h|--help} [<AF>]              Detailed usage syntax for "
-+ "specified AF.\n"
-+-msgstr ""
-+-"       route {-h|--help} [<AF>]              Utilisation d�taill�e pour l'AF "
-+-"sp�cifi�.\n"
-++msgstr "       route {-h|--help} [<AF>]              Utilisation d�taill�e pour l'AF sp�cifi�.\n"
-+ 
-+-#: ../route.c:83
-++#: ../route.c:84
-++#, c-format
-+ msgid ""
-+ "       route {-V|--version}                  Display version/author and "
-+ "exit.\n"
-+@@ -1325,16 +1269,23 @@ msgstr ""
-+ "termine.\n"
-+ "\n"
-+ 
-++#: ../route.c:92
-++#, fuzzy, c-format
-++msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
-++msgstr "  <AF>=Utiliser '-A <af>' ou '--<af>' D�faut: %s\n"
-++
-+ #: ../plipconfig.c:66
-++#, c-format
-+ msgid "Usage: plipconfig [-a] [-i] [-v] interface\n"
-+ msgstr "Syntaxe: plipconfig [-a] [-i] [-v] interface\n"
-+ 
-+ #: ../plipconfig.c:67
-++#, c-format
-+ msgid "                  [nibble NN] [trigger NN]\n"
-+ msgstr "                  [nibble NN] [trigger NN]\n"
-+ 
-+ #: ../plipconfig.c:68
-+-#, fuzzy
-++#, fuzzy, c-format
-+ msgid "       plipconfig -V | --version\n"
-+ msgstr "       plipconfig -V\n"
-+ 
-+@@ -1343,474 +1294,763 @@ msgstr "       plipconfig -V\n"
-+ msgid "%s\tnibble %lu  trigger %lu\n"
-+ msgstr "%s\tnibble %lu  trigger %lu\n"
-+ 
-+-#: ../iptunnel.c:79
-++#: ../iptunnel.c:85
-++#, c-format
-+ msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
-+ msgstr ""
-+ 
-+-#: ../iptunnel.c:80
-++#: ../iptunnel.c:86
-++#, c-format
-+ msgid ""
-+ "          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
-+ msgstr ""
-+ 
-+-#: ../iptunnel.c:81
-++#: ../iptunnel.c:87
-++#, c-format
-+ msgid "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
-+ msgstr ""
-+ 
-+-#: ../iptunnel.c:82
-++#: ../iptunnel.c:88
-++#, c-format
-+ msgid "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
-+ msgstr ""
-+ 
-+-#: ../iptunnel.c:83
-++#: ../iptunnel.c:89
-++#, c-format
-+ msgid ""
-+ "       iptunnel -V | --version\n"
-+ "\n"
-+ msgstr ""
-+ 
-+-#: ../iptunnel.c:84
-++#: ../iptunnel.c:90
-++#, c-format
-+ msgid "Where: NAME := STRING\n"
-+ msgstr ""
-+ 
-+-#: ../iptunnel.c:85
-++#: ../iptunnel.c:91
-++#, c-format
-+ msgid "       ADDR := { IP_ADDRESS | any }\n"
-+ msgstr ""
-+ 
-+-#: ../iptunnel.c:86
-++#: ../iptunnel.c:92
-++#, c-format
-+ msgid "       TOS  := { NUMBER | inherit }\n"
-+ msgstr ""
-+ 
-+-#: ../iptunnel.c:87
-++#: ../iptunnel.c:93
-++#, c-format
-+ msgid "       TTL  := { 1..255 | inherit }\n"
-+ msgstr ""
-+ 
-+-#: ../iptunnel.c:88
-++#: ../iptunnel.c:94
-++#, c-format
-+ msgid "       KEY  := { DOTTED_QUAD | NUMBER }\n"
-+ msgstr ""
-+ 
-+-#: ../iptunnel.c:326
-++#: ../iptunnel.c:332
-++#, c-format
-+ msgid "Keys are not allowed with ipip and sit.\n"
-+ msgstr ""
-+ 
-+-#: ../iptunnel.c:346
-++#: ../iptunnel.c:352
-++#, c-format
-+ msgid "Broadcast tunnel requires a source address.\n"
-+ msgstr ""
-+ 
-+-#: ../iptunnel.c:361
-++#: ../iptunnel.c:367
-++#, c-format
-+ msgid "ttl != 0 and noptmudisc are incompatible\n"
-+ msgstr ""
-+ 
-+-#: ../iptunnel.c:373
-++#: ../iptunnel.c:379
-++#, c-format
-+ msgid "cannot determine tunnel mode (ipip, gre or sit)\n"
-+ msgstr ""
-+ 
-+-#: ../iptunnel.c:411
-++#: ../iptunnel.c:417
-+ #, c-format
-+ msgid "%s: %s/ip  remote %s  local %s "
-+ msgstr ""
-+ 
-+-#: ../iptunnel.c:415
-++#: ../iptunnel.c:421
-+ #, fuzzy
-+ msgid "unknown"
-+ msgstr "Inconnu"
-+ 
-+-#: ../iptunnel.c:447
-++#: ../iptunnel.c:453
-++#, c-format
-+ msgid "  Drop packets out of sequence.\n"
-+ msgstr ""
-+ 
-+-#: ../iptunnel.c:449
-++#: ../iptunnel.c:455
-++#, c-format
-+ msgid "  Checksum in received packet is required.\n"
-+ msgstr ""
-+ 
-+-#: ../iptunnel.c:451
-++#: ../iptunnel.c:457
-++#, c-format
-+ msgid "  Sequence packets on output.\n"
-+ msgstr ""
-+ 
-+-#: ../iptunnel.c:453
-++#: ../iptunnel.c:459
-++#, c-format
-+ msgid "  Checksum output packets.\n"
-+ msgstr ""
-+ 
-+-#: ../iptunnel.c:481
-++#: ../iptunnel.c:487
-++#, c-format
-+ msgid "Wrong format of /proc/net/dev. Sorry.\n"
-+ msgstr ""
-+ 
-+-#: ../iptunnel.c:494
-++#: ../iptunnel.c:500
-+ #, c-format
-+ msgid "Failed to get type of [%s]\n"
-+ msgstr ""
-+ 
-+-#: ../iptunnel.c:510
-++#: ../iptunnel.c:516
-++#, c-format
-+ msgid "RX: Packets    Bytes        Errors CsumErrs OutOfSeq Mcasts\n"
-+ msgstr ""
-+ 
-+-#: ../iptunnel.c:513
-++#: ../iptunnel.c:519
-++#, c-format
-+ msgid "TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs\n"
-+ msgstr ""
-+ 
-+-#: ../statistics.c:45
-++#: ../statistics.c:47
-+ msgid "ICMP input histogram:"
-+ msgstr "Histogramme d'entr�e ICMP"
-+ 
-+-#: ../statistics.c:46
-++#: ../statistics.c:48
-+ msgid "ICMP output histogram:"
-+ msgstr "Histogramme de sortie ICMP"
-+ 
-+-#: ../statistics.c:63
-++#: ../statistics.c:65
-+ #, c-format
-+ msgid "Forwarding is %s"
-+ msgstr "R�acheminement est %s"
-+ 
-+-#: ../statistics.c:64
-+-#, c-format
-+-msgid "Default TTL is %d"
-++#: ../statistics.c:66
-++#, fuzzy, c-format
-++msgid "Default TTL is %u"
-+ msgstr "TTL par d�faut est %d"
-+ 
-+-#: ../statistics.c:65
-+-#, c-format
-+-msgid "%d total packets received"
-++#: ../statistics.c:67
-++#, fuzzy, c-format
-++msgid "%u total packets received"
-+ msgstr "%d paquets totaux re�us"
-+ 
-+-#: ../statistics.c:66
-+-#, c-format
-+-msgid "%d with invalid headers"
-++#: ../statistics.c:68
-++#, fuzzy, c-format
-++msgid "%u with invalid headers"
-+ msgstr "%d avec en-t�te invalides"
-+ 
-+-#: ../statistics.c:67
-+-#, c-format
-+-msgid "%d with invalid addresses"
-++#: ../statistics.c:69
-++#, fuzzy, c-format
-++msgid "%u with invalid addresses"
-+ msgstr "%d avec adresses invalides"
-+ 
-+-#: ../statistics.c:68
-+-#, c-format
-+-msgid "%d forwarded"
-++#: ../statistics.c:70
-++#, fuzzy, c-format
-++msgid "%u forwarded"
-+ msgstr "%d r�achemin�es"
-+ 
-+-#: ../statistics.c:69
-+-#, c-format
-+-msgid "%d with unknown protocol"
-++#: ../statistics.c:71
-++#, fuzzy, c-format
-++msgid "%u with unknown protocol"
-+ msgstr "%d avec protocole inconnu"
-+ 
-+-#: ../statistics.c:70
-+-#, c-format
-+-msgid "%d incoming packets discarded"
-++#: ../statistics.c:72
-++#, fuzzy, c-format
-++msgid "%u incoming packets discarded"
-+ msgstr "%d paquets entrant jet�s"
-+ 
-+-#: ../statistics.c:71
-+-#, c-format
-+-msgid "%d incoming packets delivered"
-++#: ../statistics.c:73
-++#, fuzzy, c-format
-++msgid "%u incoming packets delivered"
-+ msgstr "%d paquets entrant d�livr�s"
-+ 
-+-#: ../statistics.c:72
-+-#, c-format
-+-msgid "%d requests sent out"
-++#: ../statistics.c:74
-++#, fuzzy, c-format
-++msgid "%u requests sent out"
-+ msgstr "%d requ�tes envoy�es"
-+ 
-+ #. ?
-+-#: ../statistics.c:73
-+-#, c-format
-+-msgid "%d outgoing packets dropped"
-++#: ../statistics.c:75
-++#, fuzzy, c-format
-++msgid "%u outgoing packets dropped"
-+ msgstr "%d paquets sortant jet�s"
-+ 
-+-#: ../statistics.c:74
-+-#, c-format
-+-msgid "%d dropped because of missing route"
-++#: ../statistics.c:76
-++#, fuzzy, c-format
-++msgid "%u dropped because of missing route"
-+ msgstr "%d jet�s pour cause de route manquante"
-+ 
-+-#: ../statistics.c:75
-+-#, c-format
-+-msgid "%d fragments dropped after timeout"
-++#: ../statistics.c:77
-++#, fuzzy, c-format
-++msgid "%u fragments dropped after timeout"
-+ msgstr "%d fragments jet�s apr�s timeout"
-+ 
-+-#: ../statistics.c:76
-+-#, c-format
-+-msgid "%d reassemblies required"
-++#: ../statistics.c:78
-++#, fuzzy, c-format
-++msgid "%u reassemblies required"
-+ msgstr "%d n�cessitant un r�assemblage"
-+ 
-+ #. ?
-+-#: ../statistics.c:77
-+-#, c-format
-+-msgid "%d packets reassembled ok"
-++#: ../statistics.c:79
-++#, fuzzy, c-format
-++msgid "%u packets reassembled ok"
-+ msgstr "%d paquets r�assembl�s correctement"
-+ 
-+-#: ../statistics.c:78
-+-#, c-format
-+-msgid "%d packet reassembles failed"
-++#: ../statistics.c:80
-++#, fuzzy, c-format
-++msgid "%u packet reassembles failed"
-+ msgstr "%d paquets mal r�assembl�s"
-+ 
-+-#: ../statistics.c:79
-+-#, c-format
-+-msgid "%d fragments received ok"
-++#: ../statistics.c:81
-++#, fuzzy, c-format
-++msgid "%u fragments received ok"
-+ msgstr "%d fragments re�us correctement"
-+ 
-+-#: ../statistics.c:80
-+-#, c-format
-+-msgid "%d fragments failed"
-++#: ../statistics.c:82
-++#, fuzzy, c-format
-++msgid "%u fragments failed"
-+ msgstr "%d fragments en �chec"
-+ 
-+-#: ../statistics.c:81
-+-#, c-format
-+-msgid "%d fragments created"
-++#: ../statistics.c:83
-++#, fuzzy, c-format
-++msgid "%u fragments created"
-+ msgstr "%d fragments cr��s"
-+ 
-+-#: ../statistics.c:86
-+-#, c-format
-+-msgid "%d ICMP messages received"
-++#: ../statistics.c:88
-++#, fuzzy, c-format
-++msgid "%u ICMP messages received"
-+ msgstr "%d messages ICMP re�us"
-+ 
-+-#: ../statistics.c:87
-+-#, c-format
-+-msgid "%d input ICMP message failed."
-++#: ../statistics.c:89
-++#, fuzzy, c-format
-++msgid "%u input ICMP message failed."
-+ msgstr "%d messages d'entr�e ICMP en �chec"
-+ 
-+-#: ../statistics.c:88 ../statistics.c:101
-+-#, c-format
-+-msgid "destination unreachable: %d"
-++#: ../statistics.c:90 ../statistics.c:103
-++#, fuzzy, c-format
-++msgid "destination unreachable: %u"
-+ msgstr "destination injoignable: %d"
-+ 
-+-#: ../statistics.c:89
-+-#, c-format
-+-msgid "timeout in transit: %d"
-++#: ../statistics.c:91
-++#, fuzzy, c-format
-++msgid "timeout in transit: %u"
-+ msgstr "timeout en transmission: %d"
-+ 
-+-#: ../statistics.c:90 ../statistics.c:103
-+-#, c-format
-+-msgid "wrong parameters: %d"
-++#: ../statistics.c:92 ../statistics.c:105
-++#, fuzzy, c-format
-++msgid "wrong parameters: %u"
-+ msgstr "mauvais param�tre: %d"
-+ 
-+ #. ?
-+-#: ../statistics.c:91
-+-#, c-format
-+-msgid "source quenchs: %d"
-++#: ../statistics.c:93
-++#, fuzzy, c-format
-++msgid "source quenches: %u"
-+ msgstr "Source Quenchs: %d"
-+ 
-+-#: ../statistics.c:92
-+-#, c-format
-+-msgid "redirects: %d"
-++#: ../statistics.c:94
-++#, fuzzy, c-format
-++msgid "redirects: %u"
-+ msgstr "Redirections: %d"
-+ 
-+-#: ../statistics.c:93
-+-#, c-format
-+-msgid "echo requests: %d"
-++#: ../statistics.c:95
-++#, fuzzy, c-format
-++msgid "echo requests: %u"
-+ msgstr "requ�tes echo: %d"
-+ 
-+-#: ../statistics.c:94 ../statistics.c:107
-+-#, c-format
-+-msgid "echo replies: %d"
-++#: ../statistics.c:96 ../statistics.c:109
-++#, fuzzy, c-format
-++msgid "echo replies: %u"
-+ msgstr "r�ponses echo: %d"
-+ 
-+-#: ../statistics.c:95
-+-#, c-format
-+-msgid "timestamp request: %d"
-++#: ../statistics.c:97
-++#, fuzzy, c-format
-++msgid "timestamp request: %u"
-+ msgstr "requ�tes dat�es: %d"
-+ 
-+-#: ../statistics.c:96
-+-#, c-format
-+-msgid "timestamp reply: %d"
-++#: ../statistics.c:98
-++#, fuzzy, c-format
-++msgid "timestamp reply: %u"
-+ msgstr "r�ponses dat�es: %d"
-+ 
-+-#: ../statistics.c:97
-+-#, c-format
-+-msgid "address mask request: %d"
-++#: ../statistics.c:99
-++#, fuzzy, c-format
-++msgid "address mask request: %u"
-+ msgstr "requ�tes de masque d'adresse: %d"
-+ 
-+ #. ?
-+-#: ../statistics.c:98
-+-msgid "address mask replies"
-+-msgstr "r�ponses de masque d'adresses"
-++#: ../statistics.c:100 ../statistics.c:113
-++#, fuzzy, c-format
-++msgid "address mask replies: %u"
-++msgstr "r�ponses de masque d'adresse: %d"
-+ 
-+ #. ?
-+-#: ../statistics.c:99
-+-#, c-format
-+-msgid "%d ICMP messages sent"
-++#: ../statistics.c:101
-++#, fuzzy, c-format
-++msgid "%u ICMP messages sent"
-+ msgstr "%d messages ICMP envoy�s"
-+ 
-+-#: ../statistics.c:100
-+-#, c-format
-+-msgid "%d ICMP messages failed"
-++#: ../statistics.c:102
-++#, fuzzy, c-format
-++msgid "%u ICMP messages failed"
-+ msgstr "%d messages ICMP en �chec"
-+ 
-+-#: ../statistics.c:102
-+-#, c-format
-+-msgid "time exceeded: %d"
-++#: ../statistics.c:104
-++#, fuzzy, c-format
-++msgid "time exceeded: %u"
-+ msgstr "temps d�pass�: %d"
-+ 
-+ #. ?
-+-#: ../statistics.c:104
-+-#, c-format
-+-msgid "source quench: %d"
-++#: ../statistics.c:106
-++#, fuzzy, c-format
-++msgid "source quench: %u"
-+ msgstr "Source Quench: %d"
-+ 
-+-#: ../statistics.c:105
-+-#, c-format
-+-msgid "redirect: %d"
-++#: ../statistics.c:107
-++#, fuzzy, c-format
-++msgid "redirect: %u"
-+ msgstr "redirection: %d"
-+ 
-+-#: ../statistics.c:106
-+-#, c-format
-+-msgid "echo request: %d"
-++#: ../statistics.c:108
-++#, fuzzy, c-format
-++msgid "echo request: %u"
-+ msgstr "requ�te echo: %d"
-+ 
-+-#: ../statistics.c:108
-+-#, c-format
-+-msgid "timestamp requests: %d"
-++#: ../statistics.c:110
-++#, fuzzy, c-format
-++msgid "timestamp requests: %u"
-+ msgstr "requ�tes dat�es: %d"
-+ 
-+-#: ../statistics.c:109
-+-#, c-format
-+-msgid "timestamp replies: %d"
-++#: ../statistics.c:111
-++#, fuzzy, c-format
-++msgid "timestamp replies: %u"
-+ msgstr "r�ponses dat�es: %d"
-+ 
-+-#: ../statistics.c:110
-+-#, c-format
-+-msgid "address mask requests: %d"
-++#: ../statistics.c:112
-++#, fuzzy, c-format
-++msgid "address mask requests: %u"
-+ msgstr "requ�tes de masque d'adresse: %d"
-+ 
-+-#: ../statistics.c:111
-+-#, c-format
-+-msgid "address mask replies: %d"
-+-msgstr "r�ponses de masque d'adresse: %d"
-+-
-+-#: ../statistics.c:116
-++#: ../statistics.c:118
-+ #, c-format
-+ msgid "RTO algorithm is %s"
-+ msgstr "algorithme RTO est %s"
-+ 
-+-#: ../statistics.c:120
-+-#, c-format
-+-msgid "%d active connections openings"
-++#: ../statistics.c:122
-++#, fuzzy, c-format
-++msgid "%u active connections openings"
-+ msgstr "%d ouvertures de connexions actives"
-+ 
-+-#: ../statistics.c:121
-+-#, c-format
-+-msgid "%d passive connection openings"
-++#: ../statistics.c:123
-++#, fuzzy, c-format
-++msgid "%u passive connection openings"
-+ msgstr "%d ouvertures de connexions passives"
-+ 
-+-#: ../statistics.c:122
-+-#, c-format
-+-msgid "%d failed connection attempts"
-++#: ../statistics.c:124
-++#, fuzzy, c-format
-++msgid "%u failed connection attempts"
-+ msgstr "%d tentatives de connexion �chou�es"
-+ 
-+-#: ../statistics.c:123
-+-#, c-format
-+-msgid "%d connection resets received"
-++#: ../statistics.c:125
-++#, fuzzy, c-format
-++msgid "%u connection resets received"
-+ msgstr "%d r�initialisations de connexions re�ues"
-+ 
-+-#: ../statistics.c:124
-+-#, c-format
-+-msgid "%d connections established"
-++#: ../statistics.c:126
-++#, fuzzy, c-format
-++msgid "%u connections established"
-+ msgstr "%d connexions �tablies"
-+ 
-+-#: ../statistics.c:125
-+-#, c-format
-+-msgid "%d segments received"
-++#: ../statistics.c:127
-++#, fuzzy, c-format
-++msgid "%u segments received"
-+ msgstr "%d segments re�us"
-+ 
-+-#: ../statistics.c:126
-+-#, c-format
-+-msgid "%d segments send out"
-++#: ../statistics.c:128
-++#, fuzzy, c-format
-++msgid "%u segments send out"
-+ msgstr "%d segments envoy�s"
-+ 
-+-#: ../statistics.c:127
-+-#, c-format
-+-msgid "%d segments retransmited"
-++#: ../statistics.c:129
-++#, fuzzy, c-format
-++msgid "%u segments retransmited"
-+ msgstr "%d segments retransmis"
-+ 
-+-#: ../statistics.c:128
-+-#, c-format
-+-msgid "%d bad segments received."
-++#: ../statistics.c:130
-++#, fuzzy, c-format
-++msgid "%u bad segments received."
-+ msgstr "%d mauvais segments re�us."
-+ 
-+-#: ../statistics.c:129
-+-#, c-format
-+-msgid "%d resets sent"
-++#: ../statistics.c:131
-++#, fuzzy, c-format
-++msgid "%u resets sent"
-+ msgstr "%d r�initialisations envoy�es"
-+ 
-+-#: ../statistics.c:134
-+-#, c-format
-+-msgid "%d packets received"
-++#: ../statistics.c:136
-++#, fuzzy, c-format
-++msgid "%u packets received"
-+ msgstr "%d paquets re�us"
-+ 
-+-#: ../statistics.c:135
-+-#, c-format
-+-msgid "%d packets to unknown port received."
-++#: ../statistics.c:137
-++#, fuzzy, c-format
-++msgid "%u packets to unknown port received."
-+ msgstr "%d paquets re�us pour un port inconnu"
-+ 
-+-#: ../statistics.c:136
-+-#, c-format
-+-msgid "%d packet receive errors"
-++#: ../statistics.c:138
-++#, fuzzy, c-format
-++msgid "%u packet receive errors"
-+ msgstr "%d erreurs en r�ception de paquets"
-+ 
-+-#: ../statistics.c:137
-++#: ../statistics.c:139
-++#, fuzzy, c-format
-++msgid "%u packets sent"
-++msgstr "%d paquets envoy�s"
-++
-++#: ../statistics.c:144
-++#, fuzzy, c-format
-++msgid "%u SYN cookies sent"
-++msgstr "%d SYN-Cookies re�us"
-++
-++#: ../statistics.c:145
-++#, fuzzy, c-format
-++msgid "%u SYN cookies received"
-++msgstr "%d SYN-Cookies re�us"
-++
-++#: ../statistics.c:146
-++#, fuzzy, c-format
-++msgid "%u invalid SYN cookies received"
-++msgstr "%d SYN-Cookies re�us incorrects"
-++
-++#: ../statistics.c:148
-++#, fuzzy, c-format
-++msgid "%u resets received for embryonic SYN_RECV sockets"
-++msgstr "%d r�initialisations re�ues pour sockets SYN_RECV embryonnaires"
-++
-++#: ../statistics.c:150
-++#, fuzzy, c-format
-++msgid "%u packets pruned from receive queue because of socket buffer overrun"
-++msgstr "%d paquets supprim�s de la file de r�ception en raison de tampon de sockets plein"
-++
-++#. obsolete: 2.2.0 doesn't do that anymore
-++#: ../statistics.c:153
-++#, fuzzy, c-format
-++msgid "%u packets pruned from receive queue"
-++msgstr "%d paquets supprim�s de la file hors service"
-++
-++#: ../statistics.c:154
-++#, fuzzy, c-format
-++msgid ""
-++"%u packets dropped from out-of-order queue because of socket buffer overrun"
-++msgstr "%d paquets jet�s de la file hors service en raison de tampon de sockets plein"
-++
-++#: ../statistics.c:156
-++#, fuzzy, c-format
-++msgid "%u ICMP packets dropped because they were out-of-window"
-++msgstr "%d ICMP paquets jet�s car hors de la fen�tre"
-++
-++#: ../statistics.c:158
-++#, fuzzy, c-format
-++msgid "%u ICMP packets dropped because socket was locked"
-++msgstr "%d paquets ICMP jet�s car la socket a �t� v�rouill�e"
-++
-++#: ../statistics.c:160
-+ #, c-format
-+-msgid "%d packets sent"
-++msgid "%u TCP sockets finished time wait in fast timer"
-++msgstr ""
-++
-++#: ../statistics.c:161
-++#, c-format
-++msgid "%u time wait sockets recycled by time stamp"
-++msgstr ""
-++
-++#: ../statistics.c:162
-++#, c-format
-++msgid "%u TCP sockets finished time wait in slow timer"
-++msgstr ""
-++
-++#: ../statistics.c:163
-++#, c-format
-++msgid "%u passive connections rejected because of time stamp"
-++msgstr ""
-++
-++#: ../statistics.c:165
-++#, c-format
-++msgid "%u active connections rejected because of time stamp"
-++msgstr ""
-++
-++#: ../statistics.c:167
-++#, c-format
-++msgid "%u packets rejects in established connections because of timestamp"
-++msgstr ""
-++
-++#: ../statistics.c:169
-++#, fuzzy, c-format
-++msgid "%u delayed acks sent"
-+ msgstr "%d paquets envoy�s"
-+ 
-+-#: ../statistics.c:142
-++#: ../statistics.c:170
-+ #, c-format
-+-msgid "%d SYN cookies sent"
-++msgid "%u delayed acks further delayed because of locked socket"
-+ msgstr ""
-+ 
-+-#: ../statistics.c:143
-++#: ../statistics.c:172
-+ #, c-format
-+-msgid "%d SYN cookies received"
-+-msgstr "%d SYN-Cookies re�us"
-++msgid "Quick ack mode was activated %u times"
-++msgstr ""
-+ 
-+-#: ../statistics.c:144
-++#: ../statistics.c:173
-+ #, c-format
-+-msgid "%d invalid SYN cookies received"
-+-msgstr "%d SYN-Cookies re�us incorrects"
-++msgid "%u times the listen queue of a socket overflowed"
-++msgstr ""
-+ 
-+-#: ../statistics.c:146
-++#: ../statistics.c:175
-+ #, c-format
-+-msgid "%d resets received for embryonic SYN_RECV sockets"
-+-msgstr "%d r�initialisations re�ues pour sockets SYN_RECV embryonnaires"
-++msgid "%u SYNs to LISTEN sockets ignored"
-++msgstr ""
-+ 
-+-#: ../statistics.c:148
-++#: ../statistics.c:176
-+ #, c-format
-+-msgid "%d packets pruned from receive queue because of socket buffer overrun"
-++msgid "%u packets directly queued to recvmsg prequeue."
-+ msgstr ""
-+-"%d paquets supprim�s de la file de r�ception en raison de tampon de sockets "
-+-"plein"
-+ 
-+-#. obsolete: 2.2.0 doesn't do that anymore
-+-#: ../statistics.c:151
-++#: ../statistics.c:178
-++#, c-format
-++msgid "%u of bytes directly received from backlog"
-++msgstr ""
-++
-++#: ../statistics.c:180
-+ #, c-format
-+-msgid "%d packets pruned from out-of-order queue"
-++msgid "%u of bytes directly received from prequeue"
-++msgstr ""
-++
-++#: ../statistics.c:182
-++#, fuzzy, c-format
-++msgid "%u packets dropped from prequeue"
-+ msgstr "%d paquets supprim�s de la file hors service"
-+ 
-+-#: ../statistics.c:152
-++#: ../statistics.c:183
-++#, fuzzy, c-format
-++msgid "%u packet headers predicted"
-++msgstr "%d paquets re�us"
-++
-++#: ../statistics.c:184
-+ #, c-format
-+-msgid ""
-+-"%d packets dropped from out-of-order queue because of socket buffer overrun"
-++msgid "%u packets header predicted and directly queued to user"
-+ msgstr ""
-+-"%d paquets jet�s de la file hors service en raison de tampon de sockets plein"
-+ 
-+-#: ../statistics.c:154
-++#: ../statistics.c:186
-+ #, c-format
-+-msgid "%d ICMP packets dropped because they were out-of-window"
-+-msgstr "%d ICMP paquets jet�s car hors de la fen�tre"
-++msgid "Ran %u times out of system memory during packet sending"
-++msgstr ""
-+ 
-+-#: ../statistics.c:156
-++#: ../statistics.c:188
-++#, fuzzy, c-format
-++msgid "%u acknowledgments not containing data received"
-++msgstr "%d paquets re�us pour un port inconnu"
-++
-++#: ../statistics.c:189
-+ #, c-format
-+-msgid "%d ICMP packets dropped because socket was locked"
-+-msgstr "%d paquets ICMP jet�s car la socket a �t� v�rouill�e"
-++msgid "%u predicted acknowledgments"
-++msgstr ""
-++
-++#: ../statistics.c:190
-++#, c-format
-++msgid "%u times recovered from packet loss due to fast retransmit"
-++msgstr ""
-++
-++#: ../statistics.c:191
-++#, c-format
-++msgid "%u times recovered from packet loss due to SACK data"
-++msgstr ""
-++
-++#: ../statistics.c:192
-++#, fuzzy, c-format
-++msgid "%u bad SACKs received"
-++msgstr "%d mauvais segments re�us."
-++
-++#: ../statistics.c:193
-++#, c-format
-++msgid "Detected reordering %u times using FACK"
-++msgstr ""
-++
-++#: ../statistics.c:194
-++#, c-format
-++msgid "Detected reordering %u times using SACK"
-++msgstr ""
-++
-++#: ../statistics.c:195
-++#, c-format
-++msgid "Detected reordering %u times using time stamp"
-++msgstr ""
-++
-++#: ../statistics.c:196
-++#, c-format
-++msgid "Detected reordering %u times using reno fast retransmit"
-++msgstr ""
-++
-++#: ../statistics.c:197
-++#, c-format
-++msgid "%u congestion windows fully recovered"
-++msgstr ""
-++
-++#: ../statistics.c:198
-++#, c-format
-++msgid "%u congestion windows partially recovered using Hoe heuristic"
-++msgstr ""
-++
-++#: ../statistics.c:199
-++#, c-format
-++msgid "%u congestion window recovered using DSACK"
-++msgstr ""
-++
-++#: ../statistics.c:200
-++#, c-format
-++msgid "%u congestion windows recovered after partial ack"
-++msgstr ""
-++
-++#: ../statistics.c:201
-++#, fuzzy, c-format
-++msgid "%u retransmits lost"
-++msgstr "%d r�initialisations envoy�es"
-++
-++#: ../statistics.c:202
-++#, c-format
-++msgid "%u timeouts after reno fast retransmit"
-++msgstr ""
-++
-++#: ../statistics.c:203
-++#, c-format
-++msgid "%u timeouts after SACK recovery"
-++msgstr ""
-++
-++#: ../statistics.c:204
-++#, c-format
-++msgid "%u timeouts in loss state"
-++msgstr ""
-++
-++#: ../statistics.c:205
-++#, fuzzy, c-format
-++msgid "%u fast retransmits"
-++msgstr "%d segments retransmis"
-++
-++#: ../statistics.c:206
-++#, c-format
-++msgid "%u forward retransmits"
-++msgstr ""
-++
-++#: ../statistics.c:207
-++#, c-format
-++msgid "%u retransmits in slow start"
-++msgstr ""
-++
-++#: ../statistics.c:208
-++#, c-format
-++msgid "%u other TCP timeouts"
-++msgstr ""
-++
-++#: ../statistics.c:209
-++#, fuzzy, c-format
-++msgid "%u reno fast retransmits failed"
-++msgstr "%d segments retransmis"
-++
-++#: ../statistics.c:210
-++#, fuzzy, c-format
-++msgid "%u sack retransmits failed"
-++msgstr "%d paquets mal r�assembl�s"
-++
-++#: ../statistics.c:211
-++#, c-format
-++msgid "%u times receiver scheduled too late for direct processing"
-++msgstr ""
-++
-++#: ../statistics.c:212
-++#, fuzzy, c-format
-++msgid "%u packets collapsed in receive queue due to low socket buffer"
-++msgstr "%d paquets supprim�s de la file de r�ception en raison de tampon de sockets plein"
-++
-++#: ../statistics.c:213
-++#, c-format
-++msgid "%u DSACKs sent for old packets"
-++msgstr ""
-++
-++#: ../statistics.c:214
-++#, c-format
-++msgid "%u DSACKs sent for out of order packets"
-++msgstr ""
-++
-++#: ../statistics.c:215
-++#, fuzzy, c-format
-++msgid "%u DSACKs received"
-++msgstr "%d paquets re�us"
-++
-++#: ../statistics.c:216
-++#, fuzzy, c-format
-++msgid "%u DSACKs for out of order packets received"
-++msgstr "%d paquets totaux re�us"
-++
-++#: ../statistics.c:217
-++#, fuzzy, c-format
-++msgid "%u connections reset due to unexpected SYN"
-++msgstr "%d r�initialisations de connexions re�ues"
-++
-++#: ../statistics.c:218
-++#, fuzzy, c-format
-++msgid "%u connections reset due to unexpected data"
-++msgstr "%d r�initialisations de connexions re�ues"
-++
-++#: ../statistics.c:219
-++#, fuzzy, c-format
-++msgid "%u connections reset due to early user close"
-++msgstr "%d r�initialisations de connexions re�ues"
-++
-++#: ../statistics.c:220
-++#, c-format
-++msgid "%u connections aborted due to memory pressure"
-++msgstr ""
-++
-++#: ../statistics.c:221
-++#, fuzzy, c-format
-++msgid "%u connections aborted due to timeout"
-++msgstr "%d r�initialisations de connexions re�ues"
-+ 
-+ #: ../statistics.c:222
-++#, c-format
-++msgid "%u connections aborted after user close in linger timeout"
-++msgstr ""
-++
-++#: ../statistics.c:223
-++#, c-format
-++msgid "%u times unabled to send RST due to no memory"
-++msgstr ""
-++
-++#: ../statistics.c:224
-++#, c-format
-++msgid "TCP ran low on memory %u times"
-++msgstr ""
-++
-++#: ../statistics.c:225
-++#, c-format
-++msgid "%u TCP data loss events"
-++msgstr ""
-++
-++#: ../statistics.c:292
-+ msgid "enabled"
-+ msgstr "activ�e"
-+ 
-+-#: ../statistics.c:222
-++#: ../statistics.c:292
-+ msgid "disabled"
-+ msgstr "d�sactiv�e"
-+ 
-+-#: ../statistics.c:272
-+-#, c-format
-+-msgid "unknown title %s\n"
-+-msgstr "titre inconnu %s\n"
-+-
-+-#: ../statistics.c:298
-++#: ../statistics.c:375
-+ msgid "error parsing /proc/net/snmp"
-+ msgstr "erreur d'analyse de /proc/net/snmp"
-+ 
-+-#: ../statistics.c:311
-++#: ../statistics.c:388
-+ msgid "cannot open /proc/net/snmp"
-+ msgstr "ne peut ouvrir /proc/net/snmp"
-+ 
-+@@ -1824,89 +2064,95 @@ msgstr "Type de mat�riel `%s' pas suppor
-+ msgid "Cannot change line discipline to `%s'.\n"
-+ msgstr "Ne peut changer la discipline de ligne � `%s'.\n"
-+ 
-+-#: ../lib/af.c:145 ../lib/hw.c:148
-++#: ../lib/af.c:153 ../lib/hw.c:161
-+ msgid "UNSPEC"
-+ msgstr "UNSPEC"
-+ 
-+-#: ../lib/af.c:147
-++#: ../lib/af.c:155
-+ msgid "UNIX Domain"
-+ msgstr "Domaine UNIX"
-+ 
-+-#: ../lib/af.c:150
-++#: ../lib/af.c:158
-+ msgid "DARPA Internet"
-+ msgstr "DARPA Internet"
-+ 
-+-#: ../lib/af.c:153
-++#: ../lib/af.c:161
-+ msgid "IPv6"
-+ msgstr "IPv6"
-+ 
-+-#: ../lib/af.c:156 ../lib/hw.c:169
-++#: ../lib/af.c:164 ../lib/hw.c:182
-+ msgid "AMPR AX.25"
-+ msgstr "AMPR AX.25"
-+ 
-+-#: ../lib/af.c:159 ../lib/hw.c:175
-++#: ../lib/af.c:167 ../lib/hw.c:188
-+ msgid "AMPR NET/ROM"
-+ msgstr "AMPR NET/ROM"
-+ 
-+-#: ../lib/af.c:162
-++#: ../lib/af.c:170
-+ msgid "Novell IPX"
-+ msgstr ""
-+ 
-+-#: ../lib/af.c:165
-++#: ../lib/af.c:173
-+ msgid "Appletalk DDP"
-+ msgstr "Appletalk DDP"
-+ 
-+-#: ../lib/af.c:168 ../lib/hw.c:207
-++#: ../lib/af.c:176 ../lib/hw.c:223
-+ msgid "Econet"
-+ msgstr "Econet"
-+ 
-+-#: ../lib/af.c:171 ../lib/hw.c:172
-++#: ../lib/af.c:179
-++msgid "CCITT X.25"
-++msgstr ""
-++
-++#: ../lib/af.c:182 ../lib/hw.c:185
-+ msgid "AMPR ROSE"
-+ msgstr "AMPR ROSE"
-+ 
-+-#: ../lib/af.c:174 ../lib/hw.c:160
-++#: ../lib/af.c:185 ../lib/hw.c:173
-+ msgid "Ash"
-+ msgstr "Ash"
-+ 
-+-#: ../lib/af.c:232
-++#: ../lib/af.c:243
-++#, c-format
-+ msgid "Please don't supply more than one address family.\n"
-+ msgstr "Ne fournissez pas plus d'une famille d'adresses SVP.\n"
-+ 
-+-#: ../lib/af.c:293
-++#: ../lib/af.c:304
-++#, c-format
-+ msgid "Too much address family arguments.\n"
-+ msgstr "Trop d'arguments de familles d'adresses.\n"
-+ 
-+-#: ../lib/af.c:304
-++#: ../lib/af.c:315
-+ #, c-format
-+ msgid "Unknown address family `%s'.\n"
-+ msgstr "Famille d'adresses inconnue `%s'.\n"
-+ 
-+-#: ../lib/arcnet.c:53 ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52
-+-#: ../lib/fddi.c:67 ../lib/hippi.c:68 ../lib/inet.c:244 ../lib/inet.c:259
-+-#: ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 ../lib/rose.c:71
-+-#: ../lib/rose.c:126 ../lib/unix.c:56 ../lib/unix.c:76
-+-msgid "[NONE SET]"
-+-msgstr "[INDEFINI]"
-+-
-+-#: ../lib/arcnet.c:81 ../lib/arcnet.c:96
-++#: ../lib/arcnet.c:70 ../lib/arcnet.c:85
-+ #, c-format
-+ msgid "in_arcnet(%s): invalid arcnet address!\n"
-+ msgstr "in_arcnet(%s): adresse arcnet invalide !\n"
-+ 
-+-#: ../lib/arcnet.c:108
-++#: ../lib/arcnet.c:97
-+ #, c-format
-+ msgid "in_arcnet(%s): trailing : ignored!\n"
-+ msgstr "in_arcnet(%s): restant : ignor� !\n"
-+ 
-+-#: ../lib/arcnet.c:120
-++#: ../lib/arcnet.c:109
-+ #, c-format
-+ msgid "in_arcnet(%s): trailing junk!\n"
-+ msgstr "in_arcnet(%s): le restant � la poubelle !\n"
-+ 
-+ #: ../lib/ash.c:81
-++#, c-format
-+ msgid "Malformed Ash address"
-+ msgstr "Adresse Ash malform�e"
-+ 
-++#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244
-++#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78
-++#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76
-++msgid "[NONE SET]"
-++msgstr "[INDEFINI]"
-++
-+ #: ../lib/ax25.c:97 ../lib/netrom.c:100
-+ msgid "Invalid callsign"
-+ msgstr "Signal d'appel invalide"
-+@@ -1916,22 +2162,21 @@ msgid "Callsign too long"
-+ msgstr "Signal d'appel trop long"
-+ 
-+ #: ../lib/ax25_gr.c:47
-++#, c-format
-+ msgid "AX.25 not configured in this system.\n"
-+ msgstr "AX.25 pas configur� sur ce syst�me.\n"
-+ 
-+ #: ../lib/ax25_gr.c:50
-++#, c-format
-+ msgid "Kernel AX.25 routing table\n"
-+ msgstr "Table de routage AX.25 du noyau\n"
-+ 
-+ #. xxx
-+ #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55
-++#, c-format
-+ msgid "Destination  Iface    Use\n"
-+ msgstr "Destination  Iface    Utilisation\n"
-+ 
-+-#: ../lib/ddp_gr.c:21
-+-msgid "Routing table for `ddp' not yet supported.\n"
-+-msgstr "Table de routage pour `ddp' pas encore support�.\n"
-+-
-+ #: ../lib/ether.c:74 ../lib/ether.c:91
-+ #, c-format
-+ msgid "in_ether(%s): invalid ether address!\n"
-+@@ -1947,153 +2192,171 @@ msgstr "in_ether(%s): restant ignor� !\n
-+ msgid "in_ether(%s): trailing junk!\n"
-+ msgstr "in_ether(%s): le restant � la poubelle !\n"
-+ 
-+-#: ../lib/fddi.c:95 ../lib/fddi.c:110
-++#: ../lib/fddi.c:84 ../lib/fddi.c:99
-+ #, c-format
-+ msgid "in_fddi(%s): invalid fddi address!\n"
-+ msgstr "in_fddi(%s): adresse fddi invalide!\n"
-+ 
-+-#: ../lib/fddi.c:122
-++#: ../lib/fddi.c:111
-+ #, c-format
-+ msgid "in_fddi(%s): trailing : ignored!\n"
-+ msgstr "in_fddi(%s): restant ignor� !\n"
-+ 
-+-#: ../lib/fddi.c:134
-++#: ../lib/fddi.c:123
-+ #, c-format
-+ msgid "in_fddi(%s): trailing junk!\n"
-+ msgstr "in_fddi(%s): le restant � la poubelle !\n"
-+ 
-+-#: ../lib/getroute.c:97 ../lib/setroute.c:76
-++#: ../lib/getroute.c:101 ../lib/setroute.c:80
-+ #, c-format
-+ msgid "Address family `%s' not supported.\n"
-+ msgstr "Famille d'adresses `%s' non support�e.\n"
-+ 
-+-#: ../lib/getroute.c:103 ../lib/setroute.c:80
-++#: ../lib/getroute.c:107 ../lib/setroute.c:84
-+ #, c-format
-+ msgid "No routing for address family `%s'.\n"
-+ msgstr "Pas de routage pour la famille d'adresses `%s'.\n"
-+ 
-+-#: ../lib/hippi.c:96 ../lib/hippi.c:111
-++#: ../lib/hippi.c:84 ../lib/hippi.c:99
-+ #, c-format
-+ msgid "in_hippi(%s): invalid hippi address!\n"
-+ msgstr "in_hippi(%s): adresse hippi invalide!\n"
-+ 
-+-#: ../lib/hippi.c:123
-++#: ../lib/hippi.c:111
-+ #, c-format
-+ msgid "in_hippi(%s): trailing : ignored!\n"
-+ msgstr "in_hippi(%s): restant ignor� !\n"
-+ 
-+-#: ../lib/hippi.c:134
-++#: ../lib/hippi.c:122
-+ #, c-format
-+ msgid "in_hippi(%s): trailing junk!\n"
-+ msgstr "in_hippi(%s): le restant � la poubelle !\n"
-+ 
-+-#: ../lib/hw.c:147
-++#: ../lib/hw.c:160
-+ msgid "Local Loopback"
-+ msgstr "Boucle locale"
-+ 
-+-#: ../lib/hw.c:150
-++#: ../lib/hw.c:163
-+ msgid "Serial Line IP"
-+ msgstr "IP ligne s�rie"
-+ 
-+-#: ../lib/hw.c:151
-++#: ../lib/hw.c:164
-+ msgid "VJ Serial Line IP"
-+ msgstr "IP ligne s�rie - VJ "
-+ 
-+-#: ../lib/hw.c:152
-++#: ../lib/hw.c:165
-+ msgid "6-bit Serial Line IP"
-+ msgstr "IP ligne s�rie - 6 bits"
-+ 
-+-#: ../lib/hw.c:153
-++#: ../lib/hw.c:166
-+ msgid "VJ 6-bit Serial Line IP"
-+ msgstr "IP ligne s�rie - 6 bits VJ"
-+ 
-+-#: ../lib/hw.c:154
-++#: ../lib/hw.c:167
-+ msgid "Adaptive Serial Line IP"
-+ msgstr "IP ligne s�rie adaptative"
-+ 
-+-#: ../lib/hw.c:157
-++#: ../lib/hw.c:170
-+ msgid "Ethernet"
-+ msgstr "Ethernet"
-+ 
-+-#: ../lib/hw.c:163
-++#: ../lib/hw.c:176
-+ msgid "Fiber Distributed Data Interface"
-+ msgstr "Fiber Distributed Data Interface"
-+ 
-+-#: ../lib/hw.c:166
-++#: ../lib/hw.c:179
-+ msgid "HIPPI"
-+ msgstr "HIPPI"
-+ 
-+-#: ../lib/hw.c:178
-++#: ../lib/hw.c:191
-++msgid "generic X.25"
-++msgstr ""
-++
-++#: ../lib/hw.c:194
-+ msgid "IPIP Tunnel"
-+ msgstr "IPIP Tunnel"
-+ 
-+-#: ../lib/hw.c:181
-++#: ../lib/hw.c:197
-+ msgid "Point-to-Point Protocol"
-+ msgstr "Protocole Point-�-Point"
-+ 
-+-#: ../lib/hw.c:184
-++#: ../lib/hw.c:200
-+ msgid "(Cisco)-HDLC"
-+ msgstr "(Cisco)-HDLC"
-+ 
-+-#: ../lib/hw.c:185
-++#: ../lib/hw.c:201
-+ msgid "LAPB"
-+ msgstr "LAPB"
-+ 
-+-#: ../lib/hw.c:188
-++#: ../lib/hw.c:204
-+ msgid "ARCnet"
-+ msgstr "ARCnet"
-+ 
-+-#: ../lib/hw.c:191
-++#: ../lib/hw.c:207
-+ msgid "Frame Relay DLCI"
-+ msgstr "Frame Relay DLCI"
-+ 
-+-#: ../lib/hw.c:192
-++#: ../lib/hw.c:208
-+ msgid "Frame Relay Access Device"
-+ msgstr "P�riph�riue d'acc�s Frame Relay"
-+ 
-+-#: ../lib/hw.c:195
-++#: ../lib/hw.c:211
-+ msgid "IPv6-in-IPv4"
-+ msgstr "IPv6-dans-IPv4"
-+ 
-+-#: ../lib/hw.c:198
-++#: ../lib/hw.c:214
-+ #, fuzzy
-+ msgid "IrLAP"
-+ msgstr "LAPB"
-+ 
-+-#: ../lib/hw.c:201
-++#: ../lib/hw.c:217
-+ msgid "16/4 Mbps Token Ring"
-+ msgstr ""
-+ 
-+-#: ../lib/hw.c:203
-++#: ../lib/hw.c:219
-+ msgid "16/4 Mbps Token Ring (New)"
-+ msgstr ""
-+ 
-++#: ../lib/hw.c:226
-++msgid "Generic EUI-64"
-++msgstr ""
-++
-+ #: ../lib/inet.c:153 ../lib/inet6.c:79
-+ #, c-format
-+ msgid "rresolve: unsupport address family %d !\n"
-+ msgstr "rresolve: famille d'adresses non suport�e %d !\n"
-+ 
-+-#: ../lib/inet6_gr.c:79
-++#: ../lib/inet6.c:131
-++#, fuzzy
-++msgid "[UNKNOWN]"
-++msgstr "INCONNU"
-++
-++#: ../lib/inet6_gr.c:71
-++#, c-format
-+ msgid "INET6 (IPv6) not configured in this system.\n"
-+ msgstr "INET6 (IPv6) pas configur� sur ce syst�me.\n"
-+ 
-+-#: ../lib/inet6_gr.c:82
-++#: ../lib/inet6_gr.c:74
-++#, c-format
-+ msgid "Kernel IPv6 routing table\n"
-+ msgstr "Table de routage IPv6 du noyau\n"
-+ 
-+-#: ../lib/inet6_gr.c:84
-++#: ../lib/inet6_gr.c:76
-++#, c-format
-+ msgid ""
-+-"Destination                                 Next Hop                         "
-+-"       Flags Metric Ref    Use Iface\n"
-++"Destination                                 Next "
-++"Hop                                Flags Metric Ref    Use Iface\n"
-+ msgstr ""
-+-"Destination                                 Prochain Hop                     "
-+-"       Indic Metric Ref    Utilis. Iface\n"
-++"Destination                                 Prochain "
-++"Hop                            Indic Metric Ref    Utilis. Iface\n"
-+ 
-+-#: ../lib/inet6_gr.c:158
-++#: ../lib/inet6_gr.c:150
-++#, c-format
-+ msgid "Kernel IPv6 Neighbour Cache\n"
-+ msgstr "Cache voisin IPv6 du noyau\n"
-+ 
-+-#: ../lib/inet6_gr.c:161
-++#: ../lib/inet6_gr.c:153
-++#, c-format
-+ msgid ""
-+ "Neighbour                                   HW Address        Iface    Flags "
-+ "Ref State\n"
-+@@ -2101,39 +2364,45 @@ msgstr ""
-+ "Voisin                                      Adresse MAT       Iface    Indic "
-+ "Ref Etat\n"
-+ 
-+-#: ../lib/inet6_gr.c:165
-++#: ../lib/inet6_gr.c:157
-++#, c-format
-+ msgid ""
-+ "Neighbour                                   HW Address        Iface    Flags "
-+ "Ref State            Stale(sec) Delete(sec)\n"
-+-msgstr ""
-+-"Voisin                                      Adresse MAT       Iface    Indic "
-+-"Ref Etat             Bloqu�(sec) D�tuit(sec)\n"
-++msgstr "Voisin                                      Adresse MAT       Iface    Indic Ref Etat             Bloqu�(sec) D�tuit(sec)\n"
-+ 
-+ #: ../lib/inet6_sr.c:46
-++#, c-format
-+ msgid "Usage: inet6_route [-vF] del Target\n"
-+ msgstr "Syntaxe: inet6_route [-vF] del Cible\n"
-+ 
-+ #: ../lib/inet6_sr.c:47
-++#, c-format
-+ msgid "       inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n"
-+ msgstr "       inet6_route [-vF] add Cible [gw Gw] [metric M] [[dev] If]\n"
-+ 
-+ #: ../lib/inet6_sr.c:48
-++#, c-format
-+ msgid "       inet6_route [-FC] flush      NOT supported\n"
-+ msgstr "       inet6_route [-FC] flush      PAS support�\n"
-+ 
-+-#: ../lib/inet6_sr.c:182
-++#: ../lib/inet6_sr.c:188
-++#, c-format
-+ msgid "Flushing `inet6' routing table not supported\n"
-+ msgstr "Flush de table de routage `inet6' pas support�\n"
-+ 
-+ #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220
-++#, c-format
-+ msgid "INET (IPv4) not configured in this system.\n"
-+ msgstr "INET (IPv4) pas configur� sur ce syst�me.\n"
-+ 
-+ #: ../lib/inet_gr.c:53
-++#, c-format
-+ msgid "Kernel IP routing table\n"
-+ msgstr "Table de routage IP du noyau\n"
-+ 
-+ #: ../lib/inet_gr.c:56
-++#, c-format
-+ msgid ""
-+ "Destination     Gateway         Genmask         Flags Metric Ref    Use "
-+ "Iface\n"
-+@@ -2142,26 +2411,26 @@ msgstr ""
-+ "Iface\n"
-+ 
-+ #: ../lib/inet_gr.c:59
-++#, c-format
-+ msgid ""
-+ "Destination     Gateway         Genmask         Flags   MSS Window  irtt "
-+ "Iface\n"
-+-msgstr ""
-+-"Destination     Passerelle      Genmask         Indic   MSS Fen�tre irtt "
-+-"Iface\n"
-++msgstr "Destination     Passerelle      Genmask         Indic   MSS Fen�tre irtt Iface\n"
-+ 
-+ #: ../lib/inet_gr.c:62
-++#, c-format
-+ msgid ""
-+ "Destination     Gateway         Genmask         Flags Metric Ref    Use "
-+ "Iface    MSS   Window irtt\n"
-+-msgstr ""
-+-"Destination     Passerelle      Genmask         Indic Metric Ref    Use "
-+-"Iface    MSS  Fen�tre irtt\n"
-++msgstr "Destination     Passerelle      Genmask         Indic Metric Ref    Use Iface    MSS  Fen�tre irtt\n"
-+ 
-+ #: ../lib/inet_gr.c:237
-++#, c-format
-+ msgid "Kernel IP routing cache\n"
-+ msgstr "cache de routage IP du noyau\n"
-+ 
-+ #: ../lib/inet_gr.c:258
-++#, c-format
-+ msgid ""
-+ "Source          Destination     Gateway         Flags Metric Ref    Use "
-+ "Iface\n"
-+@@ -2170,30 +2439,28 @@ msgstr ""
-+ "Iface\n"
-+ 
-+ #: ../lib/inet_gr.c:261
-++#, c-format
-+ msgid ""
-+ "Source          Destination     Gateway         Flags   MSS Window  irtt "
-+ "Iface\n"
-+-msgstr ""
-+-"Source          Destination     Passerelle      Indic   MSS Fen�tre irtt "
-+-"Iface\n"
-++msgstr "Source          Destination     Passerelle      Indic   MSS Fen�tre irtt Iface\n"
-+ 
-+ #: ../lib/inet_gr.c:266
-++#, c-format
-+ msgid ""
-+ "Source          Destination     Gateway         Flags Metric Ref    Use "
-+ "Iface    MSS   Window irtt  HH  Arp\n"
-+-msgstr ""
-+-"Source          Destination     Passerelle      Indic Metric Ref    Use "
-+-"Iface    MSS  Fen�tre irtt  HH  Arp\n"
-++msgstr "Source          Destination     Passerelle      Indic Metric Ref    Use Iface    MSS  Fen�tre irtt  HH  Arp\n"
-+ 
-+ #: ../lib/inet_gr.c:290
-++#, c-format
-+ msgid ""
-+ "Source          Destination     Gateway         Flags Metric Ref    Use "
-+ "Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
-+-msgstr ""
-+-"Source          Destination     Passerelle      Flags Metric Ref    Use "
-+-"Iface    MSS  Fen�tre irtt  TOS HHRef HHUptod     SpecDst\n"
-++msgstr "Source          Destination     Passerelle      Flags Metric Ref    Use Iface    MSS  Fen�tre irtt  TOS HHRef HHUptod     SpecDst\n"
-+ 
-+-#: ../lib/inet_sr.c:50
-++#: ../lib/inet_sr.c:51
-++#, c-format
-+ msgid ""
-+ "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] "
-+ "[[dev] If]\n"
-+@@ -2201,29 +2468,34 @@ msgstr ""
-+ "Syntaxe: inet_route [-vF] del {-host|-net} Cible[/prefix] [gw Gw] [metric M] "
-+ "[[dev] If]\n"
-+ 
-+-#: ../lib/inet_sr.c:51
-++#: ../lib/inet_sr.c:52
-++#, c-format
-+ msgid ""
-+ "       inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n"
-+ msgstr ""
-+ "       inet_route [-vF] add {-host|-net} Cible[/prefix] [gw Gw] [metric M]\n"
-+ 
-+-#: ../lib/inet_sr.c:52
-++#: ../lib/inet_sr.c:53
-++#, c-format
-+ msgid ""
-+ "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
-+ msgstr ""
-+ "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
-+ 
-+-#: ../lib/inet_sr.c:53
-++#: ../lib/inet_sr.c:54
-++#, c-format
-+ msgid "                              [mod] [dyn] [reinstate] [[dev] If]\n"
-+ msgstr "                              [mod] [dyn] [reinstate] [[dev] If]\n"
-+ 
-+-#: ../lib/inet_sr.c:54
-++#: ../lib/inet_sr.c:55
-++#, c-format
-+ msgid ""
-+ "       inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n"
-+ msgstr ""
-+ "       inet_route [-vF] add {-host|-net} Cible[/prefix] [metric M] reject\n"
-+ 
-+-#: ../lib/inet_sr.c:55
-++#: ../lib/inet_sr.c:56
-++#, c-format
-+ msgid "       inet_route [-FC] flush      NOT supported\n"
-+ msgstr "       inet_route [-FC] flush      PAS support�\n"
-+ 
-+@@ -2233,15 +2505,17 @@ msgid "route: %s: cannot use a NETWORK a
-+ msgstr "route: %s: ne peut utiliser un RESEAU comme passerelle!\n"
-+ 
-+ #: ../lib/inet_sr.c:174
-+-#, fuzzy
-++#, fuzzy, c-format
-+ msgid "route: Invalid MSS/MTU.\n"
-+ msgstr "route: MSS invalide.\n"
-+ 
-+ #: ../lib/inet_sr.c:187
-++#, c-format
-+ msgid "route: Invalid window.\n"
-+ msgstr "route: fen�tre invalide.\n"
-+ 
-+ #: ../lib/inet_sr.c:203
-++#, c-format
-+ msgid "route: Invalid initial rtt.\n"
-+ msgstr "route: rtt initial invalide.\n"
-+ 
-+@@ -2256,75 +2530,92 @@ msgid "route: bogus netmask %s\n"
-+ msgstr "route: netmask bogu� %s\n"
-+ 
-+ #: ../lib/inet_sr.c:270
-++#, c-format
-+ msgid "route: netmask doesn't match route address\n"
-+ msgstr "route: netmask ne correspond pas � l'adresse de route\n"
-+ 
-+ #: ../lib/inet_sr.c:306
-++#, c-format
-+ msgid "Flushing `inet' routing table not supported\n"
-+ msgstr "Flush de table de routage `inet' pas support�\n"
-+ 
-+ #: ../lib/inet_sr.c:310
-++#, c-format
-+ msgid "Modifying `inet' routing cache not supported\n"
-+ msgstr "Modification de cache de routage `inet' pas support�\n"
-+ 
-+ #: ../lib/ipx_gr.c:52
-++#, c-format
-+ msgid "IPX not configured in this system.\n"
-+ msgstr "IPX pas configur� sur ce syst�me.\n"
-+ 
-+ #: ../lib/ipx_gr.c:56
-++#, c-format
-+ msgid "Kernel IPX routing table\n"
-+ msgstr "Table de routage IPX du noyau\n"
-+ 
-+ #. xxx
-+ #: ../lib/ipx_gr.c:57
-++#, c-format
-+ msgid "Destination               Router Net                Router Node\n"
-+ msgstr "Destination               R�seau Routeur            Noeud Routeur\n"
-+ 
-+ #: ../lib/ipx_sr.c:33
-++#, c-format
-+ msgid "IPX: this needs to be written\n"
-+ msgstr "IPX: ceci doit �tre �crit\n"
-+ 
-+-#: ../lib/masq_info.c:197
-++#: ../lib/masq_info.c:198
-++#, c-format
-+ msgid "IP masquerading entries\n"
-+ msgstr "Entr�es IP Masquerade\n"
-+ 
-+-#: ../lib/masq_info.c:200
-++#: ../lib/masq_info.c:201
-++#, c-format
-+ msgid "prot   expire source               destination          ports\n"
-+ msgstr "prot   expire source               destination          ports\n"
-+ 
-+-#: ../lib/masq_info.c:203
-++#: ../lib/masq_info.c:204
-++#, c-format
-+ msgid ""
-+-"prot   expire    initseq delta prevd source               destination        "
-+-"  ports\n"
-++"prot   expire    initseq delta prevd source               "
-++"destination          ports\n"
-+ msgstr ""
-+-"prot   expire    initseq delta precd source               destination        "
-+-"  ports\n"
-++"prot   expire    initseq delta precd source               "
-++"destination          ports\n"
-+ 
-+ #: ../lib/netrom_gr.c:48
-++#, c-format
-+ msgid "NET/ROM not configured in this system.\n"
-+ msgstr "NET/ROM pas configur� sur ce syst�me.\n"
-+ 
-+ #: ../lib/netrom_gr.c:51
-++#, c-format
-+ msgid "Kernel NET/ROM routing table\n"
-+ msgstr "Table de routage NET/ROM du noyau\n"
-+ 
-+ #: ../lib/netrom_gr.c:52
-++#, c-format
-+ msgid "Destination  Mnemonic  Quality  Neighbour  Iface\n"
-+ msgstr "Destination  Mnemoniq  Qualit�  Voisin     Iface\n"
-+ 
-+ #: ../lib/netrom_sr.c:34
-++#, c-format
-+ msgid "netrom usage\n"
-+ msgstr "utilisation netrom\n"
-+ 
-+ #: ../lib/netrom_sr.c:44
-++#, c-format
-+ msgid "NET/ROM: this needs to be written\n"
-+ msgstr "NET/ROM: ceci doit �tre �crit\n"
-+ 
-+ #: ../lib/ppp.c:44
-++#, c-format
-+ msgid "You cannot start PPP with this program.\n"
-+ msgstr "Vous ne pouvez d�marrer PPP avec ce programme.\n"
-+ 
-+ #: ../lib/ppp_ac.c:38
-++#, c-format
-+ msgid "Sorry, use pppd!\n"
-+ msgstr "D�sol�, utilisez pppd !\n"
-+ 
-+@@ -2333,49 +2624,314 @@ msgid "Node address must be ten digits"
-+ msgstr "L'adresse de noeud doit avoir 10 chiffres"
-+ 
-+ #: ../lib/rose_gr.c:51
-++#, c-format
-+ msgid "ROSE not configured in this system.\n"
-+ msgstr "ROSE pas configur� sur ce syst�me.\n"
-+ 
-+ #: ../lib/rose_gr.c:54
-++#, c-format
-+ msgid "Kernel ROSE routing table\n"
-+ msgstr "Table de routage ROSE du noyau\n"
-+ 
-+-#: ../lib/tr.c:70 ../lib/tr.c:85
-++#: ../lib/tr.c:86 ../lib/tr.c:101
-+ #, c-format
-+ msgid "in_tr(%s): invalid token ring address!\n"
-+ msgstr "in_tr(%s): adresse token-ring invalide !\n"
-+ 
-+-#: ../lib/tr.c:97
-++#: ../lib/tr.c:113
-+ #, c-format
-+ msgid "in_tr(%s): trailing : ignored!\n"
-+ msgstr "in_tr(%s): restant : ignor� !\n"
-+ 
-+-#: ../lib/tr.c:109
-++#: ../lib/tr.c:125
-+ #, c-format
-+ msgid "in_tr(%s): trailing junk!\n"
-+ msgstr "in_tr(%s): restant � la poubelle !\n"
-+ 
-+-#: ../lib/interface.c:124
-++#: ../lib/interface.c:176
-+ #, c-format
-+ msgid "warning: no inet socket available: %s\n"
-+ msgstr "attention: pas de socket inet disponible: %s\n"
-+ 
-+-#: ../lib/interface.c:270
-++#: ../lib/interface.c:325
-+ #, c-format
-+ msgid "Warning: cannot open %s (%s). Limited output.\n"
-+ msgstr ""
-+ 
-+ #. Give better error message for this case.
-+-#: ../lib/interface.c:504
-++#: ../lib/interface.c:571
-+ msgid "Device not found"
-+ msgstr "P�riph�rique non trouv�"
-+ 
-+-#: ../lib/interface.c:508
-++#: ../lib/interface.c:575
-+ #, c-format
-+ msgid "%s: error fetching interface information: %s\n"
-+ msgstr "%s: erreur lors de la recherche d'infos sur l'interface: %s\n"
-+ 
-+-#: ../lib/sockets.c:59
-++#: ../lib/interface.c:608
-++msgid "     - no statistics available -"
-++msgstr ""
-++
-++#: ../lib/interface.c:612
-++#, c-format
-++msgid "[NO FLAGS]"
-++msgstr "[PAS INDICATEURS]"
-++
-++#: ../lib/interface.c:688
-++#, c-format
-++msgid "%-9.9s Link encap:%s  "
-++msgstr "%-9.9s Lien encap:%s  "
-++
-++#: ../lib/interface.c:693
-++#, c-format
-++msgid "HWaddr %s  "
-++msgstr "HWaddr %s  "
-++
-++#: ../lib/interface.c:696
-++#, c-format
-++msgid "Media:%s"
-++msgstr "Media:%s"
-++
-++#: ../lib/interface.c:698
-++#, c-format
-++msgid "(auto)"
-++msgstr "(auto)"
-++
-++#: ../lib/interface.c:705
-++#, c-format
-++msgid "          %s addr:%s "
-++msgstr "          %s adr:%s "
-++
-++#: ../lib/interface.c:708
-++#, c-format
-++msgid " P-t-P:%s "
-++msgstr " P-t-P:%s "
-++
-++#: ../lib/interface.c:711
-++#, c-format
-++msgid " Bcast:%s "
-++msgstr " Bcast:%s "
-++
-++#: ../lib/interface.c:713
-++#, c-format
-++msgid " Mask:%s\n"
-++msgstr " Masque:%s\n"
-++
-++#: ../lib/interface.c:730
-++#, c-format
-++msgid "          inet6 addr: %s/%d"
-++msgstr "          adr inet6: %s/%d"
-++
-++#: ../lib/interface.c:732
-++#, c-format
-++msgid " Scope:"
-++msgstr " Scope:"
-++
-++#: ../lib/interface.c:735
-++#, c-format
-++msgid "Global"
-++msgstr "Global"
-++
-++#: ../lib/interface.c:738
-++#, c-format
-++msgid "Link"
-++msgstr "Lien"
-++
-++#: ../lib/interface.c:741
-++#, c-format
-++msgid "Site"
-++msgstr "Site"
-++
-++#: ../lib/interface.c:744
-++#, c-format
-++msgid "Compat"
-++msgstr "Compat"
-++
-++#: ../lib/interface.c:747
-++#, c-format
-++msgid "Host"
-++msgstr "H�te"
-++
-++#: ../lib/interface.c:750
-++#, c-format
-++msgid "Unknown"
-++msgstr "Inconnu"
-++
-++#: ../lib/interface.c:765
-++#, c-format
-++msgid "          IPX/Ethernet II addr:%s\n"
-++msgstr "          adr IPX/Ethernet II:%s\n"
-++
-++#: ../lib/interface.c:768
-++#, c-format
-++msgid "          IPX/Ethernet SNAP addr:%s\n"
-++msgstr "          adr IPX/Ethernet SNAP:%s\n"
-++
-++#: ../lib/interface.c:771
-++#, c-format
-++msgid "          IPX/Ethernet 802.2 addr:%s\n"
-++msgstr "          adr IPX/Ethernet 802.2:%s\n"
-++
-++#: ../lib/interface.c:774
-++#, c-format
-++msgid "          IPX/Ethernet 802.3 addr:%s\n"
-++msgstr "          adr IPX/Ethernet 802.3:%s\n"
-++
-++#: ../lib/interface.c:784
-++#, c-format
-++msgid "          EtherTalk Phase 2 addr:%s\n"
-++msgstr "          adr EtherTalk Phase 2:%s\n"
-++
-++#: ../lib/interface.c:793
-++#, c-format
-++msgid "          econet addr:%s\n"
-++msgstr "          adr econet:%s\n"
-++
-++#: ../lib/interface.c:800
-++#, c-format
-++msgid "[NO FLAGS] "
-++msgstr "[PAS INDICATEURS] "
-++
-++#: ../lib/interface.c:802
-++#, c-format
-++msgid "UP "
-++msgstr "UP "
-++
-++#: ../lib/interface.c:804
-++#, c-format
-++msgid "BROADCAST "
-++msgstr "BROADCAST "
-++
-++#: ../lib/interface.c:806
-++#, c-format
-++msgid "DEBUG "
-++msgstr "DEBUG "
-++
-++#: ../lib/interface.c:808
-++#, c-format
-++msgid "LOOPBACK "
-++msgstr "LOOPBACK "
-++
-++#: ../lib/interface.c:810
-++#, c-format
-++msgid "POINTOPOINT "
-++msgstr "POINTOPOINT "
-++
-++#: ../lib/interface.c:812
-++#, c-format
-++msgid "NOTRAILERS "
-++msgstr "NOTRAILERS "
-++
-++#: ../lib/interface.c:814
-++#, c-format
-++msgid "RUNNING "
-++msgstr "RUNNING "
-++
-++#: ../lib/interface.c:816
-++#, c-format
-++msgid "NOARP "
-++msgstr "NOARP "
-++
-++#: ../lib/interface.c:818
-++#, c-format
-++msgid "PROMISC "
-++msgstr "PROMISC "
-++
-++#: ../lib/interface.c:820
-++#, c-format
-++msgid "ALLMULTI "
-++msgstr "ALLMULTI "
-++
-++#: ../lib/interface.c:822
-++#, c-format
-++msgid "SLAVE "
-++msgstr "SLAVE "
-++
-++#: ../lib/interface.c:824
-++#, c-format
-++msgid "MASTER "
-++msgstr "MASTER "
-++
-++#: ../lib/interface.c:826
-++#, c-format
-++msgid "MULTICAST "
-++msgstr "MULTICAST "
-++
-++#: ../lib/interface.c:829
-++#, c-format
-++msgid "DYNAMIC "
-++msgstr "DYNAMIC "
-++
-++#. DONT FORGET TO ADD THE FLAGS IN ife_print_short
-++#: ../lib/interface.c:832
-++#, c-format
-++msgid " MTU:%d  Metric:%d"
-++msgstr " MTU:%d  Metric:%d"
-++
-++#: ../lib/interface.c:836
-++#, c-format
-++msgid "  Outfill:%d  Keepalive:%d"
-++msgstr "  Outfill:%d  Keepalive:%d"
-++
-++#: ../lib/interface.c:850
-++#, fuzzy, c-format
-++msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
-++msgstr "Paquets Re�us:%lu erreurs:%lu jet�s:%lu d�bordements:%lu trames:%lu\n"
-++
-++#: ../lib/interface.c:855
-++#, c-format
-++msgid "             compressed:%lu\n"
-++msgstr "             compress�s:%lu\n"
-++
-++#: ../lib/interface.c:895
-++#, fuzzy, c-format
-++msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
-++msgstr "Paquets transmis:%lu erreurs:%lu jet�s:%lu d�bordements:%lu carrier:%lu\n"
-++
-++#: ../lib/interface.c:899
-++#, c-format
-++msgid "          collisions:%lu "
-++msgstr "          collisions:%lu "
-++
-++#: ../lib/interface.c:901
-++#, c-format
-++msgid "compressed:%lu "
-++msgstr "compress�s:%lu "
-++
-++#: ../lib/interface.c:903
-++#, c-format
-++msgid "txqueuelen:%d "
-++msgstr "lg file transmission:%d "
-++
-++#: ../lib/interface.c:905
-++#, c-format
-++msgid "RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"
-++msgstr ""
-++
-++#: ../lib/interface.c:916
-++#, c-format
-++msgid "Interrupt:%d "
-++msgstr "Interruption:%d "
-++
-++#. Only print devices using it for
-++#. I/O maps
-++#: ../lib/interface.c:919
-++#, c-format
-++msgid "Base address:0x%x "
-++msgstr "Adresse de base:0x%x "
-++
-++#: ../lib/interface.c:921
-++#, c-format
-++msgid "Memory:%lx-%lx "
-++msgstr "M�moire:%lx-%lx "
-++
-++#: ../lib/interface.c:924
-++#, c-format
-++msgid "DMA chan:%x "
-++msgstr "Canal DMA:%x "
-++
-++#: ../lib/sockets.c:63
-++#, c-format
-+ msgid "No usable address families found.\n"
-+ msgstr "Pas de famille d'adresses utilisable trouv�e.\n"
-+ 
-+@@ -2399,29 +2955,32 @@ msgstr "ip: %s est une adresse IPv4 inva
-+ msgid "ip: argument is wrong: %s\n"
-+ msgstr "ip: argument incorrect: %s\n"
-+ 
-+-#: ../ipmaddr.c:56
-++#: ../ipmaddr.c:61
-++#, c-format
-+ msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n"
-+ msgstr "Syntaxe: ipmaddr [ add | del ] MULTIADR dev CHAINE\n"
-+ 
-+-#: ../ipmaddr.c:57
-++#: ../ipmaddr.c:62
-++#, c-format
-+ msgid "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
-+ msgstr "       ipmaddr show [ dev CHAINE ] [ ipv4 | ipv6 | link | all ]\n"
-+ 
-+-#: ../ipmaddr.c:58
-++#: ../ipmaddr.c:63
-++#, c-format
-+ msgid "       ipmaddr -V | -version\n"
-+ msgstr ""
-+ 
-+-#: ../ipmaddr.c:258
-++#: ../ipmaddr.c:263
-+ #, c-format
-+ msgid "family %d "
-+ msgstr ""
-+ 
-+-#: ../ipmaddr.c:267
-++#: ../ipmaddr.c:272
-+ #, c-format
-+ msgid " users %d"
-+ msgstr ""
-+ 
-+-#: ../ipmaddr.c:353
-++#: ../ipmaddr.c:358
-+ msgid "Cannot create socket"
-+ msgstr "Ne peut cr�er une socket"
-+ 
-+@@ -2436,6 +2995,7 @@ msgid "slattach: tty_lock: (%s): %s\n"
-+ msgstr ""
-+ 
-+ #: ../slattach.c:192
-++#, fuzzy, c-format
-+ msgid "slattach: cannot write PID file\n"
-+ msgstr "slattach: tty_lock: (%s): %s\n"
-+ 
-+@@ -2454,59 +3014,88 @@ msgstr "slattach: tty_hangup(DROP): %s\n
-+ msgid "slattach: tty_hangup(RAISE): %s\n"
-+ msgstr "slattach: tty_hangup(RAISE): %s\n"
-+ 
-+-#: ../slattach.c:486
-++#: ../slattach.c:468
-++#, fuzzy, c-format
-++msgid "slattach: tty name too long\n"
-++msgstr "%s: nom trop long\n"
-++
-++#: ../slattach.c:498
-++#, c-format
-+ msgid "slattach: tty_open: cannot get current state!\n"
-+ msgstr "slattach: tty_open: ne peut obtenir l'�tat courant !\n"
-+ 
-+-#: ../slattach.c:493
-++#: ../slattach.c:505
-++#, c-format
-+ msgid "slattach: tty_open: cannot get current line disc!\n"
-+ msgstr ""
-+ "slattach: tty_open: ne peut obtenir la discipline de ligne actuelle !\n"
-+ 
-+-#: ../slattach.c:501
-++#: ../slattach.c:513
-++#, c-format
-+ msgid "slattach: tty_open: cannot set RAW mode!\n"
-+ msgstr "slattach: tty_open: ne peut activer le mode RAW !\n"
-+ 
-+-#: ../slattach.c:508
-++#: ../slattach.c:520
-+ #, c-format
-+ msgid "slattach: tty_open: cannot set %s bps!\n"
-+ msgstr "slattach: tty_open: ne peut passer � %s bps!\n"
-+ 
-+-#: ../slattach.c:518
-++#: ../slattach.c:530
-++#, c-format
-+ msgid "slattach: tty_open: cannot set 8N1 mode!\n"
-+ msgstr "slattach: tty_open: ne peut activer le mode 8N1 !\n"
-+ 
-+-#: ../slattach.c:686
-++#: ../slattach.c:672
-++#, c-format
-++msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n"
-++msgstr ""
-++
-++#: ../slattach.c:704
-+ #, c-format
-+ msgid "%s started"
-+ msgstr ""
-+ 
-+-#: ../slattach.c:687
-++#: ../slattach.c:705
-+ #, c-format
-+ msgid " on %s"
-+ msgstr ""
-+ 
-+-#: ../slattach.c:688
-++#: ../slattach.c:706
-+ #, fuzzy, c-format
-+ msgid " interface %s\n"
-+ msgstr "%s: interface inconnue: %s\n"
-+ 
-+ #~ msgid ""
-+-#~ "   This comand can get or set the hostname or the NIS domainname. You can\n"
-+-#~ msgstr ""
-+-#~ "   Cette commande ne peut obtenir ou d�finir le nom d'h�te ou le domaine "
-+-#~ "NIS. Vous pouvez\n"
-++#~ "  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
-++#~ "<-''-\n"
-++#~ msgstr "  arp [-v]   [<MAT>] [-i <if>] -s  <h�te> <adrmat> [netmask <nm>] pub  <-''-\n"
-++
-++#~ msgid "%s: unknown interface: %s\n"
-++#~ msgstr "%s: interface inconnue: %s\n"
-++
-++#~ msgid "address mask replies"
-++#~ msgstr "r�ponses de masque d'adresses"
-++
-++#~ msgid "unknown title %s\n"
-++#~ msgstr "titre inconnu %s\n"
-++
-++#~ msgid "Routing table for `ddp' not yet supported.\n"
-++#~ msgstr "Table de routage pour `ddp' pas encore support�.\n"
-++
-++#~ msgid ""
-++#~ "   This comand can get or set the hostname or the NIS domainname. You "
-++#~ "can\n"
-++#~ msgstr "   Cette commande ne peut obtenir ou d�finir le nom d'h�te ou le domaine NIS. Vous pouvez\n"
-+ 
-+ #~ msgid ""
-+ #~ "   also get the DNS domain or the FQDN (fully qualified domain name).\n"
-+ #~ msgstr ""
-+-#~ "   aussi obtenir le domaine DNS ou le FQDN (fully qualified domain name).\n"
-++#~ "   aussi obtenir le domaine DNS ou le FQDN (fully qualified domain "
-++#~ "name).\n"
-+ 
-+ #~ msgid ""
-+ #~ "   Unless you are using bind or NIS for host lookups you can change the\n"
-+-#~ msgstr ""
-+-#~ "   Sauf si vous utilisez bind ou NIS pour les recherches d'h�tes, vous "
-+-#~ "pouvez changer le\n"
-++#~ msgstr "   Sauf si vous utilisez bind ou NIS pour les recherches d'h�tes, vous pouvez changer le\n"
-+ 
-+ #~ msgid ""
-+ #~ "   FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n"
---- net-tools-1.60.orig/debian/patches/CVS-20030911-nameif.c_sync.patch
-+++ net-tools-1.60/debian/patches/CVS-20030911-nameif.c_sync.patch
-@@ -0,0 +1,90 @@
-+Sync with upstream CVS, complete log:
-+
-+Revision 1.4 - Thu Sep 11 03:46:49 2003 UTC by ak
-+Fix off by one in name length checking
-+
-+Revision 1.3 - Thu Mar 6 23:26:52 2003 UTC by ecki
-+Fix Debian Bug#178209, Fix RedHat Bug#85748: nameif segfaults
-+
-+Revision 1.2 - Sun Nov 25 06:55:06 2001 UTC by ecki
-+fixed debian bug#111642 reported by Jonathan Amery <jdamery@pick.ucam.org>
-+(newline missing in nameif usage)
-+
-+Index: net-tools/nameif.c
-+===================================================================
-+--- net-tools.orig/nameif.c
-++++ net-tools/nameif.c
-+@@ -3,7 +3,7 @@
-+  * Writen 2000 by Andi Kleen.
-+  * Subject to the Gnu Public License, version 2.  
-+  * TODO: make it support token ring etc.
-+- * $Id: nameif.c,v 1.1 2000/10/18 17:26:29 ak Exp $
-++ * $Id: nameif.c,v 1.4 2003/09/11 03:46:49 ak Exp $
-+  */ 
-+ #ifndef _GNU_SOURCE 
-+ #define _GNU_SOURCE
-+@@ -117,7 +117,8 @@ int getmac(char *name, unsigned char *ma
-+ }
-+ 
-+ struct change { 
-+-	struct change *next,**pprev;
-++	struct change *next;
-++	int found;
-+ 	char ifname[IFNAMSIZ+1];
-+ 	unsigned char mac[6];
-+ }; 
-+@@ -139,10 +140,7 @@ int addchange(char *p, struct change *ch
-+ 			ch->ifname, pos); 
-+ 	if (parsemac(p,ch->mac) < 0) 
-+ 		complain(_("cannot parse MAC `%s' at %s"), p, pos); 
-+-	if (clist) 
-+-		clist->pprev = &ch->next;
-+ 	ch->next = clist;
-+-	ch->pprev = &clist;
-+ 	clist = ch;
-+ 	return 0; 
-+ }
-+@@ -177,7 +175,7 @@ void readconf(void)
-+ 		if (*p == '\0')
-+ 			continue; 
-+ 		n = strcspn(p, " \t"); 
-+-		if (n > IFNAMSIZ) 
-++		if (n > IFNAMSIZ-1) 
-+ 			complain(_("interface name too long at line %d"), line);  
-+ 		memcpy(ch->ifname, p, n); 
-+ 		ch->ifname[n] = 0; 
-+@@ -200,7 +198,7 @@ struct option lopt[] = { 
-+ 
-+ void usage(void)
-+ {
-+-	fprintf(stderr, _("usage: nameif [-c configurationfile] [-s] {ifname macaddress}")); 
-++	fprintf(stderr, _("usage: nameif [-c configurationfile] [-s] {ifname macaddress}\n")); 
-+ 	exit(1); 
-+ }
-+ 
-+@@ -277,21 +275,21 @@ int main(int ac, char **av) 
-+ 		ch = lookupmac(mac); 
-+ 		if (!ch) 
-+ 			continue;
-+-			
-+-		*ch->pprev = ch->next;
-++		
-++		ch->found = 1;	
-+ 		if (strcmp(p, ch->ifname)) { 
-+ 			if (setname(p, ch->ifname) < 0)  
-+ 				complain(_("cannot change name of %s to %s: %s"),
-+ 						p, ch->ifname, strerror(errno)); 
-+ 		} 
-+-		free(ch);
-+ 	} 
-+ 	fclose(ifh); 
-+ 	
-+ 	while (clist) { 
-+ 		struct change *ch = clist;
-+ 		clist = clist->next;
-+-		warning(_("interface '%s' not found"), ch->ifname); 
-++		if (!ch->found)
-++			warning(_("interface '%s' not found"), ch->ifname); 
-+ 		free(ch); 
-+ 	}
-+ 
---- net-tools-1.60.orig/debian/patches/netstat.c-assorted_changes.patch
-+++ net-tools-1.60/debian/patches/netstat.c-assorted_changes.patch
-@@ -0,0 +1,138 @@
-+Unsyncable patches that are nevertheless already in upstream's CVS in the
-+following revisions:
-+
-+* 1.57: Enable netstat -s for IPv6 (Debian Bug #453859 from Varun Chandramohan)
-+* 1.55: use new page aliged proc_fopen for address families
-+
-+Index: net-tools/netstat.c
-+===================================================================
-+--- net-tools.orig/netstat.c
-++++ net-tools/netstat.c
-+@@ -6,7 +6,7 @@
-+  *              NET-3 Networking Distribution for the LINUX operating
-+  *              system.
-+  *
-+- * Version:     $Id: netstat.c,v 1.54 2007/12/01 18:12:34 ecki Exp $
-++ * Version:     $Id: netstat.c,v 1.55 2007/12/01 19:00:40 ecki Exp $
-+  *
-+  * Authors:     Fred Baumgarten, <dc6iq@insu1.etec.uni-karlsruhe.de>
-+  *              Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
-+@@ -94,6 +94,7 @@
-+ #include "sockets.h"
-+ #include "interface.h"
-+ #include "util.h"
-++#include "proc.h"
-+ 
-+ #define PROGNAME_WIDTH 20
-+ 
-+@@ -104,6 +105,8 @@
-+ /* prototypes for statistics.c */
-+ void parsesnmp(int, int, int);
-+ void inittab(void);
-++void parsesnmp6(int, int, int);
-++void inittab6(void);
-+ 
-+ typedef enum {
-+     SS_FREE = 0,		/* not allocated                */
-+@@ -153,7 +156,7 @@ int flag_ver = 0;
-+ FILE *procinfo;
-+ 
-+ #define INFO_GUTS1(file,name,proc)			\
-+-  procinfo = fopen((file), "r");			\
-++  procinfo = proc_fopen((file));			\
-+   if (procinfo == NULL) {				\
-+     if (errno != ENOENT) {				\
-+       perror((file));					\
-+@@ -174,7 +177,7 @@ FILE *procinfo;
-+ #if HAVE_AFINET6
-+ #define INFO_GUTS2(file,proc)				\
-+   lnr = 0;						\
-+-  procinfo = fopen((file), "r");		       	\
-++  procinfo = proc_fopen((file));		       	\
-+   if (procinfo != NULL) {				\
-+     do {						\
-+       if (fgets(buffer, sizeof(buffer), procinfo))	\
-+@@ -454,7 +457,7 @@ static int netrom_info(void)
-+     char buffer[256], dev[16];
-+     int st, vs, vr, sendq, recvq, ret;
-+ 
-+-    f = fopen(_PATH_PROCNET_NR, "r");
-++    f = proc_fopen(_PATH_PROCNET_NR);
-+     if (f == NULL) {
-+ 	if (errno != ENOENT) {
-+ 	    perror(_PATH_PROCNET_NR);
-+@@ -650,7 +653,7 @@ static void igmp_do_one(int lnr, const c
-+ #if HAVE_AFX25
-+ static int x25_info(void)
-+ {
-+-       FILE *f=fopen(_PATH_PROCNET_X25, "r");
-++       FILE *f=proc_fopen(_PATH_PROCNET_X25);
-+        char buffer[256],dev[16];
-+        int st,vs,vr,sendq,recvq,lci;
-+        static char *x25_state[5]=
-+@@ -661,7 +664,7 @@ static int x25_info(void)
-+                "ESTABLISHED",
-+                "RECOVERY"
-+        };
-+-       if(!(f=fopen(_PATH_PROCNET_X25, "r")))
-++       if(!(f=proc_fopen(_PATH_PROCNET_X25)))
-+        {
-+                if (errno != ENOENT) {
-+                        perror(_PATH_PROCNET_X25);
-+@@ -1269,7 +1272,7 @@ static int ax25_info(void)
-+ 	N_("ESTABLISHED"),
-+ 	N_("RECOVERY")
-+     };
-+-    if (!(f = fopen(_PATH_PROCNET_AX25, "r"))) {
-++    if (!(f = proc_fopen(_PATH_PROCNET_AX25))) {
-+ 	if (errno != ENOENT) {
-+ 	    perror(_PATH_PROCNET_AX25);
-+ 	    return (-1);
-+@@ -1365,13 +1368,13 @@ static int ipx_info(void)
-+     unsigned sport = 0, dport = 0;
-+     struct stat s;
-+     
-+-    f = fopen(_PATH_PROCNET_IPX_SOCKET1, "r");
-++    f = proc_fopen(_PATH_PROCNET_IPX_SOCKET1);
-+     if (!f) {
-+         if (errno != ENOENT) {
-+             perror(_PATH_PROCNET_IPX_SOCKET1);
-+             return (-1);
-+         }
-+-        f = fopen(_PATH_PROCNET_IPX_SOCKET2, "r");
-++        f = proc_fopen(_PATH_PROCNET_IPX_SOCKET2);
-+ 
-+         /* We need to check for directory */
-+         if (f) {
-+@@ -1728,9 +1731,28 @@ int main
-+     }
-+ 
-+     if (flag_sta) {
-+-        inittab();
-+-	parsesnmp(flag_raw, flag_tcp, flag_udp);
-+-	exit(0);
-++        char *tmp1, *tmp2;
-++        char buf[256];
-++        if (!afname[0]) {
-++            inittab();
-++            parsesnmp(flag_raw, flag_tcp, flag_udp);
-++        } else {
-++            safe_strncpy(buf, afname, sizeof(buf));
-++            tmp1 = buf;
-++            if ((tmp2 = index(tmp1, ',')))
-++                 printf("Multiple interface\n");
-++            else if(!strncmp(buf,"inet6",5)) {
-++#if HAVE_AFINET6
-++                 inittab6();
-++                 parsesnmp6(flag_raw, flag_tcp, flag_udp);
-++#else
-++                 printf("Address type not supported for stats\n");
-++#endif
-++            }
-++            else
-++                 printf("Address type not supported for stats\n");
-++        }
-++        exit(1);
-+     }
-+     
-+     if (flag_rou) {
diff --git a/source/n/netatalk/doinst.sh b/source/n/netatalk/doinst.sh
index 0f07997d0..18ce52e2f 100644
--- a/source/n/netatalk/doinst.sh
+++ b/source/n/netatalk/doinst.sh
@@ -18,5 +18,14 @@ if [ -e etc/rc.d/rc.atalk ]; then
 fi
 
 config etc/rc.d/rc.atalk.new
-rm -f etc/rc.d/rc.atalk.new
 
+config etc/netatalk/AppleVolumes.default.new
+config etc/netatalk/AppleVolumes.system.new
+config etc/netatalk/afp_ldap.conf.new
+config etc/netatalk/afpd.conf.new
+config etc/netatalk/afppasswd.new
+config etc/netatalk/atalkd.conf.new
+config etc/netatalk/netatalk.conf.new 
+config etc/netatalk/papd.conf.new
+# Don't need an empty file:
+rm -f etc/netatalk/afppasswd.new
diff --git a/source/n/netatalk/netatalk.SlackBuild b/source/n/netatalk/netatalk.SlackBuild
index 467825108..1311736a0 100755
--- a/source/n/netatalk/netatalk.SlackBuild
+++ b/source/n/netatalk/netatalk.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,7 +22,7 @@
 
 
 VERSION=${VERSION:-$(echo netatalk-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-4}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -70,13 +70,6 @@ find . \
 # Fixup some paths in etc2ps.sh
 zcat $CWD/netatalk.etc2ps.diff.gz | patch -p1 || exit 1
 
-# Allow building without xfs quota support
-zcat $CWD/netatalk.without_xfs.diff.gz | patch -p1 || exit 1
-
-# Disallow transmission of passwords via cleartext and with old version 1 of
-# the Diffie-Hellman protocol
-zcat $CWD/netatalk.afpdconf.diff.gz | patch -p1 || exit 1
-
 autoreconf -vif
 CFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -88,7 +81,7 @@ CFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --disable-static \
   --with-shadow \
-  --without-xfs \
+  --enable-ddp \
   --build=$ARCH-slackware-linux
 
 make $NUMJOBS || make || exit 1
@@ -117,12 +110,10 @@ zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 ( cd $PKG/etc/netatalk
-  for file in AppleVolumes.default AppleVolumes.system afpd.conf afppasswd atalkd.conf netatalk.conf papd.conf ; do
+  for file in AppleVolumes.default AppleVolumes.system afpd.conf afp_ldap.conf afppasswd atalkd.conf netatalk.conf papd.conf ; do
     mv $file ${file}.new
-    echo "config etc/netatalk/${file}.new" >> $PKG/install/doinst.sh
   done
 )
-echo "rm -f etc/netatalk/afppasswd.new" >> $PKG/install/doinst.sh
 
 mkdir -p $PKG/usr/doc/netatalk-$VERSION
 cp -a \
diff --git a/source/n/netatalk/netatalk.afpdconf.diff b/source/n/netatalk/netatalk.afpdconf.diff
deleted file mode 100644
index b2cf5df6f..000000000
--- a/source/n/netatalk/netatalk.afpdconf.diff
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -Nur netatalk-2.0.4.orig/config/afpd.conf.tmpl netatalk-2.0.4.new/config/afpd.conf.tmpl
---- netatalk-2.0.4.orig/config/afpd.conf.tmpl	2009-04-30 04:30:13.000000000 -0500
-+++ netatalk-2.0.4.new/config/afpd.conf.tmpl	2009-05-30 23:19:39.663201236 -0500
-@@ -212,4 +212,5 @@
- #		"special" -notcp -defaultvol <path> -systemvol <path>
- #
- # default:
--# - -transall -uamlist uams_dhx.so,uams_dhx2.so -nosavepassword
-+# Disallow clear-text transmission of passwords and DHX version 1
-+- -transall -uamlist uams_guest.so,uams_dhx2.so -nosavepassword
diff --git a/source/n/netatalk/netatalk.without_xfs.diff b/source/n/netatalk/netatalk.without_xfs.diff
deleted file mode 100644
index 75f97a038..000000000
--- a/source/n/netatalk/netatalk.without_xfs.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Nur netatalk-2.0.4.orig/configure.in netatalk-2.0.4.new/configure.in
---- netatalk-2.0.4.orig/configure.in	2009-03-29 02:23:20.000000000 -0500
-+++ netatalk-2.0.4.new/configure.in	2009-05-30 23:11:29.556016349 -0500
-@@ -692,6 +692,10 @@
- #		AC_MSG_RESULT([enabling quotactl wrapper])
- #	)
- 
-+AC_ARG_WITH([xfs],
-+       AS_HELP_STRING([--without-xfs], [Build without XFS filesystem quota support]))
-+
-+if test "x$with_xfs" != "xno"; then
-         # For quotas on Linux XFS filesystems
-         
-         # For linux > 2.5.56
-@@ -699,6 +703,7 @@
- 		[AC_CHECK_HEADERS(linux/xqm.h linux/xfs_fs.h)
-         	AC_CHECK_HEADERS(xfs/libxfs.h xfs/xqm.h xfs/xfs_fs.h)]
- 	)
-+fi
- 
- 
- 	dnl ----- as far as I can tell, dbtob always does the wrong thing
diff --git a/source/n/netatalk/rc.atalk.new b/source/n/netatalk/rc.atalk.new
index ce490345f..9cb17f009 100644
--- a/source/n/netatalk/rc.atalk.new
+++ b/source/n/netatalk/rc.atalk.new
@@ -1,56 +1,145 @@
+#! /bin/sh
 #
-# AppleTalk daemons. Make sure not to start atalkd in the background:
+# Start/stop the Netatalk daemons.
+#
+# Netatalk daemons.
+# If you use AppleTalk, Make sure not to start atalkd in the background:
 # its data structures must have time to stablize before running the
 # other processes.
 #
 
-netatalk_start() {
-  echo -n 'starting appletalk daemons: '
-  if [ -x /usr/sbin/atalkd ]; then
-    echo -n ' atalkd'
-    /usr/sbin/atalkd
-  fi
-  if [ -x /usr/bin/nbprgstr ]; then
-    echo -n ' nbprgstr'
-    /usr/bin/nbprgstr -p 4 `hostname|sed 's/\..*$//'`:Workstation
-    /usr/bin/nbprgstr -p 4 `hostname|sed 's/\..*$//'`:netatalk
-  fi
-  if [ -x /usr/sbin/papd ]; then
-    echo -n ' papd'
-    /usr/sbin/papd
-  fi
-  if [ -x /usr/sbin/afpd ]; then
-    echo -n ' afpd'
-    /usr/sbin/afpd
-  fi
-  if [ -x /usr/sbin/timelord ]; then
-    echo -n ' timelord'
-    /usr/sbin/timelord
-  fi
-  echo
+#
+# kill the named process(es)
+#
+killproc() {
+	pid=`/usr/bin/ps -e |
+	     /usr/bin/grep $1 |
+	     /usr/bin/sed -e 's/^  *//' -e 's/ .*//'`
+	[ "$pid" != "" ] && kill $pid
 }
 
-netatalk_stop() {
-  killall atalkd nbprgstr papd afpd timelord 2> /dev/null
-}
+# netatalk.conf expects hostname in $HOSTNAME by default
+HOSTNAME=`hostname`
+
+. /etc/netatalk/netatalk.conf
+
+
+#
+# Start the netatalk server processes.
+#
+
+atalk_startup() {
+	echo -n 'starting netatalk daemons: '
+	if [ x"${ATALKD_RUN}" != x"no" ]; then
+		if [ -x /usr/sbin/atalkd ]; then
+			/usr/sbin/atalkd;		echo -n ' atalkd'
+		fi
 
-netatalk_restart() {
-  netatalk_stop
-  sleep 1
-  netatalk_start
+		if [ -x /usr/bin/nbprgstr ]; then
+			/usr/bin/nbprgstr -p 4 "${ATALK_NAME}:Workstation${ATALK_ZONE}";
+			/usr/bin/nbprgstr -p 4 "${ATALK_NAME}:netatalk${ATALK_ZONE}";
+							echo -n ' nbprgstr'
+		fi
+
+		if [ x"${PAPD_RUN}" = x"yes"  -a -x /usr/sbin/papd ]; then
+			/usr/sbin/papd;			echo -n ' papd'
+		fi
+
+		if [ x"${TIMELORD_RUN}" = x"yes"  -a -x /usr/sbin/timelord ]; then
+			/usr/sbin/timelord;		echo -n ' timelord'
+		fi
+	fi
+
+	if [ x"${CNID_METAD_RUN}" = x"yes" -a -x /usr/sbin/cnid_metad ]; then
+        /usr/sbin/cnid_metad $CNID_CONFIG
+        echo -n ' cnid_metad'
+	fi
+
+	if [  x"${AFPD_RUN}" = x"yes" -a -x /usr/sbin/afpd ]; then
+		/usr/sbin/afpd  ${AFPD_UAMLIST} -g ${AFPD_GUEST} \
+               -c ${AFPD_MAX_CLIENTS} -n "${ATALK_NAME}${ATALK_ZONE}";	echo -n ' afpd'
+	fi
+
+	echo '.'
 }
 
+atalk_shutdown() {
+	echo -n 'stopping netatalk daemons:'
+
+	if [ -x /usr/sbin/papd ]; then
+		killproc papd;			echo -n ' papd'
+	fi
+
+	if [ -x /usr/sbin/afpd ]; then
+		killproc afpd;			echo -n ' afpd'
+	fi
+
+	if [ -x /usr/sbin/cnid_metad ]; then
+		killproc cnid_met;		echo -n ' cnid_metad'
+	fi
+
+	if [ -x /usr/sbin/timelord ]; then
+		killproc timelord;		echo -n ' timelord'
+	fi
+
+	# kill atalkd last, since without it the plumbing goes away.
+	if [ -x /usr/sbin/atalkd ]; then
+		killproc atalkd;		echo -n ' atalkd'
+	fi
+	echo '.'
+}
 case "$1" in
+
 'start')
-  netatalk_start
-  ;;
+        if [ x"${ATALK_BGROUND}" = x"yes" ]; then
+            echo -n "Starting netatalk in the background ... "
+            atalk_startup > /dev/null &
+        else
+            atalk_startup
+        fi
+        ;;
+
+#
+# Stop the netatalk server processes.
+#
 'stop')
-  netatalk_stop
-  ;;
+
+	echo -n 'stopping netatalk daemons:'
+
+	if [ -x /usr/sbin/papd ]; then
+		killproc papd;			echo -n ' papd'
+	fi
+
+	if [ -x /usr/sbin/afpd ]; then
+		killproc afpd;			echo -n ' afpd'
+	fi
+
+	if [ -x /usr/sbin/cnid_metad ]; then
+		killproc cnid_met;		echo -n ' cnid_metad'
+	fi
+
+	if [ -x /usr/sbin/timelord ]; then
+		killproc timelord;		echo -n ' timelord'
+	fi
+
+	# kill atalkd last, since without it the plumbing goes away.
+	if [ -x /usr/sbin/atalkd ]; then
+		killproc atalkd;		echo -n ' atalkd'
+	fi
+
+	echo '.'
+	;;
+
 'restart')
-  netatalk_restart
-  ;;
+atalk_shutdown
+atalk_startup
+	;;
+#
+# Usage statement.
+#
+
 *)
-  netatalk_start
+	echo "usage: $0 {start|stop|restart}"
+	exit 1
+	;;
 esac
-
diff --git a/source/n/nettle/nettle.SlackBuild b/source/n/nettle/nettle.SlackBuild
new file mode 100755
index 000000000..599b7a9ab
--- /dev/null
+++ b/source/n/nettle/nettle.SlackBuild
@@ -0,0 +1,127 @@
+#!/bin/sh
+
+# Slackware build script for nettle
+
+# Copyright 2011  Robby Workman, Northport, Alabama, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PKGNAM=nettle
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j6}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?*z || exit 1
+cd $PKGNAM-$VERSION
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+# There is a "--disable-openssl" flag that shows this for help:
+# "Do not include openssl glue in the benchmark program"
+# Building without that flag does not appear to link any openssl libraries,
+# so I don't see any potential legal implications...  --rworkman
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --infodir=/usr/info \
+  --enable-shared \
+  --build=$ARCH-slackware-linux \
+  || exit 1
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Do not package static libraries:
+rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.a
+
+# Fix perms on shared objects
+find $PKG/usr/lib${LIBDIRSUFFIX} -type f -name "*.so.*" -exec chmod 0755 {} \;
+
+# Strip binaries:
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Compress info files, if any:
+if [ -d $PKG/usr/info ]; then
+  ( cd $PKG/usr/info
+    rm -f dir
+    gzip -9 *
+  )
+fi
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING* INSTALL NEWS README TODO \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/n/nettle/slack-desc b/source/n/nettle/slack-desc
new file mode 100644
index 000000000..159c77de3
--- /dev/null
+++ b/source/n/nettle/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+nettle: Nettle (small cryptographic library)
+nettle:
+nettle: Nettle is a cryptographic library that is designed to fit easily in 
+nettle: more or less any context: In crypto toolkits for object-oriented 
+nettle: languages (C++, Python, Pike, ...), in applications like LSH or 
+nettle: GNUPG, or even in kernel space.
+nettle:
+nettle: Homepage: http://www.lysator.liu.se/~nisse/nettle/
+nettle:
+nettle:
+nettle:
diff --git a/source/n/network-scripts/network-scripts.SlackBuild b/source/n/network-scripts/network-scripts.SlackBuild
index 9cd6a4e7d..78aa577e6 100755
--- a/source/n/network-scripts/network-scripts.SlackBuild
+++ b/source/n/network-scripts/network-scripts.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,7 +22,7 @@
 
 
 PKGNAM=network-scripts
-VERSION=${VERSION:-13.0}
+VERSION=${VERSION:-14.00}
 ARCH=noarch
 BUILD=${BUILD:-3}
 
diff --git a/source/n/network-scripts/scripts/netconfig b/source/n/network-scripts/scripts/netconfig
index 04afd698e..1e1151484 100644
--- a/source/n/network-scripts/scripts/netconfig
+++ b/source/n/network-scripts/scripts/netconfig
@@ -69,6 +69,16 @@ GATEWAY="$GATEWAY"
 # when rc.inet1 is called directly.
 DEBUG_ETH_UP="no"
 
+# Example of how to configure a bridge:
+# Note the added "BRNICS" variable which contains a space-separated list
+# of the physical network interfaces you want to add to the bridge.
+#IFNAME[0]="br0"
+#BRNICS[0]="eth0"
+#IPADDR[0]="192.168.0.1"
+#NETMASK[0]="255.255.255.0"
+#USE_DHCP[0]=""
+#DHCP_HOSTNAME[0]=""
+
 ## Example config information for wlan0.  Uncomment the lines you need and fill
 ## in your info.  (You may not need all of these for your wireless network)
 #IFNAME[4]="wlan0"
@@ -309,9 +319,14 @@ EOF
  fi
 done
 
+# Write the hostname with domain to /etc/HOSTNAME:
 echo $HOSTNM.$DOMAIN > etc/HOSTNAME
+# Also make sure the hostname is written to /etc/NetworkManager/NetworkManager.conf:
+if [ -w etc/NetworkManager/NetworkManager.conf ]; then
+  sed -i "s/^hostname=.*$/hostname=$HOSTNM/g" etc/NetworkManager/NetworkManager.conf
+fi
 
-dialog --title "SETUP IP ADDRESS FOR '$HOSTNM.$DOMAIN'" \
+dialog --title "CONFIGUATION TYPE FOR '$HOSTNM.$DOMAIN'" \
 --default-item DHCP \
 --menu \
 "Now we need to know how your machine connects to the network.\n\
@@ -319,14 +334,14 @@ If you have an internal network card and an assigned IP address, gateway, \
 and DNS, use the 'static IP' choice to enter these values.  If your IP \
 address is assigned by a DHCP server (commonly used by cable modem and DSL \
 services), select 'DHCP'.  If you do not have a network card, select \
-the 'loopback' choice.  'loopback' is also the correct choice if your \
-only connection to the network will be through a serial modem \
-(with SLIP or PPP), or if you are using a laptop network card (these \
-are configured in /etc/pcmcia/). What type of network connection \
-best describes your machine?" 20 70 3 \
+the 'loopback' choice.  You may also select 'NetworkManager' if you would \
+like to have the NetworkManager daemon automatically handle your wired and \
+wireless network interfaces (this is simple and usually works). \
+Which type of network setup would you like?"  20 70 4 \
 "static IP" "Use a static IP address to configure ethernet" \
 "DHCP" "Use a DHCP server to configure ethernet" \
-"loopback" "Set up a loopback connection (modem or no net)" 2> $TMP/reply
+"loopback" "Set up a loopback connection (modem or no net)" \
+"NetworkManager" "Autoconfigure network using NetworkManager" 2> $TMP/reply
 if [ $? = 1 -o $? = 255 ]; then
   rm -f $TMP/reply
   exit
@@ -348,6 +363,9 @@ below.  If you do not have a DHCP hostname, just hit ENTER or Cancel." 13 62 \
   DHCP_HOSTNAME="$NEW_DHCPHOST"
 elif [ "$REPLY" = "loopback" ]; then
   LOOPBACK="yes"
+elif [ "$REPLY" = "NetworkManager" ]; then
+  LOOPBACK="yes"
+  NETWORKMANAGER="yes"
 else
   LOOPBACK="no"
 fi
@@ -554,7 +572,7 @@ You'll have to try to configure the card later by editing \
   fi
 fi
 
-if [ "$LOOPBACK" = "yes" ]; then
+if [ "$LOOPBACK" = "yes" -a ! "$NETWORKMANAGER" = "yes" ]; then
   dialog --title "NETWORK SETUP COMPLETE" --yesno "Your networking \
 system is now configured to use loopback:
 
@@ -563,6 +581,15 @@ Netmask: 255.255.255.0
 
 Is this correct?  Press 'Yes' to continue, or 'No' to reconfigure." 0 0
   RETVAL=$?
+elif [ "$LOOPBACK" = "yes" -a "$NETWORKMANAGER" = "yes" ]; then
+  dialog --title "NETWORK SETUP COMPLETE" --yesno "Your networking \
+system is now configured to use NetworkManager for
+wired and wireless network management.  To set up wireless networks
+and view status, add the Network Management control panel widget to
+your KDE desktop.
+
+Is this correct?  Press 'Yes' to confirm, or 'No' to reconfigure." 0 0
+  RETVAL=$?
 elif [ "$USE_DHCP" = "" ]; then
   while [ 0 ]; do
     dialog --title "CONFIRM NETWORK SETUP" \
@@ -617,8 +644,16 @@ Is this correct?  Press 'Yes' to continue, or 'No' to reconfigure." 0 0
 fi
 
 if [ "$RETVAL" = "0" ]; then
+  # Write the hostname with domain to /etc/HOSTNAME:
   echo $HOSTNM.$DOMAIN > etc/HOSTNAME
+  # Also make sure the hostname is written to /etc/NetworkManager/NetworkManager.conf:
+  if [ -w etc/NetworkManager/NetworkManager.conf ]; then
+    sed -i "s/^hostname=.*$/hostname=$HOSTNM/g" etc/NetworkManager/NetworkManager.conf
+  fi
   write_config_files
+  if [ "$NETWORKMANAGER" = "yes" -a -r etc/rc.d/rc.networkmanager ]; then
+    chmod 755 etc/rc.d/rc.networkmanager
+  fi
   if [ "$1" = "" ]; then
     dialog --msgbox "Settings accepted.  Basic network configuration is complete." 6 40
   fi
diff --git a/source/n/network-scripts/scripts/rc.inet1 b/source/n/network-scripts/scripts/rc.inet1
index 4e6c7aa00..dc325f477 100644
--- a/source/n/network-scripts/scripts/rc.inet1
+++ b/source/n/network-scripts/scripts/rc.inet1
@@ -72,6 +72,29 @@ lo_down() {
 # INTERFACE FUNCTIONS #
 #######################
 
+# Function to assemble a bridge interface.
+br_open() {
+  # argument is 'i' - the position of this interface in the IFNAME array.
+  /sbin/brctl addbr ${IFNAME[$1]}
+  for BRIF in $(echo ${BRNICS[$1]}); do
+    /sbin/ifconfig $BRIF down
+    /sbin/ifconfig $BRIF 0.0.0.0 promisc up
+    /sbin/brctl addif ${IFNAME[$1]} $BRIF
+  done
+}
+
+# Function to disassemble a bridge interface.
+br_close() {
+  # argument is 'i' - the position of this interface in the IFNAME array.
+  #for BRIF in $(echo ${BRNICS[$1]}); do
+  for BRIF in $(ls --indicator-style=none /sys/class/net/${IFNAME[$1]}/brif/)
+  do
+    /sbin/brctl delif ${IFNAME[$1]} $BRIF
+  done
+  /sbin/ifconfig ${IFNAME[$1]} down
+  /sbin/brctl delbr ${IFNAME[$1]}
+}
+
 # Function to bring up a network interface.  If the interface is
 # already up or does not yet exist (perhaps because the kernel driver
 # is not loaded yet), do nothing.
@@ -82,6 +105,8 @@ if_up() {
     [ "${IFNAME[$i]}" = "${1}" ] && break
     i=$(($i+1))
   done
+  # If the interface is a bridge, then create it first:
+  [ -n "${BRNICS[$i]}" ] && br_open $i
   # If the interface isn't in the kernel yet (but there's an alias for it in
   # modules.conf), then it should be loaded first:
   if ! grep `echo ${1}: | cut -f 1 -d :`: /proc/net/dev 1> /dev/null ; then # no interface yet
@@ -92,7 +117,7 @@ if_up() {
   fi
   if grep `echo ${1}: | cut -f 1 -d :`: /proc/net/dev 1> /dev/null ; then # interface exists
     if ! /sbin/ifconfig | grep -w "${1}" 1>/dev/null || \
-      ! /sbin/ifconfig ${1} | grep "inet addr" 1> /dev/null ; then # interface not up or not configured
+      ! /sbin/ifconfig ${1} | grep -w inet 1> /dev/null ; then # interface not up or not configured
       if [ ! "${HWADDR[$i]}" = "" ]; then # Set hardware address _before_ the interface goes up:
         echo "/etc/rc.d/rc.inet1:  /sbin/ifconfig ${1} hw ether ${HWADDR[$i]}" | $LOGGER
         /sbin/ifconfig ${1} hw ether ${HWADDR[$i]}
@@ -105,6 +130,9 @@ if_up() {
         . /etc/rc.d/rc.wireless ${1} start # Initialize any wireless parameters
       fi
       if [ "${USE_DHCP[$i]}" = "yes" ]; then # use DHCP to bring interface up
+        # Clear DHCP_OPTIONS before adding new options to it:
+        unset DHCP_OPTIONS
+        # Set DHCP_OPTIONS for this interface:
         [ ${DHCP_HOSTNAME[$i]} ] && DHCP_OPTIONS="-h ${DHCP_HOSTNAME[$i]}"
         [ "${DHCP_KEEPRESOLV[$i]}" = "yes" ] && DHCP_OPTIONS="$DHCP_OPTIONS -C resolv.conf"
         [ "${DHCP_KEEPNTP[$i]}" = "yes" ] && DHCP_OPTIONS="$DHCP_OPTIONS -C ntp.conf"
@@ -179,6 +207,8 @@ if_down() {
     if [ -x /etc/rc.d/rc.wireless ]; then
       . /etc/rc.d/rc.wireless ${1} stop # Kill wireless daemons if any.
     fi
+    # If the interface is a bridge, then destroy it now:
+    [ -n "${BRNICS[$i]}" ] && br_close $i
   fi
 }
 
diff --git a/source/n/network-scripts/scripts/rc.inet1.conf b/source/n/network-scripts/scripts/rc.inet1.conf
index 555210c4b..d3798d8bf 100644
--- a/source/n/network-scripts/scripts/rc.inet1.conf
+++ b/source/n/network-scripts/scripts/rc.inet1.conf
@@ -45,6 +45,16 @@ GATEWAY=""
 # when rc.inet1 is called directly.
 DEBUG_ETH_UP="no"
 
+# Example of how to configure a bridge:
+# Note the added "BRNICS" variable which contains a space-separated list
+# of the physical network interfaces you want to add to the bridge.
+#IFNAME[0]="br0"
+#BRNICS[0]="eth0"
+#IPADDR[0]="192.168.0.1"
+#NETMASK[0]="255.255.255.0"
+#USE_DHCP[0]=""
+#DHCP_HOSTNAME[0]=""
+
 ## Example config information for wlan0.  Uncomment the lines you need and fill
 ## in your data.  (You may not need all of these for your wireless network)
 #IFNAME[4]="wlan0"
diff --git a/source/n/network-scripts/scripts/rc.inet2 b/source/n/network-scripts/scripts/rc.inet2
index 232d93ecb..4f51a330c 100644
--- a/source/n/network-scripts/scripts/rc.inet2
+++ b/source/n/network-scripts/scripts/rc.inet2
@@ -98,7 +98,7 @@ fi
 
 # Start NIS (the Network Information Service):
 if [ -x /etc/rc.d/rc.yp ]; then
-  . /etc/rc.d/rc.yp start
+  /etc/rc.d/rc.yp start
 fi
 
 # Start the NFS server.  Note that for this to work correctly, you'll
diff --git a/source/n/nmap/nmap.SlackBuild b/source/n/nmap/nmap.SlackBuild
index d228e63aa..a513a93e7 100755
--- a/source/n/nmap/nmap.SlackBuild
+++ b/source/n/nmap/nmap.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,8 +20,8 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=${VERSION:-5.51}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-6.01}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -72,6 +72,8 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# --without-nmap-update is needed below to avoid depending on apr and subversion libraries.
+# It's not worth the feature IMHO.
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -79,6 +81,7 @@ CFLAGS="$SLKCFLAGS" \
   --with-liblua=included \
   --mandir=/usr/man \
   --docdir=/usr/doc/nmap-$VERSION \
+  --without-nmap-update \
   --build=$ARCH-slackware-linux
 
 make $NUMJOBS || make || exit 1
diff --git a/source/n/ntp/ntp.SlackBuild b/source/n/ntp/ntp.SlackBuild
index b8d4d3638..d89863e73 100755
--- a/source/n/ntp/ntp.SlackBuild
+++ b/source/n/ntp/ntp.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,7 +22,7 @@
 
 PKGNAM=ntp
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -76,6 +76,8 @@ CFLAGS="$SLKCFLAGS" \
   --bindir=/usr/sbin \
   --sbindir=/usr/sbin \
   --mandir=/usr/man \
+  --enable-ipv6 \
+  --with-crypto \
   --program-prefix= \
   --program-suffix= \
   --build=$ARCH-slackware-linux
diff --git a/source/n/obex-data-server/obex-data-server.SlackBuild b/source/n/obex-data-server/obex-data-server.SlackBuild
index e81a071a1..030fffc7d 100755
--- a/source/n/obex-data-server/obex-data-server.SlackBuild
+++ b/source/n/obex-data-server/obex-data-server.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Copyright 2009  Robby Workman, Northport, Alabama, USA
-# Copyright 2010  Patrick Volkerding, Sebeka, MN, USA
+# Copyright 2010, 2012  Patrick Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,26 +21,27 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
 PKGNAM=obex-data-server
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
 
 # Automatically determine the architecture we're building on:
+MARCH=$( uname -m )
 if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
-    arm*) export ARCH=arm ;;
+  case "$MARCH" in
+    i?86)    export ARCH=i486 ;;
+    armv7hl) export ARCH=$MARCH ;;
+    arm*)    export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
-       *) export ARCH=$( uname -m ) ;;
+    *)       export ARCH=$MARCH ;;
   esac
 fi
 
-NUMJOBS=${NUMJOBS:-" -j7 "}
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -50,11 +51,23 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "armv7hl" ]; then
+  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
+  LIBDIRSUFFIX=""
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 fi
 
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
@@ -76,7 +89,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --build=$ARCH-slackware-linux
+  --build=$TARGET
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
diff --git a/source/n/obex-data-server/obex-data-server.url b/source/n/obex-data-server/obex-data-server.url
new file mode 100644
index 000000000..8b6e257cf
--- /dev/null
+++ b/source/n/obex-data-server/obex-data-server.url
@@ -0,0 +1 @@
+http://tadas.dailyda.com/software/
diff --git a/source/n/obex-data-server/slack-desc b/source/n/obex-data-server/slack-desc
index 68bd08907..418beba0f 100644
--- a/source/n/obex-data-server/slack-desc
+++ b/source/n/obex-data-server/slack-desc
@@ -17,4 +17,3 @@ obex-data-server:
 obex-data-server:
 obex-data-server:
 obex-data-server:
-obex-data-server:
diff --git a/source/n/obexftp/obexftp.SlackBuild b/source/n/obexftp/obexftp.SlackBuild
index c6be7ccc4..f7b045220 100755
--- a/source/n/obexftp/obexftp.SlackBuild
+++ b/source/n/obexftp/obexftp.SlackBuild
@@ -22,7 +22,7 @@
 
 PKGNAM=obexftp
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-5}
+BUILD=${BUILD:-8}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
diff --git a/source/n/openldap-client/openldap-client.SlackBuild b/source/n/openldap-client/openldap-client.SlackBuild
index c23e17f48..798536b19 100755
--- a/source/n/openldap-client/openldap-client.SlackBuild
+++ b/source/n/openldap-client/openldap-client.SlackBuild
@@ -24,7 +24,7 @@
 
 
 VERSION=${VERSION:-$(echo openldap-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -89,6 +89,9 @@ make -j4 || exit 1
 make test || exit 1
 make install DESTDIR=$PKG || exit 1
 
+# Fix permissions on shared libraries:
+chmod 755 $PKG/usr/lib${LIBDIRSUFFIX}/*.so.*
+
 rm -f $PKG/etc/openldap/ldap.conf.default
 mv $PKG/etc/openldap/ldap.conf $PKG/etc/openldap/ldap.conf.new
 cat << EOF >> $PKG/etc/openldap/ldap.conf.new
diff --git a/source/n/openssh/openssh.SlackBuild b/source/n/openssh/openssh.SlackBuild
index 89a968f92..79109e47e 100755
--- a/source/n/openssh/openssh.SlackBuild
+++ b/source/n/openssh/openssh.SlackBuild
@@ -2,7 +2,7 @@
 
 # Copyright 2000 BSDi, Inc. Concord, CA, USA
 # Copyright 2001, 2002, 2003, 2004  Slackware Linux, Inc. Concord, CA, USA
-# Copyright 2006, 2007, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -78,7 +78,6 @@ CFLAGS="$SLKCFLAGS" \
   --with-md5-passwords \
   --with-tcp-wrappers \
   --with-default-path=/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin \
-  --with-ipv4-default \
   --with-privsep-path=/var/empty \
   --with-privsep-user=sshd \
   --build=$ARCH-slackware-linux
diff --git a/source/n/openssl/certwatch b/source/n/openssl/certwatch
index 8fef1509f..d52dc3dc4 100644
--- a/source/n/openssl/certwatch
+++ b/source/n/openssl/certwatch
@@ -84,6 +84,7 @@ for binary in basename date find grep mail openssl touch ; do
 done
 
 find $CERTDIR -type f -maxdepth 1 | while read certfile ; do
+  if [ "$certfile" != "/etc/ssl/certs/ca-certificates.crt" ]; then
   certfilebase="$(basename "$certfile")"
   inform=PEM
   echo "$certfile" | grep -q -i '\.net$'
@@ -124,5 +125,6 @@ find $CERTDIR -type f -maxdepth 1 | while read certfile ; do
       fi
     fi
   fi
+  fi
 done
 
diff --git a/source/n/openssl/doinst.sh-openssl b/source/n/openssl/doinst.sh-openssl
index c92e60763..8fcf3d1c1 100644
--- a/source/n/openssl/doinst.sh-openssl
+++ b/source/n/openssl/doinst.sh-openssl
@@ -19,3 +19,8 @@ fi
 
 config etc/ssl/openssl.cnf.new
 config etc/cron.daily/certwatch.new
+
+# Rehash certificates if the package is upgraded on a running system:
+if [ -x /usr/bin/c_rehash ]; then
+  /usr/bin/c_rehash 1> /dev/null 2> /dev/null
+fi
diff --git a/source/n/openssl/openssl.SlackBuild b/source/n/openssl/openssl.SlackBuild
index f0e55b52c..8d5c4a096 100755
--- a/source/n/openssl/openssl.SlackBuild
+++ b/source/n/openssl/openssl.SlackBuild
@@ -2,7 +2,7 @@
 
 # Copyright 2000 BSDi, Inc. Concord, CA, USA
 # Copyright 2001, 2002 Slackware Linux, Inc.  Concord, CA, USA
-# Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,7 +27,7 @@
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 
-VERSION=${VERSION:-$(echo openssl-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo openssl-*.tar.gz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
@@ -45,17 +45,19 @@ PKG2=$TMP/package-ossllibs
 NAME1=openssl-$VERSION-$ARCH-$BUILD
 NAME2=openssl-solibs-$VERSION-$ARCH-$BUILD
 
-NUMJOBS=${NUMJOBS:--j6}
+# Parallel build doesn't link properly.
+#NUMJOBS=${NUMJOBS:--j6}
 
 # So that ls has the right field counts for parsing...
 export LC_ALL=C
 
 cd $TMP
 rm -rf $PKG1 $PKG2 openssl-$VERSION
-tar xvf $CWD/openssl-$VERSION.tar.?z* || exit 1
+
+tar xvf $CWD/openssl-$VERSION.tar.gz || exit 1
 cd openssl-$VERSION
 
-# Use .so.0, not .so.0.9.8:
+# Use .so.1, not .so.1.0.0:
 zcat $CWD/openssl.soname.diff.gz | patch -p1 --backup --verbose --suffix=.orig || exit 1
 if [ "$ARCH" = "i486" ]; then
   # Build with -march=i486 -mtune=i686:
@@ -70,9 +72,9 @@ fi
 # paranoid that they won't run against a different OpenSSL version than
 # what they were compiled against, whether or not the ABI has changed.
 #
-# So, we will use the OPENSSL_VERSION_NUMBER from openssl-0.9.8o unless ABI
+# So, we will use the OPENSSL_VERSION_NUMBER from openssl-1.0.1c unless ABI
 # breakage forces it to change.  Yes, we're finally using this old trick.  :)
-sed -i "s/#define OPENSSL_VERSION_NUMBER.*/\/* Use 0x009080efL (0.9.8o) below to avoid pointlessly breaking the ABI *\/\n#define OPENSSL_VERSION_NUMBER 0x009080efL/g" crypto/opensslv.h || exit 1
+sed -i "s/#define OPENSSL_VERSION_NUMBER.*/\/* Use 0x1000103fL (1.0.1c) below to avoid pointlessly breaking the ABI *\/\n#define OPENSSL_VERSION_NUMBER 0x1000103fL/g" crypto/opensslv.h || exit 1
 
 chown -R root:root .
 mkdir -p $PKG1/usr/doc/openssl-$VERSION
@@ -103,15 +105,12 @@ fi
  no-sse2 \
  shared
 
-make depend || exit 1
+make $NUMJOBS depend || make depend || exit 1
 
 make $NUMJOBS || make || exit 1
 
 make install INSTALL_PREFIX=$PKG1 || exit 1
 
-# Use proper libdir:
-( cd $PKG1/usr; mv lib lib${LIBDIRSUFFIX} )
-
 # Make the .so.? library symlinks:
 ( cd $PKG1/usr/lib${LIBDIRSUFFIX} ; ldconfig -l lib*.so.* )
 
@@ -158,6 +157,21 @@ if [ -d $PKG1/usr/man ]; then
   )
 fi
 
+# If there's an openssl0 directory, then build openssl-0 shared libraries for
+# compatibility with programs linked to those:
+if [ -d $CWD/openssl0 ]; then
+  ( cd $CWD/openssl0
+    ./openssl0.build || exit 1
+  ) || exit 1
+  # Don't put these in the openssl package...  openssl-solibs is enough.
+  #mkdir -p $PKG1/lib${LIBDIRSUFFIX}
+  #cp -a $TMP/package-openssl0/usr/lib/lib*.so.?.?.? $PKG1/lib${LIBDIRSUFFIX}
+  #( cd $PKG1/lib${LIBDIRSUFFIX} ; ldconfig -l lib*.so.?.?.? )
+  mkdir -p $PKG2/lib${LIBDIRSUFFIX}
+  cp -a $TMP/package-openssl0/usr/lib/lib*.so.?.?.? $PKG2/lib${LIBDIRSUFFIX}
+  ( cd $PKG2/lib${LIBDIRSUFFIX} ; ldconfig -l lib*.so.?.?.? )
+fi
+
 cd $PKG1
 chmod 755 usr/lib${LIBDIRSUFFIX}/pkgconfig
 sed -i -e "s#lib\$#lib${LIBDIRSUFFIX}#" usr/lib${LIBDIRSUFFIX}/pkgconfig/*.pc
diff --git a/source/n/openssl/openssl.optsx86.diff b/source/n/openssl/openssl.optsx86.diff
index a1a289a20..330e50970 100644
--- a/source/n/openssl/openssl.optsx86.diff
+++ b/source/n/openssl/openssl.optsx86.diff
@@ -1,11 +1,11 @@
---- ./Configure.orig	2005-08-02 03:59:42.000000000 -0700
-+++ ./Configure	2005-10-12 20:04:43.000000000 -0700
-@@ -317,7 +317,7 @@
- "linux-ppc",	"gcc:-DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::linux_ppc32.o::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+--- ./Configure.orig	2012-03-14 17:20:40.000000000 -0500
++++ ./Configure	2012-07-03 18:30:19.962011710 -0500
+@@ -350,7 +350,7 @@
+ "linux-armv4",	"gcc:-DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  #### IA-32 targets...
  "linux-ia32-icc",	"icc:-DL_ENDIAN -DTERMIO -O2 -no_cpprt::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 -"linux-elf",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"linux-elf",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -march=i486 -mtune=i686 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "linux-aout",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -march=i486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
+ "linux-aout",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -march=i486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out",
  ####
  "linux-generic64","gcc:-DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
diff --git a/source/n/openssl/openssl.soname.diff b/source/n/openssl/openssl.soname.diff
index f660e93bb..308968d9c 100644
--- a/source/n/openssl/openssl.soname.diff
+++ b/source/n/openssl/openssl.soname.diff
@@ -5,7 +5,7 @@
  	ALLSYMSFLAGS='-Wl,--whole-archive'; \
  	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
 -	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
-+	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB.0"
++	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB.1"
  
  DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
  
diff --git a/source/n/openssl/openssl0/certwatch b/source/n/openssl/openssl0/certwatch
new file mode 100644
index 000000000..8fef1509f
--- /dev/null
+++ b/source/n/openssl/openssl0/certwatch
@@ -0,0 +1,128 @@
+#!/bin/sh
+#
+# Will check all certificates stored in $CERTDIR for their expiration date,
+# and will display (if optional "stdout" argument is given), or mail a warning
+# message to $MAILADDR (if script is executed without any parameter
+# - unattended mode suitable for cron execution) for each particular certificate
+# that is about to expire in time less to, or equal to $DAYS after this script
+# has been executed, or if it has already expired.
+# This stupid script (C) 2006,2007 Jan Rafaj
+
+########################## CONFIGURATION SECTION BEGIN #########################
+# Note: all settings are mandatory
+# Warning will be sent if a certificate expires in time <= days given here
+DAYS=7
+# E-mail address where to send warnings
+MAILADDR=root
+# Directory with certificates to check
+CERTDIR=/etc/ssl/certs
+# Directory where to keep state files if this script isnt executed with "stdout"
+STATEDIR=/var/run
+########################### CONFIGURATION SECTION END ##########################
+
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+DAY_IN_SECS=$((60*60*24))
+DATE_CURRENT=$(date '+%s')
+
+usage()
+{
+  echo "Usage: $0 [stdout]"
+  echo
+  echo "Detailed description and configuration is embedded within the script."
+  exit 0
+}
+
+message()
+{
+  cat << EOF
+    WARNING: certificate $certfile
+    is about to expire in time equal to or less than $DAYS days from now on,
+    or has already expired - it might be a good idea to obtain/create new one.
+
+EOF
+}
+
+message_mail()
+{
+  message
+  cat << EOF
+    NOTE: This message is being sent only once.
+
+    A lock-file
+    $STATEDIR/certwatch-mailwarning-sent-$certfilebase
+    has been created, which will prevent this script from mailing you again
+    upon its subsequent executions by crond. You dont need to care about it;
+    the file will be auto-deleted as soon as you'll prolong your certificate.
+EOF
+}
+
+unset stdout
+case $# in
+  0) ;;
+  1) if   [ "$1" = "-h" -o "$1" == "--help" ]; then
+       usage
+     elif [ "$1" = "stdout" ]; then
+       stdout=1
+     else
+       usage
+     fi
+     ;;
+  *) usage ;;
+esac
+
+for dir in $STATEDIR $CERTDIR ; do
+  if [ ! -d $dir ]; then
+    echo "ERROR: directory $dir does not exist"
+    exit 1
+  fi
+done
+for binary in basename date find grep mail openssl touch ; do
+  if [ ! \( -x /usr/bin/$binary -o -x /bin/$binary \) ]; then
+    echo "ERROR: /usr/bin/$binary not found"
+    exit 1
+  fi
+done
+
+find $CERTDIR -type f -maxdepth 1 | while read certfile ; do
+  certfilebase="$(basename "$certfile")"
+  inform=PEM
+  echo "$certfile" | grep -q -i '\.net$'
+  if [ $? -eq 0 ]; then
+    # This is based purely on filename extension, so may give false results.
+    # But lets assume noone uses NET format certs today, ok?
+    continue
+  fi
+  echo "$certfile" | grep -q -i '\.der$'
+  if [ $? -eq 0 -o "$(file "$certfile" | egrep '(ASCII|PEM)')" == "" ]; then
+    inform=DER
+  fi
+  # We wont use '-checkend' since it is not properly documented (as of
+  # OpenSSL 0.9.8e).
+  DATE_CERT_EXPIRES=$(openssl x509 -in "$certfile" -inform $inform -noout -enddate | sed 's/^notAfter=//')
+  DATE_CERT_EXPIRES=$(date -d"$DATE_CERT_EXPIRES" +%s)
+  if [ $(($DATE_CERT_EXPIRES - $DATE_CURRENT)) -le $(($DAYS * $DAY_IN_SECS)) ]
+  then
+    if [ $stdout ]; then
+      message
+    else
+      if [ ! -f $STATEDIR/certwatch-mailwarning-sent-"$certfilebase" ]; then
+        subject="$0: certificate $certfile expiration warning"
+        message_mail | mail -r "certwatch@$HOSTNAME" \
+                            -s "$subject" \
+                            $MAILADDR 2>/dev/null
+        # echo "Mail about expiring certificate $certfile sent to $MAILADDR."
+        # echo "If you need to send it again, please remove lock-file"
+        # echo "$STATEDIR/certwatch-mailwarning-sent-$certfilebase ."
+        # echo
+      fi
+      touch $STATEDIR/certwatch-mailwarning-sent-"$certfilebase"
+    fi
+  else
+    if [ ! $stdout ]; then
+      if [ -f $STATEDIR/certwatch-mailwarning-sent-"$certfilebase" ]; then
+        rm $STATEDIR/certwatch-mailwarning-sent-"$certfilebase"
+      fi
+    fi
+  fi
+done
+
diff --git a/source/n/openssl/openssl0/doinst.sh-openssl b/source/n/openssl/openssl0/doinst.sh-openssl
new file mode 100644
index 000000000..c92e60763
--- /dev/null
+++ b/source/n/openssl/openssl0/doinst.sh-openssl
@@ -0,0 +1,21 @@
+config() {
+  NEW="$1"
+  OLD="`dirname $NEW`/`basename $NEW .new`"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+# If there is a known buggy certwatch script with no local
+# modifications, just replace it:
+if [ "$(md5sum etc/cron.daily/certwatch 2> /dev/null)" = "32556321806f1850d56cb2ef8384b7a1  etc/cron.daily/certwatch" ]; then
+  cat etc/cron.daily/certwatch.new > etc/cron.daily/certwatch
+  touch -r etc/cron.daily/certwatch.new etc/cron.daily/certwatch
+fi
+
+config etc/ssl/openssl.cnf.new
+config etc/cron.daily/certwatch.new
diff --git a/source/n/openssl/openssl0/doinst.sh-openssl-solibs b/source/n/openssl/openssl0/doinst.sh-openssl-solibs
new file mode 100644
index 000000000..ed4fdfacb
--- /dev/null
+++ b/source/n/openssl/openssl0/doinst.sh-openssl-solibs
@@ -0,0 +1,12 @@
+config() {
+  NEW="$1"
+  OLD="`dirname $NEW`/`basename $NEW .new`"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+config etc/ssl/openssl.cnf.new
diff --git a/source/n/openssl/openssl0/openssl.SlackBuild b/source/n/openssl/openssl0/openssl.SlackBuild
new file mode 100755
index 000000000..6c4197d50
--- /dev/null
+++ b/source/n/openssl/openssl0/openssl.SlackBuild
@@ -0,0 +1,195 @@
+#!/bin/sh
+
+# Copyright 2000 BSDi, Inc. Concord, CA, USA
+# Copyright 2001, 2002 Slackware Linux, Inc.  Concord, CA, USA
+# Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+# Set initial variables:
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+
+VERSION=${VERSION:-$(echo openssl-*.tar.gz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+PKG1=$TMP/package-openssl
+PKG2=$TMP/package-ossllibs
+NAME1=openssl-$VERSION-$ARCH-$BUILD
+NAME2=openssl-solibs-$VERSION-$ARCH-$BUILD
+
+NUMJOBS=${NUMJOBS:--j6}
+
+# So that ls has the right field counts for parsing...
+export LC_ALL=C
+
+cd $TMP
+rm -rf $PKG1 $PKG2 openssl-$VERSION
+tar xvf $CWD/openssl-$VERSION.tar.gz || exit 1
+cd openssl-$VERSION
+
+# Use .so.0, not .so.0.9.8:
+zcat $CWD/openssl.soname.diff.gz | patch -p1 --backup --verbose --suffix=.orig || exit 1
+if [ "$ARCH" = "i486" ]; then
+  # Build with -march=i486 -mtune=i686:
+  zcat $CWD/openssl.optsx86.diff.gz | patch -p1 --backup --verbose --suffix=.orig || exit 1
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+fi
+
+# OpenSSL has a (nasty?) habit of bumping the internal version number with
+# every release.  This wouldn't be so bad, but some applications are so
+# paranoid that they won't run against a different OpenSSL version than
+# what they were compiled against, whether or not the ABI has changed.
+#
+# So, we will use the OPENSSL_VERSION_NUMBER from openssl-0.9.8o unless ABI
+# breakage forces it to change.  Yes, we're finally using this old trick.  :)
+sed -i "s/#define OPENSSL_VERSION_NUMBER.*/\/* Use 0x009080efL (0.9.8o) below to avoid pointlessly breaking the ABI *\/\n#define OPENSSL_VERSION_NUMBER 0x009080efL/g" crypto/opensslv.h || exit 1
+
+chown -R root:root .
+mkdir -p $PKG1/usr/doc/openssl-$VERSION
+cp -a CHANGES CHANGES.SSLeay FAQ INSTALL INSTALL.MacOS INSTALL.VMS INSTALL.W32 \
+  LICENSE NEWS README README.ENGINE doc $PKG1/usr/doc/openssl-$VERSION
+find $PKG1/usr/doc/openssl-$VERSION -type d -exec chmod 755 {} \;
+find $PKG1/usr/doc/openssl-$VERSION -type f -exec chmod 644 {} \;
+
+# If there's a CHANGES file, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r CHANGES ]; then
+  DOCSDIR=$(echo $PKG1/usr/doc/*-$VERSION)
+  cat CHANGES | head -n 2000 > $DOCSDIR/CHANGES
+  touch -r CHANGES $DOCSDIR/CHANGES
+fi
+
+# These are the known patent issues with OpenSSL:
+# name   #         expires
+# MDC-2: 4,908,861  2007-03-13, included.  :-)
+# IDEA:  5,214,703  2010-05-25, not included.
+# RC5:   5,724,428  2015-03-03, not included.
+
+./config \
+ --prefix=/usr \
+ --openssldir=/etc/ssl \
+ no-idea \
+ no-rc5 \
+ no-sse2 \
+ shared
+
+make $NUMJOBS depend || make depend || exit 1
+
+make $NUMJOBS || make || exit 1
+
+make install INSTALL_PREFIX=$PKG1 || exit 1
+
+# Use proper libdir:
+( cd $PKG1/usr; mv lib lib${LIBDIRSUFFIX} )
+
+# Make the .so.? library symlinks:
+( cd $PKG1/usr/lib${LIBDIRSUFFIX} ; ldconfig -l lib*.so.* )
+
+# Move libraries, as they might be needed by programs that bring a network
+# mounted /usr online:
+
+mkdir $PKG1/lib${LIBDIRSUFFIX}
+( cd $PKG1/usr/lib${LIBDIRSUFFIX}
+  for file in lib*.so.?.* ; do
+    mv $file ../../lib${LIBDIRSUFFIX}
+    ln -sf ../../lib${LIBDIRSUFFIX}/$file .
+  done 
+  cp -a lib*.so.? ../../lib${LIBDIRSUFFIX}
+)
+
+# Add a cron script to warn root if a certificate is going to expire soon:
+mkdir -p $PKG1/etc/cron.daily
+zcat $CWD/certwatch.gz > $PKG1/etc/cron.daily/certwatch.new
+chmod 755 $PKG1/etc/cron.daily/certwatch.new
+
+mv $PKG1/etc/ssl/openssl.cnf $PKG1/etc/ssl/openssl.cnf.new
+
+( cd $PKG1
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+mv $PKG1/etc/ssl/man $PKG1/usr
+( cd $PKG1/usr/man/man1 ; mv passwd.1 ssl_passwd.1 )
+( cd $PKG1/usr/man/man3 ; mv rand.3 ssl_rand.3 )
+( cd $PKG1/usr/man/man3 ; mv err.3 ssl_err.3 )
+# Compress and symlink the man pages:
+if [ -d $PKG1/usr/man ]; then
+  ( cd $PKG1/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+cd $PKG1
+chmod 755 usr/lib${LIBDIRSUFFIX}/pkgconfig
+sed -i -e "s#lib\$#lib${LIBDIRSUFFIX}#" usr/lib${LIBDIRSUFFIX}/pkgconfig/*.pc
+mkdir -p install
+zcat $CWD/doinst.sh-openssl.gz > install/doinst.sh
+cat $CWD/slack-desc.openssl > install/slack-desc
+/sbin/makepkg -l y -c n $TMP/${NAME1}.txz
+
+# Make runtime package:
+mkdir -p $PKG2/lib${LIBDIRSUFFIX}
+( cd lib${LIBDIRSUFFIX} ; cp -a lib*.so.* $PKG2/lib${LIBDIRSUFFIX} )
+( cd $PKG2/lib${LIBDIRSUFFIX} ; ldconfig -l * )
+mkdir -p $PKG2/etc
+( cd $PKG2/etc ; cp -a $PKG1/etc/ssl . )
+mkdir -p $PKG2/usr/doc/openssl-$VERSION
+( cd $TMP/openssl-$VERSION
+  cp -a CHANGES CHANGES.SSLeay FAQ INSTALL INSTALL.MacOS INSTALL.VMS INSTALL.W32 \
+  LICENSE NEWS README README.ENGINE $PKG2/usr/doc/openssl-$VERSION
+)
+
+# If there's a CHANGES file, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r CHANGES ]; then
+  DOCSDIR=$(echo $PKG2/usr/doc/*-$VERSION)
+  cat CHANGES | head -n 2000 > $DOCSDIR/CHANGES
+  touch -r CHANGES $DOCSDIR/CHANGES
+fi
+
+find $PKG2/usr/doc/openssl-$VERSION -type d -exec chmod 755 {} \;
+find $PKG2/usr/doc/openssl-$VERSION -type f -exec chmod 644 {} \;
+cd $PKG2
+mkdir -p install
+zcat $CWD/doinst.sh-openssl-solibs.gz > install/doinst.sh
+cat $CWD/slack-desc.openssl-solibs > install/slack-desc
+/sbin/makepkg -l y -c n $TMP/${NAME2}.txz
diff --git a/source/n/openssl/openssl0/openssl.optsx86.diff b/source/n/openssl/openssl0/openssl.optsx86.diff
new file mode 100644
index 000000000..a1a289a20
--- /dev/null
+++ b/source/n/openssl/openssl0/openssl.optsx86.diff
@@ -0,0 +1,11 @@
+--- ./Configure.orig	2005-08-02 03:59:42.000000000 -0700
++++ ./Configure	2005-10-12 20:04:43.000000000 -0700
+@@ -317,7 +317,7 @@
+ "linux-ppc",	"gcc:-DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::linux_ppc32.o::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ #### IA-32 targets...
+ "linux-ia32-icc",	"icc:-DL_ENDIAN -DTERMIO -O2 -no_cpprt::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"linux-elf",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-elf",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -march=i486 -mtune=i686 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-aout",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -march=i486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
+ ####
+ "linux-generic64","gcc:-DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
diff --git a/source/n/openssl/openssl0/openssl.soname.diff b/source/n/openssl/openssl0/openssl.soname.diff
new file mode 100644
index 000000000..f660e93bb
--- /dev/null
+++ b/source/n/openssl/openssl0/openssl.soname.diff
@@ -0,0 +1,11 @@
+--- ./Makefile.shared.orig	2005-06-23 13:47:54.000000000 -0700
++++ ./Makefile.shared	2005-10-12 20:02:28.000000000 -0700
+@@ -151,7 +151,7 @@
+ 	SHLIB_SUFFIX=; \
+ 	ALLSYMSFLAGS='-Wl,--whole-archive'; \
+ 	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
+-	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
++	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB.0"
+ 
+ DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
+ 
diff --git a/source/n/openssl/openssl0/openssl0.build b/source/n/openssl/openssl0/openssl0.build
new file mode 100755
index 000000000..262a16a50
--- /dev/null
+++ b/source/n/openssl/openssl0/openssl0.build
@@ -0,0 +1,198 @@
+#!/bin/sh
+
+# Copyright 2000 BSDi, Inc. Concord, CA, USA
+# Copyright 2001, 2002 Slackware Linux, Inc.  Concord, CA, USA
+# Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+# Set initial variables:
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+
+VERSION=${VERSION:-$(echo openssl-*.tar.gz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+PKG1=$TMP/package-openssl0
+PKG2=$TMP/package-ossllibs
+NAME1=openssl-$VERSION-$ARCH-$BUILD
+NAME2=openssl-solibs-$VERSION-$ARCH-$BUILD
+
+NUMJOBS=${NUMJOBS:--j6}
+
+# So that ls has the right field counts for parsing...
+export LC_ALL=C
+
+cd $TMP
+#rm -rf $PKG1 $PKG2 openssl-$VERSION
+rm -rf $PKG1 openssl-$VERSION
+tar xvf $CWD/openssl-$VERSION.tar.gz || exit 1
+cd openssl-$VERSION
+
+# Use .so.0, not .so.0.9.8:
+zcat $CWD/openssl.soname.diff.gz | patch -p1 --backup --verbose --suffix=.orig || exit 1
+if [ "$ARCH" = "i486" ]; then
+  # Build with -march=i486 -mtune=i686:
+  zcat $CWD/openssl.optsx86.diff.gz | patch -p1 --backup --verbose --suffix=.orig || exit 1
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+fi
+
+# OpenSSL has a (nasty?) habit of bumping the internal version number with
+# every release.  This wouldn't be so bad, but some applications are so
+# paranoid that they won't run against a different OpenSSL version than
+# what they were compiled against, whether or not the ABI has changed.
+#
+# So, we will use the OPENSSL_VERSION_NUMBER from openssl-0.9.8o unless ABI
+# breakage forces it to change.  Yes, we're finally using this old trick.  :)
+sed -i "s/#define OPENSSL_VERSION_NUMBER.*/\/* Use 0x009080efL (0.9.8o) below to avoid pointlessly breaking the ABI *\/\n#define OPENSSL_VERSION_NUMBER 0x009080efL/g" crypto/opensslv.h || exit 1
+
+chown -R root:root .
+mkdir -p $PKG1/usr/doc/openssl-$VERSION
+cp -a CHANGES CHANGES.SSLeay FAQ INSTALL INSTALL.MacOS INSTALL.VMS INSTALL.W32 \
+  LICENSE NEWS README README.ENGINE doc $PKG1/usr/doc/openssl-$VERSION
+find $PKG1/usr/doc/openssl-$VERSION -type d -exec chmod 755 {} \;
+find $PKG1/usr/doc/openssl-$VERSION -type f -exec chmod 644 {} \;
+
+# If there's a CHANGES file, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r CHANGES ]; then
+  DOCSDIR=$(echo $PKG1/usr/doc/*-$VERSION)
+  cat CHANGES | head -n 2000 > $DOCSDIR/CHANGES
+  touch -r CHANGES $DOCSDIR/CHANGES
+fi
+
+# These are the known patent issues with OpenSSL:
+# name   #         expires
+# MDC-2: 4,908,861  2007-03-13, included.  :-)
+# IDEA:  5,214,703  2010-05-25, not included.
+# RC5:   5,724,428  2015-03-03, not included.
+
+./config \
+ --prefix=/usr \
+ --openssldir=/etc/ssl \
+ no-idea \
+ no-rc5 \
+ no-sse2 \
+ shared
+
+make $NUMJOBS depend || make depend || exit 1
+
+make $NUMJOBS || make || exit 1
+
+make install INSTALL_PREFIX=$PKG1 || exit 1
+
+exit 0
+
+# Use proper libdir:
+( cd $PKG1/usr; mv lib lib${LIBDIRSUFFIX} )
+
+# Make the .so.? library symlinks:
+( cd $PKG1/usr/lib${LIBDIRSUFFIX} ; ldconfig -l lib*.so.* )
+
+# Move libraries, as they might be needed by programs that bring a network
+# mounted /usr online:
+
+mkdir $PKG1/lib${LIBDIRSUFFIX}
+( cd $PKG1/usr/lib${LIBDIRSUFFIX}
+  for file in lib*.so.?.* ; do
+    mv $file ../../lib${LIBDIRSUFFIX}
+    ln -sf ../../lib${LIBDIRSUFFIX}/$file .
+  done 
+  cp -a lib*.so.? ../../lib${LIBDIRSUFFIX}
+)
+
+# Add a cron script to warn root if a certificate is going to expire soon:
+mkdir -p $PKG1/etc/cron.daily
+zcat $CWD/certwatch.gz > $PKG1/etc/cron.daily/certwatch.new
+chmod 755 $PKG1/etc/cron.daily/certwatch.new
+
+mv $PKG1/etc/ssl/openssl.cnf $PKG1/etc/ssl/openssl.cnf.new
+
+( cd $PKG1
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+mv $PKG1/etc/ssl/man $PKG1/usr
+( cd $PKG1/usr/man/man1 ; mv passwd.1 ssl_passwd.1 )
+( cd $PKG1/usr/man/man3 ; mv rand.3 ssl_rand.3 )
+( cd $PKG1/usr/man/man3 ; mv err.3 ssl_err.3 )
+# Compress and symlink the man pages:
+if [ -d $PKG1/usr/man ]; then
+  ( cd $PKG1/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+cd $PKG1
+chmod 755 usr/lib${LIBDIRSUFFIX}/pkgconfig
+sed -i -e "s#lib\$#lib${LIBDIRSUFFIX}#" usr/lib${LIBDIRSUFFIX}/pkgconfig/*.pc
+mkdir -p install
+zcat $CWD/doinst.sh-openssl.gz > install/doinst.sh
+cat $CWD/slack-desc.openssl > install/slack-desc
+/sbin/makepkg -l y -c n $TMP/${NAME1}.txz
+
+# Make runtime package:
+mkdir -p $PKG2/lib${LIBDIRSUFFIX}
+( cd lib${LIBDIRSUFFIX} ; cp -a lib*.so.* $PKG2/lib${LIBDIRSUFFIX} )
+( cd $PKG2/lib${LIBDIRSUFFIX} ; ldconfig -l * )
+mkdir -p $PKG2/etc
+( cd $PKG2/etc ; cp -a $PKG1/etc/ssl . )
+mkdir -p $PKG2/usr/doc/openssl-$VERSION
+( cd $TMP/openssl-$VERSION
+  cp -a CHANGES CHANGES.SSLeay FAQ INSTALL INSTALL.MacOS INSTALL.VMS INSTALL.W32 \
+  LICENSE NEWS README README.ENGINE $PKG2/usr/doc/openssl-$VERSION
+)
+
+# If there's a CHANGES file, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r CHANGES ]; then
+  DOCSDIR=$(echo $PKG2/usr/doc/*-$VERSION)
+  cat CHANGES | head -n 2000 > $DOCSDIR/CHANGES
+  touch -r CHANGES $DOCSDIR/CHANGES
+fi
+
+find $PKG2/usr/doc/openssl-$VERSION -type d -exec chmod 755 {} \;
+find $PKG2/usr/doc/openssl-$VERSION -type f -exec chmod 644 {} \;
+cd $PKG2
+mkdir -p install
+zcat $CWD/doinst.sh-openssl-solibs.gz > install/doinst.sh
+cat $CWD/slack-desc.openssl-solibs > install/slack-desc
+/sbin/makepkg -l y -c n $TMP/${NAME2}.txz
diff --git a/source/n/openssl/openssl0/slack-desc.openssl b/source/n/openssl/openssl0/slack-desc.openssl
new file mode 100644
index 000000000..57227c043
--- /dev/null
+++ b/source/n/openssl/openssl0/slack-desc.openssl
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|' on
+# the right side marks the last column you can put a character in.  You must make
+# exactly 11 lines for the formatting to be correct.  It's also customary to
+# leave one space after the ':'.
+
+       |-----handy-ruler------------------------------------------------------|
+openssl: openssl (Secure Sockets Layer toolkit)
+openssl:
+openssl: The OpenSSL certificate management tool and the shared libraries that
+openssl: provide various encryption and decryption algorithms and protocols.
+openssl:
+openssl: This product includes software developed by the OpenSSL Project for
+openssl: use in the OpenSSL Toolkit (http://www.openssl.org).  This product
+openssl: includes cryptographic software written by Eric Young
+openssl: (eay@cryptsoft.com).  This product includes software written by Tim
+openssl: Hudson (tjh@cryptsoft.com).
+openssl:
diff --git a/source/n/openssl/openssl0/slack-desc.openssl-solibs b/source/n/openssl/openssl0/slack-desc.openssl-solibs
new file mode 100644
index 000000000..58609e68b
--- /dev/null
+++ b/source/n/openssl/openssl0/slack-desc.openssl-solibs
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|' on
+# the right side marks the last column you can put a character in.  You must make
+# exactly 11 lines for the formatting to be correct.  It's also customary to
+# leave one space after the ':'.
+
+              |-----handy-ruler------------------------------------------------------|
+openssl-solibs: openssl-solibs (OpenSSL shared libraries)
+openssl-solibs:
+openssl-solibs: These shared libraries provide encryption routines required by
+openssl-solibs: programs such as openssh, bind, sendmail, and many others.
+openssl-solibs:
+openssl-solibs: This product includes software developed by the OpenSSL Project for
+openssl-solibs: use in the OpenSSL Toolkit (http://www.openssl.org).  This product
+openssl-solibs: includes cryptographic software written by Eric Young
+openssl-solibs: (eay@cryptsoft.com).  This product includes software written by Tim
+openssl-solibs: Hudson (tjh@cryptsoft.com).
+openssl-solibs:
diff --git a/source/n/openssl/slack-desc.openssl-solibs b/source/n/openssl/slack-desc.openssl-solibs
index f65bf12c9..58609e68b 100644
--- a/source/n/openssl/slack-desc.openssl-solibs
+++ b/source/n/openssl/slack-desc.openssl-solibs
@@ -9,11 +9,11 @@
 openssl-solibs: openssl-solibs (OpenSSL shared libraries)
 openssl-solibs:
 openssl-solibs: These shared libraries provide encryption routines required by
-openssl-solibs: programs such as openssh.  They are also used by KDE's Konqueror web
-openssl-solibs: browser to provide secure web connections.
+openssl-solibs: programs such as openssh, bind, sendmail, and many others.
 openssl-solibs:
 openssl-solibs: This product includes software developed by the OpenSSL Project for
 openssl-solibs: use in the OpenSSL Toolkit (http://www.openssl.org).  This product
 openssl-solibs: includes cryptographic software written by Eric Young
 openssl-solibs: (eay@cryptsoft.com).  This product includes software written by Tim
 openssl-solibs: Hudson (tjh@cryptsoft.com).
+openssl-solibs:
diff --git a/source/n/openvpn/openvpn.SlackBuild b/source/n/openvpn/openvpn.SlackBuild
index f0c78ce77..8477c453d 100755
--- a/source/n/openvpn/openvpn.SlackBuild
+++ b/source/n/openvpn/openvpn.SlackBuild
@@ -23,8 +23,8 @@
 
 
 PKGNAM=openvpn
-VERSION=2.1.4
-BUILD=${BUILD:-2}
+VERSION=2.2.2
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/n/openvpn/slack-desc b/source/n/openvpn/slack-desc
index 4f4af4c47..e73ab2fd2 100644
--- a/source/n/openvpn/slack-desc
+++ b/source/n/openvpn/slack-desc
@@ -8,7 +8,7 @@
        |-----handy-ruler------------------------------------------------------|
 openvpn: openvpn (secure IP tunnel daemon)
 openvpn:
-openvpn: OpenVPN is a full-featured SSL VPN which can accomodate a wide range
+openvpn: OpenVPN is a full-featured SSL VPN which can accommodate a wide range
 openvpn: of configurations, including remote access, site-to-site VPNs, WiFi
 openvpn: security, and enterprise-scale remote access with load balancing,
 openvpn: failover, and fine-grained access-controls.
diff --git a/source/n/p11-kit/p11-kit.SlackBuild b/source/n/p11-kit/p11-kit.SlackBuild
new file mode 100755
index 000000000..f7e9efb39
--- /dev/null
+++ b/source/n/p11-kit/p11-kit.SlackBuild
@@ -0,0 +1,106 @@
+#!/bin/sh
+
+# Slackware build script for p11-kit
+
+# Copyright 2011, 2012  Robby Workman, Northport, Alabama, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PKGNAM=p11-kit
+VERSION=${VERSION:-0.12}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j6}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --build=$ARCH-slackware-linux \
+  || exit 1
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Create the module dir
+mkdir -p $PKG/etc/pkcs11/modules
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \
+  grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING* INSTALL NEWS README* \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/n/p11-kit/slack-desc b/source/n/p11-kit/slack-desc
new file mode 100644
index 000000000..d5cf1db78
--- /dev/null
+++ b/source/n/p11-kit/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+p11-kit: p11-kit (PKCS#11 toolkit)
+p11-kit:
+p11-kit: p11-kit provides a way to load and enumerate PKCS#11 modules. 
+p11-kit:
+p11-kit: It provides a standard configuration setup for installing PKCS#11 
+p11-kit: modules in such a way that they're discoverable.  It also solves
+p11-kit: problems with coordinating the use of PKCS#11 by different components
+p11-kit: or libraries living in the same process.
+p11-kit:
+p11-kit: Homepage: http://p11-glue.freedesktop.org/p11-kit.html
+p11-kit:
diff --git a/source/n/php/doinst.sh b/source/n/php/doinst.sh
index eda8b0de9..2af731e95 100644
--- a/source/n/php/doinst.sh
+++ b/source/n/php/doinst.sh
@@ -3,6 +3,26 @@ if [ ! -r etc/httpd/mod_php.conf ]; then
 elif [ "`cat etc/httpd/mod_php.conf 2> /dev/null`" = "" ]; then
   cp -a etc/httpd/mod_php.conf.example etc/httpd/mod_php.conf
 fi
-if [ ! -r etc/httpd/php.ini ]; then
-   cp -a etc/httpd/php.ini-production etc/httpd/php.ini
+
+config() {
+  NEW="$1"
+  OLD="`dirname $NEW`/`basename $NEW .new`"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+# Keep same perms on rc.php-fpm.new:
+if [ -e etc/rc.d/rc.php-fpm ]; then
+  cp -a etc/rc.d/rc.php-fpm etc/rc.d/rc.php-fpm.new.incoming
+  cat etc/rc.d/rc.php-fpm.new > etc/rc.d/rc.php-fpm.new.incoming
+  mv etc/rc.d/rc.php-fpm.new.incoming etc/rc.d/rc.php-fpm.new
 fi
+config etc/rc.d/rc.php-fpm.new
+cp -a etc/httpd/php.ini-production etc/httpd/php.ini.new
+config etc/httpd/php.ini.new
+cp -a etc/php-fpm.conf.default etc/php-fpm.conf.new
+config etc/php-fpm.conf.new
diff --git a/source/n/php/fetch-php.sh b/source/n/php/fetch-php.sh
index 5833da49c..6542c8bb8 100755
--- a/source/n/php/fetch-php.sh
+++ b/source/n/php/fetch-php.sh
@@ -1 +1 @@
-lftpget http://us2.php.net/distributions/php-5.3.6.tar.bz2 
+lftpget http://us.php.net/distributions/php-5.4.7.tar.bz2 
diff --git a/source/n/php/php-fpm.conf.diff b/source/n/php/php-fpm.conf.diff
new file mode 100644
index 000000000..e749185b6
--- /dev/null
+++ b/source/n/php/php-fpm.conf.diff
@@ -0,0 +1,28 @@
+--- ./sapi/fpm/php-fpm.conf.in.orig	2012-05-20 19:47:53.000000000 +0200
++++ ./sapi/fpm/php-fpm.conf.in	2012-05-21 09:16:32.646276661 +0200
+@@ -12,7 +12,7 @@
+ ; Relative path can also be used. They will be prefixed by:
+ ;  - the global prefix if it's been set (-p arguement)
+ ;  - @prefix@ otherwise
+-;include=etc/fpm.d/*.conf
++;include=etc/php-fpm/*.conf
+ 
+ ;;;;;;;;;;;;;;;;;;
+ ; Global Options ;
+@@ -22,14 +22,14 @@
+ ; Pid file
+ ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
+ ; Default Value: none
+-;pid = run/php-fpm.pid
++pid = run/php-fpm.pid
+ 
+ ; Error log file
+ ; If it's set to "syslog", log is sent to syslogd instead of being written
+ ; in a local file.
+ ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
+ ; Default Value: log/php-fpm.log
+-;error_log = log/php-fpm.log
++error_log = log/php-fpm.log
+ 
+ ; syslog_facility is used to specify what type of program is logging the
+ ; message. This lets syslogd specify that messages from different facilities
diff --git a/source/n/php/php.SlackBuild b/source/n/php/php.SlackBuild
index 7a1fc1fd6..e475f824e 100755
--- a/source/n/php/php.SlackBuild
+++ b/source/n/php/php.SlackBuild
@@ -3,7 +3,7 @@
 # Build and package mod_php on Slackware.
 # by:  David Cantrell <david@slackware.com>
 # Modified for PHP 4-5 by volkerdi@slackware.com
-# Copyright 2007, 2008, 2009, 2010, 2011  Patrick Volkerding, Sebeka, MN, USA
+# Copyright 2007, 2008, 2009, 2010, 2011, 2012  Patrick Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,9 +24,9 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=5.3.6
-ALPINE=2.00
-BUILD=${BUILD:-6}
+VERSION=5.4.7
+ALPINE=2.02
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -71,7 +71,7 @@ if [ -r $IMAPLIBDIR/lib${LIBDIRSUFFIX}/c-client.a ]; then
   sleep 5
 else
   ( cd $CWD/../alpine ; ./alpine.SlackBuild || exit 1 ) || exit 1
-  ( cd $TMP/alpine-${ALPINE}/imap/c-client
+  ( cd $TMP/re-alpine-${ALPINE}/imap/c-client
     strip -g c-client.a
     mkdir -p $IMAPLIBDIR/lib${LIBDIRSUFFIX}
     cp c-client.a $IMAPLIBDIR/lib${LIBDIRSUFFIX}
@@ -126,32 +126,45 @@ find . -name "*.orig" -exec rm {} \;
 # Patch ini files:
 zcat $CWD/php.ini-development.diff.gz | patch -p1 --verbose || exit 1
 zcat $CWD/php.ini-development.diff.gz | patch -p1 --verbose php.ini-production || exit 1
-zcat $CWD/php.session.save_path.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/php-fpm.conf.diff.gz | patch -p1 --verbose || exit 1
+
+# Install the build folder into /usr/lib$LIBDIRSUFFIX/php/build
+# and adapt phpize accordingly:
+sed -i "s|build$|php/build|" scripts/Makefile.frag
+sed -i "s|build\"$|php/build\"|" scripts/phpize.in
 
 # Generic "kitchen sink" configure function, with as many things as possible (and
 # maybe then some ;-) compiled as shared extensions:
-php_configure() {
 EXTENSION_DIR=/usr/lib${LIBDIRSUFFIX}/php/extensions \
 CFLAGS="$SLKCFLAGS" \
 ./configure \
-  $* \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --with-libdir=lib${LIBDIRSUFFIX} \
+  --localstatedir=/var \
   --sysconfdir=/etc \
-  --disable-safe-mode \
-  --disable-magic-quotes \
-  --enable-zend-multibyte \
+  --datarootdir=/usr/share \
+  --datadir=/usr/share \
+  --infodir=/usr/info \
+  --mandir=/usr/man \
+  --with-apxs2=/usr/bin/apxs \
+  --enable-fpm \
+  --with-fpm-user=apache \
+  --with-fpm-group=apache \
+  --enable-maintainer-zts \
+  --enable-pcntl \
   --enable-mbregex \
   --enable-tokenizer=shared \
   --with-config-file-scan-dir=/etc/php \
   --with-config-file-path=/etc/httpd \
   --enable-mod_charset \
   --with-layout=PHP \
-  --enable-sigchild \
+  --disable-sigchild \
   --enable-xml \
   --with-libxml-dir=/usr \
   --enable-simplexml \
+  --enable-xmlreader=shared \
+  --enable-dom=shared \
   --enable-filter \
   --disable-debug \
   --with-openssl=shared \
@@ -177,7 +190,6 @@ CFLAGS="$SLKCFLAGS" \
   --with-freetype-dir=/usr \
   --with-t1lib=/usr \
   --enable-gd-native-ttf \
-  --enable-gd-jis-conv \
   --with-gettext=shared,/usr \
   --with-gmp=shared,/usr \
   --with-iconv=shared \
@@ -194,14 +206,11 @@ CFLAGS="$SLKCFLAGS" \
   --with-pdo-sqlite=shared,/usr \
   --with-pspell=shared,/usr \
   --with-enchant=shared,/usr \
-  --with-mm=/usr \
   --enable-shmop=shared \
   --with-snmp=shared,/usr \
   --enable-soap=shared \
   --enable-sockets \
-  --with-sqlite=shared \
   --with-sqlite3=shared \
-  --enable-sqlite-utf8 \
   --with-regex=php \
   --enable-sysvmsg \
   --enable-sysvsem \
@@ -210,12 +219,12 @@ CFLAGS="$SLKCFLAGS" \
   --with-xsl=shared,/usr \
   --enable-zip=shared \
   --with-tsrm-pthreads \
+  --enable-intl=shared \
   --enable-shared=yes \
   --enable-static=no \
   --with-gnu-ld \
   --with-pic \
   --build=$ARCH-slackware-linux
-}
 
 # I am told this option is worse than nothing.  :-)
 #  --enable-safe-mode
@@ -223,23 +232,12 @@ CFLAGS="$SLKCFLAGS" \
 # I would recommend *against* and will take no responbility for turning on
 # "safe" mode.
 
-# Make the Apache2 module version of PHP:
-php_configure \
-  --with-apxs2=/usr/sbin/apxs
 make $NUMJOBS || make || exit 1
 make install INSTALL_ROOT=$PKG || exit 1
 
-# Make the CLI/CGI version of PHP:
-make distclean
-php_configure \
-  --enable-pcntl \
-  --enable-sigchild
-make $NUMJOBS || make || exit 1
-mkdir -p $PKG/usr/bin
-cat ./sapi/cli/php > $PKG/usr/bin/php
-cat ./sapi/cgi/php-cgi > $PKG/usr/bin/php-cgi
-chmod 755 $PKG/usr/bin/php
-chmod 755 $PKG/usr/bin/php-cgi
+mkdir -p $PKG/etc/{rc.d,php-fpm}
+cp sapi/fpm/init.d.php-fpm $PKG/etc/rc.d/rc.php-fpm.new
+chmod 644 $PKG/etc/rc.d/rc.php-fpm.new
 
 # PHP (used to) install Pear with some strange permissions.
 chmod 755 $PKG/usr/bin/pear
@@ -249,6 +247,9 @@ chmod 755 $PKG/usr/bin/pear
   rm -rf .channels .depdb .depdblock .filemap .lock .registry
 )
 
+# We do not package static extension libraries:
+rm -f $PKG/usr/lib${LIBDIRSUFFIX}/php/extensions/*.a
+
 # Fix $PKG/usr/lib/php perms:
 ( cd $PKG/usr/lib${LIBDIRSUFFIX}/php
   find . \
diff --git a/source/n/php/php.ini-development.diff b/source/n/php/php.ini-development.diff
index 49b441e6b..8c582e4db 100644
--- a/source/n/php/php.ini-development.diff
+++ b/source/n/php/php.ini-development.diff
@@ -1,6 +1,6 @@
---- ./php.ini-development.orig	2011-02-08 18:25:44.000000000 -0600
-+++ ./php.ini-development	2011-04-01 22:42:50.000000000 -0500
-@@ -938,6 +938,44 @@
+--- ./php.ini-development.orig	2012-07-18 01:19:16.000000000 -0500
++++ ./php.ini-development	2012-08-08 20:06:33.512546116 -0500
+@@ -859,6 +859,46 @@
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
  ;
@@ -15,6 +15,7 @@
 +extension=ctype.so
 +extension=curl.so
 +extension=dba.so
++extension=dom.so
 +extension=enchant.so
 +extension=exif.so
 +extension=ftp.so
@@ -22,6 +23,7 @@
 +extension=gettext.so
 +extension=gmp.so
 +extension=iconv.so
++extension=intl.so
 +extension=ldap.so
 +extension=mbstring.so
 +extension=mysql.so
@@ -34,10 +36,10 @@
 +extension=shmop.so
 +extension=snmp.so
 +extension=soap.so
-+extension=sqlite.so
 +extension=sqlite3.so
 +extension=tokenizer.so
 +extension=wddx.so
++extension=xmlreader.so
 +extension=xsl.so
 +extension=zip.so
 +extension=zlib.so
@@ -45,3 +47,12 @@
  ; Windows Extensions
  ; Note that ODBC support is built in, so no dll is needed for it.
  ; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5)
+@@ -1391,7 +1431,7 @@
+ ; where MODE is the octal representation of the mode. Note that this
+ ; does not overwrite the process's umask.
+ ; http://php.net/session.save-path
+-;session.save_path = "/tmp"
++session.save_path = "/var/lib/php"
+ 
+ ; Whether to use cookies.
+ ; http://php.net/session.use-cookies
diff --git a/source/n/php/php.session.save_path.diff b/source/n/php/php.session.save_path.diff
deleted file mode 100644
index 60d6f072e..000000000
--- a/source/n/php/php.session.save_path.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./php.ini-development.orig	2011-04-14 14:26:44.551000001 -0500
-+++ ./php.ini-development	2011-04-14 14:38:48.591000954 -0500
-@@ -1506,7 +1506,7 @@
- ; where MODE is the octal representation of the mode. Note that this
- ; does not overwrite the process's umask.
- ; http://php.net/session.save-path
--;session.save_path = "/tmp"
-+session.save_path = "/var/lib/php"
- 
- ; Whether to use cookies.
- ; http://php.net/session.use-cookies
---- ./php.ini-production.orig	2011-04-14 14:26:44.558000001 -0500
-+++ ./php.ini-production	2011-04-14 14:39:09.598999155 -0500
-@@ -1513,7 +1513,7 @@
- ; where MODE is the octal representation of the mode. Note that this
- ; does not overwrite the process's umask.
- ; http://php.net/session.save-path
--;session.save_path = "/tmp"
-+session.save_path = "/var/lib/php"
- 
- ; Whether to use cookies.
- ; http://php.net/session.use-cookies
diff --git a/source/n/pidentd/pidentd.SlackBuild b/source/n/pidentd/pidentd.SlackBuild
index 051fdeb5f..2dbd49f47 100755
--- a/source/n/pidentd/pidentd.SlackBuild
+++ b/source/n/pidentd/pidentd.SlackBuild
@@ -21,7 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=3.0.19
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/n/popa3d/popa3d.SlackBuild b/source/n/popa3d/popa3d.SlackBuild
index fbf88a4fd..7f6713cd1 100755
--- a/source/n/popa3d/popa3d.SlackBuild
+++ b/source/n/popa3d/popa3d.SlackBuild
@@ -21,7 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=1.0.2
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/n/proftpd/proftpd.SlackBuild b/source/n/proftpd/proftpd.SlackBuild
index 17b2c9088..bce1b00ea 100755
--- a/source/n/proftpd/proftpd.SlackBuild
+++ b/source/n/proftpd/proftpd.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,9 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=1.3.3e
-DIRVER=1.3.3e
-BUILD=${BUILD:-1}
+VERSION=1.3.4a
+DIRVER=1.3.4a
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -81,7 +81,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-ctrls \
   --enable-ipv6 \
   --localstatedir=/var/run \
-  --with-modules=mod_readme:mod_ratio:mod_tls:mod_wrap:mod_ctrls_admin \
+  --with-modules=mod_ban:mod_readme:mod_ratio:mod_tls:mod_wrap:mod_ctrls_admin \
   --build=$ARCH-slackware-linux
 # This caused funny messages about "Quotas off" with every FTP command,
 # and mod_wrap gets a compile error:
@@ -99,6 +99,10 @@ cat $CWD/etc/proftpd.conf > $PKG/etc/proftpd.conf.new
 cat $CWD/etc/ftpusers > $PKG/etc/ftpusers.new
 mkdir -p $PKG/home/ftp
 
+# Directory used by mod_ban:
+mkdir -p $PKG/var/db/proftpd
+chown nobody:nogroup $PKG/var/db/proftpd
+
 gzip -9 $PKG/usr/man/man?/*.?
 
 mkdir -p $PKG/usr/doc/proftpd-$VERSION
diff --git a/source/n/pssh/pssh.SlackBuild b/source/n/pssh/pssh.SlackBuild
index d0870d785..a251d4b96 100755
--- a/source/n/pssh/pssh.SlackBuild
+++ b/source/n/pssh/pssh.SlackBuild
@@ -22,7 +22,7 @@
 
 # required: package "python" version 2.2 or higher installed
 
-VERSION=2.2
+VERSION=2.3.1
 BUILD=1
 
 # Automatically determine the architecture we're building on:
diff --git a/source/n/rt2860-firmware/rt2860-firmware.SlackBuild b/source/n/rt2860-firmware/rt2860-firmware.SlackBuild
deleted file mode 100755
index 280b276ff..000000000
--- a/source/n/rt2860-firmware/rt2860-firmware.SlackBuild
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-
-# Copyright 2006, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-CWD=$(pwd)
-
-PKGNAM=rt2860-firmware
-VERSION=${VERSION:-26}
-ARCH=${ARCH:-fw}
-BUILD=${BUILD:-1}
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-${PKGNAM}
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
-cd $TMP
-rm -rf RT2860_Firmware_V${VERSION}
-unzip $CWD/RT2860_Firmware_V${VERSION}.zip || exit 1
-cd RT2860_Firmware_V${VERSION}
-
-# Make sure ownerships and permissions are sane:
-chown -R root:root .
-find . \
-  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \; -o \
-  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \;
-
-# Install:
-mkdir -p $PKG/lib/firmware
-mv LICEN* $PKG/lib/firmware/LICENSE.ralink-firmware-RT2860_Firmware_V${VERSION}.txt
-mv * $PKG/lib/firmware
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/n/rt2860-firmware/slack-desc b/source/n/rt2860-firmware/slack-desc
deleted file mode 100644
index 6cdecaecf..000000000
--- a/source/n/rt2860-firmware/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-               |-----handy-ruler------------------------------------------------------|
-rt2860-firmware: rt2860-firmware (RT28XX/RT30XX PCI/mPCI/PCIe/CardBus firmware)
-rt2860-firmware:
-rt2860-firmware: This is firmware for PCI, mPCI, PCIe, and Cardbus wireless cards
-rt2860-firmware: using the Ralink RT2760, RT2790, RT2860, RT2890, RT3060, RT3062,
-rt2860-firmware: RT3562, RT2860, RT2760, RT2890, RT2790, and RT3090 wireless chipsets.
-rt2860-firmware:
-rt2860-firmware:
-rt2860-firmware:
-rt2860-firmware:
-rt2860-firmware:
-rt2860-firmware:
diff --git a/source/n/rt2870-firmware/rt2870-firmware.SlackBuild b/source/n/rt2870-firmware/rt2870-firmware.SlackBuild
deleted file mode 100755
index 28542412e..000000000
--- a/source/n/rt2870-firmware/rt2870-firmware.SlackBuild
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-
-# Copyright 2006, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-CWD=$(pwd)
-
-PKGNAM=rt2870-firmware
-VERSION=${VERSION:-22}
-ARCH=${ARCH:-fw}
-BUILD=${BUILD:-1}
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-${PKGNAM}
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
-cd $TMP
-rm -rf RT2870_Firmware_V${VERSION}
-unzip $CWD/RT2870_Firmware_V${VERSION}.zip || exit 1
-cd RT2870_Firmware_V${VERSION}
-
-# Make sure ownerships and permissions are sane:
-chown -R root:root .
-find . \
-  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \; -o \
-  \( -perm 666 -o -perm 664 -o -perm 700 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \;
-
-# Install:
-mkdir -p $PKG/lib/firmware
-mv LICEN* $PKG/lib/firmware/LICENSE.ralink-firmware-RT2870_Firmware_V${VERSION}.txt
-mv * $PKG/lib/firmware
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/n/rt2870-firmware/slack-desc b/source/n/rt2870-firmware/slack-desc
deleted file mode 100644
index 1b01f4947..000000000
--- a/source/n/rt2870-firmware/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-               |-----handy-ruler------------------------------------------------------|
-rt2870-firmware: rt2870-firmware (RT28XX/RT30XX USB firmware)
-rt2870-firmware:
-rt2870-firmware: This is firmware for USB wireless devices using Ralink RT2870, RT2770,
-rt2870-firmware: RT3572, and RT3070 wireless chipsets.
-rt2870-firmware:
-rt2870-firmware:
-rt2870-firmware:
-rt2870-firmware:
-rt2870-firmware:
-rt2870-firmware:
-rt2870-firmware:
diff --git a/source/n/rt61-firmware/rt61-firmware.SlackBuild b/source/n/rt61-firmware/rt61-firmware.SlackBuild
deleted file mode 100755
index 7734f9ee8..000000000
--- a/source/n/rt61-firmware/rt61-firmware.SlackBuild
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-
-# Copyright 2006, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-CWD=$(pwd)
-
-PKGNAM=rt61-firmware
-VERSION=${VERSION:-1.2}
-ARCH=${ARCH:-fw}
-BUILD=${BUILD:-1}
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-${PKGNAM}
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
-cd $TMP
-rm -rf RT61_Firmware_V${VERSION}
-unzip $CWD/RT61_Firmware_V${VERSION}.zip || exit 1
-cd RT61_Firmware_V${VERSION}
-
-# Make sure ownerships and permissions are sane:
-chown -R root:root .
-find . \
-  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \; -o \
-  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \;
-
-# Install:
-mkdir -p $PKG/lib/firmware
-mv LICEN* $PKG/lib/firmware/LICENSE.ralink-firmware-RT61_Firmware_V${VERSION}.txt
-mv * $PKG/lib/firmware
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/n/rt61-firmware/slack-desc b/source/n/rt61-firmware/slack-desc
deleted file mode 100644
index 584771e94..000000000
--- a/source/n/rt61-firmware/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-             |-----handy-ruler------------------------------------------------------|
-rt61-firmware: rt61-firmware (Firmware for Ralink rt61 wireless chips)
-rt61-firmware:
-rt61-firmware: This is firmware for the Ralink rt61 wireless chip.
-rt61-firmware:
-rt61-firmware:
-rt61-firmware:
-rt61-firmware:
-rt61-firmware:
-rt61-firmware:
-rt61-firmware:
-rt61-firmware:
diff --git a/source/n/rt71w-firmware/rt71w-firmware.SlackBuild b/source/n/rt71w-firmware/rt71w-firmware.SlackBuild
deleted file mode 100755
index 05fae27a8..000000000
--- a/source/n/rt71w-firmware/rt71w-firmware.SlackBuild
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/sh
-
-# Copyright 2006, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-PKGNAM=rt71w-firmware
-VERSION=${VERSION:-1.8}
-ARCH=${ARCH:-fw}
-BUILD=${BUILD:-1}
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-${PKGNAM}
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
-cd $TMP
-rm -rf RT71W_Firmware_V${VERSION}
-unzip $CWD/RT71W_Firmware_V${VERSION}.zip || exit 1
-cd RT71W_Firmware_V${VERSION} || exit 1
-
-# Make sure ownerships and permissions are sane:
-chown -R root:root .
-find . \
-  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \; -o \
-  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \;
-
-# Install:
-mkdir -p $PKG/lib/firmware
-mv LICEN* $PKG/lib/firmware/LICENSE.ralink-firmware-RT71W_Firmware_V${VERSION}.txt
-mv * $PKG/lib/firmware
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/n/rt71w-firmware/slack-desc b/source/n/rt71w-firmware/slack-desc
deleted file mode 100644
index 57fc43e97..000000000
--- a/source/n/rt71w-firmware/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-              |-----handy-ruler------------------------------------------------------|
-rt71w-firmware: rt71w-firmware (Firmware for Ralink rt71w wireless chips)
-rt71w-firmware:
-rt71w-firmware: This is firmware for the Ralink rt71w wireless chip.
-rt71w-firmware:
-rt71w-firmware:
-rt71w-firmware:
-rt71w-firmware:
-rt71w-firmware:
-rt71w-firmware:
-rt71w-firmware:
-rt71w-firmware:
diff --git a/source/n/samba/samba.SlackBuild b/source/n/samba/samba.SlackBuild
index b7cbeefdd..16db23417 100755
--- a/source/n/samba/samba.SlackBuild
+++ b/source/n/samba/samba.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2012  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -101,8 +101,6 @@ CFLAGS="$SLKCFLAGS" \
   --enable-shared=yes \
   --with-acl-support=yes \
   --with-automount \
-  --with-cifsmount \
-  --with-cifsumount \
   --with-quotas \
   --with-syslog \
   --with-utmp \
@@ -137,37 +135,13 @@ cp -a ../nsswitch/libnss_wins.so $PKG/lib${LIBDIRSUFFIX}/libnss_wins.so.2
   ln -sf libnss_wins.so.2 libnss_wins.so
 )
 
-# Install a pkgconfig file for libtalloc:
+# Install pkgconfig files:
 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig
+cp -a pkgconfig/*.pc $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig
 if [ ! -r $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/talloc.pc ]; then
   cat $CWD/talloc.pc | sed -e "s/\/lib/\/lib${LIBDIRSUFFIX}/" > $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/talloc.pc
 fi
 
-## Make sure that other programs can link against libsmbclient:
-#( cd $PKG/usr/lib${LIBDIRSUFFIX}
-#  for FILE in samba/libsmbclient.so* ; do
-#    ln -sf $FILE
-#  done
-#)
-
-# Add some (u)mount links:
-mkdir -p $PKG/sbin
-( cd $PKG/sbin
-  # SMBFS is obsolete in the kernel now -- use mount.cifs
-  #rm -f mount.smbfs ; ln -sf /usr/bin/smbmount mount.smbfs
-  # Add a wrapper script from Debian that's included in the upstream Samba
-  # sources to help out people (like me ;-) who don't read every speck of
-  # documentation:
-  cat $TMP/samba-$VERSION/examples/scripts/mount/mount.smbfs > mount.smbfs
-  chmod 755 $PKG/sbin/mount.smbfs
-  # I suppose this wouldn't be the worst idea in the world, either:
-  ( cd $PKG/usr/bin ; ln -sf /sbin/mount.smbfs smbmount )
-  rm -f mount.cifs ; ln -sf /usr/sbin/mount.cifs mount.cifs
-  # smbumount was giving me problems so it seems wise to play it safe
-  #rm -f umount.smbfs ; ln -sf /usr/bin/smbumount umount.smbfs
-  #rm -f umount.cifs ; ln -sf /usr/sbin/umount.cifs umount.cifs
-)
-
 # Add a sample config file:
 cat $CWD/smb.conf.default > $PKG/etc/samba/smb.conf-sample
 
diff --git a/source/n/samba/slack-desc b/source/n/samba/slack-desc
index c06b485d9..f4352c607 100644
--- a/source/n/samba/slack-desc
+++ b/source/n/samba/slack-desc
@@ -6,11 +6,11 @@
 # customary to leave one space after the ':'.
 
      |-----handy-ruler------------------------------------------------------|
-samba: samba (SMB/CIFS file and print server)
+samba: samba (CIFS file and print server)
 samba:
-samba: Samba is an SMB/CIFS file and print server for SMB and CIFS clients.
-samba: It allows you to make file space or printers on a Samba host
-samba: available to SMB/CIFS clients (such as PCs running Windows).
+samba: Samba is a CIFS file and print server for CIFS clients.  It allows
+samba: you to make file space or printers on a Samba host available to CIFS
+samba: clients (such as PCs running Windows).
 samba:
 samba: If you have any Windows file servers, you may be able to replace them
 samba: or supplement them with Samba.  One of Samba's big strengths is
diff --git a/source/n/sendmail/8.14.5.auth2.p0 b/source/n/sendmail/8.14.5.auth2.p0
new file mode 100644
index 000000000..13cdacc77
--- /dev/null
+++ b/source/n/sendmail/8.14.5.auth2.p0
@@ -0,0 +1,23 @@
+--- sendmail.h-	Tue May 24 16:24:39 2011
++++ sendmail.h	Tue May 24 16:25:29 2011
+@@ -721,9 +721,9 @@
+ #if STARTTLS
+ #define MCIF_TLS	0x00100000	/* STARTTLS supported */
+ #define MCIF_TLSACT	0x00200000	/* STARTTLS active */
+-#define MCIF_EXTENS	(MCIF_EXPN | MCIF_SIZE | MCIF_8BITMIME | MCIF_DSN | MCIF_8BITOK | MCIF_AUTH | MCIF_ENHSTAT | MCIF_TLS)
+ #else /* STARTTLS */
+-#define MCIF_EXTENS	(MCIF_EXPN | MCIF_SIZE | MCIF_8BITMIME | MCIF_DSN | MCIF_8BITOK | MCIF_AUTH | MCIF_ENHSTAT)
++#define MCIF_TLS	0
++#define MCIF_TLSACT	0
+ #endif /* STARTTLS */
+ #define MCIF_DLVR_BY	0x00400000	/* DELIVERBY */
+ #if _FFR_IGNORE_EXT_ON_HELO
+@@ -732,6 +732,8 @@
+ #define MCIF_INLONGLINE 0x01000000	/* in the middle of a long line */
+ #define MCIF_AUTH2	0x02000000	/* got 2 AUTH lines */
+ #define MCIF_ONLY_EHLO	0x10000000	/* use only EHLO in smtpinit */
++
++#define MCIF_EXTENS	(MCIF_EXPN | MCIF_SIZE | MCIF_8BITMIME | MCIF_DSN | MCIF_8BITOK | MCIF_AUTH | MCIF_ENHSTAT | MCIF_TLS | MCIF_AUTH2)
+ 
+ /* states */
+ #define MCIS_CLOSED	0		/* no traffic on this connection */
diff --git a/source/n/sendmail/SlackBuild-sendmail b/source/n/sendmail/SlackBuild-sendmail
index aec918ca7..17c79a24e 100755
--- a/source/n/sendmail/SlackBuild-sendmail
+++ b/source/n/sendmail/SlackBuild-sendmail
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2012  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,8 +20,8 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=8.14.4
-BUILD=${BUILD:-1}
+VERSION=8.14.5
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -68,6 +68,11 @@ rm -rf sendmail-$VERSION
 tar xvf $CWD/sendmail.$VERSION.tar.gz || exit 1
 cd sendmail-$VERSION
 
+# Upstream patch to fix broken SMTP AUTH in Sendmail 8.14.5:
+cd sendmail
+cat $CWD/8.14.5.auth2.p0 | patch -p0 --verbose || exit 1
+cd ..
+
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/source/n/sendmail/SlackBuild-sendmail-cf b/source/n/sendmail/SlackBuild-sendmail-cf
index d54370b98..e24570415 100755
--- a/source/n/sendmail/SlackBuild-sendmail-cf
+++ b/source/n/sendmail/SlackBuild-sendmail-cf
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2012  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,9 +20,9 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=8.14.4
+VERSION=8.14.5
 ARCH=noarch
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
diff --git a/source/n/slrn/slrn.SlackBuild b/source/n/slrn/slrn.SlackBuild
index d983724d3..d6f2a8f7e 100755
--- a/source/n/slrn/slrn.SlackBuild
+++ b/source/n/slrn/slrn.SlackBuild
@@ -22,7 +22,7 @@
 
 
 VERSION=0.9.9p1
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/n/snownews/snownews.SlackBuild b/source/n/snownews/snownews.SlackBuild
index 724cab547..75bc28757 100755
--- a/source/n/snownews/snownews.SlackBuild
+++ b/source/n/snownews/snownews.SlackBuild
@@ -22,7 +22,7 @@
 
 PKGNAM=snownews
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/n/tcpdump/tcpdump.SlackBuild b/source/n/tcpdump/tcpdump.SlackBuild
index 1ff4795f3..2462d4165 100755
--- a/source/n/tcpdump/tcpdump.SlackBuild
+++ b/source/n/tcpdump/tcpdump.SlackBuild
@@ -51,6 +51,10 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf tcpdump-$VERSION
+
+# To (try to) avoid weird errors, take an axe to this:
+rm -rf $TMP/libpcap-?.?.?
+
 tar xvf $CWD/tcpdump-$VERSION.tar.gz || exit 1
 cd tcpdump-$VERSION || exit 1
 find . -type d -name CVS -depth -exec rm -rf {} \;
diff --git a/source/n/telnet/slack-desc b/source/n/telnet/slack-desc
index 89ba84c3f..2eb4d62ec 100644
--- a/source/n/telnet/slack-desc
+++ b/source/n/telnet/slack-desc
@@ -11,7 +11,7 @@ telnet:
 telnet: telnet supports the original DARPA telnet interactive communication
 telnet: protocol.  As connecting to a telnetd server transmits your password
 telnet: over the network in cleartext, telnet's use as a login protocol has
-telnet: been mostly superceded by the use of ssh and sshd.  However, the
+telnet: been mostly superseded by the use of ssh and sshd.  However, the
 telnet: telnet client is still a very handy tool, and telnetd may still have
 telnet: some uses on networks that are known to be secure.
 telnet:
diff --git a/source/n/vsftpd/vsftpd.SlackBuild b/source/n/vsftpd/vsftpd.SlackBuild
index 93582dbb9..9a2e7fc88 100755
--- a/source/n/vsftpd/vsftpd.SlackBuild
+++ b/source/n/vsftpd/vsftpd.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,7 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PKGNAM=vsftpd
-VERSION=${VERSION:-$(echo ${PKGNAM}-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo ${PKGNAM}-*.tar.gz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
@@ -51,7 +51,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP || exit 1
 rm -rf vsftpd-$VERSION
-tar xvf $CWD/vsftpd-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/vsftpd-$VERSION.tar.gz || exit 1
 cd vsftpd-$VERSION || exit 1
 chown -R root:root .
 find . \
diff --git a/source/n/wget/wget.SlackBuild b/source/n/wget/wget.SlackBuild
index e79de18cc..6706c161f 100755
--- a/source/n/wget/wget.SlackBuild
+++ b/source/n/wget/wget.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2012  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,7 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=${VERSION:-$(echo wget-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo wget-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
@@ -56,7 +56,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf wget-$VERSION
-tar xvf $CWD/wget-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/wget-$VERSION.tar.xz || exit 1
 cd wget-$VERSION
 chown -R root:root .
 find . \
@@ -72,6 +72,7 @@ CFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --infodir=/usr/info \
   --docdir=/usr/doc/wget-$VERSION \
+  --with-ssl=openssl \
   --build=${ARCH}-slackware-linux
 
 make $NUMJOBS || make || exit 1
diff --git a/source/n/whois/whois.SlackBuild b/source/n/whois/whois.SlackBuild
index 4b024015e..7a98ac317 100755
--- a/source/n/whois/whois.SlackBuild
+++ b/source/n/whois/whois.SlackBuild
@@ -41,7 +41,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf whois-$VERSION
-tar xvf $CWD/whois_$VERSION.tar.gz || exit 1
+tar xvf $CWD/whois_$VERSION.tar.?z* || exit 1
 cd whois-$VERSION
 chown -R root:root .
 find . \
diff --git a/source/n/wireless-tools/scripts/rc.wireless b/source/n/wireless-tools/scripts/rc.wireless
index 5d5c4be5b..51623d506 100644
--- a/source/n/wireless-tools/scripts/rc.wireless
+++ b/source/n/wireless-tools/scripts/rc.wireless
@@ -53,6 +53,11 @@
 #                                if a network device is wireless.  In newer
 #                                kernels devices will not show up in
 #                                /proc/net/wireless until active.
+# 16/aug/2012 * Pat Volkerding * Use several tests to determine if an interface
+#                                is wireless, as the reliability of any given
+#                                test may depend on the kernel options and the
+#                                wireless driver used.
+#                                Convert the MAC address to uppercase in sed.
 # ------------------------------------------------------------------------------
 
 LOGGER=${LOGGER:-cat}
@@ -83,16 +88,15 @@ IFCOMMAND="/sbin/ifconfig ${INTERFACE}"
 
 is_wireless_device ()
 {
-    #[ -x $IWPATH/iwconfig ] || return 1
-    #LC_ALL=C $IWPATH/iwconfig $1 2>&1 | \
-    #    grep -Eiq "no wireless extensions|no such device" || return 0
-    #return 1
-    if [ ! -d /sys/class/net/${1}/wireless ]; then
-      # no wireless interface
-      return 1
-    else
-      # interface has wireless extensions
-      return 0
+    # Return 0 for a wireless interface, or 1 for a non-wireless interface.
+    if LC_ALL=C $IWPATH/iwconfig $1 2>&1 | grep -q "IEEE 802.11" ; then
+        return 0
+    elif [ -d /sys/class/net/${1}/wireless ]; then
+        return 0
+    elif [ "$(cat /sys/class/net/${1}/uevent | grep DEVTYPE)" = "DEVTYPE=wlan" ]; then 
+        return 0
+    else # all tests failed, assume the device is not wireless (or add a better test :)
+        return 1
     fi
 }
 
@@ -106,7 +110,7 @@ is_wireless_device ${INTERFACE} || return 0 2> /dev/null || exit 0
 # If we stop a wireless interface using wpa_supplicant,
 # we'll kill its wpa_supplicant daemon too and exit this script:
 if [ "$2" = "stop" ]; then
-	WPAPID=`echo \`ps axww|grep wpa_supplicant |grep i${INTERFACE}\` |cut -f1 -d' '`
+	WPAPID=$(echo $(ps axww | grep wpa_supplicant | grep i${INTERFACE}) | cut -f1 -d' ')
 	[ ${WPAPID} ] &&  kill ${WPAPID}
 	return 0
 fi
@@ -120,7 +124,7 @@ $IFCOMMAND up
 sleep 3
 
 # Get the MAC address for the interface
-HWADDR=`/sbin/ifconfig ${INTERFACE} | sed -ne 's/.*\(..:..:..:..:..:..\).*/\1/p' | tr [a-f] [A-F]`
+HWADDR=$(/sbin/ifconfig ${INTERFACE} | sed -ne 's/.*\(..:..:..:..:..:..\).*/\U\1/p')
 
 # Empty all wireless parameters- some of them could still be set for a previous interface:
 # when rc.inet1 is sourced from rc.M all scripts are run in the same shell.
@@ -193,7 +197,7 @@ if [ -n "$MODE" ] ; then
 fi
 # This is a bit hackish, but should do the job right...
 if [ ! -n "$NICKNAME" ] ; then
-    NICKNAME=`/bin/hostname`
+    NICKNAME=$(/bin/hostname)
 fi
 if [ -n "$ESSID" -o -n "$MODE" ] ; then
 	echo "$0:  $IWCOMMAND nick $NICKNAME" | $LOGGER
@@ -290,7 +294,7 @@ if [ "$WPA" = "wpa_supplicant" ] || [ "$WPA" = "wpaxsupplicant" ] && [ -x ${SUPP
 	[ ${WPA} = "wpaxsupplicant" ] && WPA_OPTIONS="${WPA_OPTIONS} -e" # Use external xsupplicant (disables the internal supplicant)
 
 	# We leave a running wpa_supplicant process in peace:
-	WPAPID=`echo \`ps axww|grep wpa_supplicant |grep i${INTERFACE}\` |cut -f1 -d' '`
+	WPAPID=$(echo $(ps axww | grep wpa_supplicant | grep i${INTERFACE}) | cut -f1 -d' ')
 	if [ ${WPAPID} ]; then
 	  echo "$0:  wpa_supplicant found running already" | $LOGGER
 	else
@@ -307,9 +311,9 @@ if [ "$WPA" = "wpa_supplicant" ] || [ "$WPA" = "wpaxsupplicant" ] && [ -x ${SUPP
 	while [ $wi -lt $WPAWAIT ]; do
 	  wi=$(($wi+1)); sleep 1
 	  if (grep -q "^ctrl_interface=" ${WPACONF}); then
-	    if (LC_ALL=C ${SUPPATH}/wpa_cli -i$INTERFACE status|grep -q "^wpa_state=COMPLETED"); then break; fi
+	    if (LC_ALL=C ${SUPPATH}/wpa_cli -i$INTERFACE status | grep -q "^wpa_state=COMPLETED"); then break; fi
 	  else
-	    if (LC_ALL=C ${IWCOMMAND}|grep -Eq "Encryption key:....-"); then break; fi
+	    if (LC_ALL=C ${IWCOMMAND} | grep -Eq "Encryption key:....-"); then break; fi
 	  fi
 	done
 	if [ $wi -eq $WPAWAIT ]; then
diff --git a/source/n/wireless-tools/wireless_tools.SlackBuild b/source/n/wireless-tools/wireless_tools.SlackBuild
index 2e78f0f9c..21607d3dd 100755
--- a/source/n/wireless-tools/wireless_tools.SlackBuild
+++ b/source/n/wireless-tools/wireless_tools.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2012  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,7 +22,7 @@
 
 
 VERSION=29
-BUILD=${BUILD:-6}
+BUILD=${BUILD:-9}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/n/wpa_supplicant/wpa_supplicant.defconfig b/source/n/wpa_supplicant/config/dot.config
index 2c530fdc2..f4d7306b9 100644
--- a/source/n/wpa_supplicant/wpa_supplicant.defconfig
+++ b/source/n/wpa_supplicant/config/dot.config
@@ -1,27 +1,42 @@
-CONFIG_DRIVER_HOSTAP=y
-CONFIG_DRIVER_NDISWRAPPER=y
-CONFIG_DRIVER_ATMEL=y
-CONFIG_DRIVER_IPW=y
-CONFIG_DRIVER_RALINK=y
-CONFIG_DRIVER_WEXT=y
+CONFIG_BACKEND=file
+CONFIG_BGSCAN_SIMPLE=y
+CONFIG_CTRL_IFACE=y
+CONFIG_CTRL_IFACE_DBUS=y
+CONFIG_CTRL_IFACE_DBUS_INTRO=y
+CONFIG_CTRL_IFACE_DBUS_NEW=y
+CONFIG_DEBUG_FILE=y
 CONFIG_DRIVER_NL80211=y
+CONFIG_DRIVER_WEXT=y
 CONFIG_DRIVER_WIRED=y
-CONFIG_IEEE8021X_EAPOL=y
+CONFIG_EAP_AKA=y
+CONFIG_EAP_FAST=y
+CONFIG_EAP_GPSK=y
+CONFIG_EAP_GPSK_SHA256=y
+CONFIG_EAP_GTC=y
+CONFIG_EAP_IKEV2=y
+CONFIG_EAP_LEAP=y
 CONFIG_EAP_MD5=y
 CONFIG_EAP_MSCHAPV2=y
-CONFIG_EAP_TLS=y
+CONFIG_EAP_OTP=y
+CONFIG_EAP_PAX=y
 CONFIG_EAP_PEAP=y
+CONFIG_EAP_SAKE=y
+CONFIG_EAP_TLS=y
+CONFIG_EAP_TNC=y
 CONFIG_EAP_TTLS=y
-CONFIG_EAP_GTC=y
-CONFIG_EAP_OTP=y
-CONFIG_EAP_LEAP=y
-CONFIG_WPS=y
+CONFIG_IEEE8021X_EAPOL=y
+CONFIG_LIBNL32=y
+CONFIG_PEERKEY=y
 CONFIG_PKCS12=y
-CONFIG_SMARTCARD=y
-CONFIG_CTRL_IFACE=y
 CONFIG_READLINE=y
-CONFIG_BACKEND=file
-CONFIG_PEERKEY=y
-CONFIG_CTRL_IFACE_DBUS=y
-CONFIG_CTRL_IFACE_DBUS_NEW=y
-CONFIG_CTRL_IFACE_DBUS_INTRO=y
+CONFIG_SMARTCARD=y
+CONFIG_WPS=y
+
+# These five are not defined by Fedora
+# Do we still need them?
+#CONFIG_DRIVER_ATMEL=y
+#CONFIG_DRIVER_HOSTAP=y
+#CONFIG_DRIVER_IPW=y
+#CONFIG_DRIVER_NDISWRAPPER=y
+#CONFIG_DRIVER_RALINK=y
+
diff --git a/source/n/wpa_supplicant/config/wpa_gui.desktop b/source/n/wpa_supplicant/config/wpa_gui.desktop
new file mode 100644
index 000000000..31b8b6b01
--- /dev/null
+++ b/source/n/wpa_supplicant/config/wpa_gui.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=wpa_gui
+Comment[en]=Wpa_supplicant management
+Exec=kdesu wpa_gui
+Icon=wpa_gui
+Type=Application
+Categories=Qt;Network;
diff --git a/source/n/wpa_supplicant/wpa_gui.png b/source/n/wpa_supplicant/config/wpa_gui.png
index a72f35691..a72f35691 100644
--- a/source/n/wpa_supplicant/wpa_gui.png
+++ b/source/n/wpa_supplicant/config/wpa_gui.png
diff --git a/source/n/wpa_supplicant/config/wpa_supplicant.conf b/source/n/wpa_supplicant/config/wpa_supplicant.conf
new file mode 100644
index 000000000..4dbbf96a1
--- /dev/null
+++ b/source/n/wpa_supplicant/config/wpa_supplicant.conf
@@ -0,0 +1,2 @@
+ctrl_interface=/var/run/wpa_supplicant
+ctrl_interface_group=root
diff --git a/source/n/wpa_supplicant/config/wpa_supplicant.logrotate b/source/n/wpa_supplicant/config/wpa_supplicant.logrotate
new file mode 100644
index 000000000..bd7ef91cc
--- /dev/null
+++ b/source/n/wpa_supplicant/config/wpa_supplicant.logrotate
@@ -0,0 +1,6 @@
+/var/log/wpa_supplicant.log {
+    missingok
+    notifempty
+    size 30k
+    create 0600 root root
+}
diff --git a/source/n/wpa_supplicant/doinst.sh b/source/n/wpa_supplicant/doinst.sh
new file mode 100644
index 000000000..6052fca4a
--- /dev/null
+++ b/source/n/wpa_supplicant/doinst.sh
@@ -0,0 +1,15 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/wpa_supplicant.conf.new
+config etc/logrotate.d/wpa_supplicant.new
diff --git a/source/n/wpa_supplicant/fi.epitest.hostap.WPASupplicant.service b/source/n/wpa_supplicant/fi.epitest.hostap.WPASupplicant.service
deleted file mode 100644
index e8b4250b4..000000000
--- a/source/n/wpa_supplicant/fi.epitest.hostap.WPASupplicant.service
+++ /dev/null
@@ -1,4 +0,0 @@
-[D-BUS Service]
-Name=fi.epitest.hostap.WPASupplicant
-Exec=/usr/sbin/wpa_supplicant -u
-User=root
diff --git a/source/n/wpa_supplicant/hostap-07.git-b80b5639935d37b95d00f86b57f2844a9c775f57.patch b/source/n/wpa_supplicant/hostap-07.git-b80b5639935d37b95d00f86b57f2844a9c775f57.patch
deleted file mode 100644
index 4c5002003..000000000
--- a/source/n/wpa_supplicant/hostap-07.git-b80b5639935d37b95d00f86b57f2844a9c775f57.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From b80b5639935d37b95d00f86b57f2844a9c775f57 Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw@redhat.com>
-Date: Fri, 17 Dec 2010 15:56:01 +0200
-Subject: [PATCH] dbus: Emit property changed events when adding/removing BSSes
-
-The supplicant was not emitting property changed events when the BSSs
-property changed.
-
-Signed-off-by: Dan Williams <dcbw@redhat.com>
-(cherry picked from commit 1e6288df6b07a353a9246b77e0de2a840b5f2c72)
----
- wpa_supplicant/dbus/dbus_new.c |    6 ++++++
- wpa_supplicant/dbus/dbus_new.h |    1 +
- 2 files changed, 7 insertions(+), 0 deletions(-)
-
-diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c
-index bdfbbac..c66640a 100644
---- a/wpa_supplicant/dbus/dbus_new.c
-+++ b/wpa_supplicant/dbus/dbus_new.c
-@@ -691,6 +691,10 @@ void wpas_dbus_signal_prop_changed(struct wpa_supplicant *wpa_s,
- 			wpas_dbus_getter_current_network;
- 		prop = "CurrentNetwork";
- 		break;
-+	case WPAS_DBUS_PROP_BSSS:
-+		getter = (WPADBusPropertyAccessor) wpas_dbus_getter_bsss;
-+		prop = "BSSs";
-+		break;
- 	default:
- 		wpa_printf(MSG_ERROR, "dbus: %s: Unknown Property value %d",
- 			   __func__, property);
-@@ -1199,6 +1203,7 @@ int wpas_dbus_unregister_bss(struct wpa_supplicant *wpa_s,
- 	}
- 
- 	wpas_dbus_signal_bss_removed(wpa_s, bss_obj_path);
-+	wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS);
- 
- 	return 0;
- }
-@@ -1263,6 +1268,7 @@ int wpas_dbus_register_bss(struct wpa_supplicant *wpa_s,
- 	}
- 
- 	wpas_dbus_signal_bss_added(wpa_s, bss_obj_path);
-+	wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS);
- 
- 	return 0;
- 
-diff --git a/wpa_supplicant/dbus/dbus_new.h b/wpa_supplicant/dbus/dbus_new.h
-index 80ea98c..9cdefcb 100644
---- a/wpa_supplicant/dbus/dbus_new.h
-+++ b/wpa_supplicant/dbus/dbus_new.h
-@@ -30,6 +30,7 @@ enum wpas_dbus_prop {
- 	WPAS_DBUS_PROP_STATE,
- 	WPAS_DBUS_PROP_CURRENT_BSS,
- 	WPAS_DBUS_PROP_CURRENT_NETWORK,
-+	WPAS_DBUS_PROP_BSSS,
- };
- 
- enum wpas_dbus_bss_prop {
--- 
-1.7.4-rc1
-
diff --git a/source/n/wpa_supplicant/patches/dbus-service-file-args.diff b/source/n/wpa_supplicant/patches/dbus-service-file-args.diff
new file mode 100644
index 000000000..7e2449f2e
--- /dev/null
+++ b/source/n/wpa_supplicant/patches/dbus-service-file-args.diff
@@ -0,0 +1,20 @@
+diff -Nur wpa_supplicant-1.0-rc3.orig/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in wpa_supplicant-1.0-rc3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in
+--- wpa_supplicant-1.0-rc3.orig/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in	2012-04-16 15:15:40.000000000 -0500
++++ wpa_supplicant-1.0-rc3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in	2012-05-06 01:07:44.523999837 -0500
+@@ -1,5 +1,5 @@
+ [D-BUS Service]
+ Name=fi.epitest.hostap.WPASupplicant
+-Exec=@BINDIR@/wpa_supplicant -u
++Exec=@BINDIR@/wpa_supplicant -B -u -f /var/log/wpa_supplicant.log -P /var/run/wpa_supplicant.pid
+ User=root
+ SystemdService=wpa_supplicant.service
+diff -Nur wpa_supplicant-1.0-rc3.orig/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in wpa_supplicant-1.0-rc3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in
+--- wpa_supplicant-1.0-rc3.orig/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in	2012-04-16 15:15:40.000000000 -0500
++++ wpa_supplicant-1.0-rc3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in	2012-05-06 01:06:59.528589953 -0500
+@@ -1,5 +1,5 @@
+ [D-BUS Service]
+ Name=fi.w1.wpa_supplicant1
+-Exec=@BINDIR@/wpa_supplicant -u
++Exec=@BINDIR@/wpa_supplicant -B -u -f /var/log/wpa_supplicant.log -P /var/run/wpa_supplicant.pid
+ User=root
+ SystemdService=wpa_supplicant.service
diff --git a/source/n/wpa_supplicant/patches/include-unistd_h.diff b/source/n/wpa_supplicant/patches/include-unistd_h.diff
new file mode 100644
index 000000000..a3c6ae83f
--- /dev/null
+++ b/source/n/wpa_supplicant/patches/include-unistd_h.diff
@@ -0,0 +1,15 @@
+diff -Nur wpa_supplicant-1.0-rc3.orig/wpa_supplicant/wpa_gui-qt4/wpagui.cpp wpa_supplicant-1.0-rc3/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
+--- wpa_supplicant-1.0-rc3.orig/wpa_supplicant/wpa_gui-qt4/wpagui.cpp	2012-04-16 15:15:40.000000000 -0500
++++ wpa_supplicant-1.0-rc3/wpa_supplicant/wpa_gui-qt4/wpagui.cpp	2012-05-05 17:04:40.706570034 -0500
+@@ -12,10 +12,8 @@
+  * See README and COPYING for more details.
+  */
+ 
+-#ifdef __MINGW32__
+-/* Need to get getopt() */
++/* Need to get getopt() regardless with gcc-4.7.x */
+ #include <unistd.h>
+-#endif
+ 
+ #ifdef CONFIG_NATIVE_WINDOWS
+ #include <windows.h>
diff --git a/source/n/wpa_supplicant/patches/libnl3-includes.diff b/source/n/wpa_supplicant/patches/libnl3-includes.diff
new file mode 100644
index 000000000..f8ff01c18
--- /dev/null
+++ b/source/n/wpa_supplicant/patches/libnl3-includes.diff
@@ -0,0 +1,12 @@
+diff -Nur wpa_supplicant-1.0-rc3.orig/src/drivers/drivers.mak wpa_supplicant-1.0-rc3/src/drivers/drivers.mak
+--- wpa_supplicant-1.0-rc3.orig/src/drivers/drivers.mak	2012-04-16 15:15:40.000000000 -0500
++++ wpa_supplicant-1.0-rc3/src/drivers/drivers.mak	2012-05-05 17:16:01.933597117 -0500
+@@ -48,7 +48,7 @@
+ ifdef CONFIG_LIBNL32
+   DRV_LIBS += -lnl-3
+   DRV_LIBS += -lnl-genl-3
+-  DRV_CFLAGS += -DCONFIG_LIBNL20
++  DRV_CFLAGS += -DCONFIG_LIBNL20 `pkg-config --cflags libnl-3.0`
+ else
+   ifdef CONFIG_LIBNL_TINY
+     DRV_LIBS += -lnl-tiny
diff --git a/source/n/wpa_supplicant/patches/quiet-scan-results-message.diff b/source/n/wpa_supplicant/patches/quiet-scan-results-message.diff
new file mode 100644
index 000000000..2b3eb6726
--- /dev/null
+++ b/source/n/wpa_supplicant/patches/quiet-scan-results-message.diff
@@ -0,0 +1,12 @@
+diff -Nur wpa_supplicant-1.0-rc3.orig/wpa_supplicant/events.c wpa_supplicant-1.0-rc3/wpa_supplicant/events.c
+--- wpa_supplicant-1.0-rc3.orig/wpa_supplicant/events.c	2012-04-16 15:15:40.000000000 -0500
++++ wpa_supplicant-1.0-rc3/wpa_supplicant/events.c	2012-05-05 17:02:38.061179720 -0500
+@@ -1076,7 +1076,7 @@
+ 	}
+ 
+ 	wpa_dbg(wpa_s, MSG_DEBUG, "New scan results available");
+-	wpa_msg_ctrl(wpa_s, MSG_INFO, WPA_EVENT_SCAN_RESULTS);
++	wpa_msg_ctrl(wpa_s, MSG_DEBUG, WPA_EVENT_SCAN_RESULTS);
+ 	wpas_notify_scan_results(wpa_s);
+ 
+ 	wpas_notify_scan_done(wpa_s, 1);
diff --git a/source/n/wpa_supplicant/patches/squelch-driver-disconnect-spam.diff b/source/n/wpa_supplicant/patches/squelch-driver-disconnect-spam.diff
new file mode 100644
index 000000000..b8d2be6ad
--- /dev/null
+++ b/source/n/wpa_supplicant/patches/squelch-driver-disconnect-spam.diff
@@ -0,0 +1,95 @@
+diff -Nur wpa_supplicant-1.0-rc3.orig/wpa_supplicant/events.c wpa_supplicant-1.0-rc3/wpa_supplicant/events.c
+--- wpa_supplicant-1.0-rc3.orig/wpa_supplicant/events.c	2012-04-16 15:15:40.000000000 -0500
++++ wpa_supplicant-1.0-rc3/wpa_supplicant/events.c	2012-05-06 01:01:17.529134316 -0500
+@@ -1593,6 +1593,15 @@
+ 		wpa_s->keys_cleared = 0;
+ 		wpa_clear_keys(wpa_s, wpa_s->bssid);
+ 	}
++
++	if (wpa_s->wpa_state == WPA_DISCONNECTED) {
++		wpa_s->disconnect_count++;
++		if (!eloop_is_timeout_registered(wpa_disconnect_spam_handle, wpa_s, NULL)) {
++			eloop_register_timeout(6, 0, wpa_disconnect_spam_handle, wpa_s, NULL);
++			wpa_printf(MSG_DEBUG, "%s: scheduled DISCONNECT spam handler", __FUNCTION__);
++		}
++	}
++
+ 	wpa_supplicant_mark_disassoc(wpa_s);
+ 
+ 	if (authenticating && (wpa_s->drv_flags & WPA_DRIVER_FLAGS_SME))
+diff -Nur wpa_supplicant-1.0-rc3.orig/wpa_supplicant/wpa_supplicant.c wpa_supplicant-1.0-rc3/wpa_supplicant/wpa_supplicant.c
+--- wpa_supplicant-1.0-rc3.orig/wpa_supplicant/wpa_supplicant.c	2012-04-16 15:15:40.000000000 -0500
++++ wpa_supplicant-1.0-rc3/wpa_supplicant/wpa_supplicant.c	2012-05-06 01:01:17.530134303 -0500
+@@ -434,6 +434,9 @@
+ 
+ 	wpa_supplicant_cancel_scan(wpa_s);
+ 	wpa_supplicant_cancel_auth_timeout(wpa_s);
++	if (eloop_is_timeout_registered(wpa_disconnect_spam_handle, wpa_s, NULL))
++		eloop_cancel_timeout(wpa_disconnect_spam_handle, wpa_s, NULL);
++
+ 	eloop_cancel_timeout(wpa_supplicant_stop_countermeasures, wpa_s, NULL);
+ #ifdef CONFIG_DELAYED_MIC_ERROR_REPORT
+ 	eloop_cancel_timeout(wpa_supplicant_delayed_mic_error_report,
+@@ -592,6 +595,23 @@
+ #endif /* CONFIG_BGSCAN */
+ 
+ 
++void wpa_disconnect_spam_handle(void *eloop_ctx, void *timeout_ctx)
++{
++	struct wpa_supplicant *wpa_s = eloop_ctx;
++	const u8 bssid[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
++
++	wpa_printf(MSG_DEBUG, "%s: %d disconnect events in 6 seconds",
++		   __FUNCTION__, wpa_s->disconnect_count);
++
++	if (wpa_s->disconnect_count >= 3) {
++		wpa_printf(MSG_DEBUG, "%s: forcing SSID/BSSID reset", __FUNCTION__);
++		wpa_drv_disassociate(wpa_s, bssid, WLAN_REASON_DEAUTH_LEAVING);
++		wpa_supplicant_req_scan(wpa_s, 1, 0);
++	}
++	wpa_s->disconnect_count = 0;
++}
++
++
+ /**
+  * wpa_supplicant_set_state - Set current connection state
+  * @wpa_s: Pointer to wpa_supplicant data
+@@ -612,6 +632,18 @@
+ 	if (state != WPA_SCANNING)
+ 		wpa_supplicant_notify_scanning(wpa_s, 0);
+ 
++	if (state != WPA_DISCONNECTED && state != WPA_SCANNING) {
++		/* If the state isn't disconnected, cancel any registered
++		 * disconnect spam handler, which should only live while
++		 * disconnect events are coming in quickly.
++		 */
++		wpa_s->disconnect_count = 0;
++		if (eloop_is_timeout_registered(wpa_disconnect_spam_handle, wpa_s, NULL)) {
++			wpa_printf(MSG_DEBUG, "%s: canceling DISCONNECT spam handler", __FUNCTION__);
++			eloop_cancel_timeout(wpa_disconnect_spam_handle, wpa_s, NULL);
++		}
++	}
++
+ 	if (state == WPA_COMPLETED && wpa_s->new_connection) {
+ #if defined(CONFIG_CTRL_IFACE) || !defined(CONFIG_NO_STDOUT_DEBUG)
+ 		struct wpa_ssid *ssid = wpa_s->current_ssid;
+diff -Nur wpa_supplicant-1.0-rc3.orig/wpa_supplicant/wpa_supplicant_i.h wpa_supplicant-1.0-rc3/wpa_supplicant/wpa_supplicant_i.h
+--- wpa_supplicant-1.0-rc3.orig/wpa_supplicant/wpa_supplicant_i.h	2012-04-16 15:15:40.000000000 -0500
++++ wpa_supplicant-1.0-rc3/wpa_supplicant/wpa_supplicant_i.h	2012-05-06 01:01:17.530134303 -0500
+@@ -355,6 +355,8 @@
+ 	struct wps_er *wps_er;
+ 	int blacklist_cleared;
+ 
++	int disconnect_count;
++
+ 	struct wpabuf *pending_eapol_rx;
+ 	struct os_time pending_eapol_rx_time;
+ 	u8 pending_eapol_rx_src[ETH_ALEN];
+@@ -535,6 +537,7 @@
+ 				     int sec, int usec);
+ void wpa_supplicant_set_state(struct wpa_supplicant *wpa_s,
+ 			      enum wpa_states state);
++void wpa_disconnect_spam_handle(void *eloop_ctx, void *timeout_ctx);
+ struct wpa_ssid * wpa_supplicant_get_ssid(struct wpa_supplicant *wpa_s);
+ const char * wpa_supplicant_get_eap_mode(struct wpa_supplicant *wpa_s);
+ void wpa_supplicant_cancel_auth_timeout(struct wpa_supplicant *wpa_s);
diff --git a/source/n/wpa_supplicant/wpa_supplicant.SlackBuild b/source/n/wpa_supplicant/wpa_supplicant.SlackBuild
index 8bbf01db6..32165fa90 100755
--- a/source/n/wpa_supplicant/wpa_supplicant.SlackBuild
+++ b/source/n/wpa_supplicant/wpa_supplicant.SlackBuild
@@ -22,8 +22,10 @@
 # -----------------------------------------------------------------------------
 
 PKGNAM=wpa_supplicant
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+VERSION=1.0
+BUILD=${BUILD:-1}
+
+SRCVERSION=$(printf $VERSION | tr _ -)
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -37,8 +39,6 @@ fi
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-DOCS="ChangeLog ../COPYING README README-WPS *.txt examples wpa_supplicant.conf.sample"
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -59,31 +59,16 @@ else
   LIBDIRSUFFIX=""
 fi
 
-# Support for some of the wireless drivers needs the header files of those
-# drivers.
-# Change these *_INCLUDES variables to where _your_ driver include directory
-# is located. If any of these directories is found, support for the driver
-# will be added to wpa_supplicant.
-# My madwifi package for Slackware installs the headers here:
-MADWIFI_INCLUDES="/usr/include/madwifi"
-HERMES_INCLUDES=""
-BROADCOM_INCLUDES=""
-
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
-
-if ! [ -f $CWD/${PKGNAM}.defconfig ]; then
-  echo "Could not find ${PKGNAM}.defconfig!"
-  exit 1
-fi
-
 cd $TMP
-rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-${VERSION}.tar.?z* || exit 1
-cd ${PKGNAM}-${VERSION}
+rm -rf ${PKGNAM}-${SRCVERSION}
+tar xvf $CWD/${PKGNAM}-${SRCVERSION}.tar.?z* || exit 1
+cd ${PKGNAM}-${SRCVERSION}
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -91,179 +76,91 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-#sed -i -e \
-#  "s/^#define VERSION_STR \"\(.*\)\"/#define VERSION_STR \"\1_$VERSION\"/" \
-#  src/common/version.h
+# Fixup various paths in the dbus service file
+patch -p1 < $CWD/patches/dbus-service-file-args.diff
+
+# Include unistd.h 
+patch -p1 < $CWD/patches/include-unistd_h.diff
 
-zcat $CWD/hostap-07.git-b80b5639935d37b95d00f86b57f2844a9c775f57.patch.gz | patch -p1 --verbose || exit 1
+# Add libnl3 includes
+patch -p1 < $CWD/patches/libnl3-includes.diff
+
+# Eliminate some logspam
+patch -p1 < $CWD/patches/quiet-scan-results-message.diff
+patch -p1 < $CWD/patches/squelch-driver-disconnect-spam.diff
 
-# The source code has been re-organized:
 cd wpa_supplicant
 
 # Create the configuration file for building wpa_supplicant:
-cat $CWD/${PKGNAM}.defconfig > .config
-if [ ! -z $MADWIFI_INCLUDES -a -d $MADWIFI_INCLUDES ]; then
-  echo "Adding madwifi driver (Atheros) support"
-  cat <<-EOT >> .config
-	CONFIG_DRIVER_MADWIFI=y
-	CFLAGS += -I${MADWIFI_INCLUDES}
-	EOT
-fi
-if [ ! -z $HERMES_INCLUDES -a -d $HERMES_INCLUDES ]; then
-  echo "Adding hermes driver (Agere) support"
-  cat <<-EOT >> .config
-	CONFIG_DRIVER_HERMES=y
-	CFLAGS += -I${HERMES_INCLUDES}
-	EOT
-fi
-if [ ! -z $BROADCOM_INCLUDES -a -d $BROADCOM_INCLUDES ]; then
-  echo "Adding broadcom driver support"
-  cat <<-EOT >> .config
-	CONFIG_DRIVER_BROADCOM=y
-	CFLAGS += -I${BROADCOM_INCLUDES}
-	EOT
-fi
-make $NUMJOBS || make || exit 1
+cat $CWD/config/dot.config > .config
 
-# Build the Qt4 GUI client
-make wpa_gui-qt4 || exit 1
+# Build the usual binaries
+CFLAGS="$SLKCFLAGS" \
+make $NUMJOBS \
+  BINDIR=/usr/sbin \
+  LIBDIR=/usr/lib${LIBDIRSUFFIX} || exit 1
 
-# Make man pages if needed
-( cd doc/docbook
-  if ! ls *.? >/dev/null 2>&1 ; then
-    make man
-  fi
-)
+# Build the Qt4 GUI client
+CFLAGS="$SLKCFLAGS" \
+make $NUMJOBS \
+  wpa_gui-qt4 \
+  BINDIR=/usr/sbin \
+  LIBDIR=/usr/lib${LIBDIRSUFFIX} || exit 1
 
-# Do not build the developer docs:
-#PATH=".:$PATH" make docs
+# Make sure man pages are built
+make -C doc/docbook man
 
 # This goes into the doc directory later on:
-cp wpa_supplicant.conf wpa_supplicant.conf.sample
+mv wpa_supplicant.conf wpa_supplicant.conf.sample
 
 # Install binaries:
 mkdir -p $PKG/usr/sbin $PKG/usr/bin
 cp wpa_supplicant wpa_passphrase wpa_cli $PKG/usr/sbin/
 cp wpa_gui-qt4/wpa_gui $PKG/usr/bin/
 
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
 # Install dbus configuration file:
 mkdir -p $PKG/etc/dbus-1/system.d/
 cp dbus/dbus-wpa_supplicant.conf \
   $PKG/etc/dbus-1/system.d/dbus-wpa_supplicant.conf
 
-# This file should actually be shipped with Slackware's wpa_supplicant
-# package, but since we missed it there (just kidding), we'll do it here:
 mkdir -p $PKG/usr/share/dbus-1/system-services
-install -m644 dbus/{fi.epitest.hostap.WPASupplicant.service,fi.w1.wpa_supplicant1.service} \
-  $PKG/usr/share/dbus-1/system-services/
-sed -e 's#Exec=/sbin/wpa_supplicant#Exec=/usr/sbin/wpa_supplicant#g' \
-  -i $PKG/usr/share/dbus-1/system-services/*.service
+install -m644 dbus/*.service $PKG/usr/share/dbus-1/system-services/
 
-# Install a .desktop file for wpa_gui:
-mkdir -p $PKG/usr/share/applications
-cat <<EOT > $PKG/usr/share/applications/wpa_gui.desktop
-[Desktop Entry]
-Name=wpa_gui
-Comment[en]=Wpa_supplicant management
-Exec=kdesu wpa_gui
-Icon=wpa_gui
-Type=Application
-Categories=Qt;Network;
-EOT
+# Install a .desktop file and icon for wpa_gui:
+# (converted from the wpa_gui.svg in the source)
+mkdir -p $PKG/usr/share/{applications,pixmaps}
+cat $CWD/config/wpa_gui.desktop > $PKG/usr/share/applications/wpa_gui.desktop
+cat $CWD/config/wpa_gui.png > $PKG/usr/share/pixmaps/wpa_gui.png
 
-# The icon used for the menu (converted from the wpa_gui.svg in the source)
-mkdir -p $PKG/usr/share/pixmaps
-cp -a $CWD/wpa_gui.png $PKG/usr/share/pixmaps/
+# Install a logrotate config
+mkdir -p $PKG/etc/logrotate.d
+cat $CWD/config/wpa_supplicant.logrotate > $PKG/etc/logrotate.d/wpa_supplicant.new
 
 # Install man pages:
 for m in 5 8; do
   mkdir -p $PKG/usr/man/man${m}
   cp doc/docbook/*.${m} $PKG/usr/man/man${m}/
 done
+find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \;
 
-# Install a default configuration file:
+# Install a default configuration file (only readable by root):
 mkdir -p $PKG/etc
-cat <<-_EOT_ > $PKG/etc/wpa_supplicant.conf.new
-	# See /usr/doc/${PKGNAM}-${VERSION}/wpa_supplicant.conf.sample
-	# for many more options that you can use in this file.
-	
-	# This line enables the use of wpa_cli which is used by rc.wireless
-	# if possible (to check for successful association)
-	ctrl_interface=/var/run/wpa_supplicant
-	# By default, only root (group 0) may use wpa_cli
-	ctrl_interface_group=0
-	eapol_version=1
-	ap_scan=1
-	fast_reauth=1
-	#country=US
-	
-	# WPA protected network, supply your own ESSID and WPAPSK here:
-	network={
-	  scan_ssid=0
-	  ssid="your_essid_here"
-	  proto=WPA RSN
-	  key_mgmt=WPA-PSK
-	  pairwise=CCMP TKIP
-	  group=CCMP TKIP WEP104 WEP40
-	  psk=your_64_char_psk_here
-	  priority=10
-	}
-	
-	# Plaintext connection (no WPA, no IEEE 802.1X),
-	# nice for hotel/airport types of WiFi network.
-	network={
-	  key_mgmt=NONE
-	  priority=0
-	}
-	_EOT_
-
-# Create the 'doinst.sh' script:
-mkdir -p $PKG/install 2>/dev/null
-cat <<EOINS > $PKG/install/doinst.sh
-# Handle the incoming configuration files:
-config() {
-  for infile in \$1; do
-    NEW="\$infile"
-    OLD="\`dirname \$NEW\`/\`basename \$NEW .new\`"
-    # If there's no config file by that name, mv it over:
-    if [ ! -r \$OLD ]; then
-      mv \$NEW \$OLD
-    elif [ "\`cat \$OLD | md5sum\`" = "\`cat \$NEW | md5sum\`" ]; then
-      # toss the redundant copy
-      rm \$NEW
-    fi
-    # Otherwise, we leave the .new copy for the admin to consider...
-  done
-}
-config etc/wpa_supplicant.conf.new
-
-EOINS
+cat $CWD/config/wpa_supplicant.conf > $PKG/etc/wpa_supplicant.conf.new
+chmod 600 $PKG/etc/wpa_supplicant.conf.new
 
-# Add the documentation:
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a $CWD/README.slackware $PKG/usr/doc/${PKGNAM}-${VERSION}/
-chmod -R a-w $PKG/usr/doc/$PKGNAM-$VERSION/*
+cp -a \
+  ChangeLog ../COPYING README README-{P2P,WPS} examples *.txt *.sample $CWD/README.slackware \
+  $PKG/usr/doc/$PKGNAM-$VERSION
 chown -R root:root $PKG/usr/doc/$PKGNAM-$VERSION/*
+chmod -R a-w $PKG/usr/doc/$PKGNAM-$VERSION/*
 
-# This should only be read/write by root:
-chmod 600 $PKG/etc/wpa_supplicant.conf.new
-
-# Compress the man page(s):
-find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \;
-
-# Strip binaries:
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-# Add a package description:
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-if [ -f $CWD/doinst.sh ]; then
-  cat $CWD/doinst.sh >> $PKG/install/doinst.sh
-fi
+zcat $CWD/doinst.sh.gz >> $PKG/install/doinst.sh
 
-# Build the package:
 cd $PKG
 /sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
-
diff --git a/source/n/yptools/rc.yp b/source/n/yptools/rc.yp
index 4c3b8decf..eda9634e4 100644
--- a/source/n/yptools/rc.yp
+++ b/source/n/yptools/rc.yp
@@ -10,49 +10,114 @@
 # documentation in /usr/doc/yp-tools, /usr/doc/ypbind,
 # /usr/doc/ypserv, and /usr/doc/Linux-HOWTOs/NIS-HOWTO.
 
-# # First, we must setup the NIS domainname.  NOTE: this is not necessarily
-# # the same as your DNS domainname, set in /etc/resolv.conf.  The NIS
-# # domainname is the name of a domain served by your NIS server.
-# 
-# if [ -r /etc/defaultdomain ]; then
-#   nisdomainname `cat /etc/defaultdomain`
-# fi
-#
-# # NIS SERVER CONFIGURATION:
-# # If you are the master server for the NIS domain, you must run ypserv to
-# # service clients on the domain.
-# if [ -x /usr/sbin/ypserv ]; then
-#   echo "Starting NIS server:  /usr/sbin/ypserv"
-#   /usr/sbin/ypserv
-# fi
-#
-# # If you are the master server for the NIS domain, you must also run
-# # rpc.yppasswdd, which is the RPC server that lets users change their
-# # passwords.  You might also want users to be able to change their shell
-# # and GECOS information, in which case you should comment out the first
-# # yppasswdd line and uncomment out the second one.
-# if [ -x /usr/sbin/rpc.yppasswdd ]; then
-#   echo "Starting NIS master password server:  /usr/sbin/rpc.yppasswdd"
-#   /usr/sbin/rpc.yppasswdd
-#   # echo "Starting NIS master password server:  /usr/sbin/rpc.yppasswdd -e chsh -e chfn"
-#   # /usr/sbin/rpc.yppasswdd -e chsh -e chfn
-# fi
-#
-# # If you have NIS slave servers, you might also want to start up
-# # rpc.ypxfrd, which transfers changes in the NIS domain to slave servers.
-# # Alternatively, rpc.ypxfrd can be run out of inetd.
-# if [ -x /usr/sbin/rpc.ypxfrd ]; then
-#   echo "Starting NIS transfer server:  /usr/sbin/rpc.ypxfrd"
-#   /usr/sbin/rpc.ypxfrd
-# fi
-#
-# # NIS CLIENT CONFIGURATION:
-# # If you are a NIS client, all you need to do is run ypbind, which will
-# # broadcast across the network to find a server.  Your NIS server might
-# # also be a client.
-# if [ -d /var/yp ]; then
-#   echo "Starting NIS services:  /usr/sbin/ypbind -broadcast"
-#   /usr/sbin/ypbind -broadcast
-# fi
+# Set non-zero to enable yp client functions
+YP_CLIENT_ENABLE=1
+
+# Set non-zero to enable yp server functions
+YP_SERVER_ENABLE=0
+
+# If YP_SERVER_ENABLE is set, a non-zero YP_XFRD_ENABLE setting will
+# enable ypxfrd.
+YP_XFRD_ENABLE=0
+
+PID_PATH=/var/run
+
+yp_start() {
+
+  if [ $YP_SERVER_ENABLE -ne 0 ]; then
+    # NIS SERVER CONFIGURATION:
+    # If you are the master server for the NIS domain, you must run ypserv to
+    # service clients on the domain.
+    if [ -x /usr/sbin/ypserv ]; then
+      echo "Starting NIS server:  /usr/sbin/ypserv"
+      /usr/sbin/ypserv
+    fi
+
+    # If you are the master server for the NIS domain, you must also run
+    # rpc.yppasswdd, which is the RPC server that lets users change their
+    # passwords.  You might also want users to be able to change their shell
+    # and GECOS information, in which case you should comment out the first
+    # yppasswdd line and uncomment out the second one.
+
+    if [ -x /usr/sbin/rpc.yppasswdd ]; then
+      echo "Starting NIS master password server:  /usr/sbin/rpc.yppasswdd"
+      /usr/sbin/rpc.yppasswdd
+      # echo "Starting NIS master password server:  /usr/sbin/rpc.yppasswdd -e chsh -e chfn"
+      # /usr/sbin/rpc.yppasswdd -e chsh -e chfn
+    fi
+
+    # If you have NIS slave servers, you might also want to start up
+    # rpc.ypxfrd, which transfers changes in the NIS domain to slave servers.
+    # Alternatively, rpc.ypxfrd can be run out of inetd.
+    if [ $YP_XFRD_ENABLE -ne 0 ]; then
+      if [ -x /usr/sbin/rpc.ypxfrd ]; then
+        echo "Starting NIS transfer server:  /usr/sbin/rpc.ypxfrd"
+        /usr/sbin/rpc.ypxfrd
+      fi
+    fi
+  fi
+
+  if [ $YP_CLIENT_ENABLE -ne 0 ]; then
+    # NIS CLIENT CONFIGURATION:
+    # If you are a NIS client, all you need to do is run ypbind, which will
+    # broadcast across the network to find a server.  Your NIS server might
+    # also be a client.
+    if [ -d /var/yp ]; then
+      echo "Starting NIS services:  /usr/sbin/ypbind -broadcast"
+      /usr/sbin/ypbind -broadcast
+    fi
+  fi
+}
+
+yp_stop() {
+  if [ -r ${PID_PATH}/ypbind.pid ]; then
+    echo "Stopping NIS services."
+    kill $(cat ${PID_PATH}/ypbind.pid)
+  fi
+
+  if [ -r ${PID_PATH}/ypxfrd.pid ]; then
+    echo "Stopping NIS transfer server."
+    kill $(cat ${PID_PATH}/ypxfrd.pid)
+  fi
+
+  if [ -r ${PID_PATH}/yppasswdd.pid ]; then
+    echo "Stopping NIS master password server."
+    kill $(cat ${PID_PATH}/yppasswdd.pid)
+  fi
+
+  if [ -r ${PID_PATH}/ypserv.pid ]; then
+    echo "Stopping NIS server."
+    kill $(cat ${PID_PATH}/ypserv.pid)
+  fi
+}
+
+# First, we must setup the NIS domainname.  NOTE: this is not necessarily
+# the same as your DNS domainname, set in /etc/resolv.conf.  The NIS
+# domainname is the name of a domain served by your NIS server.
 #
+# If /etc/defaultdomain has not been configured we'll bail out.
+if [ -r /etc/defaultdomain -a -x /bin/nisdomainname ]; then
+  if [ "$(nisdomainname)" == "(none)" ]; then
+    nisdomainname `cat /etc/defaultdomain`
+  fi
+else
+  echo "/etc/rc.d/rc.yp:  NIS not configured.  Hint: set up /etc/defaultdomain."
+  exit 0
+fi
+
+case "$1" in
+'start')
+  yp_start
+  ;;
+'stop')
+  yp_stop
+  ;;
+'restart')
+  yp_stop
+  yp_start
+  ;;
+*)
+  echo "usage $0 start|stop|restart"
+esac
+
 # # Done setting up NIS.
diff --git a/source/n/yptools/yptools.SlackBuild b/source/n/yptools/yptools.SlackBuild
index 6a213b2a6..42d96a30b 100755
--- a/source/n/yptools/yptools.SlackBuild
+++ b/source/n/yptools/yptools.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 
 # Package version number:
 VERSION=2.12
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 YPTOOLS=$VERSION
 YPBINDMT=1.32
@@ -208,7 +208,7 @@ make CFLAGS="$SLKCFLAGS" || exit 1
 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/yp
 ( cd scripts
   for file in create_printcap match_printcap pwupdate ypinit ypxfr_1perday ypxfr_1perhour ypxfr_2perday ; do
-    cat $file > $PKG/usr/lib${LIBDIRSUFFIX}/yp/$file
+    cat $file | sed -e "s#/usr/lib/#/usr/lib${LIBDIRSUFFIX}/#" > $PKG/usr/lib${LIBDIRSUFFIX}/yp/$file
     chmod 755 $PKG/usr/lib${LIBDIRSUFFIX}/yp/$file
   done 
   for file in pwupdate.8 ypinit.8 ; do
@@ -246,7 +246,7 @@ chown root:root $PKG/usr/doc/ypserv-$YPSERV/*
 
 mkdir -p $PKG/etc/rc.d
 zcat $CWD/rc.yp.gz > $PKG/etc/rc.d/rc.yp.new
-chmod 755 $PKG/etc/rc.d/rc.yp.new
+chmod 644 $PKG/etc/rc.d/rc.yp.new
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
@@ -266,6 +266,13 @@ config() {
   # Otherwise, we leave the .new copy for the admin to consider...
 }
 
+# Keep same perms on rc.yp.new:
+if [ -e etc/rc.d/rc.yp ]; then
+  cp -a etc/rc.d/rc.yp etc/rc.d/rc.yp.new.incoming
+  cat etc/rc.d/rc.yp.new > etc/rc.d/rc.yp.new.incoming
+  mv etc/rc.d/rc.yp.new.incoming etc/rc.d/rc.yp.new
+fi
+
 config etc/nsswitch.conf-nis.new
 config etc/netgroup.new
 config etc/yp.conf.new
author	Patrick J Volkerding <volkerdi@slackware.com>	2012-09-26 01:10:42 +0000
committer	Eric Hameleers <alien@slackware.com>	2018-05-31 22:51:55 +0200
commit	9664bee729d487bcc0a0bc35859f8e13d5421c75 (patch)
tree	b428a16618e36ed864a8d76ea3435e19a452bf90 /source/n
parent	75a4a592e5ccda30715f93563d741b83e0dcf39e (diff)
download	current-9664bee729d487bcc0a0bc35859f8e13d5421c75.tar.gz current-9664bee729d487bcc0a0bc35859f8e13d5421c75.tar.xz