diff -Nru net-tools-1.60+git20161116.90da8a0/arp.c net-tools-1.60+git20180626.aebd88e/arp.c
--- net-tools-1.60+git20161116.90da8a0/arp.c	2016-11-16 03:57:06.000000000 +0000
+++ net-tools-1.60+git20180626.aebd88e/arp.c	2018-06-26 07:30:13.000000000 +0000
@@ -93,7 +93,7 @@
 int sockfd = 0;			/* active socket descriptor     */
 int hw_set = 0;			/* flag if hw-type was set (-H) */
 char device[16] = "";		/* current device               */
-static void usage(void);
+static void usage(int);
 
 /* Delete an entry from the ARP cache. */
 static int arp_del(char **args)
@@ -168,14 +168,14 @@
 	}
 	if (!strcmp(*args, "dev")) {
 	    if (*++args == NULL)
-		usage();
+		usage(E_OPTERR);
 	    safe_strncpy(device, *args, sizeof(device));
 	    args++;
 	    continue;
 	}
 	if (!strcmp(*args, "netmask")) {
 	    if (*++args == NULL)
-		usage();
+		usage(E_OPTERR);
 	    if (strcmp(*args, "255.255.255.255") != 0) {
 		safe_strncpy(host, *args, (sizeof host));
 		if (ap->input(0, host, &ss) < 0) {
@@ -189,7 +189,7 @@
 	    args++;
 	    continue;
 	}
-	usage();
+	usage(E_OPTERR);
     }
 
     // if neighter priv nor pub is given, work on both
@@ -345,14 +345,14 @@
 	}
 	if (!strcmp(*args, "dev")) {
 	    if (*++args == NULL)
-		usage();
+		usage(E_OPTERR);
 	    safe_strncpy(device, *args, sizeof(device));
 	    args++;
 	    continue;
 	}
 	if (!strcmp(*args, "netmask")) {
 	    if (*++args == NULL)
-		usage();
+		usage(E_OPTERR);
 	    if (strcmp(*args, "255.255.255.255") != 0) {
 		safe_strncpy(host, *args, (sizeof host));
 		if (ap->input(0, host, &ss) < 0) {
@@ -366,7 +366,7 @@
 	    args++;
 	    continue;
 	}
-	usage();
+	usage(E_OPTERR);
     }
 
     /* Fill in the remainder of the request. */
@@ -565,6 +565,15 @@
 			 ip, &type, &flags, hwa, mask, dev);
 	    if (num < 4)
 		break;
+	    if (num == 5) {
+		/*
+		 * This happens for incomplete ARP entries for which there is
+		 * no hardware address in the line.
+		 */
+		num = sscanf(line, "%s 0x%x 0x%x %99s %99s\n",
+			     ip, &type, &flags, mask, dev);
+		hwa[0] = 0;
+	    }
 
 	    entries++;
 	    /* if the user specified hw-type differs, skip it */
@@ -614,33 +623,34 @@
 
 static void version(void)
 {
-    fprintf(stderr, "%s\n%s\n", Release, Features);
+    printf("%s\n%s\n", Release, Features);
     exit(E_VERSION);
 }
 
-static void usage(void)
+static void usage(int rc)
 {
-    fprintf(stderr, _("Usage:\n  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP cache\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, _("        -e                       display (all) hosts in default (Linux) style\n"));
-    fprintf(stderr, _("        -s, --set                set a new ARP entry\n"));
-    fprintf(stderr, _("        -d, --delete             delete a specified entry\n"));
-    fprintf(stderr, _("        -v, --verbose            be verbose\n"));
-    fprintf(stderr, _("        -n, --numeric            don't resolve names\n"));
-    fprintf(stderr, _("        -i, --device             specify network interface (e.g. eth0)\n"));
-    fprintf(stderr, _("        -D, --use-device         read <hwaddr> from given device\n"));
-    fprintf(stderr, _("        -A, -p, --protocol       specify protocol family\n"));
-    fprintf(stderr, _("        -f, --file               read new entries from file or from /etc/ethers\n\n"));
+    FILE *fp = rc ? stderr : stdout;
+    fprintf(fp, _("Usage:\n  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP cache\n"));
+    fprintf(fp, _("  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP entry\n"));
+    fprintf(fp, _("  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from file\n"));
+    fprintf(fp, _("  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add entry\n"));
+    fprintf(fp, _("  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          <-''-\n\n"));
+
+    fprintf(fp, _("        -a                       display (all) hosts in alternative (BSD) style\n"));
+    fprintf(fp, _("        -e                       display (all) hosts in default (Linux) style\n"));
+    fprintf(fp, _("        -s, --set                set a new ARP entry\n"));
+    fprintf(fp, _("        -d, --delete             delete a specified entry\n"));
+    fprintf(fp, _("        -v, --verbose            be verbose\n"));
+    fprintf(fp, _("        -n, --numeric            don't resolve names\n"));
+    fprintf(fp, _("        -i, --device             specify network interface (e.g. eth0)\n"));
+    fprintf(fp, _("        -D, --use-device         read <hwaddr> from given device\n"));
+    fprintf(fp, _("        -A, -p, --protocol       specify protocol family\n"));
+    fprintf(fp, _("        -f, --file               read new entries from file or from /etc/ethers\n\n"));
 
-    fprintf(stderr, _("  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"), DFLT_HW);
-    fprintf(stderr, _("  List of possible hardware types (which support ARP):\n"));
+    fprintf(fp, _("  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"), DFLT_HW);
+    fprintf(fp, _("  List of possible hardware types (which support ARP):\n"));
     print_hwlist(1); /* 1 = ARPable */
-    exit(E_USAGE);
+    exit(rc);
 }
 
 int main(int argc, char **argv)
@@ -742,10 +752,11 @@
 
 	case 'V':
 	    version();
-	case '?':
 	case 'h':
+	    usage(E_USAGE);
+	case '?':
 	default:
-	    usage();
+	    usage(E_OPTERR);
 	}
 
     if (ap->af != AF_INET) {
@@ -794,7 +805,7 @@
 	break;
 
     default:
-	usage();
+	usage(E_OPTERR);
     }
 
     exit(what);
diff -Nru net-tools-1.60+git20161116.90da8a0/debian/changelog net-tools-1.60+git20180626.aebd88e/debian/changelog
--- net-tools-1.60+git20161116.90da8a0/debian/changelog	2018-05-15 05:23:51.000000000 +0000
+++ net-tools-1.60+git20180626.aebd88e/debian/changelog	2019-02-01 18:07:53.000000000 +0000
@@ -1,3 +1,37 @@
+net-tools (1.60+git20180626.aebd88e-1ubuntu1) disco; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Ubuntu_unit_conversion.patch:
+      + Ubuntu Policy: output using standard SI unit multiples:
+        KB (10^3), MB (10^6), GB (10^9), TB (10^12) and PB (10^15).
+        Includes manpage update to remove comment about IEC units.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 01 Feb 2019 10:07:53 -0800
+
+net-tools (1.60+git20180626.aebd88e-1) unstable; urgency=medium
+
+  * New upstream snapshot
+  * Refresh patches.
+  * Fix typos in German manpages. Thanks to Prof. Dr. Steffen Wendzel and
+    Dr. Tobias Quathamer for the patch. Closes: #900962.
+
+ -- Martín Ferrari <tincho@debian.org>  Mon, 24 Sep 2018 19:08:57 +0000
+
+net-tools (1.60+git20161116.90da8a0-4) unstable; urgency=medium
+
+  * Update maintainer email address. Closes: #899617.
+  * Update Standards-Version with no changes.
+
+ -- Martín Ferrari <tincho@debian.org>  Mon, 24 Sep 2018 17:16:31 +0000
+
+net-tools (1.60+git20161116.90da8a0-3) unstable; urgency=medium
+
+  * debian/control: Update Vcs-* and Standards-Version.
+  * debian/control: remove references to ancient package ja-trans.
+  * debian/gbp.conf: Update repo layout.
+
+ -- Martín Ferrari <tincho@debian.org>  Tue, 31 Jul 2018 19:09:00 +0000
+
 net-tools (1.60+git20161116.90da8a0-2ubuntu1) cosmic; urgency=low
 
   * Merge from Debian unstable.  Remaining changes:
diff -Nru net-tools-1.60+git20161116.90da8a0/debian/control net-tools-1.60+git20180626.aebd88e/debian/control
--- net-tools-1.60+git20161116.90da8a0/debian/control	2018-05-15 05:23:51.000000000 +0000
+++ net-tools-1.60+git20180626.aebd88e/debian/control	2019-02-01 18:07:53.000000000 +0000
@@ -1,6 +1,6 @@
 Source: net-tools
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: net-tools Team <pkg-net-tools-maintainers@lists.alioth.debian.org>
+XSBC-Original-Maintainer: net-tools Team <team+net-tools@tracker.debian.org>
 Uploaders: Martín Ferrari <tincho@debian.org>,
 Section: net
 Priority: important
@@ -8,9 +8,9 @@
                gettext,
                libdnet-dev,
                libselinux1-dev,
-Standards-Version: 4.1.3
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-net-tools/pkg-net-tools.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-net-tools/pkg-net-tools.git
+Standards-Version: 4.2.1
+Vcs-Browser: https://salsa.debian.org/debian/net-tools
+Vcs-Git: https://salsa.debian.org/debian/net-tools.git
 Homepage: http://sourceforge.net/projects/net-tools/
 
 Package: net-tools
@@ -18,8 +18,6 @@
 Multi-Arch: foreign
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-Conflicts: ja-trans (<= 0.8-2),
-Replaces: ja-trans (<= 0.8-2),
 Description: NET-3 networking toolkit
  This package includes the important tools for controlling the network
  subsystem of the Linux kernel.  This includes arp, ifconfig, netstat,
diff -Nru net-tools-1.60+git20161116.90da8a0/debian/gbp.conf net-tools-1.60+git20180626.aebd88e/debian/gbp.conf
--- net-tools-1.60+git20161116.90da8a0/debian/gbp.conf	2018-02-11 17:29:24.000000000 +0000
+++ net-tools-1.60+git20180626.aebd88e/debian/gbp.conf	2018-09-24 23:17:02.000000000 +0000
@@ -1,3 +1,6 @@
+[DEFAULT]
+debian-branch = debian/sid
+
 [buildpackage]
 dist = DEP14
 upstream-tag = upstream/%(version)s
diff -Nru net-tools-1.60+git20161116.90da8a0/debian/patches/Bug_443075-ifconfig.c-pointtopoint_spelling.patch net-tools-1.60+git20180626.aebd88e/debian/patches/Bug_443075-ifconfig.c-pointtopoint_spelling.patch
--- net-tools-1.60+git20161116.90da8a0/debian/patches/Bug_443075-ifconfig.c-pointtopoint_spelling.patch	2018-02-11 17:29:24.000000000 +0000
+++ net-tools-1.60+git20180626.aebd88e/debian/patches/Bug_443075-ifconfig.c-pointtopoint_spelling.patch	2018-09-24 23:17:02.000000000 +0000
@@ -3,7 +3,7 @@
 Author: Justin Pryzby <pryzbyj@libra>
 --- a/ifconfig.c
 +++ b/ifconfig.c
-@@ -643,14 +643,14 @@
+@@ -644,14 +644,14 @@
  	    spp++;
  	    continue;
  	}
diff -Nru net-tools-1.60+git20161116.90da8a0/debian/patches/Bug_541172-netstat.c-exit-codes.patch net-tools-1.60+git20180626.aebd88e/debian/patches/Bug_541172-netstat.c-exit-codes.patch
--- net-tools-1.60+git20161116.90da8a0/debian/patches/Bug_541172-netstat.c-exit-codes.patch	2018-02-11 17:29:24.000000000 +0000
+++ net-tools-1.60+git20180626.aebd88e/debian/patches/Bug_541172-netstat.c-exit-codes.patch	2018-09-24 23:17:02.000000000 +0000
@@ -1,7 +1,7 @@
 Description: Bug#541172: netstat.c exit codes
 --- a/netstat.c
 +++ b/netstat.c
-@@ -2236,12 +2236,14 @@
+@@ -2237,12 +2237,14 @@
              parsesnmp(flag_raw, flag_tcp, flag_udp, flag_sctp);
  #else
              ENOSUPP("netstat", "AF INET");
diff -Nru net-tools-1.60+git20161116.90da8a0/debian/patches/Bug_900962-man-de-typos.patch net-tools-1.60+git20180626.aebd88e/debian/patches/Bug_900962-man-de-typos.patch
--- net-tools-1.60+git20161116.90da8a0/debian/patches/Bug_900962-man-de-typos.patch	1970-01-01 00:00:00.000000000 +0000
+++ net-tools-1.60+git20180626.aebd88e/debian/patches/Bug_900962-man-de-typos.patch	2018-09-24 19:08:57.000000000 +0000
@@ -0,0 +1,72 @@
+--- a/man/de_DE/netstat.8
++++ b/man/de_DE/netstat.8
+@@ -210,7 +210,7 @@
+ bei Verwendung der
+ .B -n
+ Option wird die Socketadresse nach dem kanonischen Rechnernamen und die
+-Portnummer in den zugeh\(:origen Dienstenamen aufgel\(sst.
++Portnummer in den zugeh\(:origen Dienstenamen aufgel\(:o\(sst.
+ 
+ .SS "Gegenadresse"
+ Die Adresse und Portnummer der Gegenseite des Sockets.  Wie bei lokalen
+@@ -237,12 +237,12 @@
+ .TP
+ .I
+ FIN_WAIT1
+-Der Socket wurde geschlo\(ssen und die Verbindung wird beendet.
++Der Socket wurde geschlossen und die Verbindung wird beendet.
+ .TP
+ .I
+ FIN_WAIT2
+-Die Verbindung ist geschl\(ssen und der Socket wartet darauf, da\(ss sie
+-von der Gegenseite ebenfalls geschlo\(ssen wird.
++Die Verbindung ist geschlossen und der Socket wartet darauf, dass sie
++von der Gegenseite ebenfalls geschlossen wird.
+ .TP
+ .I
+ TIME_WAIT
+@@ -260,7 +260,7 @@
+ .TP
+ .I
+ LAST_ACK
+-Die Gegenseite hat die Verbindung beendet und der Socket ist geschlo\(ssen;
++Die Gegenseite hat die Verbindung beendet und der Socket ist geschlossen;
+ die Best\(:atigung wird abgewartet.
+ .TP
+ .I
+@@ -274,7 +274,7 @@
+ .TP
+ .I
+ CLOSING
+-Beide Sockets sind geschlo\(ssen es wurden aber noch nicht alle Daten
++Beide Sockets sind geschlossen, es wurden aber noch nicht alle Daten
+ geschickt.
+ .TP
+ .I
+@@ -294,7 +294,7 @@
+ Sockets sind diese Daten nicht verf\(:ugbar.
+ 
+ .SS "Timer"
+-(Dies mu\(ss noch geschrieben werden)
++(Dies muss noch geschrieben werden)
+ 
+ .PP
+ .SS Aktive Sockets in der UNIX Dom\(:ane
+@@ -334,7 +334,7 @@
+ .TP
+ .I
+ SOCK_RDM
+-Dieser Socket bedient zuverl\(ssig zugestellte Nachrichten.
++Dieser Socket bedient zuverl\(:assig zugestellte Nachrichten.
+ .TP
+ .I
+ SOCK_SEQPACKET
+@@ -347,7 +347,7 @@
+ .TP
+ .I
+ UNKNOWN
+-Wer wei\(ss, was uns die Zukunft bringt soll es hier hinschreiben :-)
++Wer wei\(ss, was uns die Zukunft bringt, soll es hier hinschreiben :-)
+ 
+ .PP
+ .SS "Zustand"
diff -Nru net-tools-1.60+git20161116.90da8a0/debian/patches/series net-tools-1.60+git20180626.aebd88e/debian/patches/series
--- net-tools-1.60+git20161116.90da8a0/debian/patches/series	2018-05-15 05:23:51.000000000 +0000
+++ net-tools-1.60+git20180626.aebd88e/debian/patches/series	2019-02-01 18:07:53.000000000 +0000
@@ -6,3 +6,4 @@
 Bug_443075-ifconfig.c-pointtopoint_spelling.patch
 Bug_500913-man-en_US-route.8-EXAMPLES-Add-single-route-del.patch
 Ubuntu_unit_conversion.patch
+Bug_900962-man-de-typos.patch
diff -Nru net-tools-1.60+git20161116.90da8a0/debian/patches/translations.patch net-tools-1.60+git20180626.aebd88e/debian/patches/translations.patch
--- net-tools-1.60+git20161116.90da8a0/debian/patches/translations.patch	2018-02-11 22:20:28.000000000 +0000
+++ net-tools-1.60+git20180626.aebd88e/debian/patches/translations.patch	2018-09-24 23:17:02.000000000 +0000
@@ -11,7 +11,7 @@
 +"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"
+ "Last-Translator: Ralf Bächle <ralf@linux-mips.org>\n"
  "Language-Team:\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=iso-8859-1\n"
@@ -87,7 +87,7 @@
  msgid ""
  "Address                  HWtype  HWaddress           Flags Mask            "
  "Iface\n"
-@@ -66,45 +72,52 @@ msgstr ""
+@@ -66,45 +72,52 @@
  "Adresse                  HW-Typ  HW-Adresse          Flags Maske           "
  "Iface\n"
  
@@ -150,7 +150,7 @@
  msgid ""
  "Usage:\n"
  "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP "
-@@ -113,157 +126,165 @@ msgstr ""
+@@ -113,157 +126,165 @@
  "Benutzung:\n"
  "  arp [-vn]  [<HW>] [-i <if>] [-a] [<Hostname>]\n"
  
@@ -365,7 +365,7 @@
  #, c-format
  msgid "%s: you must be root to change the domain name\n"
  msgstr "%s: Nur Root darf den Domainnamen ändern\n"
-@@ -271,51 +292,56 @@ msgstr "%s: Nur Root darf den Domainnamen 
+@@ -271,51 +292,56 @@
  #: ../hostname.c:131
  #, c-format
  msgid "Resolving `%s' ...\n"
@@ -434,7 +434,7 @@
  msgid ""
  "       hostname [-v]                         display hostname\n"
  "\n"
-@@ -323,7 +349,8 @@ msgstr ""
+@@ -323,7 +349,8 @@
  "       hostname [-v]                         Hostnamen anzeigen\n"
  "\n"
  
@@ -444,7 +444,7 @@
  msgid ""
  "       hostname -V|--version|-h|--help       print info and exit\n"
  "\n"
-@@ -332,7 +359,8 @@ msgstr ""
+@@ -332,7 +359,8 @@
  "beenden.\n"
  "\n"
  
@@ -454,7 +454,7 @@
  msgid ""
  "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
  "\n"
-@@ -340,43 +368,52 @@ msgstr ""
+@@ -340,43 +368,52 @@
  "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
  "\n"
  
@@ -520,7 +520,7 @@
  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"
-@@ -384,395 +421,268 @@ msgid ""
+@@ -384,331 +421,135 @@
  "   FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n"
  "   part of the FQDN) in the /etc/hosts file.\n"
  msgstr ""
@@ -574,85 +574,49 @@
  #, 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
+-#, 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
+-#, 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
+-#, 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
+-#, c-format
 -msgid " Mask:%s\n"
 -msgstr " Maske:%s\n"
-+msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
-+msgstr "  [[-]broadcast [<Adresse>]]  [[-]pointopoint [<Adresse>]]\n"
++msgstr "getnodename()=»%s«\n"
  
 -#: ../ifconfig.c:201
-+#: ../ifconfig.c:207
- #, c-format
+-#, c-format
 -msgid "          inet6 addr: %s/%d"
 -msgstr "          inet6 Adresse: %s/%d"
 -
@@ -663,18 +627,12 @@
 -#: ../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
+-
+-#: ../ifconfig.c:212
 -msgid "Site"
 -msgstr "Standort"
 -
@@ -691,47 +649,32 @@
 -msgstr "Unbekannt"
 -
 -#: ../ifconfig.c:236
- #, c-format
+-#, 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
+-#, 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
+-#, 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
+-#, 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
+-#, 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
+-#, c-format
 -msgid "          econet addr:%s\n"
 -msgstr "          econet Adresse:%s\n"
 -
@@ -758,155 +701,87 @@
 -#: ../ifconfig.c:280
 -msgid "POINTOPOINT "
 -msgstr "PUNKTZUPUNKT "
-+msgid "  [[-]dynamic]\n"
-+msgstr "  [[-]dynamic]\n"
- 
+-
 -#: ../ifconfig.c:282
 -msgid "NOTRAILERS "
 -msgstr "NOTRAILERS "
-+#: ../ifconfig.c:222
-+#, c-format
-+msgid ""
-+"  [up|down] ...\n"
-+"\n"
-+msgstr ""
-+"  [up|down] ...\n"
-+"\n"
- 
+-
 -#: ../ifconfig.c:284
 -msgid "RUNNING "
 -msgstr "RUNNING "
-+#: ../ifconfig.c:224
-+#, c-format
-+msgid "  <HW>=Hardware Type.\n"
-+msgstr "  <HW>=Hardwaretyp.\n"
- 
+-
 -#: ../ifconfig.c:286
 -msgid "NOARP "
 -msgstr "NOARP "
-+#: ../ifconfig.c:225
-+#, c-format
-+msgid "  List of possible hardware types:\n"
-+msgstr "  Liste möglicher Hardwaretypen:\n"
- 
+-
 -#: ../ifconfig.c:288
 -msgid "PROMISC "
 -msgstr "PROMISC "
-+#. 1 = ARPable
-+#: ../ifconfig.c:227
-+#, c-format
-+msgid "  <AF>=Address family. Default: %s\n"
-+msgstr "  <AF>=Adressfamilie.  Standardwert: %s\n"
- 
+-
 -#: ../ifconfig.c:290
 -msgid "ALLMULTI "
 -msgstr "ALLMULTI "
-+#: ../ifconfig.c:228
-+#, c-format
-+msgid "  List of possible address families:\n"
-+msgstr "  List der möglichen Adressfamilien:\n"
- 
+-
 -#: ../ifconfig.c:292
 -msgid "SLAVE "
 -msgstr "SLAVE "
-+#: ../ifconfig.c:303
-+#, c-format
-+msgid "ifconfig: option `%s' not recognised.\n"
-+msgstr ""
- 
+-
 -#: ../ifconfig.c:294
 -msgid "MASTER "
 -msgstr "MASTER "
-+#: ../ifconfig.c:305 ../ifconfig.c:962
-+#, c-format
-+msgid "ifconfig: `--help' gives usage information.\n"
-+msgstr ""
- 
+-
 -#: ../ifconfig.c:296
 -msgid "MULTICAST "
 -msgstr "MULTICAST "
-+#: ../ifconfig.c:380
-+#, c-format
-+msgid "Unknown media type.\n"
-+msgstr "Typ des Mediums unbekannt.\n"
- 
+-
 -#: ../ifconfig.c:299
 -msgid "DYNAMIC "
 -msgstr "DYNAMIC "
-+#: ../ifconfig.c:417
-+#, c-format
-+msgid ""
-+"Warning: Interface %s still in promisc mode... maybe other application is "
-+"running?\n"
-+msgstr ""
- 
+-
 -#: ../ifconfig.c:302
-+#: ../ifconfig.c:429
- #, c-format
+-#, c-format
 -msgid " MTU:%d  Metric:%d"
 -msgstr " MTU:%d  Metric:%d"
-+msgid "Warning: Interface %s still in MULTICAST mode.\n"
-+msgstr ""
- 
+-
 -#: ../ifconfig.c:306
-+#: ../ifconfig.c:441
- #, c-format
+-#, c-format
 -msgid "  Outfill:%d  Keepalive:%d"
 -msgstr "  Outfill:%d  Keepalive:%d"
-+msgid "Warning: Interface %s still in ALLMULTI mode.\n"
-+msgstr ""
- 
+-
 -#: ../ifconfig.c:320
-+#: ../ifconfig.c:465
- #, c-format
+-#, c-format
 -msgid "RX packets:%lu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
-+msgid "Warning: Interface %s still in DYNAMIC mode.\n"
- msgstr ""
+-msgstr ""
 -"Empfangene Pakete:%lu Fehler:%lu Weggeworfen:%lu Überlauf:%lu Rahmen:%lu\n"
- 
+-
 -#: ../ifconfig.c:325
-+#: ../ifconfig.c:523
- #, c-format
+-#, c-format
 -msgid "             compressed:%lu\n"
 -msgstr "             komprimiert:%lu\n"
-+msgid "Warning: Interface %s still in BROADCAST mode.\n"
-+msgstr ""
- 
+-
 -#: ../ifconfig.c:329
-+#: ../ifconfig.c:652
- #, c-format
+-#, c-format
 -msgid "TX packets:%lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
-+msgid "Warning: Interface %s still in POINTOPOINT mode.\n"
- msgstr ""
+-msgstr ""
 -"Verschickte Pakete:%lu Fehler:%lu Weggeworfen:%lu Überlauf:%lu Träger:%lu\n"
- 
+-
 -#: ../ifconfig.c:333
-+#: ../ifconfig.c:684
- #, c-format
+-#, c-format
 -msgid "          collisions:%lu "
 -msgstr "          Kollisionen:%lu "
-+msgid "hw address type `%s' has no handler to set address. failed.\n"
-+msgstr ""
- 
+-
 -#: ../ifconfig.c:335
-+#: ../ifconfig.c:693
- #, c-format
+-#, c-format
 -msgid "compressed:%lu "
 -msgstr "Komprimiert:%lu "
-+msgid "%s: invalid %s address.\n"
-+msgstr "%s: ungültige %s Adresse.\n"
- 
+-
 -#: ../ifconfig.c:337
-+#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913
- #, c-format
+-#, c-format
 -msgid "txqueuelen:%d "
 -msgstr "Sendewarteschlangenlänge:%d "
-+msgid "No support for INET6 on this system.\n"
-+msgstr "INET6 ist auf diesem System nicht verfügbar.\n"
- 
+-
 -#: ../ifconfig.c:345
-+#: ../ifconfig.c:780 ../ifconfig.c:871
- #, c-format
+-#, c-format
 -msgid "Interrupt:%d "
 -msgstr "Interrupt:%d "
 -
@@ -916,118 +791,231 @@
 -#, c-format
 -msgid "Base address:0x%x "
 -msgstr "Basisadresse:0x%x "
--
++#: ../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:350
 -#, c-format
 -msgid "Memory:%lx-%lx "
 -msgstr "Speicher:%lx-%lx "
--
++#: ../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:353
--#, c-format
++#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862
++#: ../ifconfig.c:973
+ #, c-format
 -msgid "DMA chan:%x "
 -msgstr "DMA Kanal:%x "
--
++msgid "No support for INET on this system.\n"
++msgstr "INET ist auf diesem System nicht verfügbar.\n"
+ 
 -#: ../ifconfig.c:384 ../ifconfig.c:405
 -#, c-format
 -msgid "%s: unknown interface: %s\n"
 -msgstr "%s: unbekannte Schnittstelle: %s\n"
--
++#: ../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: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:202
++#, fuzzy, c-format
+ msgid ""
+ "Usage:\n"
+-"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <address>]\n"
++"  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"
+ msgstr ""
+ "Syntax:\n"
+ "  ifconfig [-a] [-i] [-v] <Schnittstelle> [[<AF>] <Adresse>]\n"
+ 
 -#: ../ifconfig.c:425
--msgid "  [add <address>[/<prefixlen>]]\n"
++#: ../ifconfig.c:204
++#, c-format
+ msgid "  [add <address>[/<prefixlen>]]\n"
 -msgstr "  [add <Adresse>[/<Prefixlänge>]]\n"
--
++msgstr "  [add <Adresse>[/<Präfixlänge>]]\n"
+ 
 -#: ../ifconfig.c:427
--msgid "  [del <address>[/<prefixlen>]]\n"
++#: ../ifconfig.c:205
++#, c-format
+ msgid "  [del <address>[/<prefixlen>]]\n"
 -msgstr "  [del <Adresse>[/<Prefixlänge>]]\n"
--
++msgstr "  [del <Adresse>[/<Präfixlänge>]]\n"
+ 
 -#: ../ifconfig.c:432
--msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
--msgstr "  [[-]broadcast [<Adresse>]]  [[-]pointopoint [<Adresse>]]\n"
--
++#: ../ifconfig.c:206
++#, c-format
+ msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
+ msgstr "  [[-]broadcast [<Adresse>]]  [[-]pointopoint [<Adresse>]]\n"
+ 
 -#: ../ifconfig.c:433
--msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
++#: ../ifconfig.c:207
++#, c-format
+ msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
 -msgstr "  [netmask <Addresse>]  [dstaddr <Adresse>]  [tunnel <Adresse>]\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:210
++#, c-format
+ 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:212
++#, c-format
+ 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:213
++#, c-format
+ msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
+ msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
+ 
 -#: ../ifconfig.c:440
--msgid "  [multicast]  [[-]promisc]\n"
--msgstr "  [multicast]  [[-]promisc]\n"
--
++#: ../ifconfig.c:214
++#, c-format
+ 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: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 <Typ>]\n"
+ 
 -#: ../ifconfig.c:443
--msgid "  [txqueuelen <NN>]\n"
--msgstr "  [txqueuelen <Länge>]\n"
--
++#: ../ifconfig.c:217
++#, c-format
+ msgid "  [txqueuelen <NN>]\n"
+ msgstr "  [txqueuelen <Länge>]\n"
+ 
 -#: ../ifconfig.c:446
--msgid "  [[-]dynamic]\n"
--msgstr "  [[-]dynamic]\n"
--
++#: ../ifconfig.c:220
++#, c-format
+ 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:222
++#, c-format
+ msgid ""
+ "  [up|down] ...\n"
+ "\n"
+@@ -716,63 +557,132 @@
+ "  [up|down] ...\n"
+ "\n"
+ 
 -#: ../ifconfig.c:450
--msgid "  <HW>=Hardware Type.\n"
--msgstr "  <HW>=Hardwaretyp.\n"
--
++#: ../ifconfig.c:224
++#, c-format
+ 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:225
++#, c-format
+ 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:227
+ #, 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:228
++#, c-format
+ 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: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 "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"
++#: ../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:693
+ #, c-format
+ msgid "%s: invalid %s 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:737 ../ifconfig.c:827 ../ifconfig.c:913
++#, c-format
+ msgid "No support for INET6 on this system.\n"
+ msgstr "INET6 ist auf diesem System nicht verfügbar.\n"
+ 
 -#: ../ifconfig.c:983
++#: ../ifconfig.c:780 ../ifconfig.c:871
++#, c-format
++msgid "Interface %s not initialized\n"
++msgstr ""
++
++#: ../ifconfig.c:792 ../ifconfig.c:882
++#, fuzzy, c-format
++msgid "Bad address.\n"
++msgstr "%s: ungültige %s Adresse.\n"
++
 +#: ../ifconfig.c:885
 +#, c-format
  msgid "Address deletion not supported on this system.\n"
@@ -1075,7 +1063,7 @@
  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"
-@@ -780,198 +690,220 @@ msgstr ""
+@@ -780,198 +690,220 @@
  "(Es konnten nicht alle Prozesse identifiziert werden; Informationen über\n"
  "nicht-eigene Processe werden nicht angezeigt; Root kann sie anzeigen.)\n"
  
@@ -1349,7 +1337,7 @@
  msgid ""
  "\n"
  "Proto RefCnt Flags       Type       State         I-Node"
-@@ -979,90 +911,90 @@ msgstr ""
+@@ -979,90 +911,90 @@
  "\n"
  "Proto RefZäh Flaggen     Typ        Zustand       I-Node"
  
@@ -1473,7 +1461,7 @@
  msgid ""
  "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
  "\n"
-@@ -1070,27 +1002,32 @@ msgstr ""
+@@ -1070,27 +1002,32 @@
  "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
  "\n"
  
@@ -1511,7 +1499,7 @@
  msgid ""
  "        -M, --masquerade         display masqueraded connections\n"
  "\n"
-@@ -1098,23 +1035,38 @@ msgstr ""
+@@ -1098,23 +1035,38 @@
  "        -M, --masquerade         Maskierte Verbindungen auflisten\n"
  "\n"
  
@@ -1560,7 +1548,7 @@
  msgid ""
  "        -c, --continuous         continuous listing\n"
  "\n"
-@@ -1122,24 +1074,27 @@ msgstr ""
+@@ -1122,24 +1074,27 @@
  "        -c, --continuous         Anzeige laufend aktualisieren\n"
  "\n"
  
@@ -1593,7 +1581,7 @@
  msgid ""
  "        -F, --fib                display Forwarding Information Base "
  "(default)\n"
-@@ -1147,7 +1102,8 @@ msgstr ""
+@@ -1147,7 +1102,8 @@
  "        -F, --fib                Forwarding Infomation Base anzeigen "
  "(Standard)\n"
  
@@ -1603,7 +1591,7 @@
  msgid ""
  "        -C, --cache              display routing cache instead of FIB\n"
  "\n"
-@@ -1155,110 +1111,118 @@ msgstr ""
+@@ -1155,110 +1111,118 @@
  "        -C, --cache              Routencache statt FIB anzeigen\n"
  "\n"
  
@@ -1764,7 +1752,7 @@
  msgid ""
  "       rarp -V                               display program version.\n"
  "\n"
-@@ -1266,24 +1230,26 @@ msgstr ""
+@@ -1266,24 +1230,26 @@
  "       rarp -V                               Programmversion anzeigen.\n"
  "\n"
  
@@ -1796,7 +1784,7 @@
  msgid ""
  "       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n"
  "\n"
-@@ -1291,14 +1257,15 @@ msgstr ""
+@@ -1291,14 +1257,15 @@
  "       route [-v] [-FC] {add|del|flush} ...  Routentabelle für AF ändern.\n"
  "\n"
  
@@ -1816,7 +1804,7 @@
  msgid ""
  "       route {-V|--version}                  Display version/author and "
  "exit.\n"
-@@ -1308,212 +1275,239 @@ msgstr ""
+@@ -1308,212 +1275,239 @@
  "Ende.\n"
  "\n"
  
@@ -2030,11 +2018,10 @@
 -#: ../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"
+ msgstr "%d Pakete insgesamt empfangen"
  
 -#: ../statistics.c:66
 -#, c-format
@@ -2136,7 +2123,7 @@
  msgstr "%d Fragmente korrekt empfangen"
  
  #: ../statistics.c:78
-@@ -1521,112 +1515,113 @@ msgstr "%d Fragmente korrekt empfangen"
+@@ -1521,112 +1515,113 @@
  msgid "%d packet reassemblies failed"
  msgstr "%d fehlgeschlagene Paketdefragmentierungen"
  
@@ -2315,7 +2302,7 @@
  msgstr "Umleitungen: %d"
  
  #: ../statistics.c:108
-@@ -1634,259 +1629,522 @@ msgstr "Umleitungen: %d"
+@@ -1634,259 +1629,522 @@
  msgid "timestamp requests: %d"
  msgstr "Zeitstempel Anfragen: %d"
  
@@ -2347,8 +2334,7 @@
 +#, fuzzy, c-format
 +msgid "%u active connections openings"
 +msgstr "%d Verbindungen aktiv geöffnet"
- 
--#: ../statistics.c:116
++
 +#: ../statistics.c:123
 +#, fuzzy, c-format
 +msgid "%u passive connection openings"
@@ -2418,7 +2404,8 @@
 +#, fuzzy, c-format
 +msgid "%u SYN cookies sent"
 +msgstr "%d SYN-Cookies verschickt"
-+
+ 
+-#: ../statistics.c:116
 +#: ../statistics.c:145
 +#, fuzzy, c-format
 +msgid "%u SYN cookies received"
@@ -2693,7 +2680,9 @@
 +msgstr "%d Segmente erneut geschickt"
 +
 +#: ../statistics.c:206
-+#, c-format
+ #, c-format
+-msgid "%d ICMP packets dropped because socket was locked"
+-msgstr "%d ICMP Pakete verworfen weil Socket gesperrt war"
 +msgid "%u forward retransmits"
 +msgstr ""
 +
@@ -2763,9 +2752,7 @@
 +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"
++#, c-format
 +msgid "%u connections aborted due to memory pressure"
 +msgstr ""
 +
@@ -2908,15 +2895,15 @@
  #, c-format
  msgid "Unknown address family `%s'.\n"
 -msgstr "Unbekannte Adressfamilie `%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
@@ -2949,7 +2936,7 @@
  
  #: ../lib/ax25.c:97 ../lib/netrom.c:100
  msgid "Invalid callsign"
-@@ -1897,22 +2155,21 @@ msgid "Callsign too long"
+@@ -1897,22 +2155,21 @@
  msgstr "Rufzeichen zu lang"
  
  #: ../lib/ax25_gr.c:47
@@ -2975,7 +2962,7 @@
  #: ../lib/ether.c:74 ../lib/ether.c:91
  #, c-format
  msgid "in_ether(%s): invalid ether address!\n"
-@@ -1928,153 +2185,168 @@ msgstr "in_ether(%s): angeh
+@@ -1928,153 +2185,168 @@
  msgid "in_ether(%s): trailing junk!\n"
  msgstr "in_ether(%s): Nachfolgender Müll!\n"
  
@@ -3186,7 +3173,7 @@
  msgid ""
  "Neighbour                                   HW Address        Iface    Flags "
  "Ref State\n"
-@@ -2082,39 +2354,45 @@ msgstr ""
+@@ -2082,39 +2354,45 @@
  "Nachbar                                     HW-Adresse        Iface    Flags "
  "Ref Zustand\n"
  
@@ -3239,7 +3226,7 @@
  msgid ""
  "Destination     Gateway         Genmask         Flags Metric Ref    Use "
  "Iface\n"
-@@ -2123,6 +2401,7 @@ msgstr ""
+@@ -2123,6 +2401,7 @@
  "Iface\n"
  
  #: ../lib/inet_gr.c:59
@@ -3247,7 +3234,7 @@
  msgid ""
  "Destination     Gateway         Genmask         Flags   MSS Window  irtt "
  "Iface\n"
-@@ -2131,6 +2410,7 @@ msgstr ""
+@@ -2131,6 +2410,7 @@
  "Iface\n"
  
  #: ../lib/inet_gr.c:62
@@ -3255,7 +3242,7 @@
  msgid ""
  "Destination     Gateway         Genmask         Flags Metric Ref    Use "
  "Iface    MSS   Window irtt\n"
-@@ -2139,10 +2419,12 @@ msgstr ""
+@@ -2139,10 +2419,12 @@
  "Iface    MSS   Fenster irtt\n"
  
  #: ../lib/inet_gr.c:237
@@ -3269,7 +3256,7 @@
  msgid ""
  "Source          Destination     Gateway         Flags Metric Ref    Use "
  "Iface\n"
-@@ -2151,6 +2433,7 @@ msgstr ""
+@@ -2151,6 +2433,7 @@
  "Iface\n"
  
  #: ../lib/inet_gr.c:261
@@ -3277,7 +3264,7 @@
  msgid ""
  "Source          Destination     Gateway         Flags   MSS Window  irtt "
  "Iface\n"
-@@ -2159,6 +2442,7 @@ msgstr ""
+@@ -2159,6 +2442,7 @@
  "Iface\n"
  
  #: ../lib/inet_gr.c:266
@@ -3285,7 +3272,7 @@
  msgid ""
  "Source          Destination     Gateway         Flags Metric Ref    Use "
  "Iface    MSS   Window irtt  HH  Arp\n"
-@@ -2167,6 +2451,7 @@ msgstr ""
+@@ -2167,6 +2451,7 @@
  "Iface    MSS   Fenster irtt   HH  Arp\n"
  
  #: ../lib/inet_gr.c:290
@@ -3293,7 +3280,7 @@
  msgid ""
  "Source          Destination     Gateway         Flags Metric Ref    Use "
  "Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
-@@ -2174,37 +2459,39 @@ msgstr ""
+@@ -2174,37 +2459,39 @@
  "Quelle          Ziel            Gateway         Flags Metrik Ref    Ben "
  "Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
  
@@ -3346,7 +3333,7 @@
  msgid "       inet_route [-FC] flush      NOT supported\n"
  msgstr "       inet_route [-FC] flush      NICHT unterstützt\n"
  
-@@ -2214,15 +2501,17 @@ msgid "route: %s: cannot use a NETWORK as gateway!\n"
+@@ -2214,15 +2501,17 @@
  msgstr "route: %s: Netzadresse als Gateway ungültig!\n"
  
  #: ../lib/inet_sr.c:174
@@ -3365,7 +3352,7 @@
  msgid "route: Invalid initial rtt.\n"
  msgstr "route: Ungültige Start-RTT.\n"
  
-@@ -2237,126 +2526,408 @@ msgid "route: bogus netmask %s\n"
+@@ -2237,126 +2526,408 @@
  msgstr "Route: Fehlerhafte Netzmaske %s\n"
  
  #: ../lib/inet_sr.c:270
@@ -3801,7 +3788,7 @@
  msgid "No usable address families found.\n"
  msgstr "Keine benutzbaren Adressfamilien gefunden.\n"
  
-@@ -2368,41 +2939,44 @@ msgstr "ip: %s ist eine ung
+@@ -2368,41 +2939,44 @@
  #: ../lib/util-ank.c:238
  #, c-format
  msgid "ip: %s is invalid inet prefix\n"
@@ -3854,7 +3841,7 @@
  msgid "Cannot create socket"
  msgstr "Kann Socket nicht öffnen"
  
-@@ -2417,13 +2991,14 @@ msgid "slattach: tty_lock: (%s): %s\n"
+@@ -2417,13 +2991,14 @@
  msgstr "slattach: tty_lock: (%s): %s\n"
  
  #: ../slattach.c:192
@@ -3870,7 +3857,7 @@
  
  #: ../slattach.c:430
  #, c-format
-@@ -2435,39 +3010,71 @@ msgstr "slattach: tty_hangup(DROP): %s\n"
+@@ -2435,39 +3010,71 @@
  msgid "slattach: tty_hangup(RAISE): %s\n"
  msgstr "slattach: tty_hangup(RAISE): %s\n"
  
@@ -3950,8 +3937,6 @@
 +
 +msgid "Routing table for `ddp' not yet supported.\n"
 +msgstr "DDP-Routentabelle wird noch nicht unterstützt.\n"
-diff --git a/po/et_EE.po b/po/et_EE.po
-index ebc9de6..8805605 100644
 --- a/po/et_EE.po
 +++ b/po/et_EE.po
 @@ -1,65 +1,72 @@
@@ -4043,7 +4028,7 @@
  msgid ""
  "Address                  HWtype  HWaddress           Flags Mask            "
  "Iface\n"
-@@ -67,45 +74,52 @@ msgstr ""
+@@ -67,45 +74,52 @@
  "Aadress                  HWtüüp  HWaadress           Lipud Mask            "
  "Liides\n"
  
@@ -4105,7 +4090,7 @@
  msgid ""
  "Usage:\n"
  "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP "
-@@ -115,47 +129,45 @@ msgstr ""
+@@ -115,47 +129,45 @@
  "ARP cache vaatamine:\n"
  "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hosti nimi>]\n"
  
@@ -4167,7 +4152,7 @@
  msgid ""
  "        -a                       display (all) hosts in alternative (BSD) "
  "style\n"
-@@ -163,112 +175,122 @@ msgstr ""
+@@ -163,112 +175,122 @@
  "        -a                       näita kõiki hoste alternatiivsel (BSD) "
  "kujul\n"
  
@@ -4316,7 +4301,7 @@
  #, c-format
  msgid "%s: you must be root to change the host name\n"
  msgstr "%s: ainult root saab hosti nime muuta\n"
-@@ -283,45 +305,48 @@ msgstr "Sean domeeni nimeks `%s'\n"
+@@ -283,45 +305,48 @@
  msgid "%s: you must be root to change the domain name\n"
  msgstr "%s: ainult root saab domeeni nime muuta\n"
  
@@ -4373,7 +4358,7 @@
  msgid ""
  "       nodename [-v] {nodename|-F file}      set DECnet node name (from "
  "file)\n"
-@@ -329,18 +354,21 @@ msgstr ""
+@@ -329,18 +354,21 @@
  "  nodename [-v] {nodename|-F fail}           DECneti võrgusõlme nime "
  "seadmine\n"
  
@@ -4398,7 +4383,7 @@
  msgid ""
  "       hostname -V|--version|-h|--help       print info and exit\n"
  "\n"
-@@ -349,7 +377,8 @@ msgstr ""
+@@ -349,7 +377,8 @@
  "  hostname -h|--help                         seesama abiinfo\n"
  "\n"
  
@@ -4408,7 +4393,7 @@
  msgid ""
  "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
  "\n"
-@@ -357,36 +386,44 @@ msgstr ""
+@@ -357,36 +386,44 @@
  "  dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
  "\n"
  
@@ -4461,7 +4446,7 @@
  msgid ""
  "    -F, --file            read hostname or NIS domainname from given file\n"
  "\n"
-@@ -394,7 +431,8 @@ msgstr ""
+@@ -394,7 +431,8 @@
  "    -F, --file            lugeda hosti või NIS domeeni nimi failist\n"
  "\n"
  
@@ -4471,7 +4456,7 @@
  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"
-@@ -408,12 +446,13 @@ msgstr ""
+@@ -408,12 +446,13 @@
  "   täielikku süsteeminime (FQDN) ja DNS domeeni nime (mis on täieliku nime\n"
  "   osa) muuta failist /etc/hosts.\n"
  
@@ -4487,7 +4472,7 @@
  msgid ""
  "\n"
  "Unless you are using bind or NIS for host lookups you can change the DNS\n"
-@@ -421,95 +460,117 @@ msgstr ""
+@@ -421,95 +460,117 @@
  "\n"
  "Kui Te EI kasuta bind'i ega NIS'i nimede lahendamiseks, saate DNS domeeni\n"
  
@@ -4631,7 +4616,7 @@
  msgid ""
  "  [up|down] ...\n"
  "\n"
-@@ -517,86 +578,134 @@ msgstr ""
+@@ -517,86 +578,134 @@
  "  [up|down] ...\n"
  "\n"
  
@@ -4785,7 +4770,7 @@
  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"
-@@ -604,210 +713,223 @@ msgstr ""
+@@ -604,210 +713,223 @@
  "(Mõnesid protsesse ei saanud identifitseerida, teiste kasutajate\n"
  "info lugemiseks peab olema root)\n"
  
@@ -5061,7 +5046,7 @@
  msgid ""
  "\n"
  "Proto RefCnt Flags       Type       State         I-Node"
-@@ -815,32 +937,36 @@ msgstr ""
+@@ -815,32 +937,36 @@
  "\n"
  "Proto Mitu   Lipud       Tüüp       Olek         I-kirje "
  
@@ -5105,7 +5090,7 @@
  msgid ""
  "Active IPX sockets\n"
  "Proto Recv-Q Send-Q Local Address              Foreign Address            "
-@@ -850,47 +976,53 @@ msgstr ""
+@@ -850,47 +976,53 @@
  "Proto VvJrk  SaatJrk Kohalik aadress           Väline aadress             "
  "Olek "
  
@@ -5172,7 +5157,7 @@
  msgid ""
  "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
  "\n"
-@@ -898,25 +1030,30 @@ msgstr ""
+@@ -898,25 +1030,30 @@
  "            netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
  "\n"
  
@@ -5208,7 +5193,7 @@
  msgid ""
  "        -M, --masquerade         display masqueraded connections\n"
  "\n"
-@@ -924,32 +1061,39 @@ msgstr ""
+@@ -924,32 +1061,39 @@
  "        -M, --masquerade         maskeeritavate ühenduste näitamine\n"
  "\n"
  
@@ -5255,7 +5240,7 @@
  msgid ""
  "        -c, --continuous         continuous listing\n"
  "\n"
-@@ -957,22 +1101,26 @@ msgstr ""
+@@ -957,22 +1101,26 @@
  "        -c, --continuous         pidevalt uuenev nimekiri\n"
  "\n"
  
@@ -5286,7 +5271,7 @@
  msgid ""
  "        -F, --fib                display Forwarding Information Base "
  "(default)\n"
-@@ -980,7 +1128,8 @@ msgstr ""
+@@ -980,7 +1128,8 @@
  "        -F, --fib                üldiste ruutingutabelite näitamine "
  "(vaikimisi)\n"
  
@@ -5296,7 +5281,7 @@
  msgid ""
  "        -C, --cache              display routing cache instead of FIB\n"
  "\n"
-@@ -989,49 +1138,58 @@ msgstr ""
+@@ -989,49 +1138,58 @@
  "näitamine\n"
  "\n"
  
@@ -5374,7 +5359,7 @@
  msgid "Interface       RefCnt Group\n"
  msgstr "Liides          Mitu   Grupp\n"
  
-@@ -1070,26 +1228,31 @@ msgid "rarp: cannot set entry from %s:%u\n"
+@@ -1070,26 +1228,31 @@
  msgstr "rarp: ei saa kehtestada kirjet failist %s realt %u\n"
  
  #: ../rarp.c:176
@@ -5406,7 +5391,7 @@
  msgid ""
  "       rarp -V                               display program version.\n"
  "\n"
-@@ -1108,6 +1271,7 @@ msgid "rarp: %s: unknown hardware type.\n"
+@@ -1108,6 +1271,7 @@
  msgstr "rarp: tundmatu riistvara tüüp %s\n"
  
  #: ../route.c:80
@@ -5414,7 +5399,7 @@
  msgid ""
  "Usage: route [-nNvee] [-FC] [<AF>]           List kernel routing tables\n"
  msgstr ""
-@@ -1115,6 +1279,7 @@ msgstr ""
+@@ -1115,6 +1279,7 @@
  "    route [-nNvee] [-FC] [<AF>]           Tuuma ruutingutabeli näitamine\n"
  
  #: ../route.c:81
@@ -5422,7 +5407,7 @@
  msgid ""
  "       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n"
  "\n"
-@@ -1123,6 +1288,7 @@ msgstr ""
+@@ -1123,6 +1288,7 @@
  "\n"
  
  #: ../route.c:83
@@ -5430,7 +5415,7 @@
  msgid ""
  "       route {-h|--help} [<AF>]              Detailed usage syntax for "
  "specified AF.\n"
-@@ -1131,6 +1297,7 @@ msgstr ""
+@@ -1131,6 +1297,7 @@
  "jaoks\n"
  
  #: ../route.c:84
@@ -5438,7 +5423,7 @@
  msgid ""
  "       route {-V|--version}                  Display version/author and "
  "exit.\n"
-@@ -1139,15 +1306,23 @@ msgstr ""
+@@ -1139,15 +1306,23 @@
  "    route {-V|--version}                  Versiooni ja oskuste näitamine\n"
  "\n"
  
@@ -5462,7 +5447,7 @@
  msgid "       plipconfig -V | --version\n"
  msgstr "             plipconfig -V | --version\n"
  
-@@ -1157,24 +1332,29 @@ msgid "%s\tnibble %lu  trigger %lu\n"
+@@ -1157,24 +1332,29 @@
  msgstr "%s\tnibble %lu  trigger %lu\n"
  
  #: ../iptunnel.c:85
@@ -5492,7 +5477,7 @@
  msgid ""
  "       iptunnel -V | --version\n"
  "\n"
-@@ -1183,40 +1363,49 @@ msgstr ""
+@@ -1183,40 +1363,49 @@
  "\n"
  
  #: ../iptunnel.c:90
@@ -5542,7 +5527,7 @@
  msgid "cannot determine tunnel mode (ipip, gre or sit)\n"
  msgstr "Ei suuda määrata tunneli moodi (ipip, gre või sit)\n"
  
-@@ -1230,22 +1419,27 @@ msgid "unknown"
+@@ -1230,22 +1419,27 @@
  msgstr "tundmatu"
  
  #: ../iptunnel.c:453
@@ -5570,7 +5555,7 @@
  msgid "Wrong format of /proc/net/dev. Sorry.\n"
  msgstr "/proc/net/dev on vales formaadis. Vale tuuma versioon?\n"
  
-@@ -1255,10 +1449,12 @@ msgid "Failed to get type of [%s]\n"
+@@ -1255,10 +1449,12 @@
  msgstr "Ei suutnud kindlaks teha liidese %s tüüpi\n"
  
  #: ../iptunnel.c:516
@@ -5583,7 +5568,7 @@
  msgid "TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs\n"
  msgstr "TX: Pakette    Baite        Vigu   DeadLoop EiRuudi  MäluOtsas\n"
  
-@@ -1660,13 +1856,13 @@ msgid "%u packets directly queued to recvmsg prequeue"
+@@ -1660,13 +1856,13 @@
  msgstr "%u paketti pandi otse recvmsg eeljärjekorda"
  
  #: ../statistics.c:178
@@ -5601,7 +5586,7 @@
  msgstr "%u paketti võeti vastu otse eeljärjekorrast"
  
  #: ../statistics.c:182
-@@ -1689,19 +1885,210 @@ msgstr "%u paketti p
+@@ -1689,19 +1885,210 @@
  msgid "Ran %u times out of system memory during packet sending"
  msgstr "Pakettide saatmisel sai %u korda süsteemne mälu otsa"
  
@@ -5816,7 +5801,7 @@
  msgid "cannot open /proc/net/snmp"
  msgstr "Ei saa avada faili /proc/net/snmp"
  
-@@ -1715,7 +2102,7 @@ msgstr "Riistvara t
+@@ -1715,7 +2102,7 @@
  msgid "Cannot change line discipline to `%s'.\n"
  msgstr "Ei suuda seada `%s' liiniprotokolliks\n"
  
@@ -5825,7 +5810,7 @@
  msgid "UNSPEC"
  msgstr "UNSPEC"
  
-@@ -1731,11 +2118,11 @@ msgstr "DARPA Internet"
+@@ -1731,11 +2118,11 @@
  msgid "IPv6"
  msgstr "IPv6"
  
@@ -5839,7 +5824,7 @@
  msgid "AMPR NET/ROM"
  msgstr "AMPR NET/ROM"
  
-@@ -1747,7 +2134,7 @@ msgstr "Novell IPX"
+@@ -1747,7 +2134,7 @@
  msgid "Appletalk DDP"
  msgstr "Appletalk DDP"
  
@@ -5848,7 +5833,7 @@
  msgid "Econet"
  msgstr "Econet"
  
-@@ -1755,19 +2142,21 @@ msgstr "Econet"
+@@ -1755,19 +2142,21 @@
  msgid "CCITT X.25"
  msgstr "CCITT X.25"
  
@@ -5872,7 +5857,7 @@
  msgid "Too much address family arguments.\n"
  msgstr "Liiga palju aadressiperekonna argumente\n"
  
-@@ -1792,6 +2181,7 @@ msgid "in_arcnet(%s): trailing junk!\n"
+@@ -1792,6 +2181,7 @@
  msgstr "in_arcnet(%s): sodi lõpus\n"
  
  #: ../lib/ash.c:81
@@ -5880,7 +5865,7 @@
  msgid "Malformed Ash address"
  msgstr "Vigane Ash aadress"
  
-@@ -1810,22 +2200,21 @@ msgid "Callsign too long"
+@@ -1810,22 +2200,21 @@
  msgstr "Liiga pikk kutsung"
  
  #: ../lib/ax25_gr.c:47
@@ -5906,7 +5891,7 @@
  #: ../lib/ether.c:74 ../lib/ether.c:91
  #, c-format
  msgid "in_ether(%s): invalid ether address!\n"
-@@ -1881,90 +2270,94 @@ msgstr "in_hippi(%s): ignoreerin l
+@@ -1881,90 +2270,94 @@
  msgid "in_hippi(%s): trailing junk!\n"
  msgstr "in_hippi(%s): sodi lõpus\n"
  
@@ -6022,7 +6007,7 @@
  #: ../lib/inet.c:153 ../lib/inet6.c:79
  #, c-format
  msgid "rresolve: unsupport address family %d !\n"
-@@ -1975,26 +2368,31 @@ msgid "[UNKNOWN]"
+@@ -1975,26 +2368,31 @@
  msgstr "[TUNDMATU]"
  
  #: ../lib/inet6_gr.c:71
@@ -6058,7 +6043,7 @@
  msgid ""
  "Neighbour                                   HW Address        Iface    Flags "
  "Ref State\n"
-@@ -2003,6 +2401,7 @@ msgstr ""
+@@ -2003,6 +2401,7 @@
  "Mitu Olek\n"
  
  #: ../lib/inet6_gr.c:157
@@ -6066,7 +6051,7 @@
  msgid ""
  "Neighbour                                   HW Address        Iface    Flags "
  "Ref State            Stale(sec) Delete(sec)\n"
-@@ -2011,31 +2410,38 @@ msgstr ""
+@@ -2011,31 +2410,38 @@
  "Mitu Olek            Stale(sec) Delete(sec)\n"
  
  #: ../lib/inet6_sr.c:46
@@ -6105,7 +6090,7 @@
  msgid ""
  "Destination     Gateway         Genmask         Flags Metric Ref    Use "
  "Iface\n"
-@@ -2044,6 +2450,7 @@ msgstr ""
+@@ -2044,6 +2450,7 @@
  "Liides\n"
  
  #: ../lib/inet_gr.c:59
@@ -6113,7 +6098,7 @@
  msgid ""
  "Destination     Gateway         Genmask         Flags   MSS Window  irtt "
  "Iface\n"
-@@ -2052,6 +2459,7 @@ msgstr ""
+@@ -2052,6 +2459,7 @@
  "Liides\n"
  
  #: ../lib/inet_gr.c:62
@@ -6121,7 +6106,7 @@
  msgid ""
  "Destination     Gateway         Genmask         Flags Metric Ref    Use "
  "Iface    MSS   Window irtt\n"
-@@ -2060,10 +2468,12 @@ msgstr ""
+@@ -2060,10 +2468,12 @@
  "Liides   MSS   Aken   irtt\n"
  
  #: ../lib/inet_gr.c:237
@@ -6134,7 +6119,7 @@
  msgid ""
  "Source          Destination     Gateway         Flags Metric Ref    Use "
  "Iface\n"
-@@ -2072,6 +2482,7 @@ msgstr ""
+@@ -2072,6 +2482,7 @@
  "Liides\n"
  
  #: ../lib/inet_gr.c:261
@@ -6142,7 +6127,7 @@
  msgid ""
  "Source          Destination     Gateway         Flags   MSS Window  irtt "
  "Iface\n"
-@@ -2080,6 +2491,7 @@ msgstr ""
+@@ -2080,6 +2491,7 @@
  "Liides\n"
  
  #: ../lib/inet_gr.c:266
@@ -6150,7 +6135,7 @@
  msgid ""
  "Source          Destination     Gateway         Flags Metric Ref    Use "
  "Iface    MSS   Window irtt  HH  Arp\n"
-@@ -2088,6 +2500,7 @@ msgstr ""
+@@ -2088,6 +2500,7 @@
  "Liides   MSS    Aken  irtt  HH  Arp\n"
  
  #: ../lib/inet_gr.c:290
@@ -6158,7 +6143,7 @@
  msgid ""
  "Source          Destination     Gateway         Flags Metric Ref    Use "
  "Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
-@@ -2095,7 +2508,8 @@ msgstr ""
+@@ -2095,7 +2508,8 @@
  "Lähtepunkt      Sihtpunkt       Ruuter          Lipud Meetr  Mitu Kasut "
  "Liides   MSS   Aken   irtt  TOS HHRef HHUptod     SpecDst\n"
  
@@ -6168,7 +6153,7 @@
  msgid ""
  "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] "
  "[[dev] If]\n"
-@@ -2103,31 +2517,36 @@ msgstr ""
+@@ -2103,31 +2517,36 @@
  "Kasutamine: route [-vF] del {-host|-net} AADRESS[/PREFIKS] [gw GW] [metric "
  "M] [[dev] LIIDES]\n"
  
@@ -6210,7 +6195,7 @@
  msgid "       inet_route [-FC] flush      NOT supported\n"
  msgstr "            route [-FC] flush      Seda EI toetata\n"
  
-@@ -2137,14 +2556,17 @@ msgid "route: %s: cannot use a NETWORK as gateway!\n"
+@@ -2137,14 +2556,17 @@
  msgstr "route: %s: võrku ei saa kasutada ruuterina\n"
  
  #: ../lib/inet_sr.c:174
@@ -6228,7 +6213,7 @@
  msgid "route: Invalid initial rtt.\n"
  msgstr "route: vigane algne rtt\n"
  
-@@ -2159,75 +2581,92 @@ msgid "route: bogus netmask %s\n"
+@@ -2159,75 +2581,92 @@
  msgstr "route: vale võrgumask %s\n"
  
  #: ../lib/inet_sr.c:270
@@ -6325,7 +6310,7 @@
  msgid "Sorry, use pppd!\n"
  msgstr "Palun kasutage pppd'd\n"
  
-@@ -2236,287 +2675,314 @@ msgid "Node address must be ten digits"
+@@ -2236,287 +2675,314 @@
  msgstr "Sõlme aadress peab olema kümnekohaline"
  
  #: ../lib/rose_gr.c:51
@@ -6699,7 +6684,7 @@
  msgid "No usable address families found.\n"
  msgstr "Ei leidnud ühtegi kasutatavat aadressiperekonda\n"
  
-@@ -2541,14 +3007,17 @@ msgid "ip: argument is wrong: %s\n"
+@@ -2541,14 +3007,17 @@
  msgstr "iptunnel: vale argument %s\n"
  
  #: ../ipmaddr.c:61
@@ -6717,7 +6702,7 @@
  msgid "       ipmaddr -V | -version\n"
  msgstr "            ipmaddr -V | -version\n"
  
-@@ -2577,6 +3046,7 @@ msgid "slattach: tty_lock: (%s): %s\n"
+@@ -2577,6 +3046,7 @@
  msgstr "slattach: tty_lock: (%s): %s\n"
  
  #: ../slattach.c:192
@@ -6725,7 +6710,7 @@
  msgid "slattach: cannot write PID file\n"
  msgstr "slattach: ei saa PID faili kirjutada\n"
  
-@@ -2596,18 +3066,22 @@ msgid "slattach: tty_hangup(RAISE): %s\n"
+@@ -2596,18 +3066,22 @@
  msgstr "slattach: tty_hangup(RAISE): %s\n"
  
  #: ../slattach.c:468
@@ -6748,7 +6733,7 @@
  msgid "slattach: tty_open: cannot set RAW mode!\n"
  msgstr "slattach: tty_open: ei saa seada RAW moodi\n"
  
-@@ -2617,6 +3091,7 @@ msgid "slattach: tty_open: cannot set %s bps!\n"
+@@ -2617,6 +3091,7 @@
  msgstr "slattach: tty_open: ei saa seada kiiruseks %s bps\n"
  
  #: ../slattach.c:530
@@ -6756,7 +6741,7 @@
  msgid "slattach: tty_open: cannot set 8N1 mode!\n"
  msgstr "slattach: tty_open: ei saa seada 8N1 moodi\n"
  
-@@ -2639,3 +3114,20 @@ msgstr " pordil %s"
+@@ -2639,3 +3114,20 @@
  #, c-format
  msgid " interface %s\n"
  msgstr " liides %s\n"
@@ -6777,8 +6762,6 @@
 +
 +#~ msgid "Routing table for `ddp' not yet supported.\n"
 +#~ msgstr "`ddp' jaoks ruutingutabelit veel ei oska\n"
-diff --git a/po/fr.po b/po/fr.po
-index 4981736..ba59a6b 100644
 --- a/po/fr.po
 +++ b/po/fr.po
 @@ -4,7 +4,8 @@
@@ -6791,7 +6774,7 @@
  "PO-Revision-Date: 1998-03-01 00:02+0100\n"
  "Last-Translator: J.M.Vansteene <vanstee@worldnet.fr>\n"
  "Language-Team:\n"
-@@ -12,53 +13,57 @@ msgstr ""
+@@ -12,53 +13,57 @@
  "Content-Type: text/plain; charset=iso-8859-1\n"
  "Content-Transfer-Encoding: 8bit\n"
  
@@ -6860,7 +6843,7 @@
  msgid ""
  "Address                  HWtype  HWaddress           Flags Mask            "
  "Iface\n"
-@@ -66,223 +71,220 @@ msgstr ""
+@@ -66,223 +71,220 @@
  "Adresse                  TypeMap AdresseMat          Indicateurs           "
  "Iface\n"
  
@@ -6964,7 +6947,8 @@
 -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  "
@@ -6972,8 +6956,7 @@
 -msgstr ""
 -"  arp [-v]   [<MAT>] [-i <if>] -s  <hôte> <adrmat> [netmask <nm>] pub  "
 -"<-''-\n"
-+msgstr "  arp [-v]   [<MAT>] [-i <if>] -s  <hôte> <adrmat> [temp][nopub] <-Ajout entrée\n"
- 
+-
 -#: ../arp.c:618
 +#: ../arp.c:630
 +#, fuzzy, c-format
@@ -7160,7 +7143,7 @@
  #, 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"
-@@ -307,38 +309,36 @@ msgstr "R
+@@ -307,38 +309,36 @@
  msgid "Result: h_addr_list=`%s'\n"
  msgstr "Résultat : h_addr_list=`%s'\n"
  
@@ -7213,7 +7196,7 @@
  msgid ""
  "       hostname [-v]                         display hostname\n"
  "\n"
-@@ -346,7 +346,8 @@ msgstr ""
+@@ -346,7 +346,8 @@
  "       hostname [-v]                         affiche le nom d'hôte\n"
  "\n"
  
@@ -7223,7 +7206,7 @@
  msgid ""
  "       hostname -V|--version|-h|--help       print info and exit\n"
  "\n"
-@@ -354,7 +355,8 @@ msgstr ""
+@@ -354,7 +355,8 @@
  "       hostname -V|--version|-h|--help       affiche des infos et termine\n"
  "\n"
  
@@ -7233,7 +7216,7 @@
  msgid ""
  "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
  "\n"
-@@ -362,45 +364,52 @@ msgstr ""
+@@ -362,45 +364,52 @@
  "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
  "\n"
  
@@ -7298,7 +7281,7 @@
  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,15 +424,16 @@ msgid "%s: You can't change the DNS domain name with this command\n"
+@@ -415,15 +424,16 @@
  msgstr "%s: Vous ne pouvez changer le nom de domaine DNS avec cette commande\n"
  
  #: ../hostname.c:339
@@ -7317,291 +7300,144 @@
  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"
-@@ -443,554 +453,453 @@ msgstr "getdomainname()=`%s'\n"
+@@ -443,291 +453,97 @@
  msgid "getnodename()=`%s'\n"
  msgstr "getnodename()=`%s'\n"
  
 -#: ../ifconfig.c:159
-+#: ../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: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:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862
-+#: ../ifconfig.c:973
- #, c-format
+-#, c-format
 -msgid "%-9.9s Link encap:%s  "
 -msgstr "%-9.9s Lien encap:%s  "
-+msgid "No support for INET on this system.\n"
-+msgstr "Pas de support de INET sur ce système.\n"
-+
-+#: ../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: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:164
-+#: ../ifconfig.c:204
- #, c-format
+-#, c-format
 -msgid "HWaddr %s  "
 -msgstr "HWaddr %s  "
-+msgid "  [add <address>[/<prefixlen>]]\n"
-+msgstr "  [add <adresse>[/<lg_prefixe>]]\n"
- 
+-
 -#: ../ifconfig.c:167
-+#: ../ifconfig.c:205
- #, c-format
+-#, c-format
 -msgid "Media:%s"
 -msgstr "Media:%s"
-+msgid "  [del <address>[/<prefixlen>]]\n"
-+msgstr "  [del <adresse>[/<lg_prefixe>]]\n"
- 
+-
 -#: ../ifconfig.c:169
 -msgid "(auto)"
 -msgstr "(auto)"
-+#: ../ifconfig.c:206
-+#, c-format
-+msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
-+msgstr "  [[-]broadcast [<adresse>]]  [[-]pointopoint [<adresse>]]\n"
-+
-+#: ../ifconfig.c:207
-+#, fuzzy, c-format
-+msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
-+msgstr "  [netmask <adresse>]  [dstaddr <adresse>]  [tunnel <adresse>]\n"
- 
+-
 -#: ../ifconfig.c:176
-+#: ../ifconfig.c:210
- #, c-format
+-#, c-format
 -msgid "          %s addr:%s "
 -msgstr "          %s adr:%s "
-+msgid "  [outfill <NN>] [keepalive <NN>]\n"
-+msgstr "  [outfill <NN>] [keepalive <NN>]\n"
- 
+-
 -#: ../ifconfig.c:179
-+#: ../ifconfig.c:212
- #, c-format
+-#, c-format
 -msgid " P-t-P:%s "
 -msgstr " P-t-P:%s "
-+msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
-+msgstr "  [hw <HW> <adresse>]  [metric <NN>]  [mtu <NN>]\n"
- 
+-
 -#: ../ifconfig.c:182
-+#: ../ifconfig.c:213
- #, c-format
+-#, c-format
 -msgid " Bcast:%s "
 -msgstr " Bcast:%s "
-+msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
-+msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
- 
+-
 -#: ../ifconfig.c:184
-+#: ../ifconfig.c:214
- #, c-format
+-#, c-format
 -msgid " Mask:%s\n"
 -msgstr " Masque:%s\n"
-+msgid "  [multicast]  [[-]promisc]\n"
-+msgstr "  [multicast]  [[-]promisc]\n"
- 
+-
 -#: ../ifconfig.c:201
-+#: ../ifconfig.c:215
- #, c-format
+-#, c-format
 -msgid "          inet6 addr: %s/%d"
 -msgstr "          adr inet6: %s/%d"
-+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:203
 -msgid " Scope:"
 -msgstr " Scope:"
-+#: ../ifconfig.c:217
-+#, fuzzy, c-format
-+msgid "  [txqueuelen <NN>]\n"
-+msgstr "  [txqueuelen longueur]\n"
- 
+-
 -#: ../ifconfig.c:206
 -msgid "Global"
 -msgstr "Global"
-+#: ../ifconfig.c:220
-+#, c-format
-+msgid "  [[-]dynamic]\n"
-+msgstr "  [[-]dynamic]\n"
- 
+-
 -#: ../ifconfig.c:209
 -msgid "Link"
 -msgstr "Lien"
-+#: ../ifconfig.c:222
-+#, c-format
-+msgid ""
-+"  [up|down] ...\n"
-+"\n"
-+msgstr ""
-+"  [up|down] ...\n"
-+"\n"
- 
+-
 -#: ../ifconfig.c:212
 -msgid "Site"
 -msgstr "Site"
-+#: ../ifconfig.c:224
-+#, c-format
-+msgid "  <HW>=Hardware Type.\n"
-+msgstr "  <HW>=Type de matériel.\n"
- 
+-
 -#: ../ifconfig.c:215
 -msgid "Compat"
 -msgstr "Compat"
-+#: ../ifconfig.c:225
-+#, c-format
-+msgid "  List of possible hardware types:\n"
-+msgstr "  Liste des types de matériels possibles:\n"
- 
+-
 -#: ../ifconfig.c:218
 -msgid "Host"
 -msgstr "Hôte"
-+#. 1 = ARPable
-+#: ../ifconfig.c:227
-+#, c-format
-+msgid "  <AF>=Address family. Default: %s\n"
-+msgstr "  <AF>=famille d'Adresses. Défaut: %s\n"
- 
+-
 -#: ../ifconfig.c:221
 -msgid "Unknown"
 -msgstr "Inconnu"
-+#: ../ifconfig.c:228
-+#, c-format
-+msgid "  List of possible address families:\n"
-+msgstr "  Liste des familles d'adresses possibles:\n"
- 
+-
 -#: ../ifconfig.c:236
-+#: ../ifconfig.c:303
- #, c-format
+-#, c-format
 -msgid "          IPX/Ethernet II addr:%s\n"
 -msgstr "          adr IPX/Ethernet II:%s\n"
-+msgid "ifconfig: option `%s' not recognised.\n"
-+msgstr ""
- 
+-
 -#: ../ifconfig.c:239
-+#: ../ifconfig.c:305 ../ifconfig.c:962
- #, c-format
+-#, c-format
 -msgid "          IPX/Ethernet SNAP addr:%s\n"
 -msgstr "          adr IPX/Ethernet SNAP:%s\n"
-+msgid "ifconfig: `--help' gives usage information.\n"
-+msgstr ""
- 
+-
 -#: ../ifconfig.c:242
-+#: ../ifconfig.c:380
- #, c-format
+-#, c-format
 -msgid "          IPX/Ethernet 802.2 addr:%s\n"
 -msgstr "          adr IPX/Ethernet 802.2:%s\n"
-+msgid "Unknown media type.\n"
-+msgstr "Type de média inconnu.\n"
- 
+-
 -#: ../ifconfig.c:245
-+#: ../ifconfig.c:417
- #, c-format
+-#, c-format
 -msgid "          IPX/Ethernet 802.3 addr:%s\n"
 -msgstr "          adr IPX/Ethernet 802.3:%s\n"
-+msgid ""
-+"Warning: Interface %s still in promisc mode... maybe other application is "
-+"running?\n"
-+msgstr ""
- 
+-
 -#: ../ifconfig.c:255
-+#: ../ifconfig.c:429
- #, c-format
+-#, c-format
 -msgid "          EtherTalk Phase 2 addr:%s\n"
 -msgstr "          adr EtherTalk Phase 2:%s\n"
-+msgid "Warning: Interface %s still in MULTICAST mode.\n"
-+msgstr ""
- 
+-
 -#: ../ifconfig.c:264
-+#: ../ifconfig.c:441
- #, c-format
+-#, c-format
 -msgid "          econet addr:%s\n"
 -msgstr "          adr econet:%s\n"
-+msgid "Warning: Interface %s still in ALLMULTI mode.\n"
-+msgstr ""
- 
+-
 -#: ../ifconfig.c:270
 -msgid "[NO FLAGS] "
 -msgstr "[PAS INDICATEURS] "
-+#: ../ifconfig.c:465
-+#, c-format
-+msgid "Warning: Interface %s still in DYNAMIC mode.\n"
-+msgstr ""
- 
+-
 -#: ../ifconfig.c:272
 -msgid "UP "
 -msgstr "UP "
-+#: ../ifconfig.c:523
-+#, c-format
-+msgid "Warning: Interface %s still in BROADCAST mode.\n"
-+msgstr ""
- 
+-
 -#: ../ifconfig.c:274
 -msgid "BROADCAST "
 -msgstr "BROADCAST "
-+#: ../ifconfig.c:652
-+#, c-format
-+msgid "Warning: Interface %s still in POINTOPOINT mode.\n"
-+msgstr ""
- 
+-
 -#: ../ifconfig.c:276
 -msgid "DEBUG "
 -msgstr "DEBUG "
-+#: ../ifconfig.c:684
-+#, c-format
-+msgid "hw address type `%s' has no handler to set address. failed.\n"
-+msgstr ""
- 
+-
 -#: ../ifconfig.c:278
 -msgid "LOOPBACK "
 -msgstr "LOOPBACK "
-+#: ../ifconfig.c:693
-+#, c-format
-+msgid "%s: invalid %s address.\n"
-+msgstr "%s: adresse %s invalide.\n"
- 
+-
 -#: ../ifconfig.c:280
 -msgid "POINTOPOINT "
 -msgstr "POINTOPOINT "
-+#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913
-+#, c-format
-+msgid "No support for INET6 on this system.\n"
-+msgstr "Pas de support de INET6 sur ce système.\n"
- 
+-
 -#: ../ifconfig.c:282
 -msgid "NOTRAILERS "
 -msgstr "NOTRAILERS "
-+#: ../ifconfig.c:780 ../ifconfig.c:871
-+#, c-format
-+msgid "Interface %s not initialized\n"
-+msgstr ""
- 
+-
 -#: ../ifconfig.c:284
 -msgid "RUNNING "
 -msgstr "RUNNING "
-+#: ../ifconfig.c:792 ../ifconfig.c:882
-+#, fuzzy, c-format
-+msgid "Bad address.\n"
-+msgstr "%s: adresse %s invalide.\n"
- 
+-
 -#: ../ifconfig.c:286
 -msgid "NOARP "
 -msgstr "NOARP "
@@ -7653,7 +7489,12 @@
 -#: ../ifconfig.c:329
 -#, c-format
 -msgid "TX packets:%lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
--msgstr ""
++#: ../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 ""
 -"Paquets transmis:%lu erreurs:%lu jetés:%lu débordements:%lu carrier:%lu\n"
 -
 -#: ../ifconfig.c:333
@@ -7682,117 +7523,228 @@
 -#, c-format
 -msgid "Base address:0x%x "
 -msgstr "Adresse de base:0x%x "
--
++"Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
++"Indic\n"
+ 
 -#: ../ifconfig.c:350
 -#, c-format
 -msgid "Memory:%lx-%lx "
 -msgstr "Mémoire:%lx-%lx "
--
++#: ../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:353
--#, c-format
++#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862
++#: ../ifconfig.c:973
+ #, c-format
 -msgid "DMA chan:%x "
 -msgstr "Canal DMA:%x "
--
++msgid "No support for INET on this system.\n"
++msgstr "Pas de support de INET sur ce système.\n"
+ 
 -#: ../ifconfig.c:384 ../ifconfig.c:405
 -#, c-format
 -msgid "%s: unknown interface: %s\n"
 -msgstr "%s: interface inconnue: %s\n"
--
++#: ../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:421
--msgid ""
--"Usage:\n"
++#: ../ifconfig.c:202
++#, fuzzy, c-format
+ msgid ""
+ "Usage:\n"
 -"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <address>]\n"
--msgstr ""
--"Syntaxe:\n"
--"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <adresse>]\n"
--
++"  ifconfig [-a] [-v] [-s] <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:204
++#, c-format
+ 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:205
++#, c-format
+ 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:206
++#, c-format
+ 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:207
++#, fuzzy, c-format
+ 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:210
++#, c-format
+ 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:212
++#, c-format
+ 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:213
++#, c-format
+ msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
+ msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
+ 
 -#: ../ifconfig.c:440
--msgid "  [multicast]  [[-]promisc]\n"
--msgstr "  [multicast]  [[-]promisc]\n"
--
++#: ../ifconfig.c:214
++#, c-format
+ 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: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 <type>]\n"
+ 
 -#: ../ifconfig.c:443
 -#, fuzzy
--msgid "  [txqueuelen <NN>]\n"
--msgstr "  [txqueuelen longueur]\n"
--
++#: ../ifconfig.c:217
++#, fuzzy, c-format
+ msgid "  [txqueuelen <NN>]\n"
+ msgstr "  [txqueuelen longueur]\n"
+ 
 -#: ../ifconfig.c:446
--msgid "  [[-]dynamic]\n"
--msgstr "  [[-]dynamic]\n"
--
++#: ../ifconfig.c:220
++#, c-format
+ msgid "  [[-]dynamic]\n"
+ msgstr "  [[-]dynamic]\n"
+ 
 -#: ../ifconfig.c:448
--msgid ""
--"  [up|down] ...\n"
--"\n"
--msgstr ""
--"  [up|down] ...\n"
--"\n"
--
++#: ../ifconfig.c:222
++#, c-format
+ msgid ""
+ "  [up|down] ...\n"
+ "\n"
+@@ -735,262 +551,355 @@
+ "  [up|down] ...\n"
+ "\n"
+ 
 -#: ../ifconfig.c:450
--msgid "  <HW>=Hardware Type.\n"
--msgstr "  <HW>=Type de matériel.\n"
--
++#: ../ifconfig.c:224
++#, c-format
+ 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:225
++#, c-format
+ 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:227
+ #, 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:228
++#, c-format
+ 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: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 "Type de média inconnu.\n"
+ 
 -#: ../ifconfig.c:881
-+#: ../ifconfig.c:885
++#: ../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:693
  #, c-format
--msgid "%s: invalid %s address.\n"
--msgstr "%s: adresse %s invalide.\n"
--
+ msgid "%s: invalid %s 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:737 ../ifconfig.c:827 ../ifconfig.c:913
++#, c-format
+ 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:780 ../ifconfig.c:871
++#, c-format
++msgid "Interface %s not initialized\n"
++msgstr ""
++
++#: ../ifconfig.c:792 ../ifconfig.c:882
++#, fuzzy, c-format
++msgid "Bad address.\n"
++msgstr "%s: adresse %s invalide.\n"
++
++#: ../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"
  
@@ -8111,7 +8063,7 @@
  msgid ""
  "\n"
  "Proto RefCnt Flags       Type       State         I-Node"
-@@ -998,32 +907,36 @@ msgstr ""
+@@ -998,32 +907,36 @@
  "\n"
  "Proto RefCpt Indicatrs   Type       Etat          I-Node"
  
@@ -8155,7 +8107,7 @@
  msgid ""
  "Active IPX sockets\n"
  "Proto Recv-Q Send-Q Local Address              Foreign Address            "
-@@ -1033,55 +946,53 @@ msgstr ""
+@@ -1033,55 +946,53 @@
  "Proto Recv-Q Send-Q Adresse locale             Adresse distante           "
  "Etat"
  
@@ -8231,7 +8183,7 @@
  msgid ""
  "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
  "\n"
-@@ -1089,27 +1000,30 @@ msgstr ""
+@@ -1089,27 +1000,30 @@
  "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
  "\n"
  
@@ -8270,7 +8222,7 @@
  msgid ""
  "        -M, --masquerade         display masqueraded connections\n"
  "\n"
-@@ -1117,23 +1031,41 @@ msgstr ""
+@@ -1117,23 +1031,41 @@
  "        -M, --masquerade         affiche les connexions masquées\n"
  "\n"
  
@@ -8317,7 +8269,7 @@
  msgid ""
  "        -c, --continuous         continuous listing\n"
  "\n"
-@@ -1141,32 +1073,31 @@ msgstr ""
+@@ -1141,32 +1073,31 @@
  "        -c, --continuous         listing continu\n"
  "\n"
  
@@ -8363,7 +8315,7 @@
  msgid ""
  "        -C, --cache              display routing cache instead of FIB\n"
  "\n"
-@@ -1174,110 +1105,118 @@ msgstr ""
+@@ -1174,110 +1105,118 @@
  "        -C, --cache              affiche le cache de routage au lieu de FIB\n"
  "\n"
  
@@ -8522,7 +8474,7 @@
  msgid ""
  "       rarp -V                               display program version.\n"
  "\n"
-@@ -1285,24 +1224,26 @@ msgstr ""
+@@ -1285,24 +1224,26 @@
  "       rarp -V                               affiche la version.\n"
  "\n"
  
@@ -8553,15 +8505,14 @@
  msgid ""
  "       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n"
  "\n"
-@@ -1311,15 +1252,15 @@ msgstr ""
+@@ -1311,15 +1252,15 @@
  "pour AF.\n"
  "\n"
  
 -#: ../route.c:82
--msgid ""
 +#: ../route.c:83
 +#, c-format
-+msgid ""
+ msgid ""
  "       route {-h|--help} [<AF>]              Detailed usage syntax for "
  "specified AF.\n"
 -msgstr ""
@@ -8575,7 +8526,7 @@
  msgid ""
  "       route {-V|--version}                  Display version/author and "
  "exit.\n"
-@@ -1329,16 +1270,23 @@ msgstr ""
+@@ -1329,16 +1270,23 @@
  "termine.\n"
  "\n"
  
@@ -8600,7 +8551,7 @@
  msgid "       plipconfig -V | --version\n"
  msgstr "       plipconfig -V\n"
  
-@@ -1347,191 +1295,212 @@ msgstr "       plipconfig -V\n"
+@@ -1347,191 +1295,212 @@
  msgid "%s\tnibble %lu  trigger %lu\n"
  msgstr "%s\tnibble %lu  trigger %lu\n"
  
@@ -8882,7 +8833,7 @@
  msgstr "%d paquets réassemblés correctement"
  
  #: ../statistics.c:78
-@@ -1539,24 +1508,24 @@ msgstr "%d paquets r
+@@ -1539,24 +1508,24 @@
  msgid "%d packet reassemblies failed"
  msgstr "%d paquets mal réassemblés"
  
@@ -8919,7 +8870,7 @@
  msgstr "%d messages ICMP reçus"
  
  #: ../statistics.c:87
-@@ -1564,87 +1533,88 @@ msgstr "%d messages ICMP re
+@@ -1564,87 +1533,88 @@
  msgid "%d input ICMP message failed"
  msgstr "%d messages d'entrée ICMP en échec"
  
@@ -9056,7 +9007,7 @@
  msgstr "redirection: %d"
  
  #: ../statistics.c:108
-@@ -1652,22 +1622,17 @@ msgstr "redirection: %d"
+@@ -1652,22 +1622,17 @@
  msgid "timestamp requests: %d"
  msgstr "requêtes datées: %d"
  
@@ -9086,7 +9037,7 @@
  #, c-format
  msgid "RTO algorithm is %s"
  msgstr "algorithme RTO est %s"
-@@ -1677,29 +1642,29 @@ msgstr "algorithme RTO est %s"
+@@ -1677,29 +1642,29 @@
  msgid "%d active connection openings"
  msgstr "%d ouvertures de connexions actives"
  
@@ -9131,7 +9082,7 @@
  msgstr "%d segments reçus"
  
  #: ../statistics.c:126
-@@ -1717,14 +1682,14 @@ msgstr "%d segments retransmis"
+@@ -1717,14 +1682,14 @@
  msgid "%d bad segments received"
  msgstr "%d mauvais segments reçus"
  
@@ -9152,7 +9103,7 @@
  msgstr "%d paquets reçus"
  
  #: ../statistics.c:135
-@@ -1732,180 +1697,458 @@ msgstr "%d paquets re
+@@ -1732,84 +1697,356 @@
  msgid "%d packets to unknown port received"
  msgstr "%d paquets reçus pour un port inconnu"
  
@@ -9165,178 +9116,139 @@
  msgstr "%d erreurs en réception de paquets"
  
 -#: ../statistics.c:137
--#, c-format
--msgid "%d packets sent"
 +#: ../statistics.c:139
 +#, fuzzy, c-format
 +msgid "%u packets sent"
- msgstr "%d paquets envoyés"
- 
--#: ../statistics.c:142
--#, c-format
--msgid "%d SYN cookies sent"
--msgstr ""
++msgstr "%d paquets envoyés"
++
 +#: ../statistics.c:144
 +#, fuzzy, c-format
 +msgid "%u SYN cookies sent"
 +msgstr "%d SYN-Cookies reçus"
- 
--#: ../statistics.c:143
--#, c-format
--msgid "%d SYN cookies received"
++
 +#: ../statistics.c:145
 +#, fuzzy, c-format
 +msgid "%u SYN cookies received"
- msgstr "%d SYN-Cookies reçus"
- 
--#: ../statistics.c:144
--#, c-format
--msgid "%d invalid 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:146
--#, c-format
--msgid "%d resets received for embryonic SYN_RECV sockets"
++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:148
--#, c-format
--msgid "%d 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"
++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:151
--#, c-format
--msgid "%d packets pruned from out-of-order queue"
++
++#. 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:152
--#, c-format
++msgstr "%d paquets supprimés de la file hors service"
++
 +#: ../statistics.c:154
 +#, fuzzy, c-format
- msgid ""
--"%d 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"
++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: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 "%d ICMP paquets jetés car hors de la fenêtre"
- 
--#: ../statistics.c:156
--#, c-format
--msgid "%d ICMP packets dropped because socket was locked"
++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:222
--msgid "enabled"
--msgstr "activée"
--
--#: ../statistics.c:222
--msgid "disabled"
--msgstr "désactivée"
++msgstr "%d paquets ICMP jetés car la socket a été vérouillée"
++
 +#: ../statistics.c:160
 +#, c-format
 +msgid "%u TCP sockets finished time wait in fast timer"
 +msgstr ""
- 
--#: ../statistics.c:272
++
 +#: ../statistics.c:161
- #, c-format
--msgid "unknown title %s\n"
--msgstr "titre inconnu %s\n"
++#, c-format
 +msgid "%u time wait sockets recycled by time stamp"
 +msgstr ""
- 
--#: ../statistics.c:298
--msgid "error parsing /proc/net/snmp"
--msgstr "erreur d'analyse de /proc/net/snmp"
++
 +#: ../statistics.c:162
-+#, c-format
+ #, c-format
+-msgid "%d packets sent"
 +msgid "%u TCP sockets finished time wait in slow timer"
 +msgstr ""
- 
--#: ../statistics.c:311
--msgid "cannot open /proc/net/snmp"
--msgstr "ne peut ouvrir /proc/net/snmp"
++
 +#: ../statistics.c:163
 +#, c-format
 +msgid "%u passive connections rejected because of time stamp"
 +msgstr ""
- 
--#: ../lib/activate.c:69
++
 +#: ../statistics.c:165
- #, c-format
--msgid "Hardware type `%s' not supported.\n"
--msgstr "Type de matériel `%s' pas supporté.\n"
++#, c-format
 +msgid "%u active connections rejected because of time stamp"
 +msgstr ""
- 
--#: ../lib/activate.c:73
++
 +#: ../statistics.c:167
- #, c-format
--msgid "Cannot change line discipline to `%s'.\n"
--msgstr "Ne peut changer la discipline de ligne à `%s'.\n"
++#, c-format
 +msgid "%u packets rejects in established connections because of timestamp"
 +msgstr ""
- 
--#: ../lib/af.c:145 ../lib/hw.c:148
++
 +#: ../statistics.c:169
 +#, fuzzy, c-format
 +msgid "%u delayed acks sent"
-+msgstr "%d paquets envoyés"
-+
+ msgstr "%d paquets envoyés"
+ 
+-#: ../statistics.c:142
 +#: ../statistics.c:170
-+#, c-format
+ #, c-format
+-msgid "%d SYN cookies sent"
 +msgid "%u delayed acks further delayed because of locked socket"
-+msgstr ""
-+
+ msgstr ""
+ 
+-#: ../statistics.c:143
 +#: ../statistics.c:172
-+#, c-format
+ #, 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
+ #, 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
+ #, 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
+ #, c-format
+-msgid "%d packets pruned from receive queue because of socket buffer overrun"
 +msgid "%u packets directly queued to recvmsg prequeue."
-+msgstr ""
-+
+ 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
+ #, c-format
+-msgid "%d packets pruned from out-of-order queue"
 +msgid "%u of bytes directly received from backlog"
 +msgstr ""
 +
@@ -9348,30 +9260,40 @@
 +#: ../statistics.c:182
 +#, fuzzy, c-format
 +msgid "%u packets dropped from prequeue"
-+msgstr "%d paquets supprimés de la file hors service"
-+
+ 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
+ #, 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 ""
-+
+ 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
+ #, 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
+ #, 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 ""
 +
@@ -9534,8 +9456,8 @@
 +#, fuzzy, c-format
 +msgid "%u connections aborted due to timeout"
 +msgstr "%d réinitialisations de connexions reçues"
-+
-+#: ../statistics.c:222
+ 
+ #: ../statistics.c:222
 +#, c-format
 +msgid "%u connections aborted after user close in linger timeout"
 +msgstr ""
@@ -9556,31 +9478,34 @@
 +msgstr ""
 +
 +#: ../statistics.c:292
-+msgid "enabled"
-+msgstr "activée"
-+
+ msgid "enabled"
+ msgstr "activée"
+ 
+-#: ../statistics.c:222
 +#: ../statistics.c:292
-+msgid "disabled"
-+msgstr "désactivée"
-+
+ 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"
-+
+ 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"
-+
-+#: ../lib/activate.c:69
-+#, c-format
-+msgid "Hardware type `%s' not supported.\n"
-+msgstr "Type de matériel `%s' pas supporté.\n"
-+
-+#: ../lib/activate.c:73
-+#, c-format
-+msgid "Cannot change line discipline to `%s'.\n"
-+msgstr "Ne peut changer la discipline de ligne à `%s'.\n"
-+
+ msgid "cannot open /proc/net/snmp"
+ msgstr "ne peut ouvrir /proc/net/snmp"
+ 
+@@ -1823,89 +2060,95 @@
+ 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"
@@ -9696,7 +9621,7 @@
  #: ../lib/ax25.c:97 ../lib/netrom.c:100
  msgid "Invalid callsign"
  msgstr "Signal d'appel invalide"
-@@ -1915,22 +2158,21 @@ msgid "Callsign too long"
+@@ -1915,22 +2158,21 @@
  msgstr "Signal d'appel trop long"
  
  #: ../lib/ax25_gr.c:47
@@ -9722,7 +9647,7 @@
  #: ../lib/ether.c:74 ../lib/ether.c:91
  #, c-format
  msgid "in_ether(%s): invalid ether address!\n"
-@@ -1946,153 +2188,171 @@ msgstr "in_ether(%s): restant ignor
+@@ -1946,153 +2188,171 @@
  msgid "in_ether(%s): trailing junk!\n"
  msgstr "in_ether(%s): le restant à la poubelle !\n"
  
@@ -9931,7 +9856,7 @@
  msgid ""
  "Neighbour                                   HW Address        Iface    Flags "
  "Ref State\n"
-@@ -2100,39 +2360,45 @@ msgstr ""
+@@ -2100,39 +2360,45 @@
  "Voisin                                      Adresse MAT       Iface    Indic "
  "Ref Etat\n"
  
@@ -9982,7 +9907,7 @@
  msgid ""
  "Destination     Gateway         Genmask         Flags Metric Ref    Use "
  "Iface\n"
-@@ -2141,26 +2407,26 @@ msgstr ""
+@@ -2141,26 +2407,26 @@
  "Iface\n"
  
  #: ../lib/inet_gr.c:59
@@ -10015,7 +9940,7 @@
  msgid ""
  "Source          Destination     Gateway         Flags Metric Ref    Use "
  "Iface\n"
-@@ -2169,30 +2435,28 @@ msgstr ""
+@@ -2169,30 +2435,28 @@
  "Iface\n"
  
  #: ../lib/inet_gr.c:261
@@ -10054,7 +9979,7 @@
  msgid ""
  "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] "
  "[[dev] If]\n"
-@@ -2200,29 +2464,34 @@ msgstr ""
+@@ -2200,29 +2464,34 @@
  "Syntaxe: inet_route [-vF] del {-host|-net} Cible[/prefix] [gw Gw] [metric M] "
  "[[dev] If]\n"
  
@@ -10094,7 +10019,7 @@
  msgid "       inet_route [-FC] flush      NOT supported\n"
  msgstr "       inet_route [-FC] flush      PAS supporté\n"
  
-@@ -2232,15 +2501,17 @@ msgid "route: %s: cannot use a NETWORK as gateway!\n"
+@@ -2232,15 +2501,17 @@
  msgstr "route: %s: ne peut utiliser un RESEAU comme passerelle!\n"
  
  #: ../lib/inet_sr.c:174
@@ -10113,7 +10038,7 @@
  msgid "route: Invalid initial rtt.\n"
  msgstr "route: rtt initial invalide.\n"
  
-@@ -2255,75 +2526,92 @@ msgid "route: bogus netmask %s\n"
+@@ -2255,75 +2526,92 @@
  msgstr "route: netmask bogué %s\n"
  
  #: ../lib/inet_sr.c:270
@@ -10213,7 +10138,7 @@
  msgid "Sorry, use pppd!\n"
  msgstr "Désolé, utilisez pppd !\n"
  
-@@ -2332,49 +2620,314 @@ msgid "Node address must be ten digits"
+@@ -2332,49 +2620,314 @@
  msgstr "L'adresse de noeud doit avoir 10 chiffres"
  
  #: ../lib/rose_gr.c:51
@@ -10536,7 +10461,7 @@
  msgid "No usable address families found.\n"
  msgstr "Pas de famille d'adresses utilisable trouvée.\n"
  
-@@ -2398,29 +2951,32 @@ msgstr "ip: %s est une adresse IPv4 invalide\n"
+@@ -2398,29 +2951,32 @@
  msgid "ip: argument is wrong: %s\n"
  msgstr "ip: argument incorrect: %s\n"
  
@@ -10575,7 +10500,7 @@
  msgid "Cannot create socket"
  msgstr "Ne peut créer une socket"
  
-@@ -2435,6 +2991,7 @@ msgid "slattach: tty_lock: (%s): %s\n"
+@@ -2435,6 +2991,7 @@
  msgstr ""
  
  #: ../slattach.c:192
@@ -10583,7 +10508,7 @@
  msgid "slattach: cannot write PID file\n"
  msgstr "slattach: tty_lock: (%s): %s\n"
  
-@@ -2453,59 +3010,88 @@ msgstr "slattach: tty_hangup(DROP): %s\n"
+@@ -2453,59 +3010,88 @@
  msgid "slattach: tty_hangup(RAISE): %s\n"
  msgstr "slattach: tty_hangup(RAISE): %s\n"
  
@@ -10688,9 +10613,6 @@
  
  #~ msgid ""
  #~ "   FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n"
-diff --git a/po/ja.po b/po/ja.po
-new file mode 100644
-index 0000000..c106b00
 --- /dev/null
 +++ b/po/ja.po
 @@ -0,0 +1,3133 @@
@@ -13827,11 +13749,9 @@
 +#, c-format
 +msgid " interface %s\n"
 +msgstr " インタフェース %s\n"
-diff --git a/po/net-tools.pot b/po/net-tools.pot
-index 7496818..25a703a 100644
 --- a/po/net-tools.pot
 +++ b/po/net-tools.pot
-@@ -8,7 +8,7 @@ msgid ""
+@@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
@@ -13840,7 +13760,7 @@
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"
-@@ -16,107 +16,107 @@ msgstr ""
+@@ -16,107 +16,107 @@
  "Content-Type: text/plain; charset=CHARSET\n"
  "Content-Transfer-Encoding: 8bit\n"
  
@@ -13969,7 +13889,7 @@
  #, c-format
  msgid ""
  "Usage:\n"
-@@ -124,79 +124,79 @@ msgid ""
+@@ -124,79 +124,79 @@
  "cache\n"
  msgstr ""
  
@@ -14065,7 +13985,7 @@
  #, c-format
  msgid ""
  "        -f, --file               read new entries from file or from /etc/"
-@@ -204,47 +204,47 @@ msgid ""
+@@ -204,47 +204,47 @@
  "\n"
  msgstr ""
  
@@ -14122,7 +14042,7 @@
  #, c-format
  msgid "arp: %s: hardware type without ARP support.\n"
  msgstr ""
-@@ -259,143 +259,143 @@ msgstr ""
+@@ -259,143 +259,143 @@
  msgid "%s: you must be root to change the node name\n"
  msgstr ""
  
@@ -14292,7 +14212,7 @@
  #, c-format
  msgid ""
  "   This command can read or set the hostname or the NIS domainname. You can\n"
-@@ -405,42 +405,42 @@ msgid ""
+@@ -405,42 +405,42 @@
  "   part of the FQDN) in the /etc/hosts file.\n"
  msgstr ""
  
@@ -14343,7 +14263,7 @@
  "Flg\n"
  msgstr ""
  
-@@ -449,8 +449,8 @@ msgstr ""
+@@ -449,8 +449,8 @@
  msgid "%s: ERROR while getting interface flags: %s\n"
  msgstr ""
  
@@ -14354,7 +14274,7 @@
  #, c-format
  msgid "No support for INET on this system.\n"
  msgstr ""
-@@ -550,129 +550,99 @@ msgstr ""
+@@ -550,129 +550,99 @@
  msgid "  List of possible address families:\n"
  msgstr ""
  
@@ -14503,7 +14423,7 @@
  #, c-format
  msgid "WARNING: at least one error occured. (%d)\n"
  msgstr ""
-@@ -963,6 +933,13 @@ msgstr ""
+@@ -963,6 +933,13 @@
  msgid "Kernel Interface table\n"
  msgstr ""
  
@@ -14517,7 +14437,7 @@
  #: ../netstat.c:1469
  msgid "missing interface information"
  msgstr ""
-@@ -1771,7 +1748,7 @@ msgstr ""
+@@ -1771,7 +1748,7 @@
  
  #: ../statistics.c:175
  #, c-format
@@ -14526,7 +14446,7 @@
  msgstr ""
  
  #: ../statistics.c:176
-@@ -1781,247 +1758,237 @@ msgstr ""
+@@ -1781,247 +1758,237 @@
  
  #: ../statistics.c:178
  #, c-format
@@ -14823,7 +14743,7 @@
  msgid "cannot open /proc/net/snmp"
  msgstr ""
  
-@@ -2119,7 +2086,7 @@ msgid "Malformed Ash address"
+@@ -2119,7 +2086,7 @@
  msgstr ""
  
  #: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244
@@ -14832,7 +14752,7 @@
  #: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76
  msgid "[NONE SET]"
  msgstr ""
-@@ -2291,12 +2258,12 @@ msgstr ""
+@@ -2291,12 +2258,12 @@
  msgid "Generic EUI-64"
  msgstr ""
  
@@ -14847,7 +14767,7 @@
  msgid "[UNKNOWN]"
  msgstr ""
  
-@@ -2305,36 +2272,31 @@ msgstr ""
+@@ -2305,36 +2272,31 @@
  msgid "INET6 (IPv6) not configured in this system.\n"
  msgstr ""
  
@@ -14891,7 +14811,7 @@
  #, c-format
  msgid ""
  "Neighbour                                   HW Address        Iface    Flags "
-@@ -2607,284 +2569,284 @@ msgstr ""
+@@ -2607,284 +2569,284 @@
  msgid "in_tr(%s): trailing junk!\n"
  msgstr ""
  
@@ -15232,8 +15152,6 @@
  #, c-format
  msgid "DMA chan:%x "
  msgstr ""
-diff --git a/po/pt_BR.po b/po/pt_BR.po
-index 21feb90..9d4bbb2 100644
 --- a/po/pt_BR.po
 +++ b/po/pt_BR.po
 @@ -10,55 +10,60 @@
diff -Nru net-tools-1.60+git20161116.90da8a0/debian/patches/Ubuntu_unit_conversion.patch net-tools-1.60+git20180626.aebd88e/debian/patches/Ubuntu_unit_conversion.patch
--- net-tools-1.60+git20161116.90da8a0/debian/patches/Ubuntu_unit_conversion.patch	2016-05-10 17:20:37.000000000 +0000
+++ net-tools-1.60+git20180626.aebd88e/debian/patches/Ubuntu_unit_conversion.patch	2019-02-01 18:07:53.000000000 +0000
@@ -1,7 +1,7 @@
-Index: net-tools-1.60+git20150829.73cef8a/lib/interface.c
+Index: net-tools-1.60+git20180626.aebd88e-1ubuntu1/lib/interface.c
 ===================================================================
---- net-tools-1.60+git20150829.73cef8a.orig/lib/interface.c
-+++ net-tools-1.60+git20150829.73cef8a/lib/interface.c
+--- net-tools-1.60+git20180626.aebd88e-1ubuntu1.orig/lib/interface.c
++++ net-tools-1.60+git20180626.aebd88e-1ubuntu1/lib/interface.c
 @@ -866,45 +866,45 @@
  	 */
  	rx = ptr->stats.rx_bytes;
@@ -80,11 +80,11 @@
  	}
  
  	printf("        ");
-Index: net-tools-1.60+git20150829.73cef8a/man/en_US/ifconfig.8
+Index: net-tools-1.60+git20180626.aebd88e-1ubuntu1/man/en_US/ifconfig.8
 ===================================================================
---- net-tools-1.60+git20150829.73cef8a.orig/man/en_US/ifconfig.8
-+++ net-tools-1.60+git20150829.73cef8a/man/en_US/ifconfig.8
-@@ -194,11 +194,6 @@
+--- net-tools-1.60+git20180626.aebd88e-1ubuntu1.orig/man/en_US/ifconfig.8
++++ net-tools-1.60+git20180626.aebd88e-1ubuntu1/man/en_US/ifconfig.8
+@@ -200,11 +200,6 @@
  .BR iptables (8)
  command.
  .LP
diff -Nru net-tools-1.60+git20161116.90da8a0/hostname.c net-tools-1.60+git20180626.aebd88e/hostname.c
--- net-tools-1.60+git20161116.90da8a0/hostname.c	2016-11-16 03:57:06.000000000 +0000
+++ net-tools-1.60+git20180626.aebd88e/hostname.c	2018-06-26 07:30:13.000000000 +0000
@@ -63,7 +63,6 @@
 static void sethname(char *);
 static void setdname(char *);
 static void showhname(char *, int);
-static void usage(void);
 static void version(void);
 static void setfilename(char *, int);
 
@@ -254,39 +253,40 @@
 
 static void version(void)
 {
-    fprintf(stderr, "%s\n", Release);
+    printf("%s\n", Release);
     exit(E_VERSION);
 }
 
-static void usage(void)
+static void usage(int rc)
 {
-    fprintf(stderr, _("Usage: hostname [-v] {hostname|-F file}      set hostname (from file)\n"));
-    fprintf(stderr, _("       domainname [-v] {nisdomain|-F file}   set NIS domainname (from file)\n"));
+    FILE *fp = rc ? stderr : stdout;
+    fprintf(fp, _("Usage: hostname [-v] {hostname|-F file}      set hostname (from file)\n"));
+    fprintf(fp, _("       domainname [-v] {nisdomain|-F file}   set NIS domainname (from file)\n"));
 #if HAVE_AFDECnet
-    fprintf(stderr, _("       nodename [-v] {nodename|-F file}      set DECnet node name (from file)\n"));
+    fprintf(fp, _("       nodename [-v] {nodename|-F file}      set DECnet node name (from file)\n"));
 #endif
-    fprintf(stderr, _("       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  display formatted name\n"));
-    fprintf(stderr, _("       hostname [-v]                         display hostname\n\n"));
-    fprintf(stderr, _("       hostname -V|--version|-h|--help       print info and exit\n\n"));
-    fprintf(stderr, _("    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n\n"));
-    fprintf(stderr, _("    -s, --short           short host name\n"));
-    fprintf(stderr, _("    -a, --alias           alias names\n"));
-    fprintf(stderr, _("    -i, --ip-address      addresses for the hostname\n"));
-    fprintf(stderr, _("    -f, --fqdn, --long    long host name (FQDN)\n"));
-    fprintf(stderr, _("    -d, --domain          DNS domain name\n"));
-    fprintf(stderr, _("    -y, --yp, --nis       NIS/YP domainname\n"));
+    fprintf(fp, _("       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  display formatted name\n"));
+    fprintf(fp, _("       hostname [-v]                         display hostname\n\n"));
+    fprintf(fp, _("       hostname -V|--version|-h|--help       print info and exit\n\n"));
+    fprintf(fp, _("    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n\n"));
+    fprintf(fp, _("    -s, --short           short host name\n"));
+    fprintf(fp, _("    -a, --alias           alias names\n"));
+    fprintf(fp, _("    -i, --ip-address      addresses for the hostname\n"));
+    fprintf(fp, _("    -f, --fqdn, --long    long host name (FQDN)\n"));
+    fprintf(fp, _("    -d, --domain          DNS domain name\n"));
+    fprintf(fp, _("    -y, --yp, --nis       NIS/YP domainname\n"));
 #if HAVE_AFDECnet
-    fprintf(stderr, _("    -n, --node            DECnet node name\n"));
+    fprintf(fp, _("    -n, --node            DECnet node name\n"));
 #endif /* HAVE_AFDECnet */
-    fprintf(stderr, _("    -F, --file            read hostname or NIS domainname from given file\n\n"));
-    fprintf(stderr, _(
+    fprintf(fp, _("    -F, --file            read hostname or NIS domainname from given file\n\n"));
+    fprintf(fp, _(
 "   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"));
 
-    exit(E_USAGE);
+    exit(rc);
 }
 
 
@@ -366,10 +366,12 @@
 	case 'V':
 	    version();
 	    break; // not reached
-	case '?':
 	case 'h':
+	    usage(E_USAGE);
+	    break; // not reached
+	case '?':
 	default:
-	    usage();
+	    usage(E_OPTERR);
 	    break; // not reached
 	};
 
diff -Nru net-tools-1.60+git20161116.90da8a0/ifconfig.c net-tools-1.60+git20180626.aebd88e/ifconfig.c
--- net-tools-1.60+git20161116.90da8a0/ifconfig.c	2016-11-16 03:57:06.000000000 +0000
+++ net-tools-1.60+git20180626.aebd88e/ifconfig.c	2018-06-26 07:30:13.000000000 +0000
@@ -198,42 +198,43 @@
     return (ifr.ifr_flags & flags);
 }
 
-static void usage(void)
+static void usage(int rc)
 {
-    fprintf(stderr, _("Usage:\n  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"));
+    FILE *fp = rc ? stderr : stdout;
+    fprintf(fp, _("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"));
-    fprintf(stderr, _("  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"));
-    fprintf(stderr, _("  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"));
+    fprintf(fp, _("  [add <address>[/<prefixlen>]]\n"));
+    fprintf(fp, _("  [del <address>[/<prefixlen>]]\n"));
+    fprintf(fp, _("  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"));
+    fprintf(fp, _("  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"));
 #endif
 #ifdef SIOCSKEEPALIVE
-    fprintf(stderr, _("  [outfill <NN>] [keepalive <NN>]\n"));
+    fprintf(fp, _("  [outfill <NN>] [keepalive <NN>]\n"));
 #endif
-    fprintf(stderr, _("  [hw <HW> <address>]  [mtu <NN>]\n"));
-    fprintf(stderr, _("  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"));
-    fprintf(stderr, _("  [multicast]  [[-]promisc]\n"));
-    fprintf(stderr, _("  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"));
+    fprintf(fp, _("  [hw <HW> <address>]  [mtu <NN>]\n"));
+    fprintf(fp, _("  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"));
+    fprintf(fp, _("  [multicast]  [[-]promisc]\n"));
+    fprintf(fp, _("  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"));
 #ifdef HAVE_TXQUEUELEN
-    fprintf(stderr, _("  [txqueuelen <NN>]\n"));
+    fprintf(fp, _("  [txqueuelen <NN>]\n"));
 #endif
 #ifdef HAVE_DYNAMIC
-    fprintf(stderr, _("  [[-]dynamic]\n"));
+    fprintf(fp, _("  [[-]dynamic]\n"));
 #endif
-    fprintf(stderr, _("  [up|down] ...\n\n"));
+    fprintf(fp, _("  [up|down] ...\n\n"));
 
-    fprintf(stderr, _("  <HW>=Hardware Type.\n"));
-    fprintf(stderr, _("  List of possible hardware types:\n"));
+    fprintf(fp, _("  <HW>=Hardware Type.\n"));
+    fprintf(fp, _("  List of possible hardware types:\n"));
     print_hwlist(0); /* 1 = ARPable */
-    fprintf(stderr, _("  <AF>=Address family. Default: %s\n"), DFLT_AF);
-    fprintf(stderr, _("  List of possible address families:\n"));
+    fprintf(fp, _("  <AF>=Address family. Default: %s\n"), DFLT_AF);
+    fprintf(fp, _("  List of possible address families:\n"));
     print_aflist(0); /* 1 = routeable */
-    exit(E_USAGE);
+    exit(rc);
 }
 
 static void version(void)
 {
-    fprintf(stderr, "%s\n", Release);
+    printf("%s\n", Release);
     exit(E_VERSION);
 }
 
@@ -299,7 +300,7 @@
 
 	else if (!strcmp(*argv, "-?") || !strcmp(*argv, "-h") ||
 	    !strcmp(*argv, "-help") || !strcmp(*argv, "--help"))
-	    usage();
+	    usage(E_USAGE);
 
 	else {
 	    fprintf(stderr, _("ifconfig: option `%s' not recognised.\n"),
@@ -359,7 +360,7 @@
 #ifdef IFF_PORTSEL
 	if (!strcmp(*spp, "media") || !strcmp(*spp, "port")) {
 	    if (*++spp == NULL)
-		usage();
+		usage(E_OPTERR);
 	    if (!strcasecmp(*spp, "auto")) {
 		goterr |= set_flag(ifr.ifr_name, IFF_AUTOMEDIA);
 	    } else {
@@ -471,7 +472,7 @@
 
 	if (!strcmp(*spp, "mtu")) {
 	    if (*++spp == NULL)
-		usage();
+		usage(E_OPTERR);
 	    ifr.ifr_mtu = atoi(*spp);
 	    if (ioctl(skfd, SIOCSIFMTU, &ifr) < 0) {
 		fprintf(stderr, "SIOCSIFMTU: %s\n", strerror(errno));
@@ -483,7 +484,7 @@
 #ifdef SIOCSKEEPALIVE
 	if (!strcmp(*spp, "keepalive")) {
 	    if (*++spp == NULL)
-		usage();
+		usage(E_OPTERR);
 	    ifr.ifr_data = (caddr_t) (uintptr_t) atoi(*spp);
 	    if (ioctl(skfd, SIOCSKEEPALIVE, &ifr) < 0) {
 		fprintf(stderr, "SIOCSKEEPALIVE: %s\n", strerror(errno));
@@ -497,7 +498,7 @@
 #ifdef SIOCSOUTFILL
 	if (!strcmp(*spp, "outfill")) {
 	    if (*++spp == NULL)
-		usage();
+		usage(E_OPTERR);
 	    ifr.ifr_data = (caddr_t) (uintptr_t) atoi(*spp);
 	    if (ioctl(skfd, SIOCSOUTFILL, &ifr) < 0) {
 		fprintf(stderr, "SIOCSOUTFILL: %s\n", strerror(errno));
@@ -540,7 +541,7 @@
 	}
 	if (!strcmp(*spp, "dstaddr")) {
 	    if (*++spp == NULL)
-		usage();
+		usage(E_OPTERR);
 	    safe_strncpy(host, *spp, (sizeof host));
 	    if (ap->input(0, host, &_sa) < 0) {
 		    if (ap->herror)
@@ -562,7 +563,7 @@
 	}
 	if (!strcmp(*spp, "netmask")) {
 	    if (*++spp == NULL || didnetmask)
-		usage();
+		usage(E_OPTERR);
 	    safe_strncpy(host, *spp, (sizeof host));
 	    if (ap->input(0, host, &_sa) < 0) {
 		    if (ap->herror)
@@ -581,7 +582,7 @@
 #ifdef HAVE_TXQUEUELEN
 	if (!strcmp(*spp, "txqueuelen")) {
 	    if (*++spp == NULL)
-		usage();
+		usage(E_OPTERR);
 	    ifr.ifr_qlen = strtoul(*spp, NULL, 0);
 	    if (ioctl(skfd, SIOCSIFTXQLEN, &ifr) < 0) {
 		fprintf(stderr, "SIOCSIFTXQLEN: %s\n", strerror(errno));
@@ -594,7 +595,7 @@
 
 	if (!strcmp(*spp, "mem_start")) {
 	    if (*++spp == NULL)
-		usage();
+		usage(E_OPTERR);
 	    if (ioctl(skfd, SIOCGIFMAP, &ifr) < 0) {
 		fprintf(stderr, "mem_start: SIOCGIFMAP: %s\n", strerror(errno));
 		spp++;
@@ -611,7 +612,7 @@
 	}
 	if (!strcmp(*spp, "io_addr")) {
 	    if (*++spp == NULL)
-		usage();
+		usage(E_OPTERR);
 	    if (ioctl(skfd, SIOCGIFMAP, &ifr) < 0) {
 		fprintf(stderr, "io_addr: SIOCGIFMAP: %s\n", strerror(errno));
 		spp++;
@@ -628,7 +629,7 @@
 	}
 	if (!strcmp(*spp, "irq")) {
 	    if (*++spp == NULL)
-		usage();
+		usage(E_OPTERR);
 	    if (ioctl(skfd, SIOCGIFMAP, &ifr) < 0) {
 		fprintf(stderr, "irq: SIOCGIFMAP: %s\n", strerror(errno));
 		goterr = 1;
@@ -677,9 +678,9 @@
 
 	if (!strcmp(*spp, "hw")) {
 	    if (*++spp == NULL)
-		usage();
+		usage(E_OPTERR);
 	    if ((hw = get_hwtype(*spp)) == NULL)
-		usage();
+		usage(E_OPTERR);
 	    if (hw->input == NULL) {
 	    	fprintf(stderr, _("hw address type `%s' has no handler to set address. failed.\n"), *spp);
 	    	spp+=2;
@@ -687,7 +688,7 @@
 	    	continue;
 	    }
 	    if (*++spp == NULL)
-		usage();
+		usage(E_OPTERR);
 	    safe_strncpy(host, *spp, (sizeof host));
 	    if (hw->input(host, &_sa) < 0) {
 		fprintf(stderr, _("%s: invalid %s address.\n"), host, hw->name);
@@ -711,14 +712,14 @@
 #if HAVE_AFINET || HAVE_AFINET6
 	if (!strcmp(*spp, "add")) {
 	    if (*++spp == NULL)
-		usage();
+		usage(E_OPTERR);
 #if HAVE_AFINET6
 	    if (strchr(*spp, ':')) {
 		/* INET6 */
 		if ((cp = strchr(*spp, '/'))) {
 		    prefix_len = atol(cp + 1);
 		    if ((prefix_len < 0) || (prefix_len > 128))
-			usage();
+			usage(E_OPTERR);
 		    *cp = 0;
 		} else {
 		    prefix_len = 128;
@@ -801,7 +802,7 @@
 #if HAVE_AFINET || HAVE_AFINET6
 	if (!strcmp(*spp, "del")) {
 	    if (*++spp == NULL)
-		usage();
+		usage(E_OPTERR);
 
 #ifdef SIOCDIFADDR
 #if HAVE_AFINET6
@@ -809,7 +810,7 @@
 		if ((cp = strchr(*spp, '/'))) {
 		    prefix_len = atol(cp + 1);
 		    if ((prefix_len < 0) || (prefix_len > 128))
-			usage();
+			usage(E_OPTERR);
 		    *cp = 0;
 		} else {
 		    prefix_len = 128;
@@ -896,11 +897,11 @@
 #if HAVE_AFINET6
 	if (!strcmp(*spp, "tunnel")) {
 	    if (*++spp == NULL)
-		usage();
+		usage(E_OPTERR);
 	    if ((cp = strchr(*spp, '/'))) {
 		prefix_len = atol(cp + 1);
 		if ((prefix_len < 0) || (prefix_len > 128))
-		    usage();
+		    usage(E_OPTERR);
 		*cp = 0;
 	    } else {
 		prefix_len = 128;
@@ -948,11 +949,11 @@
 	if (ap->getmask) {
 	    switch (ap->getmask(host, &_samask, NULL)) {
 	    case -1:
-		usage();
+		usage(E_OPTERR);
 		break;
 	    case 1:
 		if (didnetmask)
-		    usage();
+		    usage(E_OPTERR);
 
 		// remeber to set the netmask from samask later
 		neednetmask = 1;
diff -Nru net-tools-1.60+git20161116.90da8a0/include/util-ank.h net-tools-1.60+git20180626.aebd88e/include/util-ank.h
--- net-tools-1.60+git20161116.90da8a0/include/util-ank.h	2016-11-16 03:57:06.000000000 +0000
+++ net-tools-1.60+git20180626.aebd88e/include/util-ank.h	2018-06-26 07:30:13.000000000 +0000
@@ -23,7 +23,7 @@
 #define NEXT_ARG() \
 argv++; \
 if (--argc <= 0) \
-	usage();
+	usage(E_OPTERR);
 
 typedef struct
 {
diff -Nru net-tools-1.60+git20161116.90da8a0/ipmaddr.c net-tools-1.60+git20180626.aebd88e/ipmaddr.c
--- net-tools-1.60+git20161116.90da8a0/ipmaddr.c	2016-11-16 03:57:06.000000000 +0000
+++ net-tools-1.60+git20180626.aebd88e/ipmaddr.c	2018-06-26 07:30:13.000000000 +0000
@@ -49,14 +49,14 @@
 	exit(E_VERSION);
 }
 
-static void usage(void) __attribute__((noreturn));
-
-static void usage(void)
+__attribute__((noreturn))
+static void usage(int rc)
 {
-	fprintf(stderr, _("Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n"));
-	fprintf(stderr, _("       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"));
-	fprintf(stderr, _("       ipmaddr -V | -version\n"));
-	exit(E_USAGE);
+	FILE *fp = rc ? stderr : stdout;
+	fprintf(fp, _("Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n"));
+	fprintf(fp, _("       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"));
+	fprintf(fp, _("       ipmaddr -V | -version\n"));
+	exit(rc);
 }
 
 static void print_lla(FILE *fp, int len, unsigned char *addr)
@@ -290,7 +290,7 @@
 			NEXT_ARG();
 			l = strlen(*argv);
 			if (l <= 0 || l >= sizeof(filter_dev))
-				usage();
+				usage(E_OPTERR);
 			strncpy(filter_dev, *argv, sizeof (filter_dev));
 		} else if (strcmp(*argv, "all") == 0) {
 			filter_family = AF_UNSPEC;
@@ -303,7 +303,7 @@
 		} else {
 			l = strlen(*argv);
 			if (l <= 0 || l >= sizeof(filter_dev))
-				usage();
+				usage(E_OPTERR);
 			strncpy(filter_dev, *argv, sizeof (filter_dev));
 		}
 		argv++; argc--;
@@ -335,18 +335,18 @@
 		if (strcmp(*argv, "dev") == 0) {
 			NEXT_ARG();
 			if (ifr.ifr_name[0])
-				usage();
+				usage(E_OPTERR);
 			strncpy(ifr.ifr_name, *argv, IFNAMSIZ);
 		} else {
 			if (ifr.ifr_hwaddr.sa_data[0])
-				usage();
+				usage(E_OPTERR);
 			if (parse_lla(*argv, ifr.ifr_hwaddr.sa_data) < 0)
-				usage();
+				usage(E_OPTERR);
 		}
 		argc--; argv++;
 	}
 	if (ifr.ifr_name[0] == 0)
-		usage();
+		usage(E_OPTERR);
 
 	fd = socket(AF_INET, SOCK_DGRAM, 0);
 	if (fd < 0) {
@@ -374,7 +374,7 @@
 	if (matches(*argv, "list") == 0 || matches(*argv, "show") == 0
 	    || matches(*argv, "lst") == 0)
 		return multiaddr_list(argc-1, argv+1);
-	usage();
+	usage(E_OPTERR);
 }
 
 int preferred_family = AF_UNSPEC;
@@ -404,13 +404,13 @@
 			argc--;
 			argv++;
 			if (argc <= 1)
-				usage();
+				usage(E_OPTERR);
 			if (strcmp(argv[1], "inet") == 0)
 				preferred_family = AF_INET;
 			else if (strcmp(argv[1], "inet6") == 0)
 				preferred_family = AF_INET6;
 			else
-				usage();
+				usage(E_OPTERR);
 		} else if (matches(argv[1], "-stats") == 0 ||
 			   matches(argv[1], "-statistics") == 0) {
 			++show_stats;
@@ -418,8 +418,10 @@
 			++resolve_hosts;
 		} else if ((matches(argv[1], "-V") == 0) || matches(argv[1], "--version") == 0) {
 			version();
+		} else if ((matches(argv[1], "-h") == 0) || matches(argv[1], "--help") == 0) {
+			usage(E_USAGE);
 		} else
-			usage();
+			usage(E_OPTERR);
 		argc--;	argv++;
 	}
 
diff -Nru net-tools-1.60+git20161116.90da8a0/iptunnel.c net-tools-1.60+git20180626.aebd88e/iptunnel.c
--- net-tools-1.60+git20161116.90da8a0/iptunnel.c	2016-11-16 03:57:06.000000000 +0000
+++ net-tools-1.60+git20180626.aebd88e/iptunnel.c	2018-06-26 07:30:13.000000000 +0000
@@ -75,21 +75,21 @@
 	exit(E_VERSION);
 }
 
-static void usage(void) __attribute__((noreturn));
-
-static void usage(void)
+__attribute__((noreturn))
+static void usage(int rc)
 {
-	fprintf(stderr, _("Usage: iptunnel { add | change | del | show } [ NAME ]\n"));
-	fprintf(stderr, _("          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"));
-	fprintf(stderr, _("          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"));
-	fprintf(stderr, _("          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"));
-	fprintf(stderr, _("       iptunnel -V | --version\n\n"));
-	fprintf(stderr, _("Where: NAME := STRING\n"));
-	fprintf(stderr, _("       ADDR := { IP_ADDRESS | any }\n"));
-	fprintf(stderr, _("       TOS  := { NUMBER | inherit }\n"));
-	fprintf(stderr, _("       TTL  := { 1..255 | inherit }\n"));
-	fprintf(stderr, _("       KEY  := { DOTTED_QUAD | NUMBER }\n"));
-	exit(E_USAGE);
+    FILE *fp = rc ? stderr : stdout;
+	fprintf(fp, _("Usage: iptunnel { add | change | del | show } [ NAME ]\n"));
+	fprintf(fp, _("          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"));
+	fprintf(fp, _("          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"));
+	fprintf(fp, _("          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"));
+	fprintf(fp, _("       iptunnel -V | --version\n\n"));
+	fprintf(fp, _("Where: NAME := STRING\n"));
+	fprintf(fp, _("       ADDR := { IP_ADDRESS | any }\n"));
+	fprintf(fp, _("       TOS  := { NUMBER | inherit }\n"));
+	fprintf(fp, _("       TTL  := { 1..255 | inherit }\n"));
+	fprintf(fp, _("       KEY  := { DOTTED_QUAD | NUMBER }\n"));
+	exit(rc);
 }
 
 static int do_ioctl_get_ifindex(char *dev)
@@ -216,18 +216,18 @@
 			NEXT_ARG();
 			if (strcmp(*argv, "ipip") == 0) {
 				if (p->iph.protocol)
-					usage();
+					usage(E_OPTERR);
 				p->iph.protocol = IPPROTO_IPIP;
 			} else if (strcmp(*argv, "gre") == 0) {
 				if (p->iph.protocol)
-					usage();
+					usage(E_OPTERR);
 				p->iph.protocol = IPPROTO_GRE;
 			} else if (strcmp(*argv, "sit") == 0) {
 				if (p->iph.protocol)
-					usage();
+					usage(E_OPTERR);
 				p->iph.protocol = IPPROTO_IPV6;
 			} else
-				usage();
+				usage(E_OPTERR);
 		} else if (strcmp(*argv, "key") == 0) {
 			unsigned uval;
 			NEXT_ARG();
@@ -237,7 +237,7 @@
 				p->i_key = p->o_key = get_addr32(*argv);
 			else {
 				if (scan_number(*argv, &uval)<0)
-					usage();
+					usage(E_OPTERR);
 				p->i_key = p->o_key = htonl(uval);
 			}
 		} else if (strcmp(*argv, "ikey") == 0) {
@@ -248,7 +248,7 @@
 				p->o_key = get_addr32(*argv);
 			else {
 				if (scan_number(*argv, &uval)<0)
-					usage();
+					usage(E_OPTERR);
 				p->i_key = htonl(uval);
 			}
 		} else if (strcmp(*argv, "okey") == 0) {
@@ -259,7 +259,7 @@
 				p->o_key = get_addr32(*argv);
 			else {
 				if (scan_number(*argv, &uval)<0)
-					usage();
+					usage(E_OPTERR);
 				p->o_key = htonl(uval);
 			}
 		} else if (strcmp(*argv, "seq") == 0) {
@@ -294,9 +294,9 @@
 			NEXT_ARG();
 			if (strcmp(*argv, "inherit") != 0) {
 				if (scan_number(*argv, &uval)<0)
-					usage();
+					usage(E_OPTERR);
 				if (uval > 255)
-					usage();
+					usage(E_OPTERR);
 				p->iph.ttl = uval;
 			}
 		} else if (strcmp(*argv, "tos") == 0) {
@@ -304,15 +304,15 @@
 			NEXT_ARG();
 			if (strcmp(*argv, "inherit") != 0) {
 				if (scan_number(*argv, &uval)<0)
-					usage();
+					usage(E_OPTERR);
 				if (uval > 255)
-					usage();
+					usage(E_OPTERR);
 				p->iph.tos = uval;
 			} else
 				p->iph.tos = 1;
 		} else {
 			if (p->name[0])
-				usage();
+				usage(E_OPTERR);
 			safe_strncpy(p->name, *argv, IFNAMSIZ);
 		}
 		argc--; argv++;
@@ -573,7 +573,7 @@
 	} else
 		return do_show(0, NULL);
 
-	usage();
+	usage(E_OPTERR);
 }
 
 
@@ -604,13 +604,13 @@
 			argc--;
 			argv++;
 			if (argc <= 1)
-				usage();
+				usage(E_OPTERR);
 			if (strcmp(argv[1], "inet") == 0)
 				preferred_family = AF_INET;
 			else if (strcmp(argv[1], "inet6") == 0)
 				preferred_family = AF_INET6;
 			else
-				usage();
+				usage(E_OPTERR);
 		} else if (matches(argv[1], "-stats") == 0 ||
 			   matches(argv[1], "-statistics") == 0) {
 			++show_stats;
@@ -618,8 +618,10 @@
 			++resolve_hosts;
 		} else if ((matches(argv[1], "-V") == 0) || (matches(argv[1], "--version") == 0)) {
 			version();
+		} else if ((matches(argv[1], "-h") == 0) || (matches(argv[1], "--help") == 0)) {
+			usage(E_USAGE);
 		} else
-			usage();
+			usage(E_OPTERR);
 		argc--;	argv++;
 	}
 
diff -Nru net-tools-1.60+git20161116.90da8a0/lib/inet6_sr.c net-tools-1.60+git20180626.aebd88e/lib/inet6_sr.c
--- net-tools-1.60+git20161116.90da8a0/lib/inet6_sr.c	2016-11-16 03:57:06.000000000 +0000
+++ net-tools-1.60+git20180626.aebd88e/lib/inet6_sr.c	2018-06-26 07:30:13.000000000 +0000
@@ -44,9 +44,10 @@
 
 static int usage(const int rc)
 {
-    fprintf(stderr, _("Usage: inet6_route [-vF] del Target\n"));
-    fprintf(stderr, _("       inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n"));
-    fprintf(stderr, _("       inet6_route [-FC] flush      NOT supported\n"));
+    FILE *fp = rc ? stderr : stdout;
+    fprintf(fp, _("Usage: inet6_route [-vF] del Target\n"));
+    fprintf(fp, _("       inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n"));
+    fprintf(fp, _("       inet6_route [-FC] flush      NOT supported\n"));
     return (rc);
 }
 
diff -Nru net-tools-1.60+git20161116.90da8a0/lib/inet_sr.c net-tools-1.60+git20180626.aebd88e/lib/inet_sr.c
--- net-tools-1.60+git20161116.90da8a0/lib/inet_sr.c	2016-11-16 03:57:06.000000000 +0000
+++ net-tools-1.60+git20180626.aebd88e/lib/inet_sr.c	2018-06-26 07:30:13.000000000 +0000
@@ -50,12 +50,13 @@
 
 static int usage(const int rc)
 {
-    fprintf(stderr, _("Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] [[dev] If]\n"));
-    fprintf(stderr, _("       inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n"));
-    fprintf(stderr, _("                              [netmask N] [mss Mss] [window W] [irtt I]\n"));
-    fprintf(stderr, _("                              [mod] [dyn] [reinstate] [[dev] If]\n"));
-    fprintf(stderr, _("       inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n"));
-    fprintf(stderr, _("       inet_route [-FC] flush      NOT supported\n"));
+    FILE *fp = rc ? stderr : stdout;
+    fprintf(fp, _("Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] [[dev] If]\n"));
+    fprintf(fp, _("       inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n"));
+    fprintf(fp, _("                              [netmask N] [mss Mss] [window W] [irtt I]\n"));
+    fprintf(fp, _("                              [mod] [dyn] [reinstate] [[dev] If]\n"));
+    fprintf(fp, _("       inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n"));
+    fprintf(fp, _("       inet_route [-FC] flush      NOT supported\n"));
     return (rc);
 }
 
diff -Nru net-tools-1.60+git20161116.90da8a0/lib/rose.c net-tools-1.60+git20180626.aebd88e/lib/rose.c
--- net-tools-1.60+git20161116.90da8a0/lib/rose.c	2016-11-16 03:57:06.000000000 +0000
+++ net-tools-1.60+git20180626.aebd88e/lib/rose.c	2018-06-26 07:30:13.000000000 +0000
@@ -59,7 +59,8 @@
 {
     static char buff[12];
 
-    snprintf(buff, sizeof(buff), "%02x%02x%02x%02x%02x", ptr[0], ptr[1], ptr[2], ptr[3], ptr[4]);
+    snprintf(buff, sizeof(buff), "%02hhx%02hhx%02hhx%02hhx%02hhx",
+	     ptr[0], ptr[1], ptr[2], ptr[3], ptr[4]);
     buff[10] = '\0';
     return (buff);
 }
diff -Nru net-tools-1.60+git20161116.90da8a0/lib/x25_sr.c net-tools-1.60+git20180626.aebd88e/lib/x25_sr.c
--- net-tools-1.60+git20161116.90da8a0/lib/x25_sr.c	2016-11-16 03:57:06.000000000 +0000
+++ net-tools-1.60+git20180626.aebd88e/lib/x25_sr.c	2018-06-26 07:30:13.000000000 +0000
@@ -47,8 +47,9 @@
 
 static int usage(const int rc)
 {
-  fprintf(stderr,"Usage: x25_route [-v] del Target[/mask] [dev] If\n");
-  fprintf(stderr,"       x25_route [-v] add Target[/mask] [dev] If\n");
+  FILE *fp = rc ? stderr : stdout;
+  fprintf(fp, "Usage: x25_route [-v] del Target[/mask] [dev] If\n");
+  fprintf(fp, "       x25_route [-v] add Target[/mask] [dev] If\n");
   return(rc);
 }
 
diff -Nru net-tools-1.60+git20161116.90da8a0/man/de_DE/arp.8 net-tools-1.60+git20180626.aebd88e/man/de_DE/arp.8
--- net-tools-1.60+git20161116.90da8a0/man/de_DE/arp.8	2016-11-16 03:57:06.000000000 +0000
+++ net-tools-1.60+git20180626.aebd88e/man/de_DE/arp.8	2018-06-26 07:30:13.000000000 +0000
@@ -192,4 +192,4 @@
 Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>, Bernd Eckenfels <net-tools@lina.inka.de>.
 
 .SH \(:Ubersetzung
-Ralf B\(:achle <ralf@gnu.org>, Simon A. Eugster <simon.eu@gmail.com>
+Ralf B\(:achle <ralf@linux-mips.org>, Simon A. Eugster <simon.eu@gmail.com>
diff -Nru net-tools-1.60+git20161116.90da8a0/man/de_DE/ethers.5 net-tools-1.60+git20180626.aebd88e/man/de_DE/ethers.5
--- net-tools-1.60+git20161116.90da8a0/man/de_DE/ethers.5	2016-11-16 03:57:06.000000000 +0000
+++ net-tools-1.60+git20180626.aebd88e/man/de_DE/ethers.5	2018-06-26 07:30:13.000000000 +0000
@@ -1,7 +1,7 @@
 .\"
 .\" Original by ??
 .\"
-.\" German translation by Ralf Baechle (ralf@gnu.org)
+.\" German translation by Ralf Baechle (ralf@linux-mips.org)
 .\"
 .TH ETHERS 5 "6. M\(:arz, 1999" "" "Dateiformate"
 .SH NAME \"{{{roff}}}\"{{{
@@ -34,4 +34,4 @@
 rarp(8)
 .\"}}}
 .SH \(:Ubersetzung
-Ralf B\(:achle <ralf@gnu.org>
+Ralf B\(:achle <ralf@linux-mips.org>
diff -Nru net-tools-1.60+git20161116.90da8a0/man/de_DE/hostname.1 net-tools-1.60+git20180626.aebd88e/man/de_DE/hostname.1
--- net-tools-1.60+git20161116.90da8a0/man/de_DE/hostname.1	2016-11-16 03:57:06.000000000 +0000
+++ net-tools-1.60+git20180626.aebd88e/man/de_DE/hostname.1	2018-06-26 07:30:13.000000000 +0000
@@ -1,7 +1,7 @@
 .\"
 .\" Original by ??
 .\"
-.\" German translation by Ralf Baechle (ralf@gnu.org)
+.\" German translation by Ralf Baechle (ralf@linux-mips.org)
 .\"
 .TH HOSTNAME 1 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
 
@@ -226,4 +226,4 @@
 .br
 Steve Whitehouse, <SteveW@ACM.org> (DECnet support and manpage).
 .SH \(:Ubersetzung
-Ralf B\(:achle <ralf@gnu.org>
+Ralf B\(:achle <ralf@linux-mips.org>
diff -Nru net-tools-1.60+git20161116.90da8a0/man/de_DE/ifconfig.8 net-tools-1.60+git20180626.aebd88e/man/de_DE/ifconfig.8
--- net-tools-1.60+git20161116.90da8a0/man/de_DE/ifconfig.8	2016-11-16 03:57:06.000000000 +0000
+++ net-tools-1.60+git20180626.aebd88e/man/de_DE/ifconfig.8	2018-06-26 07:30:13.000000000 +0000
@@ -198,4 +198,4 @@
 .br
 Andi Kleen, 
 .SH \(:Ubersetzung
-Ralf B\(:achle <ralf@gnu.org>
+Ralf B\(:achle <ralf@linux-mips.org>
diff -Nru net-tools-1.60+git20161116.90da8a0/man/de_DE/netstat.8 net-tools-1.60+git20180626.aebd88e/man/de_DE/netstat.8
--- net-tools-1.60+git20161116.90da8a0/man/de_DE/netstat.8	2016-11-16 03:57:06.000000000 +0000
+++ net-tools-1.60+git20180626.aebd88e/man/de_DE/netstat.8	2018-06-26 07:30:13.000000000 +0000
@@ -2,7 +2,7 @@
 .\" netstat.8 
 .\"
 .\" Original: (mdw@tc.cornell.edu & dc6iq@insu1.etec.uni-karlsruhe.de)
-.\" German translation: Ralf Baechle (ralf@gnu.org)
+.\" German translation: Ralf Baechle (ralf@linux-mips.org)
 .\"
 .\" Modified: Bernd.Eckenfels@inka.de
 .\" Modified: Andi Kleen ak@muc.de 
@@ -504,4 +504,4 @@
 Befehl wuren von Bernd Eckenfels <ecki@linux.de> vollst\(:andig neu
 geschrieben.
 .SH \(:Ubersetzung
-Ralf B\(:achle <ralf@gnu.org>
+Ralf B\(:achle <ralf@linux-mips.org>
diff -Nru net-tools-1.60+git20161116.90da8a0/man/de_DE/plipconfig.8 net-tools-1.60+git20180626.aebd88e/man/de_DE/plipconfig.8
--- net-tools-1.60+git20161116.90da8a0/man/de_DE/plipconfig.8	2016-11-16 03:57:06.000000000 +0000
+++ net-tools-1.60+git20180626.aebd88e/man/de_DE/plipconfig.8	2018-06-26 07:30:13.000000000 +0000
@@ -48,4 +48,4 @@
 .SH AUTOREN
 John Paul Morrison, <jmorriso@bogomips.ee.ubc.ca>, <ve7jpm@ve7jpm.ampr.org>
 .SH \(:Ubersetzung
-Ralf B\(:achle <ralf@gnu.org>
+Ralf B\(:achle <ralf@linux-mips.org>
diff -Nru net-tools-1.60+git20161116.90da8a0/man/de_DE/rarp.8 net-tools-1.60+git20180626.aebd88e/man/de_DE/rarp.8
--- net-tools-1.60+git20161116.90da8a0/man/de_DE/rarp.8	2016-11-16 03:57:06.000000000 +0000
+++ net-tools-1.60+git20180626.aebd88e/man/de_DE/rarp.8	2018-06-26 07:30:13.000000000 +0000
@@ -79,4 +79,4 @@
 .br
 Phil Blundell, <Philip.Blundell@pobox.com>
 .SH \(:Ubersetzung
-Ralf B\(:achle <ralf@gnu.org>
+Ralf B\(:achle <ralf@linux-mips.org>
diff -Nru net-tools-1.60+git20161116.90da8a0/man/de_DE/route.8 net-tools-1.60+git20180626.aebd88e/man/de_DE/route.8
--- net-tools-1.60+git20161116.90da8a0/man/de_DE/route.8	2016-11-16 03:57:06.000000000 +0000
+++ net-tools-1.60+git20180626.aebd88e/man/de_DE/route.8	2018-06-26 07:30:13.000000000 +0000
@@ -347,4 +347,4 @@
 .B Route
 wird zur Zeit von Phil Blundel (Philip.Blundell@pobox.com) gewartet.
 .SH \(:Ubersetzung
-Ralf B\(:achle <ralf@gnu.org>
+Ralf B\(:achle <ralf@linux-mips.org>
diff -Nru net-tools-1.60+git20161116.90da8a0/man/de_DE/slattach.8 net-tools-1.60+git20180626.aebd88e/man/de_DE/slattach.8
--- net-tools-1.60+git20161116.90da8a0/man/de_DE/slattach.8	2016-11-16 03:57:06.000000000 +0000
+++ net-tools-1.60+git20180626.aebd88e/man/de_DE/slattach.8	2018-06-26 07:30:13.000000000 +0000
@@ -76,7 +76,7 @@
 F\(:ur
 .B kiss
 Verbindungen sollte stattdessen das
-.B axattach
+.B kissattach
 Programm verwendet werden.
 .TP
 .B "[-s Geschwindigkeit]"
@@ -91,7 +91,7 @@
 .SH FEHLER
 Keine bekannt.
 .SH SIEHE ALSO
-axattach(8), dip(8) pppd(8), sliplogin(8).
+kissattach(8), dip(8) pppd(8), sliplogin(8).
 .SH AUTOREN
 Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
 .br
@@ -103,4 +103,4 @@
 .br
 Yossi Gottlieb, <yogo@math.tau.ac.il>
 .SH \(:Ubersetzung
-Ralf B\(:achle <ralf@gnu.org>
+Ralf B\(:achle <ralf@linux-mips.org>
diff -Nru net-tools-1.60+git20161116.90da8a0/man/en_US/slattach.8 net-tools-1.60+git20180626.aebd88e/man/en_US/slattach.8
--- net-tools-1.60+git20161116.90da8a0/man/en_US/slattach.8	2016-11-16 03:57:06.000000000 +0000
+++ net-tools-1.60+git20180626.aebd88e/man/en_US/slattach.8	2018-06-26 07:30:13.000000000 +0000
@@ -73,7 +73,7 @@
 Using 'ppp' mode is not normally useful as ppp requires an additional ppp daemon
 .B pppd
 to be active on the line. For kiss connections the 
-.B axattach
+.B kissattach
 program should be used.
 .TP
 .B "[\-s speed]"
@@ -87,7 +87,7 @@
 .SH BUGS
 None known.
 .SH SEE ALSO
-axattach(8), dip(8) pppd(8), sliplogin(8).
+kissattach(8), dip(8) pppd(8), sliplogin(8).
 .SH AUTHORS
 Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
 .br
diff -Nru net-tools-1.60+git20161116.90da8a0/man/fr_FR/slattach.8 net-tools-1.60+git20180626.aebd88e/man/fr_FR/slattach.8
--- net-tools-1.60+git20161116.90da8a0/man/fr_FR/slattach.8	2016-11-16 03:57:06.000000000 +0000
+++ net-tools-1.60+git20180626.aebd88e/man/fr_FR/slattach.8	2018-06-26 07:30:13.000000000 +0000
@@ -72,7 +72,7 @@
 principe pas utile puisque ppp nécessite le démon additionnel
 .B pppd
 pour être actif sur la ligne. Pour les connexions `kiss', le programme 
-.B axattach
+.B kissattach
 doit être utilisé.
 .TP
 .B "[-s vitesse]"
@@ -87,7 +87,7 @@
 .SH BUGS
 Aucun connu.
 .SH VOIR AUSSI
-axattach(8), dip(8) pppd(8), sliplogin(8).
+kissattach(8), dip(8) pppd(8), sliplogin(8).
 .SH AUTEURS
 Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
 .br
diff -Nru net-tools-1.60+git20161116.90da8a0/mii-tool.c net-tools-1.60+git20180626.aebd88e/mii-tool.c
--- net-tools-1.60+git20161116.90da8a0/mii-tool.c	2016-11-16 03:57:06.000000000 +0000
+++ net-tools-1.60+git20180626.aebd88e/mii-tool.c	2018-06-26 07:30:13.000000000 +0000
@@ -469,7 +469,7 @@
 
 static void version(void)
 {
-    fprintf(stderr, "%s\n%s\n", Release, Signature);
+    printf("%s\n%s\n", Release, Signature);
     exit(E_VERSION);
 }
 
diff -Nru net-tools-1.60+git20161116.90da8a0/nameif.c net-tools-1.60+git20180626.aebd88e/nameif.c
--- net-tools-1.60+git20161116.90da8a0/nameif.c	2016-11-16 03:57:06.000000000 +0000
+++ net-tools-1.60+git20180626.aebd88e/nameif.c	2018-06-26 07:30:13.000000000 +0000
@@ -188,13 +188,14 @@
 struct option lopt[] = {
 	{"syslog", 0, NULL, 's' },
 	{"config-file", 1, NULL, 'c' },
-	{"help", 0, NULL, '?' },
+	{"help", 0, NULL, 'h' },
 	{NULL},
 };
 
-void usage(void)
+static void usage(int rc)
 {
-	fprintf(stderr, _("usage: nameif [-c configurationfile] [-s] {ifname macaddress}\n"));
+	FILE *fp = rc ? stderr : stdout;
+	fprintf(fp, _("usage: nameif [-c configurationfile] [-s] {ifname macaddress}\n"));
 	exit(E_USAGE);
 }
 
@@ -209,12 +210,13 @@
 	int ret = 0;
 
 	for (;;) {
-		int c = getopt_long(ac,av,"c:s",lopt,NULL);
+		int c = getopt_long(ac,av,"c:sh",lopt,NULL);
 		if (c == -1) break;
 		switch (c) {
 		default:
-		case '?':
-			usage();
+			usage(E_OPTERR);
+		case 'h':
+			usage(E_USAGE);
 		case 'c':
 			fname = optarg;
 			break;
@@ -232,7 +234,7 @@
 		char pos[30];
 
 		if ((ac-optind) & 1)
-			usage();
+			usage(E_OPTERR);
 		if (strlen(av[optind])+1>IFNAMSIZ)
 			complain(_("interface name `%s' too long"), av[optind]);
 		safe_strncpy(ch->ifname, av[optind], sizeof(ch->ifname));
diff -Nru net-tools-1.60+git20161116.90da8a0/netstat.c net-tools-1.60+git20180626.aebd88e/netstat.c
--- net-tools-1.60+git20161116.90da8a0/netstat.c	2016-11-16 03:57:06.000000000 +0000
+++ net-tools-1.60+git20180626.aebd88e/netstat.c	2018-06-26 07:30:13.000000000 +0000
@@ -1962,41 +1962,42 @@
 
 static void usage(int rc)
 {
-    fprintf(stderr, _("usage: netstat [-vWeenNcCF] [<Af>] -r         netstat {-V|--version|-h|--help}\n"));
-    fprintf(stderr, _("       netstat [-vWnNcaeol] [<Socket> ...]\n"));
-    fprintf(stderr, _("       netstat { [-vWeenNac] -i | [-cnNe] -M | -s [-6tuw] }\n\n"));
+    FILE *fp = rc ? stderr : stdout;
+    fprintf(fp, _("usage: netstat [-vWeenNcCF] [<Af>] -r         netstat {-V|--version|-h|--help}\n"));
+    fprintf(fp, _("       netstat [-vWnNcaeol] [<Socket> ...]\n"));
+    fprintf(fp, _("       netstat { [-vWeenNac] -i | [-cnNe] -M | -s [-6tuw] }\n\n"));
 
-    fprintf(stderr, _("        -r, --route              display routing table\n"));
-    fprintf(stderr, _("        -i, --interfaces         display interface table\n"));
-    fprintf(stderr, _("        -g, --groups             display multicast group memberships\n"));
-    fprintf(stderr, _("        -s, --statistics         display networking statistics (like SNMP)\n"));
+    fprintf(fp, _("        -r, --route              display routing table\n"));
+    fprintf(fp, _("        -i, --interfaces         display interface table\n"));
+    fprintf(fp, _("        -g, --groups             display multicast group memberships\n"));
+    fprintf(fp, _("        -s, --statistics         display networking statistics (like SNMP)\n"));
 #if HAVE_FW_MASQUERADE
-    fprintf(stderr, _("        -M, --masquerade         display masqueraded connections\n\n"));
+    fprintf(fp, _("        -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"));
-    fprintf(stderr, _("        --numeric-users          don't resolve user names\n"));
-    fprintf(stderr, _("        -N, --symbolic           resolve hardware names\n"));
-    fprintf(stderr, _("        -e, --extend             display other/more information\n"));
-    fprintf(stderr, _("        -p, --programs           display PID/Program name for sockets\n"));
-    fprintf(stderr, _("        -o, --timers             display timers\n"));
-    fprintf(stderr, _("        -c, --continuous         continuous listing\n\n"));
-    fprintf(stderr, _("        -l, --listening          display listening server sockets\n"));
-    fprintf(stderr, _("        -a, --all                display all sockets (default: connected)\n"));
-    fprintf(stderr, _("        -F, --fib                display Forwarding Information Base (default)\n"));
-    fprintf(stderr, _("        -C, --cache              display routing cache instead of FIB\n"));
+    fprintf(fp, _("        -v, --verbose            be verbose\n"));
+    fprintf(fp, _("        -W, --wide               don't truncate IP addresses\n"));
+    fprintf(fp, _("        -n, --numeric            don't resolve names\n"));
+    fprintf(fp, _("        --numeric-hosts          don't resolve host names\n"));
+    fprintf(fp, _("        --numeric-ports          don't resolve port names\n"));
+    fprintf(fp, _("        --numeric-users          don't resolve user names\n"));
+    fprintf(fp, _("        -N, --symbolic           resolve hardware names\n"));
+    fprintf(fp, _("        -e, --extend             display other/more information\n"));
+    fprintf(fp, _("        -p, --programs           display PID/Program name for sockets\n"));
+    fprintf(fp, _("        -o, --timers             display timers\n"));
+    fprintf(fp, _("        -c, --continuous         continuous listing\n\n"));
+    fprintf(fp, _("        -l, --listening          display listening server sockets\n"));
+    fprintf(fp, _("        -a, --all                display all sockets (default: connected)\n"));
+    fprintf(fp, _("        -F, --fib                display Forwarding Information Base (default)\n"));
+    fprintf(fp, _("        -C, --cache              display routing cache instead of FIB\n"));
 #if HAVE_SELINUX
-    fprintf(stderr, _("        -Z, --context            display SELinux security context for sockets\n"));
+    fprintf(fp, _("        -Z, --context            display SELinux security context for sockets\n"));
 #endif
 
-    fprintf(stderr, _("\n  <Socket>={-t|--tcp} {-u|--udp} {-U|--udplite} {-S|--sctp} {-w|--raw}\n"));
-    fprintf(stderr, _("           {-x|--unix} --ax25 --ipx --netrom\n"));
-    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"));
+    fprintf(fp, _("\n  <Socket>={-t|--tcp} {-u|--udp} {-U|--udplite} {-S|--sctp} {-w|--raw}\n"));
+    fprintf(fp, _("           {-x|--unix} --ax25 --ipx --netrom\n"));
+    fprintf(fp, _("  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"), DFLT_AF);
+    fprintf(fp, _("  List of possible address families (which support routing):\n"));
     print_aflist(1); /* 1 = routeable */
     exit(rc);
 }
diff -Nru net-tools-1.60+git20161116.90da8a0/plipconfig.c net-tools-1.60+git20180626.aebd88e/plipconfig.c
--- net-tools-1.60+git20161116.90da8a0/plipconfig.c	2016-11-16 03:57:06.000000000 +0000
+++ net-tools-1.60+git20180626.aebd88e/plipconfig.c	2018-06-26 07:30:13.000000000 +0000
@@ -57,12 +57,13 @@
     exit(E_VERSION);
 }
 
-void usage(void)
+static void usage(int rc)
 {
-    fprintf(stderr, _("Usage: plipconfig interface [nibble NN] [trigger NN]\n"));
-    fprintf(stderr, _("       plipconfig -V | --version\n"));
-    fprintf(stderr, _("       plipconfig -h | --help\n"));
-    exit(E_USAGE);
+    FILE *fp = rc ? stderr : stdout;
+    fprintf(fp, _("Usage: plipconfig interface [nibble NN] [trigger NN]\n"));
+    fprintf(fp, _("       plipconfig -V | --version\n"));
+    fprintf(fp, _("       plipconfig -h | --help\n"));
+    exit(rc);
 }
 
 void print_plip(void)
@@ -91,14 +92,16 @@
     while (argv[0] && *argv[0] == '-') {
 	if (!strcmp(*argv, "-V") || !strcmp(*argv, "--version"))
 	    version();
+	else if (!strcmp(*argv, "-h") || !strcmp(*argv, "--help"))
+	    usage(E_USAGE);
 	else
-            usage();
+            usage(E_OPTERR);
 	argv++;
 	argc--;
     }
 
     if (argc == 0)
-	usage();
+	usage(E_OPTERR);
 
     spp = argv;
     safe_strncpy(ifr.ifr_name, *spp++, IFNAMSIZ);
@@ -117,19 +120,19 @@
     while (*spp != (char *) NULL) {
 	if (!strcmp(*spp, "nibble")) {
 	    if (*++spp == NULL)
-		usage();
+		usage(E_OPTERR);
 	    plip->nibble = atoi(*spp);
 	    spp++;
 	    continue;
 	}
 	if (!strcmp(*spp, "trigger")) {
 	    if (*++spp == NULL)
-		usage();
+		usage(E_OPTERR);
 	    plip->trigger = atoi(*spp);
 	    spp++;
 	    continue;
 	}
-	usage();
+	usage(E_OPTERR);
     }
 
     plip->pcmd = PLIP_SET_TIMEOUT;
diff -Nru net-tools-1.60+git20161116.90da8a0/po/de.po net-tools-1.60+git20180626.aebd88e/po/de.po
--- net-tools-1.60+git20161116.90da8a0/po/de.po	2016-11-16 03:57:06.000000000 +0000
+++ net-tools-1.60+git20180626.aebd88e/po/de.po	2018-06-26 07:30:13.000000000 +0000
@@ -1,12 +1,12 @@
 # $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>
+# Copyright (C) 1999 Ralf Bächle <ralf@linux-mips.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"
-"Last-Translator: Ralf Bächle <ralf@gnu.org>\n"
+"Last-Translator: Ralf Bächle <ralf@linux-mips.org>\n"
 "Language-Team:\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
diff -Nru net-tools-1.60+git20161116.90da8a0/po/pt_BR.po net-tools-1.60+git20180626.aebd88e/po/pt_BR.po
--- net-tools-1.60+git20161116.90da8a0/po/pt_BR.po	2016-11-16 03:57:06.000000000 +0000
+++ net-tools-1.60+git20180626.aebd88e/po/pt_BR.po	2018-06-26 07:30:13.000000000 +0000
@@ -6,7 +6,7 @@
 # Brazilian portuguese translation for net-tools 1.54
 # Copyright (C) 1998, 1999 Free Software Foundation, Inc.
 # Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 1998-2000
-# Ralf Baechle <ralf@gnu.org>, 1999
+# Ralf Baechle <ralf@linux-mips.org>, 1999
 msgid ""
 msgstr ""
 "Project-Id-Version: net-tools 1.54\n"
diff -Nru net-tools-1.60+git20161116.90da8a0/rarp.c net-tools-1.60+git20180626.aebd88e/rarp.c
--- net-tools-1.60+git20161116.90da8a0/rarp.c	2016-11-16 03:57:06.000000000 +0000
+++ net-tools-1.60+git20180626.aebd88e/rarp.c	2018-06-26 07:30:13.000000000 +0000
@@ -173,18 +173,19 @@
     return 0;
 }
 
-static void usage(void)
+static void usage(int rc)
 {
-    fprintf(stderr, _("Usage: rarp -a                               list entries in cache.\n"));
-    fprintf(stderr, _("       rarp -d <hostname>                    delete entry from cache.\n"));
-    fprintf(stderr, _("       rarp [<HW>] -s <hostname> <hwaddr>    add entry to cache.\n"));
-    fprintf(stderr, _("       rarp -f                               add entries from /etc/ethers.\n"));
-    fprintf(stderr, _("       rarp -V                               display program version.\n\n"));
+    FILE *fp = rc ? stderr : stdout;
+    fprintf(fp, _("Usage: rarp -a                               list entries in cache.\n"));
+    fprintf(fp, _("       rarp -d <hostname>                    delete entry from cache.\n"));
+    fprintf(fp, _("       rarp [<HW>] -s <hostname> <hwaddr>    add entry to cache.\n"));
+    fprintf(fp, _("       rarp -f                               add entries from /etc/ethers.\n"));
+    fprintf(fp, _("       rarp -V                               display program version.\n\n"));
 
-    fprintf(stderr, _("  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"), DFLT_HW);
-    fprintf(stderr, _("  List of possible hardware types (which support ARP):\n"));
+    fprintf(fp, _("  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"), DFLT_HW);
+    fprintf(fp, _("  List of possible hardware types (which support ARP):\n"));
     print_hwlist(1); /* 1 = ARPable */
-    exit(E_USAGE);
+    exit(rc);
 }
 
 #define MODE_DISPLAY   1
@@ -225,9 +226,9 @@
 	case EOF:
 	    break;
 	case 'h':
-	    usage();
+	    usage(E_USAGE);
 	case 'V':
-	    fprintf(stderr, "%s\n", Release);
+	    printf("%s\n", Release);
 	    exit(E_VERSION);
 	    break;
 	case 'v':
@@ -238,7 +239,7 @@
 	case 'd':
 	    if (mode) {
 		fprintf(stderr, _("%s: illegal option mix.\n"), argv[0]);
-		usage();
+		usage(E_OPTERR);
 	    } else {
 		mode = (c == 'a' ? MODE_DISPLAY : (c == 'd' ? MODE_DELETE : MODE_SET));
 	    }
@@ -251,19 +252,19 @@
 	    if (optarg) {
 		hardware = get_hwtype(optarg);
 	    } else {
-		usage();
+		usage(E_OPTERR);
 	    }
 	    break;
 	case 1:
 	    if (nargs == 2) {
-		usage();
+		usage(E_OPTERR);
 		exit(1);
 	    } else {
 		args[nargs++] = optarg;
 	    }
 	    break;
 	default:
-	    usage();
+	    usage(E_OPTERR);
 	}
     } while (c != EOF);
 
@@ -273,11 +274,11 @@
     }
     switch (mode) {
     case 0:
-	usage();
+	usage(E_OPTERR);
 
     case MODE_DISPLAY:
 	if (nargs != (mode - 1)) {
-	    usage();
+	    usage(E_OPTERR);
 	}
 	result = display_cache();
 	break;
@@ -285,7 +286,7 @@
     case MODE_DELETE:
     case MODE_SET:
 	if (nargs != (mode - 1)) {
-	    usage();
+	    usage(E_OPTERR);
 	}
 	if ((hp = gethostbyname(args[0])) == NULL) {
 	    fprintf(stderr, _("rarp: %s: unknown host\n"), args[0]);
@@ -301,7 +302,7 @@
 
     case MODE_ETHERS:
 	if (nargs != 0 && nargs != 1)
-	    usage();
+	    usage(E_OPTERR);
 	if (fd = socket(PF_INET, SOCK_DGRAM, 0), fd < 0) {
 	    perror("socket");
 	    exit(1);
diff -Nru net-tools-1.60+git20161116.90da8a0/route.c net-tools-1.60+git20180626.aebd88e/route.c
--- net-tools-1.60+git20161116.90da8a0/route.c	2016-11-16 03:57:06.000000000 +0000
+++ net-tools-1.60+git20180626.aebd88e/route.c	2018-06-26 07:30:13.000000000 +0000
@@ -78,20 +78,21 @@
 
 static void usage(int rc)
 {
-    fprintf(stderr, _("Usage: route [-nNvee] [-FC] [<AF>]           List kernel routing tables\n"));
-    fprintf(stderr, _("       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n\n"));
+    FILE *fp = rc ? stderr : stdout;
+    fprintf(fp, _("Usage: route [-nNvee] [-FC] [<AF>]           List kernel routing tables\n"));
+    fprintf(fp, _("       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n\n"));
+
+    fprintf(fp, _("       route {-h|--help} [<AF>]              Detailed usage syntax for specified AF.\n"));
+    fprintf(fp, _("       route {-V|--version}                  Display version/author and exit.\n\n"));
+
+    fprintf(fp, _("        -v, --verbose            be verbose\n"));
+    fprintf(fp, _("        -n, --numeric            don't resolve names\n"));
+    fprintf(fp, _("        -e, --extend             display other/more information\n"));
+    fprintf(fp, _("        -F, --fib                display Forwarding Information Base (default)\n"));
+    fprintf(fp, _("        -C, --cache              display routing cache instead of FIB\n\n"));
 
-    fprintf(stderr, _("       route {-h|--help} [<AF>]              Detailed usage syntax for specified AF.\n"));
-    fprintf(stderr, _("       route {-V|--version}                  Display version/author and exit.\n\n"));
-
-    fprintf(stderr, _("        -v, --verbose            be verbose\n"));
-    fprintf(stderr, _("        -n, --numeric            don't resolve names\n"));
-    fprintf(stderr, _("        -e, --extend             display other/more information\n"));
-    fprintf(stderr, _("        -F, --fib                display Forwarding Information Base (default)\n"));
-    fprintf(stderr, _("        -C, --cache              display routing cache instead of FIB\n\n"));
-
-    fprintf(stderr, _("  <AF>=Use -4, -6, '-A <af>' or '--<af>'; default: %s\n"), DFLT_AF);
-    fprintf(stderr, _("  List of possible address families (which support routing):\n"));
+    fprintf(fp, _("  <AF>=Use -4, -6, '-A <af>' or '--<af>'; default: %s\n"), DFLT_AF);
+    fprintf(fp, _("  List of possible address families (which support routing):\n"));
     print_aflist(1); /* 1 = routeable */
     exit(rc);
 }
@@ -99,7 +100,7 @@
 
 static void version(void)
 {
-    fprintf(stderr, "%s\n%s\n", Release, Features);
+    printf("%s\n%s\n", Release, Features);
     exit(E_VERSION);
 }
 
diff -Nru net-tools-1.60+git20161116.90da8a0/slattach.c net-tools-1.60+git20180626.aebd88e/slattach.c
--- net-tools-1.60+git20161116.90da8a0/slattach.c	2016-11-16 03:57:06.000000000 +0000
+++ net-tools-1.60+git20180626.aebd88e/slattach.c	2018-06-26 07:30:13.000000000 +0000
@@ -574,8 +574,9 @@
 
 
 static void
-usage(void)
+usage(int rc)
 {
+  FILE *fp = rc ? stderr : stdout;
   char *usage_msg = "Usage: slattach [-ehlLmnqv] "
 #ifdef SIOCSKEEPALIVE
 	  "[-k keepalive] "
@@ -586,8 +587,8 @@
 	  "[-c cmd] [-s speed] [-p protocol] tty | -\n"
 	  "       slattach -V | --version\n";
 
-  fputs(usage_msg, stderr);
-  exit(E_USAGE);
+  fputs(usage_msg, fp);
+  exit(rc);
 }
 
 
@@ -684,7 +685,7 @@
 		/*NOTREACHED*/
 
 	default:
-		usage();
+		usage(E_OPTERR);
 		/*NOTREACHED*/
   }
 
@@ -700,7 +701,7 @@
        opt_m++;
 
   /* Is a terminal given? */
-  if (optind != (argc - 1)) usage();
+  if (optind != (argc - 1)) usage(E_OPTERR);
   safe_strncpy(path_buf, argv[optind], sizeof(path_buf));
   if (!strcmp(path_buf, "-")) {
 	opt_e = 1;
diff -Nru net-tools-1.60+git20161116.90da8a0/TODO net-tools-1.60+git20180626.aebd88e/TODO
--- net-tools-1.60+git20161116.90da8a0/TODO	2016-11-16 03:57:06.000000000 +0000
+++ net-tools-1.60+git20180626.aebd88e/TODO	2018-06-26 07:30:13.000000000 +0000
@@ -24,7 +24,7 @@
 [ ] Config file only works with bash not ash.
 [ ] Token ring is almost totally untested.
 [ ] additional tools for IPX, AX.25 etc be bundled [ipxripd004, ipx_* tools
-	from caldera, axattach] into existing bins
+	from caldera, kissattach] into existing bins
 [ ] "SIOCAX25OPTRT" [Joerg (DL1BKE)]. 1.3.75
 [ ] dummy NOARP?! (2. default route for preveting hostunreachables on linedrop)
 [ ] ppp_dev_stat called for each dev in ifconfig, why? (1.3.17)