--- net-tools-1.60.orig/debian/rules +++ net-tools-1.60/debian/rules @@ -0,0 +1,81 @@ +#!/usr/bin/make -f + +include /usr/share/quilt/quilt.make + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This has to be exported to make some magic below work. +export DH_OPTIONS + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +configure: configure-stamp +configure-stamp: $(QUILT_STAMPFN) + [ ! -f config.make ] || mv config.make debian/config.make.bk + cp -f debian/config.make config.make + [ ! -f config.h ] || mv config.h debian/config.h.bk + cp -f debian/config.h config.h + dh_testdir + touch $@ + +build: build-stamp +build-stamp: configure-stamp + dh_testdir + $(MAKE) PROGS="ifconfig arp netstat route rarp slattach plipconfig \ + nameif iptunnel ipmaddr mii-tool" + touch $@ + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + [ ! -f Makefile ] || $(MAKE) clobber + [ ! -f debian/config.h.bk ] || \ + mv debian/config.h.bk config.h + [ ! -f debian/config.make.bk ] || \ + mv debian/config.make.bk config.make + dh_clean + +MANPAGES = arp.8 ethers.5 ifconfig.8 mii-tool.8 nameif.8 netstat.8 \ + plipconfig.8 rarp.8 route.8 slattach.8 + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs bin sbin usr/sbin + dh_install + $(MAKE) -C po install BASEDIR=$(CURDIR)/debian/net-tools + dh_installman --language=de \ + $(wildcard $(addprefix man/de_DE/,$(MANPAGES))) + dh_installman --language=C \ + $(wildcard $(addprefix man/en_US/,$(MANPAGES))) + dh_installman --language=fr \ + $(wildcard $(addprefix man/fr_FR/,$(MANPAGES))) + dh_installman --language=pt_BR \ + $(wildcard $(addprefix man/pt_BR/,$(MANPAGES))) + +binary-indep: build install + +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs README README.ipv6 TODO + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-arch binary-indep +.PHONY: build clean binary-indep binary-arch binary install install-indep \ + install-arch --- net-tools-1.60.orig/debian/config.h +++ net-tools-1.60/debian/config.h @@ -0,0 +1,75 @@ +/* +* config.h Automatically generated configuration includefile +* +* NET-TOOLS A collection of programs that form the base set of the +* NET-3 Networking Distribution for the LINUX operating +* system. +* +* DO NOT EDIT DIRECTLY +* +*/ + +/* + * + * Internationalization + * + * The net-tools package has currently been translated to French, + * German and Brazilian Portugese. Other translations are, of + * course, welcome. Answer `n' here if you have no support for + * internationalization on your system. + * + */ +#define I18N 1 + +/* + * + * Protocol Families. + * + */ +#define HAVE_AFUNIX 1 +#define HAVE_AFINET 1 +#define HAVE_AFINET6 1 +#define HAVE_AFIPX 1 +#define HAVE_AFATALK 1 +#define HAVE_AFAX25 1 +#define HAVE_AFNETROM 1 +#define HAVE_AFROSE 1 +#define HAVE_AFX25 1 +#define HAVE_AFECONET 1 +#define HAVE_AFDECnet 1 +#define HAVE_AFASH 1 + +/* + * + * Device Hardware types. + * + */ +#define HAVE_HWETHER 1 +#define HAVE_HWARC 1 +#define HAVE_HWSLIP 1 +#define HAVE_HWPPP 1 +#define HAVE_HWTUNNEL 1 +#define HAVE_HWSTRIP 1 +#define HAVE_HWTR 1 +#define HAVE_HWAX25 1 +#define HAVE_HWROSE 1 +#define HAVE_HWNETROM 1 +#define HAVE_HWX25 1 +#define HAVE_HWFR 1 +#define HAVE_HWSIT 1 +#define HAVE_HWFDDI 1 +#define HAVE_HWHIPPI 1 +#define HAVE_HWASH 1 +#define HAVE_HWHDLCLAPB 1 +#define HAVE_HWIRDA 1 +#define HAVE_HWEC 1 +#define HAVE_HWEUI64 1 + +/* + * + * Other Features. + * + */ +#define HAVE_FW_MASQUERADE 1 +#define HAVE_IP_TOOLS 1 +#define HAVE_MII 1 --- net-tools-1.60.orig/debian/README.source +++ net-tools-1.60/debian/README.source @@ -0,0 +1,5 @@ +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +See /usr/share/doc/quilt/README.source for a detailed explanation. --- net-tools-1.60.orig/debian/compat +++ net-tools-1.60/debian/compat @@ -0,0 +1 @@ +5 --- net-tools-1.60.orig/debian/control +++ net-tools-1.60/debian/control @@ -0,0 +1,23 @@ +Source: net-tools +Section: net +Priority: important +Build-Depends: debhelper (>= 5), gettext, quilt +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: net-tools Team +Uploaders: Luk Claes , Martín Ferrari +Standards-Version: 3.8.1 + +Package: net-tools +Architecture: any +Depends: ${shlibs:Depends} +Replaces: netbase (<< 4.00), ja-trans (<= 0.8-2) +Conflicts: ja-trans (<= 0.8-2) +Description: The NET-3 networking toolkit + This package includes the important tools for controlling the network + subsystem of the Linux kernel. This includes arp, ifconfig, netstat, + rarp, nameif and route. Additionally, this package contains utilities + relating to particular network hardware types (plipconfig, slattach, + mii-tool) and advanced aspects of IP configuration (iptunnel, ipmaddr). + . + In the upstream package 'hostname' and friends are included. Those are + not installed by this package, since there is a special "hostname*.deb". --- net-tools-1.60.orig/debian/watch +++ net-tools-1.60/debian/watch @@ -0,0 +1,3 @@ +version=3 + +http://download.berlios.de/net-tools/net-tools-(\d.*)\.tar\.(?:bz2|gz) --- net-tools-1.60.orig/debian/config.make +++ net-tools-1.60/debian/config.make @@ -0,0 +1,36 @@ +I18N=1 +HAVE_AFUNIX=1 +HAVE_AFINET=1 +HAVE_AFINET6=1 +HAVE_AFIPX=1 +HAVE_AFATALK=1 +HAVE_AFAX25=1 +HAVE_AFNETROM=1 +HAVE_AFROSE=1 +HAVE_AFX25=1 +HAVE_AFECONET=1 +HAVE_AFDECnet=1 +HAVE_AFASH=1 +HAVE_HWETHER=1 +HAVE_HWARC=1 +HAVE_HWSLIP=1 +HAVE_HWPPP=1 +HAVE_HWTUNNEL=1 +HAVE_HWSTRIP=1 +HAVE_HWTR=1 +HAVE_HWAX25=1 +HAVE_HWROSE=1 +HAVE_HWNETROM=1 +HAVE_HWX25=1 +HAVE_HWFR=1 +HAVE_HWSIT=1 +HAVE_HWFDDI=1 +HAVE_HWHIPPI=1 +HAVE_HWASH=1 +HAVE_HWHDLCLAPB=1 +HAVE_HWIRDA=1 +HAVE_HWEC=1 +HAVE_EUI64=1 +HAVE_FW_MASQUERADE=1 +HAVE_IP_TOOLS=1 +HAVE_MII=1 --- net-tools-1.60.orig/debian/changelog +++ net-tools-1.60/debian/changelog @@ -0,0 +1,437 @@ +net-tools (1.60-23ubuntu3) maverick; urgency=low + + * debian/patches/Add_missing_headers.patch: + + Add missing headers to fix undefined reference to 'S_ISREG' linker + error hence fix FTBFS LP: #599795 + * fix > is depreceated dpkg-source warning + + -- Bhavani Shankar Tue, 29 Jun 2010 18:39:55 +0530 + +net-tools (1.60-23ubuntu2) lucid; urgency=low + + * Add debian/patches/Bug#569509-iface_overflow.patch: do not crash with + oversized iface arguemnt when using -D (LP: #515010, Debian bug 569509). + + -- Kees Cook Thu, 11 Feb 2010 16:27:16 -0800 + +net-tools (1.60-23ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + Ubuntu_unit_conversion.patch: + - the diff-style patch was converted into quilt format + - 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. + LP: #240073. + Dropped patches, already in debian: + - lib/ec_hw.c: #include to get types. LP: #66209. + + -- Muharem Hrnjadovic Mon, 04 May 2009 12:29:43 +0200 + +net-tools (1.60-23) unstable; urgency=low + + * debian/patches/Bug#254243-netstat.c-wide-opt.patch: Converted last patch + from Luar Roji to a quilt patch. + * Many changes done in diff.gz that are also present in upstream's CVS: + - debian/patches/CVS-20020730-route.c_opts_64.patch + - debian/patches/CVS-20061011-ipmaddr.c_buffer_overflow.patch + - debian/patches/CVS-20081003-statistics.c_sync.patch + - debian/patches/CVS-20071202-rarp.c_sync.patch + - debian/patches/CVS-20070316-netstat.c_sync.patch + - debian/patches/CVS-20060927-mii-tool.c_sync.patch + - debian/patches/CVS-20051204-arp.c_sync.patch + - debian/patches/CVS-20030911-nameif.c_sync.patch + - debian/patches/CVS-20081002-ifconfig.c_sync.patch + - debian/patches/CVS-20031011-hostname.c_sync.patch + - debian/patches/CVS-20051204-slttach.c_sync.patch + - debian/patches/CVS-20061011-includes_sync.patch + - debian/patches/CVS-lib_sync.patch + - debian/patches/CVS-20081003-config.in_sync.patch + - debian/patches/CVS-20081002-manpages_sync.patch + * Some unsyncable patches converted from diff.gz: + - debian/patches/netstat.c-assorted_changes.patch + - debian/patches/translations.patch + - debian/patches/local-manpages.patch + - debian/patches/lib_local_changes.patch + - debian/patches/netstat.c-local_changes.patch + * Reverted changes to Makefile and README. + * debian/watch: added watchfile. + * debian/control, debian/compat: Added versioned dependency on debhelper (it + was version 1!) + * debian/rules: made from scratch. Closes: #443063. + * Added quilt dependencies and hooks. + * debian/control: updated Standards-Version. + * debian/README.source: added to comply with S-V 3.8.1. + * debian/patches/local-manpages.patch: more manpage fixes. + * debian/patches/translations.patch: fix encoding for .po files. + * debia/rules: supercede Makefile install with custom commands. + * debian/copyright: new format, and attempt to provide a real copyright + file. Still, the attribution is a mess. + * debian/patches/Bug#345331-socket_overflow.patch: patch from Antonio Galea + that solves an issue when the socket number exceeds 2^31. Closes: #345331. + + -- Martín Ferrari Mon, 16 Mar 2009 01:58:18 -0300 + +net-tools (1.60-22) unstable; urgency=low + + * Add new command line option -W/--wide to netstat which prevents + truncation of IPv6 addresses (Closes: #254243). Thanks Luar Roji. + + -- Luk Claes Sun, 16 Nov 2008 17:53:05 +0100 + +net-tools (1.60-21ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + - 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. + LP: #240073. + - lib/ec_hw.c: #include to get types. LP: #66209. + + -- Scott James Remnant Tue, 11 Nov 2008 17:04:09 +0000 + +net-tools (1.60-21) unstable; urgency=low + + * Update maintainer to net-tools Team. + * Support ipv6 stats in netstat (Closes: #453859). + * Fix closes statements in changelog entry. + * Add hardware support for InfiniBand (Closes: #294252). + + -- Luk Claes Sat, 27 Sep 2008 19:40:40 +0200 + +net-tools (1.60-20) unstable; urgency=low + + * New maintainer (Closes: #486004). + * Don't segfault when /proc/net/dev is not available (Closes: #222209). + * Find IPv6 addresses for interfaces with ifindex > 255 (Closes: #433543). + * Skip . and .. in netstat as they are invalid (Closes: #234447). + * Fix hyphenation for manpages (Closes: #288343). + + -- Luk Claes Tue, 16 Sep 2008 15:22:20 +0200 + +net-tools (1.60-19ubuntu3) intrepid; urgency=low + + * Include stddef.h to get NULL + + -- Scott James Remnant Thu, 17 Jul 2008 10:05:29 +0100 + +net-tools (1.60-19ubuntu2) intrepid; urgency=low + + * Change units to be multiples of 10, there is compelling argument that + this is better for transfer speeds and bandwidths. Remove mention of + IEC 60027-2 units from the manpage. LP: #240073. + + -- Scott James Remnant Thu, 17 Jul 2008 09:42:07 +0100 + +net-tools (1.60-19ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - Change units to be more consistent with Ubuntu + - lib/fddi.c: Add missing #include to fix FTBFS + - set Ubuntu maintainer address + + -- Michael Vogt Thu, 13 Dec 2007 11:20:45 +0100 + +net-tools (1.60-19) unstable; urgency=low + + * fixed netstat(8) (interfaceS) reported by Liu Xing. (Closes: Bug#435690) + * fixed interface name truncation (Closes: Bug#405521) + Thank you Csaba Szep. + * fixed pt error string (Closes: Bug#403033) + * fixed route samples (Closes: Bug#400844, #368697) Thanks Danny Rathjens. + * fixed ifconfig(8) see also section (Closes: Bug#365916) Dan Jacobs. + + -- Bernd Eckenfels Sun, 02 Dec 2007 06:27:41 +0100 + +net-tools (1.60-18) unstable; urgency=low + + * Thanks for the l10n NMU to Kenshi Muto + * fixed hostname compile problems + * better error handling and speedup for proc file reading + * improved mii-tool (more media types) + * fixed string length contraint in ipmaddr + * fixed ipx /proc/net (alternate naming) + * smaller fixed to netstat(8) (de) 2002-02-20 - still incomplete + * expanded arp(8) (en) 2007-12-01 + * added -4 and -6 to netstat(8) 02 October 2003 + * formatting fixed rarp(8)+slattach(8) [en] + * formatting fixed arp(8), rarp(8), ifconfig(8), hostname(1) [fr] + * fixed slattach -L to not require HW handshake anymore + * netstat -n: show v4inv6 mapped addressses as v4 + + -- Bernd Eckenfels Sun, 02 Dec 2007 03:28:17 +0100 + +net-tools (1.60-17.2ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - Change units to be more consistent with Ubuntu + - lib/fddi.c: Add missing #include to fix FTBFS + - set Ubuntu maintainer address + + -- Michael Vogt Mon, 19 Nov 2007 11:44:59 +0100 + +net-tools (1.60-17.2) unstable; urgency=low + + * l10n NMU + * Set conflict against ja-trans which has obsolete Japanese + translations only for net-tools. (closes: #447327) + + -- Kenshi Muto Sat, 20 Oct 2007 18:00:34 +0900 + +net-tools (1.60-17.1) unstable; urgency=low + + * l10n NMU + * Updated net-tools.pot. + * Updated Japanese translation (closes: Bug#432338) + * Updated German translation (closes: #313808) + + -- Kenshi Muto Thu, 11 Oct 2007 19:44:26 +0900 + +net-tools (1.60-17ubuntu2) gutsy; urgency=low + + * Change units to be more consistent with other parts of Ubuntu, such + as the desktop. LP: #119998. + + -- Scott James Remnant Wed, 13 Jun 2007 08:24:28 +0100 + +net-tools (1.60-17ubuntu1) edgy; urgency=low + + * lib/fddi.c: Add missing #include to fix FTBFS. + Closes: LP#66209 + + -- Martin Pitt Mon, 16 Oct 2006 11:54:37 +0200 + +net-tools (1.60-17) unstable; urgency=medium + + * arp.c: bus error on sparc64 with latest gcc fixed. (Closes: Bug#340384) + + -- Bernd Eckenfels Sun, 04 Dec 2005 05:47:05 +0100 + +net-tools (1.60-16) unstable; urgency=low + + * spelling fix to slattach(8) (Closes: Bug#326124 (patch by A.Costa) + * inet.c: portability fix for 64bit. + * comment cleanups to aliagn with 1.65 cvs + * net-support.h, inet_sr.c, nstrcmp.c, arp.c, ether.h + + -- Bernd Eckenfels Mon, 24 Oct 2005 22:05:38 +0200 + +net-tools (1.60-15) unstable; urgency=low + + * minor formating fix to ifconfig(8) + + -- Bernd Eckenfels Thu, 30 Jun 2005 21:49:52 +0200 + +net-tools (1.60-14) unstable; urgency=low + + * added iptables(8) in ifconfig(8) (thanks Toralf Förster) + * more usage updates in ifconfig.8 (used upstream HEAD=1.11) + + -- Bernd Eckenfels Thu, 30 Jun 2005 20:51:18 +0200 + +net-tools (1.60-13) unstable; urgency=low + + * X25 code compiles with 2.4 and 2.6 kernel headers (Closes: Bug#271678) + * IMPORTANT: make ifconfig show alias interfaces in 2.6 again. + * resort media type array to match kernel (Closes: Bug#199920) + + -- Bernd Eckenfels Tue, 17 May 2005 01:28:51 +0200 + +net-tools (1.60-12) unstable; urgency=low + + * make TR hw address type work for new kernel (Closes: Bug #79462, #203400) + * update-po uses msgmerge, new net-tools.pot (Closes: Bug: 271426) + * de-support dontpub option in arp -? und arp.8 (Closes: Bug #203396) + + -- Bernd Eckenfels Mon, 16 May 2005 06:33:48 +0200 + +net-tools (1.60-11) unstable; urgency=low + + * spelling fixes (Closes: Bug #305640, #305638, 305637) + * nameif.c avoid overflow by malicious kernel + * avoid overflow of the TX-OK Column (Closes: Bug #308922) + + -- Bernd Eckenfels Sat, 14 May 2005 01:48:45 +0200 + +net-tools (1.60-10) unstable; urgency=low + + * typo fix in po/de.po for german arp command output (Closes: Bug #176151) + * added diagnostics messages to mii-tool.8 (Closes: Bug #239229) + * new version of nstrcmp (Closes: Bug #226503) + * enable EUI64 support + * stadanrds version 3.6.1 (no changes) + + -- Bernd Eckenfels Fri, 23 Apr 2004 00:57:20 +0200 + +net-tools (1.60-9) unstable; urgency=medium + + * debian/changelog: fixed in last entry fixed bug from 197925 to 197924 + * include linux/sockios.h for SIOCGMIIPHY definition (new style) + which will fix MII reporting on 2.4 kernels. (Closes: Bug #133648) + NOTE: this will now require root to work, it will also not work on + older kernels. + * Rene Engelhard's patch to make AF X25 compile with 2.6 headers (Closes: Bug #223091) + + -- Bernd Eckenfels Mon, 29 Dec 2003 13:42:20 +0100 + +net-tools (1.60-8) unstable; urgency=medium + + * lib/interface.c: backed off change which skipped reading ioctl + interfacelist, if _proc interfacelist was ok, which does not work, + because alias interfaces are only in ioctl list available. It is + also falling back to the original lib/nstrcml.c because the + comparision if : is present does not work. + (Closes: bug #197924, #197582, #197269) + * bumped standards version (no changes) + + -- Bernd Eckenfels Sat, 28 Jun 2003 02:56:38 +0200 + +net-tools (1.60-7) unstable; urgency=low + + * interfaces.c: cvs version fixes Connectiva Bug #5711 (Closes: #149576) + from Eduardo Pereira Habkost + * netstat.c: cvs version adds support for tcp6,udp6,icmp6 protocols + * netstat.c: cvs version adds support for -4 or -6 cmd line shortcut + * netstat.c: cvs version adds fix for inode + signedness (Closes: #134600, #78932) + * ifconfig: removed -i from usage (Closes: #181528) + * make gcc 3.3 happy: added ull unsigned long long prefix to constant + * lib/ddp_gr.c+pathnames.h: first support for appletalk routing from cvs + * lib/eui64.c+hw.c+Makefile: forst support for new hw type from cvs + * lib/interface.c: cvs fix for column run-into (Closes: #161080) + * lib/irda.c,lib/ipx.c: cvs update + * lib/nstrcmp.c: new, faster version, fixes b-lookups for ifconfig + * hostanme.c: gcc 3.3 fix from cvs (not compiled in net-tools.deb) + * lib/interface: fixed memory globbering + (Closes: #135744, #149579, #185187) + + -- Bernd Eckenfels Thu, 12 Jun 2003 05:44:38 +0200 + +net-tools (1.60-6) unstable; urgency=low + + * took route.c from upstream cvs: allow -6 and -4 option + * took statistics.c from upstream cvs: more complete netstat -S + * took README from upstream cvs: fix COPYING file title and removed + the line (Closes: #102139) + * took arp.c from upstream: fixed name "PUB", better not found handling, + implicite proxy arp mac changed from '*' to '', + usage line made shorter + * added mii-tool in control file (Closes: #172473) + * fixed description of binary multiple in man page (Closes: #182487) + * fixed interpunctation in netstat(8) (Closes: #191660) + * fixed compile warning in inet_sr.c by removing empty default: label in + switch + + -- Bernd Eckenfels Wed, 28 May 2003 22:35:12 +0200 + +net-tools (1.60-5) unstable; urgency=low + + * thanks Andrew for the 4.1 NMU + * NMU: Apply nameif patch from Matt Domsch. (Closes: #178209) + * Fix FTB bug (string concatenation in gcc 3.3) (Closes: #194995) + * Fix segfault in mii-tool by using cvs version (Closes: #139027) + * fixed plural of authors to make lintian happy (I JOIN YOU :) + + -- Bernd Eckenfels Wed, 28 May 2003 22:04:14 +0200 + +net-tools (1.60-4.1) unstable; urgency=low + + * NMU + * Apply nameif patch from Matt Domsch. (Closes: #178209) + + -- Andrew Suffield Wed, 9 Apr 2003 21:44:09 +0100 + +net-tools (1.60-4) unstable; urgency=medium + + * fixed (upstream) spurious newline in ifconfig + Thanks Jonathen, Closes: Bug #109379 + * fixed SI-Units printout in ifconfig (Closes: Bug #110629, #97029, #100167) + * this is done by including lib/interfaces.c from upstream cvs + * also added ifconfig man page from upstream cvs + * fixed (upstream) man page about netstat's --interface opt. (Closes: Bug#120475) + + -- Bernd Eckenfels Sat, 24 Nov 2001 06:26:37 +0100 + +net-tools (1.60-3) unstable; urgency=medium + + * fixed upstream error where counters in ifconfig/netstat -i are 0 + + -- Bernd Eckenfels Sat, 10 Nov 2001 18:12:13 +0100 + +net-tools (1.60-2) unstable; urgency=low + + * Fixed the following bug: (Closes: #117837) + * inserted ifconfig.c from upstream cvs to do this + * bumped debian Standard 3.1.1 -> 3.5.6 and removed -g from linking + + -- Bernd Eckenfels Thu, 1 Nov 2001 02:51:33 +0100 + +net-tools (1.60-1) unstable; urgency=low + + * New upstream + * Phil fixed the following Bugs upstream: (Closes: #91919, #93048, #90282) + + -- Bernd Eckenfels Mon, 16 Apr 2001 02:28:12 +0200 + +net-tools (1.59-1) unstable; urgency=low + + * added Build Dependencies (closes bug: #89083) + * new upstream version + * removed dh_suidregister and a few comments from rules file + + -- Bernd Eckenfels Sun, 18 Mar 2001 03:00:33 +0100 + +net-tools (1.58-2) unstable; urgency=low + + * backported ifconfig change from 1.59 to avoid closing socket too early + on some systems (depending on the protocols installed). + Closes Bug: #85688, #85743 + + -- Bernd Eckenfels Tue, 13 Feb 2001 01:39:59 +0100 + +net-tools (1.58-1) unstable; urgency=low + + * new upstream version + * removed local man pages for now (Closes: bug #83894) + * install nameif in /sbin + + -- Bernd Eckenfels Sat, 10 Feb 2001 21:50:30 +0100 + +net-tools (1.57-2) unstable; urgency=high + + * rebuild, this is believed to closes: #75825 + + -- Bernd Eckenfels Sat, 30 Dec 2000 22:43:01 +0100 + +net-tools (1.57-1) unstable; urgency=low + + * new debian maintainer (thanks Anthony for the Work!) + * new upstream version + + -- Bernd Eckenfels Mon, 14 Aug 2000 02:40:13 +0200 + +net-tools (1.54-3) unstable; urgency=low + + * Argggh. Don't use that horrible dh_installmanpages hack. (Closes: + Bug#68925, Bug#68879) + + -- Anthony Towns Sun, 13 Aug 2000 00:12:05 +1000 + +net-tools (1.54-2) unstable; urgency=low + + * Reapply slattach patch from netbase 3.16-3. + + -- Anthony Towns Thu, 10 Aug 2000 11:32:58 +1000 + +net-tools (1.54-1) unstable; urgency=low + + * Split from netbase. + + -- Anthony Towns Mon, 17 Jul 2000 07:34:12 +1000 + +Local variables: +mode: debian-changelog +End: + --- net-tools-1.60.orig/debian/copyright +++ net-tools-1.60/debian/copyright @@ -0,0 +1,31 @@ +Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=437 +Upstream-Maintainer: Phil Blundell , + Bernd Eckenfels +Upstream-Source: https://developer.berlios.de/projects/net-tools/ + +Files: * +Copyright: © 1988-1994 MicroWalt Corporation +Copyright: © 1995-1996 Bernd Eckenfels +Copyright: © 1997-2000 Andi Kleen +Copyright: © 1997-2000 Donald Becker +License: GPL-2+ + The copyright attribution has been derived from individual files' text, but + each file may have different copyright holders, and some may be missing. See + the source code for details. + . + This program is free software; you can redistribute it and/or modify it under + the terms of the GNU General Public License as published by the Free + Software Foundation; either version 2 of the License, or (at your option) + any later version. + . + On Debian GNU/Linux systems, the complete text of the GNU General Public + License can be found in `/usr/share/common-licenses/GPL-2' + +Files: debian/* +Copyright: © 2008-2009 Luk Claes, Martín Ferrari +Copyright: © 2000-2007 Bernd Eckenfels +Copyright: © 2000 Anthony Towns +License: GPL-2+ + It is assumed that all contributors put their work under the same license + as the module itself. + --- net-tools-1.60.orig/debian/install +++ net-tools-1.60/debian/install @@ -0,0 +1,11 @@ +arp /usr/sbin +ifconfig /sbin +nameif /sbin +plipconfig /sbin +rarp /sbin +route /sbin +slattach /sbin +ipmaddr /sbin +iptunnel /sbin +mii-tool /sbin +netstat /bin --- net-tools-1.60.orig/debian/patches/netstat.c-local_changes.patch +++ net-tools-1.60/debian/patches/netstat.c-local_changes.patch @@ -0,0 +1,61 @@ +Undocumented patches found in diff.gz. + +Index: net-tools/netstat.c +=================================================================== +--- net-tools.orig/netstat.c ++++ net-tools/netstat.c +@@ -387,6 +387,10 @@ static void prg_cache_load(void) + #ifdef DIRENT_HAVE_D_TYPE_WORKS + if (direfd->d_type!=DT_LNK) + continue; ++#else ++ /* Skip . and .. */ ++ if (!isdigit(direfd->d_name[0])) ++ continue; + #endif + if (procfdlen+1+strlen(direfd->d_name)+1>sizeof(line)) + continue; +@@ -541,9 +545,9 @@ static void finish_this_one(int uid, uns + printf("%-10lu ",inode); + } + if (flag_prg) +- printf("%-" PROGNAME_WIDTHs "s",prg_cache_get(inode)); ++ printf(" %-16s",prg_cache_get(inode)); + if (flag_opt) +- printf("%s", timers); ++ printf(" %s", timers); + putchar('\n'); + } + +@@ -1250,7 +1254,7 @@ static int unix_info(void) + printf(_("(w/o servers)")); + } + +- printf(_("\nProto RefCnt Flags Type State I-Node")); ++ printf(_("\nProto RefCnt Flags Type State I-Node ")); + print_progname_banner(); + printf(_(" Path\n")); /* xxx */ + +@@ -1813,10 +1817,11 @@ int main + } + printf(_("\nProto Recv-Q Send-Q Local Address Foreign Address State ")); /* xxx */ + if (flag_exp > 1) +- printf(_(" User Inode ")); +- print_progname_banner(); ++ printf(_(" User Inode ")); ++ if (flag_prg) ++ printf(_(" PID/Program name")); + if (flag_opt) +- printf(_(" Timer")); /* xxx */ ++ printf(_(" Timer")); + printf("\n"); + #else + if (flag_arg) { +@@ -1917,6 +1922,7 @@ int main + } + #endif + } ++ + if (!flag_cnt || i) + break; + sleep(1); --- net-tools-1.60.orig/debian/patches/local-manpages.patch +++ net-tools-1.60/debian/patches/local-manpages.patch @@ -0,0 +1,1759 @@ +Formatting fixes to manpages, not found upstream. + +Index: net-tools/man/de_DE/arp.8 +=================================================================== +--- net-tools.orig/man/de_DE/arp.8 ++++ net-tools/man/de_DE/arp.8 +@@ -1,12 +1,12 @@ +-.TH ARP 8 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer" ++.TH ARP 8 "6. M\(:arz 1999" "net\-tools" "Handbuch f\(:ur Linuxprogrammierer" + .SH NAME + arp \- Manipulation des ARP-Caches + .SH SYNOPSIS + .B arp + .RB [ \-vn ] + .RB [ "\-H Typ" ] +-.RB [ "-i Schnittstelle" ] +-.B -a ++.RB [ "\-i Schnittstelle" ] ++.B \-a + .RB [ Rechnername ] + .PP + .B arp +@@ -19,14 +19,14 @@ arp \- Manipulation des ARP-Caches + .RB [ \-v ] + .RB [ "\-H Typ" ] + .RB [ "\-i Schnittstelle" ] +-.B -s Rechnername hw_adr ++.B \-s Rechnername hw_adr + .RB [ temp ] + .PP + .B arp + .RB [ \-v ] + .RB [ "\-H Typ" ] + .RB [ "\-i Interface" ] +-.B -s Rechnername hw_adr ++.B \-s Rechnername hw_adr + .RB [ "netmask nm" ] + .B pub + .PP +@@ -34,15 +34,15 @@ arp \- Manipulation des ARP-Caches + .RB [ \-v ] + .RB [ "\-H Typ" ] + .RB [ "\-i Schnittstelle" ] +-.B -Ds Rechnername ifa ++.B \-Ds Rechnername ifa + .RB [ "netmask nm" ] + .B pub + .PP + .B arp + .RB [ \-vnD ] + .RB [ "\-H Typ" ] +-.RB [ "-i Schnittstelle" ] +-.B -f [Dateiname] ++.RB [ "\-i Schnittstelle" ] ++.B \-f [Dateiname] + + .SH BESCHREIBUNG + .B Arp +@@ -61,7 +61,7 @@ Ausf\(:uhrlichere Ausgaben. + macht numerische Adressausgaben anstatt zu versuche, den symbolischen Rechner-, + Port- oder Benutzernamen zu ermitteln. + .TP +-.B "\-H type, \-\-hw-type type" ++.B "\-H type, \-\-hw\-type type" + Beim Setzen oder Auslesen des ARP-Caches schr\(:ankt diese Option + ein, auf welcher Klasse von Eintr\(:agen + .B arp +@@ -86,7 +86,7 @@ Argument verwendet, so werden alle Eintr + Alle Eintr\(:age f\(:ur den angegebenen Host entfernen. Dies kann z.B. + benutzt werden, wenn ein System angehalten wird. + .TP +-.B "\-D, \-\-use-device" ++.B "\-D, \-\-use\-device" + Die Hardwareadresse der Netzwerksschnittstelle + .B ifa + verwenden. +@@ -180,6 +180,6 @@ Flagge. + ethers(5), rarp(8), route(8), ifconfig(8), netstat(8) + .SH AUTOREN + Fred N. van Kempen, mit vielen Verbesserungen vom +-Verwalter der Net-Tools Bernd Eckenfels . ++Verwalter der Net-Tools Bernd Eckenfels . + .SH \(:Ubersetzung + Ralf B\(:achle +Index: net-tools/man/de_DE/hostname.1 +=================================================================== +--- net-tools.orig/man/de_DE/hostname.1 ++++ net-tools/man/de_DE/hostname.1 +@@ -3,7 +3,7 @@ + .\" + .\" German translation by Ralf Baechle (ralf@gnu.org) + .\" +-.TH HOSTNAME 1 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer" ++.TH HOSTNAME 1 "6. M\(:arz 1999" "net\-tools" "Handbuch f\(:ur Linuxprogrammierer" + + .SH NAME + hostname \- den Rechnernamen anzeigen oder setzen. +@@ -28,7 +28,7 @@ nodename \- den DECnet-Knotennamen anzei + .RB [ \-f ] + .RB [ \-\-fqdn ] + .RB [ \-i ] +-.RB [ \-\-ip-address ] ++.RB [ \-\-ip\-address ] + .RB [ \-\-long ] + .RB [ \-s ] + .RB [ \-\-short ] +@@ -195,7 +195,7 @@ ge\(:andert werden. + .I "\-h, \-\-help" + Kurzanleitung ausdrucken und beenden. + .TP +-.I "\-i, \-\-ip-address" ++.I "\-i, \-\-ip\-address" + Die IP-Adresse(n) des Rechners anzeigen und beenden. + .TP + .I "\-n, \-\-node" +@@ -220,9 +220,9 @@ Option gegeben wird, dann kann Root auch + .SH DATEIEN + .B /etc/hosts + .SH AUTOREN +-Peter Tobias, ++Peter Tobias, + .br +-Bernd Eckenfels, (NIS and manpage). ++Bernd Eckenfels, (NIS and manpage). + .br + Steve Whitehouse, (DECnet support and manpage). + .SH \(:Ubersetzung +Index: net-tools/man/de_DE/ifconfig.8 +=================================================================== +--- net-tools.orig/man/de_DE/ifconfig.8 ++++ net-tools/man/de_DE/ifconfig.8 +@@ -1,4 +1,4 @@ +-.TH IFCONFIG 8 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer" ++.TH IFCONFIG 8 "2007-12-02" "net\-tools" "Handbuch f\(:ur Linuxprogrammierer" + .SH NAME + ifconfig \- Konfiguration einer Netzwerkskarte + .SH SYNOPSIS +@@ -19,7 +19,7 @@ Wird ein einzelne + .BR Schnittstelle nargument + angegeben, so zeigt es nur den Zustand der angegebenen Netzwerksschnittstelle + an. Wird ein einzelne +-.B -a ++.B \-a + Option angegeben, zeigt es den Zustand aller Schnittstellen an, selbst wenn + diese inaktiviert sind. Ansonsten konfiguriert + .B ifconfig +@@ -130,13 +130,13 @@ sind + kann benutzt werden, damit der Treiber automatischen den Typ des Mediums + erkennt. Wiederum unterst\(:utzen dies nicht alle Treiber. + .TP +-.B "[-]broadcast [Adr]" ++.B "[\-]broadcast [Adr]" + Wird das Adressargument gegeben, so wird die Protokolladresse f\(:ur Broadcast + f\(:ur diese Schnittstelle gesetzt. Ansonsten wird die + .B IFF_BROADCAST + Flagge f\(:ur diese Schnittstelle gesetzt bzw. gel\(:oscht. + .TP +-.B "[-]pointopoint [Adr]" ++.B "[\-]pointopoint [Adr]" + Dieses Schl\(:usselwort aktiviert den + .B Punkt-zu-Punkt + Modus einer Schnittstelle. Das bedeutet, da\(ss eine Verbindung zwischen zwei +@@ -193,7 +193,7 @@ Kommando gemacht werden. + W\(:ahrend AppleTalk DDP und IPX Adressen angezeigt werden, k\(:onnen sie mit + diesem Kommando nicht ge\(:andert werden. + .SH SIEHE AUCH +-route(8), netstat(8), arp(8), rarp(8), ipchains(8) ++route(8), netstat(8), arp(8), rarp(8), ipchains(8), iptables(8), ifup(8), interfaces(5). + .SH AUTOREN + Fred N. van Kempen, + .br +Index: net-tools/man/de_DE/netstat.8 +=================================================================== +--- net-tools.orig/man/de_DE/netstat.8 ++++ net-tools/man/de_DE/netstat.8 +@@ -9,7 +9,7 @@ + .\" Modified: Tuan Hoang tuan@optimus.mitre.org + .\" + .\" +-.TH NETSTAT 8 "2007-12-02" "net-tools" "Handbuch f\(:ur Linuxprogrammierer" ++.TH NETSTAT 8 "2007-12-02" "net\-tools" "Handbuch f\(:ur Linuxprogrammierer" + + .SH NAME + netstat \- Anzeige von Netzwerksverbindungen, Routentabellen, Schnittstellenstatistiken, maskierten Verbindungen, Netlink-Nachrichten und Mitgliedschaft in Multicastgruppen +@@ -76,17 +76,17 @@ Ohne Optionen zeigt + den Zustand von offenen Sockets an. Wird keine Adressfamilie angegeben, dann + werden die offenen Sockets aller konfigurierten Adressfamilien gedruckt. + Die Option +-.B -e ++.B \-e + gibt zus\(:atzliche Informationen aus (User ID). Mit der Option +-.B -v ++.B \-v + gibt + .B netstat + zus\(:atzlich Fehlermeldungen \(:uber von Kernel nicht unterst\(:utzte + Adressfamilien aus. Die Option +-.B -p ++.B \-p + gibt zus\(:atzlich die PID und den Namen des Programms, das den Socket + ge\(:offnet hat, aus. +-.B -a ++.B \-a + druckt alle Sockets einschlie\(sslich der auf Verbinungen wartenden + Serversockets aus. Die Adressfamilie + .B inet +@@ -96,9 +96,9 @@ zeigt RAW, UDP und TCP Sockets an. + Die + .BR \-r ", " \-\-route + Option gibt die Routentabellen des Kernels im gleichen Format wie +-.B "route -e" ++.B "route \-e" + aus. +-.B "netstat -er" ++.B "netstat \-er" + benutzt das Ausgabeformat von + .BR route . + Wegen Details siehe +@@ -106,18 +106,18 @@ Wegen Details siehe + + .SS "\-i, \-\-interfaces" + Wird die +-.BR -i ", " --interfaces ++.BR \-i ", " \-\-interfaces + Option verwendet, so wird eine Tabelle aller Schnittstellen + ausgedruckt. Die Ausgabe ist im Format von +-.B "ifconfig -e" ++.B "ifconfig \-e" + und wird in + .BR ifconfig (8) + beschrieben. +-.B "netstat -ei" ++.B "netstat \-ei" + druckt eine Tabelle f\(:ur Interfaces wie + .BR ifconfig . + Die +-.B -a ++.B \-a + Option schlie\(sst Schnittstellen, die gar nicht konfiguriert sind in die + Ausgabe ein, d.h. die die + .BR U = UP +@@ -126,7 +126,7 @@ Flagge nicht gesetzt haben). + .SS "\-M, \-\-masquerade" + + Eine Liste aller maskierten Sitzungen wird dargestellt. Der +-.B -e ++.B \-e + Schalter schlie\(sst zus\(:atzlich Information \(:uber Sequenznummern und + Deltas, die durch das Umschreiben von FTP-Sitzungen (PORT Kommando) verursacht + werden. Maskieren wird dazu verwendet um Maschinen mit inoffiziellen +@@ -196,24 +196,24 @@ im Sekundenabstand die Ausgabe, bis es a + .SS "Proto" + Das von Socket verwendete Protokoll (TCP, UDP, RAW). + +-.SS "Recv-Q" ++.SS "Recv\-Q" + Die Anzahl von Bytes, die noch nicht von der Anwendung vom Socket abgeholt + wurden. + +-.SS "Send-Q" ++.SS "Send\-Q" + Die Anzahl von Bytes, die von der Gegenseite noch nicht best\(:atigt wurde. + + .SS "Lokale Adresse" + Die lokale Adresse (lokaler Rechnername) und Portnummer des Sockets. Au\(sser + bei Verwendung der +-.B -n ++.B \-n + Option wird die Socketadresse nach dem kanonischen Rechnernamen und die + Portnummer in den zugeh\(:origen Dienstenamen aufgel\(sst. + + .SS "Gegenadresse" + Die Adresse und Portnummer der Gegenseite des Sockets. Wie bei lokalen + Adressen schaltet der +-.B -n ++.B \-n + Schalter die Umwandlung von Rechneradresse und Portnummer ab. + + .SS "State" +@@ -267,7 +267,7 @@ Der Socket wartet auf eingehende Verbind + angezeit, wenn die + The socket is listening for incoming connections. Those sockets are only + displayed if the +-.BR -a , --listening ++.BR \-a , \-\-listening + Option gegeben wird. + .TP + .I +@@ -285,7 +285,7 @@ Der Name oder die Benutzer-ID des Eigent + .SS "PID/Program name" + Durch einen Schr\(:agstrich abgetrenntes Paar von Prozess-ID und Programmname + des Programms, das diesen Socket besitzt. Die Option +-.B -p ++.B \-p + schaltet die Anzeige dieser Spalte ein. Es werden + .B root + Privilegien ben\(:otigt um die n\(:otigen Daten zu erhalten. F\(:ur IPX +@@ -359,7 +359,7 @@ Der Socket ist unbenutzt + H\(:Ort + Der Socket lauscht nach Verbindungsanfragen. Diese Sockets werden nur + angezeigt, wenn die +-.BR -a , --listening ++.BR \-a , \-\-listening + Option gesetzt ist. + .TP + .I +@@ -411,7 +411,7 @@ werden.) + + .PP + .SH BEMERKUNGEN +-Seit der Kern Version 2.2 zeigt netstat -i keine Schnittstellenstatistiken ++Seit der Kern Version 2.2 zeigt netstat \-i keine Schnittstellenstatistiken + von Schnittstellenaliasen mehr an. Um Statistiken per Schnittstelle zur + erhalten, m\(:ussen jetzt mit dem + .BR ipchains(8) +@@ -489,14 +489,14 @@ so kann unsinnige Information ausgegeben + unwahrscheinlich. + .br + Die +-.B netstat -i ++.B netstat \-i + die beschrieben wird sollte nach einigem S\(:aubern der BETA-Version des + Codes des Net-Tools Packets funktionieren. + + .PP + .SH AUTOREN + Die Benutzerschnittstelle wurde von Fred Baumgarten +- geschrieben, die Manpage zum gr\(:o\(ssten ++ geschrieben, die Manpage zum gr\(:o\(ssten + Teil von Matt Welsh . Sie wurde von Alan Cox + aktualisiert, ben\(:otigt aber weitere Arbeit. + .br +Index: net-tools/man/de_DE/plipconfig.8 +=================================================================== +--- net-tools.orig/man/de_DE/plipconfig.8 ++++ net-tools/man/de_DE/plipconfig.8 +@@ -1,4 +1,4 @@ +-.TH PLIPCONFIG 8 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer" ++.TH PLIPCONFIG 8 "6. M\(:arz 1999" "net\-tools" "Handbuch f\(:ur Linuxprogrammierer" + .SH NAME + plipconfig \- Einstellung von PLIP Schnittstellen-Parametern + .SH SYNOPSIS +Index: net-tools/man/de_DE/rarp.8 +=================================================================== +--- net-tools.orig/man/de_DE/rarp.8 ++++ net-tools/man/de_DE/rarp.8 +@@ -1,14 +1,14 @@ +-.TH RARP 8 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer" ++.TH RARP 8 "6. M\(:arz 1999" "net\-tools" "Handbuch f\(:ur Linuxprogrammierer" + .SH NAME + rarp \- Manipulation des RARP-Caches + .SH SYNOPSIS +-.B "rarp [-V] [--version] [-h] [--help]" ++.B "rarp [\-V] [\-\-version] [\-h] [\-\-help]" + .br +-.B "rarp -a" ++.B "rarp \-a" + .br +-.B "rarp [-v] -d Rechnername ..." ++.B "rarp [\-v] \-d Rechnername ..." + .br +-.B "rarp [-v] [-t type] -s Rechnername hw_addr" ++.B "rarp [\-v] [\-t type] \-s Rechnername hw_addr" + .SH BESCHREIBUNG + .B Rarp + kann die RARP-Tabelle des Kernels auf verschiedene Arten manipulieren. Die +Index: net-tools/man/de_DE/route.8 +=================================================================== +--- net-tools.orig/man/de_DE/route.8 ++++ net-tools/man/de_DE/route.8 +@@ -1,4 +1,4 @@ +-.TH ROUTE 8 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer" ++.TH ROUTE 8 "2007-12-02" "net\-tools" "Handbuch f\(:ur Linuxprogrammierer" + .SH NAME + route \- Anzeigen der IP-Routen-Tabelle + .SH SYNOPSIS +@@ -51,11 +51,11 @@ Schnittstelle] + .RB [ \-V ] + .RB [ \-\-version ] + .RB [ \-h ] +-.RB [ \--help ] ++.RB [ \-\-help ] + .SH BESCHREIBUNG + .B Route + wird zum \(:Andern der IP-Routing-Tabelle der Kernels verwendet. Seine +-prim\(:are Verwendung ist statische Routen f\*:ur bestimmte Rechner oder ++prim\(:are Verwendung ist statische Routen f\(:ur bestimmte Rechner oder + Netzwerke \(:uber eine Schnittstelle einzutragen, nachdem diese mit dem + Programm + .BR ifconfig (8) +@@ -92,13 +92,13 @@ Das + ist ein Netzwerk. + + .TP +-.B -host ++.B \-host + daS + .B Ziel + ist ein Rechner + + .TP +-.B -F ++.B \-F + Zeit die FIB Routentabelle des Kerns an. Das Ausgabeformat kann mit den + Optionen + .B \-e +@@ -107,7 +107,7 @@ and + ge\(:andert werden. + + .TP +-.B -C ++.B \-C + zeigt den Routencache des Kernels an. + + .TP +@@ -120,8 +120,8 @@ f\(:ugt eine Route zu. + + .TP + .B Ziel +-Das Zielnetzwerk oder -System. Die Angabe von sowohl IP-Adressen in Form +-von dezimalen durch Punkt getrennten Quadrupeln als auch Rechner- und ++Das Zielnetzwerk oder \(hySystem. Die Angabe von sowohl IP-Adressen in Form ++von dezimalen durch Punkt getrennten Quadrupeln als auch Rechner\(hy und + Netznamen ist zul\(:assig. + + .TP +@@ -130,7 +130,7 @@ Netznamen ist zul\(:assig. + + .TP + .B gw Router +-Alle IP-Pakete f\(:ur das Zielnetzwerk / -System werden zum angegebenen ++Alle IP-Pakete f\(:ur das Zielnetzwerk / \(hySystem werden zum angegebenen + Router weitergeleitet. + + .B ANMERKUNG: +@@ -202,7 +202,7 @@ der Optionen (metric, netmask, gw und de + + .SH BEISPIELE + .TP +-.B route add -net 127.0.0.0 ++.B route add \-net 127.0.0.0 + erzeugt die normale Loopbackroute mit der Netzmaske 255.0.0.0 (Netzwerk Klasse + A, ermittelt aus der Zieladresse) und assoziert sie mit der Schnittstelle lo + unter der Annahme, da\(ss dieses Ger\(:at vorher mit +@@ -210,18 +210,18 @@ unter der Annahme, da\(ss dieses Ger\(:a + konfiguriert wurde. + + .TP +-.B route add -net 192.56.76.0 netmask 255.255.255.0 dev eth0 ++.B route add \-net 192.56.76.0 netmask 255.255.255.0 dev eth0 + Legt eine Route zum Netzwerk 192.56.76.x \(:uber eth0 an. Die Angabe der + Klasse C Netzmaske ist in diesem Fall nicht n\(:otig, 192.* Klasse C + IP-Adressen sind. Das Wort dev darf in diesem Fall ausgelassen werden. + + .TP +-.B route add default gw mango-gw ++.B route add default gw mango\-gw + legt eine Standardroute, d.h. eine Route die verwendet wird, wenn keine andere +-Route passt, an. Alle Pakete \(:uber diese Route werden \(:uber mango-gw ++Route passt, an. Alle Pakete \(:uber diese Route werden \(:uber mango\-gw + weitergeleitet. Die Schnittstelle, die tats\(:achlich f\(:ur diese Route +-verwendet wird, h\(:angt davon ab, wie mango-gw erreicht werden kann. Zuvor +-mu\(ss mango-gw bereits \(:uber eine andere Route erreicht werden k\(:onnen. ++verwendet wird, h\(:angt davon ab, wie mango\-gw erreicht werden kann. Zuvor ++mu\(ss mango\-gw bereits \(:uber eine andere Route erreicht werden k\(:onnen. + + .TP + .B route add ipx4 sl0 +@@ -229,7 +229,7 @@ Legt eine Route zum Rechner ipx4 \(:uber + wird angenommen da\(ss ipx4 der SLIP-Rechner auf der Gegenseite ist. + + .TP +-.B route add -net 192.57.66.0 netmask 255.255.255.0 gw ipx4 ++.B route add \-net 192.57.66.0 netmask 255.255.255.0 gw ipx4 + Dieses Kommando sorgt daf\(:ur, dass das Netz 192.57.66.x \(:uber die + obige Route \(:uber die SLIP-Schnittstelle weitergeleitet wird. + +@@ -250,7 +250,7 @@ Dies installiert eine zur\(:uckweisende + Die Ausgabe der Kernelroutentabelle besteht aus folgenden Spalten + .TP + .B Ziel +-Das Zielnetzwerk oder -System. ++Das Zielnetzwerk oder \(hySystem. + .TP + .B Router + Die Adresse des weiterleitenden Routers oder "*", wenn keine gesetzt ist. +@@ -296,10 +296,10 @@ von Routend\(:amonen ben\(:otigt werden. + Anzahl der Referenzen auf diese Route. Wird vom Linux Kern nicht benutzt. + .TP + .B Benutzer +-Zahl der Suchvorg\(:ange nach dieser Route. Abh\(:angig von -F und -C +-werden entweder fehlgeschlagene Suchen im Cache (-F) oder Cache-Treffer (-C) +-Count of lookups for the route. Depending on the use of -F and -C this will +-be either route cache misses (-F) or hits (-C). ++Zahl der Suchvorg\(:ange nach dieser Route. Abh\(:angig von \-F und \-C ++werden entweder fehlgeschlagene Suchen im Cache (\-F) oder Cache-Treffer (\-C) ++Count of lookups for the route. Depending on the use of \-F and \-C this will ++be either route cache misses (\-F) or hits (\-C). + .TP + .B Schnittstelle + Schnittstelle auf die Pakete f\(:ur diese Route geleitet werden. +@@ -345,6 +345,6 @@ zugef\(:ugt. Bernd Eckenfels hat schlie + irtt beigesteuert und den Code mit dem von Netstat vereinigt. + .SH AUTOREN + .B Route +-wird zur Zeit von Phil Blundel (Philip.Blundell@pobox.com) gewartet. ++wird zur Zeit von Phil Blundel und Bernd Eckenfels gewartet. + .SH \(:Ubersetzung + Ralf B\(:achle +Index: net-tools/man/de_DE/slattach.8 +=================================================================== +--- net-tools.orig/man/de_DE/slattach.8 ++++ net-tools/man/de_DE/slattach.8 +@@ -1,8 +1,8 @@ +-.TH SLATTACH 8 "6. M\(:arz 1999" "net-tools" "slattach" ++.TH SLATTACH 8 "6. M\(:arz 1999" "net\-tools" "slattach" + .SH NAME + slattach \- Anbindung einer Netzwerksschnittstelle an eine serielle Verbindung + .SH SYNOPSIS +-.B "slattach [-dehlLmnqv] [-c Kommando] [-p Protokoll] [-s Geschwindigkeit] ++.B "slattach [\-dehlLmnqv] [\-c Kommando] [\-p Protokoll] [\-s Geschwindigkeit] + [Terminal]" + .br + .SH BESCHREIBUNG +@@ -12,46 +12,46 @@ Reihe von m\(:oglichen Netzwerksmodi umz + m\(:oglich, es zur Verbindung mit anderen Computern zu verwenden. + .SH OPTIONEN + .TP +-.B "[-c Kommando]" ++.B "[\-c Kommando]" + Den Befehl + .B Kommando + beim Auflegen der Verbindung ausf\(:uhren. Die kann benutzt werden um + Skripte laufen zu lassen oder eine Verbindung nach Abbruch wiederaufzubauen. + .TP +-.B "[-d]" ++.B "[\-d]" + Zus\(:atzliche Ausgaben zur Fehlersuche einschalten. N\(:utzlich, wenn + eine Konfiguration nicht arbeitet. + .TP +-.B "[-h]" ++.B "[\-h]" + Beenden, wenn der Tr\(:ager verloren geht. Dies funktioniert sowohl auf + /dev/tty als auch auf /dev/cua Ger\(:aten dadurch, da\(ss der Tr\(:ager + alle 15 Sekunden \(:uberpr\(:uft wird. +-.B "[-v]" ++.B "[\-v]" + Ausf\(:uhrliche Ausgaben. Die ist n\(:utzlich in Shellskripten. + .TP +-.B "[-q]" ++.B "[\-q]" + Schaltet alle Ausgaben aus. + .TP +-.B "[-l]" ++.B "[\-l]" + Erzeugt eine Sperrdatei in /var/lock \(:ahnlich wie UUCP. + .TP +-.B "[-n]" ++.B "[\-n]" + Equivalent mit dem + .B mesg n + Befehl. + .TP +-.B "[-m]" ++.B "[\-m]" + Versetzt \fBnot\fP die Verbindung in den 8-bit raw-Modus. + .TP +-.B "[-e]" ++.B "[\-e]" + Beenden sofort nach der Initialisierung des Ger\(:ats anstelle darauf zu + warten, da\(ss die Leitung aufgelegt wird. + .TP +-.B "[-L]" ++.B "[\-L]" + Aktiviert 3-Draht-Betrieb. Das Terminal wird in die CLOCAL Betriebsart + geschaltet und der Tr\(:ager wird nicht \(:uberwacht. + .TP +-.B "[-p Protokoll]" ++.B "[\-p Protokoll]" + Setzt ein spezifisches Protkoll um eine Leitung zu benutzen. Die + Voreinstellung ist + .BR cslip , +@@ -79,7 +79,7 @@ Verbindungen sollte stattdessen das + .B axattach + Programm verwendet werden. + .TP +-.B "[-s Geschwindigkeit]" ++.B "[\-s Geschwindigkeit]" + Setzt eine von der Voreinstellung abweichende \(:Ubertragungseschwindigkeit. + .PP + Werden keine Argument gegeben, sie wird das aktuelle Terminal, das ist +Index: net-tools/man/en_US/arp.8 +=================================================================== +--- net-tools.orig/man/en_US/arp.8 ++++ net-tools/man/en_US/arp.8 +@@ -1,4 +1,4 @@ +-.TH ARP 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual" ++.TH ARP 8 "2007-12-01" "net\-tools" "Linux Programmer's Manual" + .SH NAME + arp \- manipulate the system ARP cache + .SH SYNOPSIS +@@ -167,8 +167,8 @@ used with 2.4 and newer kernels. + Similar to the + .B \-s + option, only this time the address info is taken from file +-.B filename +-. This can be used if ARP entries for a lot of hosts have to be ++.B filename. ++This can be used if ARP entries for a lot of hosts have to be + set up. The name of the data file is very often + .IR /etc/ethers , + but this is not official. If no filename is specified /etc/ethers +@@ -196,7 +196,7 @@ flag. Permanent entries are marked with + and published entries have the + .B P + flag. +-.SH EXAMPLES ++.SH EXSAMPLES + .B /usr/sbin/arp -i eth0 -Ds 10.0.0.2 eth1 pub + + This will answer ARP requests for 10.0.0.2 on eth0 with the MAC address for +Index: net-tools/man/en_US/ethers.5 +=================================================================== +--- net-tools.orig/man/en_US/ethers.5 ++++ net-tools/man/en_US/ethers.5 +@@ -1,4 +1,4 @@ +-.TH ETHERS 5 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual" ++.TH ETHERS 5 "May 15th, 2005" "" "File formats" + .SH NAME \"{{{roff}}}\"{{{ + ethers \- Ethernet address to IP number database + .\"}}} +@@ -7,17 +7,17 @@ ethers \- Ethernet address to IP number + IP numbers, one line for each IP number: + .sp + .RS +-\fIEthernet\-address\fP \fIIP\-number\fP ++\fIEthernet-address\fP \fIIP-number\fP + .RE + .sp + The two items are separated by any number of SPACE and/or TAB characters. + A \fB#\fP at the beginning of a line starts a comment +-which extends to the end of the line. The \fIEthernet\-address\fP is ++which extends to the end of the line. The \fIEthernet-address\fP is + written as + .IR x : x : x : x : x : x , + where \fIx\fP is a hexadecimal number between \fB0\fP and \fBff\fP + which represents one byte of the address, which is in network byte +-order (big-endian). The \fIIP\-number\fP may be a hostname which ++order (big-endian). The \fIIP-number\fP may be a hostname which + can be resolved by DNS or a dot separated number. + .\"}}} + .SH EXAMPLES \"{{{ +Index: net-tools/man/en_US/hostname.1 +=================================================================== +--- net-tools.orig/man/en_US/hostname.1 ++++ net-tools/man/en_US/hostname.1 +@@ -1,4 +1,4 @@ +-.TH HOSTNAME 1 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual" ++.TH HOSTNAME 1 "28 Jan 1996" "net\-tools" "Linux Programmer's Manual" + + .SH NAME + hostname \- show or set the system's host name +Index: net-tools/man/en_US/ifconfig.8 +=================================================================== +--- net-tools.orig/man/en_US/ifconfig.8 ++++ net-tools/man/en_US/ifconfig.8 +@@ -1,4 +1,4 @@ +-.TH IFCONFIG 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual" ++.TH IFCONFIG 8 "2007-12-02" "net\-tools" "Linux Programmer's Manual" + .SH NAME + ifconfig \- configure a network interface + .SH SYNOPSIS +@@ -45,7 +45,7 @@ supported address families include + display all interfaces which are currently available, even if down + .TP + .B -s +-display a short list (like netstat -i) ++display a short list (like netstat \-i) + .TP + .B -v + be more verbose for some error conditions +Index: net-tools/man/en_US/mii-tool.8 +=================================================================== +--- net-tools.orig/man/en_US/mii-tool.8 ++++ net-tools/man/en_US/mii-tool.8 +@@ -1,7 +1,7 @@ + .\" Copyright (C) 2000 David A. Hinds -- dhinds@pcmcia.sourceforge.org + .\" mii-tool.8 1.5 2000/04/25 22:58:19 + .\" +-.TH MII\-TOOL 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual" ++.TH MII\-TOOL 8 "2004/03/28 23:30:00" "net\-tools" + + .SH NAME + mii\-tool \- view, manipulate media-independent interface status +Index: net-tools/man/en_US/nameif.8 +=================================================================== +--- net-tools.orig/man/en_US/nameif.8 ++++ net-tools/man/en_US/nameif.8 +@@ -1,4 +1,4 @@ +-.TH NAMEIF 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual" ++.TH NAMEIF 8 "18 Oct 2000" "net\-tools" "Linux's Administrator's Manual" + .SH NAME + nameif \- name network interfaces based on MAC addresses + .SH SYNOPSIS +Index: net-tools/man/en_US/netstat.8 +=================================================================== +--- net-tools.orig/man/en_US/netstat.8 ++++ net-tools/man/en_US/netstat.8 +@@ -23,7 +23,7 @@ netstat \- Print network connections, ro + .RB [ \-\-listening | \-l ] + .RB [ \-\-all | \-a ] + .RB [ \-\-numeric | \-n ] +-.RB [ \-\-numeric\-hosts "] [" \-\-numeric\-ports "] [" \-\-numeric\-users ] ++.RB [ \-\-numeric-hosts "] [" \-\-numeric-ports "] [" \-\-numeric\-users ] + .RB [ \-\-symbolic | \-N ] + .RB [ \-\-extend | \-e [ \-\-extend | \-e] ] + .RB [ \-\-timers | \-o ] +@@ -186,11 +186,9 @@ Print routing information from the route + .SS "Proto" + The protocol (tcp, udp, raw) used by the socket. + .SS "Recv\-Q" +-Established: The count of bytes not copied by the user program connected to this socket. +-Listening: Since Kernel 2.6.18 this column contains the current syn backlog. ++The count of bytes not copied by the user program connected to this socket. + .SS "Send\-Q" +-Established: The count of bytes not acknowledged by the remote host. +-Listening: Since Kernel 2.6.18 this column contains the maximum size of the syn backlog. ++The count of bytes not acknowledged by the remote host. + .SS "Local Address" + Address and port number of the local end of the socket. Unless the + .BR \-\-numeric " (" \-n ) +Index: net-tools/man/en_US/plipconfig.8 +=================================================================== +--- net-tools.orig/man/en_US/plipconfig.8 ++++ net-tools/man/en_US/plipconfig.8 +@@ -1,4 +1,4 @@ +-.TH PLIPCONFIG 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual" ++.TH PLIPCONFIG 8 "17 February 1995" "" "" + .SH NAME + plipconfig \- fine tune PLIP device parameters + .SH SYNOPSIS +Index: net-tools/man/en_US/rarp.8 +=================================================================== +--- net-tools.orig/man/en_US/rarp.8 ++++ net-tools/man/en_US/rarp.8 +@@ -1,4 +1,4 @@ +-.TH RARP 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual" ++.TH RARP 8 "4 August 1997" "net\-tools" "Linux Programmer's Manual" + .SH NAME + rarp \- manipulate the system RARP table + .SH SYNOPSIS +Index: net-tools/man/en_US/route.8 +=================================================================== +--- net-tools.orig/man/en_US/route.8 ++++ net-tools/man/en_US/route.8 +@@ -1,4 +1,4 @@ +-.TH ROUTE 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual" ++.TH ROUTE 8 "2007-12-02" "net\-tools" "Linux Programmer's Manual" + .SH NAME + route \- show / manipulate the IP routing table + .SH SYNOPSIS +Index: net-tools/man/en_US/slattach.8 +=================================================================== +--- net-tools.orig/man/en_US/slattach.8 ++++ net-tools/man/en_US/slattach.8 +@@ -1,4 +1,4 @@ +-.TH SLATTACH 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual" ++.TH SLATTACH 8 "10 Oct 2006" "" "" + .SH NAME + slattach \- attach a network interface to a serial line + .SH SYNOPSIS +Index: net-tools/man/fr_FR/arp.8 +=================================================================== +--- net-tools.orig/man/fr_FR/arp.8 ++++ net-tools/man/fr_FR/arp.8 +@@ -1,12 +1,12 @@ +-.TH ARP 8 "5 Jan 1999" "net-tools" "Linux Programmer's Manual" ++.TH ARP 8 "5 Jan 1999" "net\-tools" "Linux Programmer's Manual" + .SH NOM + arp \- manipule la table ARP du systme + .SH SYNOPSIS + .B arp + .RB [ \-vn ] + .RB [ "\-H type" ] +-.RB [ "-i if" ] +-.B -a ++.RB [ "\-i if" ] ++.B \-a + .RB [ nom_hte ] + .PP + .B arp +@@ -19,14 +19,14 @@ arp \- manipule la table ARP du systme + .RB [ \-v ] + .RB [ "\-H type" ] + .RB [ "\-i if" ] +-.B -s nom_hte hw_addr ++.B \-s nom_hte hw_addr + .RB [ temp ] + .PP + .B arp + .RB [ \-v ] + .RB [ "\-H type" ] + .RB [ "\-i if" ] +-.B -s nom_hte hw_addr ++.B \-s nom_hte hw_addr + .RB [ "netmask nm" ] + .B pub + .PP +@@ -34,15 +34,15 @@ arp \- manipule la table ARP du systme + .RB [ \-v ] + .RB [ "\-H type" ] + .RB [ "\-i if" ] +-.B -Ds nom_hte ifa ++.B \-Ds nom_hte ifa + .RB [ "netmask nm" ] + .B pub + .PP + .B arp + .RB [ \-vnD ] + .RB [ "\-H type" ] +-.RB [ "-i if" ] +-.B -f nom_fichier ++.RB [ "\-i if" ] ++.B \-f nom_fichier + + .SH DESCRIPTION + .B Arp +@@ -61,7 +61,7 @@ Dit l'utilisateur ce qui se passe en + Affiche les adresses numriques au lieu d'essayer de dterminer les nom + d'htes symboliques. + .TP +-.B "\-H type, \-\-hw-type type" ++.B "\-H type, \-\-hw\-type type" + En positionnant ou lisant les entres ARP, ce paramtre optionnel indique + + .B arp +@@ -92,7 +92,7 @@ les entres seront affiches. + Enlve une entre pour l'hte spcifi. Ceci peut tre + utilis si l'hte concern ne fonctionne plus, par exemple. + .TP +-.B "\-D, \-\-use-device" ++.B "\-D, \-\-use\-device" + Utilise l'adresse matrielle de l'interface + .BR ifa + . +@@ -178,7 +178,7 @@ et les entres 'pub' ont l'indicateur + rarp(8), route(8), ifconfig(8), netstat(8) + .SH AUTEUR + Fred N. van Kempen, avec les amliorations +-apportes par le mainteneur des net-tools Bernd Eckenfels +-. ++apportes par le mainteneur des net\-tools Bernd Eckenfels ++. + .SH TRADUCTION + Jean Michel VANSTEENE (vanstee@worldnet.fr) +Index: net-tools/man/fr_FR/hostname.1 +=================================================================== +--- net-tools.orig/man/fr_FR/hostname.1 ++++ net-tools/man/fr_FR/hostname.1 +@@ -1,4 +1,4 @@ +-.TH HOSTNAME 1 "15 Mars 1999" "net-tools" "Linux Programmer's Manual" ++.TH HOSTNAME 1 "15 Mars 1999" "net\-tools" "Linux Programmer's Manual" + .SH NOM + hostname \- affiche ou dfinit le nom d'hte du systme + .br +@@ -22,7 +22,7 @@ nodename \- affiche ou dfinit le nom de + .RB [ \-f ] + .RB [ \-\-fqdn ] + .RB [ \-i ] +-.RB [ \-\-ip-address ] ++.RB [ \-\-ip\-address ] + .RB [ \-\-long ] + .RB [ \-s ] + .RB [ \-\-short ] +@@ -177,7 +177,7 @@ le nom FQDN et le nom de domaine (qui fa + .I "\-h, \-\-help" + Affiche un message d'aide et se termine. + .TP +-.I "\-i, \-\-ip-address" ++.I "\-i, \-\-ip\-address" + Affiche la (les) adresse(s) IP de l'hte. + .TP + .I "\-n, \-\-node" +@@ -203,9 +203,9 @@ Affiche le nom de domaine NIS. Si un par + .SH FICHIERS + .B /etc/hosts + .SH AUTEURS +-Peter Tobias, ++Peter Tobias, + .br +-Bernd Eckenfels, (NIS et pages de manuel). ++Bernd Eckenfels, (NIS et pages de manuel). + .br + Steve Whitehouse, (Support DECnet et pages de manuel). + .SH TRADUCTION +Index: net-tools/man/fr_FR/ifconfig.8 +=================================================================== +--- net-tools.orig/man/fr_FR/ifconfig.8 ++++ net-tools/man/fr_FR/ifconfig.8 +@@ -1,4 +1,4 @@ +-.TH IFCONFIG 8 "4 August 1997" "net-tools" "Linux Programmer's Manual" ++.TH IFCONFIG 8 "2007-12-02" "net\-tools" "Linux Programmer's Manual" + .SH NOM + ifconfig \- configure une interface rseau + .SH SYNOPSIS +@@ -20,7 +20,7 @@ seul le paramtre + .B interface + est donn, il affiche seulement l'tat de l'interface correspondante; + si seul le paramtre +-.B -a ++.B \-a + est fourni, il affiche l'tat de toutes les interfaces, mme celles qui + ne sont pas actives. + Autrement, il considre qu'il faut positionner de nouvelles valeurs. +@@ -128,14 +128,14 @@ permet d'indiquer au pilote de dtecter + utilis. Une fois de plus, tous les priphriques ne supportent pas cette + option. + .TP +-.B "[-]broadcast [adr]" ++.B "[\-]broadcast [adr]" + Si l'adresse est galement donne, dfinit l'adresse broadcast + protocolaire pour cette interface. Autrement, il permet d'armer (ou dsarmer) + l'indicateur + .B IFF_BROADCAST + de l'interface. + .TP +-.B "[-]pointopoint [adr]" ++.B "[\-]pointopoint [adr]" + Ce mot cl valide le mode + .B point--point + d'une interface, signifiant qu'il existe un lien direct entre 2 machines, +@@ -196,7 +196,7 @@ comptabilit particulires pour l'adress + Mme si les adresses appletalk DDP et IPX peuvent tre affiches, + elles ne peuvent tre modifies avec cette commande. + .SH VOIR AUSSI +-route(8), netstat(8), arp(8), rarp(8), ipchains(8) ++route(8), netstat(8), arp(8), rarp(8), ipchains(8), iptables(8), ifup(8), interfaces(5). + .SH AUTHORS + Fred N. van Kempen, + .br +Index: net-tools/man/fr_FR/netstat.8 +=================================================================== +--- net-tools.orig/man/fr_FR/netstat.8 ++++ net-tools/man/fr_FR/netstat.8 +@@ -8,7 +8,7 @@ + .\" Modified: Tuan Hoang tuan@optimus.mitre.org + .\" + .\" +-.TH NETSTAT 8 "2007-12-02" "net-tools" "Linux Programmer's Manual" ++.TH NETSTAT 8 "2007-12-02" "net\-tools" "Linux Programmer's Manual" + + .SH NAME + netstat \- Affiche les connexions rseau, les tables de routage, les +@@ -76,17 +76,17 @@ ouvertes. C'est l'option par dfaut : si + d'adresses, les sockets actives de toutes les familles d'adresses seront + affiches. + Avec le paramtre +-.B -e ++.B \-e + vous obtenez quelques informations supplmentaires (userid). Avec le paramtre +-.B -v ++.B \-v + vous pouvez demander netstat de signaler des familles d'adresses connues + non supportes par le noyau. Le paramtre +-.B -o ++.B \-o + affiche des informations supplmentaires sur les timers rseau. En donnant + le paramtre +-.B -p ++.B \-p + vous verrez le PID et le nom du processus qui appartient la socket. Le paramtre +-.B -a ++.B \-a + affiche toutes les sockets, y compris les sockets d'coute des serveurs. La famille + d'adresses + .B inet +@@ -97,9 +97,9 @@ Avec le paramtre + .BR \-r ", " \-\-route + vous pouvez visualiser les tables de routage dans le mme format qu'avec la + commande +-.B "route -e" ++.B "route \-e" + . +-.B "netstat -er" ++.B "netstat \-er" + utilisera le format de la commande + .BR route . + Veuillez consulter +@@ -108,19 +108,19 @@ pour plus de dtails. + + .SS "\-i, \-\-interfaces \fIiface\fI" + Si vous utilisez l'option +-.BR -i ", " --interfaces ++.BR \-i ", " \-\-interfaces + , une table de toutes (ou de l'interface + .IR iface + spcifie) les interfaces rseau sera affiche. Le format de sortie est le + mme que celui de la commande +-.B "ifconfig -e" ++.B "ifconfig \-e" + , et est dcrit dans + .BR ifconfig (8). +-.B "netstat -ei" ++.B "netstat \-ei" + affiche une table ou une seule entre d'interface comme la commande + .BR ifconfig . + Avec le paramtre +-.B -a ++.B \-a + , vous pouvez inclure les interfaces qui ne sont pas configures (c.a.d qui + n'ont pas l'indicateur + .BR U = UP +@@ -129,7 +129,7 @@ arm). + .SS "\-M, \-\-masquerade" + + Permet de voir les sessions ayant de l'IP-masquerade. Avec le paramtre +-.B -e ++.B \-e + vous pouvez inclure quelques informations concernant les numros de + squence et les deltas causs par des rcritures de donnes sur des + sessions FTP (commande PORT). Le support de l'IP-Masquerade est utilis +@@ -197,24 +197,24 @@ l'interrompiez. + .SS "Proto" + Le protocole (TCP, UDP, RAW) utilis par la socket. + +-.SS "Recv-Q" ++.SS "Recv\-Q" + Le nombre d'octets non encore lus par le programme utilisateur connect + cette socket. + +-.SS "Send-Q" ++.SS "Send\-Q" + Le nombre d'octets non encore acquitts par l'hte distant. + + .SS "Local Address (Adresse locale)" + L'adresse locale (nom d'hte local) et numro de port de la + socket. Sauf si l'option +-.B -n ++.B \-n + est donne, l'adresse de la prise est traduite en nom d'hte, + et le numro de port est traduit en nom de service correspondant. + + .SS "Foreign Address (Adresse distante)" + L'adresse distante (nom d'hte distant) et le numro de port de + la prise. Comme pour l'adresse locale et le numro de port, l'option +-.B -n ++.B \-n + invalide la traduction du nom d'hte et de service. + + .SS "State (Etat)" +@@ -264,7 +264,7 @@ Le distant termine, et la socket est fer + LISTEN + La socket est l'coute de connexions entrantes. Ces sockets ne sont + affiches que si le paramtre +-.BR -a , --listening ++.BR \-a , \-\-listening + est fourni. + .TP + .I +@@ -282,7 +282,7 @@ Le nom d'utilisateur ou l'UID du propri + .SS "PID/Program name (PID/Nom de Programme)" + Le PID et le nom du programme (spars par un slash) propritaire de la + socket. Le paramtre +-.B -p ++.B \-p + active l'affichage de cette colonne. Vous devez avoir les droits de + .B root + puisque vous devez avoir les droits d'accs aux processus pour visualiser +@@ -357,7 +357,7 @@ La socket n'est pas alloue + LISTENING + La socket est l'coute de demandes de connexions. Ces sockets ne sont + affiches que si le paramtre +-.BR -a , --listening ++.BR \-a , \-\-listening + est fourni. + .TP + .I +@@ -406,7 +406,7 @@ Affiche le chemin correspondant l'atta + + .PP + .SH NOTES +-Depuis la version 2.2 du noyau, netstat -i n'affiche plus les statistiques ++Depuis la version 2.2 du noyau, netstat \-i n'affiche plus les statistiques + des interfaces alias. Pour obtenir les compteurs par interface alias, vous + devez dfinir des rgles spcifiques l'aide de la commande + .BR ipchains (8). +@@ -482,18 +482,18 @@ si une socket change d'tat au moment ou + Ceci est peut probable. + .br + Le paramtre +-.B netstat -i ++.B netstat \-i + est dcrit tel qu'il fonctionnera lorsque le code de la version BETA du +-paquetage net-tools aura t nettoy. ++paquetage net\-tools aura t nettoy. + + .PP + .SH AUTEURS + L'interface utilisateur de netstat a t dveloppe par +-Fred Baumgarten . Les pages du ++Fred Baumgarten . Les pages du + manuel essentiellement crites par Matt Welsh + . Mis jour par Alan Cox . + .br +-La page de manuel et la commande incluse dans le paquetage net-tools ++La page de manuel et la commande incluse dans le paquetage net\-tools + a t totallement rcrite par Bernd Eckenfels + . + .SH TRADUCTION +Index: net-tools/man/fr_FR/rarp.8 +=================================================================== +--- net-tools.orig/man/fr_FR/rarp.8 ++++ net-tools/man/fr_FR/rarp.8 +@@ -1,14 +1,14 @@ +-.TH RARP 8 "4 Aot 1997" "net-tools" "Linux Programmer's Manual" ++.TH RARP 8 "4 Aot 1997" "net\-tools" "Linux Programmer's Manual" + .SH NOM + rarp \- manipule la table systme RARP + .SH SYNOPSIS +-.B "rarp [-V] [--version] [-h] [--help]" ++.B "rarp [\-V] [\-\-version] [\-h] [\-\-help]" + .br +-.B "rarp -a" ++.B "rarp \-a" + .br +-.B "rarp [-v] -d nom_d_hote ..." ++.B "rarp [\-v] \-d nom_d_hote ..." + .br +-.B "rarp [-v] [-t type] -s nom_d_hote adr_materiel" ++.B "rarp [\-v] [\-t type] \-s nom_d_hote adr_materiel" + .SH DESCRIPTION + .B Rarp + manipule la table RARP du noyau de diffrentes faons. Les options de base +Index: net-tools/man/fr_FR/route.8 +=================================================================== +--- net-tools.orig/man/fr_FR/route.8 ++++ net-tools/man/fr_FR/route.8 +@@ -1,4 +1,4 @@ +-.TH ROUTE 8 "8 Aot 1997" "net-tools" "Linux Programmer's Manual" ++.TH ROUTE 8 "2007-12-02" "net\-tools" "Linux Programmer's Manual" + .SH NAME + route \- affiche / manipule la table de routage IP + .SH SYNOPSIS +@@ -51,7 +51,7 @@ If] + .RB [ \-V ] + .RB [ \-\-version ] + .RB [ \-h ] +-.RB [ \--help ] ++.RB [ \-\-help ] + .SH DESCRIPTION + .B Route + manipule la table de routage IP du noyau. Son utilisation premire +@@ -77,7 +77,7 @@ savoir pourquoi la route vers votre serv + .TP + .B \-e + utilise +-.BR netstat (8)-format ++.BR netstat (8)\-format + pour l'affichage de la table de routage. + .B \-ee + Gnre une trs longue ligne avec tous les paramtres partir de la table +@@ -90,13 +90,13 @@ la + est un rseau. + + .TP +-.B -host ++.B \-host + la + .B cible + est un hte. + + .TP +-.B -F ++.B \-F + affiche la table de routage FIB du noyau. L'organisation peut tre change avec + .B \-e + et +@@ -104,7 +104,7 @@ et + . + + .TP +-.B -C ++.B \-C + affiche le cache de routage du noyau. + + .TP +@@ -188,25 +188,25 @@ modificateurs de route (metric - netmask + + .SH EXEMPLES + .TP +-.B route add -net 127.0.0.0 ++.B route add \-net 127.0.0.0 + ajoute l'entre loopback normale, en utilisant le masque 255.0.0.0 (rseau + de classe A, selon l'adresse de destination) et associe avec l'interface + "lo" (en supposant que ce priphrique a t correctement configur avec + .BR ifconfig (8)). + + .TP +-.B route add -net 192.56.76.0 netmask 255.255.255.0 dev eth0 ++.B route add \-net 192.56.76.0 netmask 255.255.255.0 dev eth0 + ajoute une route vers le rseau 192.56.76.x via + "eth0". Le masque de classe C n'est pas vraiment ncessaire ici car + 192.* est une adresse IP de classe C. Le mot "dev" peut tre omis. + + .TP +-.B route add default gw mango-gw ++.B route add default gw mango\-gw + ajoute une route par dfaut (qui sera utilise si aucune autre route ne + convient). Tous les paquets empreintant cette route passeront par +-"mango-gw". Le priphrique qui sera effectivement utilis pour cette route +-dpend de la faon dont on atteint "mango-gw" - la route statique vers +-"mango-gw" devra tre pralablement configure. ++"mango\-gw". Le priphrique qui sera effectivement utilis pour cette route ++dpend de la faon dont on atteint "mango\-gw" - la route statique vers ++"mango\-gw" devra tre pralablement configure. + + .TP + .B route add ipx4 sl0 +@@ -214,7 +214,7 @@ ajoute une route vers l'hte "ipx4" via + "ipx4" est l'hte SLIP). + + .TP +-.B route add -net 192.57.66.0 netmask 255.255.255.0 gw ipx4 ++.B route add \-net 192.57.66.0 netmask 255.255.255.0 gw ipx4 + Cette commande route le rseau "192.57.66.x" par l'ancienne route vers l'interface SLIP. + + .TP +@@ -285,8 +285,8 @@ de routage. + Nombre de rfrences cette route. (Pas utilis dans le noyau Linux.) + .TP + .B Use +-Count of lookups for the route. Depending on the use of -F and -C this will +-be either route cache misses (-F) or hits (-C). ++Count of lookups for the route. Depending on the use of \-F and \-C this will ++be either route cache misses (\-F) or hits (\-C). + .TP + .B Iface + Interface vers laquelle les paquets empruntant cette route seront envoys. +@@ -330,6 +330,6 @@ Linus Torvalds pour pl15. Alan Cox a ajo + la gestion des fentres et MSS pour Linux 1.1.22. Le support de irtt + et la fusion avec netstat ont t raliss par Bernd Eckenfels. + .SH AUTEUR +-Maintenu par Phil Blundell . ++Maintenu par Phil Blundell et Bernd Eckenfels . + .SH TRADUCTION +-Jean-Michel VANSTEENE (vanstee@worldnet.fr) ++Jean-Michel VANSTEENE +Index: net-tools/man/fr_FR/slattach.8 +=================================================================== +--- net-tools.orig/man/fr_FR/slattach.8 ++++ net-tools/man/fr_FR/slattach.8 +@@ -2,7 +2,7 @@ + .SH NOM + slattach \- attache une interface rseau une ligne srie + .SH SYNOPSIS +-.B "slattach [-dehlLmnqv] [-c commande] [-p proto] [-s vitesse] [tty]" ++.B "slattach [\-dehlLmnqv] [\-c commande] [\-p proto] [\-s vitesse] [tty]" + .br + .SH DESCRIPTION + .B Slattach +@@ -12,46 +12,46 @@ ceci vous permettant de l'utiliser pour + vers d'autres systmes. + .SH OPTIONS + .TP +-.B "[-c commande]" ++.B "[\-c commande]" + Excute + .B `commande' + lorsque la ligne est suspendue. Ceci peut tre utilis pour lancer + des scripts ou rtablir des connexions quand un lien tombe. + .TP +-.B "[-d]" ++.B "[\-d]" + Valide le dbogage. Utile pour dterminer pourquoi une configuration + ne fonctionne pas. + .TP +-.B "[-h]" ++.B "[\-h]" + Termine lorsque la porteuse est perdue. Ceci fonctionne la fois sur + les priphriques /dev/tty et /dev/cua en contrlant directement + l'tat de la porteuse toutes les 15 secondes. + .TP +-.B "[-v]" ++.B "[\-v]" + Valide le mode verbeux. Utile pour les shell scripts. + .TP +-.B "[-q]" ++.B "[\-q]" + Opre en mode silencieux - pas de messages du tout. + .TP +-.B "[-l]" ++.B "[\-l]" + Cre un fichier de vrouillage pour le priphrique comme + pour UUCP dans /var/lock. + .TP +-.B "[-n]" ++.B "[\-n]" + Equivalent la commande "mesg n". + .TP +-.B "[-m]" ++.B "[\-m]" + \fBn'\fPinitialise \fBpas\fP la ligne en mode raw 8 bits. + .TP +-.B "[-e]" ++.B "[\-e]" + Termine correctement aprs l'initialisation du priphrique, + au lieu d'attendre que la ligne soit suspendue. + .TP +-.B "[-L]" ++.B "[\-L]" + Valide les oprations 3 lignes. Le terminal est mis en mode CLOCAL, + la surveillance de porteuse est invalide. + .TP +-.B "[-p proto]" ++.B "[\-p proto]" + Dfinit le protocole spcifique utiliser sur la ligne. + La valeur par dfaut est + .B "cslip" +@@ -75,7 +75,7 @@ pour tre actif sur la ligne. Pour les c + .B axattach + doit tre utilis. + .TP +-.B "[-s vitesse]" ++.B "[\-s vitesse]" + Dfinit la vitesse de la ligne, diffrente de la valeur par dfaut. + .PP + Si aucun argument n'est donn, la ligne courante du terminal +Index: net-tools/man/pt_BR/arp.8 +=================================================================== +--- net-tools.orig/man/pt_BR/arp.8 ++++ net-tools/man/pt_BR/arp.8 +@@ -1,12 +1,12 @@ +-.TH ARP 8 "22 de junho de 1996" "net-tools" "Manual do Programador Linux" ++.TH ARP 8 "22 de junho de 1996" "net\-tools" "Manual do Programador Linux" + .SH NOME + arp \- manipula o cache ARP do sistema + .SH SINOPSE + .B arp + .RB [ \-vn ] + .RB [ "\-H tipo" ] +-.RB [ "-i if" ] +-.B -a ++.RB [ "\-i if" ] ++.B \-a + .RB [ mquina ] + .PP + .B arp +@@ -20,7 +20,7 @@ arp \- manipula o cache ARP do sistema + .RB [ \-v ] + .RB [ "\-H tipo" ] + .RB [ "\-i if" ] +-.B -s mquina endereo_hardware ++.B \-s mquina endereo_hardware + .RB [ temp ] + .RB [ nopub ] + .PP +@@ -28,7 +28,7 @@ arp \- manipula o cache ARP do sistema + .RB [ \-v ] + .RB [ "\-H tipo" ] + .RB [ "\-i if" ] +-.B -s mquina endereo_hardware ++.B \-s mquina endereo_hardware + .RB [ "netmask nm" ] + .B pub + .PP +@@ -36,15 +36,15 @@ arp \- manipula o cache ARP do sistema + .RB [ \-v ] + .RB [ "\-H tipo" ] + .RB [ "\-i if" ] +-.B -Ds mquina ifa ++.B \-Ds mquina ifa + .RB [ "netmask nm" ] + .B pub + .PP + .B arp + .RB [ \-vnD ] + .RB [ "\-H tipo" ] +-.RB [ "-i if" ] +-.B -f arquivo ++.RB [ "\-i if" ] ++.B \-f arquivo + + .SH DESCRIO + .B arp +@@ -62,7 +62,7 @@ Mostra ao usurio o que est acontecendo + mostra endereos numricos, ao invs de tentar determinar os nomes simblicos da + mquina, porta e usurio. + .TP +-.B "\-H type, \-\-hw-type type" ++.B "\-H type, \-\-hw\-type type" + Quando configurando ou lendo o cache ARP, este parmetro opcional informa ao + .B arp + que classe de entradas devem ser verificadas. O valor padro deste parmetro +@@ -96,7 +96,7 @@ ou + para decidir se uma entrada pblica ou privada deve ser removida. Se voc + no informar uma destas flags as duas entradas sero removidas. + .TP +-.B "\-D, \-\-use-device" ++.B "\-D, \-\-use\-device" + Usa o endereo de hardware da interface + .BR ifa + .TP +@@ -170,7 +170,7 @@ e entradas publicadas tem uma flag + .I /etc/ethers + .SH AUTOR + Fred N. van Kempen, com muitas melhorias +-feitas pelo mantenedor do net-tools, Bernd Eckenfels . ++feitas pelo mantenedor do net\-tools, Bernd Eckenfels . + Traduo para a lngua portuguesa feita por + Arnaldo Carvalho de Melo em 11/abril/1998. + Revisado por +Index: net-tools/man/pt_BR/hostname.1 +=================================================================== +--- net-tools.orig/man/pt_BR/hostname.1 ++++ net-tools/man/pt_BR/hostname.1 +@@ -1,4 +1,4 @@ +-.TH HOSTNAME 1 "28 de janeiro de 1996" "net-tools" "Manual do Programador Linux" ++.TH HOSTNAME 1 "28 de janeiro de 1996" "net\-tools" "Manual do Programador Linux" + + .SH NOME + hostname \- mostra ou configura o nome da mquina +@@ -21,7 +21,7 @@ ypdomainname \- mostra ou configura o no + .RB [ \-f ] + .RB [ \-\-fqdn ] + .RB [ \-i ] +-.RB [ \-\-ip-address ] ++.RB [ \-\-ip\-address ] + .RB [ \-\-long ] + .RB [ \-s ] + .RB [ \-\-short ] +@@ -161,7 +161,7 @@ do domnio DNS (que parte do FQDN) no + .I "\-h, \-\-help" + Mostra uma mensagem sobre como utilizar o comando e termina. + .TP +-.I "\-i, \-\-ip-address" ++.I "\-i, \-\-ip\-address" + Mostra o(s) endereo(s) IP da mquina. + .TP + .I "\-s, \-\-short" +@@ -180,9 +180,9 @@ Mostra o nome do domnio NIS. Se um par + .SH ARQUIVOS + .B /etc/hosts + .SH AUTOR +-Peter Tobias, ++Peter Tobias, + .BR +-Bernd Eckenfels, (NIS e pgina man). ++Bernd Eckenfels, (NIS e pgina man). + .BR + Arnaldo Carvalho de Melo, Traduo para a lngua + portuguesa. +Index: net-tools/man/pt_BR/ifconfig.8 +=================================================================== +--- net-tools.orig/man/pt_BR/ifconfig.8 ++++ net-tools/man/pt_BR/ifconfig.8 +@@ -1,4 +1,4 @@ +-.TH IFCONFIG 8 "10 de fevereiro de 1996" "net-tools" "Manual do Programador Linux" ++.TH IFCONFIG 8 "2007-12-02" "net\-tools" "Manual do Programador Linux" + .SH NOME + ifconfig \- configura uma interface de rede + .SH SINOPSE +@@ -61,7 +61,7 @@ o sinal de menos (\-) estiver presente a + .TP + .B "[\-]trailers" + Habilita ou desabilita o uso de trailer em frames Ethernet. No +-utilizada na implementao atual do pacote net-tools. ++utilizada na implementao atual do pacote net\-tools. + .TP + .B "[\-]allmulti" + Habilita ou desabilita o modo +@@ -97,7 +97,7 @@ uso de sub-redes. + Configura a linha de interrupo (IRQ) usada por este dispositivo. Muitos + dispositivos no suportam configurao dinmica de IRQ. + .TP +-.B "[-]broadcast [endereo]" ++.B "[\-]broadcast [endereo]" + Se o argumento endereo for informado, configura o endereo de protocolo + broadcast para esta interface. De outra forma ele somente configura a flag + .B IFF_BROADCAST +@@ -105,7 +105,7 @@ da interface. Se a palavra-chave for pr + .B (-) + , ento a flag removida. + .TP +-.B "[-]pointopoint [endereo]" ++.B "[\-]pointopoint [endereo]" + Esta palavra-chave habilita o modo + .B ponto-a-ponto + da interface, significando que ela um link direto entre duas mquinas +@@ -169,7 +169,7 @@ endereos usando o comando + Os endereos appletalk DDP e IPX sero mostrados, mas no podem ser alterados + com este comando. + .SH VEJA TAMBM +-route(8), netstat(8), arp(8), rarp(8), ipchains(8) ++route(8), netstat(8), arp(8), rarp(8), ipchains(8), iptables(8), ifup(8), interfaces(5). + .SH AUTORES + Fred N. van Kempen, + Alan Cox, +Index: net-tools/man/pt_BR/netstat.8 +=================================================================== +--- net-tools.orig/man/pt_BR/netstat.8 ++++ net-tools/man/pt_BR/netstat.8 +@@ -8,7 +8,7 @@ + .\" Traduzido para portugus por Arnaldo Carvalho de Melo + .\" Revisado por Jorge Luiz Godoy Filho + .\" +-.TH NETSTAT 8 "2007-12-02" "net-tools" "Manual do Programador Linux" ++.TH NETSTAT 8 "2007-12-02" "net\-tools" "Manual do Programador Linux" + + .SH NOME + netstat \- Mostra conexes de rede, tabelas de roteamento, estatsticas de interface e conexes +@@ -72,14 +72,14 @@ Voc pode ver o estado das conexes de r + abertos. Esta a operao padro: se voc no especificar nenhuma + famlia de endereos, os sockets ativos de todas as famlias de endereos + configuradas sero mostrados. Com +-.B -e ++.B \-e + voc obter informaes adicionais (userid). Com a chave +-.B -v ++.B \-v + voc poder fazer com que o netstat reclame sobre famlias de endereos + conhecidas que no sejam suportadas pelo kernel. A opo +-.B -o ++.B \-o + mostra algumas informaes adicionais sobre temporizadores de rede. +-.B -a ++.B \-a + mostra todos os sockets, incluindo sockets de servidores. A famlia de + endereos + .B inet +@@ -89,8 +89,8 @@ mostrar sockets raw, udp e tcp. + Com a opo + .BR \-r ", " \-\-route + voc obter as tabelas de roteamento do kernel no mesmo formato usado por +-.BR "route -e" . +-.B "netstat -er" ++.BR "route \-e" . ++.B "netstat \-er" + usar o formato de apresentao do comando + .BR route . + Por favor veja +@@ -99,18 +99,18 @@ para maiores detalhes. + + .SS "\-i, \-\-interfaces \fIiface\fI" + Se voc usar a opo +-.BR -i ", " --interfaces ++.BR \-i ", " \-\-interfaces + , uma tabela de todas (ou da + .IR iface + especificada) as interfaces de rede ser mostrada. A sada usa o formato +-.B "ifconfig -e" ++.B "ifconfig \-e" + , e descrita em + .BR ifconfig (8). +-.B "netstat -ei" ++.B "netstat \-ei" + mostrar uma tabela ou uma entrada de interface como + .B ifconfig + mostra. Com a chave +-.B -a ++.B \-a + , voc pode incluir interfaces que no estejam configuradas (i.e. no tem + a flag + .BR U = UP +@@ -119,7 +119,7 @@ configurada). + .SS "\-M, \-\-masquerade" + + Uma lista de todas as sesses mascaradas tambm pode ser vista. Com a chave +-.B -e ++.B \-e + voc pode incluir mais algumas informaes sobre numerao sequencial e deltas + , causados por reescritas de dados em sesses FTP (comando PORT). + O suporte a mascaramento usado para esconder mquinas em endereos de +@@ -179,23 +179,23 @@ voc o interrompa. + .SS "Proto" + O protocolo (tcp, udp, raw) usado pelo socket. + +-.SS "Recv-Q" ++.SS "Recv\-Q" + O contador de bytes no copiados pelo programa conectado a este socket. + +-.SS "Send-Q" ++.SS "Send\-Q" + O contador de bytes no confirmados pela mquina remota. + + .SS "Endereo Local" + O endereo local (nome da mquina local) e o numero da porta do socket. A menos + que a chave +-.B -n ++.B \-n + seja especificada o endereo do socket ser resolvido para seu nome de mquina + cannico e o nmero da porta ser traduzido para o servio correspondente. + + .SS "Endereo Remoto" + O endereo remoto (nome da mquina remota) e o nmero da porta do socket. Como + com o endereo local, a chave +-.B -n ++.B \-n + desliga a resoluo do nome da mquina e do servio. + + .SS "Estado" +@@ -245,7 +245,7 @@ confirmao. + OUVINDO + O socket est ouvindo por conexes. Estes socket so somente mostrados se + a chave +-.BR -a , --listening ++.BR \-a , \-\-listening + for especificada. + .TP + .I +@@ -329,7 +329,7 @@ Este socket no est alocado. + LISTENING + O socket est aguardando por uma solicitao de conexo. So mostrados + apenas se as opes +-.BR -a , --listening ++.BR \-a , \-\-listening + forem selecionadas. + .TP + .I +@@ -372,7 +372,7 @@ Mostra o caminho (path) do processo do q + + .PP + .SH NOTAS +-Desde o kernel 2.2 o netstat -i no mostra estatsticas para apelidos (aliases) ++Desde o kernel 2.2 o netstat \-i no mostra estatsticas para apelidos (aliases) + de interfaces. Para obter contadores por apelido de interface voc precisa + configurar regras explcitas usando o comando + +.BR ipchains(8) +@@ -447,20 +447,20 @@ Ocasionalmente informaes estranhas pod + enquanto visualizado. Isso incomum. + .br + As opes descritas para +-.B netstat -i ++.B netstat \-i + foram descritas como devero funcionar aps alguma limpeza da liberao +-BETA do pacote net-tools. ++BETA do pacote net\-tools. + + .PP + .SH AUTORES + A interface com o usurio foi escrita por Fred Baumgarten +- a pgina do manual basicamente ++ a pgina do manual basicamente + por Matt Welsh . Foi atualizada por + Alan Cox mas poderia ter sido feita com um pouco + mais de trabalho. + .BR + .LP +-A pgina do manual e os comandos includos no pacote net-tools ++A pgina do manual e os comandos includos no pacote net\-tools + foram totalmente reescritos desde Bernd Eckenfels + . + .BR +Index: net-tools/man/pt_BR/rarp.8 +=================================================================== +--- net-tools.orig/man/pt_BR/rarp.8 ++++ net-tools/man/pt_BR/rarp.8 +@@ -1,12 +1,12 @@ +-.TH RARP 8 "10 de fevereiro de 1996" "net-tools" "Manual do Programador Linux" ++.TH RARP 8 "10 de fevereiro de 1996" "net\-tools" "Manual do Programador Linux" + .SH NOME + rarp \- manipula a tabela RARP do sistema + .SH SINOPSE +-.B "rarp [-v] [-t tipo] -a [mquina]" ++.B "rarp [\-v] [\-t tipo] \-a [mquina]" + .br +-.B "rarp [-v] -d mquina ..." ++.B "rarp [\-v] \-d mquina ..." + .br +-.B "rarp [-v] [-t tipo] -s mquina endereo_hardware" ++.B "rarp [\-v] [\-t tipo] \-s mquina endereo_hardware" + .SH DESCRIO + .B Rarp + manipula as tabelas RARP do kernel de varias formas. As opes principais +Index: net-tools/man/pt_BR/route.8 +=================================================================== +--- net-tools.orig/man/pt_BR/route.8 ++++ net-tools/man/pt_BR/route.8 +@@ -1,4 +1,4 @@ +-.TH ROUTE 8 "27 Jan 1996" "net-tools" "Manual do Programador Linux" ++.TH ROUTE 8 "2007-12-02" "net\-tools" "Manual do Programador Linux" + .SH NOME + route \- mostra / manipula a tabela de roteamento IP + .SH SINOPSE +@@ -47,7 +47,7 @@ If] + .RB [ \-V ] + .RB [ \-\-version ] + .RB [ \-h ] +-.RB [ \--help ] ++.RB [ \-\-help ] + .SH DESCRICAO + .B Route + manipula a tabela de roteamento IP do kernel. Seu principal uso +@@ -186,7 +186,7 @@ modificadores do route (metric - netmask + + .SH EXEMPLOS + .TP +-.B route add -net 127.0.0.0 ++.B route add \-net 127.0.0.0 + Adiciona a entrada para a interface loopback normal, usando mascara igual + a 255.0.0.0 (rede classe A, determinada a partir do endereo de destino), + associada ao dispositivo "lo" (assumindo que este dispositivo tenha sido +@@ -194,17 +194,17 @@ previamente configurado com o + .BR ifconfig (8)). + + .TP +-.B route add -net 192.56.76.0 netmask 255.255.255.0 dev eth0 ++.B route add \-net 192.56.76.0 netmask 255.255.255.0 dev eth0 + Adiciona uma rota para a rede 192.56.76.x atravs da interface "eth0". O + modificador de mascara classe C no realmente necessrio aqui por que + 192.* um endereo IP de classe C. A palavra "dev" pode ser omitida aqui. + + .TP +-.B route add default gw mango-gw ++.B route add default gw mango\-gw + Adiciona uma rota default (que ser usada se nenhuma outra rota for encontrada). +-Todos os pacotes que usarem esta rota sero passados para a mquina "mango-gw". ++Todos os pacotes que usarem esta rota sero passados para a mquina "mango\-gw". + O dispositivo que ser utilizado para esta rota depende de como possvel +-alcanar "mango-gw" - a rota esttica para "mango-gw" ter que ser configurada ++alcanar "mango\-gw" - a rota esttica para "mango\-gw" ter que ser configurada + previamente. + + .TP +@@ -213,12 +213,12 @@ Adiciona uma rota para a mquina "ipx4" + que "ipx4" a mquina SLIP). + + .TP +-.B route add -net 192.57.66.0 netmask 255.255.255.0 gw ipx4 ++.B route add \-net 192.57.66.0 netmask 255.255.255.0 gw ipx4 + Este comando adiciona a rede "192.57.66.x" para ser alcanada atravs da + rota anterior atravs da interface SLIP. + + .TP +-.B route add -net 224.0.0.0 netmask 240.0.0.0 dev eth0 ++.B route add \-net 224.0.0.0 netmask 240.0.0.0 dev eth0 + Isto bem obscura, documentada para que as pessoas saibam como us-la. + Configura para que todas as rotas IP classe D (multicast) vo atravs da + interface "eth0". Esta a linha de configurao normal a ser usada com +@@ -239,8 +239,8 @@ A rede ou mquina de destino. + A mquina roteador ou '*' se nenhuma estiver configurada. + .TP + .B Mascara Genrica +-A mascara para a rede destino. '255.255.255.255' para uma mquina de destino, +-'0.0.0.0' para a rota ++A mascara para a rede destino. '255.255.255.255' para uma mquina de ++destino, '0.0.0.0' para a rota + .B default + . + .TP +@@ -321,7 +321,7 @@ para o linux foi originalmente escrito p + Linus Torvalds para a verso pl15. Alan Cox adicionou as opes para + mss e window no kernel 1.1.22. O suporte a irtt (compartilhado com o + netstat) foi feito por Bernd Eckenfels. ++.SH AUTHOR ++Currently maintained by Phil Blundell and Bernd Eckenfels . + .SH TRADUO + Arnaldo Carvalho de Melo - 13/04/1998 +-.SH BUGS +-nenhum :) --- net-tools-1.60.orig/debian/patches/CVS-20031011-hostname.c_sync.patch +++ net-tools-1.60/debian/patches/CVS-20031011-hostname.c_sync.patch @@ -0,0 +1,97 @@ +Sync with upstream CVS, complete log: + +Revision 1.12 - Sat Oct 11 21:08:10 2003 UTC by ecki +Maik Broemme contributed gcc warning fixes (break after default: label) + +Revision 1.11 - Thu Jun 12 03:22:30 2003 UTC by ecki +make hostname compile warnign free with gcc 3.3 (Ec) + +Index: net-tools/hostname.c +=================================================================== +--- net-tools.orig/hostname.c ++++ net-tools/hostname.c +@@ -9,20 +9,19 @@ + * dnsdmoainname + * nisdomainname {name|-F file} + * +- * Version: hostname 1.96 (1996-02-18) ++ * Version: hostname 1.101 (2003-10-11) + * + * Author: Peter Tobias + * + * Changes: +- * {1.90} Peter Tobias : Added -a and -i options. +- * {1.91} Bernd Eckenfels : -v,-V rewritten, long_opts +- * (major rewrite), usage. +- *960120 {1.95} Bernd Eckenfels : -y/nisdomainname - support for get/ +- * setdomainname added +- *960218 {1.96} Bernd Eckenfels : netinet/in.h added +- *980629 {1.97} Arnaldo Carvalho de Melo : gettext instead of catgets for i18n +- *20000213 {1.99} Arnaldo Carvalho de Melo : fixed some i18n strings ++ * {1.90} Peter Tobias : Added -a and -i options. ++ * {1.91} Bernd Eckenfels : -v,-V rewritten, long_opts (major rewrite), usage. ++ *19960120 {1.95} Bernd Eckenfels : -y/nisdomainname - support for get/setdomainname added ++ *19960218 {1.96} Bernd Eckenfels : netinet/in.h added ++ *19980629 {1.97} Arnaldo Carvalho de Melo : gettext instead of catgets for i18n ++ *20000213 {1.99} Arnaldo Carvalho de Melo : fixed some i18n strings + *20010404 {1.100} Arnaldo Carvalho de Melo: use setlocale ++ *20031011 {1.101} Maik Broemme: gcc 3.x fixes (default: break) + * + * This program is free software; you can redistribute it + * and/or modify it under the terms of the GNU General +@@ -31,7 +30,9 @@ + * your option) any later version. + */ + #include ++#include + #include ++#include + #include + #include + #include +@@ -78,6 +79,7 @@ static void setnname(char *nname) + fprintf(stderr, _("%s: name too long\n"), program_name); + break; + default: ++ break; + } + exit(1); + } +@@ -97,7 +99,6 @@ static void sethname(char *hname) + case EINVAL: + fprintf(stderr, _("%s: name too long\n"), program_name); + break; +- default: + } + exit(1); + }; +@@ -116,7 +117,6 @@ static void setdname(char *dname) + case EINVAL: + fprintf(stderr, _("%s: name too long\n"), program_name); + break; +- default: + } + exit(1); + }; +@@ -173,7 +173,6 @@ static void showhname(char *hname, int c + *p = '\0'; + printf("%s\n", hp->h_name); + break; +- default: + } + } + +@@ -326,11 +325,12 @@ int main(int argc, char **argv) + break; + case 'V': + version(); ++ break; // not reached + case '?': + case 'h': + default: + usage(); +- ++ break; // not reached + }; + + --- net-tools-1.60.orig/debian/patches/CVS-20061011-includes_sync.patch +++ net-tools-1.60/debian/patches/CVS-20061011-includes_sync.patch @@ -0,0 +1,113 @@ +Sync with upstream CVS, complete log: + +2006-10-10 22:14 ecki + + * util-ank.h: fixed signedness compiler warning + +2006-09-27 17:59 ecki + + * mii.h: GigE Support by Stephen Hemminger from + http://developer.osdl.org/shemminger/prototypes/mii-tool.tar.bz2 + with verbose register patch from Dean Gaudet + +2003-06-28 00:19 ecki + + * mii.h: Use new style MII ioctls only. This will give you a + warning, if compiled with old kernel source tree. It will also + not work if compiled with new source on old kernels. The new + ioctls also require root for reading, the old didnt. This fixes + Debian bug #133648. No fallback compatibility is included for + reasons of cleaner source. + +2002-03-04 21:47 ecki + + * interface.h: export procnetdev_version, get_dev_fields, get_name + from lib/interface.c for general usage (e.g. in my next patch to + iptunnel) + +2001-11-25 03:48 ecki + + * interface.h: this fixes Debian Bug #109164 (netstat -ci does only + print stats once). It also renames add_interface and + free_interface list to if_cache_add/free. I am not sure if + removing the "proc_read" flag will harm performance, looks likt + this check is never triggereed. Anyway, we need more efficient + b-search sooner or later. + +--- net-tools-1.60.orig/include/util-ank.h ++++ net-tools-1.60/include/util-ank.h +@@ -75,6 +75,6 @@ + extern int do_class(int argc, char **argv); + extern int do_filter(int argc, char **argv); + +-extern const char *format_host(int af, void *addr, __u8 *abuf, int alen); ++extern const char *format_host(int af, void *addr, char *abuf, int alen); + + #endif /* __UTILS_H__ */ +--- net-tools-1.60.orig/include/mii.h ++++ net-tools-1.60/include/mii.h +@@ -6,11 +6,14 @@ + * Copyright (C) 2000 David A. Hinds -- dhinds@pcmcia.sourceforge.org + */ + +-#ifndef _LINUX_MII_H +-#define _LINUX_MII_H ++#ifndef _NETTOOL_MII_H ++#define _NETTOOLS_MII_H ++ ++#include + + /* network interface ioctl's for MII commands */ + #ifndef SIOCGMIIPHY ++#warning "SIOCGMIIPHY is not defined by your kernel source" + #define SIOCGMIIPHY (SIOCDEVPRIVATE) /* Read from current PHY */ + #define SIOCGMIIREG (SIOCDEVPRIVATE+1) /* Read any PHY register */ + #define SIOCSMIIREG (SIOCDEVPRIVATE+2) /* Write any PHY register */ +@@ -38,6 +41,7 @@ + #define MII_BMCR_RESTART 0x0200 + #define MII_BMCR_DUPLEX 0x0100 + #define MII_BMCR_COLTEST 0x0080 ++#define MII_BMCR_SPEED1000 0x0040 + + /* Basic Mode Status Register */ + #define MII_BMSR 0x01 +@@ -83,4 +87,17 @@ + #define MII_ANER_PAGE_RX 0x0002 + #define MII_ANER_LP_AN_ABLE 0x0001 + +-#endif /* _LINUX_MII_H */ ++#define MII_CTRL1000 0x09 ++#define MII_BMCR2_1000FULL 0x0200 ++#define MII_BMCR2_1000HALF 0x0100 ++ ++#define MII_STAT1000 0x0a ++#define MII_LPA2_1000LOCALOK 0x2000 ++#define MII_LPA2_1000REMRXOK 0x1000 ++#define MII_LPA2_1000FULL 0x0800 ++#define MII_LPA2_1000HALF 0x0400 ++ ++/* Last register we need for show_basic_mii() */ ++#define MII_BASIC_MAX (MII_STAT1000+1) ++ ++#endif /* _NETTOOLS_MII_H */ +--- net-tools-1.60.orig/include/interface.h ++++ net-tools-1.60/include/interface.h +@@ -64,13 +64,17 @@ + extern int if_fetch(struct interface *ife); + + extern int for_all_interfaces(int (*)(struct interface *, void *), void *); +-extern int free_interface_list(void); ++extern int if_cache_free(void); + extern struct interface *lookup_interface(char *name); + extern int if_readlist(void); + + extern int do_if_fetch(struct interface *ife); + extern int do_if_print(struct interface *ife, void *cookie); + ++extern int procnetdev_version(char *buf); ++extern int get_dev_fields(char *bp, struct interface *ife); ++extern char * get_name(char *name, char *p); ++ + extern void ife_print(struct interface *ptr); + + extern int ife_short; --- net-tools-1.60.orig/debian/patches/Add_missing_headers.patch +++ net-tools-1.60/debian/patches/Add_missing_headers.patch @@ -0,0 +1,14 @@ +Index: net-tools-1.60/netstat.c +======================================== +--- net-tools-1.60.orig/netstat.c ++++ net-tools-1.60/netstat.c +@@ -85,6 +85,8 @@ + #include + #include + #include ++#include ++#include + + #include "net-support.h" + #include "pathnames.h" + --- net-tools-1.60.orig/debian/patches/Bug#569509-iface_overflow.patch +++ net-tools-1.60/debian/patches/Bug#569509-iface_overflow.patch @@ -0,0 +1,19 @@ +Description: do not crash if an inappropriately long argument is used for -D. +Author: Kees Cook +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/net-tools/+bug/515010 +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=569509 + +Index: net-tools-1.60/arp.c +=================================================================== +--- net-tools-1.60.orig/arp.c 2010-02-11 15:19:16.702985736 -0800 ++++ net-tools-1.60/arp.c 2010-02-11 15:22:29.729592589 -0800 +@@ -243,7 +243,8 @@ + struct ifreq ifr; + struct hwtype *xhw; + +- strcpy(ifr.ifr_name, ifname); ++ strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); ++ ifr.ifr_name[IFNAMSIZ-1]='\0'; + if (ioctl(sockfd, SIOCGIFHWADDR, &ifr) < 0) { + fprintf(stderr, _("arp: cant get HW-Address for `%s': %s.\n"), ifname, strerror(errno)); + return (-1); --- net-tools-1.60.orig/debian/patches/CVS-20081002-ifconfig.c_sync.patch +++ net-tools-1.60/debian/patches/CVS-20081002-ifconfig.c_sync.patch @@ -0,0 +1,379 @@ +Sync with upstream CVS, complete log: + +Revision 1.58 - Thu Oct 2 23:31:04 2008 UTC by ecki +Avoid segfault of ifconfig(8) on missing /proc/net/dev +(Debian Bug #222209 Pierre Lombard, Tollef Fog Heen) + +Revision 1.57 - Tue Dec 10 00:56:41 2002 UTC by ecki +- change columns of netstat -i/ifconfig -s to avoid run-into (Stefan Illner) +- prevent segfault on protocol families without host error member +- use /128 as default prefix if not specified instead of /0 + +Revision 1.56 - Fri Jul 5 17:36:02 2002 UTC by ecki +Jack Bloch noticed that the hw comamnd of ifconfig returns a +confusing -EBUSY if interface is up (on lkml). + +Revision 1.55 - Wed Jul 3 23:40:47 2002 UTC by ecki +there is no such thing as -i option for ifconfig +removed variable, fixed usage, added options to english man page + +Revision 1.54 - Thu Nov 1 03:00:13 2001 UTC by ecki +delay the setting of netmask derived from /mask after setting address +(Debian Bug #116573 reported by Brian Warner) + +Revision 1.53 - Thu Nov 1 01:54:49 2001 UTC by ecki +minor fix to return E_USAGE on -V instead of exit(0); + +Revision 1.52 - Thu Nov 1 01:48:31 2001 UTC by ecki +failed to set error flag if netmask setting reported an error +(Debian Bug #117837 reported by Sam Clegg) + +Revision 1.51 - Fri Jun 29 03:48:51 2001 UTC by ecki +this will check after clearing a flag, that it is indeed cleared. it will +also be a bit more verbose and precise on errors. See Debian Bug #102474 + +Index: net-tools/ifconfig.c +=================================================================== +--- net-tools.orig/ifconfig.c ++++ net-tools/ifconfig.c +@@ -3,7 +3,7 @@ + * that either displays or sets the characteristics of + * one or more of the system's networking interfaces. + * +- * Version: $Id: ifconfig.c,v 1.50 2001/04/13 18:25:18 pb Exp $ ++ * Version: $Id: ifconfig.c,v 1.58 2008/10/02 23:31:04 ecki Exp $ + * + * Author: Fred N. van Kempen, + * and others. Copyright 1993 MicroWalt Corporation +@@ -88,7 +88,6 @@ struct in6_ifreq { + char *Release = RELEASE, *Version = "ifconfig 1.42 (2001-04-13)"; + + int opt_a = 0; /* show all interfaces */ +-int opt_i = 0; /* show the statistics */ + int opt_v = 0; /* debugging output flag */ + + int addr_family = 0; /* currently selected AF */ +@@ -105,7 +104,7 @@ static int if_print(char *ifname) + int res; + + if (ife_short) +- printf(_("Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg\n")); ++ printf(_("Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg\n")); + + if (!ifname) { + res = for_all_interfaces(do_if_print, &opt_a); +@@ -113,6 +112,9 @@ static int if_print(char *ifname) + struct interface *ife; + + ife = lookup_interface(ifname); ++ if (!ife) { ++ return -1; ++ } + res = do_if_fetch(ife); + if (res >= 0) + ife_print(ife); +@@ -127,7 +129,7 @@ static int set_flag(char *ifname, short + + safe_strncpy(ifr.ifr_name, ifname, IFNAMSIZ); + if (ioctl(skfd, SIOCGIFFLAGS, &ifr) < 0) { +- fprintf(stderr, _("%s: unknown interface: %s\n"), ++ fprintf(stderr, _("%s: ERROR while getting interface flags: %s\n"), + ifname, strerror(errno)); + return (-1); + } +@@ -159,7 +161,7 @@ static int clr_flag(char *ifname, short + + safe_strncpy(ifr.ifr_name, ifname, IFNAMSIZ); + if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) { +- fprintf(stderr, _("%s: unknown interface: %s\n"), ++ fprintf(stderr, _("%s: ERROR while getting interface flags: %s\n"), + ifname, strerror(errno)); + return -1; + } +@@ -172,9 +174,35 @@ static int clr_flag(char *ifname, short + return (0); + } + ++/** test is a specified flag is set */ ++static int test_flag(char *ifname, short flags) ++{ ++ struct ifreq ifr; ++ int fd; ++ ++ if (strchr(ifname, ':')) { ++ /* This is a v4 alias interface. Downing it via a socket for ++ another AF may have bad consequences. */ ++ fd = get_socket_for_af(AF_INET); ++ if (fd < 0) { ++ fprintf(stderr, _("No support for INET on this system.\n")); ++ return -1; ++ } ++ } else ++ fd = skfd; ++ ++ safe_strncpy(ifr.ifr_name, ifname, IFNAMSIZ); ++ if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) { ++ fprintf(stderr, _("%s: ERROR while testing interface flags: %s\n"), ++ ifname, strerror(errno)); ++ return -1; ++ } ++ return (ifr.ifr_flags & flags); ++} ++ + static void usage(void) + { +- fprintf(stderr, _("Usage:\n ifconfig [-a] [-i] [-v] [-s] [[]
]\n")); ++ fprintf(stderr, _("Usage:\n ifconfig [-a] [-v] [-s] [[]
]\n")); + #if HAVE_AFINET + fprintf(stderr, _(" [add
[/]]\n")); + fprintf(stderr, _(" [del
[/]]\n")); +@@ -208,7 +236,7 @@ static void usage(void) + static void version(void) + { + fprintf(stderr, "%s\n%s\n", Release, Version); +- exit(0); ++ exit(E_USAGE); + } + + static int set_netmask(int skfd, struct ifreq *ifr, struct sockaddr *sa) +@@ -222,18 +250,19 @@ static int set_netmask(int skfd, struct + strerror(errno)); + err = 1; + } +- return 0; ++ return err; + } + + int main(int argc, char **argv) + { + struct sockaddr sa; ++ struct sockaddr samask; + struct sockaddr_in sin; + char host[128]; + struct aftype *ap; + struct hwtype *hw; + struct ifreq ifr; +- int goterr = 0, didnetmask = 0; ++ int goterr = 0, didnetmask = 0, neednetmask=0; + char **spp; + int fd; + #if HAVE_AFINET6 +@@ -388,6 +417,8 @@ int main(int argc, char **argv) + } + if (!strcmp(*spp, "-promisc")) { + goterr |= clr_flag(ifr.ifr_name, IFF_PROMISC); ++ if (test_flag(ifr.ifr_name, IFF_PROMISC) > 0) ++ fprintf(stderr, _("Warning: Interface %s still in promisc mode... maybe other application is running?\n"), ifr.ifr_name); + spp++; + continue; + } +@@ -398,6 +429,8 @@ int main(int argc, char **argv) + } + if (!strcmp(*spp, "-multicast")) { + goterr |= clr_flag(ifr.ifr_name, IFF_MULTICAST); ++ if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0) ++ fprintf(stderr, _("Warning: Interface %s still in MULTICAST mode.\n"), ifr.ifr_name); + spp++; + continue; + } +@@ -408,6 +441,8 @@ int main(int argc, char **argv) + } + if (!strcmp(*spp, "-allmulti")) { + goterr |= clr_flag(ifr.ifr_name, IFF_ALLMULTI); ++ if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0) ++ fprintf(stderr, _("Warning: Interface %s still in ALLMULTI mode.\n"), ifr.ifr_name); + spp++; + continue; + } +@@ -430,6 +465,8 @@ int main(int argc, char **argv) + if (!strcmp(*spp, "-dynamic")) { + goterr |= clr_flag(ifr.ifr_name, IFF_DYNAMIC); + spp++; ++ if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0) ++ fprintf(stderr, _("Warning: Interface %s still in DYNAMIC mode.\n"), ifr.ifr_name); + continue; + } + #endif +@@ -486,6 +523,8 @@ int main(int argc, char **argv) + + if (!strcmp(*spp, "-broadcast")) { + goterr |= clr_flag(ifr.ifr_name, IFF_BROADCAST); ++ if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0) ++ fprintf(stderr, _("Warning: Interface %s still in BROADCAST mode.\n"), ifr.ifr_name); + spp++; + continue; + } +@@ -493,7 +532,10 @@ int main(int argc, char **argv) + if (*++spp != NULL) { + safe_strncpy(host, *spp, (sizeof host)); + if (ap->input(0, host, &sa) < 0) { +- ap->herror(host); ++ if (ap->herror) ++ ap->herror(host); ++ else ++ fprintf(stderr, _("ifconfig: Error resolving '%s' for broadcast\n"), host); + goterr = 1; + spp++; + continue; +@@ -515,7 +557,10 @@ int main(int argc, char **argv) + usage(); + safe_strncpy(host, *spp, (sizeof host)); + if (ap->input(0, host, &sa) < 0) { +- ap->herror(host); ++ if (ap->herror) ++ ap->herror(host); ++ else ++ fprintf(stderr, _("ifconfig: Error resolving '%s' for dstaddr\n"), host); + goterr = 1; + spp++; + continue; +@@ -535,13 +580,16 @@ int main(int argc, char **argv) + usage(); + safe_strncpy(host, *spp, (sizeof host)); + if (ap->input(0, host, &sa) < 0) { +- ap->herror(host); ++ if (ap->herror) ++ ap->herror(host); ++ else ++ fprintf(stderr, _("ifconfig: Error resolving '%s' for netmask\n"), host); + goterr = 1; + spp++; + continue; + } + didnetmask++; +- goterr = set_netmask(ap->fd, &ifr, &sa); ++ goterr |= set_netmask(ap->fd, &ifr, &sa); + spp++; + continue; + } +@@ -613,6 +661,8 @@ int main(int argc, char **argv) + if (!strcmp(*spp, "-pointopoint")) { + goterr |= clr_flag(ifr.ifr_name, IFF_POINTOPOINT); + spp++; ++ if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0) ++ fprintf(stderr, _("Warning: Interface %s still in POINTOPOINT mode.\n"), ifr.ifr_name); + continue; + } + if (!strcmp(*spp, "pointopoint")) { +@@ -620,7 +670,10 @@ int main(int argc, char **argv) + spp++; + safe_strncpy(host, *spp, (sizeof host)); + if (ap->input(0, host, &sa)) { +- ap->herror(host); ++ if (ap->herror) ++ ap->herror(host); ++ else ++ fprintf(stderr, _("ifconfig: Error resolving '%s' for pointopoint\n"), host); + goterr = 1; + spp++; + continue; +@@ -661,8 +714,12 @@ int main(int argc, char **argv) + memcpy((char *) &ifr.ifr_hwaddr, (char *) &sa, + sizeof(struct sockaddr)); + if (ioctl(skfd, SIOCSIFHWADDR, &ifr) < 0) { +- fprintf(stderr, "SIOCSIFHWADDR: %s\n", +- strerror(errno)); ++ if (errno == EBUSY) ++ fprintf(stderr, "SIOCSIFHWADDR: %s - you may need to down the interface\n", ++ strerror(errno)); ++ else ++ fprintf(stderr, "SIOCSIFHWADDR: %s\n", ++ strerror(errno)); + goterr = 1; + } + spp++; +@@ -681,12 +738,15 @@ int main(int argc, char **argv) + usage(); + *cp = 0; + } else { +- prefix_len = 0; ++ prefix_len = 128; + } + safe_strncpy(host, *spp, (sizeof host)); + if (inet6_aftype.input(1, host, + (struct sockaddr *) &sa6) < 0) { +- inet6_aftype.herror(host); ++ if (inet6_aftype.herror) ++ inet6_aftype.herror(host); ++ else ++ fprintf(stderr, _("ifconfig: Error resolving '%s' for add\n"), host); + goterr = 1; + spp++; + continue; +@@ -771,7 +831,7 @@ int main(int argc, char **argv) + usage(); + *cp = 0; + } else { +- prefix_len = 0; ++ prefix_len = 128; + } + safe_strncpy(host, *spp, (sizeof host)); + if (inet6_aftype.input(1, host, +@@ -800,6 +860,8 @@ int main(int argc, char **argv) + } + ifr6.ifr6_ifindex = ifr.ifr_ifindex; + ifr6.ifr6_prefixlen = prefix_len; ++ if (opt_v) ++ fprintf(stderr, "now deleting: ioctl(SIOCDIFADDR,{ifindex=%d,prefixlen=%ld})\n",ifr.ifr_ifindex,prefix_len); + if (ioctl(fd, SIOCDIFADDR, &ifr6) < 0) { + fprintf(stderr, "SIOCDIFADDR: %s\n", + strerror(errno)); +@@ -859,7 +921,7 @@ int main(int argc, char **argv) + usage(); + *cp = 0; + } else { +- prefix_len = 0; ++ prefix_len = 128; + } + safe_strncpy(host, *spp, (sizeof host)); + if (inet6_aftype.input(1, host, (struct sockaddr *) &sa6) < 0) { +@@ -903,7 +965,7 @@ int main(int argc, char **argv) + /* FIXME: sa is too small for INET6 addresses, inet6 should use that too, + broadcast is unexpected */ + if (ap->getmask) { +- switch (ap->getmask(host, &sa, NULL)) { ++ switch (ap->getmask(host, &samask, NULL)) { + case -1: + usage(); + break; +@@ -911,8 +973,8 @@ int main(int argc, char **argv) + if (didnetmask) + usage(); + +- goterr = set_netmask(skfd, &ifr, &sa); +- didnetmask++; ++ // remeber to set the netmask from samask later ++ neednetmask = 1; + break; + } + } +@@ -921,9 +983,11 @@ int main(int argc, char **argv) + exit(1); + } + if (ap->input(0, host, &sa) < 0) { +- ap->herror(host); +- fprintf(stderr, _("ifconfig: `--help' gives usage information.\n")); +- exit(1); ++ if (ap->herror) ++ ap->herror(host); ++ else ++ fprintf(stderr,_("ifconfig: error resolving '%s' to set address for af=%s\n"), host, ap->name); fprintf(stderr, ++ _("ifconfig: `--help' gives usage information.\n")); exit(1); + } + memcpy((char *) &ifr.ifr_addr, (char *) &sa, sizeof(struct sockaddr)); + { +@@ -980,6 +1044,14 @@ int main(int argc, char **argv) + spp++; + } + ++ if (neednetmask) { ++ goterr |= set_netmask(skfd, &ifr, &samask); ++ didnetmask++; ++ } ++ ++ if (opt_v && goterr) ++ fprintf(stderr, _("WARNING: at least one error occured. (%d)\n"), goterr); ++ + return (goterr); + } + --- net-tools-1.60.orig/debian/patches/Bug#254243-netstat.c-wide-opt.patch +++ net-tools-1.60/debian/patches/Bug#254243-netstat.c-wide-opt.patch @@ -0,0 +1,113 @@ +This patch adds the --wide option to netstat, to avoid truncation of ipv6 +addresses, by Luar Roji. (Bug #254243) + +Already in upstream's CVS (rev 1.60) + +Index: net-tools/man/en_US/netstat.8 +=================================================================== +--- net-tools.orig/man/en_US/netstat.8 ++++ net-tools/man/en_US/netstat.8 +@@ -8,7 +8,7 @@ + .\" Modified: Tuan Hoang tqhoang@bigfoot.com + .\" + .\" +-.TH NETSTAT 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual" ++.TH NETSTAT 8 "2008-11-16" "net\-tools" "Linux Programmer's Manual" + + .SH NAME + netstat \- Print network connections, routing tables, interface statistics, masquerade connections, and multicast memberships +@@ -118,6 +118,9 @@ Display summary statistics for each prot + .SS "\-\-verbose , \-v" + Tell the user what is going on by being verbose. Especially print some + useful information about unconfigured address families. ++.SS "\-\-wide , \-W" ++Do not truncate IP addresses by using output as wide as needed. This is ++optional for now to not break existing scripts. + .SS "\-\-numeric , \-n" + Show numerical addresses instead of trying to determine symbolic host, port + or user names. +Index: net-tools/netstat.c +=================================================================== +--- net-tools.orig/netstat.c ++++ net-tools/netstat.c +@@ -149,6 +149,7 @@ int flag_udp = 0; + int flag_igmp= 0; + int flag_rom = 0; + int flag_exp = 1; ++int flag_wide= 0; + int flag_prg = 0; + int flag_arg = 0; + int flag_ver = 0; +@@ -782,16 +783,20 @@ static void tcp_do_one(int lnr, const ch + get_sname(htons(local_port), "tcp", + flag_not & FLAG_NUM_PORT)); + +- if ((strlen(local_addr) + strlen(buffer)) > 22) +- local_addr[22 - strlen(buffer)] = '\0'; ++ if (!flag_wide) { ++ if ((strlen(local_addr) + strlen(buffer)) > 22) ++ local_addr[22 - strlen(buffer)] = '\0'; ++ } + + strcat(local_addr, ":"); + strcat(local_addr, buffer); + snprintf(buffer, sizeof(buffer), "%s", + get_sname(htons(rem_port), "tcp", flag_not & FLAG_NUM_PORT)); + +- if ((strlen(rem_addr) + strlen(buffer)) > 22) +- rem_addr[22 - strlen(buffer)] = '\0'; ++ if (!flag_wide) { ++ if ((strlen(rem_addr) + strlen(buffer)) > 22) ++ rem_addr[22 - strlen(buffer)] = '\0'; ++ } + + strcat(rem_addr, ":"); + strcat(rem_addr, buffer); +@@ -1511,9 +1516,9 @@ static void version(void) + + static void usage(void) + { +- fprintf(stderr, _("usage: netstat [-veenNcCF] [] -r netstat {-V|--version|-h|--help}\n")); +- fprintf(stderr, _(" netstat [-vnNcaeol] [ ...]\n")); +- fprintf(stderr, _(" netstat { [-veenNac] -i | [-cnNe] -M | -s }\n\n")); ++ fprintf(stderr, _("usage: netstat [-vWeenNcCF] [] -r netstat {-V|--version|-h|--help}\n")); ++ fprintf(stderr, _(" netstat [-vWnNcaeol] [ ...]\n")); ++ fprintf(stderr, _(" netstat { [-vWeenNac] -i | [-cWnNe] -M | -s }\n\n")); + + fprintf(stderr, _(" -r, --route display routing table\n")); + fprintf(stderr, _(" -i, --interfaces display interface table\n")); +@@ -1523,6 +1528,7 @@ static void usage(void) + fprintf(stderr, _(" -M, --masquerade display masqueraded connections\n\n")); + #endif + fprintf(stderr, _(" -v, --verbose be verbose\n")); ++ fprintf(stderr, _(" -W, --wide don't truncate IP addresses\n")); + fprintf(stderr, _(" -n, --numeric don't resolve names\n")); + fprintf(stderr, _(" --numeric-hosts don't resolve host names\n")); + fprintf(stderr, _(" --numeric-ports don't resolve port names\n")); +@@ -1572,6 +1578,7 @@ int main + {"programs", 0, 0, 'p'}, + {"verbose", 0, 0, 'v'}, + {"statistics", 0, 0, 's'}, ++ {"wide", 0, 0, 'W'}, + {"numeric", 0, 0, 'n'}, + {"numeric-hosts", 0, 0, '!'}, + {"numeric-ports", 0, 0, '@'}, +@@ -1591,7 +1598,7 @@ int main + getroute_init(); /* Set up AF routing support */ + + afname[0] = '\0'; +- while ((i = getopt_long(argc, argv, "MCFA:acdegphinNorstuVv?wxl64", longopts, &lop)) != EOF) ++ while ((i = getopt_long(argc, argv, "MCFA:acdegphinNorstuWVv?wxl64", longopts, &lop)) != EOF) + switch (i) { + case -1: + break; +@@ -1635,6 +1642,9 @@ int main + case 'i': + flag_int++; + break; ++ case 'W': ++ flag_wide++; ++ break; + case 'n': + flag_not |= FLAG_NUM; + break; --- net-tools-1.60.orig/debian/patches/netstat.c-assorted_changes.patch +++ net-tools-1.60/debian/patches/netstat.c-assorted_changes.patch @@ -0,0 +1,138 @@ +Unsyncable patches that are nevertheless already in upstream's CVS in the +following revisions: + +* 1.57: Enable netstat -s for IPv6 (Debian Bug #453859 from Varun Chandramohan) +* 1.55: use new page aliged proc_fopen for address families + +Index: net-tools/netstat.c +=================================================================== +--- net-tools.orig/netstat.c ++++ net-tools/netstat.c +@@ -6,7 +6,7 @@ + * NET-3 Networking Distribution for the LINUX operating + * system. + * +- * Version: $Id: netstat.c,v 1.54 2007/12/01 18:12:34 ecki Exp $ ++ * Version: $Id: netstat.c,v 1.55 2007/12/01 19:00:40 ecki Exp $ + * + * Authors: Fred Baumgarten, + * Fred N. van Kempen, +@@ -94,6 +94,7 @@ + #include "sockets.h" + #include "interface.h" + #include "util.h" ++#include "proc.h" + + #define PROGNAME_WIDTH 20 + +@@ -104,6 +105,8 @@ + /* prototypes for statistics.c */ + void parsesnmp(int, int, int); + void inittab(void); ++void parsesnmp6(int, int, int); ++void inittab6(void); + + typedef enum { + SS_FREE = 0, /* not allocated */ +@@ -153,7 +156,7 @@ int flag_ver = 0; + FILE *procinfo; + + #define INFO_GUTS1(file,name,proc) \ +- procinfo = fopen((file), "r"); \ ++ procinfo = proc_fopen((file)); \ + if (procinfo == NULL) { \ + if (errno != ENOENT) { \ + perror((file)); \ +@@ -174,7 +177,7 @@ FILE *procinfo; + #if HAVE_AFINET6 + #define INFO_GUTS2(file,proc) \ + lnr = 0; \ +- procinfo = fopen((file), "r"); \ ++ procinfo = proc_fopen((file)); \ + if (procinfo != NULL) { \ + do { \ + if (fgets(buffer, sizeof(buffer), procinfo)) \ +@@ -454,7 +457,7 @@ static int netrom_info(void) + char buffer[256], dev[16]; + int st, vs, vr, sendq, recvq, ret; + +- f = fopen(_PATH_PROCNET_NR, "r"); ++ f = proc_fopen(_PATH_PROCNET_NR); + if (f == NULL) { + if (errno != ENOENT) { + perror(_PATH_PROCNET_NR); +@@ -650,7 +653,7 @@ static void igmp_do_one(int lnr, const c + #if HAVE_AFX25 + static int x25_info(void) + { +- FILE *f=fopen(_PATH_PROCNET_X25, "r"); ++ FILE *f=proc_fopen(_PATH_PROCNET_X25); + char buffer[256],dev[16]; + int st,vs,vr,sendq,recvq,lci; + static char *x25_state[5]= +@@ -661,7 +664,7 @@ static int x25_info(void) + "ESTABLISHED", + "RECOVERY" + }; +- if(!(f=fopen(_PATH_PROCNET_X25, "r"))) ++ if(!(f=proc_fopen(_PATH_PROCNET_X25))) + { + if (errno != ENOENT) { + perror(_PATH_PROCNET_X25); +@@ -1269,7 +1272,7 @@ static int ax25_info(void) + N_("ESTABLISHED"), + N_("RECOVERY") + }; +- if (!(f = fopen(_PATH_PROCNET_AX25, "r"))) { ++ if (!(f = proc_fopen(_PATH_PROCNET_AX25))) { + if (errno != ENOENT) { + perror(_PATH_PROCNET_AX25); + return (-1); +@@ -1365,13 +1368,13 @@ static int ipx_info(void) + unsigned sport = 0, dport = 0; + struct stat s; + +- f = fopen(_PATH_PROCNET_IPX_SOCKET1, "r"); ++ f = proc_fopen(_PATH_PROCNET_IPX_SOCKET1); + if (!f) { + if (errno != ENOENT) { + perror(_PATH_PROCNET_IPX_SOCKET1); + return (-1); + } +- f = fopen(_PATH_PROCNET_IPX_SOCKET2, "r"); ++ f = proc_fopen(_PATH_PROCNET_IPX_SOCKET2); + + /* We need to check for directory */ + if (f) { +@@ -1728,9 +1731,28 @@ int main + } + + if (flag_sta) { +- inittab(); +- parsesnmp(flag_raw, flag_tcp, flag_udp); +- exit(0); ++ char *tmp1, *tmp2; ++ char buf[256]; ++ if (!afname[0]) { ++ inittab(); ++ parsesnmp(flag_raw, flag_tcp, flag_udp); ++ } else { ++ safe_strncpy(buf, afname, sizeof(buf)); ++ tmp1 = buf; ++ if ((tmp2 = index(tmp1, ','))) ++ printf("Multiple interface\n"); ++ else if(!strncmp(buf,"inet6",5)) { ++#if HAVE_AFINET6 ++ inittab6(); ++ parsesnmp6(flag_raw, flag_tcp, flag_udp); ++#else ++ printf("Address type not supported for stats\n"); ++#endif ++ } ++ else ++ printf("Address type not supported for stats\n"); ++ } ++ exit(1); + } + + if (flag_rou) { --- net-tools-1.60.orig/debian/patches/CVS-20081002-manpages_sync.patch +++ net-tools-1.60/debian/patches/CVS-20081002-manpages_sync.patch @@ -0,0 +1,1398 @@ +Sync from upstream's CVS for all manpages. Full log: + +2008-10-02 20:16 ecki + + * en_US/: arp.8, ethers.5, hostname.1, ifconfig.8, mii-tool.8, + nameif.8, netstat.8, plipconfig.8, rarp.8, route.8, slattach.8: + Fix hypen in man pages (Debian Bug#288343 from Andrew Moise) Move + man pages to sysadmin books update samples for route(8) (Debian + Bug#400844, #368697 Danny Rathjens) update see also for + ifconfig(8) (Debian Bug#365916 Dan Jacobs) + +2008-10-02 19:42 ecki + + * en_US/arp.8: fix some more hypens, changed book name and updated + date to 2008-10-03 + +2008-10-02 19:30 ecki + + * en_US/netstat.8: document the additional info in Send-Q/Recv-Q + with recent kernels for listening sockets. + +2008-06-16 21:18 ecki + + * en_US/arp.8: Spelling error (Debian Bug #486448 reported by + Volker Stolz) + +2007-12-02 01:42 ecki + + * de_DE/netstat.8, en_US/netstat.8, fr_FR/netstat.8, + pt_BR/netstat.8: fixed interfaceS spelling (Debian Bug #435690). + Thanks Alan and Liu Xing. + +2007-12-01 15:19 ecki + + * en_US/arp.8: cleanup man page (arp.8 2007-12-01) + +2007-11-07 20:01 ecki + + * en_US/ifconfig.8: Fix Formatting Bug for ifconfig.8 (Debian + Bug#450432 reported by Ivan Shmakov) + +2006-10-10 02:58 ecki + + * en_US/slattach.8: formatting fixes from Justin Pryzby in Debian + Bug #391495 + +2005-09-04 00:51 ecki + + * en_US/slattach.8 (tags: net-tools-1_65): Spelling fix for Debian + Bug#326124 reported by A. Costa. + +2005-06-30 16:26 ecki + + * en_US/ifconfig.8: minor formatting + +2005-06-30 15:42 ecki + + * en_US/ifconfig.8: added pointer to iptables(8) not only + ipchains(8) (Toralf Frster) + +2005-05-16 01:30 ecki + + * en_US/arp.8: desupport dontpub in arp.8 and arp -? (Debian Bug + #203396) + +2005-05-13 19:34 ecki + + * en_US/ethers.5: line break fix debian bug #305637 + +2005-05-13 19:31 ecki + + * en_US/mii-tool.8: spellig fix debian bug #305638 + +2005-05-13 19:28 ecki + + * en_US/route.8: spelling fix debian bug #305640 + +2004-06-29 17:28 ecki + + * en_US/netstat.8 (tags: net-tools-1_65): little formatting fix + +2004-03-28 18:35 ecki + + * en_US/mii-tool.8 (tags: net-tools-1_65): added diagnostics + (closes debian bug #239229: EINVAL for downed interface) + +2003-10-02 17:06 ecki + + * en_US/: netstat.8, route.8 (tags: net-tools-1_65): fixes for man + page bugs reported by Hugh Redelmeier. + +2003-05-28 17:59 ecki + + * en_US/: ifconfig.8 (tags: net-tools-1_65), netstat.8: fixed + wording of binary units counters and interpunctuation in + netstat(8) + +2003-02-25 18:03 ecki + + * en_US/ifconfig.8: Marc Lehmann pointed out that binary prefixes + are made up by the IEEE and are not official SI yet. (Debian Bug + #182478) + +2003-02-08 19:49 ecki + + * en_US/ifconfig.8: add a comment about alias interfaces and + primary interface of scopes (intended to fix Debian wishlist bug + #179780 and normal bug #64458) + +2002-07-03 20:40 ecki + + * en_US/ifconfig.8: there is no such thing as -i option for + ifconfig removed variable, fixed usage, added options to english + man page + +2002-02-20 11:31 ecki + + * de_DE/netstat.8 (tags: net-tools-1_65): fixed typo in german man + page and added a comment that man page is currently not + completely up-to-date. + +2001-11-24 02:56 ecki + + * de_DE/netstat.8, en_US/netstat.8: fixed minor errors in netstat.8 + man page (--numeric-users was missing, some font problems and + --interfaces has no argument (Debian Bug #120475) + thanks for the report to Uwe Hermann. + +2001-11-11 22:46 ecki + + * en_US/ifconfig.8: added documentation about SI prefixes for + decimal numbers + +2001-11-05 10:12 ecki + + * en_US/rarp.8, fr_FR/arp.8, fr_FR/hostname.1, fr_FR/ifconfig.8, + fr_FR/netstat.8, fr_FR/rarp.8, pt_BR/rarp.8 (utags: + net-tools-1_65): changed troff syntax according to ESR's report + +2001-11-05 10:07 ecki + + * en_US/arp.8 (tags: net-tools-1_65): fixed troff syntax, as + reported by ESR. Did not changed the date of the man page. + +2001-06-29 04:47 ecki + + * en_US/ifconfig.8: made man page more useful and added right link + for irq conflicts in ifconfig.8 + +2001-06-29 00:50 ecki + + * fr_FR/netstat.8: man page fix CLOSED -> CLOSE + +2001-06-29 00:15 ecki + + * en_US/netstat.8: fixed CLOSED -> CLOSE in french and english + manpage as of bug report from Matthew Tippett + +Index: net-tools/man/de_DE/netstat.8 +=================================================================== +--- net-tools.orig/man/de_DE/netstat.8 ++++ net-tools/man/de_DE/netstat.8 +@@ -9,7 +9,7 @@ + .\" Modified: Tuan Hoang tuan@optimus.mitre.org + .\" + .\" +-.TH NETSTAT 8 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer" ++.TH NETSTAT 8 "2007-12-02" "net-tools" "Handbuch f\(:ur Linuxprogrammierer" + + .SH NAME + netstat \- Anzeige von Netzwerksverbindungen, Routentabellen, Schnittstellenstatistiken, maskierten Verbindungen, Netlink-Nachrichten und Mitgliedschaft in Multicastgruppen +@@ -44,7 +44,6 @@ netstat \- Anzeige von Netzwerksverbindu + .B netstat + .RB [ \-veenpac ] + .RB { \-\-interfaces | \-i } +-.RI [ Schnittstelle ] + + .PP + +@@ -68,6 +67,8 @@ netstat \- Anzeige von Netzwerksverbindu + .SH BESCHREIBUNG + .B Netstat + zeigt Informationen des Linux Netzwerkssystems an. ++.PP ++.B Bitte beachten Sie, dass der Inhalt der deutschen man-page nicht vollst\(:andig ist, im Moment. + + .SS "(no option)" + Ohne Optionen zeigt +@@ -103,18 +104,17 @@ benutzt das Ausgabeformat von + Wegen Details siehe + .BR route (8). + +-.SS "\-i, \-\-interface \fISchnittstelle\fI" ++.SS "\-i, \-\-interfaces" + Wird die + .BR -i ", " --interfaces +-Option verwendet, so wird eine Tabelle aller (oder der angegebenen +-.IR Schnittstellen ) ++Option verwendet, so wird eine Tabelle aller Schnittstellen + ausgedruckt. Die Ausgabe ist im Format von + .B "ifconfig -e" + und wird in + .BR ifconfig (8) + beschrieben. + .B "netstat -ei" +-druckt eine Tabelle oder einen Eintrag f\(:ur einen einzelnes Interface wie ++druckt eine Tabelle f\(:ur Interfaces wie + .BR ifconfig . + Die + .B -a +@@ -182,7 +182,7 @@ Dies hat den gleichen Effekt wie die Lan + und + .BR \-\-ddp. + +-.SS "\-c, \-\-continous" ++.SS "\-c, \-\-continuous" + Mit dieser Option wiederholt + .B netstat + im Sekundenabstand die Ausgabe, bis es abgebrochen wird. +Index: net-tools/man/en_US/arp.8 +=================================================================== +--- net-tools.orig/man/en_US/arp.8 ++++ net-tools/man/en_US/arp.8 +@@ -1,56 +1,111 @@ +-.TH ARP 8 "5 Jan 1999" "net-tools" "Linux Programmer's Manual" ++.TH ARP 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual" + .SH NAME + arp \- manipulate the system ARP cache + .SH SYNOPSIS + .B arp + .RB [ \-vn ] +-.RB [ "\-H type" ] +-.RB [ "-i if" ] +-.B -a +-.RB [ hostname ] ++.RB [ \-H ++.IR type ] ++.RB [ \-i ++.IR if ] ++.RB [ \-a ] ++.RI [ hostname ] + .PP + .B arp + .RB [ \-v ] +-.RB [ "\-i if" ] +-.B "\-d hostname" ++.RB [ \-i ++.IR if ] ++.B \-d ++.I hostname + .RB [ pub ] + .PP + .B arp + .RB [ \-v ] +-.RB [ "\-H type" ] +-.RB [ "\-i if" ] +-.B -s hostname hw_addr ++.RB [ \-H ++.IR type ] ++.RB [ \-i ++.IR if ] ++.B \-s ++.I hostname hw_addr + .RB [ temp ] + .PP + .B arp + .RB [ \-v ] +-.RB [ "\-H type" ] +-.RB [ "\-i if" ] +-.B -s hostname hw_addr +-.RB [ "netmask nm" ] ++.RB [ \-H ++.IR type ] ++.RB [ \-i ++.IR if ] ++.B \-s ++.I hostname hw_addr ++.RB [ netmask ++.IR nm ] + .B pub + .PP + .B arp + .RB [ \-v ] +-.RB [ "\-H type" ] +-.RB [ "\-i if" ] +-.B -Ds hostname ifa +-.RB [ "netmask nm" ] ++.RB [ \-H ++.IR type ] ++.RB [ \-i ++.IR if ] ++.B \-Ds ++.I hostname ++.I ifname ++.RB [ netmask ++.IR nm ] + .B pub + .PP + .B arp + .RB [ \-vnD ] +-.RB [ "\-H type" ] +-.RB [ "-i if" ] +-.B -f [filename] ++.RB [ \-H ++.IR type ] ++.RB [ \-i ++.IR if ] ++.B \-f ++.RI [ filename ] + + .SH DESCRIPTION + .B Arp +-manipulates the kernel's ARP cache in various ways. The primary options +-are clearing an address mapping entry and manually setting up one. For +-debugging purposes, the ++manipulates or displays the kernel's IPv4 network neighbour cache. It can add ++entries to the table, delete one or display the current content. ++ ++.B ARP ++stands for Address Resolution Protocol, which is used to find the media ++access control address of a network neighbour for a given IPv4 Address. ++.SH MODES + .B arp +-program also allows a complete dump of the ARP cache. ++with no mode specifier will print the current content of the table. It is ++possible to limit the number of entries printed, by specifying an hardware ++address type, interface name or host address. ++ ++.B arp -d ++.I address ++will delete a ARP table entry. Root or netadmin priveledge is required to do ++this. The entry is found by IP address. If a hostname is given, it will be ++resolved before looking up the entry in the ARP table. ++ ++.B arp -s ++.I address hw_addr ++is used to set up a new table entry. The format of the ++.I hw_addr ++parameter is dependent on the hardware class, but for most classes one can ++assume that the usual presentation can be used. For the Ethernet class, ++this is 6 bytes in hexadecimal, separated by colons. When adding proxy arp ++entries (that is those with the ++.BR pub lish ++flag set a ++.B netmask ++may be specified to proxy arp for entire subnets. This is not good ++practice, but is supported by older kernels because it can be ++useful. If the ++.B temp ++flag is not supplied entries will be permanent stored into the ARP ++cache. To simplyfy setting up entries for one of your own network interfaces, you can use the ++.B "arp \-Ds" ++.I address ifname ++form. In that case the hardware address is taken from the interface with the ++specified name. ++ ++.br + .SH OPTIONS + .TP + .B "\-v, \-\-verbose" +@@ -60,7 +115,7 @@ Tell the user what is going on by being + shows numerical addresses instead of trying to determine symbolic host, port + or user names. + .TP +-.B "\-H type, \-\-hw-type type" ++.B "\-H type, \-\-hw\-type type" + When setting or reading the ARP cache, this optional parameter tells + .B arp + which class of entries it should check for. The default value of +@@ -76,21 +131,13 @@ Other values might include network techn + and + .RB "NET/ROM (" netrom ")." + .TP +-.B "\-a [hostname], \-\-display [hostname]" +-Shows the entries of the specified hosts. If the +-.B hostname +-parameter is not used, +-.B all +-entries will be displayed. +-.TP +-.B "\-d hostname, \-\-delete hostname" +-Remove any entry for the specified host. This can be used if the +-indicated host is brought down, for example. ++.B \-a ++Use alternate BSD style output format (with no fixed columns). + .TP + .B "\-D, \-\-use-device" +-Use the interface +-.BR ifa "'s" +-hardware address. ++Instead of a hw_addr, the given argument is the name of an interface. ++.B arp ++will use the MAC address of that interface for the table entry. This is usually the best option to set up a proxy ARP entry to yourself. + .TP + .B "\-i If, \-\-device If" + Select an interface. When dumping the ARP cache only entries matching +@@ -106,33 +153,15 @@ be answered. + .B NOTE: + This has to be different from the interface to which the IP + datagrams will be routed. +-.TP +-.B "\-s hostname hw_addr, \-\-set hostname" +-Manually create an ARP address mapping entry for host +-.B hostname +-with hardware address set to +-.B hw_addr +-. The format of the hardware address is dependent on the hardware +-class, but for most classes one can assume that the usual presentation +-can be used. For the Ethernet class, this is 6 bytes in hexadecimal, +-separated by colons. When adding proxy arp entries (that is those with +-the +-.BR pub lish +-flag set a +-.B netmask +-may be specified to proxy arp for entire subnets. This is not good +-practice, but is supported by older kernels because it can be +-useful. If the +-.B temp +-flag is not supplied entries will be permanent stored into the ARP +-cache. +-.br + .B NOTE: + As of kernel 2.2.0 it is no longer possible to set an ARP entry for an + entire subnet. Linux instead does automagic proxy arp when a route + exists and it is forwarding. See + .BR arp (7) +-for details. ++for details. Also the ++.B dontpub ++option which is available for delete and set operations cannot be ++used with 2.4 and newer kernels. + .TP + .B "\-f filename, \-\-file filename" + Similar to the +@@ -167,8 +196,18 @@ flag. Permanent entries are marked with + and published entries have the + .B P + flag. ++.SH EXAMPLES ++.B /usr/sbin/arp -i eth0 -Ds 10.0.0.2 eth1 pub ++ ++This will answer ARP requests for 10.0.0.2 on eth0 with the MAC address for ++eth1. ++ ++.B /usr/sbin/arp -i eth1 -d 10.0.0.1 ++ ++Delete the ARP table entry for 10.0.0.1 on interface eth1. This will match ++published proxy ARP entries and permanent entries. + .SH FILES +-.I /proc/net/arp, ++.I /proc/net/arp + .br + .I /etc/networks + .br +@@ -178,5 +217,4 @@ flag. + .SH SEE ALSO + rarp(8), route(8), ifconfig(8), netstat(8) + .SH AUTHORS +-Fred N. van Kempen, with a lot of improvements +-from net-tools Maintainer Bernd Eckenfels . ++Fred N. van Kempen , Bernd Eckenfels . +Index: net-tools/man/en_US/ethers.5 +=================================================================== +--- net-tools.orig/man/en_US/ethers.5 ++++ net-tools/man/en_US/ethers.5 +@@ -1,4 +1,4 @@ +-.TH ETHERS 5 "April 26th, 1996" "" "File formats" ++.TH ETHERS 5 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual" + .SH NAME \"{{{roff}}}\"{{{ + ethers \- Ethernet address to IP number database + .\"}}} +@@ -7,17 +7,17 @@ ethers \- Ethernet address to IP number + IP numbers, one line for each IP number: + .sp + .RS +-\fIEthernet-address\fP \fIIP-number\fP ++\fIEthernet\-address\fP \fIIP\-number\fP + .RE + .sp +-The two items are separated by any number of SPACE and/or TAB char +-acters. A \fB#\fP at the beginning of a line starts a comment +-which extends to the end of the line. The \fIEthernet-address\fP is ++The two items are separated by any number of SPACE and/or TAB characters. ++A \fB#\fP at the beginning of a line starts a comment ++which extends to the end of the line. The \fIEthernet\-address\fP is + written as + .IR x : x : x : x : x : x , + where \fIx\fP is a hexadecimal number between \fB0\fP and \fBff\fP + which represents one byte of the address, which is in network byte +-order (big-endian). The \fIIP-number\fP may be a hostname which ++order (big-endian). The \fIIP\-number\fP may be a hostname which + can be resolved by DNS or a dot separated number. + .\"}}} + .SH EXAMPLES \"{{{ +Index: net-tools/man/en_US/hostname.1 +=================================================================== +--- net-tools.orig/man/en_US/hostname.1 ++++ net-tools/man/en_US/hostname.1 +@@ -1,4 +1,4 @@ +-.TH HOSTNAME 1 "28 Jan 1996" "net-tools" "Linux Programmer's Manual" ++.TH HOSTNAME 1 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual" + + .SH NAME + hostname \- show or set the system's host name +@@ -23,7 +23,7 @@ nodename \- show or set the system's DEC + .RB [ \-f ] + .RB [ \-\-fqdn ] + .RB [ \-i ] +-.RB [ \-\-ip-address ] ++.RB [ \-\-ip\-address ] + .RB [ \-\-long ] + .RB [ \-s ] + .RB [ \-\-short ] +@@ -181,7 +181,7 @@ part of the FQDN) in the \fI/etc/hosts\f + .I "\-h, \-\-help" + Print a usage message and exit. + .TP +-.I "\-i, \-\-ip-address" ++.I "\-i, \-\-ip\-address" + Display the IP address(es) of the host. + .TP + .I "\-n, \-\-node" +@@ -205,9 +205,9 @@ Display the NIS domain name. If a parame + .SH FILES + .B /etc/hosts + .SH AUTHOR +-Peter Tobias, ++Peter Tobias, + .br +-Bernd Eckenfels, (NIS and manpage). ++Bernd Eckenfels, (NIS and manpage). + .br + Steve Whitehouse, (DECnet support and manpage). + +Index: net-tools/man/en_US/ifconfig.8 +=================================================================== +--- net-tools.orig/man/en_US/ifconfig.8 ++++ net-tools/man/en_US/ifconfig.8 +@@ -1,10 +1,10 @@ +-.TH IFCONFIG 8 "14 August 2000" "net-tools" "Linux Programmer's Manual" ++.TH IFCONFIG 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual" + .SH NAME + ifconfig \- configure a network interface + .SH SYNOPSIS +-.B "ifconfig [interface]" ++.B "ifconfig [-v] [-a] [-s] [interface]" + .br +-.B "ifconfig interface [aftype] options | address ..." ++.B "ifconfig [-v] interface [aftype] options | address ..." + .SH DESCRIPTION + .B Ifconfig + is used to configure the kernel-resident network interfaces. It is +@@ -18,7 +18,7 @@ a single + .B interface + argument is given, it displays the status of the given interface + only; if a single +-.B -a ++.B \-a + argument is given, it displays the status of all interfaces, even + those that are down. Otherwise, it configures an interface. + +@@ -41,11 +41,27 @@ supported address families include + (AMPR Packet radio). + .SH OPTIONS + .TP ++.B -a ++display all interfaces which are currently available, even if down ++.TP ++.B -s ++display a short list (like netstat -i) ++.TP ++.B -v ++be more verbose for some error conditions ++.TP + .B interface + The name of the interface. This is usually a driver name followed by + a unit number, for example + .B eth0 +-for the first Ethernet interface. ++for the first Ethernet interface. If your kernel supports alias interfaces, ++you can specify them with ++.B eth0:0 ++for the first alias of eth0. You can use them to assign a second address. To ++delete an alias interface use ++.BR "ifconfig eth0:0 down" . ++Note: for every scope (i.e. same net with address/netmask combination) all ++aliases are deleted, if you delete the first (primary). + .TP + .B up + This flag causes the interface to be activated. It is implicitly +@@ -122,13 +138,13 @@ are + can be used to tell the driver to auto-sense the media. Again, not + all drivers can do this. + .TP +-.B "[-]broadcast [addr]" ++.B "[\-]broadcast [addr]" + If the address argument is given, set the protocol broadcast + address for this interface. Otherwise, set (or clear) the + .B IFF_BROADCAST + flag for the interface. + .TP +-.B "[-]pointopoint [addr]" ++.B "[\-]pointopoint [addr]" + This keyword enables the + .B point-to-point + mode of an interface, meaning that it is a direct link between two +@@ -173,11 +189,20 @@ alias interfaces anymore. The statistics + are shared with all alias addresses on the same device. If you want per-address + statistics you should add explicit accounting + rules for the address using the +-.BR ipchains(8) ++.BR ipchains (8) ++or ++.BR iptables (8) + command. + .LP +-Interrupt problems with Ethernet device drivers fail with EAGAIN. See +-.I http://cesdis.gsfc.nasa.gov/linux/misc/irq-conflict.html ++Since net\-tools 1.60\-4 ifconfig is printing byte counters and human readable ++counters with IEC 60027-2 units. So 1 KiB are 2^10 byte. Note, the numbers ++are truncated to one decimal (which can by quite a large error if you ++consider 0.1 PiB is 112.589.990.684.262 bytes :) ++.LP ++Interrupt problems with Ethernet device drivers fail with EAGAIN ++.I (SIOCSIIFLAGS: Resource temporarily unavailable) ++it is most likely a interrupt conflict. See ++.I http://www.scyld.com/expert/irq\-conflict.html + for more information. + .SH FILES + .I /proc/net/socket +@@ -189,7 +214,9 @@ for more information. + While appletalk DDP and IPX addresses will be displayed they cannot be + altered by this command. + .SH SEE ALSO +-route(8), netstat(8), arp(8), rarp(8), ipchains(8) ++route(8), netstat(8), arp(8), rarp(8), ipchains(8), iptables(8), ifup(8), interfaces(5). ++.br ++http://physics.nist.gov/cuu/Units/binary.html - Prefixes for binary multiples + .SH AUTHORS + Fred N. van Kempen, + .br +@@ -198,3 +225,5 @@ Alan Cox, + Phil Blundell, + .br + Andi Kleen ++.br ++Bernd Eckenfels, +Index: net-tools/man/en_US/mii-tool.8 +=================================================================== +--- net-tools.orig/man/en_US/mii-tool.8 ++++ net-tools/man/en_US/mii-tool.8 +@@ -1,13 +1,13 @@ + .\" Copyright (C) 2000 David A. Hinds -- dhinds@pcmcia.sourceforge.org + .\" mii-tool.8 1.5 2000/04/25 22:58:19 + .\" +-.TH MII-TOOL 8 "2000/04/25 22:58:19" "net-tools" ++.TH MII\-TOOL 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual" + + .SH NAME +-mii-tool \- view, manipulate media-independent interface status ++mii\-tool \- view, manipulate media-independent interface status + + .SH SYNOPSIS +-.B mii-tool ++.B mii\-tool + [\fB\-v\fR, \fB\-\-verbose\fR] + [\fB\-V\fR, \fB\-\-version\fR] + [\fB\-R\fR, \fB\-\-reset\fR] +@@ -32,12 +32,12 @@ single-speed hubs, are unable to autoneg + devices, the MII protocol also allows for establishing a link by + simply detecting either a 10baseT or 100baseT link beat. The \fB\-F\fR + or \fB\-\-force\fR options can be used to force the MII to operate in +-one mode, instead of autonegotiating. The \fB\-A\fR and \fB-F\fR ++one mode, instead of autonegotiating. The \fB\-A\fR and \fB\-F\fR + options are mutually exclusive. + .PP + The default short output reports the negotiated link speed and link + status for each interface. If an interface or interfaces are not +-specified on the command line, then \fBmii-tool\fR will check any ++specified on the command line, then \fBmii\-tool\fR will check any + available interfaces from \fBeth0\fR through \fBeth7\fR. + .SH OPTIONS + .TP +@@ -59,7 +59,7 @@ Watch interface(s) and report changes in + interfaces are polled at one second intervals. + .TP + \fB\-l\fR, \fB\-\-log\fR +-Used with \fB-w\fR, records link status changes in the system log ++Used with \fB\-w\fR, records link status changes in the system log + instead of printing on standard output. + .TP + \fB\-F\fI media\fR, \fB\-\-force=\fImedia\fR +@@ -72,7 +72,24 @@ media technologies. Multiple technologi + commas. Valid media are \fB100baseT4\fR, \fB100baseTx-FD\fR, + \fB100baseTx-HD\fR, \fB10baseT-FD\fR, and \fB10baseT-HD\fR. + ++.SH DIAGNOSTICS ++.TP ++SIOCGMIIPHY on 'eth?' failed: Invalid argument ++If the interface is not running (up), kernel will refuse to report its link state. ++.TP ++SIOCGMIIPHY on 'eth?' failed: Operation not permitted ++Most kernels restrict access to root. ++.TP ++SIOCGMIIPHY on 'eth?' failed: No such device ++This error is shown, if the kernel does not know about the named device. ++.TP ++SIOCGMIIPHY on 'eth?' failed: Operation not supported ++The interface in question does not support MII queries. Most likely, it does not have ++MII transceivers, at all. ++ + .SH AUTHORS + David Hinds \- dhinds@pcmcia.sourceforge.org + .br + Donald Becker \- becker@scyld.com ++.br ++Bernd Eckenfels \- ecki@debian.org +Index: net-tools/man/en_US/nameif.8 +=================================================================== +--- net-tools.orig/man/en_US/nameif.8 ++++ net-tools/man/en_US/nameif.8 +@@ -1,10 +1,10 @@ +-.TH NAMEIF 8 "18 Oct 2000" "net-tools" "Linux's Administrator's Manual" ++.TH NAMEIF 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual" + .SH NAME + nameif \- name network interfaces based on MAC addresses + .SH SYNOPSIS +-.B "nameif [-c configfile] [-s]" ++.B "nameif [\-c configfile] [\-s]" + .br +-.B "nameif [-c configfile] [-s] {interface macaddress}" ++.B "nameif [\-c configfile] [\-s] {interface macaddress}" + .SH DESCRIPTION + .B nameif + renames network interfaces based on mac addresses. When no arguments are +@@ -18,11 +18,11 @@ looks for the interface with the given M + name given. + + When the +-.I -s ++.I \-s + argument is given all error messages go to the syslog. + + When the +-.I -c ++.I \-c + argument is given with a file name that file is read instead of /etc/mactab. + + .SH NOTES +Index: net-tools/man/en_US/netstat.8 +=================================================================== +--- net-tools.orig/man/en_US/netstat.8 ++++ net-tools/man/en_US/netstat.8 +@@ -8,7 +8,7 @@ + .\" Modified: Tuan Hoang tqhoang@bigfoot.com + .\" + .\" +-.TH NETSTAT 8 "19 December 2000" "net-tools" "Linux Programmer's Manual" ++.TH NETSTAT 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual" + + .SH NAME + netstat \- Print network connections, routing tables, interface statistics, masquerade connections, and multicast memberships +@@ -23,7 +23,7 @@ netstat \- Print network connections, ro + .RB [ \-\-listening | \-l ] + .RB [ \-\-all | \-a ] + .RB [ \-\-numeric | \-n ] +-.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ] ++.RB [ \-\-numeric\-hosts "] [" \-\-numeric\-ports "] [" \-\-numeric\-users ] + .RB [ \-\-symbolic | \-N ] + .RB [ \-\-extend | \-e [ \-\-extend | \-e] ] + .RB [ \-\-timers | \-o ] +@@ -37,31 +37,30 @@ netstat \- Print network connections, ro + .RB [ \-\-extend | \-e [ \-\-extend | \-e] ] + .RB [ \-\-verbose | \-v ] + .RB [ \-\-numeric | \-n ] +-.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ] ++.RB [ \-\-numeric\-hosts "] [" \-\-numeric\-ports "] [" \-\-numeric\-users ] + .RB [ \-\-continuous | \-c] + .P + .B netstat + .RB { \-\-interfaces | \-i } +-.RI [ iface ] + .RB [ \-\-all | \-a ] + .RB [ \-\-extend | \-e [ \-\-extend | \-e] ] + .RB [ \-\-verbose | \-v ] + .RB [ \-\-program | \-p ] + .RB [ \-\-numeric | \-n ] +-.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ] ++.RB [ \-\-numeric-hosts "] [" \-\-numeric-ports "] [" \-\-numeric-users ] + .RB [ \-\-continuous | \-c] + .P + .B netstat + .RB { \-\-groups | \-g } + .RB [ \-\-numeric | \-n ] +-.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ] ++.RB [ \-\-numeric\-hosts "] [" \-\-numeric\-ports "] [" \-\-numeric\-users ] + .RB [ \-\-continuous | \-c] + .P + .B netstat + .RB { \-\-masquerade | \-M } + .RB [ \-\-extend | \-e ] + .RB [ \-\-numeric | \-n ] +-.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ] ++.RB [ \-\-numeric\-hosts "] [" \-\-numeric\-ports "] [" \-\-numeric\-users ] + .RB [ \-\-continuous | \-c] + .P + .B netstat +@@ -78,6 +77,8 @@ netstat \- Print network connections, ro + .P + .IR address_family_options : + .PP ++.RB [ -4 ] ++.RB [ -6 ] + .RB [ \-\-protocol= { inet , unix , ipx , ax25 , netrom , ddp }[, ...] ] + .RB [ \-\-unix | \-x ] + .RB [ \-\-inet | \-\-ip ] +@@ -98,12 +99,17 @@ displays a list of open sockets. If you + address families, then the active sockets of all configured address + families will be printed. + .SS "\-\-route , \-r" +-Display the kernel routing tables. ++Display the kernel routing tables. See the description in ++.BR route (8) ++for details. ++.B netstat -r ++and ++.B route -e ++produce the same output. + .SS "\-\-groups , \-g" + Display multicast group membership information for IPv4 and IPv6. +-.SS "\-\-interface=\fIiface \fR, \fB\-i" +-Display a table of all network interfaces, or the specified +-.IR iface ) . ++.SS "\-\-interfaces, \-i" ++Display a table of all network interfaces. + .SS "\-\-masquerade , \-M" + Display a list of masqueraded connections. + .SS "\-\-statistics , \-s" +@@ -115,13 +121,13 @@ useful information about unconfigured ad + .SS "\-\-numeric , \-n" + Show numerical addresses instead of trying to determine symbolic host, port + or user names. +-.SS "\-\-numeric-hosts" ++.SS "\-\-numeric\-hosts" + shows numerical host addresses but does not affect the resolution of + port or user names. +-.SS "\-\-numeric-ports" ++.SS "\-\-numeric\-ports" + shows numerical port numbers but does not affect the resolution of + host or user names. +-.SS "\-\-numeric-users" ++.SS "\-\-numeric\-users" + shows numerical user IDs but does not affect the resolution of host or + port names. + +@@ -164,23 +170,24 @@ Show the PID and name of the program to + Show only listening sockets. (These are omitted by default.) + .SS "\-a, \-\-all" + Show both listening and non-listening sockets. With the +-.B --interfaces +-option, show interfaces that are not marked ++.B \-\-interfaces ++option, show interfaces that are not up + .SS "\-F" + Print routing information from the FIB. (This is the default.) + .SS "\-C" + Print routing information from the route cache. +-.IR UP . + .P + .SH OUTPUT + .P + .SS Active Internet connections \fR(TCP, UDP, raw)\fR + .SS "Proto" + The protocol (tcp, udp, raw) used by the socket. +-.SS "Recv-Q" +-The count of bytes not copied by the user program connected to this socket. +-.SS "Send-Q" +-The count of bytes not acknowledged by the remote host. ++.SS "Recv\-Q" ++Established: The count of bytes not copied by the user program connected to this socket. ++Listening: Since Kernel 2.6.18 this column contains the current syn backlog. ++.SS "Send\-Q" ++Established: The count of bytes not acknowledged by the remote host. ++Listening: Since Kernel 2.6.18 this column contains the maximum size of the syn backlog. + .SS "Local Address" + Address and port number of the local end of the socket. Unless the + .BR \-\-numeric " (" \-n ) +@@ -221,7 +228,7 @@ TIME_WAIT + The socket is waiting after close to handle packets still in the network. + .TP + .I +-CLOSED ++CLOSE + The socket is not being used. + .TP + .I +@@ -255,7 +262,7 @@ The username or the user id (UID) of the + .SS "PID/Program name" + Slash-separated pair of the process id (PID) and process name of the + process that owns the socket. +-.B --program ++.B \-\-program + causes this column to be included. You will also need + .I superuser + privileges to see this information on sockets you don't own. This +@@ -358,7 +365,7 @@ to the socket. + .PP + .SH NOTES + Starting with Linux release 2.2 +-.B netstat -i ++.B netstat \-i + does not show interface statistics for alias interfaces. To get per + alias interface counters you need to setup explicit rules using the + .BR ipchains(8) +@@ -438,12 +445,12 @@ as it is viewed. This is unlikely to occ + .P + .SH AUTHORS + The netstat user interface was written by Fred Baumgarten +- the man page basically ++, the man page basically + by Matt Welsh . It was updated by + Alan Cox but could do with a bit more + work. It was updated again by Tuan Hoang + . + .br +-The man page and the command included in the net-tools ++The man page and the command included in the net\-tools + package is totally rewritten by Bernd Eckenfels + . +Index: net-tools/man/en_US/plipconfig.8 +=================================================================== +--- net-tools.orig/man/en_US/plipconfig.8 ++++ net-tools/man/en_US/plipconfig.8 +@@ -1,4 +1,4 @@ +-.TH PLIPCONFIG 8 "17 February 1995" "" "" ++.TH PLIPCONFIG 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual" + .SH NAME + plipconfig \- fine tune PLIP device parameters + .SH SYNOPSIS +Index: net-tools/man/en_US/rarp.8 +=================================================================== +--- net-tools.orig/man/en_US/rarp.8 ++++ net-tools/man/en_US/rarp.8 +@@ -1,20 +1,20 @@ +-.TH RARP 8 "4 August 1997" "net-tools" "Linux Programmer's Manual" ++.TH RARP 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual" + .SH NAME + rarp \- manipulate the system RARP table + .SH SYNOPSIS +-.B "rarp [-V] [--version] [-h] [--help]" ++.B "rarp [\-V] [\-\-version] [\-h] [\-\-help]" + .br +-.B "rarp -a" ++.B "rarp \-a" + .br +-.B "rarp [-v] -d hostname ..." ++.B "rarp [\-v] \-d hostname ..." + .br +-.B "rarp [-v] [-t type] -s hostname hw_addr" ++.B "rarp [\-v] [\-t type] \-s hostname hw_addr" + .SH NOTE + .P + This program is obsolete. From version 2.3, the Linux kernel + no longer contains RARP support. For a replacement RARP daemon, see + .I +-ftp://ftp.dementia.org/pub/net-tools ++ftp://ftp.dementia.org/pub/net\-tools + .SH DESCRIPTION + .B Rarp + manipulates the kernel's RARP table in various ways. The primary options +@@ -61,8 +61,8 @@ Remove all RARP entries for the specifie + Create a RARP address mapping entry for host + .B hostname + with hardware address set to +-.B hw_addr +-. The format of the hardware address is dependent on the hardware ++.BR hw_addr . ++The format of the hardware address is dependent on the hardware + class, but for most classes one can assume that the usual presentation + can be used. For the Ethernet class, this is 6 bytes in hexadecimal, + separated by colons. +Index: net-tools/man/en_US/route.8 +=================================================================== +--- net-tools.orig/man/en_US/route.8 ++++ net-tools/man/en_US/route.8 +@@ -1,4 +1,4 @@ +-.TH ROUTE 8 "2 January 2000" "net-tools" "Linux Programmer's Manual" ++.TH ROUTE 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual" + .SH NAME + route \- show / manipulate the IP routing table + .SH SYNOPSIS +@@ -51,7 +51,7 @@ If] + .RB [ \-V ] + .RB [ \-\-version ] + .RB [ \-h ] +-.RB [ \--help ] ++.RB [ \-\-help ] + .SH DESCRIPTION + .B Route + manipulates the kernel's IP routing tables. Its primary use is to set +@@ -73,16 +73,16 @@ displays the current contents of the rou + .SH OPTIONS + .TP + .B \-A family +-use the specified address family (eg `inet'; use `route --help' for a full ++use the specified address family (eg `inet'; use `route \-\-help' for a full + list). + + .TP +-.B -F ++.B \-F + operate on the kernel's FIB (Forwarding Information Base) routing + table. + This is the default. + .TP +-.B -C ++.B \-C + operate on the kernel's routing cache. + + .TP +@@ -96,7 +96,7 @@ nameserver has vanished. + .TP + .B \-e + use +-.BR netstat (8)-format ++.BR netstat (8)\-format + for displaying the routing table. + .B \-ee + will generate a very long line with all parameters from the routing table. +@@ -117,7 +117,7 @@ the + .B target + is a network. + .TP +-.B -host ++.B \-host + the + .B target + is a host. +@@ -141,7 +141,7 @@ set the metric field in the routing tabl + set the TCP Maximum Segment Size (MSS) for connections over this route + to M bytes. + The default is the device MTU minus headers, or a lower MTU when path mtu +-discovery occured. This setting can be used to force smaller TCP packets on the ++discovery occurred. This setting can be used to force smaller TCP packets on the + other end when path mtu discovery does not work (usually because of + misconfigured firewalls that block ICMP Fragmentation Needed) + .TP +@@ -179,24 +179,27 @@ modifiers (metric - netmask - gw - dev) + + .SH EXAMPLES + .TP +-.B route add -net 127.0.0.0 +-adds the normal loopback entry, using netmask 255.0.0.0 (class A net, +-determined from the destination address) and associated with the +-"lo" device (assuming this device was prviously set up correctly with ++.B route add \-net 127.0.0.0 netmask 255.0.0.0 dev lo ++adds the normal loopback entry, using netmask 255.0.0.0 and associated with the ++"lo" device (assuming this device was previously set up correctly with + .BR ifconfig (8)). + + .TP +-.B route add -net 192.56.76.0 netmask 255.255.255.0 dev eth0 +-adds a route to the network 192.56.76.x via +-"eth0". The Class C netmask modifier is not really necessary here because +-192.* is a Class C IP address. The word "dev" can be omitted here. ++.B route add \-net 192.56.76.0 netmask 255.255.255.0 dev eth0 ++adds a route to the local network 192.56.76.x via ++"eth0". The word "dev" can be omitted here. + + .TP +-.B route add default gw mango-gw ++.B route del default ++deletes the current default route, which is labeled "default" or 0.0.0.0 ++in the destination field of the current routing table. ++ ++.TP ++.B route add default gw mango\-gw + adds a default route (which will be used if no other route matches). +-All packets using this route will be gatewayed through "mango-gw". The ++All packets using this route will be gatewayed through "mango\-gw". The + device which will actually be used for that route depends on how we +-can reach "mango-gw" - the static route to "mango-gw" will have to be ++can reach "mango\-gw" - the static route to "mango\-gw" will have to be + set up before. + + .TP +@@ -205,18 +208,18 @@ Adds the route to the "ipx4" host via th + "ipx4" is the SLIP host). + + .TP +-.B route add -net 192.57.66.0 netmask 255.255.255.0 gw ipx4 ++.B route add \-net 192.57.66.0 netmask 255.255.255.0 gw ipx4 + This command adds the net "192.57.66.x" to be gatewayed through the former + route to the SLIP interface. + + .TP +-.B route add -net 224.0.0.0 netmask 240.0.0.0 dev eth0 ++.B route add \-net 224.0.0.0 netmask 240.0.0.0 dev eth0 + This is an obscure one documented so people know how to do it. This sets + all of the class D (multicast) IP routes to go via "eth0". This is the + correct normal configuration line with a multicasting kernel. + + .TP +-.B route add -net 10.0.0.0 netmask 255.0.0.0 reject ++.B route add \-net 10.0.0.0 netmask 255.0.0.0 reject + This installs a rejecting route for the private network "10.x.x.x." + + .LP +@@ -282,14 +285,14 @@ recent kernels, but may be needed by rou + Number of references to this route. (Not used in the Linux kernel.) + .TP + .B Use +-Count of lookups for the route. Depending on the use of -F and -C this will +-be either route cache misses (-F) or hits (-C). ++Count of lookups for the route. Depending on the use of \-F and \-C this will ++be either route cache misses (\-F) or hits (\-C). + .TP + .B Iface + Interface to which packets for this route will be sent. + .TP + .B MSS +-Default maximum segement size for TCP connections over this route. ++Default maximum segment size for TCP connections over this route. + .TP + .B Window + Default window size for TCP connections over this route. +@@ -323,4 +326,4 @@ for Linux was originally written by Fred + Linus Torvalds for pl15. Alan Cox added the mss and window options for + Linux 1.1.22. irtt support and merged with netstat from Bernd Eckenfels. + .SH AUTHOR +-Currently maintained by Phil Blundell . ++Currently maintained by Phil Blundell and Bernd Eckenfels . +Index: net-tools/man/en_US/slattach.8 +=================================================================== +--- net-tools.orig/man/en_US/slattach.8 ++++ net-tools/man/en_US/slattach.8 +@@ -1,8 +1,8 @@ +-.TH SLATTACH 8 "12 Feb 1994" "" "" ++.TH SLATTACH 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual" + .SH NAME + slattach \- attach a network interface to a serial line + .SH SYNOPSIS +-.B "slattach [-dehlLmnqv] [-c command] [-p proto] [-s speed] [tty]" ++.B "slattach [\-dehlLmnqv] [\-c command] [\-p proto] [\-s speed] [tty]" + .br + .SH DESCRIPTION + .B Slattach +@@ -11,47 +11,48 @@ is a tiny little program that can be use + you to use it for point-to-point links to other computers. + .SH OPTIONS + .TP +-.B "[-c command]" ++.B "[\-c command]" + Execute + .B command + when the line is hung up. This can be used to run scripts or re-establish + connections when a link goes down. + .TP +-.B "[-d]" ++.B "[\-d]" + Enable debugging output. Useful when determining why a given + setup doesn't work. + .TP +-.B "[-h]" ++.B "[\-h]" + Exit when the carrier is lost. This works on both /dev/tty and /dev/cua + devices by directly monitoring the carrier status every 15 seconds. +-.B "[-v]" ++.TP ++.B "[\-v]" + Enable verbose output. Useful in shell scripts. + .TP +-.B "[-q]" ++.B "[\-q]" + Operate in quiet mode - no messages at all. + .TP +-.B "[-l]" ++.B "[\-l]" + Create an UUCP-style lockfile for the device in /var/lock. + .TP +-.B "[-n]" ++.B "[\-n]" + Equivalent to the "mesg n" command. + .TP +-.B "[-m]" ++.B "[\-m]" + Do \fBnot\fP initialize the line into 8 bits raw mode. + .TP +-.B "[-e]" ++.B "[\-e]" + Exit right after initializing device, instead of waiting for the +-line to hangup. ++line to hang up. + .TP +-.B "[-L]" ++.B "[\-L]" + Enable 3 wire operation. The terminal is moved into CLOCAL mode, + carrier watching is disabled. + .TP +-.B "[-p proto]" ++.B "[\-p proto]" + Set a specific kind of protocol to use on the line. The default + is set to +-.B "cslip" +-, i.e. compressed SLIP. Other possible values are ++.BR "cslip" , ++i.e. compressed SLIP. Other possible values are + .B "slip" + (normal SLIP), + .B "adaptive" +@@ -70,7 +71,7 @@ to be active on the line. For kiss conne + .B axattach + program should be used. + .TP +-.B "[-s speed]" ++.B "[\-s speed]" + Set a specific line speed, other than the default. + .PP + If no arguments are given, the current terminal line (usually: the +Index: net-tools/man/fr_FR/arp.8 +=================================================================== +--- net-tools.orig/man/fr_FR/arp.8 ++++ net-tools/man/fr_FR/arp.8 +@@ -140,8 +140,8 @@ pour un sous rseau entier. + Similaire l'option + .B \-s + , mais cette fois les informations d'adresses sont prises dans le fichier +-.B nom_de_fichier +-. Ceci peut tre utilis si les entres ARP configurer sont ++.BR nom_de_fichier . ++Ceci peut tre utilis si les entres ARP configurer sont + nombreuses. Le nom du fichier de donnes est trs souvent nomm + .B /etc/ethers + , mais ce n'est pas officiel. +@@ -160,8 +160,8 @@ en notation dcimale pointe. + .LP + Chaque entre complte se trouvant dans le cache ARP est marque de + l'indicateur +-.B C +-. Les entres permanentes sont marques de l'indicateur ++.BR C . ++Les entres permanentes sont marques de l'indicateur + .B M + et les entres 'pub' ont l'indicateur + .B P +Index: net-tools/man/fr_FR/hostname.1 +=================================================================== +--- net-tools.orig/man/fr_FR/hostname.1 ++++ net-tools/man/fr_FR/hostname.1 +@@ -84,8 +84,8 @@ Appel sans argument, le programme affic + .LP + .B hostname + fournit le nom du systme tel qu'il est retourn par la fonction +-.BR getdomainname (2) +-. Ceci est connu comme nom de domaine YP/NIS du systme. ++.BR getdomainname (2). ++Ceci est connu comme nom de domaine YP/NIS du systme. + + + .LP +@@ -145,8 +145,8 @@ Le nom de domaine DNS est la partie suiv + .LP + La faon dont vous pouvez le changer dpend de la configuration + (habituellement dans +-.IR /etc/host.conf ) +-. Si le fichier 'hosts' est analys avant d'interroger le DNS ou ++.IR /etc/host.conf ). ++Si le fichier 'hosts' est analys avant d'interroger le DNS ou + NIS) vous pouvez le changer dans le fichier + .IR /etc/hosts . + +Index: net-tools/man/fr_FR/ifconfig.8 +=================================================================== +--- net-tools.orig/man/fr_FR/ifconfig.8 ++++ net-tools/man/fr_FR/ifconfig.8 +@@ -60,14 +60,14 @@ le signe moins (\-) est prsent, l'optio + .TP + .B "[\-]promisc" + Valide ou invalide le mode +-.B promiscuous +-. S'il est valid, tous les paquets circulant sur le rseau ++.BR promiscuous . ++S'il est valid, tous les paquets circulant sur le rseau + seront reus sur cette interface. + .TP + .B "[\-]allmulti" + Valide ou invalide le fonctionnement de l'interface en mode +-.B all-multicast +-. S'il est valid, tous les paquets multicast circulant sur le rseau ++.BR all-multicast . ++S'il est valid, tous les paquets multicast circulant sur le rseau + seront reus sur cette interface. + .TP + .B "metric N" +Index: net-tools/man/fr_FR/netstat.8 +=================================================================== +--- net-tools.orig/man/fr_FR/netstat.8 ++++ net-tools/man/fr_FR/netstat.8 +@@ -8,7 +8,7 @@ + .\" Modified: Tuan Hoang tuan@optimus.mitre.org + .\" + .\" +-.TH NETSTAT 8 "25 Fv 1999" "net-tools" "Linux Programmer's Manual" ++.TH NETSTAT 8 "2007-12-02" "net-tools" "Linux Programmer's Manual" + + .SH NAME + netstat \- Affiche les connexions rseau, les tables de routage, les +@@ -106,7 +106,7 @@ Veuillez consulter + .BR route (8) + pour plus de dtails. + +-.SS "\-i, \-\-interface \fIiface\fI" ++.SS "\-i, \-\-interfaces \fIiface\fI" + Si vous utilisez l'option + .BR -i ", " --interfaces + , une table de toutes (ou de l'interface +@@ -118,8 +118,8 @@ mme que celui de la commande + .BR ifconfig (8). + .B "netstat -ei" + affiche une table ou une seule entre d'interface comme la commande +-.B ifconfig +-. Avec le paramtre ++.BR ifconfig . ++Avec le paramtre + .B -a + , vous pouvez inclure les interfaces qui ne sont pas configures (c.a.d qui + n'ont pas l'indicateur +@@ -249,7 +249,7 @@ La socket attend le traitement de tous l + avant d'entreprendre la fermeture. + .TP + .I +-CLOSED ++CLOSE + La socket n'est pas utilise. + .TP + .I +@@ -409,8 +409,7 @@ Affiche le chemin correspondant l'atta + Depuis la version 2.2 du noyau, netstat -i n'affiche plus les statistiques + des interfaces alias. Pour obtenir les compteurs par interface alias, vous + devez dfinir des rgles spcifiques l'aide de la commande +-.BR ipchains(8) +-. ++.BR ipchains (8). + + .SH FICHIERS + .ta +Index: net-tools/man/fr_FR/rarp.8 +=================================================================== +--- net-tools.orig/man/fr_FR/rarp.8 ++++ net-tools/man/fr_FR/rarp.8 +@@ -55,8 +55,8 @@ Supprime toutes les entres RARP relativ + Cre manuellement une correspondance d'adresses RARP pour l'hte + .B nom_d_hte + avec l'adresse matrielle +-.B adr_materielle +-. Le format de l'adresse matrielle est dpendant du matriel, ++.BR adr_materielle . ++Le format de l'adresse matrielle est dpendant du matriel, + mais pour la plupart on peut considrer que la prsentation classique + peut tre utilise. Pour la classe Ethernet, c'est 6 octets en hexadcimal, + spars par des double-points. +Index: net-tools/man/pt_BR/netstat.8 +=================================================================== +--- net-tools.orig/man/pt_BR/netstat.8 ++++ net-tools/man/pt_BR/netstat.8 +@@ -8,7 +8,7 @@ + .\" Traduzido para portugus por Arnaldo Carvalho de Melo + .\" Revisado por Jorge Luiz Godoy Filho + .\" +-.TH NETSTAT 8 "19 de maio de 1997" "net-tools" "Manual do Programador Linux" ++.TH NETSTAT 8 "2007-12-02" "net-tools" "Manual do Programador Linux" + + .SH NOME + netstat \- Mostra conexes de rede, tabelas de roteamento, estatsticas de interface e conexes +@@ -97,7 +97,7 @@ Por favor veja + .BR route (8) + para maiores detalhes. + +-.SS "\-i, \-\-interface \fIiface\fI" ++.SS "\-i, \-\-interfaces \fIiface\fI" + Se voc usar a opo + .BR -i ", " --interfaces + , uma tabela de todas (ou da +Index: net-tools/man/pt_BR/rarp.8 +=================================================================== +--- net-tools.orig/man/pt_BR/rarp.8 ++++ net-tools/man/pt_BR/rarp.8 +@@ -50,8 +50,8 @@ mquina indicada for desligada, por exem + Cria um mapeamento de endereos RARP para a mquina + .B mquina + com endereo de hardware configurado para +-.B endereo_hardware +-. O formato do endereo de hardware depende da classe do hardware, mas ++.B endereo_hardware. ++O formato do endereo de hardware depende da classe do hardware, mas + para a maioria das classes voc pode assumir que a apresentao usual pode + ser usada. Para a classe Ethernet, so 6 bytes em hexadecimal, separados + por dois pontos (:). --- net-tools-1.60.orig/debian/patches/CVS-20070316-netstat.c_sync.patch +++ net-tools-1.60/debian/patches/CVS-20070316-netstat.c_sync.patch @@ -0,0 +1,484 @@ +Sync with upstream's CVS until rev 1.53 + +Revision 1.53 - Thu Mar 16 08:59:42 2006 UTC by ecki + +Debian Bug #260587 fixed, make sure the Columns state and user in netstat -t -e +are separated by blanks. This may cause scripts to fail parsing by column width. +Better wait for the script compatible output. Problems exists for ESTABLIHED +state only. + +Revision 1.52 - Tue Aug 2 22:28:10 2005 UTC by ecki +make ipx in 2.6 work (perhaps). +Fixes http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=318503 + +Revision 1.51 - Thu Jun 3 22:27:37 2004 UTC by ecki +avoid namespace conflicts + +Revision 1.50 - Tue Dec 10 00:56:41 2002 UTC by ecki + - change columns of netstat -i/ifconfig -s to avoid run-into (Stefan Illner) + - prevent segfault on protocol families without host error member + - use /128 as default prefix if not specified instead of /0 + +Revision 1.49 - Tue Jul 23 21:08:16 2002 UTC by ecki +allow support for -6 and -4 options to netstat, also allow both, and +print out tcp6, udp6 or raw6 if it is a v6 socket + +Revision 1.48 - Thu Jun 27 18:04:02 2002 UTC by ecki +fixing debian bug #151130 reported by Dan Jacobson where netstat +was printing 81 chars in a line for tcp, udp and raw. + +Revision 1.47 - Tue Feb 19 01:12:49 2002 UTC by ecki +inodes in unix domain sockets are now padded to 8chars (netstat -x) + +Revision 1.46 - Tue Feb 19 00:55:35 2002 UTC by ecki +fixes debian bug#134600 (sigsegv in netstat on negative inoded in +/proc/net/udp) on "netstat -lpu". Thanks to Arnaud Giersch for the report. + +Revision 1.45 - Sun Nov 25 06:48:50 2001 UTC by ecki +this fixes Debian Bug #109164 (netstat -ci does only print stats once). It +also renames add_interface and free_interface list to if_cache_add/free. +I am not sure if removing the "proc_read" flag will harm performance, looks +likt this check is never triggereed. Anyway, we need more efficient b-search +sooner or later. + +Revision 1.44 - Sun Aug 26 05:25:21 2001 UTC by ak +Fix netstat -- don't print all v4 addresses as v4-mapped-in-v6. + +Index: net-tools/netstat.c +=================================================================== +--- net-tools.orig/netstat.c ++++ net-tools/netstat.c +@@ -6,7 +6,7 @@ + * NET-3 Networking Distribution for the LINUX operating + * system. + * +- * Version: $Id: netstat.c,v 1.43 2001/04/15 14:41:17 pb Exp $ ++ * Version: $Id: netstat.c,v 1.54 2007/12/01 18:12:34 ecki Exp $ + * + * Authors: Fred Baumgarten, + * Fred N. van Kempen, +@@ -216,7 +216,7 @@ FILE *procinfo; + + static struct prg_node { + struct prg_node *next; +- int inode; ++ unsigned long inode; + char name[PROGNAME_WIDTH]; + } *prg_hash[PRG_HASH_SIZE]; + +@@ -249,7 +249,7 @@ static char prg_cache_loaded = 0; + /* NOT working as of glibc-2.0.7: */ + #undef DIRENT_HAVE_D_TYPE_WORKS + +-static void prg_cache_add(int inode, char *name) ++static void prg_cache_add(unsigned long inode, char *name) + { + unsigned hi = PRG_HASHIT(inode); + struct prg_node **pnp,*pn; +@@ -272,7 +272,7 @@ static void prg_cache_add(int inode, cha + strcpy(pn->name,name); + } + +-static const char *prg_cache_get(int inode) ++static const char *prg_cache_get(unsigned long inode) + { + unsigned hi=PRG_HASHIT(inode); + struct prg_node *pn; +@@ -295,16 +295,18 @@ static void prg_cache_clear(void) + prg_cache_loaded=0; + } + +-static void extract_type_1_socket_inode(const char lname[], long * inode_p) { ++static int extract_type_1_socket_inode(const char lname[], unsigned long * inode_p) { + + /* If lname is of the form "socket:[12345]", extract the "12345" + as *inode_p. Otherwise, return -1 as *inode_p. + */ + +- if (strlen(lname) < PRG_SOCKET_PFXl+3) *inode_p = -1; +- else if (memcmp(lname, PRG_SOCKET_PFX, PRG_SOCKET_PFXl)) *inode_p = -1; +- else if (lname[strlen(lname)-1] != ']') *inode_p = -1; +- else { ++ if (strlen(lname) < PRG_SOCKET_PFXl+3) return(-1); ++ ++ if (memcmp(lname, PRG_SOCKET_PFX, PRG_SOCKET_PFXl)) return(-1); ++ if (lname[strlen(lname)-1] != ']') return(-1); ++ ++ { + char inode_str[strlen(lname + 1)]; /* e.g. "12345" */ + const int inode_str_len = strlen(lname) - PRG_SOCKET_PFXl - 1; + char *serr; +@@ -313,37 +315,41 @@ static void extract_type_1_socket_inode( + inode_str[inode_str_len] = '\0'; + *inode_p = strtol(inode_str,&serr,0); + if (!serr || *serr || *inode_p < 0 || *inode_p >= INT_MAX) +- *inode_p = -1; ++ return(-1); + } ++ return(0); + } + + + +-static void extract_type_2_socket_inode(const char lname[], long * inode_p) { ++static int extract_type_2_socket_inode(const char lname[], unsigned long * inode_p) { + + /* If lname is of the form "[0000]:12345", extract the "12345" + as *inode_p. Otherwise, return -1 as *inode_p. + */ + +- if (strlen(lname) < PRG_SOCKET_PFX2l+1) *inode_p = -1; +- else if (memcmp(lname, PRG_SOCKET_PFX2, PRG_SOCKET_PFX2l)) *inode_p = -1; +- else { ++ if (strlen(lname) < PRG_SOCKET_PFX2l+1) return(-1); ++ if (memcmp(lname, PRG_SOCKET_PFX2, PRG_SOCKET_PFX2l)) return(-1); ++ ++ { + char *serr; + + *inode_p=strtol(lname + PRG_SOCKET_PFX2l,&serr,0); + if (!serr || *serr || *inode_p < 0 || *inode_p >= INT_MAX) +- *inode_p = -1; ++ return(-1); + } ++ return(0); + } + + + ++ + static void prg_cache_load(void) + { + char line[LINE_MAX],eacces=0; + int procfdlen,fd,cmdllen,lnamelen; + char lname[30],cmdlbuf[512],finbuf[PROGNAME_WIDTH]; +- long inode; ++ unsigned long inode; + const char *cs,*cmdlp; + DIR *dirproc=NULL,*dirfd=NULL; + struct dirent *direproc,*direfd; +@@ -386,11 +392,9 @@ static void prg_cache_load(void) + lnamelen=readlink(line,lname,sizeof(lname)-1); + lname[lnamelen] = '\0'; /*make it a null-terminated string*/ + +- extract_type_1_socket_inode(lname, &inode); +- +- if (inode < 0) extract_type_2_socket_inode(lname, &inode); +- +- if (inode < 0) continue; ++ if (extract_type_1_socket_inode(lname, &inode) < 0) ++ if (extract_type_2_socket_inode(lname, &inode) < 0) ++ continue; + + if (!cmdlp) { + if (procfdlen - PATH_FD_SUFFl + PATH_CMDLINEl >= +@@ -527,10 +531,10 @@ static void finish_this_one(int uid, uns + + if (flag_exp > 1) { + if (!(flag_not & FLAG_NUM_USER) && ((pw = getpwuid(uid)) != NULL)) +- printf("%-10s ", pw->pw_name); ++ printf(" %-10s ", pw->pw_name); + else +- printf("%-10d ", uid); +- printf("%-10ld ",inode); ++ printf(" %-10d ", uid); ++ printf("%-10lu ",inode); + } + if (flag_prg) + printf("%-" PROGNAME_WIDTHs "s",prg_cache_get(inode)); +@@ -705,6 +709,7 @@ static void tcp_do_one(int lnr, const ch + unsigned long rxq, txq, time_len, retr, inode; + int num, local_port, rem_port, d, state, uid, timer_run, timeout; + char rem_addr[128], local_addr[128], timers[64], buffer[1024], more[512]; ++ char *protname; + struct aftype *ap; + #if HAVE_AFINET6 + struct sockaddr_in6 localaddr, remaddr; +@@ -719,12 +724,13 @@ static void tcp_do_one(int lnr, const ch + return; + + num = sscanf(line, +- "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %ld %512s\n", ++ "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %lu %512s\n", + &d, local_addr, &local_port, rem_addr, &rem_port, &state, + &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more); + + if (strlen(local_addr) > 8) { + #if HAVE_AFINET6 ++ protname = "tcp6"; + /* Demangle what the kernel gives us */ + sscanf(local_addr, "%08X%08X%08X%08X", + &in6.s6_addr32[0], &in6.s6_addr32[1], +@@ -740,6 +746,7 @@ static void tcp_do_one(int lnr, const ch + remaddr.sin6_family = AF_INET6; + #endif + } else { ++ protname = "tcp"; + sscanf(local_addr, "%X", + &((struct sockaddr_in *) &localaddr)->sin_addr.s_addr); + sscanf(rem_addr, "%X", +@@ -813,8 +820,8 @@ static void tcp_do_one(int lnr, const ch + timer_run, (double) time_len / HZ, retr, timeout); + break; + } +- printf("tcp %6ld %6ld %-23s %-23s %-12s", +- rxq, txq, local_addr, rem_addr, _(tcp_state[state])); ++ printf("%-4s %6ld %6ld %-*s %-*s %-11s", ++ protname, rxq, txq, netmax(23,strlen(local_addr)), local_addr, netmax(23,strlen(rem_addr)), rem_addr, _(tcp_state[state])); + + finish_this_one(uid,inode,timers); + } +@@ -831,6 +838,7 @@ static void udp_do_one(int lnr, const ch + char buffer[8192], local_addr[64], rem_addr[64]; + char *udp_state, timers[64], more[512]; + int num, local_port, rem_port, d, state, timer_run, uid, timeout; ++ char *protname; + #if HAVE_AFINET6 + struct sockaddr_in6 localaddr, remaddr; + char addr6[INET6_ADDRSTRLEN]; +@@ -847,13 +855,14 @@ static void udp_do_one(int lnr, const ch + + more[0] = '\0'; + num = sscanf(line, +- "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %ld %512s\n", ++ "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %lu %512s\n", + &d, local_addr, &local_port, + rem_addr, &rem_port, &state, + &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more); + + if (strlen(local_addr) > 8) { + #if HAVE_AFINET6 ++ protname="udp6"; + sscanf(local_addr, "%08X%08X%08X%08X", + &in6.s6_addr32[0], &in6.s6_addr32[1], + &in6.s6_addr32[2], &in6.s6_addr32[3]); +@@ -868,6 +877,7 @@ static void udp_do_one(int lnr, const ch + remaddr.sin6_family = AF_INET6; + #endif + } else { ++ protname="udp"; + sscanf(local_addr, "%X", + &((struct sockaddr_in *) &localaddr)->sin_addr.s_addr); + sscanf(rem_addr, "%X", +@@ -953,8 +963,8 @@ static void udp_do_one(int lnr, const ch + retr, timeout); + break; + } +- printf("udp %6ld %6ld %-23s %-23s %-12s", +- rxq, txq, local_addr, rem_addr, udp_state); ++ printf("%-4s %6ld %6ld %-23s %-23s %-11s", ++ protname, rxq, txq, local_addr, rem_addr, udp_state); + + finish_this_one(uid,inode,timers); + } +@@ -971,6 +981,7 @@ static void raw_do_one(int lnr, const ch + char buffer[8192], local_addr[64], rem_addr[64]; + char timers[64], more[512]; + int num, local_port, rem_port, d, state, timer_run, uid, timeout; ++ char *protname; + #if HAVE_AFINET6 + struct sockaddr_in6 localaddr, remaddr; + char addr6[INET6_ADDRSTRLEN]; +@@ -987,12 +998,13 @@ static void raw_do_one(int lnr, const ch + + more[0] = '\0'; + num = sscanf(line, +- "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %ld %512s\n", ++ "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %lu %512s\n", + &d, local_addr, &local_port, rem_addr, &rem_port, &state, + &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more); + + if (strlen(local_addr) > 8) { + #if HAVE_AFINET6 ++ protname = "raw6"; + sscanf(local_addr, "%08X%08X%08X%08X", + &in6.s6_addr32[0], &in6.s6_addr32[1], + &in6.s6_addr32[2], &in6.s6_addr32[3]); +@@ -1007,6 +1019,7 @@ static void raw_do_one(int lnr, const ch + remaddr.sin6_family = AF_INET6; + #endif + } else { ++ protname = "raw"; + sscanf(local_addr, "%X", + &((struct sockaddr_in *) &localaddr)->sin_addr.s_addr); + sscanf(rem_addr, "%X", +@@ -1074,8 +1087,8 @@ static void raw_do_one(int lnr, const ch + retr, timeout); + break; + } +- printf("raw %6ld %6ld %-23s %-23s %-12d", +- rxq, txq, local_addr, rem_addr, state); ++ printf("%-4s %6ld %6ld %-23s %-23s %-11d", ++ protname, rxq, txq, local_addr, rem_addr, state); + + finish_this_one(uid,inode,timers); + } +@@ -1099,9 +1112,9 @@ static void unix_do_one(int nr, const ch + static int has = 0; + char path[MAXPATHLEN], ss_flags[32]; + char *ss_proto, *ss_state, *ss_type; +- int num, state, type, inode; ++ int num, state, type; + void *d; +- unsigned long refcnt, proto, flags; ++ unsigned long refcnt, proto, flags, inode; + + if (nr == 0) { + if (strstr(line, "Inode")) +@@ -1109,14 +1122,14 @@ static void unix_do_one(int nr, const ch + return; + } + path[0] = '\0'; +- num = sscanf(line, "%p: %lX %lX %lX %X %X %d %s", ++ num = sscanf(line, "%p: %lX %lX %lX %X %X %lu %s", + &d, &refcnt, &proto, &flags, &type, &state, &inode, path); + if (num < 6) { + fprintf(stderr, _("warning, got bogus unix line.\n")); + return; + } + if (!(has & HAS_INODE)) +- snprintf(path,sizeof(path),"%d",inode); ++ snprintf(path,sizeof(path),"%lu",inode); + + if (!flag_all) { + if ((state == SS_UNCONNECTED) && (flags & SO_ACCEPTCON)) { +@@ -1208,9 +1221,9 @@ static void unix_do_one(int nr, const ch + printf("%-5s %-6ld %-11s %-10s %-13s ", + ss_proto, refcnt, ss_flags, ss_type, ss_state); + if (has & HAS_INODE) +- printf("%-6d ",inode); ++ printf("%-8lu ",inode); + else +- printf("- "); ++ printf("- "); + if (flag_prg) + printf("%-" PROGNAME_WIDTHs "s",(has & HAS_INODE?prg_cache_get(inode):"-")); + puts(path); +@@ -1350,18 +1363,37 @@ static int ipx_info(void) + char sad[50], dad[50]; + struct sockaddr sa; + unsigned sport = 0, dport = 0; +- +- if (!(f = fopen(_PATH_PROCNET_IPX, "r"))) { +- if (errno != ENOENT) { +- perror(_PATH_PROCNET_IPX); +- return (-1); +- } +- if (flag_arg || flag_ver) +- ESYSNOT("netstat", "AF IPX"); +- if (flag_arg) +- return (1); +- else +- return (0); ++ struct stat s; ++ ++ f = fopen(_PATH_PROCNET_IPX_SOCKET1, "r"); ++ if (!f) { ++ if (errno != ENOENT) { ++ perror(_PATH_PROCNET_IPX_SOCKET1); ++ return (-1); ++ } ++ f = fopen(_PATH_PROCNET_IPX_SOCKET2, "r"); ++ ++ /* We need to check for directory */ ++ if (f) { ++ fstat(fileno(f), &s); ++ if (!S_ISREG(s.st_mode)) { ++ fclose(f); ++ f=NULL; ++ } ++ } ++ ++ if (!f) { ++ if (errno != ENOENT) { ++ perror(_PATH_PROCNET_IPX_SOCKET2); ++ return (-1); ++ } ++ if (flag_arg || flag_ver) ++ ESYSNOT("netstat", "AF IPX"); ++ if (flag_arg) ++ return (1); ++ else ++ return (0); ++ } + } + printf(_("Active IPX sockets\nProto Recv-Q Send-Q Local Address Foreign Address State")); /* xxx */ + if (flag_exp > 1) +@@ -1381,7 +1413,7 @@ static int ipx_info(void) + sscanf(st, "%X", &sport); /* net byt order */ + sport = ntohs(sport); + } else { +- EINTERN("netstat.c", _PATH_PROCNET_IPX " sport format error"); ++ EINTERN("netstat.c", "ipx socket format error in source port"); + return (-1); + } + nc = 0; +@@ -1391,7 +1423,7 @@ static int ipx_info(void) + sscanf(st, "%X", &dport); /* net byt order */ + dport = ntohs(dport); + } else { +- EINTERN("netstat.c", _PATH_PROCNET_IPX " dport format error"); ++ EINTERN("netstat.c", "ipx soket format error in destination port"); + return (-1); + } + } else +@@ -1449,7 +1481,7 @@ static int iface_info(void) + } + if (flag_exp < 2) { + ife_short = 1; +- printf(_("Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg\n")); ++ printf(_("Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg\n")); + } + + if (for_all_interfaces(do_if_print, &flag_all) < 0) { +@@ -1457,7 +1489,7 @@ static int iface_info(void) + exit(1); + } + if (flag_cnt) +- free_interface_list(); ++ if_cache_free(); + else { + close(skfd); + skfd = -1; +@@ -1503,7 +1535,7 @@ static void usage(void) + fprintf(stderr, _(" -C, --cache display routing cache instead of FIB\n\n")); + + fprintf(stderr, _(" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --netrom\n")); +- fprintf(stderr, _(" =Use '-A ' or '--'; default: %s\n"), DFLT_AF); ++ fprintf(stderr, _(" =Use '-6|-4' or '-A ' or '--'; default: %s\n"), DFLT_AF); + fprintf(stderr, _(" List of possible address families (which support routing):\n")); + print_aflist(1); /* 1 = routeable */ + exit(E_USAGE); +@@ -1514,7 +1546,7 @@ int main + (int argc, char *argv[]) { + int i; + int lop; +- struct option longopts[] = ++ static struct option longopts[] = + { + AFTRANS_OPTS, + {"version", 0, 0, 'V'}, +@@ -1556,7 +1588,7 @@ int main + getroute_init(); /* Set up AF routing support */ + + afname[0] = '\0'; +- while ((i = getopt_long(argc, argv, "MCFA:acdegphinNorstuVv?wxl", longopts, &lop)) != EOF) ++ while ((i = getopt_long(argc, argv, "MCFA:acdegphinNorstuVv?wxl64", longopts, &lop)) != EOF) + switch (i) { + case -1: + break; +@@ -1624,6 +1656,14 @@ int main + case 'o': + flag_opt++; + break; ++ case '6': ++ if (aftrans_opt("inet6")) ++ exit(1); ++ break; ++ case '4': ++ if (aftrans_opt("inet")) ++ exit(1); ++ break; + case 'V': + version(); + /*NOTREACHED */ --- net-tools-1.60.orig/debian/patches/CVS-20081003-config.in_sync.patch +++ net-tools-1.60/debian/patches/CVS-20081003-config.in_sync.patch @@ -0,0 +1,74 @@ +Sync with upstream CVS, complete log: + +Revision 1.24 - Fri Oct 3 02:09:57 2008 UTC by ecki +moved H suport for Infiniband to the right section + +Revision 1.23 - Fri Oct 3 01:55:07 2008 UTC by ecki +Add hardware support for InfiniBand (Debian Bug #294252 Tom Duffy from Sun). + +Revision 1.22 - Fri Jun 4 00:06:50 2004 UTC by ecki +default all options which work with recent systems to on + +Revision 1.21 - Mon Nov 12 02:12:05 2001 UTC by ecki +added EUI64 Hardware Address Family +Daniel Stodden + +Index: net-tools/config.in +=================================================================== +--- net-tools.orig/config.in ++++ net-tools/config.in +@@ -49,16 +49,16 @@ bool 'Does your system support GNU gette + * + bool 'UNIX protocol family' HAVE_AFUNIX y + bool 'INET (TCP/IP) protocol family' HAVE_AFINET y +-bool 'INET6 (IPv6) protocol family' HAVE_AFINET6 n ++bool 'INET6 (IPv6) protocol family' HAVE_AFINET6 y + bool 'Novell IPX/SPX protocol family' HAVE_AFIPX y + bool 'Appletalk DDP protocol family' HAVE_AFATALK y + bool 'AX25 (packet radio) protocol family' HAVE_AFAX25 y + bool 'NET/ROM (packet radio) protocol family' HAVE_AFNETROM y +-bool 'Rose (packet radio) protocol family' HAVE_AFROSE n ++bool 'Rose (packet radio) protocol family' HAVE_AFROSE y + bool 'X.25 (CCITT) protocol family' HAVE_AFX25 y +-bool 'Econet protocol family' HAVE_AFECONET n ++bool 'Econet protocol family' HAVE_AFECONET y + bool 'DECnet protocol family' HAVE_AFDECnet n +-bool 'Ash protocol family' HAVE_AFASH n ++bool 'Ash protocol family' HAVE_AFASH y + * + * + * Device Hardware types. +@@ -71,21 +71,23 @@ bool 'IPIP Tunnel support' HAVE_HWTUNNEL + bool 'STRIP (Metricom radio) support' HAVE_HWSTRIP y + bool 'Token ring (generic) support' HAVE_HWTR y + bool 'AX25 (packet radio) support' HAVE_HWAX25 y +-bool 'Rose (packet radio) support' HAVE_HWROSE n ++bool 'Rose (packet radio) support' HAVE_HWROSE y + bool 'NET/ROM (packet radio) support' HAVE_HWNETROM y + bool 'X.25 (generic) support' HAVE_HWX25 y + bool 'DLCI/FRAD (frame relay) support' HAVE_HWFR y +-bool 'SIT (IPv6-in-IPv4) support' HAVE_HWSIT n +-bool 'FDDI (generic) support' HAVE_HWFDDI n +-bool 'HIPPI (generic) support' HAVE_HWHIPPI n +-bool 'Ash hardware support' HAVE_HWASH n +-bool '(Cisco)-HDLC/LAPB support' HAVE_HWHDLCLAPB n ++bool 'SIT (IPv6-in-IPv4) support' HAVE_HWSIT y ++bool 'FDDI (generic) support' HAVE_HWFDDI y ++bool 'HIPPI (generic) support' HAVE_HWHIPPI y ++bool 'Ash hardware support' HAVE_HWASH y ++bool '(Cisco)-HDLC/LAPB support' HAVE_HWHDLCLAPB y + bool 'IrDA support' HAVE_HWIRDA y +-bool 'Econet hardware support' HAVE_HWEC n ++bool 'Econet hardware support' HAVE_HWEC y ++bool 'Generic EUI-64 hardware support' HAVE_HWEUI64 y ++bool 'InfiniBand hardware support' HAVE_HWIB y + * + * + * Other Features. + * +-bool 'IP Masquerading support' HAVE_FW_MASQUERADE n +-bool 'Build iptunnel and ipmaddr' HAVE_IP_TOOLS n +-bool 'Build mii-tool' HAVE_MII n ++bool 'IP Masquerading support' HAVE_FW_MASQUERADE y ++bool 'Build iptunnel and ipmaddr' HAVE_IP_TOOLS y ++bool 'Build mii-tool' HAVE_MII y --- net-tools-1.60.orig/debian/patches/CVS-20061011-ipmaddr.c_buffer_overflow.patch +++ net-tools-1.60/debian/patches/CVS-20061011-ipmaddr.c_buffer_overflow.patch @@ -0,0 +1,36 @@ +Patch by Jochen Voss, already applied in upstream CVS. (Bug #392263) +Index: net-tools/ipmaddr.c +=================================================================== +--- net-tools.orig/ipmaddr.c ++++ net-tools/ipmaddr.c +@@ -291,13 +291,15 @@ static void print_mlist(FILE *fp, struct + static int multiaddr_list(int argc, char **argv) + { + struct ma_info *list = NULL; ++ size_t l; + + while (argc > 0) { + if (strcmp(*argv, "dev") == 0) { + NEXT_ARG(); +- if (filter_dev[0]) ++ l = strlen(*argv); ++ if (l <= 0 || l >= sizeof(filter_dev)) + usage(); +- strcpy(filter_dev, *argv); ++ strncpy(filter_dev, *argv, sizeof (filter_dev)); + } else if (strcmp(*argv, "all") == 0) { + filter_family = AF_UNSPEC; + } else if (strcmp(*argv, "ipv4") == 0) { +@@ -307,9 +309,10 @@ static int multiaddr_list(int argc, char + } else if (strcmp(*argv, "link") == 0) { + filter_family = AF_PACKET; + } else { +- if (filter_dev[0]) ++ l = strlen(*argv); ++ if (l <= 0 || l >= sizeof(filter_dev)) + usage(); +- strcpy(filter_dev, *argv); ++ strncpy(filter_dev, *argv, sizeof (filter_dev)); + } + argv++; argc--; + } --- net-tools-1.60.orig/debian/patches/Bug#345331-socket_overflow.patch +++ net-tools-1.60/debian/patches/Bug#345331-socket_overflow.patch @@ -0,0 +1,28 @@ +Patch by Antonio Galea to solve the socket number overflow +from #345331 + +diff -urNad net-tools-1.60/netstat.c /tmp/dpep.15Gej9/net-tools-1.60/netstat.c +--- net-tools-1.60/netstat.c 2005-12-30 16:52:15.000000000 +0100 ++++ /tmp/dpep.15Gej9/net-tools-1.60/netstat.c 2005-12-30 16:56:00.000000000 +0100 +@@ -313,8 +313,8 @@ + + strncpy(inode_str, lname+PRG_SOCKET_PFXl, inode_str_len); + inode_str[inode_str_len] = '\0'; +- *inode_p = strtol(inode_str,&serr,0); +- if (!serr || *serr || *inode_p < 0 || *inode_p >= INT_MAX) ++ *inode_p = strtoul(inode_str,&serr,0); ++ if (!serr || *serr) + return(-1); + } + return(0); +@@ -334,8 +334,8 @@ + { + char *serr; + +- *inode_p=strtol(lname + PRG_SOCKET_PFX2l,&serr,0); +- if (!serr || *serr || *inode_p < 0 || *inode_p >= INT_MAX) ++ *inode_p=strtoul(lname + PRG_SOCKET_PFX2l,&serr,0); ++ if (!serr || *serr) + return(-1); + } + return(0); --- net-tools-1.60.orig/debian/patches/translations.patch +++ net-tools-1.60/debian/patches/translations.patch @@ -0,0 +1,24458 @@ +Probably unsyncable changes, extracted from diff.gz + +Index: net-tools/po/pt_BR.po +=================================================================== +--- net-tools.orig/po/pt_BR.po ++++ net-tools/po/pt_BR.po +@@ -10,275 +10,287 @@ + msgid "" + msgstr "" + "Project-Id-Version: net-tools 1.54\n" +-"POT-Creation-Date: 2000-02-14 02:31+0100\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2007-06-30 12:28+0900\n" + "PO-Revision-Date: 1999-03-01 02:38+0100\n" + "Last-Translator: Arnaldo Carvalho de Melo \n" + "MIME-Version: 1.0\n" +-"Content-Type: text/plain; charset=ISO8859-9\n" ++"Content-Type: text/plain; charset=ISO-8859-9\n" + "Content-Transfer-Encoding: 8bit\n" + +-#: ../arp.c:110 ../arp.c:269 ++#: ../arp.c:112 ../arp.c:279 ++#, c-format + msgid "arp: need host name\n" + msgstr "arp: preciso do nome da mquina\n" + +-#: ../arp.c:207 ../arp.c:221 ++#: ../arp.c:215 ../arp.c:230 + #, c-format + msgid "No ARP entry for %s\n" + msgstr "Nenhuma entrada ARP para %s\n" + +-#: ../arp.c:239 ++#: ../arp.c:248 + #, c-format + msgid "arp: cant get HW-Address for `%s': %s.\n" + msgstr "arp: no foi possvel obter o endereo de hardware para `%s': %s.\n" + +-#: ../arp.c:243 ++#: ../arp.c:252 ++#, c-format + msgid "arp: protocol type mismatch.\n" + msgstr "arp: erro no tipo do protocolo.\n" + +-#: ../arp.c:252 ++#: ../arp.c:261 + #, c-format + msgid "arp: device `%s' has HW address %s `%s'.\n" + msgstr "arp: o dispositivo `%s' tem endereo de hardware %s `%s'.\n" + +-#: ../arp.c:282 ++#: ../arp.c:293 ++#, c-format + msgid "arp: need hardware address\n" + msgstr "arp: preciso do endereo de hardware\n" + +-#: ../arp.c:290 ++#: ../arp.c:301 ++#, c-format + msgid "arp: invalid hardware address\n" + msgstr "arp: endereo invlido de hardware\n" + +-#: ../arp.c:387 ++#: ../arp.c:398 + #, c-format + msgid "arp: cannot open etherfile %s !\n" + msgstr "arp: no foi possvel abrir o arquivo etherfile %s!\n" + +-#: ../arp.c:403 ++#: ../arp.c:414 + #, c-format + msgid "arp: format error on line %u of etherfile %s !\n" + msgstr "arp: erro de formato na linha %u do arquivo etherfile %s!\n" + +-#: ../arp.c:416 ++#: ../arp.c:427 + #, c-format + msgid "arp: cannot set entry on line %u of etherfile %s !\n" + msgstr "arp: no foi possvel configurar a linha %u do arquivo etherfile %s!\n" + +-#: ../arp.c:437 +-msgid "Address\t\t\tHWtype\tHWaddress\t Flags Mask\t\t Iface\n" ++#: ../arp.c:448 ++#, fuzzy, c-format ++msgid "" ++"Address HWtype HWaddress Flags Mask " ++"Iface\n" + msgstr "Endereo\t\tTipoHW\tEndereoHW\t Flags Mascara\t\t Iface\n" + +-#: ../arp.c:467 ++#: ../arp.c:476 ++#, fuzzy ++msgid "" ++msgstr "%s: interface desconhecida.\n" ++ ++#: ../arp.c:478 + msgid "(incomplete)" + msgstr "(incompleto)" + +-#: ../arp.c:484 ++#: ../arp.c:495 + #, c-format + msgid "%s (%s) at " + msgstr "%s (%s) em " + +-#: ../arp.c:490 ++#: ../arp.c:501 ++#, c-format + msgid " " + msgstr " " + +-#: ../arp.c:496 ++#: ../arp.c:507 + #, c-format + msgid "netmask %s " + msgstr "mascara %s " + +-#: ../arp.c:513 ++#: ../arp.c:524 + #, c-format + msgid "on %s\n" + msgstr "em %s\n" + +-#: ../arp.c:592 ++#: ../arp.c:605 + #, c-format + msgid "Entries: %d\tSkipped: %d\tFound: %d\n" + msgstr "Entradas: %d\tIgnorada: %d\tEncontrada: %d\n" + +-#: ../arp.c:596 ++#: ../arp.c:609 + #, c-format + msgid "%s (%s) -- no entry\n" + msgstr "%s (%s) -- nenhuma entrada\n" + +-#: ../arp.c:598 ++#: ../arp.c:611 + #, c-format + msgid "arp: in %d entries no match found.\n" + msgstr "arp: em %d entradas no foi encontrado.\n" + +-#: ../arp.c:613 ++#: ../arp.c:626 ++#, c-format + msgid "" + "Usage:\n" + " arp [-vn] [] [-i ] [-a] [] <-Display ARP " + "cache\n" + msgstr "" + "Uso:\n" +-" arp [-vn] [] [-i ] [-a] [] <-Mostra cache " +-"ARP\n" ++" arp [-vn] [] [-i ] [-a] [] <-Mostra cache ARP\n" + +-#: ../arp.c:614 ++#: ../arp.c:627 ++#, fuzzy, c-format + msgid "" +-" arp [-v] [-i ] -d [pub][nopub] <-Delete ARP " ++" arp [-v] [-i ] -d [pub] <-Delete ARP " + "entry\n" +-msgstr "" +-" arp [-v] [-i ] -d [pub][nopub] <-Remove entrada " +-"ARP\n" ++msgstr " arp [-v] [-i ] -d [pub][nopub] <-Remove entrada ARP\n" + +-#: ../arp.c:615 ++#: ../arp.c:628 ++#, fuzzy, c-format + msgid "" +-" arp [-vnD] [] [-i ] -f [] <-Add entry from " ++" arp [-vnD] [] [-i ] -f [] <-Add entry from " + "file\n" + msgstr "" + " arp [-vnD] [] [-i ] -f [] <-Inclui entrada de " + "arquivo\n" + +-#: ../arp.c:616 ++#: ../arp.c:629 ++#, fuzzy, c-format + msgid "" +-" arp [-v] [] [-i ] -s [temp][nopub] <-Add " ++" arp [-v] [] [-i ] -s [temp] <-Add " + "entry\n" +-msgstr "" +-" arp [-v] [] [-i ] -s [temp][nopub] <-Inc. " +-"Entrada\n" +- +-#: ../arp.c:617 +-msgid "" +-" arp [-v] [] [-i ] -s [netmask ] pub " +-"<-''-\n" +-msgstr "" +-" arp [-v] [] [-i ] -s [netmask ] pub " +-"<-''-\n" ++msgstr " arp [-v] [] [-i ] -s [temp][nopub] <-Inc. Entrada\n" + +-#: ../arp.c:618 ++#: ../arp.c:630 ++#, fuzzy, c-format + msgid "" +-" arp [-v] [] [-i ] -Ds [netmask ] pub " ++" arp [-v] [] [-i ] -Ds [netmask ] pub " + "<-''-\n" + "\n" +-msgstr "" +-" arp [-v] [] [-i ] -Ds [netmask ] pub " +-"<-''-\n" ++msgstr " arp [-v] [] [-i ] -Ds [netmask ] pub <-''-\n" + +-#: ../arp.c:620 ++#: ../arp.c:632 ++#, c-format + msgid "" + " -a display (all) hosts in alternative (BSD) " + "style\n" +-msgstr "" +-" -a mostra (todas as) mquinas no estilo alternativo " +-"(BSD)\n" ++msgstr " -a mostra (todas as) mquinas no estilo alternativo (BSD)\n" + +-#: ../arp.c:621 ++#: ../arp.c:633 ++#, c-format + msgid " -s, --set set a new ARP entry\n" + msgstr " -s, --set define uma nova entrada ARP\n" + +-#: ../arp.c:622 ++#: ../arp.c:634 ++#, c-format + msgid " -d, --delete delete a specified entry\n" + msgstr " -d, --delete remove a entrada especificada\n" + +-#: ../arp.c:623 ../netstat.c:1436 ../route.c:85 ++#: ../arp.c:635 ../netstat.c:1503 ../route.c:86 ++#, c-format + msgid " -v, --verbose be verbose\n" + msgstr " -v, --verbose listagem detalhada\n" + +-#: ../arp.c:624 ../netstat.c:1437 ../route.c:86 +-msgid " -n, --numeric dont resolve names\n" ++#: ../arp.c:636 ../netstat.c:1504 ../route.c:87 ++#, fuzzy, c-format ++msgid " -n, --numeric don't resolve names\n" + msgstr " -n, --numeric no resolve nomes\n" + +-#: ../arp.c:625 ++#: ../arp.c:637 ++#, c-format + msgid "" + " -i, --device specify network interface (e.g. eth0)\n" + msgstr "" + " -i, --device especifica a interface de rede (ex: eth0)\n" + +-#: ../arp.c:626 ++#: ../arp.c:638 ++#, c-format + msgid " -D, --use-device read from given device\n" + msgstr " -D, --use-device leia de um dispositivo\n" + +-#: ../arp.c:627 ++#: ../arp.c:639 ++#, c-format + msgid " -A, -p, --protocol specify protocol family\n" + msgstr " -A, -p, --protocol especifica a famlia de protocolos\n" + +-#: ../arp.c:628 ++#: ../arp.c:640 ++#, c-format + msgid "" +-" -f, --file read new entries from file or from " +-"/etc/ethers\n" ++" -f, --file read new entries from file or from /etc/" ++"ethers\n" + "\n" + msgstr "" +-" -f, --file leia novas entradas de arquivo ou de " +-"/etc/ethers\n" ++" -f, --file leia novas entradas de arquivo ou de /etc/" ++"ethers\n" + "\n" + +-#: ../arp.c:630 ../rarp.c:181 ++#: ../arp.c:642 ../rarp.c:182 + #, c-format + msgid " =Use '-H ' to specify hardware address type. Default: %s\n" +-msgstr "" +-" =Use '-H ' para especificar o tipo de endereo de hw. Default: %s\n" ++msgstr " =Use '-H ' para especificar o tipo de endereo de hw. Default: %s\n" + +-#: ../arp.c:631 ../rarp.c:182 ++#: ../arp.c:643 ../rarp.c:183 ++#, c-format + msgid " List of possible hardware types (which support ARP):\n" + msgstr " Lista dos tipos de hardware possveis (que suportam ARP):\n" + +-#: ../arp.c:664 ++#: ../arp.c:677 ../arp.c:762 + #, c-format + msgid "%s: hardware type not supported!\n" + msgstr "%s: tipo de hardware no suportado!\n" + +-#: ../arp.c:668 ++#: ../arp.c:681 + #, c-format + msgid "%s: address family not supported!\n" + msgstr "%s: famlia de endereos no suportada!\n" + +-#: ../arp.c:703 ++#: ../arp.c:716 ++#, c-format + msgid "arp: -N not yet supported.\n" + msgstr "arp: -N ainda no suportada.\n" + +-#: ../arp.c:713 ++#: ../arp.c:726 + #, c-format + msgid "arp: %s: unknown address family.\n" + msgstr "arp: %s: famlia de endereos desconhecida.\n" + +-#: ../arp.c:722 ++#: ../arp.c:735 + #, c-format + msgid "arp: %s: unknown hardware type.\n" + msgstr "arp: %s: tipo de hardware desconhecido.\n" + +-#: ../arp.c:741 ++#: ../arp.c:754 + #, c-format + msgid "arp: %s: kernel only supports 'inet'.\n" + msgstr "arp: %s: kernel somente suporta net'.\n" + +-#: ../arp.c:746 ++#: ../arp.c:767 + #, c-format + msgid "arp: %s: hardware type without ARP support.\n" + msgstr "arp: %s: tipo de hardware sem suporte a ARP.\n" + +-#: ../hostname.c:69 ++#: ../hostname.c:71 + #, c-format + msgid "Setting nodename to `%s'\n" + msgstr "Configurando nome do n como `%s'\n" + +-#: ../hostname.c:74 ++#: ../hostname.c:76 + #, c-format + msgid "%s: you must be root to change the node name\n" + msgstr "%s: voc deve ser root para mudar o nome do n\n" + +-#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116 ++#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117 + #, c-format + msgid "%s: name too long\n" + msgstr "%s: nome muito longo\n" + +-#: ../hostname.c:89 ++#: ../hostname.c:91 + #, c-format + msgid "Setting hostname to `%s'\n" + msgstr "Configurando nome da mquina para `%s'\n" + +-#: ../hostname.c:94 ++#: ../hostname.c:96 + #, c-format + msgid "%s: you must be root to change the host name\n" + msgstr "%s: voc deve ser root para mudar o nome da mquina\n" + +-#: ../hostname.c:108 ++#: ../hostname.c:109 + #, c-format + msgid "Setting domainname to `%s'\n" + msgstr "Configurando nome do domnio para `%s'\n" + +-#: ../hostname.c:113 ++#: ../hostname.c:114 + #, c-format + msgid "%s: you must be root to change the domain name\n" + msgstr "%s: voc deve ser root para mudar o nome do domnio\n" +@@ -303,37 +315,38 @@ msgstr "Resultado: h_aliases=`%s'\n" + msgid "Result: h_addr_list=`%s'\n" + msgstr "Resultado: h_addr_list=`%s'\n" + +-#: ../hostname.c:209 ++#: ../hostname.c:208 + #, c-format + msgid "%s: can't open `%s'\n" + msgstr "%s: no foi possvel abrir `%s'\n" + +-#: ../hostname.c:223 ++#: ../hostname.c:222 ++#, c-format + msgid "Usage: hostname [-v] {hostname|-F file} set hostname (from file)\n" +-msgstr "" +-"Uso: hostname [-v] {mquina|-F arquivo} configura nome da mquina (de " +-"arquivo)\n" ++msgstr "Uso: hostname [-v] {mquina|-F arquivo} configura nome da mquina (de arquivo)\n" + +-#: ../hostname.c:224 ++#: ../hostname.c:223 ++#, c-format + msgid "" + " domainname [-v] {nisdomain|-F file} set NIS domainname (from file)\n" + msgstr "" + " domainname [-v] {domnio_nis|-F file} configura nome do domnio NIS\n" + " (a partir de arquivo)\n" + +-#: ../hostname.c:226 ++#: ../hostname.c:225 ++#, c-format + msgid "" + " nodename [-v] {nodename|-F file} set DECnet node name (from " + "file)\n" +-msgstr "" +-"Uso: hostname [-v] {mquina|-F arquivo} configura o nome do n DECnet (de " +-"arquivo)\n" ++msgstr "Uso: hostname [-v] {mquina|-F arquivo} configura o nome do n DECnet (de arquivo)\n" + +-#: ../hostname.c:228 ++#: ../hostname.c:227 ++#, c-format + msgid " hostname [-v] [-d|-f|-s|-a|-i|-y|-n] display formatted name\n" + msgstr " hostname [-v] [-d|-f|-s|-a|-i|-y|-n] mostra nome formatado\n" + +-#: ../hostname.c:229 ++#: ../hostname.c:228 ++#, c-format + msgid "" + " hostname [-v] display hostname\n" + "\n" +@@ -341,7 +354,8 @@ msgstr "" + " hostname [-v] mostra nome da mquina\n" + "\n" + +-#: ../hostname.c:230 ++#: ../hostname.c:229 ++#, c-format + msgid "" + " hostname -V|--version|-h|--help print info and exit\n" + "\n" +@@ -349,7 +363,8 @@ msgstr "" + " hostname -V|--version|-h|--help mostra informaes e termina\n" + "\n" + +-#: ../hostname.c:231 ++#: ../hostname.c:230 ++#, c-format + msgid "" + " dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" + "\n" +@@ -357,35 +372,43 @@ msgstr "" + " dnsdomainname=mquina -d, {yp,nis,}domainname=hostname -y\n" + "\n" + +-#: ../hostname.c:232 ++#: ../hostname.c:231 ++#, c-format + msgid " -s, --short short host name\n" + msgstr " -s, --short nome curto da mquina\n" + +-#: ../hostname.c:233 ++#: ../hostname.c:232 ++#, c-format + msgid " -a, --alias alias names\n" + msgstr " -a, --alias aliases para a mquina\n" + +-#: ../hostname.c:234 ++#: ../hostname.c:233 ++#, c-format + msgid " -i, --ip-address addresses for the hostname\n" + msgstr " -i, --ip-address endereos da mquina\n" + +-#: ../hostname.c:235 ++#: ../hostname.c:234 ++#, c-format + msgid " -f, --fqdn, --long long host name (FQDN)\n" + msgstr " -f, --fqdn, --long nome longo da mquina (FQDN)\n" + +-#: ../hostname.c:236 ++#: ../hostname.c:235 ++#, c-format + msgid " -d, --domain DNS domain name\n" + msgstr " -d, --domain nome do domnio DNS\n" + +-#: ../hostname.c:237 ++#: ../hostname.c:236 ++#, c-format + msgid " -y, --yp, --nis NIS/YP domainname\n" + msgstr " -y, --yp, --nis nome do domnio NIS/YP\n" + +-#: ../hostname.c:239 ++#: ../hostname.c:238 ++#, c-format + msgid " -n, --node DECnet node name\n" + msgstr " -n, --node nome do n DECnet\n" + +-#: ../hostname.c:241 ++#: ../hostname.c:240 ++#, c-format + msgid "" + " -F, --file read hostname or NIS domainname from given file\n" + "\n" +@@ -393,7 +416,8 @@ msgstr "" + " -F, --file leia o nome da mquina ou domnio NIS do arquivo\n" + "\n" + +-#: ../hostname.c:243 ++#: ../hostname.c:242 ++#, c-format + msgid "" + " This command can read or set the hostname or the NIS domainname. You can\n" + " also read the DNS domain or the FQDN (fully qualified domain name).\n" +@@ -413,15 +437,16 @@ msgid "%s: You can't change the DNS doma + msgstr "%s: Voc no pode mudar o nome do domnio DNS com este comando\n" + + #: ../hostname.c:339 ++#, c-format + msgid "" + "\n" + "Unless you are using bind or NIS for host lookups you can change the DNS\n" + msgstr "" + "\n" +-"A menos que esteja usando bind ou NIS para resoluo de nomes voc pode " +-"mudar\n" ++"A menos que esteja usando bind ou NIS para resoluo de nomes voc pode mudar\n" + + #: ../hostname.c:340 ++#, c-format + msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n" + msgstr "o nome do domnio DNS (que parte do FQDN) no arquivo /etc/hosts.\n" + +@@ -440,552 +465,453 @@ msgstr "getdomainname()=`%s'\n" + msgid "getnodename()=`%s'\n" + msgstr "getnodename()=`%s'\n" + +-#: ../ifconfig.c:159 +-#, c-format +-msgid "%-9.9s Link encap:%s " +-msgstr "%-9.9s Encapsulamento do Link: %s " ++#: ../ifconfig.c:107 ++#, fuzzy, c-format ++msgid "" ++"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " ++"Flg\n" ++msgstr "Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OV Opes\n" + +-#: ../ifconfig.c:164 +-#, c-format +-msgid "HWaddr %s " +-msgstr "Endereo de HW %s " ++#: ../ifconfig.c:129 ../ifconfig.c:161 ++#, fuzzy, c-format ++msgid "%s: ERROR while getting interface flags: %s\n" ++msgstr "" ++"%s: erro obtendo informaes da interface: %s\n" ++"\n" + +-#: ../ifconfig.c:167 ++#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862 ++#: ../ifconfig.c:973 + #, c-format +-msgid "Media:%s" +-msgstr "Mdia:%s" ++msgid "No support for INET on this system.\n" ++msgstr "Este sistema no tem suporte a INET.\n" + +-#: ../ifconfig.c:169 +-msgid "(auto)" +-msgstr "(auto)" ++#: ../ifconfig.c:193 ++#, fuzzy, c-format ++msgid "%s: ERROR while testing interface flags: %s\n" ++msgstr "" ++"%s: erro obtendo informaes da interface: %s\n" ++"\n" + +-#: ../ifconfig.c:176 +-#, c-format +-msgid " %s addr:%s " +-msgstr " %s end.: %s " ++#: ../ifconfig.c:202 ++#, fuzzy, c-format ++msgid "" ++"Usage:\n" ++" ifconfig [-a] [-v] [-s] [[]
]\n" ++msgstr "" ++"Uso:\n" ++" ifconfig [-a] [-i] [-v] [[] ]\n" + +-#: ../ifconfig.c:179 ++#: ../ifconfig.c:204 + #, c-format +-msgid " P-t-P:%s " +-msgstr " P-a-P:%s " ++msgid " [add
[/]]\n" ++msgstr " [add [/]]\n" + +-#: ../ifconfig.c:182 ++#: ../ifconfig.c:205 + #, c-format +-msgid " Bcast:%s " +-msgstr " Bcast:%s " ++msgid " [del
[/]]\n" ++msgstr " [del [/]]\n" + +-#: ../ifconfig.c:184 ++#: ../ifconfig.c:206 + #, c-format +-msgid " Mask:%s\n" +-msgstr " Masc:%s\n" ++msgid " [[-]broadcast [
]] [[-]pointopoint [
]]\n" ++msgstr " [[-]broadcast []] [[-]pointopoint []]\n" + +-#: ../ifconfig.c:201 ++#: ../ifconfig.c:207 + #, c-format +-msgid " inet6 addr: %s/%d" +-msgstr " endereo inet6: %s/%d" +- +-#: ../ifconfig.c:203 +-msgid " Scope:" +-msgstr " Escopo:" +- +-#: ../ifconfig.c:206 +-msgid "Global" +-msgstr "Global" ++msgid " [netmask
] [dstaddr
] [tunnel
]\n" ++msgstr " [netmask ] [dstaddr ] [tunnel ]\n" + +-#: ../ifconfig.c:209 +-msgid "Link" +-msgstr "Link" ++#: ../ifconfig.c:210 ++#, c-format ++msgid " [outfill ] [keepalive ]\n" ++msgstr " [outfill ] [keepalive ]\n" + + #: ../ifconfig.c:212 +-msgid "Site" +-msgstr "Site" +- +-#: ../ifconfig.c:215 +-msgid "Compat" +-msgstr "Compat" +- +-#: ../ifconfig.c:218 +-msgid "Host" +-msgstr "Mquina" +- +-#: ../ifconfig.c:221 +-msgid "Unknown" +-msgstr "Desconhecido" +- +-#: ../ifconfig.c:236 + #, c-format +-msgid " IPX/Ethernet II addr:%s\n" +-msgstr " Endereo IPX/Ethernet II:%s\n" ++msgid " [hw
] [metric ] [mtu ]\n" ++msgstr " [hw ] [metric ] [mtu ]\n" + +-#: ../ifconfig.c:239 ++#: ../ifconfig.c:213 + #, c-format +-msgid " IPX/Ethernet SNAP addr:%s\n" +-msgstr " Endereo IPX/Ethernet SNAP:%s\n" ++msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" ++msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" + +-#: ../ifconfig.c:242 ++#: ../ifconfig.c:214 + #, c-format +-msgid " IPX/Ethernet 802.2 addr:%s\n" +-msgstr " Endereo IPX/Ethernet 802.2:%s\n" ++msgid " [multicast] [[-]promisc]\n" ++msgstr " [multicast] [[-]promisc]\n" + +-#: ../ifconfig.c:245 ++#: ../ifconfig.c:215 + #, c-format +-msgid " IPX/Ethernet 802.3 addr:%s\n" +-msgstr " Endereo IPX/Ethernet 802.3:%s\n" ++msgid " [mem_start ] [io_addr ] [irq ] [media ]\n" ++msgstr " [mem_start ] [io_addr ] [irq ] [media ]\n" + +-#: ../ifconfig.c:255 ++#: ../ifconfig.c:217 + #, c-format +-msgid " EtherTalk Phase 2 addr:%s\n" +-msgstr " Endereo EtherTalk fase 2:%s\n" ++msgid " [txqueuelen ]\n" ++msgstr " [txqueuelen ]\n" + +-#: ../ifconfig.c:264 ++#: ../ifconfig.c:220 + #, c-format +-msgid " econet addr:%s\n" +-msgstr " Endereo econet:%s\n" +- +-#: ../ifconfig.c:270 +-msgid "[NO FLAGS] " +-msgstr "[NENHUMA FLAG] " +- +-#: ../ifconfig.c:272 +-msgid "UP " +-msgstr "UP " +- +-#: ../ifconfig.c:274 +-msgid "BROADCAST " +-msgstr "BROADCAST" +- +-#: ../ifconfig.c:276 +-msgid "DEBUG " +-msgstr "DEBUG " +- +-#: ../ifconfig.c:278 +-msgid "LOOPBACK " +-msgstr "LOOPBACK" +- +-#: ../ifconfig.c:280 +-msgid "POINTOPOINT " +-msgstr "POINTOPOINT " +- +-#: ../ifconfig.c:282 +-msgid "NOTRAILERS " +-msgstr "NOTRAILERS " +- +-#: ../ifconfig.c:284 +-msgid "RUNNING " +-msgstr "RUNNING " ++msgid " [[-]dynamic]\n" ++msgstr " [[-]dynamic]\n" + +-#: ../ifconfig.c:286 +-msgid "NOARP " +-msgstr "NOARP " ++#: ../ifconfig.c:222 ++#, c-format ++msgid "" ++" [up|down] ...\n" ++"\n" ++msgstr "" ++" [up|down] ...\n" ++"\n" + +-#: ../ifconfig.c:288 +-msgid "PROMISC " +-msgstr "PROMISC " ++#: ../ifconfig.c:224 ++#, c-format ++msgid " =Hardware Type.\n" ++msgstr " =Tipo de Hardware.\n" + +-#: ../ifconfig.c:290 +-msgid "ALLMULTI " +-msgstr "ALLMULTI " ++#: ../ifconfig.c:225 ++#, c-format ++msgid " List of possible hardware types:\n" ++msgstr " Lista dos tipos possveis de hardware:\n" + +-#: ../ifconfig.c:292 +-msgid "SLAVE " +-msgstr "SLAVE " ++#. 1 = ARPable ++#: ../ifconfig.c:227 ++#, c-format ++msgid " =Address family. Default: %s\n" ++msgstr " =Famlia de endereos. Default: %s\n" + +-#: ../ifconfig.c:294 +-msgid "MASTER " +-msgstr "MASTER " ++#: ../ifconfig.c:228 ++#, c-format ++msgid " List of possible address families:\n" ++msgstr " Lista de famlias de endereos possveis:\n" + +-#: ../ifconfig.c:296 +-msgid "MULTICAST " +-msgstr "MULTICAST " ++#: ../ifconfig.c:303 ++#, c-format ++msgid "ifconfig: option `%s' not recognised.\n" ++msgstr "" + +-#: ../ifconfig.c:299 +-msgid "DYNAMIC " +-msgstr "DYNAMIC " ++#: ../ifconfig.c:305 ../ifconfig.c:962 ++#, c-format ++msgid "ifconfig: `--help' gives usage information.\n" ++msgstr "" + +-#: ../ifconfig.c:302 ++#: ../ifconfig.c:380 + #, c-format +-msgid " MTU:%d Metric:%d" +-msgstr " MTU:%d Mtrica:%d" ++msgid "Unknown media type.\n" ++msgstr "Tipo desconhecido de mdia.\n" + +-#: ../ifconfig.c:306 ++#: ../ifconfig.c:417 + #, c-format +-msgid " Outfill:%d Keepalive:%d" +-msgstr " Outfill:%d Keepalive:%d" ++msgid "" ++"Warning: Interface %s still in promisc mode... maybe other application is " ++"running?\n" ++msgstr "" + +-#: ../ifconfig.c:320 ++#: ../ifconfig.c:429 + #, c-format +-msgid "RX packets:%lu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" +-msgstr "Pacotes RX:%lu erros:%lu descartados:%lu sobreposies:%lu frame:%lu\n" ++msgid "Warning: Interface %s still in MULTICAST mode.\n" ++msgstr "" + +-#: ../ifconfig.c:325 ++#: ../ifconfig.c:441 + #, c-format +-msgid " compressed:%lu\n" +-msgstr " compactados:%lu\n" ++msgid "Warning: Interface %s still in ALLMULTI mode.\n" ++msgstr "" + +-#: ../ifconfig.c:329 ++#: ../ifconfig.c:465 + #, c-format +-msgid "TX packets:%lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" ++msgid "Warning: Interface %s still in DYNAMIC mode.\n" + msgstr "" +-"Pacotes TX:%lu erros:%lu descartados:%lu sobreposies:%lu portadora:%lu\n" + +-#: ../ifconfig.c:333 ++#: ../ifconfig.c:523 + #, c-format +-msgid " collisions:%lu " +-msgstr " colises:%lu " ++msgid "Warning: Interface %s still in BROADCAST mode.\n" ++msgstr "" + +-#: ../ifconfig.c:335 ++#: ../ifconfig.c:652 + #, c-format +-msgid "compressed:%lu " +-msgstr "compactados:%lu " ++msgid "Warning: Interface %s still in POINTOPOINT mode.\n" ++msgstr "" + +-#: ../ifconfig.c:337 ++#: ../ifconfig.c:684 + #, c-format +-msgid "txqueuelen:%d " +-msgstr "txqueuelen:%d " +- +-#: ../ifconfig.c:345 +-#, c-format +-msgid "Interrupt:%d " +-msgstr "IRQ:%d " +- +-#. Only print devices using it for +-#. I/O maps +-#: ../ifconfig.c:348 +-#, c-format +-msgid "Base address:0x%x " +-msgstr "Endereo de E/S:0x%x " ++msgid "hw address type `%s' has no handler to set address. failed.\n" ++msgstr "" + +-#: ../ifconfig.c:350 ++#: ../ifconfig.c:693 + #, c-format +-msgid "Memory:%lx-%lx " +-msgstr "Memria:%lx-%lx " ++msgid "%s: invalid %s address.\n" ++msgstr "%s: endereo %s invlido.\n" + +-#: ../ifconfig.c:353 ++#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913 + #, c-format +-msgid "DMA chan:%x " +-msgstr "Canal DMA:%x " ++msgid "No support for INET6 on this system.\n" ++msgstr "Este sistema no tem suporte a INET6.\n" + +-#: ../ifconfig.c:384 ../ifconfig.c:405 ++#: ../ifconfig.c:780 ../ifconfig.c:871 + #, c-format +-msgid "%s: unknown interface: %s\n" +-msgstr "%s: interface desconhecida: %s\n" +- +-#: ../ifconfig.c:421 +-msgid "" +-"Usage:\n" +-" ifconfig [-a] [-i] [-v] [[]
]\n" +-msgstr "" +-"Uso:\n" +-" ifconfig [-a] [-i] [-v] [[] ]\n" +- +-#: ../ifconfig.c:425 +-msgid " [add
[/]]\n" +-msgstr " [add [/]]\n" +- +-#: ../ifconfig.c:427 +-msgid " [del
[/]]\n" +-msgstr " [del [/]]\n" +- +-#: ../ifconfig.c:432 +-msgid " [[-]broadcast [
]] [[-]pointopoint [
]]\n" +-msgstr " [[-]broadcast []] [[-]pointopoint []]\n" +- +-#: ../ifconfig.c:433 +-msgid " [netmask
] [dstaddr
] [tunnel
]\n" +-msgstr " [netmask ] [dstaddr ] [tunnel ]\n" +- +-#: ../ifconfig.c:436 +-msgid " [outfill ] [keepalive ]\n" +-msgstr " [outfill ] [keepalive ]\n" +- +-#: ../ifconfig.c:438 +-msgid " [hw
] [metric ] [mtu ]\n" +-msgstr " [hw ] [metric ] [mtu ]\n" +- +-#: ../ifconfig.c:439 +-msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" +-msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" +- +-#: ../ifconfig.c:440 +-msgid " [multicast] [[-]promisc]\n" +-msgstr " [multicast] [[-]promisc]\n" +- +-#: ../ifconfig.c:441 +-msgid " [mem_start ] [io_addr ] [irq ] [media ]\n" +-msgstr " [mem_start ] [io_addr ] [irq ] [media ]\n" +- +-#: ../ifconfig.c:443 +-msgid " [txqueuelen ]\n" +-msgstr " [txqueuelen ]\n" +- +-#: ../ifconfig.c:446 +-msgid " [[-]dynamic]\n" +-msgstr " [[-]dynamic]\n" +- +-#: ../ifconfig.c:448 +-msgid "" +-" [up|down] ...\n" +-"\n" ++msgid "Interface %s not initialized\n" + msgstr "" +-" [up|down] ...\n" +-"\n" +- +-#: ../ifconfig.c:450 +-msgid " =Hardware Type.\n" +-msgstr " =Tipo de Hardware.\n" +- +-#: ../ifconfig.c:451 +-msgid " List of possible hardware types:\n" +-msgstr " Lista dos tipos possveis de hardware:\n" +- +-#. 1 = ARPable +-#: ../ifconfig.c:453 +-#, c-format +-msgid " =Address family. Default: %s\n" +-msgstr " =Famlia de endereos. Default: %s\n" +- +-#: ../ifconfig.c:454 +-msgid " List of possible address families:\n" +-msgstr " Lista de famlias de endereos possveis:\n" +- +-#: ../ifconfig.c:593 +-msgid "Unknown media type.\n" +-msgstr "Tipo desconhecido de mdia.\n" + +-#: ../ifconfig.c:881 +-#, c-format +-msgid "%s: invalid %s address.\n" ++#: ../ifconfig.c:792 ../ifconfig.c:882 ++#, fuzzy, c-format ++msgid "Bad address.\n" + msgstr "%s: endereo %s invlido.\n" + +-#: ../ifconfig.c:920 ../ifconfig.c:963 ../ifconfig.c:1011 +-msgid "No support for INET6 on this system.\n" +-msgstr "Este sistema no tem suporte a INET6.\n" +- +-#: ../ifconfig.c:983 ++#: ../ifconfig.c:885 ++#, c-format + msgid "Address deletion not supported on this system.\n" + msgstr "Remoo de endereo no suportada neste sistema.\n" + +-#: ../ifconfig.c:1066 +-msgid "No support for INET on this system.\n" +-msgstr "Este sistema no tem suporte a INET.\n" ++#: ../ifconfig.c:957 ++#, fuzzy, c-format ++msgid "ifconfig: Cannot set address for this protocol family.\n" ++msgstr "No sei como configurar endereos para a famlia %d.\n" + +-#: ../ifconfig.c:1076 ++#: ../ifconfig.c:983 ++#, c-format + msgid "No support for ECONET on this system.\n" + msgstr "Este sistema no tem suporte a ECONET.\n" + +-#: ../ifconfig.c:1084 ++#: ../ifconfig.c:991 + #, c-format + msgid "Don't know how to set addresses for family %d.\n" + msgstr "No sei como configurar endereos para a famlia %d.\n" + +-#: ../netstat.c:383 ++#: ../ifconfig.c:1021 ++#, c-format ++msgid "WARNING: at least one error occured. (%d)\n" ++msgstr "" ++ ++#: ../netstat.c:434 + #, c-format + msgid "" + "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n" +-msgstr "" +-"(No foi possvel ler informaes para \"-p\": geteuid()=%d mas voc deve " +-"ser root.)\n" ++msgstr "(No foi possvel ler informaes para \"-p\": geteuid()=%d mas voc deve ser root.)\n" + +-#: ../netstat.c:387 ++#: ../netstat.c:438 ++#, c-format + msgid "" + "(Not all processes could be identified, non-owned process info\n" + " will not be shown, you would have to be root to see it all.)\n" + msgstr "" +-"(Nem todos os processos puderam ser identificados, informaes sobre " +-"processos\n" ++"(Nem todos os processos puderam ser identificados, informaes sobre processos\n" + " de outrem no sero mostrados, voc deve ser root para v-los todos.)\n" + +-#: ../netstat.c:394 ../netstat.c:1089 ../netstat.c:1166 ++#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266 + msgid "LISTENING" + msgstr "OUVINDO" + +-#: ../netstat.c:395 ++#: ../netstat.c:446 + msgid "CONN SENT" + msgstr "CONN ENVIADO" + +-#: ../netstat.c:396 ../netstat.c:1168 ++#: ../netstat.c:447 ../netstat.c:1268 + msgid "DISC SENT" + msgstr "DISC ENVIADO" + +-#: ../netstat.c:397 ../netstat.c:464 ../netstat.c:809 ../netstat.c:1169 ++#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269 + msgid "ESTABLISHED" + msgstr "ESTABELECIDA" + +-#: ../netstat.c:419 ++#: ../netstat.c:470 ++#, c-format + msgid "Active NET/ROM sockets\n" + msgstr "Ative sockets NET/ROM\n" + +-#: ../netstat.c:420 ++#: ../netstat.c:471 ++#, c-format + msgid "" +-"User Dest Source Device State Vr/Vs Send-Q " +-"Recv-Q\n" +-msgstr "" +-"Usurio Destino Origem Dispositivo Estado Vr/Vs Send-Q Recv-Q\n" ++"User Dest Source Device State Vr/Vs Send-Q Recv-" ++"Q\n" ++msgstr "Usurio Destino Origem Dispositivo Estado Vr/Vs Send-Q Recv-Q\n" + +-#: ../netstat.c:430 ../netstat.c:1208 ++#: ../netstat.c:481 ../netstat.c:1308 + #, c-format + msgid "Problem reading data from %s\n" + msgstr "Problemas lendo dados de %s\n" + +-#: ../netstat.c:465 ++#: ../netstat.c:516 + msgid "SYN_SENT" + msgstr "SYN_ENVIADO" + +-#: ../netstat.c:466 ++#: ../netstat.c:517 + msgid "SYN_RECV" + msgstr "SYN_RECEBIDO" + +-#: ../netstat.c:467 ++#: ../netstat.c:518 + msgid "FIN_WAIT1" + msgstr "ESPERA_FIN1" + +-#: ../netstat.c:468 ++#: ../netstat.c:519 + msgid "FIN_WAIT2" + msgstr "ESPERA_FIN2" + +-#: ../netstat.c:469 ++#: ../netstat.c:520 + msgid "TIME_WAIT" + msgstr "TIME_WAIT" + +-#: ../netstat.c:470 ++#: ../netstat.c:521 + msgid "CLOSE" + msgstr "FECHAR" + +-#: ../netstat.c:471 ++#: ../netstat.c:522 + msgid "CLOSE_WAIT" + msgstr "ESPERANDO_FECHAR" + +-#: ../netstat.c:472 ++#: ../netstat.c:523 + msgid "LAST_ACK" + msgstr "LTIMO_ACK" + +-#: ../netstat.c:473 ++#: ../netstat.c:524 + msgid "LISTEN" + msgstr "OUA" + +-#: ../netstat.c:474 ++#: ../netstat.c:525 + msgid "CLOSING" + msgstr "FECHANDO" + +-#: ../netstat.c:544 ++#: ../netstat.c:596 + #, c-format + msgid "warning, got bogus igmp6 line %d.\n" + msgstr "ateno, recebi linha igmp6 invlida %d.\n" + +-#: ../netstat.c:549 ../netstat.c:587 ../netstat.c:670 ../netstat.c:803 +-#: ../netstat.c:935 ../netstat.c:940 ++#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898 ++#: ../netstat.c:1032 ../netstat.c:1037 + #, c-format + msgid "netstat: unsupported address family %d !\n" + msgstr "netstat: famlia de protocolos %d no suportada!\n" + +-#: ../netstat.c:562 ../netstat.c:567 ../netstat.c:575 ../netstat.c:582 ++#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634 + #, c-format + msgid "warning, got bogus igmp line %d.\n" + msgstr "ateno, recebi linha igmp invlida %d.\n" + +-#: ../netstat.c:666 ++#: ../netstat.c:677 ++#, fuzzy, c-format ++msgid "Active X.25 sockets\n" ++msgstr "Ativar sockets AX.25\n" ++ ++#. IMHO, Vr/Vs is not very usefull --SF ++#: ../netstat.c:679 ++#, fuzzy, c-format ++msgid "" ++"Dest Source Device LCI State Vr/Vs Send-Q Recv-" ++"Q\n" ++msgstr "Destino Origem Dispositivo Estado Vr/Vs Send-Q Recv-Q\n" ++ ++#: ../netstat.c:759 ++#, c-format + msgid "warning, got bogus tcp line.\n" + msgstr "ateno, recebi linha tcp invlida.\n" + +-#: ../netstat.c:704 ../netstat.c:855 ../netstat.c:975 ++#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075 + #, c-format + msgid "off (0.00/%ld/%d)" + msgstr "desligado (0.00/%ld/%ld)" + +-#: ../netstat.c:708 ++#: ../netstat.c:804 + #, c-format + msgid "on (%2.2f/%ld/%d)" + msgstr "em (%2.2f/%ld/%d)" + +-#: ../netstat.c:713 ++#: ../netstat.c:809 + #, c-format + msgid "keepalive (%2.2f/%ld/%d)" + msgstr "keepalive (%2.2f/%ld/%d)" + +-#: ../netstat.c:718 ++#: ../netstat.c:814 + #, c-format + msgid "timewait (%2.2f/%ld/%d)" + msgstr "timewait (%2.2f/%ld/%d)" + +-#: ../netstat.c:723 ../netstat.c:864 ../netstat.c:985 ++#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085 + #, c-format + msgid "unkn-%d (%2.2f/%ld/%d)" + msgstr "desconh.-%d (%2.2f/%ld)" + +-#: ../netstat.c:799 ++#: ../netstat.c:894 ++#, c-format + msgid "warning, got bogus udp line.\n" + msgstr "ateno, recebi linha udp invlida.\n" + +-#: ../netstat.c:817 ../netstat.c:1075 ../netstat.c:1108 ++#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208 + msgid "UNKNOWN" + msgstr "DESCONHECIDA" + +-#: ../netstat.c:860 ../netstat.c:980 ++#: ../netstat.c:958 ../netstat.c:1080 + #, c-format + msgid "on%d (%2.2f/%ld/%d)" + msgstr "ligado %d (%2.2f/%ld)" + +-#: ../netstat.c:949 ++#: ../netstat.c:1046 ++#, c-format + msgid "warning, got bogus raw line.\n" + msgstr "ateno, recebi linha raw invlida.\n" + +-#: ../netstat.c:1028 ++#: ../netstat.c:1128 ++#, c-format + msgid "warning, got bogus unix line.\n" + msgstr "ateno, recebi linha unix invlida.\n" + +-#: ../netstat.c:1055 ++#: ../netstat.c:1155 + msgid "STREAM" + msgstr "STREAM" + +-#: ../netstat.c:1059 ++#: ../netstat.c:1159 + msgid "DGRAM" + msgstr "DGRAM" + +-#: ../netstat.c:1063 ++#: ../netstat.c:1163 + msgid "RAW" + msgstr "RAW" + +-#: ../netstat.c:1067 ++#: ../netstat.c:1167 + msgid "RDM" + msgstr "RDM" + +-#: ../netstat.c:1071 ++#: ../netstat.c:1171 + msgid "SEQPACKET" + msgstr "SEQPACKET" + +-#: ../netstat.c:1080 ++#: ../netstat.c:1180 + msgid "FREE" + msgstr "LIVRE" + +-#: ../netstat.c:1096 ++#: ../netstat.c:1196 + msgid "CONNECTING" + msgstr "CONECTANDO" + +-#: ../netstat.c:1100 ++#: ../netstat.c:1200 + msgid "CONNECTED" + msgstr "CONECTADO" + +-#: ../netstat.c:1104 ++#: ../netstat.c:1204 + msgid "DISCONNECTING" + msgstr "DESCONECTANDO" + +-#: ../netstat.c:1135 ++#: ../netstat.c:1235 ++#, c-format + msgid "Active UNIX domain sockets " + msgstr "Domain sockets UNIX ativos " + +-#: ../netstat.c:1137 ../netstat.c:1666 ++#: ../netstat.c:1237 ../netstat.c:1756 ++#, c-format + msgid "(servers and established)" + msgstr "(servidores e estabelecidas)" + +-#: ../netstat.c:1140 ../netstat.c:1669 ++#: ../netstat.c:1240 ../netstat.c:1759 ++#, c-format + msgid "(only servers)" + msgstr "(sem os servidores)" + +-#: ../netstat.c:1142 ../netstat.c:1671 ++#: ../netstat.c:1242 ../netstat.c:1761 ++#, c-format + msgid "(w/o servers)" + msgstr "(sem os servidores)" + +-#: ../netstat.c:1145 ++#: ../netstat.c:1245 ++#, c-format + msgid "" + "\n" + "Proto RefCnt Flags Type State I-Node" +@@ -993,114 +919,118 @@ msgstr "" + "\n" + "Proto CntRef Flags Tipo Estado I-Node Rota" + +-#: ../netstat.c:1147 ++#: ../netstat.c:1247 ++#, c-format + msgid " Path\n" + msgstr " Caminho\n" + +-#: ../netstat.c:1167 ++#: ../netstat.c:1267 + msgid "SABM SENT" + msgstr "SABM ENVIADO" + +-#: ../netstat.c:1170 ++#: ../netstat.c:1270 + msgid "RECOVERY" + msgstr "RECUPERAO" + +-#: ../netstat.c:1184 ++#: ../netstat.c:1284 ++#, c-format + msgid "Active AX.25 sockets\n" + msgstr "Ativar sockets AX.25\n" + +-#: ../netstat.c:1185 ++#: ../netstat.c:1285 ++#, c-format + msgid "Dest Source Device State Vr/Vs Send-Q Recv-Q\n" + msgstr "Destino Origem Dispositivo Estado Vr/Vs Send-Q Recv-Q\n" + +-#: ../netstat.c:1228 ++#: ../netstat.c:1328 + #, c-format + msgid "problem reading data from %s\n" + msgstr "problemas lendo dados de %s\n" + +-#: ../netstat.c:1279 ++#: ../netstat.c:1379 ++#, c-format + msgid "" + "Active IPX sockets\n" + "Proto Recv-Q Send-Q Local Address Foreign Address " + "State" + msgstr "" + "Sockets IPX ativos\n" +-"Proto Recv-Q Send-Q Endereo Local Endereo Remoto " +-"Estado" ++"Proto Recv-Q Send-Q Endereo Local Endereo Remoto Estado" + +-#: ../netstat.c:1281 ++#: ../netstat.c:1381 ++#, c-format + msgid " User" + msgstr " Usurio" + +-#: ../netstat.c:1315 ++#: ../netstat.c:1415 + msgid "ESTAB" + msgstr "ESTAB" + +-#: ../netstat.c:1323 ++#: ../netstat.c:1423 + msgid "UNK." + msgstr "DESC." + +-#: ../netstat.c:1367 +-msgid " - no statistics available -" +-msgstr " - estatsticas no disponveis -" +- +-#: ../netstat.c:1370 +-msgid "[NO FLAGS]" +-msgstr "[SEM FLAGS]" +- +-#: ../netstat.c:1400 ++#: ../netstat.c:1461 ++#, c-format + msgid "Kernel Interface table\n" + msgstr "Tabela de Interfaces do Kernel\n" + +-#: ../netstat.c:1401 ++#: ../netstat.c:1465 ++#, fuzzy, c-format + msgid "" +-"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " ++"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " + "Flg\n" +-msgstr "" +-"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OV " +-"Opes\n" ++msgstr "Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OV Opes\n" + +-#: ../netstat.c:1404 ++#: ../netstat.c:1469 + msgid "missing interface information" + msgstr "falta informao da interface" + +-#: ../netstat.c:1425 ++#: ../netstat.c:1492 ++#, c-format + msgid "" +-"usage: netstat [-veenNcCF] [] -r netstat " +-"{-V|--version|-h|--help}\n" ++"usage: netstat [-veenNcCF] [] -r netstat {-V|--version|-h|--" ++"help}\n" + msgstr "" + "uso: netstat [-veenNcCF] [] -r netstat {-V|--version|-h|--help}\n" + +-#: ../netstat.c:1426 ++#: ../netstat.c:1493 ++#, c-format + msgid " netstat [-vnNcaeol] [ ...]\n" + msgstr " netstat [-vnNcaeo] []\n" + +-#: ../netstat.c:1427 ++#: ../netstat.c:1494 ++#, c-format + msgid "" + " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" + "\n" + msgstr " netstat [-vnNcaeo] []\n" + +-#: ../netstat.c:1429 ++#: ../netstat.c:1496 ++#, c-format + msgid " -r, --route display routing table\n" + msgstr " -r, --route mostra tabela de roteamento\n" + +-#: ../netstat.c:1430 ++#: ../netstat.c:1497 ++#, c-format + msgid " -i, --interfaces display interface table\n" + msgstr " -i, --interfaces mostra tabela de interfaces\n" + +-#: ../netstat.c:1431 ++#: ../netstat.c:1498 ++#, c-format + msgid " -g, --groups display multicast group memberships\n" + msgstr "" + " -o, --timers mostra temporizadores\n" + "\n" + +-#: ../netstat.c:1432 ++#: ../netstat.c:1499 ++#, c-format + msgid "" + " -s, --statistics display networking statistics (like SNMP)\n" + msgstr " -i, --interfaces mostra tabela de interfaces\n" + +-#: ../netstat.c:1434 ++#: ../netstat.c:1501 ++#, c-format + msgid "" + " -M, --masquerade display masqueraded connections\n" + "\n" +@@ -1108,19 +1038,38 @@ msgstr "" + " -M, --masquerade mostra conexes mascaradas\n" + "\n" + +-#: ../netstat.c:1438 ../route.c:87 ++#: ../netstat.c:1505 ++#, fuzzy, c-format ++msgid " --numeric-hosts don't resolve host names\n" ++msgstr " -n, --numeric no resolve nomes\n" ++ ++#: ../netstat.c:1506 ++#, fuzzy, c-format ++msgid " --numeric-ports don't resolve port names\n" ++msgstr " -n, --numeric no resolve nomes\n" ++ ++#: ../netstat.c:1507 ++#, fuzzy, c-format ++msgid " --numeric-users don't resolve user names\n" ++msgstr " -n, --numeric no resolve nomes\n" ++ ++#: ../netstat.c:1508 ++#, c-format + msgid " -N, --symbolic resolve hardware names\n" + msgstr " -n, --numeric no resolve nomes\n" + +-#: ../netstat.c:1439 ../route.c:88 ++#: ../netstat.c:1509 ../route.c:88 ++#, c-format + msgid " -e, --extend display other/more information\n" + msgstr " -e, --extend mostra outras/mais informaes\n" + +-#: ../netstat.c:1440 ++#: ../netstat.c:1510 ++#, c-format + msgid " -p, --programs display PID/Program name for sockets\n" + msgstr " -r, --route mostra tabela de roteamento\n" + +-#: ../netstat.c:1441 ++#: ../netstat.c:1511 ++#, c-format + msgid "" + " -c, --continuous continuous listing\n" + "\n" +@@ -1128,30 +1077,33 @@ msgstr "" + " -c, --continuous listagem contnua\n" + "\n" + +-#: ../netstat.c:1442 ++#: ../netstat.c:1512 ++#, c-format + msgid " -l, --listening display listening server sockets\n" + msgstr " -L, --netlink mostra mensagens netlink do kernel\n" + +-#: ../netstat.c:1443 ++#: ../netstat.c:1513 ++#, c-format + msgid "" + " -a, --all, --listening display all sockets (default: connected)\n" + msgstr " -a, --all, --listening mostra tudo\n" + +-#: ../netstat.c:1444 ++#: ../netstat.c:1514 ++#, c-format + msgid " -o, --timers display timers\n" + msgstr "" + " -o, --timers mostra temporizadores\n" + "\n" + +-#: ../netstat.c:1445 ../route.c:89 ++#: ../netstat.c:1515 ../route.c:89 ++#, c-format + msgid "" + " -F, --fib display Forwarding Information Base " + "(default)\n" +-msgstr "" +-" -F, --fib mostra a Base de Informaes de Repasse " +-"(default)\n" ++msgstr " -F, --fib mostra a Base de Informaes de Repasse (default)\n" + +-#: ../netstat.c:1446 ../route.c:90 ++#: ../netstat.c:1516 ../route.c:90 ++#, c-format + msgid "" + " -C, --cache display routing cache instead of FIB\n" + "\n" +@@ -1159,136 +1111,145 @@ msgstr "" + " -C, --cache mostra cache de roteamento no lugar da FIB\n" + "\n" + +-#: ../netstat.c:1448 ++#: ../netstat.c:1518 ++#, c-format + msgid "" +-" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx " +-"--netrom\n" ++" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" ++"netrom\n" + msgstr "" +-" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx " +-"--netrom\n" ++" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" ++"netrom\n" + +-#: ../netstat.c:1449 ../route.c:92 +-#, c-format +-msgid " =Use '-A ' or '--' Default: %s\n" ++#: ../netstat.c:1519 ++#, fuzzy, c-format ++msgid " =Use '-6|-4' or '-A ' or '--'; default: %s\n" + msgstr " =Use '-A ' ou [--' Default: %s\n" + +-#: ../netstat.c:1450 ../route.c:93 ++#: ../netstat.c:1520 ../route.c:93 ++#, c-format + msgid " List of possible address families (which support routing):\n" +-msgstr "" +-" Lista das famlias de endereos possveis (que suportam roteamento):\n" ++msgstr " Lista das famlias de endereos possveis (que suportam roteamento):\n" + +-#: ../netstat.c:1663 ++#: ../netstat.c:1753 ++#, c-format + msgid "Active Internet connections " + msgstr "Conexes Internet Ativas " + +-#: ../netstat.c:1673 ++#: ../netstat.c:1763 ++#, c-format + msgid "" + "\n" +-"Proto Recv-Q Send-Q Local Address Foreign Address State " +-" " ++"Proto Recv-Q Send-Q Local Address Foreign Address " ++"State " + msgstr "" + "\n" +-"Proto Recv-Q Send-Q Endereo Local Endereo Remoto Estado " +-" " ++"Proto Recv-Q Send-Q Endereo Local Endereo Remoto Estado " + +-#: ../netstat.c:1675 ++#: ../netstat.c:1765 ++#, c-format + msgid " User Inode " + msgstr " Usurio " + +-#: ../netstat.c:1678 ++#: ../netstat.c:1768 ++#, c-format + msgid " Timer" + msgstr " Temporizador" + +-#: ../netstat.c:1708 ++#: ../netstat.c:1798 ++#, c-format + msgid "IPv4 Group Memberships\n" + msgstr "IPv4 Group Memberships\n" + +-#: ../netstat.c:1709 ++#: ../netstat.c:1799 ++#, c-format + msgid "Interface RefCnt Group\n" + msgstr "Interface CntRef Grupo\n" + +-#: ../rarp.c:43 ++#: ../rarp.c:44 + msgid "This kernel does not support RARP.\n" + msgstr "Este kernel no tem suporte a RARP.\n" + +-#: ../rarp.c:82 ++#: ../rarp.c:83 + #, c-format + msgid "no RARP entry for %s.\n" + msgstr "Sem entrada RARP para %s.\n" + +-#: ../rarp.c:95 ++#: ../rarp.c:96 + #, c-format + msgid "%s: bad hardware address\n" + msgstr "%s: endereo de hardware invlido\n" + +-#: ../rarp.c:127 ++#: ../rarp.c:128 + #, c-format + msgid "rarp: cannot open file %s:%s.\n" + msgstr "rarp: no foi possvel abrir o arquivo %s:%s.\n" + +-#: ../rarp.c:139 ++#: ../rarp.c:140 + #, c-format + msgid "rarp: format error at %s:%u\n" + msgstr "rarp: erro de formato em %s:%u\n" + +-#: ../rarp.c:143 ../rarp.c:287 ++#: ../rarp.c:144 ../rarp.c:289 + #, c-format + msgid "rarp: %s: unknown host\n" + msgstr "rarp: %s: mquina desconhecida\n" + +-#: ../rarp.c:146 ++#: ../rarp.c:147 + #, c-format + msgid "rarp: cannot set entry from %s:%u\n" + msgstr "rarp: no possvel incluir uma entrada para %s:%u\n" + +-#: ../rarp.c:175 ++#: ../rarp.c:176 ++#, c-format + msgid "Usage: rarp -a list entries in cache.\n" + msgstr "" + "Uso: rarp -a lista entradas no cache\n" + +-#: ../rarp.c:176 ++#: ../rarp.c:177 ++#, c-format + msgid " rarp -d delete entry from cache.\n" +-msgstr "" +-" rarp -d mquina remove entrada do cache\n" ++msgstr " rarp -d mquina remove entrada do cache\n" + +-#: ../rarp.c:177 ++#: ../rarp.c:178 ++#, c-format + msgid " rarp [] -s add entry to cache.\n" +-msgstr "" +-" rarp [-t tipo-hw] -s mquina endereo-hw adiciona entrada ao cache\n" ++msgstr " rarp [-t tipo-hw] -s mquina endereo-hw adiciona entrada ao cache\n" + +-#: ../rarp.c:178 ++#: ../rarp.c:179 ++#, c-format + msgid "" + " rarp -f add entries from /etc/ethers.\n" + msgstr "" + " rarp -f adiciona entradas a partir do\n" + " arquivo ethers.\n" + +-#: ../rarp.c:179 ++#: ../rarp.c:180 ++#, c-format + msgid "" + " rarp -V display program version.\n" + "\n" +-msgstr "" +-" rarp -V mostra verso do programa\n" ++msgstr " rarp -V mostra verso do programa\n" + +-#: ../rarp.c:236 ++#: ../rarp.c:238 + #, c-format + msgid "%s: illegal option mix.\n" + msgstr "%s: mistura ilegal de opes.\n" + +-#: ../rarp.c:267 ++#: ../rarp.c:269 + #, c-format + msgid "rarp: %s: unknown hardware type.\n" + msgstr "rarp: %s: tipo desconhecido de hardware.\n" + +-#: ../route.c:79 ++#: ../route.c:80 ++#, c-format + msgid "" + "Usage: route [-nNvee] [-FC] [] List kernel routing tables\n" + msgstr "" +-"Uso: route [-nNvee] [-FC] [famlias_de_endereos] Lista as tabelas de " +-"rotea-\n" ++"Uso: route [-nNvee] [-FC] [famlias_de_endereos] Lista as tabelas de rotea-\n" + " mento do kernel\n" + +-#: ../route.c:80 ++#: ../route.c:81 ++#, c-format + msgid "" + " route [-v] [-FC] {add|del|flush} ... Modify routing table for AF.\n" + "\n" +@@ -1298,35 +1259,42 @@ msgstr "" + " mento da famlia.\n" + "\n" + +-#: ../route.c:82 ++#: ../route.c:83 ++#, c-format + msgid "" + " route {-h|--help} [] Detailed usage syntax for " + "specified AF.\n" + msgstr "" +-" route {-h|--help} [famlia_de_endereos] Sintaxe para a AF " +-"(Famlia\n" +-" de endereos) " +-"espeficicada.\n" ++" route {-h|--help} [famlia_de_endereos] Sintaxe para a AF (Famlia\n" ++" de endereos) espeficicada.\n" + +-#: ../route.c:83 ++#: ../route.c:84 ++#, c-format + msgid "" + " route {-V|--version} Display version/author and " + "exit.\n" + "\n" + msgstr "" +-" route {-V|--version} Mostra a verso do " +-"comando\n" ++" route {-V|--version} Mostra a verso do comando\n" + " e sai.\n" + ++#: ../route.c:92 ++#, fuzzy, c-format ++msgid " =Use '-A ' or '--'; default: %s\n" ++msgstr " =Use '-A ' ou [--' Default: %s\n" ++ + #: ../plipconfig.c:66 ++#, c-format + msgid "Usage: plipconfig [-a] [-i] [-v] interface\n" + msgstr "Uso: ifconfig [-a] [-i] [-v] interface\n" + + #: ../plipconfig.c:67 ++#, c-format + msgid " [nibble NN] [trigger NN]\n" + msgstr " [[famlia] endereo]\n" + + #: ../plipconfig.c:68 ++#, c-format + msgid " plipconfig -V | --version\n" + msgstr " plipconfig -V | --version\n" + +@@ -1335,25 +1303,29 @@ msgstr " plipconfig -V | --version + msgid "%s\tnibble %lu trigger %lu\n" + msgstr "%s\tnibble %lu trigger %lu\n" + +-#: ../iptunnel.c:79 ++#: ../iptunnel.c:85 ++#, c-format + msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n" + msgstr "Uso: iptunnel { add | change | del | show } [ NOME ]\n" + +-#: ../iptunnel.c:80 ++#: ../iptunnel.c:86 ++#, c-format + msgid "" + " [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n" +-msgstr "" +-" [ mode { ipip | gre | sit } ] [ remote END ] [ local END ]\n" ++msgstr " [ mode { ipip | gre | sit } ] [ remote END ] [ local END ]\n" + +-#: ../iptunnel.c:81 ++#: ../iptunnel.c:87 ++#, c-format + msgid " [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n" + msgstr " [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n" + +-#: ../iptunnel.c:82 ++#: ../iptunnel.c:88 ++#, c-format + msgid " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n" + msgstr " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev DISP_FSICO ]\n" + +-#: ../iptunnel.c:83 ++#: ../iptunnel.c:89 ++#, c-format + msgid "" + " iptunnel -V | --version\n" + "\n" +@@ -1361,451 +1333,734 @@ msgstr "" + " iptunnel -V | --version\n" + "\n" + +-#: ../iptunnel.c:84 ++#: ../iptunnel.c:90 ++#, c-format + msgid "Where: NAME := STRING\n" + msgstr "Onde: NAME := STRING\n" + +-#: ../iptunnel.c:85 ++#: ../iptunnel.c:91 ++#, c-format + msgid " ADDR := { IP_ADDRESS | any }\n" + msgstr " END := { ENDEREO_IP | any }\n" + +-#: ../iptunnel.c:86 ++#: ../iptunnel.c:92 ++#, c-format + msgid " TOS := { NUMBER | inherit }\n" + msgstr " TOS := { NMERO | inherit }\n" + +-#: ../iptunnel.c:87 ++#: ../iptunnel.c:93 ++#, c-format + msgid " TTL := { 1..255 | inherit }\n" + msgstr " TTL := { 1..255 | inherit }\n" + +-#: ../iptunnel.c:88 ++#: ../iptunnel.c:94 ++#, c-format + msgid " KEY := { DOTTED_QUAD | NUMBER }\n" + msgstr " KEY := { QUATRO_NMEROS_SEPARADOS_POR_PONTOS | NMERO }\n" + +-#: ../iptunnel.c:326 ++#: ../iptunnel.c:332 ++#, c-format + msgid "Keys are not allowed with ipip and sit.\n" + msgstr "Chaves no so permitidas com ipip e sit.\n" + +-#: ../iptunnel.c:346 ++#: ../iptunnel.c:352 ++#, c-format + msgid "Broadcast tunnel requires a source address.\n" + msgstr "Um tnel de broadcast precisa de um endereo de origem.\n" + +-#: ../iptunnel.c:361 ++#: ../iptunnel.c:367 ++#, c-format + msgid "ttl != 0 and noptmudisc are incompatible\n" + msgstr "ttl != 0 e noptmudisc so incompatveis\n" + +-#: ../iptunnel.c:373 ++#: ../iptunnel.c:379 ++#, c-format + msgid "cannot determine tunnel mode (ipip, gre or sit)\n" + msgstr "no foi possvel determinar o modo do tnel (ip, gre ou sit)\n" + +-#: ../iptunnel.c:411 ++#: ../iptunnel.c:417 + #, c-format + msgid "%s: %s/ip remote %s local %s " + msgstr "%s: %s/ip remoto %s local %s " + +-#: ../iptunnel.c:415 ++#: ../iptunnel.c:421 + msgid "unknown" + msgstr "Desconhecido" + +-#: ../iptunnel.c:447 ++#: ../iptunnel.c:453 ++#, c-format + msgid " Drop packets out of sequence.\n" + msgstr " Descarte pacotes fora de seqncia.\n" + +-#: ../iptunnel.c:449 ++#: ../iptunnel.c:455 ++#, c-format + msgid " Checksum in received packet is required.\n" + msgstr " necessrio checksum nos pacotes recebidos.\n" + +-#: ../iptunnel.c:451 ++#: ../iptunnel.c:457 ++#, c-format + msgid " Sequence packets on output.\n" + msgstr " Seqencie pacotes na sada.\n" + +-#: ../iptunnel.c:453 ++#: ../iptunnel.c:459 ++#, c-format + msgid " Checksum output packets.\n" + msgstr " Calcule o checksum para pacotes de sada.\n" + +-#: ../iptunnel.c:481 ++#: ../iptunnel.c:487 ++#, c-format + msgid "Wrong format of /proc/net/dev. Sorry.\n" + msgstr "Formato errado de /proc/net/dev. Desculpe.\n" + +-#: ../iptunnel.c:494 ++#: ../iptunnel.c:500 + #, c-format + msgid "Failed to get type of [%s]\n" + msgstr "No foi possvel obter o tipo de [%s]\n" + +-#: ../iptunnel.c:510 ++#: ../iptunnel.c:516 ++#, c-format + msgid "RX: Packets Bytes Errors CsumErrs OutOfSeq Mcasts\n" + msgstr "RX: Pacotes Bytes Erros CsunErrs ForaSeq Mcasts\n" + +-#: ../iptunnel.c:513 ++#: ../iptunnel.c:519 ++#, c-format + msgid "TX: Packets Bytes Errors DeadLoop NoRoute NoBufs\n" + msgstr "TX: Pacotes Bytes Erros DeadLoop SemRota SemBufs\n" + +-#: ../statistics.c:45 ++#: ../statistics.c:47 + msgid "ICMP input histogram:" + msgstr "Histograma de entrada ICMP:" + +-#: ../statistics.c:46 ++#: ../statistics.c:48 + msgid "ICMP output histogram:" + msgstr "Histograma de sada ICMP" + +-#: ../statistics.c:63 ++#: ../statistics.c:65 + #, c-format + msgid "Forwarding is %s" + msgstr "Repassagem est %s" + +-#: ../statistics.c:64 +-#, c-format +-msgid "Default TTL is %d" ++#: ../statistics.c:66 ++#, fuzzy, c-format ++msgid "Default TTL is %u" + msgstr "Default TTL %d" + +-#: ../statistics.c:65 +-#, c-format +-msgid "%d total packets received" ++#: ../statistics.c:67 ++#, fuzzy, c-format ++msgid "%u total packets received" + msgstr "%d total de pacotes recebidos" + +-#: ../statistics.c:66 +-#, c-format +-msgid "%d with invalid headers" ++#: ../statistics.c:68 ++#, fuzzy, c-format ++msgid "%u with invalid headers" + msgstr "%d com cabealhos invlidos" + +-#: ../statistics.c:67 +-#, c-format +-msgid "%d with invalid addresses" ++#: ../statistics.c:69 ++#, fuzzy, c-format ++msgid "%u with invalid addresses" + msgstr "%d com endereos invlidos" + +-#: ../statistics.c:68 +-#, c-format +-msgid "%d forwarded" ++#: ../statistics.c:70 ++#, fuzzy, c-format ++msgid "%u forwarded" + msgstr "%d repassados" + +-#: ../statistics.c:69 +-#, c-format +-msgid "%d with unknown protocol" ++#: ../statistics.c:71 ++#, fuzzy, c-format ++msgid "%u with unknown protocol" + msgstr "%d com protocolo desconhecido" + +-#: ../statistics.c:70 +-#, c-format +-msgid "%d incoming packets discarded" ++#: ../statistics.c:72 ++#, fuzzy, c-format ++msgid "%u incoming packets discarded" + msgstr "%d pacotes entrantes descartados" + +-#: ../statistics.c:71 +-#, c-format +-msgid "%d incoming packets delivered" ++#: ../statistics.c:73 ++#, fuzzy, c-format ++msgid "%u incoming packets delivered" + msgstr "%d pacotes entrantes despachados" + +-#: ../statistics.c:72 +-#, c-format +-msgid "%d requests sent out" ++#: ../statistics.c:74 ++#, fuzzy, c-format ++msgid "%u requests sent out" + msgstr "%d requisies enviadas" + + #. ? +-#: ../statistics.c:73 +-#, c-format +-msgid "%d outgoing packets dropped" ++#: ../statistics.c:75 ++#, fuzzy, c-format ++msgid "%u outgoing packets dropped" + msgstr "%d pacotes saintes descartados" + +-#: ../statistics.c:74 +-#, c-format +-msgid "%d dropped because of missing route" ++#: ../statistics.c:76 ++#, fuzzy, c-format ++msgid "%u dropped because of missing route" + msgstr "%d descartados devido a falta de rota" + +-#: ../statistics.c:75 +-#, c-format +-msgid "%d fragments dropped after timeout" ++#: ../statistics.c:77 ++#, fuzzy, c-format ++msgid "%u fragments dropped after timeout" + msgstr "%d fragmentos descartados aps estouro de tempo" + +-#: ../statistics.c:76 +-#, c-format +-msgid "%d reassemblies required" ++#: ../statistics.c:78 ++#, fuzzy, c-format ++msgid "%u reassemblies required" + msgstr "%d remontagens requeridas" + + #. ? +-#: ../statistics.c:77 +-#, c-format +-msgid "%d packets reassembled ok" ++#: ../statistics.c:79 ++#, fuzzy, c-format ++msgid "%u packets reassembled ok" + msgstr "%d pacotes remontados sem problemas" + +-#: ../statistics.c:78 +-#, c-format +-msgid "%d packet reassembles failed" ++#: ../statistics.c:80 ++#, fuzzy, c-format ++msgid "%u packet reassembles failed" + msgstr "%d remontagens de pacotes falharam" + +-#: ../statistics.c:79 +-#, c-format +-msgid "%d fragments received ok" ++#: ../statistics.c:81 ++#, fuzzy, c-format ++msgid "%u fragments received ok" + msgstr "%d fragmentos recebidos sem problemas" + +-#: ../statistics.c:80 +-#, c-format +-msgid "%d fragments failed" ++#: ../statistics.c:82 ++#, fuzzy, c-format ++msgid "%u fragments failed" + msgstr "%d fragmentos falharam" + +-#: ../statistics.c:81 +-#, c-format +-msgid "%d fragments created" ++#: ../statistics.c:83 ++#, fuzzy, c-format ++msgid "%u fragments created" + msgstr "%d fragmentos criados" + +-#: ../statistics.c:86 +-#, c-format +-msgid "%d ICMP messages received" ++#: ../statistics.c:88 ++#, fuzzy, c-format ++msgid "%u ICMP messages received" + msgstr "%d mensagens ICMP recebidas" + +-#: ../statistics.c:87 +-#, c-format +-msgid "%d input ICMP message failed." ++#: ../statistics.c:89 ++#, fuzzy, c-format ++msgid "%u input ICMP message failed." + msgstr "%d mensagens ICMP entrantes falharam." + +-#: ../statistics.c:88 ../statistics.c:101 +-#, c-format +-msgid "destination unreachable: %d" ++#: ../statistics.c:90 ../statistics.c:103 ++#, fuzzy, c-format ++msgid "destination unreachable: %u" + msgstr "destino no alcanvel: %d" + +-#: ../statistics.c:89 +-#, c-format +-msgid "timeout in transit: %d" ++#: ../statistics.c:91 ++#, fuzzy, c-format ++msgid "timeout in transit: %u" + msgstr "estouro de tempo em trnsito: %d" + +-#: ../statistics.c:90 ../statistics.c:103 +-#, c-format +-msgid "wrong parameters: %d" ++#: ../statistics.c:92 ../statistics.c:105 ++#, fuzzy, c-format ++msgid "wrong parameters: %u" + msgstr "parmetros errados: %d" + + #. ? +-#: ../statistics.c:91 +-#, c-format +-msgid "source quenchs: %d" ++#: ../statistics.c:93 ++#, fuzzy, c-format ++msgid "source quenches: %u" + msgstr "source quenchs: %d" + +-#: ../statistics.c:92 +-#, c-format +-msgid "redirects: %d" ++#: ../statistics.c:94 ++#, fuzzy, c-format ++msgid "redirects: %u" + msgstr "redirees: %d" + +-#: ../statistics.c:93 +-#, c-format +-msgid "echo requests: %d" ++#: ../statistics.c:95 ++#, fuzzy, c-format ++msgid "echo requests: %u" + msgstr "requisies de eco: %d" + +-#: ../statistics.c:94 ../statistics.c:107 +-#, c-format +-msgid "echo replies: %d" ++#: ../statistics.c:96 ../statistics.c:109 ++#, fuzzy, c-format ++msgid "echo replies: %u" + msgstr "respostas de eco: %d" + +-#: ../statistics.c:95 +-#, c-format +-msgid "timestamp request: %d" ++#: ../statistics.c:97 ++#, fuzzy, c-format ++msgid "timestamp request: %u" + msgstr "requisies de timestamp: %d" + +-#: ../statistics.c:96 +-#, c-format +-msgid "timestamp reply: %d" ++#: ../statistics.c:98 ++#, fuzzy, c-format ++msgid "timestamp reply: %u" + msgstr "respostas a timestamps: %d" + +-#: ../statistics.c:97 +-#, c-format +-msgid "address mask request: %d" ++#: ../statistics.c:99 ++#, fuzzy, c-format ++msgid "address mask request: %u" + msgstr "requisies de mascara de endereo: %d" + + #. ? +-#: ../statistics.c:98 +-msgid "address mask replies" +-msgstr "resposta a mascara de endereo" ++#: ../statistics.c:100 ../statistics.c:113 ++#, fuzzy, c-format ++msgid "address mask replies: %u" ++msgstr "respostas a mscara de endereo: %d" + + #. ? +-#: ../statistics.c:99 +-#, c-format +-msgid "%d ICMP messages sent" ++#: ../statistics.c:101 ++#, fuzzy, c-format ++msgid "%u ICMP messages sent" + msgstr "%d mensagens ICMP enviadas" + +-#: ../statistics.c:100 +-#, c-format +-msgid "%d ICMP messages failed" ++#: ../statistics.c:102 ++#, fuzzy, c-format ++msgid "%u ICMP messages failed" + msgstr "%d mensagens ICMP falharam" + +-#: ../statistics.c:102 +-#, c-format +-msgid "time exceeded: %d" ++#: ../statistics.c:104 ++#, fuzzy, c-format ++msgid "time exceeded: %u" + msgstr "tempo excedido: %d" + + #. ? +-#: ../statistics.c:104 +-#, c-format +-msgid "source quench: %d" ++#: ../statistics.c:106 ++#, fuzzy, c-format ++msgid "source quench: %u" + msgstr "source quench: %d" + +-#: ../statistics.c:105 +-#, c-format +-msgid "redirect: %d" ++#: ../statistics.c:107 ++#, fuzzy, c-format ++msgid "redirect: %u" + msgstr "redirees: %d" + +-#: ../statistics.c:106 +-#, c-format +-msgid "echo request: %d" ++#: ../statistics.c:108 ++#, fuzzy, c-format ++msgid "echo request: %u" + msgstr "requisies de eco: %d" + +-#: ../statistics.c:108 +-#, c-format +-msgid "timestamp requests: %d" ++#: ../statistics.c:110 ++#, fuzzy, c-format ++msgid "timestamp requests: %u" + msgstr "requisies de timestamp: %d" + +-#: ../statistics.c:109 +-#, c-format +-msgid "timestamp replies: %d" ++#: ../statistics.c:111 ++#, fuzzy, c-format ++msgid "timestamp replies: %u" + msgstr "respostas a timestamp: %d" + +-#: ../statistics.c:110 +-#, c-format +-msgid "address mask requests: %d" ++#: ../statistics.c:112 ++#, fuzzy, c-format ++msgid "address mask requests: %u" + msgstr "requisies de mscara de endereo: %d" + +-#: ../statistics.c:111 +-#, c-format +-msgid "address mask replies: %d" +-msgstr "respostas a mscara de endereo: %d" +- +-#: ../statistics.c:116 ++#: ../statistics.c:118 + #, c-format + msgid "RTO algorithm is %s" + msgstr "Algortmo RTO %s" + +-#: ../statistics.c:120 +-#, c-format +-msgid "%d active connections openings" ++#: ../statistics.c:122 ++#, fuzzy, c-format ++msgid "%u active connections openings" + msgstr "%d tentativas de conexo falharam" + +-#: ../statistics.c:121 +-#, c-format +-msgid "%d passive connection openings" ++#: ../statistics.c:123 ++#, fuzzy, c-format ++msgid "%u passive connection openings" + msgstr "%d opens passivos" + +-#: ../statistics.c:122 +-#, c-format +-msgid "%d failed connection attempts" ++#: ../statistics.c:124 ++#, fuzzy, c-format ++msgid "%u failed connection attempts" + msgstr "%d tentativas de conexo falharam" + +-#: ../statistics.c:123 +-#, c-format +-msgid "%d connection resets received" ++#: ../statistics.c:125 ++#, fuzzy, c-format ++msgid "%u connection resets received" + msgstr "%d resets de conexo recebidas" + +-#: ../statistics.c:124 +-#, c-format +-msgid "%d connections established" ++#: ../statistics.c:126 ++#, fuzzy, c-format ++msgid "%u connections established" + msgstr "%d conexes estabelecidas" + +-#: ../statistics.c:125 +-#, c-format +-msgid "%d segments received" ++#: ../statistics.c:127 ++#, fuzzy, c-format ++msgid "%u segments received" + msgstr "%d segmentos recebidos" + +-#: ../statistics.c:126 +-#, c-format +-msgid "%d segments send out" ++#: ../statistics.c:128 ++#, fuzzy, c-format ++msgid "%u segments send out" + msgstr "%d segmentos enviados" + +-#: ../statistics.c:127 +-#, c-format +-msgid "%d segments retransmited" ++#: ../statistics.c:129 ++#, fuzzy, c-format ++msgid "%u segments retransmited" + msgstr "%d segmentos retransmitidos" + +-#: ../statistics.c:128 +-#, c-format +-msgid "%d bad segments received." ++#: ../statistics.c:130 ++#, fuzzy, c-format ++msgid "%u bad segments received." + msgstr "%d segmentos ruins recebidos." + +-#: ../statistics.c:129 +-#, c-format +-msgid "%d resets sent" ++#: ../statistics.c:131 ++#, fuzzy, c-format ++msgid "%u resets sent" + msgstr "%d resets enviados" + +-#: ../statistics.c:134 +-#, c-format +-msgid "%d packets received" ++#: ../statistics.c:136 ++#, fuzzy, c-format ++msgid "%u packets received" + msgstr "%d pacotes recebidos" + +-#: ../statistics.c:135 +-#, c-format +-msgid "%d packets to unknown port received." ++#: ../statistics.c:137 ++#, fuzzy, c-format ++msgid "%u packets to unknown port received." + msgstr "%d pacotes para portas desconhecidas recebidos." + +-#: ../statistics.c:136 +-#, c-format +-msgid "%d packet receive errors" ++#: ../statistics.c:138 ++#, fuzzy, c-format ++msgid "%u packet receive errors" + msgstr "%d erros de recepo de pacotes" + +-#: ../statistics.c:137 +-#, c-format +-msgid "%d packets sent" ++#: ../statistics.c:139 ++#, fuzzy, c-format ++msgid "%u packets sent" + msgstr "%d pacotes enviados" + +-#: ../statistics.c:142 ++#: ../statistics.c:144 ++#, fuzzy, c-format ++msgid "%u SYN cookies sent" ++msgstr "%d pacotes enviados" ++ ++#: ../statistics.c:145 ++#, fuzzy, c-format ++msgid "%u SYN cookies received" ++msgstr "%d pacotes recebidos" ++ ++#: ../statistics.c:146 ++#, fuzzy, c-format ++msgid "%u invalid SYN cookies received" ++msgstr "%d pacotes recebidos" ++ ++#: ../statistics.c:148 ++#, fuzzy, c-format ++msgid "%u resets received for embryonic SYN_RECV sockets" ++msgstr "%d resets recebidos para sockets embrinicos SYN_RECV" ++ ++#: ../statistics.c:150 ++#, fuzzy, c-format ++msgid "%u packets pruned from receive queue because of socket buffer overrun" ++msgstr "%d pacotes retirados da fila de recepo devido a sobreposio de buffers de sockets" ++ ++#. obsolete: 2.2.0 doesn't do that anymore ++#: ../statistics.c:153 ++#, fuzzy, c-format ++msgid "%u packets pruned from receive queue" ++msgstr "%d pacotes retirados da fila de fora de ordem (out-of-order)" ++ ++#: ../statistics.c:154 ++#, fuzzy, c-format ++msgid "" ++"%u packets dropped from out-of-order queue because of socket buffer overrun" ++msgstr "%d pacotes descartados da fila de fora de ordem devido a sobreposio de buffers de sockets" ++ ++#: ../statistics.c:156 ++#, fuzzy, c-format ++msgid "%u ICMP packets dropped because they were out-of-window" ++msgstr "%d pacotes ICMP descartados porque estavam fora da janela" ++ ++#: ../statistics.c:158 ++#, fuzzy, c-format ++msgid "%u ICMP packets dropped because socket was locked" ++msgstr "%d pacotes ICMP descartadas porque o socket estava bloqueado" ++ ++#: ../statistics.c:160 ++#, c-format ++msgid "%u TCP sockets finished time wait in fast timer" ++msgstr "" ++ ++#: ../statistics.c:161 ++#, c-format ++msgid "%u time wait sockets recycled by time stamp" ++msgstr "" ++ ++#: ../statistics.c:162 ++#, c-format ++msgid "%u TCP sockets finished time wait in slow timer" ++msgstr "" ++ ++#: ../statistics.c:163 ++#, c-format ++msgid "%u passive connections rejected because of time stamp" ++msgstr "" ++ ++#: ../statistics.c:165 ++#, c-format ++msgid "%u active connections rejected because of time stamp" ++msgstr "" ++ ++#: ../statistics.c:167 + #, c-format +-msgid "%d SYN cookies sent" ++msgid "%u packets rejects in established connections because of timestamp" ++msgstr "" ++ ++#: ../statistics.c:169 ++#, fuzzy, c-format ++msgid "%u delayed acks sent" + msgstr "%d pacotes enviados" + +-#: ../statistics.c:143 ++#: ../statistics.c:170 + #, c-format +-msgid "%d SYN cookies received" +-msgstr "%d pacotes recebidos" ++msgid "%u delayed acks further delayed because of locked socket" ++msgstr "" + +-#: ../statistics.c:144 ++#: ../statistics.c:172 + #, c-format +-msgid "%d invalid SYN cookies received" +-msgstr "%d pacotes recebidos" ++msgid "Quick ack mode was activated %u times" ++msgstr "" + +-#: ../statistics.c:146 ++#: ../statistics.c:173 + #, c-format +-msgid "%d resets received for embryonic SYN_RECV sockets" +-msgstr "%d resets recebidos para sockets embrinicos SYN_RECV" ++msgid "%u times the listen queue of a socket overflowed" ++msgstr "" + +-#: ../statistics.c:148 ++#: ../statistics.c:175 + #, c-format +-msgid "%d packets pruned from receive queue because of socket buffer overrun" ++msgid "%u SYNs to LISTEN sockets ignored" + msgstr "" +-"%d pacotes retirados da fila de recepo devido a sobreposio de buffers de " +-"sockets" + +-#. obsolete: 2.2.0 doesn't do that anymore +-#: ../statistics.c:151 ++#: ../statistics.c:176 ++#, c-format ++msgid "%u packets directly queued to recvmsg prequeue." ++msgstr "" ++ ++#: ../statistics.c:178 + #, c-format +-msgid "%d packets pruned from out-of-order queue" ++msgid "%u of bytes directly received from backlog" ++msgstr "" ++ ++#: ../statistics.c:180 ++#, c-format ++msgid "%u of bytes directly received from prequeue" ++msgstr "" ++ ++#: ../statistics.c:182 ++#, fuzzy, c-format ++msgid "%u packets dropped from prequeue" + msgstr "%d pacotes retirados da fila de fora de ordem (out-of-order)" + +-#: ../statistics.c:152 ++#: ../statistics.c:183 ++#, fuzzy, c-format ++msgid "%u packet headers predicted" ++msgstr "%d pacotes recebidos" ++ ++#: ../statistics.c:184 + #, c-format +-msgid "" +-"%d packets dropped from out-of-order queue because of socket buffer overrun" ++msgid "%u packets header predicted and directly queued to user" + msgstr "" +-"%d pacotes descartados da fila de fora de ordem devido a sobreposio de " +-"buffers de sockets" + +-#: ../statistics.c:154 ++#: ../statistics.c:186 + #, c-format +-msgid "%d ICMP packets dropped because they were out-of-window" +-msgstr "%d pacotes ICMP descartados porque estavam fora da janela" ++msgid "Ran %u times out of system memory during packet sending" ++msgstr "" + +-#: ../statistics.c:156 ++#: ../statistics.c:188 ++#, fuzzy, c-format ++msgid "%u acknowledgments not containing data received" ++msgstr "%d pacotes para portas desconhecidas recebidos." ++ ++#: ../statistics.c:189 + #, c-format +-msgid "%d ICMP packets dropped because socket was locked" +-msgstr "%d pacotes ICMP descartadas porque o socket estava bloqueado" ++msgid "%u predicted acknowledgments" ++msgstr "" ++ ++#: ../statistics.c:190 ++#, c-format ++msgid "%u times recovered from packet loss due to fast retransmit" ++msgstr "" ++ ++#: ../statistics.c:191 ++#, c-format ++msgid "%u times recovered from packet loss due to SACK data" ++msgstr "" ++ ++#: ../statistics.c:192 ++#, fuzzy, c-format ++msgid "%u bad SACKs received" ++msgstr "%d segmentos ruins recebidos." ++ ++#: ../statistics.c:193 ++#, c-format ++msgid "Detected reordering %u times using FACK" ++msgstr "" ++ ++#: ../statistics.c:194 ++#, c-format ++msgid "Detected reordering %u times using SACK" ++msgstr "" ++ ++#: ../statistics.c:195 ++#, c-format ++msgid "Detected reordering %u times using time stamp" ++msgstr "" ++ ++#: ../statistics.c:196 ++#, c-format ++msgid "Detected reordering %u times using reno fast retransmit" ++msgstr "" ++ ++#: ../statistics.c:197 ++#, c-format ++msgid "%u congestion windows fully recovered" ++msgstr "" ++ ++#: ../statistics.c:198 ++#, c-format ++msgid "%u congestion windows partially recovered using Hoe heuristic" ++msgstr "" ++ ++#: ../statistics.c:199 ++#, c-format ++msgid "%u congestion window recovered using DSACK" ++msgstr "" ++ ++#: ../statistics.c:200 ++#, c-format ++msgid "%u congestion windows recovered after partial ack" ++msgstr "" ++ ++#: ../statistics.c:201 ++#, fuzzy, c-format ++msgid "%u retransmits lost" ++msgstr "%d resets enviados" ++ ++#: ../statistics.c:202 ++#, c-format ++msgid "%u timeouts after reno fast retransmit" ++msgstr "" ++ ++#: ../statistics.c:203 ++#, c-format ++msgid "%u timeouts after SACK recovery" ++msgstr "" ++ ++#: ../statistics.c:204 ++#, c-format ++msgid "%u timeouts in loss state" ++msgstr "" ++ ++#: ../statistics.c:205 ++#, fuzzy, c-format ++msgid "%u fast retransmits" ++msgstr "%d segmentos retransmitidos" ++ ++#: ../statistics.c:206 ++#, c-format ++msgid "%u forward retransmits" ++msgstr "" ++ ++#: ../statistics.c:207 ++#, c-format ++msgid "%u retransmits in slow start" ++msgstr "" ++ ++#: ../statistics.c:208 ++#, c-format ++msgid "%u other TCP timeouts" ++msgstr "" ++ ++#: ../statistics.c:209 ++#, fuzzy, c-format ++msgid "%u reno fast retransmits failed" ++msgstr "%d segmentos retransmitidos" ++ ++#: ../statistics.c:210 ++#, fuzzy, c-format ++msgid "%u sack retransmits failed" ++msgstr "%d remontagens de pacotes falharam" ++ ++#: ../statistics.c:211 ++#, c-format ++msgid "%u times receiver scheduled too late for direct processing" ++msgstr "" ++ ++#: ../statistics.c:212 ++#, fuzzy, c-format ++msgid "%u packets collapsed in receive queue due to low socket buffer" ++msgstr "%d pacotes retirados da fila de recepo devido a sobreposio de buffers de sockets" ++ ++#: ../statistics.c:213 ++#, c-format ++msgid "%u DSACKs sent for old packets" ++msgstr "" ++ ++#: ../statistics.c:214 ++#, c-format ++msgid "%u DSACKs sent for out of order packets" ++msgstr "" ++ ++#: ../statistics.c:215 ++#, fuzzy, c-format ++msgid "%u DSACKs received" ++msgstr "%d pacotes recebidos" ++ ++#: ../statistics.c:216 ++#, fuzzy, c-format ++msgid "%u DSACKs for out of order packets received" ++msgstr "%d total de pacotes recebidos" ++ ++#: ../statistics.c:217 ++#, fuzzy, c-format ++msgid "%u connections reset due to unexpected SYN" ++msgstr "%d resets de conexo recebidas" ++ ++#: ../statistics.c:218 ++#, fuzzy, c-format ++msgid "%u connections reset due to unexpected data" ++msgstr "%d resets de conexo recebidas" ++ ++#: ../statistics.c:219 ++#, fuzzy, c-format ++msgid "%u connections reset due to early user close" ++msgstr "%d resets de conexo recebidas" ++ ++#: ../statistics.c:220 ++#, c-format ++msgid "%u connections aborted due to memory pressure" ++msgstr "" ++ ++#: ../statistics.c:221 ++#, fuzzy, c-format ++msgid "%u connections aborted due to timeout" ++msgstr "%d resets de conexo recebidas" + + #: ../statistics.c:222 ++#, c-format ++msgid "%u connections aborted after user close in linger timeout" ++msgstr "" ++ ++#: ../statistics.c:223 ++#, c-format ++msgid "%u times unabled to send RST due to no memory" ++msgstr "" ++ ++#: ../statistics.c:224 ++#, c-format ++msgid "TCP ran low on memory %u times" ++msgstr "" ++ ++#: ../statistics.c:225 ++#, c-format ++msgid "%u TCP data loss events" ++msgstr "" ++ ++#: ../statistics.c:292 + msgid "enabled" + msgstr "habilitado" + +-#: ../statistics.c:222 ++#: ../statistics.c:292 + msgid "disabled" + msgstr "desabilitado" + +-#: ../statistics.c:272 +-#, c-format +-msgid "unknown title %s\n" +-msgstr "ttulo %s desconhecido\n" +- +-#: ../statistics.c:298 ++#: ../statistics.c:375 + msgid "error parsing /proc/net/snmp" + msgstr "erro lendo /proc/net/snmp" + +-#: ../statistics.c:311 ++#: ../statistics.c:388 + msgid "cannot open /proc/net/snmp" + msgstr "no foi possvel abrir /proc/net/snmp" + +@@ -1819,89 +2074,95 @@ msgstr "O tipo de hardware `%s' no su + msgid "Cannot change line discipline to `%s'.\n" + msgstr "No foi possvel mudar a disciplina da linha para `%s'.\n" + +-#: ../lib/af.c:145 ../lib/hw.c:148 ++#: ../lib/af.c:153 ../lib/hw.c:161 + msgid "UNSPEC" + msgstr "No Especificado" + +-#: ../lib/af.c:147 ++#: ../lib/af.c:155 + msgid "UNIX Domain" + msgstr "UNIX Domain" + +-#: ../lib/af.c:150 ++#: ../lib/af.c:158 + msgid "DARPA Internet" + msgstr "DARPA Internet" + +-#: ../lib/af.c:153 ++#: ../lib/af.c:161 + msgid "IPv6" + msgstr "IPv6" + +-#: ../lib/af.c:156 ../lib/hw.c:169 ++#: ../lib/af.c:164 ../lib/hw.c:182 + msgid "AMPR AX.25" + msgstr "AX.25 AMPR" + +-#: ../lib/af.c:159 ../lib/hw.c:175 ++#: ../lib/af.c:167 ../lib/hw.c:188 + msgid "AMPR NET/ROM" + msgstr "NET/ROM AMPR" + +-#: ../lib/af.c:162 ++#: ../lib/af.c:170 + msgid "Novell IPX" + msgstr "Novell IPX" + +-#: ../lib/af.c:165 ++#: ../lib/af.c:173 + msgid "Appletalk DDP" + msgstr "Appletalk DDP" + +-#: ../lib/af.c:168 ../lib/hw.c:207 ++#: ../lib/af.c:176 ../lib/hw.c:223 + msgid "Econet" + msgstr "Econet" + +-#: ../lib/af.c:171 ../lib/hw.c:172 ++#: ../lib/af.c:179 ++msgid "CCITT X.25" ++msgstr "" ++ ++#: ../lib/af.c:182 ../lib/hw.c:185 + msgid "AMPR ROSE" + msgstr "AMPR ROSE" + +-#: ../lib/af.c:174 ../lib/hw.c:160 ++#: ../lib/af.c:185 ../lib/hw.c:173 + msgid "Ash" + msgstr "Ash" + +-#: ../lib/af.c:232 ++#: ../lib/af.c:243 ++#, c-format + msgid "Please don't supply more than one address family.\n" + msgstr "Por favor no especifique mais que uma famlia de endereos.\n" + +-#: ../lib/af.c:293 ++#: ../lib/af.c:304 ++#, c-format + msgid "Too much address family arguments.\n" + msgstr "Excesso no nmero de famlias de endereos.\n" + +-#: ../lib/af.c:304 ++#: ../lib/af.c:315 + #, c-format + msgid "Unknown address family `%s'.\n" + msgstr "Famlia de endereos `%s' desconhecida.\n" + +-#: ../lib/arcnet.c:53 ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 +-#: ../lib/fddi.c:67 ../lib/hippi.c:68 ../lib/inet.c:244 ../lib/inet.c:259 +-#: ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 ../lib/rose.c:71 +-#: ../lib/rose.c:126 ../lib/unix.c:56 ../lib/unix.c:76 +-msgid "[NONE SET]" +-msgstr "[Nenhum configurado]" +- +-#: ../lib/arcnet.c:81 ../lib/arcnet.c:96 ++#: ../lib/arcnet.c:70 ../lib/arcnet.c:85 + #, c-format + msgid "in_arcnet(%s): invalid arcnet address!\n" + msgstr "in_arcnet(%s): endereo arcnet invlido!\n" + +-#: ../lib/arcnet.c:108 ++#: ../lib/arcnet.c:97 + #, c-format + msgid "in_arcnet(%s): trailing : ignored!\n" + msgstr "in_arcnet(%s): trailing : ignorado!\n" + +-#: ../lib/arcnet.c:120 ++#: ../lib/arcnet.c:109 + #, c-format + msgid "in_arcnet(%s): trailing junk!\n" + msgstr "in_arcnet(%s): lixo no trailing!\n" + + #: ../lib/ash.c:81 ++#, c-format + msgid "Malformed Ash address" + msgstr "Endereo Ash mal formado" + ++#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244 ++#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 ++#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76 ++msgid "[NONE SET]" ++msgstr "[Nenhum configurado]" ++ + #: ../lib/ax25.c:97 ../lib/netrom.c:100 + msgid "Invalid callsign" + msgstr "Callsign invlido" +@@ -1911,22 +2172,21 @@ msgid "Callsign too long" + msgstr "Callsign muito longo" + + #: ../lib/ax25_gr.c:47 ++#, c-format + msgid "AX.25 not configured in this system.\n" + msgstr "O AX.25 no foi configurado neste sistema.\n" + + #: ../lib/ax25_gr.c:50 ++#, c-format + msgid "Kernel AX.25 routing table\n" + msgstr "Tabela de roteamento AX.25 do kernel\n" + + #. xxx + #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55 ++#, c-format + msgid "Destination Iface Use\n" + msgstr "Destino Iface Uso\n" + +-#: ../lib/ddp_gr.c:21 +-msgid "Routing table for `ddp' not yet supported.\n" +-msgstr "Tabela de roteamento para `ddp' ainda no suportada.\n" +- + #: ../lib/ether.c:74 ../lib/ether.c:91 + #, c-format + msgid "in_ether(%s): invalid ether address!\n" +@@ -1942,253 +2202,268 @@ msgstr "in_ether(%s): trailing : ignorad + msgid "in_ether(%s): trailing junk!\n" + msgstr "in_ether(%s): lixo no trailing!\n" + +-#: ../lib/fddi.c:95 ../lib/fddi.c:110 ++#: ../lib/fddi.c:84 ../lib/fddi.c:99 + #, c-format + msgid "in_fddi(%s): invalid fddi address!\n" + msgstr "in_fddi(%S): endereo fddi invlido!\n" + +-#: ../lib/fddi.c:122 ++#: ../lib/fddi.c:111 + #, c-format + msgid "in_fddi(%s): trailing : ignored!\n" + msgstr "in_fddi(%s): trailing : ignorado!\n" + +-#: ../lib/fddi.c:134 ++#: ../lib/fddi.c:123 + #, c-format + msgid "in_fddi(%s): trailing junk!\n" + msgstr "in_fddi(%s): lixo no trailing!\n" + +-#: ../lib/getroute.c:97 ../lib/setroute.c:76 ++#: ../lib/getroute.c:101 ../lib/setroute.c:80 + #, c-format + msgid "Address family `%s' not supported.\n" + msgstr "Famlia de endereos `%s' no suportada.\n" + +-#: ../lib/getroute.c:103 ../lib/setroute.c:80 ++#: ../lib/getroute.c:107 ../lib/setroute.c:84 + #, c-format + msgid "No routing for address family `%s'.\n" + msgstr "Nenhum roteamento para a famlia `%s'\n" + +-#: ../lib/hippi.c:96 ../lib/hippi.c:111 ++#: ../lib/hippi.c:84 ../lib/hippi.c:99 + #, c-format + msgid "in_hippi(%s): invalid hippi address!\n" + msgstr "in_fddi(%S): endereo fddi invlido!\n" + +-#: ../lib/hippi.c:123 ++#: ../lib/hippi.c:111 + #, c-format + msgid "in_hippi(%s): trailing : ignored!\n" + msgstr "in_fddi(%s): trailing : ignorado!\n" + +-#: ../lib/hippi.c:134 ++#: ../lib/hippi.c:122 + #, c-format + msgid "in_hippi(%s): trailing junk!\n" + msgstr "in_fddi(%s): lixo no trailing!\n" + +-#: ../lib/hw.c:147 ++#: ../lib/hw.c:160 + msgid "Local Loopback" + msgstr "Loopback Local" + +-#: ../lib/hw.c:150 ++#: ../lib/hw.c:163 + msgid "Serial Line IP" + msgstr "SLIP" + +-#: ../lib/hw.c:151 ++#: ../lib/hw.c:164 + msgid "VJ Serial Line IP" + msgstr "SLIP VJ" + +-#: ../lib/hw.c:152 ++#: ../lib/hw.c:165 + msgid "6-bit Serial Line IP" + msgstr "SLIP 6 bits" + +-#: ../lib/hw.c:153 ++#: ../lib/hw.c:166 + msgid "VJ 6-bit Serial Line IP" + msgstr "SLIP VJ 6 bits" + +-#: ../lib/hw.c:154 ++#: ../lib/hw.c:167 + msgid "Adaptive Serial Line IP" + msgstr "SLIP Adaptativo" + +-#: ../lib/hw.c:157 ++#: ../lib/hw.c:170 + msgid "Ethernet" + msgstr "Ethernet" + +-#: ../lib/hw.c:163 ++#: ../lib/hw.c:176 + msgid "Fiber Distributed Data Interface" + msgstr "FDDI - Fibra tica" + +-#: ../lib/hw.c:166 ++#: ../lib/hw.c:179 + msgid "HIPPI" + msgstr "HIPPI" + +-#: ../lib/hw.c:178 ++#: ../lib/hw.c:191 ++msgid "generic X.25" ++msgstr "" ++ ++#: ../lib/hw.c:194 + msgid "IPIP Tunnel" + msgstr "Tnel IPIP" + +-#: ../lib/hw.c:181 ++#: ../lib/hw.c:197 + msgid "Point-to-Point Protocol" + msgstr "Protocolo Ponto-a-Ponto" + +-#: ../lib/hw.c:184 ++#: ../lib/hw.c:200 + msgid "(Cisco)-HDLC" + msgstr "(Cisco)-HDLC" + +-#: ../lib/hw.c:185 ++#: ../lib/hw.c:201 + msgid "LAPB" + msgstr "LAPB" + +-#: ../lib/hw.c:188 ++#: ../lib/hw.c:204 + msgid "ARCnet" + msgstr "ARCnet" + +-#: ../lib/hw.c:191 ++#: ../lib/hw.c:207 + msgid "Frame Relay DLCI" + msgstr "Frame Relay DLCI" + +-#: ../lib/hw.c:192 ++#: ../lib/hw.c:208 + msgid "Frame Relay Access Device" + msgstr "FRAD - Dispositivo de Acesso a Frame Relay" + +-#: ../lib/hw.c:195 ++#: ../lib/hw.c:211 + msgid "IPv6-in-IPv4" + msgstr "IPv6 sobre IPv4" + +-#: ../lib/hw.c:198 ++#: ../lib/hw.c:214 + msgid "IrLAP" + msgstr "IrLAP" + +-#: ../lib/hw.c:201 ++#: ../lib/hw.c:217 + msgid "16/4 Mbps Token Ring" + msgstr "16/4 Mbps Token Ring" + +-#: ../lib/hw.c:203 ++#: ../lib/hw.c:219 + msgid "16/4 Mbps Token Ring (New)" + msgstr "16/4 Mbps Token Ring (Novo)" + ++#: ../lib/hw.c:226 ++msgid "Generic EUI-64" ++msgstr "" ++ + #: ../lib/inet.c:153 ../lib/inet6.c:79 + #, c-format + msgid "rresolve: unsupport address family %d !\n" + msgstr "rresolve: famlia de endereos %d no suportada!\n" + +-#: ../lib/inet6_gr.c:79 ++#: ../lib/inet6.c:131 ++#, fuzzy ++msgid "[UNKNOWN]" ++msgstr "DESCONHECIDA" ++ ++#: ../lib/inet6_gr.c:71 ++#, c-format + msgid "INET6 (IPv6) not configured in this system.\n" + msgstr "NET/ROM no configurado neste sistema.\n" + +-#: ../lib/inet6_gr.c:82 ++#: ../lib/inet6_gr.c:74 ++#, c-format + msgid "Kernel IPv6 routing table\n" + msgstr "Tabela de Roteamento IPv6 do Kernel\n" + +-#: ../lib/inet6_gr.c:84 ++#: ../lib/inet6_gr.c:76 ++#, c-format + msgid "" +-"Destination Next Hop " +-" Flags Metric Ref Use Iface\n" +-msgstr "" +-"Destino Prximo \"Hop\" " +-" Opes Mtrica Ref Uso Iface\n" ++"Destination Next " ++"Hop Flags Metric Ref Use Iface\n" ++msgstr "Destino Prximo \"Hop\" Opes Mtrica Ref Uso Iface\n" + +-#: ../lib/inet6_gr.c:158 ++#: ../lib/inet6_gr.c:150 ++#, c-format + msgid "Kernel IPv6 Neighbour Cache\n" + msgstr "Cache de Vizinhos IPv6 do Kernel\n" + +-#: ../lib/inet6_gr.c:161 ++#: ../lib/inet6_gr.c:153 ++#, c-format + msgid "" + "Neighbour HW Address Iface Flags " + "Ref State\n" +-msgstr "" +-"Vizinho Endereo HW Iface Opes " +-"Estado Ref\n" ++msgstr "Vizinho Endereo HW Iface Opes Estado Ref\n" + +-#: ../lib/inet6_gr.c:165 ++#: ../lib/inet6_gr.c:157 ++#, c-format + msgid "" + "Neighbour HW Address Iface Flags " + "Ref State Stale(sec) Delete(sec)\n" + msgstr "" +-"Vizinho Endereo HW Iface Opes " +-"Estado Ref\n" ++"Vizinho Endereo HW Iface Opes Estado Ref\n" + " Parado(seg) Remover(seg)\n" + + #: ../lib/inet6_sr.c:46 ++#, c-format + msgid "Usage: inet6_route [-vF] del Target\n" + msgstr "Uso: inet6_route [-vF] del Destino\n" + + #: ../lib/inet6_sr.c:47 ++#, c-format + msgid " inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n" + msgstr " inet6_route [-vF] add Destino [gw Gw] [metric M] [[dev] If]\n" + + #: ../lib/inet6_sr.c:48 ++#, c-format + msgid " inet6_route [-FC] flush NOT supported\n" + msgstr " inet6_route [-FC] flush NO suportado\n" + +-#: ../lib/inet6_sr.c:182 ++#: ../lib/inet6_sr.c:188 ++#, c-format + msgid "Flushing `inet6' routing table not supported\n" + msgstr "Limpeza da tabela de roteamento `inet6' no suportada\n" + + #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220 ++#, c-format + msgid "INET (IPv4) not configured in this system.\n" + msgstr "NET/ROM no configurado neste sistema.\n" + + #: ../lib/inet_gr.c:53 ++#, c-format + msgid "Kernel IP routing table\n" + msgstr "Tabela de Roteamento IP do Kernel\n" + + #: ../lib/inet_gr.c:56 ++#, c-format + msgid "" + "Destination Gateway Genmask Flags Metric Ref Use " + "Iface\n" +-msgstr "" +-"Destino Roteador MscaraGen. Opes Mtrica Ref Uso " +-"Iface\n" ++msgstr "Destino Roteador MscaraGen. Opes Mtrica Ref Uso Iface\n" + + #: ../lib/inet_gr.c:59 ++#, c-format + msgid "" + "Destination Gateway Genmask Flags MSS Window irtt " + "Iface\n" +-msgstr "" +-"Destino Roteador MscaraGen. Opes MSS Janela irtt " +-"Iface\n" ++msgstr "Destino Roteador MscaraGen. Opes MSS Janela irtt Iface\n" + + #: ../lib/inet_gr.c:62 ++#, c-format + msgid "" + "Destination Gateway Genmask Flags Metric Ref Use " + "Iface MSS Window irtt\n" +-msgstr "" +-"Destino Roteador MscaraGen Opes Mtrica Ref Uso " +-"Iface MSS Janela irtt\n" ++msgstr "Destino Roteador MscaraGen Opes Mtrica Ref Uso Iface MSS Janela irtt\n" + + #: ../lib/inet_gr.c:237 ++#, c-format + msgid "Kernel IP routing cache\n" + msgstr "Tabela de Roteamento IP do Kernel\n" + + #: ../lib/inet_gr.c:258 ++#, c-format + msgid "" + "Source Destination Gateway Flags Metric Ref Use " + "Iface\n" +-msgstr "" +-"Destino Roteador MscaraGen. Opes Mtrica Ref Uso " +-"Iface\n" ++msgstr "Destino Roteador MscaraGen. Opes Mtrica Ref Uso Iface\n" + + #: ../lib/inet_gr.c:261 ++#, c-format + msgid "" + "Source Destination Gateway Flags MSS Window irtt " + "Iface\n" +-msgstr "" +-"Destino Roteador MscaraGen. Opes MSS Janela irtt " +-"Iface\n" ++msgstr "Destino Roteador MscaraGen. Opes MSS Janela irtt Iface\n" + + #: ../lib/inet_gr.c:266 ++#, c-format + msgid "" + "Source Destination Gateway Flags Metric Ref Use " + "Iface MSS Window irtt HH Arp\n" +-msgstr "" +-"Destino Roteador Origem Opes Mtrica Ref Uso " +-"Iface MSS Janela irtt HH Arp\n" ++msgstr "Destino Roteador Origem Opes Mtrica Ref Uso Iface MSS Janela irtt HH Arp\n" + + #: ../lib/inet_gr.c:290 ++#, c-format + msgid "" + "Source Destination Gateway Flags Metric Ref Use " + "Iface MSS Window irtt TOS HHRef HHUptod SpecDst\n" +-msgstr "" +-"Destino Roteador Origem Opes Mtrica Ref Uso " +-"Iface MSS Janela irtt HH Arp\n" ++msgstr "Destino Roteador Origem Opes Mtrica Ref Uso Iface MSS Janela irtt HH Arp\n" + +-#: ../lib/inet_sr.c:50 ++#: ../lib/inet_sr.c:51 ++#, c-format + msgid "" + "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] " + "[[dev] If]\n" +@@ -2196,31 +2471,36 @@ msgstr "" + "Uso: inet_route [-vF] del {-host|-net} Destino[/prefixo] [gw Gw] [metric M] " + "[[dev] If]\n" + +-#: ../lib/inet_sr.c:51 ++#: ../lib/inet_sr.c:52 ++#, c-format + msgid "" + " inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n" + msgstr "" + " inet_route [-vF] add {-host|-net} Destino[/prefixo] [gw Gw] [metric " + "M]\n" + +-#: ../lib/inet_sr.c:52 ++#: ../lib/inet_sr.c:53 ++#, c-format + msgid "" + " [netmask N] [mss Mss] [window W] [irtt I]\n" + msgstr "" + " [netmask N] [mss Mss] [window W] [irtt I]\n" + +-#: ../lib/inet_sr.c:53 ++#: ../lib/inet_sr.c:54 ++#, c-format + msgid " [mod] [dyn] [reinstate] [[dev] If]\n" + msgstr " [mod] [dyn] [reinstate] [[dev] If]\n" + +-#: ../lib/inet_sr.c:54 ++#: ../lib/inet_sr.c:55 ++#, c-format + msgid "" + " inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n" + msgstr "" + " inet_route [-vF] add {-host|-net} Destino[/prefixo] [metric M] " + "reject\n" + +-#: ../lib/inet_sr.c:55 ++#: ../lib/inet_sr.c:56 ++#, c-format + msgid " inet_route [-FC] flush NOT supported\n" + msgstr " inet_route [-FC] flush NO suportado\n" + +@@ -2230,14 +2510,17 @@ msgid "route: %s: cannot use a NETWORK a + msgstr "route: %s: no possvel usar uma REDE como roteador!\n" + + #: ../lib/inet_sr.c:174 ++#, c-format + msgid "route: Invalid MSS/MTU.\n" + msgstr "route: MSS invlido.\n" + + #: ../lib/inet_sr.c:187 ++#, c-format + msgid "route: Invalid window.\n" + msgstr "route: janela invlida.\n" + + #: ../lib/inet_sr.c:203 ++#, c-format + msgid "route: Invalid initial rtt.\n" + msgstr "route: rtt inicial invlido.\n" + +@@ -2252,75 +2535,92 @@ msgid "route: bogus netmask %s\n" + msgstr "route: netmask %s invlida\n" + + #: ../lib/inet_sr.c:270 ++#, c-format + msgid "route: netmask doesn't match route address\n" + msgstr "route: a netmask no casa com o endereo de rede\n" + + #: ../lib/inet_sr.c:306 ++#, c-format + msgid "Flushing `inet' routing table not supported\n" + msgstr "No suportado limpar a tabela de roteamento `inet'\n" + + #: ../lib/inet_sr.c:310 ++#, c-format + msgid "Modifying `inet' routing cache not supported\n" + msgstr "No suportado modificar o cache de roteamento `inet'\n" + + #: ../lib/ipx_gr.c:52 ++#, c-format + msgid "IPX not configured in this system.\n" + msgstr "O AX.25 no foi configurado neste sistema.\n" + + #: ../lib/ipx_gr.c:56 ++#, c-format + msgid "Kernel IPX routing table\n" + msgstr "Tabela de roteamento IPX do kernel\n" + + #. xxx + #: ../lib/ipx_gr.c:57 ++#, c-format + msgid "Destination Router Net Router Node\n" + msgstr "Destino Rede Roteadora N Roteador\n" + + #: ../lib/ipx_sr.c:33 ++#, c-format + msgid "IPX: this needs to be written\n" + msgstr "NET/ROM: isto precisa ser escrito\n" + +-#: ../lib/masq_info.c:197 ++#: ../lib/masq_info.c:198 ++#, c-format + msgid "IP masquerading entries\n" + msgstr "Entradas de IP mascarado\n" + +-#: ../lib/masq_info.c:200 ++#: ../lib/masq_info.c:201 ++#, c-format + msgid "prot expire source destination ports\n" + msgstr "prot expira origem destino portas\n" + +-#: ../lib/masq_info.c:203 ++#: ../lib/masq_info.c:204 ++#, c-format + msgid "" +-"prot expire initseq delta prevd source destination " +-" ports\n" ++"prot expire initseq delta prevd source " ++"destination ports\n" + msgstr "" +-"prot expira initseq delta prevd origem destino " +-" portas\n" ++"prot expira initseq delta prevd origem " ++"destino portas\n" + + #: ../lib/netrom_gr.c:48 ++#, c-format + msgid "NET/ROM not configured in this system.\n" + msgstr "NET/ROM no configurado neste sistema.\n" + + #: ../lib/netrom_gr.c:51 ++#, c-format + msgid "Kernel NET/ROM routing table\n" + msgstr "Tabela de roteamento NET/ROM do kernel\n" + + #: ../lib/netrom_gr.c:52 ++#, c-format + msgid "Destination Mnemonic Quality Neighbour Iface\n" + msgstr "Destino Mnemnico Qualidade Vizinho Iface\n" + + #: ../lib/netrom_sr.c:34 ++#, c-format + msgid "netrom usage\n" + msgstr "uso de netrom\n" + + #: ../lib/netrom_sr.c:44 ++#, c-format + msgid "NET/ROM: this needs to be written\n" + msgstr "NET/ROM: isto precisa ser escrito\n" + + #: ../lib/ppp.c:44 ++#, c-format + msgid "You cannot start PPP with this program.\n" + msgstr "Voc no pode iniciar o PPP com este programa.\n" + + #: ../lib/ppp_ac.c:38 ++#, c-format + msgid "Sorry, use pppd!\n" + msgstr "Desculpe, use o pppd!\n" + +@@ -2329,51 +2629,314 @@ msgid "Node address must be ten digits" + msgstr "Endereo do n deve ter dez dgitos" + + #: ../lib/rose_gr.c:51 ++#, c-format + msgid "ROSE not configured in this system.\n" + msgstr "ROSE no configurada neste sistema.\n" + + #: ../lib/rose_gr.c:54 ++#, c-format + msgid "Kernel ROSE routing table\n" + msgstr "Tabela de roteamento ROSE do kernel\n" + +-#: ../lib/tr.c:70 ../lib/tr.c:85 ++#: ../lib/tr.c:86 ../lib/tr.c:101 + #, c-format + msgid "in_tr(%s): invalid token ring address!\n" + msgstr "in_tr(%s): endereo token ring invlido!\n" + +-#: ../lib/tr.c:97 ++#: ../lib/tr.c:113 + #, c-format + msgid "in_tr(%s): trailing : ignored!\n" + msgstr "in_tr(%s): trailing : ignorado!\n" + +-#: ../lib/tr.c:109 ++#: ../lib/tr.c:125 + #, c-format + msgid "in_tr(%s): trailing junk!\n" + msgstr "in_tr(%s): lixo no trailing!\n" + +-#: ../lib/interface.c:124 ++#: ../lib/interface.c:176 + #, c-format + msgid "warning: no inet socket available: %s\n" + msgstr "ateno: nenhum socket inet disponvel: %s\n" + +-#: ../lib/interface.c:270 ++#: ../lib/interface.c:325 + #, c-format + msgid "Warning: cannot open %s (%s). Limited output.\n" + msgstr "Ateno: no foi possvel abrir %s (%s). Sada limitada.\n" + + #. Give better error message for this case. +-#: ../lib/interface.c:504 ++#: ../lib/interface.c:571 + msgid "Device not found" + msgstr "%s: dispositivo no encontrado" + +-#: ../lib/interface.c:508 ++#: ../lib/interface.c:575 + #, c-format + msgid "%s: error fetching interface information: %s\n" ++msgstr "%s: erro obtendo informaes da interface: %s\n" ++ ++#: ../lib/interface.c:608 ++msgid " - no statistics available -" ++msgstr " - estatsticas no disponveis -" ++ ++#: ../lib/interface.c:612 ++#, c-format ++msgid "[NO FLAGS]" ++msgstr "[SEM FLAGS]" ++ ++#: ../lib/interface.c:688 ++#, c-format ++msgid "%-9.9s Link encap:%s " ++msgstr "%-9.9s Encapsulamento do Link: %s " ++ ++#: ../lib/interface.c:693 ++#, c-format ++msgid "HWaddr %s " ++msgstr "Endereo de HW %s " ++ ++#: ../lib/interface.c:696 ++#, c-format ++msgid "Media:%s" ++msgstr "Mdia:%s" ++ ++#: ../lib/interface.c:698 ++#, c-format ++msgid "(auto)" ++msgstr "(auto)" ++ ++#: ../lib/interface.c:705 ++#, c-format ++msgid " %s addr:%s " ++msgstr " %s end.: %s " ++ ++#: ../lib/interface.c:708 ++#, c-format ++msgid " P-t-P:%s " ++msgstr " P-a-P:%s " ++ ++#: ../lib/interface.c:711 ++#, c-format ++msgid " Bcast:%s " ++msgstr " Bcast:%s " ++ ++#: ../lib/interface.c:713 ++#, c-format ++msgid " Mask:%s\n" ++msgstr " Masc:%s\n" ++ ++#: ../lib/interface.c:730 ++#, c-format ++msgid " inet6 addr: %s/%d" ++msgstr " endereo inet6: %s/%d" ++ ++#: ../lib/interface.c:732 ++#, c-format ++msgid " Scope:" ++msgstr " Escopo:" ++ ++#: ../lib/interface.c:735 ++#, c-format ++msgid "Global" ++msgstr "Global" ++ ++#: ../lib/interface.c:738 ++#, c-format ++msgid "Link" ++msgstr "Link" ++ ++#: ../lib/interface.c:741 ++#, c-format ++msgid "Site" ++msgstr "Site" ++ ++#: ../lib/interface.c:744 ++#, c-format ++msgid "Compat" ++msgstr "Compat" ++ ++#: ../lib/interface.c:747 ++#, c-format ++msgid "Host" ++msgstr "Mquina" ++ ++#: ../lib/interface.c:750 ++#, c-format ++msgid "Unknown" ++msgstr "Desconhecido" ++ ++#: ../lib/interface.c:765 ++#, c-format ++msgid " IPX/Ethernet II addr:%s\n" ++msgstr " Endereo IPX/Ethernet II:%s\n" ++ ++#: ../lib/interface.c:768 ++#, c-format ++msgid " IPX/Ethernet SNAP addr:%s\n" ++msgstr " Endereo IPX/Ethernet SNAP:%s\n" ++ ++#: ../lib/interface.c:771 ++#, c-format ++msgid " IPX/Ethernet 802.2 addr:%s\n" ++msgstr " Endereo IPX/Ethernet 802.2:%s\n" ++ ++#: ../lib/interface.c:774 ++#, c-format ++msgid " IPX/Ethernet 802.3 addr:%s\n" ++msgstr " Endereo IPX/Ethernet 802.3:%s\n" ++ ++#: ../lib/interface.c:784 ++#, c-format ++msgid " EtherTalk Phase 2 addr:%s\n" ++msgstr " Endereo EtherTalk fase 2:%s\n" ++ ++#: ../lib/interface.c:793 ++#, c-format ++msgid " econet addr:%s\n" ++msgstr " Endereo econet:%s\n" ++ ++#: ../lib/interface.c:800 ++#, c-format ++msgid "[NO FLAGS] " ++msgstr "[NENHUMA FLAG] " ++ ++#: ../lib/interface.c:802 ++#, c-format ++msgid "UP " ++msgstr "UP " ++ ++#: ../lib/interface.c:804 ++#, c-format ++msgid "BROADCAST " ++msgstr "BROADCAST" ++ ++#: ../lib/interface.c:806 ++#, c-format ++msgid "DEBUG " ++msgstr "DEBUG " ++ ++#: ../lib/interface.c:808 ++#, c-format ++msgid "LOOPBACK " ++msgstr "LOOPBACK" ++ ++#: ../lib/interface.c:810 ++#, c-format ++msgid "POINTOPOINT " ++msgstr "POINTOPOINT " ++ ++#: ../lib/interface.c:812 ++#, c-format ++msgid "NOTRAILERS " ++msgstr "NOTRAILERS " ++ ++#: ../lib/interface.c:814 ++#, c-format ++msgid "RUNNING " ++msgstr "RUNNING " ++ ++#: ../lib/interface.c:816 ++#, c-format ++msgid "NOARP " ++msgstr "NOARP " ++ ++#: ../lib/interface.c:818 ++#, c-format ++msgid "PROMISC " ++msgstr "PROMISC " ++ ++#: ../lib/interface.c:820 ++#, c-format ++msgid "ALLMULTI " ++msgstr "ALLMULTI " ++ ++#: ../lib/interface.c:822 ++#, c-format ++msgid "SLAVE " ++msgstr "SLAVE " ++ ++#: ../lib/interface.c:824 ++#, c-format ++msgid "MASTER " ++msgstr "MASTER " ++ ++#: ../lib/interface.c:826 ++#, c-format ++msgid "MULTICAST " ++msgstr "MULTICAST " ++ ++#: ../lib/interface.c:829 ++#, c-format ++msgid "DYNAMIC " ++msgstr "DYNAMIC " ++ ++#. DONT FORGET TO ADD THE FLAGS IN ife_print_short ++#: ../lib/interface.c:832 ++#, c-format ++msgid " MTU:%d Metric:%d" ++msgstr " MTU:%d Mtrica:%d" ++ ++#: ../lib/interface.c:836 ++#, c-format ++msgid " Outfill:%d Keepalive:%d" ++msgstr " Outfill:%d Keepalive:%d" ++ ++#: ../lib/interface.c:850 ++#, fuzzy, c-format ++msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" ++msgstr "Pacotes RX:%lu erros:%lu descartados:%lu sobreposies:%lu frame:%lu\n" ++ ++#: ../lib/interface.c:855 ++#, c-format ++msgid " compressed:%lu\n" ++msgstr " compactados:%lu\n" ++ ++#: ../lib/interface.c:895 ++#, fuzzy, c-format ++msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" ++msgstr "Pacotes TX:%lu erros:%lu descartados:%lu sobreposies:%lu portadora:%lu\n" ++ ++#: ../lib/interface.c:899 ++#, c-format ++msgid " collisions:%lu " ++msgstr " colises:%lu " ++ ++#: ../lib/interface.c:901 ++#, c-format ++msgid "compressed:%lu " ++msgstr "compactados:%lu " ++ ++#: ../lib/interface.c:903 ++#, c-format ++msgid "txqueuelen:%d " ++msgstr "txqueuelen:%d " ++ ++#: ../lib/interface.c:905 ++#, c-format ++msgid "RX bytes:%llu (%lu.%lu %s) TX bytes:%llu (%lu.%lu %s)\n" + msgstr "" +-"%s: erro obtendo informaes da interface: %s\n" +-"\n" + +-#: ../lib/sockets.c:59 ++#: ../lib/interface.c:916 ++#, c-format ++msgid "Interrupt:%d " ++msgstr "IRQ:%d " ++ ++#. Only print devices using it for ++#. I/O maps ++#: ../lib/interface.c:919 ++#, c-format ++msgid "Base address:0x%x " ++msgstr "Endereo de E/S:0x%x " ++ ++#: ../lib/interface.c:921 ++#, c-format ++msgid "Memory:%lx-%lx " ++msgstr "Memria:%lx-%lx " ++ ++#: ../lib/interface.c:924 ++#, c-format ++msgid "DMA chan:%x " ++msgstr "Canal DMA:%x " ++ ++#: ../lib/sockets.c:63 ++#, c-format + msgid "No usable address families found.\n" + msgstr "Nenhuma famlia de endereos que possa ser usada foi encontrada.\n" + +@@ -2397,29 +2960,32 @@ msgstr "%s: endereo %s invlido.\n" + msgid "ip: argument is wrong: %s\n" + msgstr "ip: argumento errado: %s\n" + +-#: ../ipmaddr.c:56 ++#: ../ipmaddr.c:61 ++#, c-format + msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n" + msgstr "Uso: ipmaddr [ add | del ] ENDMULTI dev STRING\n" + +-#: ../ipmaddr.c:57 ++#: ../ipmaddr.c:62 ++#, c-format + msgid " ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n" + msgstr " ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n" + +-#: ../ipmaddr.c:58 ++#: ../ipmaddr.c:63 ++#, c-format + msgid " ipmaddr -V | -version\n" + msgstr " ipmaddr -V | -version\n" + +-#: ../ipmaddr.c:258 ++#: ../ipmaddr.c:263 + #, c-format + msgid "family %d " + msgstr "famlia %d " + +-#: ../ipmaddr.c:267 ++#: ../ipmaddr.c:272 + #, c-format + msgid " users %d" + msgstr " usurios %d" + +-#: ../ipmaddr.c:353 ++#: ../ipmaddr.c:358 + msgid "Cannot create socket" + msgstr "No foi possvel criar o socket" + +@@ -2434,6 +3000,7 @@ msgid "slattach: tty_lock: (%s): %s\n" + msgstr "slattach: tty_lock: (%s): %s\n" + + #: ../slattach.c:192 ++#, c-format + msgid "slattach: cannot write PID file\n" + msgstr "slattach: no foi possvel escrever o arquivo PID\n" + +@@ -2452,39 +3019,69 @@ msgstr "slattach: tty_hangup(DROP): %s\n + msgid "slattach: tty_hangup(RAISE): %s\n" + msgstr "slattach: tty_hangup(RAISE): %s\n" + +-#: ../slattach.c:486 ++#: ../slattach.c:468 ++#, fuzzy, c-format ++msgid "slattach: tty name too long\n" ++msgstr "%s: nome muito longo\n" ++ ++#: ../slattach.c:498 ++#, c-format + msgid "slattach: tty_open: cannot get current state!\n" + msgstr "slattach: tty_open: no foi possvel obter o estado corrente!\n" + +-#: ../slattach.c:493 ++#: ../slattach.c:505 ++#, c-format + msgid "slattach: tty_open: cannot get current line disc!\n" +-msgstr "" +-"slattach: tty_open: no foi possvel obter a disciplina de linha corrente!\n" ++msgstr "slattach: tty_open: no foi possvel obter a disciplina de linha corrente!\n" + +-#: ../slattach.c:501 ++#: ../slattach.c:513 ++#, c-format + msgid "slattach: tty_open: cannot set RAW mode!\n" + msgstr "slattach: tty_open: no foi possvel configurar o modo RAW!\n" + +-#: ../slattach.c:508 ++#: ../slattach.c:520 + #, c-format + msgid "slattach: tty_open: cannot set %s bps!\n" + msgstr "slattach: tty_open: no foi possvel configurar %s bps!\n" + +-#: ../slattach.c:518 ++#: ../slattach.c:530 ++#, c-format + msgid "slattach: tty_open: cannot set 8N1 mode!\n" + msgstr "slattach: tty_open: no foi possvel configurar modo 8N1!\n" + +-#: ../slattach.c:686 ++#: ../slattach.c:672 ++#, c-format ++msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n" ++msgstr "" ++ ++#: ../slattach.c:704 + #, c-format + msgid "%s started" + msgstr "%s inicializado" + +-#: ../slattach.c:687 ++#: ../slattach.c:705 + #, c-format + msgid " on %s" + msgstr " em %s" + +-#: ../slattach.c:688 ++#: ../slattach.c:706 + #, c-format + msgid " interface %s\n" + msgstr "%s: interface desconhecida.\n" ++ ++#~ msgid "" ++#~ " arp [-v] [] [-i ] -s [netmask ] pub " ++#~ "<-''-\n" ++#~ msgstr " arp [-v] [] [-i ] -s [netmask ] pub <-''-\n" ++ ++#~ msgid "%s: unknown interface: %s\n" ++#~ msgstr "%s: interface desconhecida: %s\n" ++ ++#~ msgid "address mask replies" ++#~ msgstr "resposta a mascara de endereo" ++ ++#~ msgid "unknown title %s\n" ++#~ msgstr "ttulo %s desconhecido\n" ++ ++#~ msgid "Routing table for `ddp' not yet supported.\n" ++#~ msgstr "Tabela de roteamento para `ddp' ainda no suportada.\n" +Index: net-tools/po/net-tools.pot +=================================================================== +--- net-tools.orig/po/net-tools.pot ++++ net-tools/po/net-tools.pot +@@ -1,253 +1,275 @@ + # SOME DESCRIPTIVE TITLE. +-# Copyright (C) YEAR Free Software Foundation, Inc. ++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the PACKAGE package. + # FIRST AUTHOR , YEAR. + # + #, fuzzy + msgid "" + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" +-"POT-Creation-Date: 2001-04-15 15:40+0100\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2007-06-30 12:28+0900\n" + "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" + "Last-Translator: FULL NAME \n" + "Language-Team: LANGUAGE \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=CHARSET\n" +-"Content-Transfer-Encoding: ENCODING\n" ++"Content-Transfer-Encoding: 8bit\n" + +-#: ../arp.c:111 ../arp.c:270 ++#: ../arp.c:112 ../arp.c:279 ++#, c-format + msgid "arp: need host name\n" + msgstr "" + +-#: ../arp.c:208 ../arp.c:222 ++#: ../arp.c:215 ../arp.c:230 + #, c-format + msgid "No ARP entry for %s\n" + msgstr "" + +-#: ../arp.c:240 ++#: ../arp.c:248 + #, c-format + msgid "arp: cant get HW-Address for `%s': %s.\n" + msgstr "" + +-#: ../arp.c:244 ++#: ../arp.c:252 ++#, c-format + msgid "arp: protocol type mismatch.\n" + msgstr "" + +-#: ../arp.c:253 ++#: ../arp.c:261 + #, c-format + msgid "arp: device `%s' has HW address %s `%s'.\n" + msgstr "" + +-#: ../arp.c:283 ++#: ../arp.c:293 ++#, c-format + msgid "arp: need hardware address\n" + msgstr "" + +-#: ../arp.c:291 ++#: ../arp.c:301 ++#, c-format + msgid "arp: invalid hardware address\n" + msgstr "" + +-#: ../arp.c:388 ++#: ../arp.c:398 + #, c-format + msgid "arp: cannot open etherfile %s !\n" + msgstr "" + +-#: ../arp.c:404 ++#: ../arp.c:414 + #, c-format + msgid "arp: format error on line %u of etherfile %s !\n" + msgstr "" + +-#: ../arp.c:417 ++#: ../arp.c:427 + #, c-format + msgid "arp: cannot set entry on line %u of etherfile %s !\n" + msgstr "" + +-#: ../arp.c:438 ++#: ../arp.c:448 ++#, c-format + msgid "" + "Address HWtype HWaddress Flags Mask " + "Iface\n" + msgstr "" + +-#: ../arp.c:468 ++#: ../arp.c:476 ++msgid "" ++msgstr "" ++ ++#: ../arp.c:478 + msgid "(incomplete)" + msgstr "" + +-#: ../arp.c:485 ++#: ../arp.c:495 + #, c-format + msgid "%s (%s) at " + msgstr "" + +-#: ../arp.c:491 ++#: ../arp.c:501 ++#, c-format + msgid " " + msgstr "" + +-#: ../arp.c:497 ++#: ../arp.c:507 + #, c-format + msgid "netmask %s " + msgstr "" + +-#: ../arp.c:514 ++#: ../arp.c:524 + #, c-format + msgid "on %s\n" + msgstr "" + +-#: ../arp.c:593 ++#: ../arp.c:605 + #, c-format + msgid "Entries: %d\tSkipped: %d\tFound: %d\n" + msgstr "" + +-#: ../arp.c:597 ++#: ../arp.c:609 + #, c-format + msgid "%s (%s) -- no entry\n" + msgstr "" + +-#: ../arp.c:599 ++#: ../arp.c:611 + #, c-format + msgid "arp: in %d entries no match found.\n" + msgstr "" + +-#: ../arp.c:614 ++#: ../arp.c:626 ++#, c-format + msgid "" + "Usage:\n" + " arp [-vn] [] [-i ] [-a] [] <-Display ARP " + "cache\n" + msgstr "" + +-#: ../arp.c:615 ++#: ../arp.c:627 ++#, c-format + msgid "" +-" arp [-v] [-i ] -d [pub][nopub] <-Delete ARP " ++" arp [-v] [-i ] -d [pub] <-Delete ARP " + "entry\n" + msgstr "" + +-#: ../arp.c:616 ++#: ../arp.c:628 ++#, c-format + msgid "" +-" arp [-vnD] [] [-i ] -f [] <-Add entry from " ++" arp [-vnD] [] [-i ] -f [] <-Add entry from " + "file\n" + msgstr "" + +-#: ../arp.c:617 ++#: ../arp.c:629 ++#, c-format + msgid "" +-" arp [-v] [] [-i ] -s [temp][nopub] <-Add " ++" arp [-v] [] [-i ] -s [temp] <-Add " + "entry\n" + msgstr "" + +-#: ../arp.c:618 +-msgid "" +-" arp [-v] [] [-i ] -s [netmask ] pub " +-"<-''-\n" +-msgstr "" +- +-#: ../arp.c:619 ++#: ../arp.c:630 ++#, c-format + msgid "" +-" arp [-v] [] [-i ] -Ds [netmask ] pub " ++" arp [-v] [] [-i ] -Ds [netmask ] pub " + "<-''-\n" + "\n" + msgstr "" + +-#: ../arp.c:621 ++#: ../arp.c:632 ++#, c-format + msgid "" + " -a display (all) hosts in alternative (BSD) " + "style\n" + msgstr "" + +-#: ../arp.c:622 ++#: ../arp.c:633 ++#, c-format + msgid " -s, --set set a new ARP entry\n" + msgstr "" + +-#: ../arp.c:623 ++#: ../arp.c:634 ++#, c-format + msgid " -d, --delete delete a specified entry\n" + msgstr "" + +-#: ../arp.c:624 ../netstat.c:1490 ../route.c:86 ++#: ../arp.c:635 ../netstat.c:1503 ../route.c:86 ++#, c-format + msgid " -v, --verbose be verbose\n" + msgstr "" + +-#: ../arp.c:625 ../netstat.c:1491 ../route.c:87 ++#: ../arp.c:636 ../netstat.c:1504 ../route.c:87 ++#, c-format + msgid " -n, --numeric don't resolve names\n" + msgstr "" + +-#: ../arp.c:626 ++#: ../arp.c:637 ++#, c-format + msgid "" + " -i, --device specify network interface (e.g. eth0)\n" + msgstr "" + +-#: ../arp.c:627 ++#: ../arp.c:638 ++#, c-format + msgid " -D, --use-device read from given device\n" + msgstr "" + +-#: ../arp.c:628 ++#: ../arp.c:639 ++#, c-format + msgid " -A, -p, --protocol specify protocol family\n" + msgstr "" + +-#: ../arp.c:629 ++#: ../arp.c:640 ++#, c-format + msgid "" +-" -f, --file read new entries from file or from " +-"/etc/ethers\n" ++" -f, --file read new entries from file or from /etc/" ++"ethers\n" + "\n" + msgstr "" + +-#: ../arp.c:631 ../rarp.c:182 ++#: ../arp.c:642 ../rarp.c:182 + #, c-format + msgid " =Use '-H ' to specify hardware address type. Default: %s\n" + msgstr "" + +-#: ../arp.c:632 ../rarp.c:183 ++#: ../arp.c:643 ../rarp.c:183 ++#, c-format + msgid " List of possible hardware types (which support ARP):\n" + msgstr "" + +-#: ../arp.c:666 ../arp.c:751 ++#: ../arp.c:677 ../arp.c:762 + #, c-format + msgid "%s: hardware type not supported!\n" + msgstr "" + +-#: ../arp.c:670 ++#: ../arp.c:681 + #, c-format + msgid "%s: address family not supported!\n" + msgstr "" + +-#: ../arp.c:705 ++#: ../arp.c:716 ++#, c-format + msgid "arp: -N not yet supported.\n" + msgstr "" + +-#: ../arp.c:715 ++#: ../arp.c:726 + #, c-format + msgid "arp: %s: unknown address family.\n" + msgstr "" + +-#: ../arp.c:724 ++#: ../arp.c:735 + #, c-format + msgid "arp: %s: unknown hardware type.\n" + msgstr "" + +-#: ../arp.c:743 ++#: ../arp.c:754 + #, c-format + msgid "arp: %s: kernel only supports 'inet'.\n" + msgstr "" + +-#: ../arp.c:756 ++#: ../arp.c:767 + #, c-format + msgid "arp: %s: hardware type without ARP support.\n" + msgstr "" + +-#: ../hostname.c:70 ++#: ../hostname.c:71 + #, c-format + msgid "Setting nodename to `%s'\n" + msgstr "" + +-#: ../hostname.c:75 ++#: ../hostname.c:76 + #, c-format + msgid "%s: you must be root to change the node name\n" + msgstr "" + +-#: ../hostname.c:78 ../hostname.c:98 ../hostname.c:117 ++#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117 + #, c-format + msgid "%s: name too long\n" + msgstr "" + +-#: ../hostname.c:90 ++#: ../hostname.c:91 + #, c-format + msgid "Setting hostname to `%s'\n" + msgstr "" + +-#: ../hostname.c:95 ++#: ../hostname.c:96 + #, c-format + msgid "%s: you must be root to change the host name\n" + msgstr "" +@@ -262,103 +284,119 @@ msgstr "" + msgid "%s: you must be root to change the domain name\n" + msgstr "" + +-#: ../hostname.c:132 ++#: ../hostname.c:131 + #, c-format + msgid "Resolving `%s' ...\n" + msgstr "" + +-#: ../hostname.c:138 ++#: ../hostname.c:137 + #, c-format + msgid "Result: h_name=`%s'\n" + msgstr "" + +-#: ../hostname.c:143 ++#: ../hostname.c:142 + #, c-format + msgid "Result: h_aliases=`%s'\n" + msgstr "" + +-#: ../hostname.c:148 ++#: ../hostname.c:147 + #, c-format + msgid "Result: h_addr_list=`%s'\n" + msgstr "" + +-#: ../hostname.c:210 ++#: ../hostname.c:208 + #, c-format + msgid "%s: can't open `%s'\n" + msgstr "" + +-#: ../hostname.c:224 ++#: ../hostname.c:222 ++#, c-format + msgid "Usage: hostname [-v] {hostname|-F file} set hostname (from file)\n" + msgstr "" + +-#: ../hostname.c:225 ++#: ../hostname.c:223 ++#, c-format + msgid "" + " domainname [-v] {nisdomain|-F file} set NIS domainname (from file)\n" + msgstr "" + +-#: ../hostname.c:227 ++#: ../hostname.c:225 ++#, c-format + msgid "" + " nodename [-v] {nodename|-F file} set DECnet node name (from " + "file)\n" + msgstr "" + +-#: ../hostname.c:229 ++#: ../hostname.c:227 ++#, c-format + msgid " hostname [-v] [-d|-f|-s|-a|-i|-y|-n] display formatted name\n" + msgstr "" + +-#: ../hostname.c:230 ++#: ../hostname.c:228 ++#, c-format + msgid "" + " hostname [-v] display hostname\n" + "\n" + msgstr "" + +-#: ../hostname.c:231 ++#: ../hostname.c:229 ++#, c-format + msgid "" + " hostname -V|--version|-h|--help print info and exit\n" + "\n" + msgstr "" + +-#: ../hostname.c:232 ++#: ../hostname.c:230 ++#, c-format + msgid "" + " dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" + "\n" + msgstr "" + +-#: ../hostname.c:233 ++#: ../hostname.c:231 ++#, c-format + msgid " -s, --short short host name\n" + msgstr "" + +-#: ../hostname.c:234 ++#: ../hostname.c:232 ++#, c-format + msgid " -a, --alias alias names\n" + msgstr "" + +-#: ../hostname.c:235 ++#: ../hostname.c:233 ++#, c-format + msgid " -i, --ip-address addresses for the hostname\n" + msgstr "" + +-#: ../hostname.c:236 ++#: ../hostname.c:234 ++#, c-format + msgid " -f, --fqdn, --long long host name (FQDN)\n" + msgstr "" + +-#: ../hostname.c:237 ++#: ../hostname.c:235 ++#, c-format + msgid " -d, --domain DNS domain name\n" + msgstr "" + +-#: ../hostname.c:238 ++#: ../hostname.c:236 ++#, c-format + msgid " -y, --yp, --nis NIS/YP domainname\n" + msgstr "" + +-#: ../hostname.c:240 ++#: ../hostname.c:238 ++#, c-format + msgid " -n, --node DECnet node name\n" + msgstr "" + +-#: ../hostname.c:242 ++#: ../hostname.c:240 ++#, c-format + msgid "" + " -F, --file read hostname or NIS domainname from given file\n" + "\n" + msgstr "" + +-#: ../hostname.c:244 ++#: ../hostname.c:242 ++#, c-format + msgid "" + " This command can read or set the hostname or the NIS domainname. You can\n" + " also read the DNS domain or the FQDN (fully qualified domain name).\n" +@@ -367,587 +405,706 @@ msgid "" + " part of the FQDN) in the /etc/hosts file.\n" + msgstr "" + +-#: ../hostname.c:340 ++#: ../hostname.c:338 + #, c-format + msgid "%s: You can't change the DNS domain name with this command\n" + msgstr "" + +-#: ../hostname.c:341 ++#: ../hostname.c:339 ++#, c-format + msgid "" + "\n" + "Unless you are using bind or NIS for host lookups you can change the DNS\n" + msgstr "" + +-#: ../hostname.c:342 ++#: ../hostname.c:340 ++#, c-format + msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n" + msgstr "" + +-#: ../hostname.c:359 ++#: ../hostname.c:357 + #, c-format + msgid "gethostname()=`%s'\n" + msgstr "" + +-#: ../hostname.c:376 ++#: ../hostname.c:374 + #, c-format + msgid "getdomainname()=`%s'\n" + msgstr "" + +-#: ../hostname.c:391 ++#: ../hostname.c:389 + #, c-format + msgid "getnodename()=`%s'\n" + msgstr "" + +-#: ../ifconfig.c:108 ++#: ../ifconfig.c:107 ++#, c-format + msgid "" +-"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " ++"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " + "Flg\n" + msgstr "" + +-#: ../ifconfig.c:130 ../ifconfig.c:162 ++#: ../ifconfig.c:129 ../ifconfig.c:161 + #, c-format +-msgid "%s: unknown interface: %s\n" ++msgid "%s: ERROR while getting interface flags: %s\n" + msgstr "" + +-#: ../ifconfig.c:154 ../ifconfig.c:734 ../ifconfig.c:825 ../ifconfig.c:936 ++#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862 ++#: ../ifconfig.c:973 ++#, c-format + msgid "No support for INET on this system.\n" + msgstr "" + +-#: ../ifconfig.c:177 ++#: ../ifconfig.c:193 ++#, c-format ++msgid "%s: ERROR while testing interface flags: %s\n" ++msgstr "" ++ ++#: ../ifconfig.c:202 ++#, c-format + msgid "" + "Usage:\n" +-" ifconfig [-a] [-i] [-v] [-s] [[]
]\n" ++" ifconfig [-a] [-v] [-s] [[]
]\n" + msgstr "" + +-#: ../ifconfig.c:179 ++#: ../ifconfig.c:204 ++#, c-format + msgid " [add
[/]]\n" + msgstr "" + +-#: ../ifconfig.c:180 ++#: ../ifconfig.c:205 ++#, c-format + msgid " [del
[/]]\n" + msgstr "" + +-#: ../ifconfig.c:181 ++#: ../ifconfig.c:206 ++#, c-format + msgid " [[-]broadcast [
]] [[-]pointopoint [
]]\n" + msgstr "" + +-#: ../ifconfig.c:182 ++#: ../ifconfig.c:207 ++#, c-format + msgid " [netmask
] [dstaddr
] [tunnel
]\n" + msgstr "" + +-#: ../ifconfig.c:185 ++#: ../ifconfig.c:210 ++#, c-format + msgid " [outfill ] [keepalive ]\n" + msgstr "" + +-#: ../ifconfig.c:187 ++#: ../ifconfig.c:212 ++#, c-format + msgid " [hw
] [metric ] [mtu ]\n" + msgstr "" + +-#: ../ifconfig.c:188 ++#: ../ifconfig.c:213 ++#, c-format + msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" + msgstr "" + +-#: ../ifconfig.c:189 ++#: ../ifconfig.c:214 ++#, c-format + msgid " [multicast] [[-]promisc]\n" + msgstr "" + +-#: ../ifconfig.c:190 ++#: ../ifconfig.c:215 ++#, c-format + msgid " [mem_start ] [io_addr ] [irq ] [media ]\n" + msgstr "" + +-#: ../ifconfig.c:192 ++#: ../ifconfig.c:217 ++#, c-format + msgid " [txqueuelen ]\n" + msgstr "" + +-#: ../ifconfig.c:195 ++#: ../ifconfig.c:220 ++#, c-format + msgid " [[-]dynamic]\n" + msgstr "" + +-#: ../ifconfig.c:197 ++#: ../ifconfig.c:222 ++#, c-format + msgid "" + " [up|down] ...\n" + "\n" + msgstr "" + +-#: ../ifconfig.c:199 ++#: ../ifconfig.c:224 ++#, c-format + msgid " =Hardware Type.\n" + msgstr "" + +-#: ../ifconfig.c:200 ++#: ../ifconfig.c:225 ++#, c-format + msgid " List of possible hardware types:\n" + msgstr "" + + #. 1 = ARPable +-#: ../ifconfig.c:202 ++#: ../ifconfig.c:227 + #, c-format + msgid " =Address family. Default: %s\n" + msgstr "" + +-#: ../ifconfig.c:203 ++#: ../ifconfig.c:228 ++#, c-format + msgid " List of possible address families:\n" + msgstr "" + +-#: ../ifconfig.c:278 ++#: ../ifconfig.c:303 + #, c-format + msgid "ifconfig: option `%s' not recognised.\n" + msgstr "" + +-#: ../ifconfig.c:280 ../ifconfig.c:925 ++#: ../ifconfig.c:305 ../ifconfig.c:962 ++#, c-format + msgid "ifconfig: `--help' gives usage information.\n" + msgstr "" + +-#: ../ifconfig.c:355 ++#: ../ifconfig.c:380 ++#, c-format + msgid "Unknown media type.\n" + msgstr "" + +-#: ../ifconfig.c:647 ++#: ../ifconfig.c:417 ++#, c-format ++msgid "" ++"Warning: Interface %s still in promisc mode... maybe other application is " ++"running?\n" ++msgstr "" ++ ++#: ../ifconfig.c:429 ++#, c-format ++msgid "Warning: Interface %s still in MULTICAST mode.\n" ++msgstr "" ++ ++#: ../ifconfig.c:441 ++#, c-format ++msgid "Warning: Interface %s still in ALLMULTI mode.\n" ++msgstr "" ++ ++#: ../ifconfig.c:465 ++#, c-format ++msgid "Warning: Interface %s still in DYNAMIC mode.\n" ++msgstr "" ++ ++#: ../ifconfig.c:523 ++#, c-format ++msgid "Warning: Interface %s still in BROADCAST mode.\n" ++msgstr "" ++ ++#: ../ifconfig.c:652 ++#, c-format ++msgid "Warning: Interface %s still in POINTOPOINT mode.\n" ++msgstr "" ++ ++#: ../ifconfig.c:684 + #, c-format + msgid "hw address type `%s' has no handler to set address. failed.\n" + msgstr "" + +-#: ../ifconfig.c:656 ++#: ../ifconfig.c:693 + #, c-format + msgid "%s: invalid %s address.\n" + msgstr "" + +-#: ../ifconfig.c:700 ../ifconfig.c:790 ../ifconfig.c:876 ++#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913 ++#, c-format + msgid "No support for INET6 on this system.\n" + msgstr "" + +-#: ../ifconfig.c:743 ../ifconfig.c:834 ++#: ../ifconfig.c:780 ../ifconfig.c:871 + #, c-format + msgid "Interface %s not initialized\n" + msgstr "" + +-#: ../ifconfig.c:755 ../ifconfig.c:845 ++#: ../ifconfig.c:792 ../ifconfig.c:882 ++#, c-format + msgid "Bad address.\n" + msgstr "" + +-#: ../ifconfig.c:848 ++#: ../ifconfig.c:885 ++#, c-format + msgid "Address deletion not supported on this system.\n" + msgstr "" + +-#: ../ifconfig.c:920 ++#: ../ifconfig.c:957 ++#, c-format + msgid "ifconfig: Cannot set address for this protocol family.\n" + msgstr "" + +-#: ../ifconfig.c:946 ++#: ../ifconfig.c:983 ++#, c-format + msgid "No support for ECONET on this system.\n" + msgstr "" + +-#: ../ifconfig.c:954 ++#: ../ifconfig.c:991 + #, c-format + msgid "Don't know how to set addresses for family %d.\n" + msgstr "" + +-#: ../netstat.c:430 ++#: ../ifconfig.c:1021 ++#, c-format ++msgid "WARNING: at least one error occured. (%d)\n" ++msgstr "" ++ ++#: ../netstat.c:434 + #, c-format + msgid "" + "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n" + msgstr "" + +-#: ../netstat.c:434 ++#: ../netstat.c:438 ++#, c-format + msgid "" + "(Not all processes could be identified, non-owned process info\n" + " will not be shown, you would have to be root to see it all.)\n" + msgstr "" + +-#: ../netstat.c:441 ../netstat.c:1176 ../netstat.c:1253 ++#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266 + msgid "LISTENING" + msgstr "" + +-#: ../netstat.c:442 ++#: ../netstat.c:446 + msgid "CONN SENT" + msgstr "" + +-#: ../netstat.c:443 ../netstat.c:1255 ++#: ../netstat.c:447 ../netstat.c:1268 + msgid "DISC SENT" + msgstr "" + +-#: ../netstat.c:444 ../netstat.c:511 ../netstat.c:894 ../netstat.c:1256 ++#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269 + msgid "ESTABLISHED" + msgstr "" + +-#: ../netstat.c:466 ++#: ../netstat.c:470 ++#, c-format + msgid "Active NET/ROM sockets\n" + msgstr "" + +-#: ../netstat.c:467 ++#: ../netstat.c:471 ++#, c-format + msgid "" +-"User Dest Source Device State Vr/Vs Send-Q " +-"Recv-Q\n" ++"User Dest Source Device State Vr/Vs Send-Q Recv-" ++"Q\n" + msgstr "" + +-#: ../netstat.c:477 ../netstat.c:1295 ++#: ../netstat.c:481 ../netstat.c:1308 + #, c-format + msgid "Problem reading data from %s\n" + msgstr "" + +-#: ../netstat.c:512 ++#: ../netstat.c:516 + msgid "SYN_SENT" + msgstr "" + +-#: ../netstat.c:513 ++#: ../netstat.c:517 + msgid "SYN_RECV" + msgstr "" + +-#: ../netstat.c:514 ++#: ../netstat.c:518 + msgid "FIN_WAIT1" + msgstr "" + +-#: ../netstat.c:515 ++#: ../netstat.c:519 + msgid "FIN_WAIT2" + msgstr "" + +-#: ../netstat.c:516 ++#: ../netstat.c:520 + msgid "TIME_WAIT" + msgstr "" + +-#: ../netstat.c:517 ++#: ../netstat.c:521 + msgid "CLOSE" + msgstr "" + +-#: ../netstat.c:518 ++#: ../netstat.c:522 + msgid "CLOSE_WAIT" + msgstr "" + +-#: ../netstat.c:519 ++#: ../netstat.c:523 + msgid "LAST_ACK" + msgstr "" + +-#: ../netstat.c:520 ++#: ../netstat.c:524 + msgid "LISTEN" + msgstr "" + +-#: ../netstat.c:521 ++#: ../netstat.c:525 + msgid "CLOSING" + msgstr "" + +-#: ../netstat.c:592 ++#: ../netstat.c:596 + #, c-format + msgid "warning, got bogus igmp6 line %d.\n" + msgstr "" + +-#: ../netstat.c:597 ../netstat.c:635 ../netstat.c:756 ../netstat.c:888 +-#: ../netstat.c:1019 ../netstat.c:1024 ++#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898 ++#: ../netstat.c:1032 ../netstat.c:1037 + #, c-format + msgid "netstat: unsupported address family %d !\n" + msgstr "" + +-#: ../netstat.c:610 ../netstat.c:615 ../netstat.c:623 ../netstat.c:630 ++#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634 + #, c-format + msgid "warning, got bogus igmp line %d.\n" + msgstr "" + +-#: ../netstat.c:673 ++#: ../netstat.c:677 ++#, c-format + msgid "Active X.25 sockets\n" + msgstr "" + + #. IMHO, Vr/Vs is not very usefull --SF +-#: ../netstat.c:675 ++#: ../netstat.c:679 ++#, c-format + msgid "" +-"Dest Source Device LCI State Vr/Vs Send-Q " +-"Recv-Q\n" ++"Dest Source Device LCI State Vr/Vs Send-Q Recv-" ++"Q\n" + msgstr "" + +-#: ../netstat.c:752 ++#: ../netstat.c:759 ++#, c-format + msgid "warning, got bogus tcp line.\n" + msgstr "" + +-#: ../netstat.c:793 ../netstat.c:943 ../netstat.c:1062 ++#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075 + #, c-format + msgid "off (0.00/%ld/%d)" + msgstr "" + +-#: ../netstat.c:797 ++#: ../netstat.c:804 + #, c-format + msgid "on (%2.2f/%ld/%d)" + msgstr "" + +-#: ../netstat.c:802 ++#: ../netstat.c:809 + #, c-format + msgid "keepalive (%2.2f/%ld/%d)" + msgstr "" + +-#: ../netstat.c:807 ++#: ../netstat.c:814 + #, c-format + msgid "timewait (%2.2f/%ld/%d)" + msgstr "" + +-#: ../netstat.c:812 ../netstat.c:952 ../netstat.c:1072 ++#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085 + #, c-format + msgid "unkn-%d (%2.2f/%ld/%d)" + msgstr "" + +-#: ../netstat.c:884 ++#: ../netstat.c:894 ++#, c-format + msgid "warning, got bogus udp line.\n" + msgstr "" + +-#: ../netstat.c:902 ../netstat.c:1162 ../netstat.c:1195 ++#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208 + msgid "UNKNOWN" + msgstr "" + +-#: ../netstat.c:948 ../netstat.c:1067 ++#: ../netstat.c:958 ../netstat.c:1080 + #, c-format + msgid "on%d (%2.2f/%ld/%d)" + msgstr "" + +-#: ../netstat.c:1033 ++#: ../netstat.c:1046 ++#, c-format + msgid "warning, got bogus raw line.\n" + msgstr "" + +-#: ../netstat.c:1115 ++#: ../netstat.c:1128 ++#, c-format + msgid "warning, got bogus unix line.\n" + msgstr "" + +-#: ../netstat.c:1142 ++#: ../netstat.c:1155 + msgid "STREAM" + msgstr "" + +-#: ../netstat.c:1146 ++#: ../netstat.c:1159 + msgid "DGRAM" + msgstr "" + +-#: ../netstat.c:1150 ++#: ../netstat.c:1163 + msgid "RAW" + msgstr "" + +-#: ../netstat.c:1154 ++#: ../netstat.c:1167 + msgid "RDM" + msgstr "" + +-#: ../netstat.c:1158 ++#: ../netstat.c:1171 + msgid "SEQPACKET" + msgstr "" + +-#: ../netstat.c:1167 ++#: ../netstat.c:1180 + msgid "FREE" + msgstr "" + +-#: ../netstat.c:1183 ++#: ../netstat.c:1196 + msgid "CONNECTING" + msgstr "" + +-#: ../netstat.c:1187 ++#: ../netstat.c:1200 + msgid "CONNECTED" + msgstr "" + +-#: ../netstat.c:1191 ++#: ../netstat.c:1204 + msgid "DISCONNECTING" + msgstr "" + +-#: ../netstat.c:1222 ++#: ../netstat.c:1235 ++#, c-format + msgid "Active UNIX domain sockets " + msgstr "" + +-#: ../netstat.c:1224 ../netstat.c:1735 ++#: ../netstat.c:1237 ../netstat.c:1756 ++#, c-format + msgid "(servers and established)" + msgstr "" + +-#: ../netstat.c:1227 ../netstat.c:1738 ++#: ../netstat.c:1240 ../netstat.c:1759 ++#, c-format + msgid "(only servers)" + msgstr "" + +-#: ../netstat.c:1229 ../netstat.c:1740 ++#: ../netstat.c:1242 ../netstat.c:1761 ++#, c-format + msgid "(w/o servers)" + msgstr "" + +-#: ../netstat.c:1232 ++#: ../netstat.c:1245 ++#, c-format + msgid "" + "\n" + "Proto RefCnt Flags Type State I-Node" + msgstr "" + +-#: ../netstat.c:1234 ++#: ../netstat.c:1247 ++#, c-format + msgid " Path\n" + msgstr "" + +-#: ../netstat.c:1254 ++#: ../netstat.c:1267 + msgid "SABM SENT" + msgstr "" + +-#: ../netstat.c:1257 ++#: ../netstat.c:1270 + msgid "RECOVERY" + msgstr "" + +-#: ../netstat.c:1271 ++#: ../netstat.c:1284 ++#, c-format + msgid "Active AX.25 sockets\n" + msgstr "" + +-#: ../netstat.c:1272 ++#: ../netstat.c:1285 ++#, c-format + msgid "Dest Source Device State Vr/Vs Send-Q Recv-Q\n" + msgstr "" + +-#: ../netstat.c:1315 ++#: ../netstat.c:1328 + #, c-format + msgid "problem reading data from %s\n" + msgstr "" + +-#: ../netstat.c:1366 ++#: ../netstat.c:1379 ++#, c-format + msgid "" + "Active IPX sockets\n" + "Proto Recv-Q Send-Q Local Address Foreign Address " + "State" + msgstr "" + +-#: ../netstat.c:1368 ++#: ../netstat.c:1381 ++#, c-format + msgid " User" + msgstr "" + +-#: ../netstat.c:1402 ++#: ../netstat.c:1415 + msgid "ESTAB" + msgstr "" + +-#: ../netstat.c:1410 ++#: ../netstat.c:1423 + msgid "UNK." + msgstr "" + +-#: ../netstat.c:1448 ++#: ../netstat.c:1461 ++#, c-format + msgid "Kernel Interface table\n" + msgstr "" + +-#: ../netstat.c:1452 ++#: ../netstat.c:1465 ++#, c-format + msgid "" +-"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " ++"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " + "Flg\n" + msgstr "" + +-#: ../netstat.c:1456 ++#: ../netstat.c:1469 + msgid "missing interface information" + msgstr "" + +-#: ../netstat.c:1479 ++#: ../netstat.c:1492 ++#, c-format + msgid "" +-"usage: netstat [-veenNcCF] [] -r netstat " +-"{-V|--version|-h|--help}\n" ++"usage: netstat [-veenNcCF] [] -r netstat {-V|--version|-h|--" ++"help}\n" + msgstr "" + +-#: ../netstat.c:1480 ++#: ../netstat.c:1493 ++#, c-format + msgid " netstat [-vnNcaeol] [ ...]\n" + msgstr "" + +-#: ../netstat.c:1481 ++#: ../netstat.c:1494 ++#, c-format + msgid "" + " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" + "\n" + msgstr "" + +-#: ../netstat.c:1483 ++#: ../netstat.c:1496 ++#, c-format + msgid " -r, --route display routing table\n" + msgstr "" + +-#: ../netstat.c:1484 ++#: ../netstat.c:1497 ++#, c-format + msgid " -i, --interfaces display interface table\n" + msgstr "" + +-#: ../netstat.c:1485 ++#: ../netstat.c:1498 ++#, c-format + msgid " -g, --groups display multicast group memberships\n" + msgstr "" + +-#: ../netstat.c:1486 ++#: ../netstat.c:1499 ++#, c-format + msgid "" + " -s, --statistics display networking statistics (like SNMP)\n" + msgstr "" + +-#: ../netstat.c:1488 ++#: ../netstat.c:1501 ++#, c-format + msgid "" + " -M, --masquerade display masqueraded connections\n" + "\n" + msgstr "" + +-#: ../netstat.c:1492 ++#: ../netstat.c:1505 ++#, c-format + msgid " --numeric-hosts don't resolve host names\n" + msgstr "" + +-#: ../netstat.c:1493 ++#: ../netstat.c:1506 ++#, c-format + msgid " --numeric-ports don't resolve port names\n" + msgstr "" + +-#: ../netstat.c:1494 ++#: ../netstat.c:1507 ++#, c-format + msgid " --numeric-users don't resolve user names\n" + msgstr "" + +-#: ../netstat.c:1495 ++#: ../netstat.c:1508 ++#, c-format + msgid " -N, --symbolic resolve hardware names\n" + msgstr "" + +-#: ../netstat.c:1496 ../route.c:88 ++#: ../netstat.c:1509 ../route.c:88 ++#, c-format + msgid " -e, --extend display other/more information\n" + msgstr "" + +-#: ../netstat.c:1497 ++#: ../netstat.c:1510 ++#, c-format + msgid " -p, --programs display PID/Program name for sockets\n" + msgstr "" + +-#: ../netstat.c:1498 ++#: ../netstat.c:1511 ++#, c-format + msgid "" + " -c, --continuous continuous listing\n" + "\n" + msgstr "" + +-#: ../netstat.c:1499 ++#: ../netstat.c:1512 ++#, c-format + msgid " -l, --listening display listening server sockets\n" + msgstr "" + +-#: ../netstat.c:1500 ++#: ../netstat.c:1513 ++#, c-format + msgid "" + " -a, --all, --listening display all sockets (default: connected)\n" + msgstr "" + +-#: ../netstat.c:1501 ++#: ../netstat.c:1514 ++#, c-format + msgid " -o, --timers display timers\n" + msgstr "" + +-#: ../netstat.c:1502 ../route.c:89 ++#: ../netstat.c:1515 ../route.c:89 ++#, c-format + msgid "" + " -F, --fib display Forwarding Information Base " + "(default)\n" + msgstr "" + +-#: ../netstat.c:1503 ../route.c:90 ++#: ../netstat.c:1516 ../route.c:90 ++#, c-format + msgid "" + " -C, --cache display routing cache instead of FIB\n" + "\n" + msgstr "" + +-#: ../netstat.c:1505 ++#: ../netstat.c:1518 ++#, c-format + msgid "" +-" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx " +-"--netrom\n" ++" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" ++"netrom\n" + msgstr "" + +-#: ../netstat.c:1506 ../route.c:92 ++#: ../netstat.c:1519 + #, c-format +-msgid " =Use '-A ' or '--'; default: %s\n" ++msgid " =Use '-6|-4' or '-A ' or '--'; default: %s\n" + msgstr "" + +-#: ../netstat.c:1507 ../route.c:93 ++#: ../netstat.c:1520 ../route.c:93 ++#, c-format + msgid " List of possible address families (which support routing):\n" + msgstr "" + +-#: ../netstat.c:1732 ++#: ../netstat.c:1753 ++#, c-format + msgid "Active Internet connections " + msgstr "" + +-#: ../netstat.c:1742 ++#: ../netstat.c:1763 ++#, c-format + msgid "" + "\n" +-"Proto Recv-Q Send-Q Local Address Foreign Address State " +-" " ++"Proto Recv-Q Send-Q Local Address Foreign Address " ++"State " + msgstr "" + +-#: ../netstat.c:1744 ++#: ../netstat.c:1765 ++#, c-format + msgid " User Inode " + msgstr "" + +-#: ../netstat.c:1747 ++#: ../netstat.c:1768 ++#, c-format + msgid " Timer" + msgstr "" + +-#: ../netstat.c:1777 ++#: ../netstat.c:1798 ++#, c-format + msgid "IPv4 Group Memberships\n" + msgstr "" + +-#: ../netstat.c:1778 ++#: ../netstat.c:1799 ++#, c-format + msgid "Interface RefCnt Group\n" + msgstr "" + +@@ -986,23 +1143,28 @@ msgid "rarp: cannot set entry from %s:%u + msgstr "" + + #: ../rarp.c:176 ++#, c-format + msgid "Usage: rarp -a list entries in cache.\n" + msgstr "" + + #: ../rarp.c:177 ++#, c-format + msgid " rarp -d delete entry from cache.\n" + msgstr "" + + #: ../rarp.c:178 ++#, c-format + msgid " rarp [] -s add entry to cache.\n" + msgstr "" + + #: ../rarp.c:179 ++#, c-format + msgid "" + " rarp -f add entries from /etc/ethers.\n" + msgstr "" + + #: ../rarp.c:180 ++#, c-format + msgid "" + " rarp -V display program version.\n" + "\n" +@@ -1019,38 +1181,50 @@ msgid "rarp: %s: unknown hardware type.\ + msgstr "" + + #: ../route.c:80 ++#, c-format + msgid "" + "Usage: route [-nNvee] [-FC] [] List kernel routing tables\n" + msgstr "" + + #: ../route.c:81 ++#, c-format + msgid "" + " route [-v] [-FC] {add|del|flush} ... Modify routing table for AF.\n" + "\n" + msgstr "" + + #: ../route.c:83 ++#, c-format + msgid "" + " route {-h|--help} [] Detailed usage syntax for " + "specified AF.\n" + msgstr "" + + #: ../route.c:84 ++#, c-format + msgid "" + " route {-V|--version} Display version/author and " + "exit.\n" + "\n" + msgstr "" + ++#: ../route.c:92 ++#, c-format ++msgid " =Use '-A ' or '--'; default: %s\n" ++msgstr "" ++ + #: ../plipconfig.c:66 ++#, c-format + msgid "Usage: plipconfig [-a] [-i] [-v] interface\n" + msgstr "" + + #: ../plipconfig.c:67 ++#, c-format + msgid " [nibble NN] [trigger NN]\n" + msgstr "" + + #: ../plipconfig.c:68 ++#, c-format + msgid " plipconfig -V | --version\n" + msgstr "" + +@@ -1060,61 +1234,75 @@ msgid "%s\tnibble %lu trigger %lu\n" + msgstr "" + + #: ../iptunnel.c:85 ++#, c-format + msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n" + msgstr "" + + #: ../iptunnel.c:86 ++#, c-format + msgid "" + " [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n" + msgstr "" + + #: ../iptunnel.c:87 ++#, c-format + msgid " [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n" + msgstr "" + + #: ../iptunnel.c:88 ++#, c-format + msgid " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n" + msgstr "" + + #: ../iptunnel.c:89 ++#, c-format + msgid "" + " iptunnel -V | --version\n" + "\n" + msgstr "" + + #: ../iptunnel.c:90 ++#, c-format + msgid "Where: NAME := STRING\n" + msgstr "" + + #: ../iptunnel.c:91 ++#, c-format + msgid " ADDR := { IP_ADDRESS | any }\n" + msgstr "" + + #: ../iptunnel.c:92 ++#, c-format + msgid " TOS := { NUMBER | inherit }\n" + msgstr "" + + #: ../iptunnel.c:93 ++#, c-format + msgid " TTL := { 1..255 | inherit }\n" + msgstr "" + + #: ../iptunnel.c:94 ++#, c-format + msgid " KEY := { DOTTED_QUAD | NUMBER }\n" + msgstr "" + + #: ../iptunnel.c:332 ++#, c-format + msgid "Keys are not allowed with ipip and sit.\n" + msgstr "" + + #: ../iptunnel.c:352 ++#, c-format + msgid "Broadcast tunnel requires a source address.\n" + msgstr "" + + #: ../iptunnel.c:367 ++#, c-format + msgid "ttl != 0 and noptmudisc are incompatible\n" + msgstr "" + + #: ../iptunnel.c:379 ++#, c-format + msgid "cannot determine tunnel mode (ipip, gre or sit)\n" + msgstr "" + +@@ -1128,22 +1316,27 @@ msgid "unknown" + msgstr "" + + #: ../iptunnel.c:453 ++#, c-format + msgid " Drop packets out of sequence.\n" + msgstr "" + + #: ../iptunnel.c:455 ++#, c-format + msgid " Checksum in received packet is required.\n" + msgstr "" + + #: ../iptunnel.c:457 ++#, c-format + msgid " Sequence packets on output.\n" + msgstr "" + + #: ../iptunnel.c:459 ++#, c-format + msgid " Checksum output packets.\n" + msgstr "" + + #: ../iptunnel.c:487 ++#, c-format + msgid "Wrong format of /proc/net/dev. Sorry.\n" + msgstr "" + +@@ -1153,10 +1346,12 @@ msgid "Failed to get type of [%s]\n" + msgstr "" + + #: ../iptunnel.c:516 ++#, c-format + msgid "RX: Packets Bytes Errors CsumErrs OutOfSeq Mcasts\n" + msgstr "" + + #: ../iptunnel.c:519 ++#, c-format + msgid "TX: Packets Bytes Errors DeadLoop NoRoute NoBufs\n" + msgstr "" + +@@ -1563,12 +1758,12 @@ msgstr "" + + #: ../statistics.c:178 + #, c-format +-msgid "%u packets directly received from backlog" ++msgid "%u of bytes directly received from backlog" + msgstr "" + + #: ../statistics.c:180 + #, c-format +-msgid "%u packets directly received from prequeue" ++msgid "%u of bytes directly received from prequeue" + msgstr "" + + #: ../statistics.c:182 +@@ -1578,7 +1773,7 @@ msgstr "" + + #: ../statistics.c:183 + #, c-format +-msgid "%u packets header predicted" ++msgid "%u packet headers predicted" + msgstr "" + + #: ../statistics.c:184 +@@ -1591,19 +1786,209 @@ msgstr "" + msgid "Ran %u times out of system memory during packet sending" + msgstr "" + +-#: ../statistics.c:253 ++#: ../statistics.c:188 ++#, c-format ++msgid "%u acknowledgments not containing data received" ++msgstr "" ++ ++#: ../statistics.c:189 ++#, c-format ++msgid "%u predicted acknowledgments" ++msgstr "" ++ ++#: ../statistics.c:190 ++#, c-format ++msgid "%u times recovered from packet loss due to fast retransmit" ++msgstr "" ++ ++#: ../statistics.c:191 ++#, c-format ++msgid "%u times recovered from packet loss due to SACK data" ++msgstr "" ++ ++#: ../statistics.c:192 ++#, c-format ++msgid "%u bad SACKs received" ++msgstr "" ++ ++#: ../statistics.c:193 ++#, c-format ++msgid "Detected reordering %u times using FACK" ++msgstr "" ++ ++#: ../statistics.c:194 ++#, c-format ++msgid "Detected reordering %u times using SACK" ++msgstr "" ++ ++#: ../statistics.c:195 ++#, c-format ++msgid "Detected reordering %u times using time stamp" ++msgstr "" ++ ++#: ../statistics.c:196 ++#, c-format ++msgid "Detected reordering %u times using reno fast retransmit" ++msgstr "" ++ ++#: ../statistics.c:197 ++#, c-format ++msgid "%u congestion windows fully recovered" ++msgstr "" ++ ++#: ../statistics.c:198 ++#, c-format ++msgid "%u congestion windows partially recovered using Hoe heuristic" ++msgstr "" ++ ++#: ../statistics.c:199 ++#, c-format ++msgid "%u congestion window recovered using DSACK" ++msgstr "" ++ ++#: ../statistics.c:200 ++#, c-format ++msgid "%u congestion windows recovered after partial ack" ++msgstr "" ++ ++#: ../statistics.c:201 ++#, c-format ++msgid "%u retransmits lost" ++msgstr "" ++ ++#: ../statistics.c:202 ++#, c-format ++msgid "%u timeouts after reno fast retransmit" ++msgstr "" ++ ++#: ../statistics.c:203 ++#, c-format ++msgid "%u timeouts after SACK recovery" ++msgstr "" ++ ++#: ../statistics.c:204 ++#, c-format ++msgid "%u timeouts in loss state" ++msgstr "" ++ ++#: ../statistics.c:205 ++#, c-format ++msgid "%u fast retransmits" ++msgstr "" ++ ++#: ../statistics.c:206 ++#, c-format ++msgid "%u forward retransmits" ++msgstr "" ++ ++#: ../statistics.c:207 ++#, c-format ++msgid "%u retransmits in slow start" ++msgstr "" ++ ++#: ../statistics.c:208 ++#, c-format ++msgid "%u other TCP timeouts" ++msgstr "" ++ ++#: ../statistics.c:209 ++#, c-format ++msgid "%u reno fast retransmits failed" ++msgstr "" ++ ++#: ../statistics.c:210 ++#, c-format ++msgid "%u sack retransmits failed" ++msgstr "" ++ ++#: ../statistics.c:211 ++#, c-format ++msgid "%u times receiver scheduled too late for direct processing" ++msgstr "" ++ ++#: ../statistics.c:212 ++#, c-format ++msgid "%u packets collapsed in receive queue due to low socket buffer" ++msgstr "" ++ ++#: ../statistics.c:213 ++#, c-format ++msgid "%u DSACKs sent for old packets" ++msgstr "" ++ ++#: ../statistics.c:214 ++#, c-format ++msgid "%u DSACKs sent for out of order packets" ++msgstr "" ++ ++#: ../statistics.c:215 ++#, c-format ++msgid "%u DSACKs received" ++msgstr "" ++ ++#: ../statistics.c:216 ++#, c-format ++msgid "%u DSACKs for out of order packets received" ++msgstr "" ++ ++#: ../statistics.c:217 ++#, c-format ++msgid "%u connections reset due to unexpected SYN" ++msgstr "" ++ ++#: ../statistics.c:218 ++#, c-format ++msgid "%u connections reset due to unexpected data" ++msgstr "" ++ ++#: ../statistics.c:219 ++#, c-format ++msgid "%u connections reset due to early user close" ++msgstr "" ++ ++#: ../statistics.c:220 ++#, c-format ++msgid "%u connections aborted due to memory pressure" ++msgstr "" ++ ++#: ../statistics.c:221 ++#, c-format ++msgid "%u connections aborted due to timeout" ++msgstr "" ++ ++#: ../statistics.c:222 ++#, c-format ++msgid "%u connections aborted after user close in linger timeout" ++msgstr "" ++ ++#: ../statistics.c:223 ++#, c-format ++msgid "%u times unabled to send RST due to no memory" ++msgstr "" ++ ++#: ../statistics.c:224 ++#, c-format ++msgid "TCP ran low on memory %u times" ++msgstr "" ++ ++#: ../statistics.c:225 ++#, c-format ++msgid "%u TCP data loss events" ++msgstr "" ++ ++#: ../statistics.c:292 + msgid "enabled" + msgstr "" + +-#: ../statistics.c:253 ++#: ../statistics.c:292 + msgid "disabled" + msgstr "" + +-#: ../statistics.c:336 ++#: ../statistics.c:375 + msgid "error parsing /proc/net/snmp" + msgstr "" + +-#: ../statistics.c:349 ++#: ../statistics.c:388 + msgid "cannot open /proc/net/snmp" + msgstr "" + +@@ -1617,7 +2002,7 @@ msgstr "" + msgid "Cannot change line discipline to `%s'.\n" + msgstr "" + +-#: ../lib/af.c:153 ../lib/hw.c:156 ++#: ../lib/af.c:153 ../lib/hw.c:161 + msgid "UNSPEC" + msgstr "" + +@@ -1633,11 +2018,11 @@ msgstr "" + msgid "IPv6" + msgstr "" + +-#: ../lib/af.c:164 ../lib/hw.c:177 ++#: ../lib/af.c:164 ../lib/hw.c:182 + msgid "AMPR AX.25" + msgstr "" + +-#: ../lib/af.c:167 ../lib/hw.c:183 ++#: ../lib/af.c:167 ../lib/hw.c:188 + msgid "AMPR NET/ROM" + msgstr "" + +@@ -1649,7 +2034,7 @@ msgstr "" + msgid "Appletalk DDP" + msgstr "" + +-#: ../lib/af.c:176 ../lib/hw.c:218 ++#: ../lib/af.c:176 ../lib/hw.c:223 + msgid "Econet" + msgstr "" + +@@ -1657,19 +2042,21 @@ msgstr "" + msgid "CCITT X.25" + msgstr "" + +-#: ../lib/af.c:182 ../lib/hw.c:180 ++#: ../lib/af.c:182 ../lib/hw.c:185 + msgid "AMPR ROSE" + msgstr "" + +-#: ../lib/af.c:185 ../lib/hw.c:168 ++#: ../lib/af.c:185 ../lib/hw.c:173 + msgid "Ash" + msgstr "" + + #: ../lib/af.c:243 ++#, c-format + msgid "Please don't supply more than one address family.\n" + msgstr "" + + #: ../lib/af.c:304 ++#, c-format + msgid "Too much address family arguments.\n" + msgstr "" + +@@ -1694,6 +2081,7 @@ msgid "in_arcnet(%s): trailing junk!\n" + msgstr "" + + #: ../lib/ash.c:81 ++#, c-format + msgid "Malformed Ash address" + msgstr "" + +@@ -1712,22 +2100,21 @@ msgid "Callsign too long" + msgstr "" + + #: ../lib/ax25_gr.c:47 ++#, c-format + msgid "AX.25 not configured in this system.\n" + msgstr "" + + #: ../lib/ax25_gr.c:50 ++#, c-format + msgid "Kernel AX.25 routing table\n" + msgstr "" + + #. xxx + #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55 ++#, c-format + msgid "Destination Iface Use\n" + msgstr "" + +-#: ../lib/ddp_gr.c:21 +-msgid "Routing table for `ddp' not yet supported.\n" +-msgstr "" +- + #: ../lib/ether.c:74 ../lib/ether.c:91 + #, c-format + msgid "in_ether(%s): invalid ether address!\n" +@@ -1783,90 +2170,94 @@ msgstr "" + msgid "in_hippi(%s): trailing junk!\n" + msgstr "" + +-#: ../lib/hw.c:155 ++#: ../lib/hw.c:160 + msgid "Local Loopback" + msgstr "" + +-#: ../lib/hw.c:158 ++#: ../lib/hw.c:163 + msgid "Serial Line IP" + msgstr "" + +-#: ../lib/hw.c:159 ++#: ../lib/hw.c:164 + msgid "VJ Serial Line IP" + msgstr "" + +-#: ../lib/hw.c:160 ++#: ../lib/hw.c:165 + msgid "6-bit Serial Line IP" + msgstr "" + +-#: ../lib/hw.c:161 ++#: ../lib/hw.c:166 + msgid "VJ 6-bit Serial Line IP" + msgstr "" + +-#: ../lib/hw.c:162 ++#: ../lib/hw.c:167 + msgid "Adaptive Serial Line IP" + msgstr "" + +-#: ../lib/hw.c:165 ++#: ../lib/hw.c:170 + msgid "Ethernet" + msgstr "" + +-#: ../lib/hw.c:171 ++#: ../lib/hw.c:176 + msgid "Fiber Distributed Data Interface" + msgstr "" + +-#: ../lib/hw.c:174 ++#: ../lib/hw.c:179 + msgid "HIPPI" + msgstr "" + +-#: ../lib/hw.c:186 ++#: ../lib/hw.c:191 + msgid "generic X.25" + msgstr "" + +-#: ../lib/hw.c:189 ++#: ../lib/hw.c:194 + msgid "IPIP Tunnel" + msgstr "" + +-#: ../lib/hw.c:192 ++#: ../lib/hw.c:197 + msgid "Point-to-Point Protocol" + msgstr "" + +-#: ../lib/hw.c:195 ++#: ../lib/hw.c:200 + msgid "(Cisco)-HDLC" + msgstr "" + +-#: ../lib/hw.c:196 ++#: ../lib/hw.c:201 + msgid "LAPB" + msgstr "" + +-#: ../lib/hw.c:199 ++#: ../lib/hw.c:204 + msgid "ARCnet" + msgstr "" + +-#: ../lib/hw.c:202 ++#: ../lib/hw.c:207 + msgid "Frame Relay DLCI" + msgstr "" + +-#: ../lib/hw.c:203 ++#: ../lib/hw.c:208 + msgid "Frame Relay Access Device" + msgstr "" + +-#: ../lib/hw.c:206 ++#: ../lib/hw.c:211 + msgid "IPv6-in-IPv4" + msgstr "" + +-#: ../lib/hw.c:209 ++#: ../lib/hw.c:214 + msgid "IrLAP" + msgstr "" + +-#: ../lib/hw.c:212 ++#: ../lib/hw.c:217 + msgid "16/4 Mbps Token Ring" + msgstr "" + +-#: ../lib/hw.c:214 ++#: ../lib/hw.c:219 + msgid "16/4 Mbps Token Ring (New)" + msgstr "" + ++#: ../lib/hw.c:226 ++msgid "Generic EUI-64" ++msgstr "" ++ + #: ../lib/inet.c:153 ../lib/inet6.c:79 + #, c-format + msgid "rresolve: unsupport address family %d !\n" +@@ -1877,131 +2268,157 @@ msgid "[UNKNOWN]" + msgstr "" + + #: ../lib/inet6_gr.c:71 ++#, c-format + msgid "INET6 (IPv6) not configured in this system.\n" + msgstr "" + + #: ../lib/inet6_gr.c:74 ++#, c-format + msgid "Kernel IPv6 routing table\n" + msgstr "" + + #: ../lib/inet6_gr.c:76 ++#, c-format + msgid "" +-"Destination Next Hop " +-" Flags Metric Ref Use Iface\n" ++"Destination Next " ++"Hop Flags Metric Ref Use Iface\n" + msgstr "" + + #: ../lib/inet6_gr.c:150 ++#, c-format + msgid "Kernel IPv6 Neighbour Cache\n" + msgstr "" + + #: ../lib/inet6_gr.c:153 ++#, c-format + msgid "" + "Neighbour HW Address Iface Flags " + "Ref State\n" + msgstr "" + + #: ../lib/inet6_gr.c:157 ++#, c-format + msgid "" + "Neighbour HW Address Iface Flags " + "Ref State Stale(sec) Delete(sec)\n" + msgstr "" + + #: ../lib/inet6_sr.c:46 ++#, c-format + msgid "Usage: inet6_route [-vF] del Target\n" + msgstr "" + + #: ../lib/inet6_sr.c:47 ++#, c-format + msgid " inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n" + msgstr "" + + #: ../lib/inet6_sr.c:48 ++#, c-format + msgid " inet6_route [-FC] flush NOT supported\n" + msgstr "" + + #: ../lib/inet6_sr.c:188 ++#, c-format + msgid "Flushing `inet6' routing table not supported\n" + msgstr "" + + #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220 ++#, c-format + msgid "INET (IPv4) not configured in this system.\n" + msgstr "" + + #: ../lib/inet_gr.c:53 ++#, c-format + msgid "Kernel IP routing table\n" + msgstr "" + + #: ../lib/inet_gr.c:56 ++#, c-format + msgid "" + "Destination Gateway Genmask Flags Metric Ref Use " + "Iface\n" + msgstr "" + + #: ../lib/inet_gr.c:59 ++#, c-format + msgid "" + "Destination Gateway Genmask Flags MSS Window irtt " + "Iface\n" + msgstr "" + + #: ../lib/inet_gr.c:62 ++#, c-format + msgid "" + "Destination Gateway Genmask Flags Metric Ref Use " + "Iface MSS Window irtt\n" + msgstr "" + + #: ../lib/inet_gr.c:237 ++#, c-format + msgid "Kernel IP routing cache\n" + msgstr "" + + #: ../lib/inet_gr.c:258 ++#, c-format + msgid "" + "Source Destination Gateway Flags Metric Ref Use " + "Iface\n" + msgstr "" + + #: ../lib/inet_gr.c:261 ++#, c-format + msgid "" + "Source Destination Gateway Flags MSS Window irtt " + "Iface\n" + msgstr "" + + #: ../lib/inet_gr.c:266 ++#, c-format + msgid "" + "Source Destination Gateway Flags Metric Ref Use " + "Iface MSS Window irtt HH Arp\n" + msgstr "" + + #: ../lib/inet_gr.c:290 ++#, c-format + msgid "" + "Source Destination Gateway Flags Metric Ref Use " + "Iface MSS Window irtt TOS HHRef HHUptod SpecDst\n" + msgstr "" + +-#: ../lib/inet_sr.c:50 ++#: ../lib/inet_sr.c:51 ++#, c-format + msgid "" + "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] " + "[[dev] If]\n" + msgstr "" + +-#: ../lib/inet_sr.c:51 ++#: ../lib/inet_sr.c:52 ++#, c-format + msgid "" + " inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n" + msgstr "" + +-#: ../lib/inet_sr.c:52 ++#: ../lib/inet_sr.c:53 ++#, c-format + msgid "" + " [netmask N] [mss Mss] [window W] [irtt I]\n" + msgstr "" + +-#: ../lib/inet_sr.c:53 ++#: ../lib/inet_sr.c:54 ++#, c-format + msgid " [mod] [dyn] [reinstate] [[dev] If]\n" + msgstr "" + +-#: ../lib/inet_sr.c:54 ++#: ../lib/inet_sr.c:55 ++#, c-format + msgid "" + " inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n" + msgstr "" + +-#: ../lib/inet_sr.c:55 ++#: ../lib/inet_sr.c:56 ++#, c-format + msgid " inet_route [-FC] flush NOT supported\n" + msgstr "" + +@@ -2011,14 +2428,17 @@ msgid "route: %s: cannot use a NETWORK a + msgstr "" + + #: ../lib/inet_sr.c:174 ++#, c-format + msgid "route: Invalid MSS/MTU.\n" + msgstr "" + + #: ../lib/inet_sr.c:187 ++#, c-format + msgid "route: Invalid window.\n" + msgstr "" + + #: ../lib/inet_sr.c:203 ++#, c-format + msgid "route: Invalid initial rtt.\n" + msgstr "" + +@@ -2033,73 +2453,90 @@ msgid "route: bogus netmask %s\n" + msgstr "" + + #: ../lib/inet_sr.c:270 ++#, c-format + msgid "route: netmask doesn't match route address\n" + msgstr "" + + #: ../lib/inet_sr.c:306 ++#, c-format + msgid "Flushing `inet' routing table not supported\n" + msgstr "" + + #: ../lib/inet_sr.c:310 ++#, c-format + msgid "Modifying `inet' routing cache not supported\n" + msgstr "" + + #: ../lib/ipx_gr.c:52 ++#, c-format + msgid "IPX not configured in this system.\n" + msgstr "" + + #: ../lib/ipx_gr.c:56 ++#, c-format + msgid "Kernel IPX routing table\n" + msgstr "" + + #. xxx + #: ../lib/ipx_gr.c:57 ++#, c-format + msgid "Destination Router Net Router Node\n" + msgstr "" + + #: ../lib/ipx_sr.c:33 ++#, c-format + msgid "IPX: this needs to be written\n" + msgstr "" + + #: ../lib/masq_info.c:198 ++#, c-format + msgid "IP masquerading entries\n" + msgstr "" + + #: ../lib/masq_info.c:201 ++#, c-format + msgid "prot expire source destination ports\n" + msgstr "" + + #: ../lib/masq_info.c:204 ++#, c-format + msgid "" +-"prot expire initseq delta prevd source destination " +-" ports\n" ++"prot expire initseq delta prevd source " ++"destination ports\n" + msgstr "" + + #: ../lib/netrom_gr.c:48 ++#, c-format + msgid "NET/ROM not configured in this system.\n" + msgstr "" + + #: ../lib/netrom_gr.c:51 ++#, c-format + msgid "Kernel NET/ROM routing table\n" + msgstr "" + + #: ../lib/netrom_gr.c:52 ++#, c-format + msgid "Destination Mnemonic Quality Neighbour Iface\n" + msgstr "" + + #: ../lib/netrom_sr.c:34 ++#, c-format + msgid "netrom usage\n" + msgstr "" + + #: ../lib/netrom_sr.c:44 ++#, c-format + msgid "NET/ROM: this needs to be written\n" + msgstr "" + + #: ../lib/ppp.c:44 ++#, c-format + msgid "You cannot start PPP with this program.\n" + msgstr "" + + #: ../lib/ppp_ac.c:38 ++#, c-format + msgid "Sorry, use pppd!\n" + msgstr "" + +@@ -2108,287 +2545,314 @@ msgid "Node address must be ten digits" + msgstr "" + + #: ../lib/rose_gr.c:51 ++#, c-format + msgid "ROSE not configured in this system.\n" + msgstr "" + + #: ../lib/rose_gr.c:54 ++#, c-format + msgid "Kernel ROSE routing table\n" + msgstr "" + +-#: ../lib/tr.c:70 ../lib/tr.c:85 ++#: ../lib/tr.c:86 ../lib/tr.c:101 + #, c-format + msgid "in_tr(%s): invalid token ring address!\n" + msgstr "" + +-#: ../lib/tr.c:97 ++#: ../lib/tr.c:113 + #, c-format + msgid "in_tr(%s): trailing : ignored!\n" + msgstr "" + +-#: ../lib/tr.c:109 ++#: ../lib/tr.c:125 + #, c-format + msgid "in_tr(%s): trailing junk!\n" + msgstr "" + +-#: ../lib/interface.c:164 ++#: ../lib/interface.c:176 + #, c-format + msgid "warning: no inet socket available: %s\n" + msgstr "" + +-#: ../lib/interface.c:316 ++#: ../lib/interface.c:325 + #, c-format + msgid "Warning: cannot open %s (%s). Limited output.\n" + msgstr "" + + #. Give better error message for this case. +-#: ../lib/interface.c:556 ++#: ../lib/interface.c:571 + msgid "Device not found" + msgstr "" + +-#: ../lib/interface.c:560 ++#: ../lib/interface.c:575 + #, c-format + msgid "%s: error fetching interface information: %s\n" + msgstr "" + +-#: ../lib/interface.c:593 ++#: ../lib/interface.c:608 + msgid " - no statistics available -" + msgstr "" + +-#: ../lib/interface.c:597 ++#: ../lib/interface.c:612 ++#, c-format + msgid "[NO FLAGS]" + msgstr "" + +-#: ../lib/interface.c:673 ++#: ../lib/interface.c:688 + #, c-format + msgid "%-9.9s Link encap:%s " + msgstr "" + +-#: ../lib/interface.c:678 ++#: ../lib/interface.c:693 + #, c-format + msgid "HWaddr %s " + msgstr "" + +-#: ../lib/interface.c:681 ++#: ../lib/interface.c:696 + #, c-format + msgid "Media:%s" + msgstr "" + +-#: ../lib/interface.c:683 ++#: ../lib/interface.c:698 ++#, c-format + msgid "(auto)" + msgstr "" + +-#: ../lib/interface.c:690 ++#: ../lib/interface.c:705 + #, c-format + msgid " %s addr:%s " + msgstr "" + +-#: ../lib/interface.c:693 ++#: ../lib/interface.c:708 + #, c-format + msgid " P-t-P:%s " + msgstr "" + +-#: ../lib/interface.c:696 ++#: ../lib/interface.c:711 + #, c-format + msgid " Bcast:%s " + msgstr "" + +-#: ../lib/interface.c:698 ++#: ../lib/interface.c:713 + #, c-format + msgid " Mask:%s\n" + msgstr "" + +-#: ../lib/interface.c:715 ++#: ../lib/interface.c:730 + #, c-format + msgid " inet6 addr: %s/%d" + msgstr "" + +-#: ../lib/interface.c:717 ++#: ../lib/interface.c:732 ++#, c-format + msgid " Scope:" + msgstr "" + +-#: ../lib/interface.c:720 ++#: ../lib/interface.c:735 ++#, c-format + msgid "Global" + msgstr "" + +-#: ../lib/interface.c:723 ++#: ../lib/interface.c:738 ++#, c-format + msgid "Link" + msgstr "" + +-#: ../lib/interface.c:726 ++#: ../lib/interface.c:741 ++#, c-format + msgid "Site" + msgstr "" + +-#: ../lib/interface.c:729 ++#: ../lib/interface.c:744 ++#, c-format + msgid "Compat" + msgstr "" + +-#: ../lib/interface.c:732 ++#: ../lib/interface.c:747 ++#, c-format + msgid "Host" + msgstr "" + +-#: ../lib/interface.c:735 ++#: ../lib/interface.c:750 ++#, c-format + msgid "Unknown" + msgstr "" + +-#: ../lib/interface.c:750 ++#: ../lib/interface.c:765 + #, c-format + msgid " IPX/Ethernet II addr:%s\n" + msgstr "" + +-#: ../lib/interface.c:753 ++#: ../lib/interface.c:768 + #, c-format + msgid " IPX/Ethernet SNAP addr:%s\n" + msgstr "" + +-#: ../lib/interface.c:756 ++#: ../lib/interface.c:771 + #, c-format + msgid " IPX/Ethernet 802.2 addr:%s\n" + msgstr "" + +-#: ../lib/interface.c:759 ++#: ../lib/interface.c:774 + #, c-format + msgid " IPX/Ethernet 802.3 addr:%s\n" + msgstr "" + +-#: ../lib/interface.c:769 ++#: ../lib/interface.c:784 + #, c-format + msgid " EtherTalk Phase 2 addr:%s\n" + msgstr "" + +-#: ../lib/interface.c:778 ++#: ../lib/interface.c:793 + #, c-format + msgid " econet addr:%s\n" + msgstr "" + +-#: ../lib/interface.c:785 ++#: ../lib/interface.c:800 ++#, c-format + msgid "[NO FLAGS] " + msgstr "" + +-#: ../lib/interface.c:787 ++#: ../lib/interface.c:802 ++#, c-format + msgid "UP " + msgstr "" + +-#: ../lib/interface.c:789 ++#: ../lib/interface.c:804 ++#, c-format + msgid "BROADCAST " + msgstr "" + +-#: ../lib/interface.c:791 ++#: ../lib/interface.c:806 ++#, c-format + msgid "DEBUG " + msgstr "" + +-#: ../lib/interface.c:793 ++#: ../lib/interface.c:808 ++#, c-format + msgid "LOOPBACK " + msgstr "" + +-#: ../lib/interface.c:795 ++#: ../lib/interface.c:810 ++#, c-format + msgid "POINTOPOINT " + msgstr "" + +-#: ../lib/interface.c:797 ++#: ../lib/interface.c:812 ++#, c-format + msgid "NOTRAILERS " + msgstr "" + +-#: ../lib/interface.c:799 ++#: ../lib/interface.c:814 ++#, c-format + msgid "RUNNING " + msgstr "" + +-#: ../lib/interface.c:801 ++#: ../lib/interface.c:816 ++#, c-format + msgid "NOARP " + msgstr "" + +-#: ../lib/interface.c:803 ++#: ../lib/interface.c:818 ++#, c-format + msgid "PROMISC " + msgstr "" + +-#: ../lib/interface.c:805 ++#: ../lib/interface.c:820 ++#, c-format + msgid "ALLMULTI " + msgstr "" + +-#: ../lib/interface.c:807 ++#: ../lib/interface.c:822 ++#, c-format + msgid "SLAVE " + msgstr "" + +-#: ../lib/interface.c:809 ++#: ../lib/interface.c:824 ++#, c-format + msgid "MASTER " + msgstr "" + +-#: ../lib/interface.c:811 ++#: ../lib/interface.c:826 ++#, c-format + msgid "MULTICAST " + msgstr "" + +-#: ../lib/interface.c:814 ++#: ../lib/interface.c:829 ++#, c-format + msgid "DYNAMIC " + msgstr "" + + #. DONT FORGET TO ADD THE FLAGS IN ife_print_short +-#: ../lib/interface.c:817 ++#: ../lib/interface.c:832 + #, c-format + msgid " MTU:%d Metric:%d" + msgstr "" + +-#: ../lib/interface.c:821 ++#: ../lib/interface.c:836 + #, c-format + msgid " Outfill:%d Keepalive:%d" + msgstr "" + +-#: ../lib/interface.c:835 ++#: ../lib/interface.c:850 + #, c-format + msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" + msgstr "" + +-#: ../lib/interface.c:840 ++#: ../lib/interface.c:855 + #, c-format + msgid " compressed:%lu\n" + msgstr "" + +-#: ../lib/interface.c:852 ++#: ../lib/interface.c:895 + #, c-format + msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" + msgstr "" + +-#: ../lib/interface.c:856 ++#: ../lib/interface.c:899 + #, c-format + msgid " collisions:%lu " + msgstr "" + +-#: ../lib/interface.c:858 ++#: ../lib/interface.c:901 + #, c-format + msgid "compressed:%lu " + msgstr "" + +-#: ../lib/interface.c:860 ++#: ../lib/interface.c:903 + #, c-format + msgid "txqueuelen:%d " + msgstr "" + +-#: ../lib/interface.c:862 ++#: ../lib/interface.c:905 + #, c-format + msgid "RX bytes:%llu (%lu.%lu %s) TX bytes:%llu (%lu.%lu %s)\n" + msgstr "" + +-#: ../lib/interface.c:873 ++#: ../lib/interface.c:916 + #, c-format + msgid "Interrupt:%d " + msgstr "" + + #. Only print devices using it for + #. I/O maps +-#: ../lib/interface.c:876 ++#: ../lib/interface.c:919 + #, c-format + msgid "Base address:0x%x " + msgstr "" + +-#: ../lib/interface.c:878 ++#: ../lib/interface.c:921 + #, c-format + msgid "Memory:%lx-%lx " + msgstr "" + +-#: ../lib/interface.c:881 ++#: ../lib/interface.c:924 + #, c-format + msgid "DMA chan:%x " + msgstr "" + + #: ../lib/sockets.c:63 ++#, c-format + msgid "No usable address families found.\n" + msgstr "" + +@@ -2413,14 +2877,17 @@ msgid "ip: argument is wrong: %s\n" + msgstr "" + + #: ../ipmaddr.c:61 ++#, c-format + msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n" + msgstr "" + + #: ../ipmaddr.c:62 ++#, c-format + msgid " ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n" + msgstr "" + + #: ../ipmaddr.c:63 ++#, c-format + msgid " ipmaddr -V | -version\n" + msgstr "" + +@@ -2449,6 +2916,7 @@ msgid "slattach: tty_lock: (%s): %s\n" + msgstr "" + + #: ../slattach.c:192 ++#, c-format + msgid "slattach: cannot write PID file\n" + msgstr "" + +@@ -2468,18 +2936,22 @@ msgid "slattach: tty_hangup(RAISE): %s\n + msgstr "" + + #: ../slattach.c:468 ++#, c-format + msgid "slattach: tty name too long\n" + msgstr "" + + #: ../slattach.c:498 ++#, c-format + msgid "slattach: tty_open: cannot get current state!\n" + msgstr "" + + #: ../slattach.c:505 ++#, c-format + msgid "slattach: tty_open: cannot get current line disc!\n" + msgstr "" + + #: ../slattach.c:513 ++#, c-format + msgid "slattach: tty_open: cannot set RAW mode!\n" + msgstr "" + +@@ -2489,6 +2961,7 @@ msgid "slattach: tty_open: cannot set %s + msgstr "" + + #: ../slattach.c:530 ++#, c-format + msgid "slattach: tty_open: cannot set 8N1 mode!\n" + msgstr "" + +Index: net-tools/po/et_EE.po +=================================================================== +--- net-tools.orig/po/et_EE.po ++++ net-tools/po/et_EE.po +@@ -6,7 +6,8 @@ + msgid "" + msgstr "" + "Project-Id-Version: net-tools 1.58\n" +-"POT-Creation-Date: 2001-02-15 21:28+0200\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2007-06-30 12:28+0900\n" + "PO-Revision-Date: 2001-02-15 18:00+0300\n" + "Last-Translator: Meelis Roos \n" + "Language-Team: Estonian \n" +@@ -14,53 +15,58 @@ msgstr "" + "Content-Type: text/plain; charset=iso-8859-15\n" + "Content-Transfer-Encoding: 8bit\n" + +-#: ../arp.c:110 ../arp.c:269 ++#: ../arp.c:112 ../arp.c:279 ++#, c-format + msgid "arp: need host name\n" + msgstr "arp: puudub hosti nimi\n" + +-#: ../arp.c:207 ../arp.c:221 ++#: ../arp.c:215 ../arp.c:230 + #, c-format + msgid "No ARP entry for %s\n" + msgstr "%s jaoks pole ARP kirjet\n" + +-#: ../arp.c:239 ++#: ../arp.c:248 + #, c-format + msgid "arp: cant get HW-Address for `%s': %s.\n" + msgstr "arp: ei saa riistvaralist aadressi `%s' jaoks: %s\n" + +-#: ../arp.c:243 ++#: ../arp.c:252 ++#, c-format + msgid "arp: protocol type mismatch.\n" + msgstr "arp: vale protokolli tp\n" + +-#: ../arp.c:252 ++#: ../arp.c:261 + #, c-format + msgid "arp: device `%s' has HW address %s `%s'.\n" + msgstr "arp: seadmel `%s' on riistvaraline aadress %s `%s'\n" + +-#: ../arp.c:282 ++#: ../arp.c:293 ++#, c-format + msgid "arp: need hardware address\n" + msgstr "arp: puudub riistvaraline aadress\n" + +-#: ../arp.c:290 ++#: ../arp.c:301 ++#, c-format + msgid "arp: invalid hardware address\n" + msgstr "arp: vigane riistvaraline aadress\n" + +-#: ../arp.c:387 ++#: ../arp.c:398 + #, c-format + msgid "arp: cannot open etherfile %s !\n" + msgstr "arp: ei saa avada faili %s\n" + +-#: ../arp.c:403 ++#: ../arp.c:414 + #, c-format + msgid "arp: format error on line %u of etherfile %s !\n" + msgstr "arp: formaadiviga real %u failis %s\n" + +-#: ../arp.c:416 ++#: ../arp.c:427 + #, c-format + msgid "arp: cannot set entry on line %u of etherfile %s !\n" + msgstr "arp: ei saa kehtestada ARP kirjet real %u failis %s\n" + +-#: ../arp.c:437 ++#: ../arp.c:448 ++#, c-format + msgid "" + "Address HWtype HWaddress Flags Mask " + "Iface\n" +@@ -68,45 +74,52 @@ msgstr "" + "Aadress HWtp HWaadress Lipud Mask " + "Liides\n" + +-#: ../arp.c:467 ++#: ../arp.c:476 ++#, fuzzy ++msgid "" ++msgstr " liides %s\n" ++ ++#: ../arp.c:478 + msgid "(incomplete)" + msgstr "(mittetielik)" + +-#: ../arp.c:484 ++#: ../arp.c:495 + #, c-format + msgid "%s (%s) at " + msgstr "%s (%s) aadressil " + +-#: ../arp.c:490 ++#: ../arp.c:501 ++#, c-format + msgid " " + msgstr "" + +-#: ../arp.c:496 ++#: ../arp.c:507 + #, c-format + msgid "netmask %s " + msgstr "vrgumask %s " + +-#: ../arp.c:513 ++#: ../arp.c:524 + #, c-format + msgid "on %s\n" + msgstr "liides %s\n" + +-#: ../arp.c:592 ++#: ../arp.c:605 + #, c-format + msgid "Entries: %d\tSkipped: %d\tFound: %d\n" + msgstr "ARP kirjeid kokku: %s\tignoreerisin: %d\tleidsin: %d\n" + +-#: ../arp.c:596 ++#: ../arp.c:609 + #, c-format + msgid "%s (%s) -- no entry\n" + msgstr "%s (%s) -- pole kirjet\n" + +-#: ../arp.c:598 ++#: ../arp.c:611 + #, c-format + msgid "arp: in %d entries no match found.\n" + msgstr "arp: ei leidnud %d kirje hulgast sobivat\n" + +-#: ../arp.c:613 ++#: ../arp.c:626 ++#, c-format + msgid "" + "Usage:\n" + " arp [-vn] [] [-i ] [-a] [] <-Display ARP " +@@ -116,47 +129,45 @@ msgstr "" + "ARP cache vaatamine:\n" + " arp [-vn] [] [-i ] [-a] []\n" + +-#: ../arp.c:614 ++#: ../arp.c:627 ++#, fuzzy, c-format + msgid "" +-" arp [-v] [-i ] -d [pub][nopub] <-Delete ARP " ++" arp [-v] [-i ] -d [pub] <-Delete ARP " + "entry\n" + msgstr "" + "ARP kirje kustutamine:\n" + " arp [-v] [-i ] -d [pub] [nopub]\n" + +-#: ../arp.c:615 ++#: ../arp.c:628 ++#, fuzzy, c-format + msgid "" +-" arp [-vnD] [] [-i ] -f [] <-Add entry from " ++" arp [-vnD] [] [-i ] -f [] <-Add entry from " + "file\n" + msgstr "" + "ARP kirjete lisamine failist:\n" + " arp [-vnD] [] [-i ] -f []\n" + +-#: ../arp.c:616 ++#: ../arp.c:629 ++#, fuzzy, c-format + msgid "" +-" arp [-v] [] [-i ] -s [temp][nopub] <-Add " ++" arp [-v] [] [-i ] -s [temp] <-Add " + "entry\n" + msgstr "" + "ARP kirje lisamine:\n" + " arp [-v] [] [-i ] -s [temp] [nopub]\n" + +-#: ../arp.c:617 +-msgid "" +-" arp [-v] [] [-i ] -s [netmask ] pub " +-"<-''-\n" +-msgstr "" +-" arp [-v] [] [-i ] -s [netmask ] pub\n" +- +-#: ../arp.c:618 ++#: ../arp.c:630 ++#, fuzzy, c-format + msgid "" +-" arp [-v] [] [-i ] -Ds [netmask ] pub " ++" arp [-v] [] [-i ] -Ds [netmask ] pub " + "<-''-\n" + "\n" + msgstr "" + " arp [-v] [] [-i ] -Ds [netmask ] pub\n" + "\n" + +-#: ../arp.c:620 ++#: ../arp.c:632 ++#, c-format + msgid "" + " -a display (all) hosts in alternative (BSD) " + "style\n" +@@ -164,122 +175,132 @@ msgstr "" + " -a nita kiki hoste alternatiivsel (BSD) " + "kujul\n" + +-#: ../arp.c:621 ++#: ../arp.c:633 ++#, c-format + msgid " -s, --set set a new ARP entry\n" + msgstr " -s, --set uue ARP kirje seadmine\n" + +-#: ../arp.c:622 ++#: ../arp.c:634 ++#, c-format + msgid " -d, --delete delete a specified entry\n" + msgstr " -d, --delete mratud kirje kustutamine\n" + +-#: ../arp.c:623 ../netstat.c:1485 ../route.c:85 ++#: ../arp.c:635 ../netstat.c:1503 ../route.c:86 ++#, c-format + msgid " -v, --verbose be verbose\n" + msgstr " -v, --verbose jutukas vljund\n" + +-#: ../arp.c:624 ++#: ../arp.c:636 ../netstat.c:1504 ../route.c:87 ++#, c-format + msgid " -n, --numeric don't resolve names\n" + msgstr " -n, --numeric mitte lahendada nimesid\n" + +-#: ../arp.c:625 ++#: ../arp.c:637 ++#, c-format + msgid "" + " -i, --device specify network interface (e.g. eth0)\n" + msgstr "" + " -i, --device vrguliidese tpsustamine (niteks eth0)\n" + +-#: ../arp.c:626 ++#: ../arp.c:638 ++#, c-format + msgid " -D, --use-device read from given device\n" + msgstr " -D, --use-device lugeda vastavalt liideselt\n" + +-#: ../arp.c:627 ++#: ../arp.c:639 ++#, c-format + msgid " -A, -p, --protocol specify protocol family\n" + msgstr " -A, -p, --protocol protokollipere mramine\n" + +-#: ../arp.c:628 ++#: ../arp.c:640 ++#, c-format + msgid "" +-" -f, --file read new entries from file or from " +-"/etc/ethers\n" ++" -f, --file read new entries from file or from /etc/" ++"ethers\n" + "\n" + msgstr "" +-" -f, --file lugeda kirjed antud failist vi " +-"/etc/ethers'st\n" ++" -f, --file lugeda kirjed antud failist vi /etc/" ++"ethers'st\n" + "\n" + +-#: ../arp.c:630 ../rarp.c:181 ++#: ../arp.c:642 ../rarp.c:182 + #, c-format + msgid " =Use '-H ' to specify hardware address type. Default: %s\n" + msgstr "" + " =kasutage '-H ' riistvaralise aadressi mramiseks.\n" + " Vaikimisi: %s\n" + +-#: ../arp.c:631 ../rarp.c:182 ++#: ../arp.c:643 ../rarp.c:183 ++#, c-format + msgid " List of possible hardware types (which support ARP):\n" + msgstr " Vimalike ARP-i toetavate riistvara tpide nimekiri:\n" + +-#: ../arp.c:664 ../arp.c:749 ++#: ../arp.c:677 ../arp.c:762 + #, c-format + msgid "%s: hardware type not supported!\n" + msgstr "arp: riistvara tpi %s ei toetata\n" + +-#: ../arp.c:668 ++#: ../arp.c:681 + #, c-format + msgid "%s: address family not supported!\n" + msgstr "arp: aadressiperekonda %s ei toetata\n" + +-#: ../arp.c:703 ++#: ../arp.c:716 ++#, c-format + msgid "arp: -N not yet supported.\n" + msgstr "arp: -N toetust pole veel\n" + +-#: ../arp.c:713 ++#: ../arp.c:726 + #, c-format + msgid "arp: %s: unknown address family.\n" + msgstr "arp: tundmatu aadressiperekond %s\n" + +-#: ../arp.c:722 ++#: ../arp.c:735 + #, c-format + msgid "arp: %s: unknown hardware type.\n" + msgstr "arp: tundmatu riistvara tp %s\n" + +-#: ../arp.c:741 ++#: ../arp.c:754 + #, c-format + msgid "arp: %s: kernel only supports 'inet'.\n" + msgstr "arp: tuumas on ainult 'inet' aadressiperekonna toetus\n" + +-#: ../arp.c:754 ++#: ../arp.c:767 + #, c-format + msgid "arp: %s: hardware type without ARP support.\n" + msgstr "arp: riistvara tbil %s pole ARP toetust\n" + +-#: ../hostname.c:69 ++#: ../hostname.c:71 + #, c-format + msgid "Setting nodename to `%s'\n" + msgstr "Sean slme nimeks `%s'\n" + +-#: ../hostname.c:74 ++#: ../hostname.c:76 + #, c-format + msgid "%s: you must be root to change the node name\n" + msgstr "%s: ainult root saab slme nime muuta\n" + +-#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116 ++#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117 + #, c-format + msgid "%s: name too long\n" + msgstr "%s: nimi on liiga pikk\n" + +-#: ../hostname.c:89 ++#: ../hostname.c:91 + #, c-format + msgid "Setting hostname to `%s'\n" + msgstr "Sean hosti nimeks `%s'\n" + +-#: ../hostname.c:94 ++#: ../hostname.c:96 + #, c-format + msgid "%s: you must be root to change the host name\n" + msgstr "%s: ainult root saab hosti nime muuta\n" + +-#: ../hostname.c:108 ++#: ../hostname.c:109 + #, c-format + msgid "Setting domainname to `%s'\n" + msgstr "Sean domeeni nimeks `%s'\n" + +-#: ../hostname.c:113 ++#: ../hostname.c:114 + #, c-format + msgid "%s: you must be root to change the domain name\n" + msgstr "%s: ainult root saab domeeni nime muuta\n" +@@ -304,25 +325,28 @@ msgstr "Tulemus: h_aliases=`%s'\n" + msgid "Result: h_addr_list=`%s'\n" + msgstr "Tulemus: h_addr_list=`%s'\n" + +-#: ../hostname.c:209 ++#: ../hostname.c:208 + #, c-format + msgid "%s: can't open `%s'\n" + msgstr "%s: ei saa avada faili `%s'\n" + +-#: ../hostname.c:223 ++#: ../hostname.c:222 ++#, c-format + msgid "Usage: hostname [-v] {hostname|-F file} set hostname (from file)\n" + msgstr "" + "Kasutamine:\n" + " hostname [-v] {hosti nimi|-F fail} hosti nime seadmine (ka " + "failist)\n" + +-#: ../hostname.c:224 ++#: ../hostname.c:223 ++#, c-format + msgid "" + " domainname [-v] {nisdomain|-F file} set NIS domainname (from file)\n" + msgstr "" + " domainname [-v] {nisdomeen|-F fail} NIS domeeni nime seadmine\n" + +-#: ../hostname.c:226 ++#: ../hostname.c:225 ++#, c-format + msgid "" + " nodename [-v] {nodename|-F file} set DECnet node name (from " + "file)\n" +@@ -330,18 +354,21 @@ msgstr "" + " nodename [-v] {nodename|-F fail} DECneti vrguslme nime " + "seadmine\n" + +-#: ../hostname.c:228 ++#: ../hostname.c:227 ++#, c-format + msgid " hostname [-v] [-d|-f|-s|-a|-i|-y|-n] display formatted name\n" + msgstr "" + " hostname [-v] [-d|-f|-s|-a|-i|-y|-n] nime nitamine antud formaadis\n" + +-#: ../hostname.c:229 ++#: ../hostname.c:228 ++#, c-format + msgid "" + " hostname [-v] display hostname\n" + "\n" + msgstr " hostname [-v] hosti nime nitamine\n" + +-#: ../hostname.c:230 ++#: ../hostname.c:229 ++#, c-format + msgid "" + " hostname -V|--version|-h|--help print info and exit\n" + "\n" +@@ -350,7 +377,8 @@ msgstr "" + " hostname -h|--help seesama abiinfo\n" + "\n" + +-#: ../hostname.c:231 ++#: ../hostname.c:230 ++#, c-format + msgid "" + " dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" + "\n" +@@ -358,36 +386,44 @@ msgstr "" + " dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" + "\n" + +-#: ../hostname.c:232 ++#: ../hostname.c:231 ++#, c-format + msgid " -s, --short short host name\n" + msgstr " -s, --short lhike hosti nimi\n" + +-#: ../hostname.c:233 ++#: ../hostname.c:232 ++#, c-format + msgid " -a, --alias alias names\n" + msgstr " -a, --alias alias-nimed\n" + +-#: ../hostname.c:234 ++#: ../hostname.c:233 ++#, c-format + msgid " -i, --ip-address addresses for the hostname\n" + msgstr " -i, --ip-address hosti IP aadressid\n" + +-#: ../hostname.c:235 ++#: ../hostname.c:234 ++#, c-format + msgid " -f, --fqdn, --long long host name (FQDN)\n" + msgstr "" + " -f, --fqdn, --long pikk hosti nimi (FQDN - tielik ssteeminimi)\n" + +-#: ../hostname.c:236 ++#: ../hostname.c:235 ++#, c-format + msgid " -d, --domain DNS domain name\n" + msgstr " -d, --domain DNS domeeni nimi\n" + +-#: ../hostname.c:237 ++#: ../hostname.c:236 ++#, c-format + msgid " -y, --yp, --nis NIS/YP domainname\n" + msgstr " -y, --yp, --nis NIS/YP domeeni nimi\n" + +-#: ../hostname.c:239 ++#: ../hostname.c:238 ++#, c-format + msgid " -n, --node DECnet node name\n" + msgstr " -n, --node DECneti vrguslme nimi\n" + +-#: ../hostname.c:241 ++#: ../hostname.c:240 ++#, c-format + msgid "" + " -F, --file read hostname or NIS domainname from given file\n" + "\n" +@@ -395,7 +431,8 @@ msgstr "" + " -F, --file lugeda hosti vi NIS domeeni nimi failist\n" + "\n" + +-#: ../hostname.c:243 ++#: ../hostname.c:242 ++#, c-format + msgid "" + " This command can read or set the hostname or the NIS domainname. You can\n" + " also read the DNS domain or the FQDN (fully qualified domain name).\n" +@@ -415,6 +452,7 @@ msgid "%s: You can't change the DNS doma + msgstr "%s: selle ksuga ei saa muuta DNS domeeni nime\n" + + #: ../hostname.c:339 ++#, c-format + msgid "" + "\n" + "Unless you are using bind or NIS for host lookups you can change the DNS\n" +@@ -423,6 +461,7 @@ msgstr "" + "Kui Te EI kasuta bind'i ega NIS'i nimede lahendamiseks, saate DNS domeeni\n" + + #: ../hostname.c:340 ++#, c-format + msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n" + msgstr "(mis on tieliku nime osa) nime muuta failist /etc/hosts.\n" + +@@ -441,76 +480,97 @@ msgstr "getdomainname()=`%s'\n" + msgid "getnodename()=`%s'\n" + msgstr "getnodename()=`%s'\n" + +-#: ../ifconfig.c:110 ++#: ../ifconfig.c:107 ++#, c-format + msgid "" +-"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " ++"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " + "Flg\n" + msgstr "" +-"Liides MTU Meetr. RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " ++"Liides MTU Meetr RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " + "Lip\n" + +-#: ../ifconfig.c:132 ../ifconfig.c:164 +-#, c-format +-msgid "%s: unknown interface: %s\n" +-msgstr "ifconfig: tundmatu liides %s: %s\n" ++#: ../ifconfig.c:129 ../ifconfig.c:161 ++#, fuzzy, c-format ++msgid "%s: ERROR while getting interface flags: %s\n" ++msgstr "%s: viga liidese info ksimisel: %s\n" + +-#: ../ifconfig.c:156 ../ifconfig.c:740 ../ifconfig.c:831 ../ifconfig.c:937 ++#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862 ++#: ../ifconfig.c:973 ++#, c-format + msgid "No support for INET on this system.\n" + msgstr "Antud ssteem ei toeta INET aadressiperekonda\n" + +-#: ../ifconfig.c:179 ++#: ../ifconfig.c:193 ++#, fuzzy, c-format ++msgid "%s: ERROR while testing interface flags: %s\n" ++msgstr "%s: viga liidese info ksimisel: %s\n" ++ ++#: ../ifconfig.c:202 ++#, fuzzy, c-format + msgid "" + "Usage:\n" +-" ifconfig [-a] [-i] [-v] [-s] [[]
]\n" ++" ifconfig [-a] [-v] [-s] [[]
]\n" + msgstr "" + "Kasutamine:\n" + " ifconfig [-a] [-i] [-v] [-s] [[] ]\n" + +-#: ../ifconfig.c:181 ++#: ../ifconfig.c:204 ++#, c-format + msgid " [add
[/]]\n" + msgstr " [add [/]]\n" + +-#: ../ifconfig.c:182 ++#: ../ifconfig.c:205 ++#, c-format + msgid " [del
[/]]\n" + msgstr " [del [/]]\n" + +-#: ../ifconfig.c:183 ++#: ../ifconfig.c:206 ++#, c-format + msgid " [[-]broadcast [
]] [[-]pointopoint [
]]\n" + msgstr " [[-]broadcast []] [[-]pointopoint []]\n" + +-#: ../ifconfig.c:184 ++#: ../ifconfig.c:207 ++#, c-format + msgid " [netmask
] [dstaddr
] [tunnel
]\n" + msgstr " [netmask ] [dstaddr ] [tunnel ]\n" + +-#: ../ifconfig.c:187 ++#: ../ifconfig.c:210 ++#, c-format + msgid " [outfill ] [keepalive ]\n" + msgstr " [outfill ] [keepalive ]\n" + +-#: ../ifconfig.c:189 ++#: ../ifconfig.c:212 ++#, c-format + msgid " [hw
] [metric ] [mtu ]\n" + msgstr " [hw ] [metric ] [mtu ]\n" + +-#: ../ifconfig.c:190 ++#: ../ifconfig.c:213 ++#, c-format + msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" + msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" + +-#: ../ifconfig.c:191 ++#: ../ifconfig.c:214 ++#, c-format + msgid " [multicast] [[-]promisc]\n" + msgstr " [multicast] [[-]promisc]\n" + +-#: ../ifconfig.c:192 ++#: ../ifconfig.c:215 ++#, c-format + msgid " [mem_start ] [io_addr ] [irq ] [media ]\n" + msgstr " [mem_start ] [io_addr ] [irq ] [media ]\n" + +-#: ../ifconfig.c:194 ++#: ../ifconfig.c:217 ++#, c-format + msgid " [txqueuelen ]\n" + msgstr " [txqueuelen ]\n" + +-#: ../ifconfig.c:197 ++#: ../ifconfig.c:220 ++#, c-format + msgid " [[-]dynamic]\n" + msgstr " [[-]dynamic]\n" + +-#: ../ifconfig.c:199 ++#: ../ifconfig.c:222 ++#, c-format + msgid "" + " [up|down] ...\n" + "\n" +@@ -518,73 +578,134 @@ msgstr "" + " [up|down] ...\n" + "\n" + +-#: ../ifconfig.c:201 ++#: ../ifconfig.c:224 ++#, c-format + msgid " =Hardware Type.\n" + msgstr " =riistvara tp\n" + +-#: ../ifconfig.c:202 ++#: ../ifconfig.c:225 ++#, c-format + msgid " List of possible hardware types:\n" + msgstr " Vimalike riistvara tpide nimekiri:\n" + + #. 1 = ARPable +-#: ../ifconfig.c:204 ++#: ../ifconfig.c:227 + #, c-format + msgid " =Address family. Default: %s\n" + msgstr " =aadressiperekond, vaikimisi %s\n" + +-#: ../ifconfig.c:205 ++#: ../ifconfig.c:228 ++#, c-format + msgid " List of possible address families:\n" + msgstr " Vimalike aadressiperekondade nimekiri:\n" + +-#: ../ifconfig.c:361 ++#: ../ifconfig.c:303 ++#, c-format ++msgid "ifconfig: option `%s' not recognised.\n" ++msgstr "" ++ ++#: ../ifconfig.c:305 ../ifconfig.c:962 ++#, c-format ++msgid "ifconfig: `--help' gives usage information.\n" ++msgstr "" ++ ++#: ../ifconfig.c:380 ++#, c-format + msgid "Unknown media type.\n" + msgstr "Tundmatu meedia tp\n" + +-#: ../ifconfig.c:653 ++#: ../ifconfig.c:417 ++#, c-format ++msgid "" ++"Warning: Interface %s still in promisc mode... maybe other application is " ++"running?\n" ++msgstr "" ++ ++#: ../ifconfig.c:429 ++#, c-format ++msgid "Warning: Interface %s still in MULTICAST mode.\n" ++msgstr "" ++ ++#: ../ifconfig.c:441 ++#, c-format ++msgid "Warning: Interface %s still in ALLMULTI mode.\n" ++msgstr "" ++ ++#: ../ifconfig.c:465 ++#, c-format ++msgid "Warning: Interface %s still in DYNAMIC mode.\n" ++msgstr "" ++ ++#: ../ifconfig.c:523 ++#, c-format ++msgid "Warning: Interface %s still in BROADCAST mode.\n" ++msgstr "" ++ ++#: ../ifconfig.c:652 ++#, c-format ++msgid "Warning: Interface %s still in POINTOPOINT mode.\n" ++msgstr "" ++ ++#: ../ifconfig.c:684 + #, c-format + msgid "hw address type `%s' has no handler to set address. failed.\n" + msgstr "" + "riistvara aadressi tbil `%s' pole ksitlejat aadressi seadmiseks - ebann\n" + +-#: ../ifconfig.c:662 ++#: ../ifconfig.c:693 + #, c-format + msgid "%s: invalid %s address.\n" + msgstr "%s: vigane %s aadress\n" + +-#: ../ifconfig.c:706 ../ifconfig.c:796 ../ifconfig.c:882 ++#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913 ++#, c-format + msgid "No support for INET6 on this system.\n" + msgstr "Antud ssteem ei toeta INET6 aadressiperekonda\n" + +-#: ../ifconfig.c:749 ../ifconfig.c:840 ++#: ../ifconfig.c:780 ../ifconfig.c:871 + #, c-format + msgid "Interface %s not initialized\n" + msgstr "Liides %s pole initsialiseeritud\n" + +-#: ../ifconfig.c:761 ../ifconfig.c:851 ++#: ../ifconfig.c:792 ../ifconfig.c:882 ++#, c-format + msgid "Bad address.\n" + msgstr "Vigane aadress\n" + +-#: ../ifconfig.c:854 ++#: ../ifconfig.c:885 ++#, c-format + msgid "Address deletion not supported on this system.\n" + msgstr "Antud ssteem ei toeta aadresside kustutamist\n" + +-#: ../ifconfig.c:947 ++#: ../ifconfig.c:957 ++#, fuzzy, c-format ++msgid "ifconfig: Cannot set address for this protocol family.\n" ++msgstr "Ei oska seada aadresse aadressiperekonna %d jaoks\n" ++ ++#: ../ifconfig.c:983 ++#, c-format + msgid "No support for ECONET on this system.\n" + msgstr "Antud ssteem ei toeta ECONET aadressiperekonda\n" + +-#: ../ifconfig.c:955 ++#: ../ifconfig.c:991 + #, c-format + msgid "Don't know how to set addresses for family %d.\n" + msgstr "Ei oska seada aadresse aadressiperekonna %d jaoks\n" + +-#: ../netstat.c:429 ++#: ../ifconfig.c:1021 ++#, c-format ++msgid "WARNING: at least one error occured. (%d)\n" ++msgstr "" ++ ++#: ../netstat.c:434 + #, c-format + msgid "" + "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n" + msgstr "" + "(\"-p\" jaoks ei saanud infot lugeda: geteuid()=%d, aga vaja oleks root'u)\n" + +-#: ../netstat.c:433 ++#: ../netstat.c:438 ++#, c-format + msgid "" + "(Not all processes could be identified, non-owned process info\n" + " will not be shown, you would have to be root to see it all.)\n" +@@ -592,210 +713,223 @@ msgstr "" + "(Mnesid protsesse ei saanud identifitseerida, teiste kasutajate\n" + "info lugemiseks peab olema root)\n" + +-#: ../netstat.c:440 ../netstat.c:1171 ../netstat.c:1248 ++#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266 + msgid "LISTENING" + msgstr "LISTENING" + +-#: ../netstat.c:441 ++#: ../netstat.c:446 + msgid "CONN SENT" + msgstr "CONN SENT" + +-#: ../netstat.c:442 ../netstat.c:1250 ++#: ../netstat.c:447 ../netstat.c:1268 + msgid "DISC SENT" + msgstr "DISC SENT" + +-#: ../netstat.c:443 ../netstat.c:510 ../netstat.c:889 ../netstat.c:1251 ++#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269 + msgid "ESTABLISHED" + msgstr "ESTABLISHED" + +-#: ../netstat.c:465 ++#: ../netstat.c:470 ++#, c-format + msgid "Active NET/ROM sockets\n" + msgstr "Aktiivsed NET/ROM soklid\n" + +-#: ../netstat.c:466 ++#: ../netstat.c:471 ++#, c-format + msgid "" +-"User Dest Source Device State Vr/Vs Send-Q " +-"Recv-Q\n" ++"User Dest Source Device State Vr/Vs Send-Q Recv-" ++"Q\n" + msgstr "" + "Kasutaja Sihtpunkt Lhtepunkt Liides Olek Vr/Vs SaatJrk " + "VvJrk\n" + +-#: ../netstat.c:476 ../netstat.c:1290 ++#: ../netstat.c:481 ../netstat.c:1308 + #, c-format + msgid "Problem reading data from %s\n" + msgstr "Probleem andmete lugemisel failist %s\n" + +-#: ../netstat.c:511 ++#: ../netstat.c:516 + msgid "SYN_SENT" + msgstr "SYN_SENT" + +-#: ../netstat.c:512 ++#: ../netstat.c:517 + msgid "SYN_RECV" + msgstr "SYN_RECV" + +-#: ../netstat.c:513 ++#: ../netstat.c:518 + msgid "FIN_WAIT1" + msgstr "FIN_WAIT1" + +-#: ../netstat.c:514 ++#: ../netstat.c:519 + msgid "FIN_WAIT2" + msgstr "FIN_WAIT2" + +-#: ../netstat.c:515 ++#: ../netstat.c:520 + msgid "TIME_WAIT" + msgstr "TIME_WAIT" + +-#: ../netstat.c:516 ++#: ../netstat.c:521 + msgid "CLOSE" + msgstr "CLOSE" + +-#: ../netstat.c:517 ++#: ../netstat.c:522 + msgid "CLOSE_WAIT" + msgstr "CLOSE_WAIT" + +-#: ../netstat.c:518 ++#: ../netstat.c:523 + msgid "LAST_ACK" + msgstr "LAST_ACK" + +-#: ../netstat.c:519 ++#: ../netstat.c:524 + msgid "LISTEN" + msgstr "LISTEN" + +-#: ../netstat.c:520 ++#: ../netstat.c:525 + msgid "CLOSING" + msgstr "CLOSING" + +-#: ../netstat.c:587 ++#: ../netstat.c:596 + #, c-format + msgid "warning, got bogus igmp6 line %d.\n" + msgstr "Hoiatus - sain imeliku igmp6 rea (nr. %d)\n" + +-#: ../netstat.c:592 ../netstat.c:630 ../netstat.c:751 ../netstat.c:883 +-#: ../netstat.c:1014 ../netstat.c:1019 ++#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898 ++#: ../netstat.c:1032 ../netstat.c:1037 + #, c-format + msgid "netstat: unsupported address family %d !\n" + msgstr "netstat: aadressiperekonda %d ei toetata\n" + +-#: ../netstat.c:605 ../netstat.c:610 ../netstat.c:618 ../netstat.c:625 ++#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634 + #, c-format + msgid "warning, got bogus igmp line %d.\n" + msgstr "Hoiatus - sain imeliku igmp rea (nr. %d)\n" + +-#: ../netstat.c:668 ++#: ../netstat.c:677 ++#, c-format + msgid "Active X.25 sockets\n" + msgstr "Aktiivsed X.25 soklid\n" + + #. IMHO, Vr/Vs is not very usefull --SF +-#: ../netstat.c:670 ++#: ../netstat.c:679 ++#, c-format + msgid "" +-"Dest Source Device LCI State Vr/Vs Send-Q " +-"Recv-Q\n" ++"Dest Source Device LCI State Vr/Vs Send-Q Recv-" ++"Q\n" + msgstr "" + "Sihtpunkt Lhtepunkt Liides LCI Olek Vr/Vs SaatJrk VvJrk\n" + +-#: ../netstat.c:747 ++#: ../netstat.c:759 ++#, c-format + msgid "warning, got bogus tcp line.\n" + msgstr "Hoiatus - sain imeliku tcp rea\n" + +-#: ../netstat.c:788 ../netstat.c:938 ../netstat.c:1057 ++#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075 + #, c-format + msgid "off (0.00/%ld/%d)" + msgstr "eiki ((0.00/%ld/%d)" + +-#: ../netstat.c:792 ++#: ../netstat.c:804 + #, c-format + msgid "on (%2.2f/%ld/%d)" + msgstr "kib (%2.2f/%ld/%d)" + +-#: ../netstat.c:797 ++#: ../netstat.c:809 + #, c-format + msgid "keepalive (%2.2f/%ld/%d)" + msgstr "keepalive (%2.2f/%ld/%d)" + +-#: ../netstat.c:802 ++#: ../netstat.c:814 + #, c-format + msgid "timewait (%2.2f/%ld/%d)" + msgstr "timewait (%2.2f/%ld/%d)" + +-#: ../netstat.c:807 ../netstat.c:947 ../netstat.c:1067 ++#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085 + #, c-format + msgid "unkn-%d (%2.2f/%ld/%d)" + msgstr "eitea-%d (%2.2f/%ld/%d)" + +-#: ../netstat.c:879 ++#: ../netstat.c:894 ++#, c-format + msgid "warning, got bogus udp line.\n" + msgstr "Hoiatus - sain imeliku udp rea\n" + +-#: ../netstat.c:897 ../netstat.c:1157 ../netstat.c:1190 ++#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208 + msgid "UNKNOWN" + msgstr "TUNDMATU" + +-#: ../netstat.c:943 ../netstat.c:1062 ++#: ../netstat.c:958 ../netstat.c:1080 + #, c-format + msgid "on%d (%2.2f/%ld/%d)" + msgstr "kib-%d (%2.2f/%ld/%d)" + +-#: ../netstat.c:1028 ++#: ../netstat.c:1046 ++#, c-format + msgid "warning, got bogus raw line.\n" + msgstr "Hoiatus - sain imeliku raw rea\n" + +-#: ../netstat.c:1110 ++#: ../netstat.c:1128 ++#, c-format + msgid "warning, got bogus unix line.\n" + msgstr "Hoiatus - sain imeliku unix rea\n" + +-#: ../netstat.c:1137 ++#: ../netstat.c:1155 + msgid "STREAM" + msgstr "STREAM" + +-#: ../netstat.c:1141 ++#: ../netstat.c:1159 + msgid "DGRAM" + msgstr "DGRAM" + +-#: ../netstat.c:1145 ++#: ../netstat.c:1163 + msgid "RAW" + msgstr "RAW" + +-#: ../netstat.c:1149 ++#: ../netstat.c:1167 + msgid "RDM" + msgstr "RDM" + +-#: ../netstat.c:1153 ++#: ../netstat.c:1171 + msgid "SEQPACKET" + msgstr "SEQPACKET" + +-#: ../netstat.c:1162 ++#: ../netstat.c:1180 + msgid "FREE" + msgstr "VABA" + +-#: ../netstat.c:1178 ++#: ../netstat.c:1196 + msgid "CONNECTING" + msgstr "HENDUMAS" + +-#: ../netstat.c:1182 ++#: ../netstat.c:1200 + msgid "CONNECTED" + msgstr "HENDATUD" + +-#: ../netstat.c:1186 ++#: ../netstat.c:1204 + msgid "DISCONNECTING" + msgstr "LAHTIHENDUMAS" + +-#: ../netstat.c:1217 ++#: ../netstat.c:1235 ++#, c-format + msgid "Active UNIX domain sockets " + msgstr "Aktiivsed UNIX domeeni soklid " + +-#: ../netstat.c:1219 ../netstat.c:1729 ++#: ../netstat.c:1237 ../netstat.c:1756 ++#, c-format + msgid "(servers and established)" + msgstr "(serverid ja hendatud)" + +-#: ../netstat.c:1222 ../netstat.c:1732 ++#: ../netstat.c:1240 ../netstat.c:1759 ++#, c-format + msgid "(only servers)" + msgstr "(ainult serverid)" + +-#: ../netstat.c:1224 ../netstat.c:1734 ++#: ../netstat.c:1242 ../netstat.c:1761 ++#, c-format + msgid "(w/o servers)" + msgstr "(ilma serveriteta)" + +-#: ../netstat.c:1227 ++#: ../netstat.c:1245 ++#, c-format + msgid "" + "\n" + "Proto RefCnt Flags Type State I-Node" +@@ -803,32 +937,36 @@ msgstr "" + "\n" + "Proto Mitu Lipud Tp Olek I-kirje " + +-#: ../netstat.c:1229 ++#: ../netstat.c:1247 ++#, c-format + msgid " Path\n" + msgstr "Tee\n" + +-#: ../netstat.c:1249 ++#: ../netstat.c:1267 + msgid "SABM SENT" + msgstr "SABM SENT" + +-#: ../netstat.c:1252 ++#: ../netstat.c:1270 + msgid "RECOVERY" + msgstr "RECOVERY" + +-#: ../netstat.c:1266 ++#: ../netstat.c:1284 ++#, c-format + msgid "Active AX.25 sockets\n" + msgstr "Aktiivsed AX.25 soklid\n" + +-#: ../netstat.c:1267 ++#: ../netstat.c:1285 ++#, c-format + msgid "Dest Source Device State Vr/Vs Send-Q Recv-Q\n" + msgstr "Sihtpunkt Lhtepunkt Liides Olek Vr/Vs SaatJrk VvJrk\n" + +-#: ../netstat.c:1310 ++#: ../netstat.c:1328 + #, c-format + msgid "problem reading data from %s\n" + msgstr "Probleem andmete lugemisel failist %s\n" + +-#: ../netstat.c:1361 ++#: ../netstat.c:1379 ++#, c-format + msgid "" + "Active IPX sockets\n" + "Proto Recv-Q Send-Q Local Address Foreign Address " +@@ -838,47 +976,53 @@ msgstr "" + "Proto VvJrk SaatJrk Kohalik aadress Vline aadress " + "Olek " + +-#: ../netstat.c:1363 ++#: ../netstat.c:1381 ++#, c-format + msgid " User" + msgstr " Kasutaja" + +-#: ../netstat.c:1397 ++#: ../netstat.c:1415 + msgid "ESTAB" + msgstr "ESTAB" + +-#: ../netstat.c:1405 ++#: ../netstat.c:1423 + msgid "UNK." + msgstr "UNK." + +-#: ../netstat.c:1443 ++#: ../netstat.c:1461 ++#, c-format + msgid "Kernel Interface table\n" + msgstr "Tuuma liideste tabel\n" + +-#: ../netstat.c:1447 ++#: ../netstat.c:1465 ++#, fuzzy, c-format + msgid "" +-"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " ++"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " + "Flg\n" + msgstr "" +-"Liides MTU Meetr RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " ++"Liides MTU Meetr. RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " + "Lip\n" + +-#: ../netstat.c:1451 ++#: ../netstat.c:1469 + msgid "missing interface information" + msgstr "Puudulik informatsioon liideste kohta" + +-#: ../netstat.c:1474 ++#: ../netstat.c:1492 ++#, c-format + msgid "" +-"usage: netstat [-veenNcCF] [] -r netstat " +-"{-V|--version|-h|--help}\n" ++"usage: netstat [-veenNcCF] [] -r netstat {-V|--version|-h|--" ++"help}\n" + msgstr "" + "Kasutamine: netstat [-veenNcCF] [] -r\n" + " netstat {-V|--version|-h|--help}\n" + +-#: ../netstat.c:1475 ++#: ../netstat.c:1493 ++#, c-format + msgid " netstat [-vnNcaeol] [ ...]\n" + msgstr " netstat [-vnNcaeol] [ ...]\n" + +-#: ../netstat.c:1476 ++#: ../netstat.c:1494 ++#, c-format + msgid "" + " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" + "\n" +@@ -886,25 +1030,30 @@ msgstr "" + " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" + "\n" + +-#: ../netstat.c:1478 ++#: ../netstat.c:1496 ++#, c-format + msgid " -r, --route display routing table\n" + msgstr " -r, --route ruutingutabeli nitamine\n" + +-#: ../netstat.c:1479 ++#: ../netstat.c:1497 ++#, c-format + msgid " -i, --interfaces display interface table\n" + msgstr " -i, --interfaces liideste tabeli nitamine\n" + +-#: ../netstat.c:1480 ++#: ../netstat.c:1498 ++#, c-format + msgid " -g, --groups display multicast group memberships\n" + msgstr " -g, --groups multiedastuse gruppide nitamine\n" + +-#: ../netstat.c:1481 ++#: ../netstat.c:1499 ++#, c-format + msgid "" + " -s, --statistics display networking statistics (like SNMP)\n" + msgstr "" + " -s, --statistics vrgu statistika nitamine (SNMP stiilis)\n" + +-#: ../netstat.c:1483 ++#: ../netstat.c:1501 ++#, c-format + msgid "" + " -M, --masquerade display masqueraded connections\n" + "\n" +@@ -912,36 +1061,39 @@ msgstr "" + " -M, --masquerade maskeeritavate henduste nitamine\n" + "\n" + +-#: ../netstat.c:1486 ../route.c:86 +-msgid " -n, --numeric dont resolve names\n" +-msgstr " -n, --numeric mitte lahendada numbreid nimedeks\n" +- +-#: ../netstat.c:1487 +-msgid " --numeric-hosts dont resolve host names\n" ++#: ../netstat.c:1505 ++#, fuzzy, c-format ++msgid " --numeric-hosts don't resolve host names\n" + msgstr " --numeric-hosts mitte lahendada hostinimesid\n" + +-#: ../netstat.c:1488 +-msgid " --numeric-ports dont resolve port names\n" ++#: ../netstat.c:1506 ++#, fuzzy, c-format ++msgid " --numeric-ports don't resolve port names\n" + msgstr " --numeric-ports mitte lahendada pordinimesid\n" + +-#: ../netstat.c:1489 +-msgid " --numeric-users dont resolve user names\n" ++#: ../netstat.c:1507 ++#, fuzzy, c-format ++msgid " --numeric-users don't resolve user names\n" + msgstr " --numeric-users mitte lahendada kasutajanimesid\n" + +-#: ../netstat.c:1490 ++#: ../netstat.c:1508 ++#, c-format + msgid " -N, --symbolic resolve hardware names\n" + msgstr " -N, --symbolic lahendada riistvara aadressid\n" + +-#: ../netstat.c:1491 ../route.c:87 ++#: ../netstat.c:1509 ../route.c:88 ++#, c-format + msgid " -e, --extend display other/more information\n" + msgstr " -e, --extend muu info/lisainfo nitamine\n" + +-#: ../netstat.c:1492 ++#: ../netstat.c:1510 ++#, c-format + msgid " -p, --programs display PID/Program name for sockets\n" + msgstr "" + " -p, --programs soklite kohta PID/protsessi nime nitamine\n" + +-#: ../netstat.c:1493 ++#: ../netstat.c:1511 ++#, c-format + msgid "" + " -c, --continuous continuous listing\n" + "\n" +@@ -949,22 +1101,26 @@ msgstr "" + " -c, --continuous pidevalt uuenev nimekiri\n" + "\n" + +-#: ../netstat.c:1494 ++#: ../netstat.c:1512 ++#, c-format + msgid " -l, --listening display listening server sockets\n" + msgstr " -l, --listening kuulavate serversoklite nitamine\n" + +-#: ../netstat.c:1495 ++#: ../netstat.c:1513 ++#, c-format + msgid "" + " -a, --all, --listening display all sockets (default: connected)\n" + msgstr "" + " -a, --all, --listening kigi soklite nitamine (vaikimisi " + "hendatud)\n" + +-#: ../netstat.c:1496 ++#: ../netstat.c:1514 ++#, c-format + msgid " -o, --timers display timers\n" + msgstr " -o, --timers taimerite nitamine\n" + +-#: ../netstat.c:1497 ../route.c:88 ++#: ../netstat.c:1515 ../route.c:89 ++#, c-format + msgid "" + " -F, --fib display Forwarding Information Base " + "(default)\n" +@@ -972,7 +1128,8 @@ msgstr "" + " -F, --fib ldiste ruutingutabelite nitamine " + "(vaikimisi)\n" + +-#: ../netstat.c:1498 ../route.c:89 ++#: ../netstat.c:1516 ../route.c:90 ++#, c-format + msgid "" + " -C, --cache display routing cache instead of FIB\n" + "\n" +@@ -981,108 +1138,121 @@ msgstr "" + "nitamine\n" + "\n" + +-#: ../netstat.c:1500 ++#: ../netstat.c:1518 ++#, c-format + msgid "" +-" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx " +-"--netrom\n" ++" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" ++"netrom\n" + msgstr "" +-" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx " +-"--netrom\n" ++" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" ++"netrom\n" + +-#: ../netstat.c:1501 ../route.c:91 +-#, c-format +-msgid " =Use '-A ' or '--' Default: %s\n" ++#: ../netstat.c:1519 ++#, fuzzy, c-format ++msgid " =Use '-6|-4' or '-A ' or '--'; default: %s\n" + msgstr " =kasutage '-A ' vi '--' vaikimisi: %s\n" + +-#: ../netstat.c:1502 ../route.c:92 ++#: ../netstat.c:1520 ../route.c:93 ++#, c-format + msgid " List of possible address families (which support routing):\n" + msgstr " Vimalike ruutingu toetavate aadressiperekondade nimekiri:\n" + +-#: ../netstat.c:1726 ++#: ../netstat.c:1753 ++#, c-format + msgid "Active Internet connections " + msgstr "Aktiivsed internetihendused " + +-#: ../netstat.c:1736 ++#: ../netstat.c:1763 ++#, c-format + msgid "" + "\n" +-"Proto Recv-Q Send-Q Local Address Foreign Address State " +-" " ++"Proto Recv-Q Send-Q Local Address Foreign Address " ++"State " + msgstr "" + "\n" +-"Proto VvJrk SaatJrk Kohalik aadress Vline aadress Olek " +-" " ++"Proto VvJrk SaatJrk Kohalik aadress Vline aadress " ++"Olek " + +-#: ../netstat.c:1738 ++#: ../netstat.c:1765 ++#, c-format + msgid " User Inode " + msgstr " Kasutaja I-kirje " + +-#: ../netstat.c:1741 ++#: ../netstat.c:1768 ++#, c-format + msgid " Timer" + msgstr " Taimer" + +-#: ../netstat.c:1771 ++#: ../netstat.c:1798 ++#, c-format + msgid "IPv4 Group Memberships\n" + msgstr "IPv4 grupikuuluvused\n" + +-#: ../netstat.c:1772 ++#: ../netstat.c:1799 ++#, c-format + msgid "Interface RefCnt Group\n" + msgstr "Liides Mitu Grupp\n" + +-#: ../rarp.c:43 ++#: ../rarp.c:44 + msgid "This kernel does not support RARP.\n" + msgstr "rarp: tuum ei toeta RARP'i\n" + +-#: ../rarp.c:82 ++#: ../rarp.c:83 + #, c-format + msgid "no RARP entry for %s.\n" + msgstr "rarp: %s jaoks pole RARP kirjet\n" + +-#: ../rarp.c:95 ++#: ../rarp.c:96 + #, c-format + msgid "%s: bad hardware address\n" + msgstr "rarp: vigane riistvaraline aadress %s\n" + +-#: ../rarp.c:127 ++#: ../rarp.c:128 + #, c-format + msgid "rarp: cannot open file %s:%s.\n" + msgstr "rarp: ei saa avada faili %s:%s\n" + +-#: ../rarp.c:139 ++#: ../rarp.c:140 + #, c-format + msgid "rarp: format error at %s:%u\n" + msgstr "rarp: vorminguviga failis %s real %u\n" + +-#: ../rarp.c:143 ../rarp.c:287 ++#: ../rarp.c:144 ../rarp.c:289 + #, c-format + msgid "rarp: %s: unknown host\n" + msgstr "rarp: tundmatu host %s\n" + +-#: ../rarp.c:146 ++#: ../rarp.c:147 + #, c-format + msgid "rarp: cannot set entry from %s:%u\n" + msgstr "rarp: ei saa kehtestada kirjet failist %s realt %u\n" + +-#: ../rarp.c:175 ++#: ../rarp.c:176 ++#, c-format + msgid "Usage: rarp -a list entries in cache.\n" + msgstr "" + "Kasutamine:\n" + " rarp -a puhvris olevate kirjete vaatamine\n" + +-#: ../rarp.c:176 ++#: ../rarp.c:177 ++#, c-format + msgid " rarp -d delete entry from cache.\n" + msgstr " rarp -d kirje kustutamine puhvrist\n" + +-#: ../rarp.c:177 ++#: ../rarp.c:178 ++#, c-format + msgid " rarp [] -s add entry to cache.\n" + msgstr " rarp [] -s kirje lisamine puhvrisse\n" + +-#: ../rarp.c:178 ++#: ../rarp.c:179 ++#, c-format + msgid "" + " rarp -f add entries from /etc/ethers.\n" + msgstr "" + " rarp -f kirjete lisamine failist /etc/ethers\n" + +-#: ../rarp.c:179 ++#: ../rarp.c:180 ++#, c-format + msgid "" + " rarp -V display program version.\n" + "\n" +@@ -1090,24 +1260,26 @@ msgstr "" + " rarp -V programmi versiooni nitamine\n" + "\n" + +-#: ../rarp.c:236 ++#: ../rarp.c:238 + #, c-format + msgid "%s: illegal option mix.\n" + msgstr "%s: lubamatu vtmete kombinatsioon\n" + +-#: ../rarp.c:267 ++#: ../rarp.c:269 + #, c-format + msgid "rarp: %s: unknown hardware type.\n" + msgstr "rarp: tundmatu riistvara tp %s\n" + +-#: ../route.c:79 ++#: ../route.c:80 ++#, c-format + msgid "" + "Usage: route [-nNvee] [-FC] [] List kernel routing tables\n" + msgstr "" + "Kasutamine:\n" + " route [-nNvee] [-FC] [] Tuuma ruutingutabeli nitamine\n" + +-#: ../route.c:80 ++#: ../route.c:81 ++#, c-format + msgid "" + " route [-v] [-FC] {add|del|flush} ... Modify routing table for AF.\n" + "\n" +@@ -1115,7 +1287,8 @@ msgstr "" + " route [-v] [-FC] {add|del|flush} ... Tuuma ruutingutabeli muutmine\n" + "\n" + +-#: ../route.c:82 ++#: ../route.c:83 ++#, c-format + msgid "" + " route {-h|--help} [] Detailed usage syntax for " + "specified AF.\n" +@@ -1123,7 +1296,8 @@ msgstr "" + " route {-h|--help} [] Detailne sntaks perekonna AF " + "jaoks\n" + +-#: ../route.c:83 ++#: ../route.c:84 ++#, c-format + msgid "" + " route {-V|--version} Display version/author and " + "exit.\n" +@@ -1132,15 +1306,23 @@ msgstr "" + " route {-V|--version} Versiooni ja oskuste nitamine\n" + "\n" + ++#: ../route.c:92 ++#, fuzzy, c-format ++msgid " =Use '-A ' or '--'; default: %s\n" ++msgstr " =kasutage '-A ' vi '--' vaikimisi: %s\n" ++ + #: ../plipconfig.c:66 ++#, c-format + msgid "Usage: plipconfig [-a] [-i] [-v] interface\n" + msgstr "Kasutamine: plipconfig [-a] [-i] [-v] liides\n" + + #: ../plipconfig.c:67 ++#, c-format + msgid " [nibble NN] [trigger NN]\n" + msgstr " [nibble NN] [trigger NN]\n" + + #: ../plipconfig.c:68 ++#, c-format + msgid " plipconfig -V | --version\n" + msgstr " plipconfig -V | --version\n" + +@@ -1149,25 +1331,30 @@ msgstr " plipconfig -V | --v + msgid "%s\tnibble %lu trigger %lu\n" + msgstr "%s\tnibble %lu trigger %lu\n" + +-#: ../iptunnel.c:84 ++#: ../iptunnel.c:85 ++#, c-format + msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n" + msgstr "Kasutamine: iptunnel { add | change | del | show } [ NIMI ]\n" + +-#: ../iptunnel.c:85 ++#: ../iptunnel.c:86 ++#, c-format + msgid "" + " [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n" + msgstr "" + " [ mode { ipip | gre | sit } ] [ remote AADR ] [ local AADR ]\n" + +-#: ../iptunnel.c:86 ++#: ../iptunnel.c:87 ++#, c-format + msgid " [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n" + msgstr " [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n" + +-#: ../iptunnel.c:87 ++#: ../iptunnel.c:88 ++#, c-format + msgid " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n" + msgstr " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev LIIDES ]\n" + +-#: ../iptunnel.c:88 ++#: ../iptunnel.c:89 ++#, c-format + msgid "" + " iptunnel -V | --version\n" + "\n" +@@ -1175,83 +1362,99 @@ msgstr "" + " iptunnel -V | --version\n" + "\n" + +-#: ../iptunnel.c:89 ++#: ../iptunnel.c:90 ++#, c-format + msgid "Where: NAME := STRING\n" + msgstr "Kus: NIMI := STRING\n" + +-#: ../iptunnel.c:90 ++#: ../iptunnel.c:91 ++#, c-format + msgid " ADDR := { IP_ADDRESS | any }\n" + msgstr " AADR := { IP_AADRESS | any }\n" + +-#: ../iptunnel.c:91 ++#: ../iptunnel.c:92 ++#, c-format + msgid " TOS := { NUMBER | inherit }\n" + msgstr " TOS := { ARV | inherit }\n" + +-#: ../iptunnel.c:92 ++#: ../iptunnel.c:93 ++#, c-format + msgid " TTL := { 1..255 | inherit }\n" + msgstr " TTL := { 1..255 | inherit }\n" + +-#: ../iptunnel.c:93 ++#: ../iptunnel.c:94 ++#, c-format + msgid " KEY := { DOTTED_QUAD | NUMBER }\n" + msgstr "" + " KEY := { PUNKTIDEGA_ARVUNELIK | ARV }\n" + " LIIDES := FSILISE_LIIDESE_NIMI\n" + +-#: ../iptunnel.c:331 ++#: ../iptunnel.c:332 ++#, c-format + msgid "Keys are not allowed with ipip and sit.\n" + msgstr "ipip ja sit juures ei ole vtmed lubatud\n" + +-#: ../iptunnel.c:351 ++#: ../iptunnel.c:352 ++#, c-format + msgid "Broadcast tunnel requires a source address.\n" + msgstr "Leviedastusega tunnel vajab lhteaadressi\n" + +-#: ../iptunnel.c:366 ++#: ../iptunnel.c:367 ++#, c-format + msgid "ttl != 0 and noptmudisc are incompatible\n" + msgstr "ttl != 0 ning noptmudisc ei sobi kokku\n" + +-#: ../iptunnel.c:378 ++#: ../iptunnel.c:379 ++#, c-format + msgid "cannot determine tunnel mode (ipip, gre or sit)\n" + msgstr "Ei suuda mrata tunneli moodi (ipip, gre vi sit)\n" + +-#: ../iptunnel.c:416 ++#: ../iptunnel.c:417 + #, c-format + msgid "%s: %s/ip remote %s local %s " + msgstr "%s: %s/ip teises otsas %s siin %s " + +-#: ../iptunnel.c:420 ++#: ../iptunnel.c:421 + msgid "unknown" + msgstr "tundmatu" + +-#: ../iptunnel.c:452 ++#: ../iptunnel.c:453 ++#, c-format + msgid " Drop packets out of sequence.\n" + msgstr " Jrjekorravlised paketid visatakse minema\n" + +-#: ../iptunnel.c:454 ++#: ../iptunnel.c:455 ++#, c-format + msgid " Checksum in received packet is required.\n" + msgstr " Vastuvetavates pakettides on kontrollsumma kohustuslik\n" + +-#: ../iptunnel.c:456 ++#: ../iptunnel.c:457 ++#, c-format + msgid " Sequence packets on output.\n" + msgstr " Vljuvad paketid varustatakse jrjekorranumbritega\n" + +-#: ../iptunnel.c:458 ++#: ../iptunnel.c:459 ++#, c-format + msgid " Checksum output packets.\n" + msgstr " Vljuvad paketid varustatakse kontrollsummaga\n" + +-#: ../iptunnel.c:486 ++#: ../iptunnel.c:487 ++#, c-format + msgid "Wrong format of /proc/net/dev. Sorry.\n" + msgstr "/proc/net/dev on vales formaadis. Vale tuuma versioon?\n" + +-#: ../iptunnel.c:499 ++#: ../iptunnel.c:500 + #, c-format + msgid "Failed to get type of [%s]\n" + msgstr "Ei suutnud kindlaks teha liidese %s tpi\n" + +-#: ../iptunnel.c:515 ++#: ../iptunnel.c:516 ++#, c-format + msgid "RX: Packets Bytes Errors CsumErrs OutOfSeq Mcasts\n" + msgstr "RX: Pakette Baite Vigu KSumVigu JrkVigu Levipakette\n" + +-#: ../iptunnel.c:518 ++#: ../iptunnel.c:519 ++#, c-format + msgid "TX: Packets Bytes Errors DeadLoop NoRoute NoBufs\n" + msgstr "TX: Pakette Baite Vigu DeadLoop EiRuudi MluOtsas\n" + +@@ -1658,13 +1861,13 @@ msgid "%u packets directly queued to rec + msgstr "%u paketti pandi otse recvmsg eeljrjekorda" + + #: ../statistics.c:178 +-#, c-format +-msgid "%u packets directly received from backlog" ++#, fuzzy, c-format ++msgid "%u of bytes directly received from backlog" + msgstr "%u paketti veti vastu otse backlog-ist" + + #: ../statistics.c:180 +-#, c-format +-msgid "%u packets directly received from prequeue" ++#, fuzzy, c-format ++msgid "%u of bytes directly received from prequeue" + msgstr "%u paketti veti vastu otse eeljrjekorrast" + + #: ../statistics.c:182 +@@ -1673,8 +1876,8 @@ msgid "%u packets dropped from prequeue" + msgstr "%u paketti kustutati eeljrjekorrast" + + #: ../statistics.c:183 +-#, c-format +-msgid "%u packets header predicted" ++#, fuzzy, c-format ++msgid "%u packet headers predicted" + msgstr "%u paketti pise ige ennustusega" + + #: ../statistics.c:184 +@@ -1687,19 +1890,210 @@ msgstr "%u paketti pise ige ennustuseg + msgid "Ran %u times out of system memory during packet sending" + msgstr "Pakettide saatmisel sai %u korda ssteemne mlu otsa" + +-#: ../statistics.c:253 ++#: ../statistics.c:188 ++#, fuzzy, c-format ++msgid "%u acknowledgments not containing data received" ++msgstr "%u sisenevat paketti tundmatule pordile" ++ ++#: ../statistics.c:189 ++#, c-format ++msgid "%u predicted acknowledgments" ++msgstr "" ++ ++#: ../statistics.c:190 ++#, c-format ++msgid "%u times recovered from packet loss due to fast retransmit" ++msgstr "" ++ ++#: ../statistics.c:191 ++#, c-format ++msgid "%u times recovered from packet loss due to SACK data" ++msgstr "" ++ ++#: ../statistics.c:192 ++#, fuzzy, c-format ++msgid "%u bad SACKs received" ++msgstr "%u vigast segmenti veti vastu" ++ ++#: ../statistics.c:193 ++#, c-format ++msgid "Detected reordering %u times using FACK" ++msgstr "" ++ ++#: ../statistics.c:194 ++#, c-format ++msgid "Detected reordering %u times using SACK" ++msgstr "" ++ ++#: ../statistics.c:195 ++#, c-format ++msgid "Detected reordering %u times using time stamp" ++msgstr "" ++ ++#: ../statistics.c:196 ++#, c-format ++msgid "Detected reordering %u times using reno fast retransmit" ++msgstr "" ++ ++#: ../statistics.c:197 ++#, fuzzy, c-format ++msgid "%u congestion windows fully recovered" ++msgstr "%u henduse katkestust saabus" ++ ++#: ../statistics.c:198 ++#, c-format ++msgid "%u congestion windows partially recovered using Hoe heuristic" ++msgstr "" ++ ++#: ../statistics.c:199 ++#, c-format ++msgid "%u congestion window recovered using DSACK" ++msgstr "" ++ ++#: ../statistics.c:200 ++#, c-format ++msgid "%u congestion windows recovered after partial ack" ++msgstr "" ++ ++#: ../statistics.c:201 ++#, fuzzy, c-format ++msgid "%u retransmits lost" ++msgstr "%u katkestust saadeti" ++ ++#: ../statistics.c:202 ++#, fuzzy, c-format ++msgid "%u timeouts after reno fast retransmit" ++msgstr "%u segmenti saadeti uuesti" ++ ++#: ../statistics.c:203 ++#, c-format ++msgid "%u timeouts after SACK recovery" ++msgstr "" ++ ++#: ../statistics.c:204 ++#, c-format ++msgid "%u timeouts in loss state" ++msgstr "" ++ ++#: ../statistics.c:205 ++#, fuzzy, c-format ++msgid "%u fast retransmits" ++msgstr "%u segmenti saadeti uuesti" ++ ++#: ../statistics.c:206 ++#, fuzzy, c-format ++msgid "%u forward retransmits" ++msgstr "%u edastati" ++ ++#: ../statistics.c:207 ++#, c-format ++msgid "%u retransmits in slow start" ++msgstr "" ++ ++#: ../statistics.c:208 ++#, c-format ++msgid "%u other TCP timeouts" ++msgstr "" ++ ++#: ../statistics.c:209 ++#, fuzzy, c-format ++msgid "%u reno fast retransmits failed" ++msgstr "%u segmenti saadeti uuesti" ++ ++#: ../statistics.c:210 ++#, fuzzy, c-format ++msgid "%u sack retransmits failed" ++msgstr "%u pakettide kokkupanekut ebannestus" ++ ++#: ../statistics.c:211 ++#, c-format ++msgid "%u times receiver scheduled too late for direct processing" ++msgstr "" ++ ++#: ../statistics.c:212 ++#, fuzzy, c-format ++msgid "%u packets collapsed in receive queue due to low socket buffer" ++msgstr "" ++"%u paketti kustutati vastuvtu jrjekorrast sokli puhvri letitumise tttu" ++ ++#: ../statistics.c:213 ++#, c-format ++msgid "%u DSACKs sent for old packets" ++msgstr "" ++ ++#: ../statistics.c:214 ++#, c-format ++msgid "%u DSACKs sent for out of order packets" ++msgstr "" ++ ++#: ../statistics.c:215 ++#, fuzzy, c-format ++msgid "%u DSACKs received" ++msgstr "%u paketti veti vastu" ++ ++#: ../statistics.c:216 ++#, fuzzy, c-format ++msgid "%u DSACKs for out of order packets received" ++msgstr "kokku veti vastu %u paketti" ++ ++#: ../statistics.c:217 ++#, fuzzy, c-format ++msgid "%u connections reset due to unexpected SYN" ++msgstr "%u henduse katkestust saabus" ++ ++#: ../statistics.c:218 ++#, fuzzy, c-format ++msgid "%u connections reset due to unexpected data" ++msgstr "%u henduse katkestust saabus" ++ ++#: ../statistics.c:219 ++#, fuzzy, c-format ++msgid "%u connections reset due to early user close" ++msgstr "%u henduse katkestust saabus" ++ ++#: ../statistics.c:220 ++#, c-format ++msgid "%u connections aborted due to memory pressure" ++msgstr "" ++ ++#: ../statistics.c:221 ++#, fuzzy, c-format ++msgid "%u connections aborted due to timeout" ++msgstr "%u aktiivsest hendusest keelduti ajatempli tttu" ++ ++#: ../statistics.c:222 ++#, c-format ++msgid "%u connections aborted after user close in linger timeout" ++msgstr "" ++ ++#: ../statistics.c:223 ++#, c-format ++msgid "%u times unabled to send RST due to no memory" ++msgstr "" ++ ++#: ../statistics.c:224 ++#, c-format ++msgid "TCP ran low on memory %u times" ++msgstr "" ++ ++#: ../statistics.c:225 ++#, c-format ++msgid "%u TCP data loss events" ++msgstr "" ++ ++#: ../statistics.c:292 + msgid "enabled" + msgstr "lubatud" + +-#: ../statistics.c:253 ++#: ../statistics.c:292 + msgid "disabled" + msgstr "keelatud" + +-#: ../statistics.c:336 ++#: ../statistics.c:375 + msgid "error parsing /proc/net/snmp" + msgstr "Viga /proc/net/snmp analsimisel" + +-#: ../statistics.c:349 ++#: ../statistics.c:388 + msgid "cannot open /proc/net/snmp" + msgstr "Ei saa avada faili /proc/net/snmp" + +@@ -1713,7 +2107,7 @@ msgstr "Riistvara tpi `%s' ei toetata\ + msgid "Cannot change line discipline to `%s'.\n" + msgstr "Ei suuda seada `%s' liiniprotokolliks\n" + +-#: ../lib/af.c:153 ../lib/hw.c:156 ++#: ../lib/af.c:153 ../lib/hw.c:161 + msgid "UNSPEC" + msgstr "UNSPEC" + +@@ -1729,11 +2123,11 @@ msgstr "DARPA Internet" + msgid "IPv6" + msgstr "IPv6" + +-#: ../lib/af.c:164 ../lib/hw.c:177 ++#: ../lib/af.c:164 ../lib/hw.c:182 + msgid "AMPR AX.25" + msgstr "AMPR AX.25" + +-#: ../lib/af.c:167 ../lib/hw.c:183 ++#: ../lib/af.c:167 ../lib/hw.c:188 + msgid "AMPR NET/ROM" + msgstr "AMPR NET/ROM" + +@@ -1745,7 +2139,7 @@ msgstr "Novell IPX" + msgid "Appletalk DDP" + msgstr "Appletalk DDP" + +-#: ../lib/af.c:176 ../lib/hw.c:218 ++#: ../lib/af.c:176 ../lib/hw.c:223 + msgid "Econet" + msgstr "Econet" + +@@ -1753,19 +2147,21 @@ msgstr "Econet" + msgid "CCITT X.25" + msgstr "CCITT X.25" + +-#: ../lib/af.c:182 ../lib/hw.c:180 ++#: ../lib/af.c:182 ../lib/hw.c:185 + msgid "AMPR ROSE" + msgstr "AMPR ROSE" + +-#: ../lib/af.c:185 ../lib/hw.c:168 ++#: ../lib/af.c:185 ../lib/hw.c:173 + msgid "Ash" + msgstr "Ash" + + #: ../lib/af.c:243 ++#, c-format + msgid "Please don't supply more than one address family.\n" + msgstr "Meil on kombeks ks aadressiperekond korraga\n" + + #: ../lib/af.c:304 ++#, c-format + msgid "Too much address family arguments.\n" + msgstr "Liiga palju aadressiperekonna argumente\n" + +@@ -1790,6 +2186,7 @@ msgid "in_arcnet(%s): trailing junk!\n" + msgstr "in_arcnet(%s): sodi lpus\n" + + #: ../lib/ash.c:81 ++#, c-format + msgid "Malformed Ash address" + msgstr "Vigane Ash aadress" + +@@ -1808,22 +2205,21 @@ msgid "Callsign too long" + msgstr "Liiga pikk kutsung" + + #: ../lib/ax25_gr.c:47 ++#, c-format + msgid "AX.25 not configured in this system.\n" + msgstr "AX.25 pole antud ssteemis konfigureeritud\n" + + #: ../lib/ax25_gr.c:50 ++#, c-format + msgid "Kernel AX.25 routing table\n" + msgstr "Tuuma AX.25 ruutingutabel\n" + + #. xxx + #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55 ++#, c-format + msgid "Destination Iface Use\n" + msgstr "Sihtpunkt Liides Kasutus\n" + +-#: ../lib/ddp_gr.c:21 +-msgid "Routing table for `ddp' not yet supported.\n" +-msgstr "`ddp' jaoks ruutingutabelit veel ei oska\n" +- + #: ../lib/ether.c:74 ../lib/ether.c:91 + #, c-format + msgid "in_ether(%s): invalid ether address!\n" +@@ -1879,90 +2275,94 @@ msgstr "in_hippi(%s): ignoreerin lpetav + msgid "in_hippi(%s): trailing junk!\n" + msgstr "in_hippi(%s): sodi lpus\n" + +-#: ../lib/hw.c:155 ++#: ../lib/hw.c:160 + msgid "Local Loopback" + msgstr "Kohalik loopback" + +-#: ../lib/hw.c:158 ++#: ../lib/hw.c:163 + msgid "Serial Line IP" + msgstr "Serial Line IP" + +-#: ../lib/hw.c:159 ++#: ../lib/hw.c:164 + msgid "VJ Serial Line IP" + msgstr "VJ Serial Line IP" + +-#: ../lib/hw.c:160 ++#: ../lib/hw.c:165 + msgid "6-bit Serial Line IP" + msgstr "6-bitine Serial Line IP" + +-#: ../lib/hw.c:161 ++#: ../lib/hw.c:166 + msgid "VJ 6-bit Serial Line IP" + msgstr "VJ 6-bitine Serial Line IP" + +-#: ../lib/hw.c:162 ++#: ../lib/hw.c:167 + msgid "Adaptive Serial Line IP" + msgstr "Adaptiivne Serial Line IP" + +-#: ../lib/hw.c:165 ++#: ../lib/hw.c:170 + msgid "Ethernet" + msgstr "Ethernet" + +-#: ../lib/hw.c:171 ++#: ../lib/hw.c:176 + msgid "Fiber Distributed Data Interface" + msgstr "Fiber Distributed Data Interface" + +-#: ../lib/hw.c:174 ++#: ../lib/hw.c:179 + msgid "HIPPI" + msgstr "HIPPI" + +-#: ../lib/hw.c:186 ++#: ../lib/hw.c:191 + msgid "generic X.25" + msgstr "ldine X.25" + +-#: ../lib/hw.c:189 ++#: ../lib/hw.c:194 + msgid "IPIP Tunnel" + msgstr "IPIP tunnel" + +-#: ../lib/hw.c:192 ++#: ../lib/hw.c:197 + msgid "Point-to-Point Protocol" + msgstr "Kakspunktprotokoll" + +-#: ../lib/hw.c:195 ++#: ../lib/hw.c:200 + msgid "(Cisco)-HDLC" + msgstr "(Cisco-)HDLC" + +-#: ../lib/hw.c:196 ++#: ../lib/hw.c:201 + msgid "LAPB" + msgstr "LAPB" + +-#: ../lib/hw.c:199 ++#: ../lib/hw.c:204 + msgid "ARCnet" + msgstr "ARCnet" + +-#: ../lib/hw.c:202 ++#: ../lib/hw.c:207 + msgid "Frame Relay DLCI" + msgstr "Frame Relay DLCI" + +-#: ../lib/hw.c:203 ++#: ../lib/hw.c:208 + msgid "Frame Relay Access Device" + msgstr "Frame Relay Access Device" + +-#: ../lib/hw.c:206 ++#: ../lib/hw.c:211 + msgid "IPv6-in-IPv4" + msgstr "IPv6-in-IPv4" + +-#: ../lib/hw.c:209 ++#: ../lib/hw.c:214 + msgid "IrLAP" + msgstr "IrLAP" + +-#: ../lib/hw.c:212 ++#: ../lib/hw.c:217 + msgid "16/4 Mbps Token Ring" + msgstr "16/4 Mbps Token Ring" + +-#: ../lib/hw.c:214 ++#: ../lib/hw.c:219 + msgid "16/4 Mbps Token Ring (New)" + msgstr "16/4 Mbps Token Ring (New)" + ++#: ../lib/hw.c:226 ++msgid "Generic EUI-64" ++msgstr "" ++ + #: ../lib/inet.c:153 ../lib/inet6.c:79 + #, c-format + msgid "rresolve: unsupport address family %d !\n" +@@ -1972,27 +2372,32 @@ msgstr "rresolve: toetuseta aadressipere + msgid "[UNKNOWN]" + msgstr "[TUNDMATU]" + +-#: ../lib/inet6_gr.c:79 ++#: ../lib/inet6_gr.c:71 ++#, c-format + msgid "INET6 (IPv6) not configured in this system.\n" + msgstr "INET6 (IPv6) pole antud ssteemis konfigureeritud\n" + +-#: ../lib/inet6_gr.c:82 ++#: ../lib/inet6_gr.c:74 ++#, c-format + msgid "Kernel IPv6 routing table\n" + msgstr "Tuuma IPv6 ruutingutabel\n" + +-#: ../lib/inet6_gr.c:84 ++#: ../lib/inet6_gr.c:76 ++#, c-format + msgid "" +-"Destination Next Hop " +-" Flags Metric Ref Use Iface\n" ++"Destination Next " ++"Hop Flags Metric Ref Use Iface\n" + msgstr "" +-"Sihtpunkt Jrgmine samm " +-" Lipud Meetr Mitu Kasut Liides\n" ++"Sihtpunkt Jrgmine " ++"samm Lipud Meetr Mitu Kasut Liides\n" + +-#: ../lib/inet6_gr.c:158 ++#: ../lib/inet6_gr.c:150 ++#, c-format + msgid "Kernel IPv6 Neighbour Cache\n" + msgstr "Tuuma IPv6 naabrite puhver\n" + +-#: ../lib/inet6_gr.c:161 ++#: ../lib/inet6_gr.c:153 ++#, c-format + msgid "" + "Neighbour HW Address Iface Flags " + "Ref State\n" +@@ -2000,7 +2405,8 @@ msgstr "" + "Naaber HW Aadress Liides Lipud " + "Mitu Olek\n" + +-#: ../lib/inet6_gr.c:165 ++#: ../lib/inet6_gr.c:157 ++#, c-format + msgid "" + "Neighbour HW Address Iface Flags " + "Ref State Stale(sec) Delete(sec)\n" +@@ -2009,31 +2415,38 @@ msgstr "" + "Mitu Olek Stale(sec) Delete(sec)\n" + + #: ../lib/inet6_sr.c:46 ++#, c-format + msgid "Usage: inet6_route [-vF] del Target\n" + msgstr "Kasutamine: route [-vF] del AADRESS\n" + + #: ../lib/inet6_sr.c:47 ++#, c-format + msgid " inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n" + msgstr "" + " route [-vF] add AADRESS [gw GW] [metric M] [[dev] LIIDES]\n" + + #: ../lib/inet6_sr.c:48 ++#, c-format + msgid " inet6_route [-FC] flush NOT supported\n" + msgstr " route [-FC] flush Seda EI toetata\n" + + #: ../lib/inet6_sr.c:188 ++#, c-format + msgid "Flushing `inet6' routing table not supported\n" + msgstr "`inet6' ruutingutabeli thjendamist ei toetata\n" + + #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220 ++#, c-format + msgid "INET (IPv4) not configured in this system.\n" + msgstr "INET (IPv4) pole antud ssteemis konfigureeritud\n" + + #: ../lib/inet_gr.c:53 ++#, c-format + msgid "Kernel IP routing table\n" + msgstr "Tuuma IP ruutingutabel\n" + + #: ../lib/inet_gr.c:56 ++#, c-format + msgid "" + "Destination Gateway Genmask Flags Metric Ref Use " + "Iface\n" +@@ -2042,6 +2455,7 @@ msgstr "" + "Liides\n" + + #: ../lib/inet_gr.c:59 ++#, c-format + msgid "" + "Destination Gateway Genmask Flags MSS Window irtt " + "Iface\n" +@@ -2050,6 +2464,7 @@ msgstr "" + "Liides\n" + + #: ../lib/inet_gr.c:62 ++#, c-format + msgid "" + "Destination Gateway Genmask Flags Metric Ref Use " + "Iface MSS Window irtt\n" +@@ -2058,10 +2473,12 @@ msgstr "" + "Liides MSS Aken irtt\n" + + #: ../lib/inet_gr.c:237 ++#, c-format + msgid "Kernel IP routing cache\n" + msgstr "Tuuma IP ruutingu puhver\n" + + #: ../lib/inet_gr.c:258 ++#, c-format + msgid "" + "Source Destination Gateway Flags Metric Ref Use " + "Iface\n" +@@ -2070,6 +2487,7 @@ msgstr "" + "Liides\n" + + #: ../lib/inet_gr.c:261 ++#, c-format + msgid "" + "Source Destination Gateway Flags MSS Window irtt " + "Iface\n" +@@ -2078,6 +2496,7 @@ msgstr "" + "Liides\n" + + #: ../lib/inet_gr.c:266 ++#, c-format + msgid "" + "Source Destination Gateway Flags Metric Ref Use " + "Iface MSS Window irtt HH Arp\n" +@@ -2086,6 +2505,7 @@ msgstr "" + "Liides MSS Aken irtt HH Arp\n" + + #: ../lib/inet_gr.c:290 ++#, c-format + msgid "" + "Source Destination Gateway Flags Metric Ref Use " + "Iface MSS Window irtt TOS HHRef HHUptod SpecDst\n" +@@ -2093,7 +2513,8 @@ msgstr "" + "Lhtepunkt Sihtpunkt Ruuter Lipud Meetr Mitu Kasut " + "Liides MSS Aken irtt TOS HHRef HHUptod SpecDst\n" + +-#: ../lib/inet_sr.c:50 ++#: ../lib/inet_sr.c:51 ++#, c-format + msgid "" + "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] " + "[[dev] If]\n" +@@ -2101,31 +2522,36 @@ msgstr "" + "Kasutamine: route [-vF] del {-host|-net} AADRESS[/PREFIKS] [gw GW] [metric " + "M] [[dev] LIIDES]\n" + +-#: ../lib/inet_sr.c:51 ++#: ../lib/inet_sr.c:52 ++#, c-format + msgid "" + " inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n" + msgstr "" + " route [-vF] add {-host|-net} AADRESS[/PREFIKS] [gw GW] [metric " + "M]\n" + +-#: ../lib/inet_sr.c:52 ++#: ../lib/inet_sr.c:53 ++#, c-format + msgid "" + " [netmask N] [mss Mss] [window W] [irtt I]\n" + msgstr "" + " [netmask N] [mss MSS] [window W] [irtt I]\n" + +-#: ../lib/inet_sr.c:53 ++#: ../lib/inet_sr.c:54 ++#, c-format + msgid " [mod] [dyn] [reinstate] [[dev] If]\n" + msgstr " [mod] [dyn] [reinstate] [[dev] LIIDES]\n" + +-#: ../lib/inet_sr.c:54 ++#: ../lib/inet_sr.c:55 ++#, c-format + msgid "" + " inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n" + msgstr "" + " route [-vF] add {-host|-net} AADRESS[/PREFIKS] [metric M] " + "reject\n" + +-#: ../lib/inet_sr.c:55 ++#: ../lib/inet_sr.c:56 ++#, c-format + msgid " inet_route [-FC] flush NOT supported\n" + msgstr " route [-FC] flush Seda EI toetata\n" + +@@ -2135,14 +2561,17 @@ msgid "route: %s: cannot use a NETWORK a + msgstr "route: %s: vrku ei saa kasutada ruuterina\n" + + #: ../lib/inet_sr.c:174 ++#, c-format + msgid "route: Invalid MSS/MTU.\n" + msgstr "route: vigane MSS/MTU\n" + + #: ../lib/inet_sr.c:187 ++#, c-format + msgid "route: Invalid window.\n" + msgstr "route: Vigane akna suurus\n" + + #: ../lib/inet_sr.c:203 ++#, c-format + msgid "route: Invalid initial rtt.\n" + msgstr "route: vigane algne rtt\n" + +@@ -2157,75 +2586,92 @@ msgid "route: bogus netmask %s\n" + msgstr "route: vale vrgumask %s\n" + + #: ../lib/inet_sr.c:270 ++#, c-format + msgid "route: netmask doesn't match route address\n" + msgstr "route: vrgumask ei sobi ruutingu aadressiga\n" + + #: ../lib/inet_sr.c:306 ++#, c-format + msgid "Flushing `inet' routing table not supported\n" + msgstr "`inet' ruutingutabeli thjendamist ei toetata\n" + + #: ../lib/inet_sr.c:310 ++#, c-format + msgid "Modifying `inet' routing cache not supported\n" + msgstr "`inet' ruutingu puhvri muutmist ei toetata\n" + + #: ../lib/ipx_gr.c:52 ++#, c-format + msgid "IPX not configured in this system.\n" + msgstr "IPX pole antud ssteemis konfigureeritud\n" + + #: ../lib/ipx_gr.c:56 ++#, c-format + msgid "Kernel IPX routing table\n" + msgstr "Tuuma IPX ruutingutabel\n" + + #. xxx + #: ../lib/ipx_gr.c:57 ++#, c-format + msgid "Destination Router Net Router Node\n" + msgstr "Sihtpunkt Ruuteri vrk Ruuter ise\n" + + #: ../lib/ipx_sr.c:33 ++#, c-format + msgid "IPX: this needs to be written\n" + msgstr "IPX osa vajab mbertegemist\n" + + #: ../lib/masq_info.c:198 ++#, c-format + msgid "IP masquerading entries\n" + msgstr "IP maskeerimise kirjed\n" + + #: ../lib/masq_info.c:201 ++#, c-format + msgid "prot expire source destination ports\n" + msgstr "Proto Aegub Lhtepunkt Sihtpunkt Pordid\n" + + #: ../lib/masq_info.c:204 ++#, c-format + msgid "" +-"prot expire initseq delta prevd source destination " +-" ports\n" ++"prot expire initseq delta prevd source " ++"destination ports\n" + msgstr "" +-"Proto Aegub Initseq Delta Prevd Lhtepunkt Sihtpunkt " +-" Pordid\n" ++"Proto Aegub Initseq Delta Prevd Lhtepunkt " ++"Sihtpunkt Pordid\n" + + #: ../lib/netrom_gr.c:48 ++#, c-format + msgid "NET/ROM not configured in this system.\n" + msgstr "NET/ROM pole antud ssteemis konfigureeritud\n" + + #: ../lib/netrom_gr.c:51 ++#, c-format + msgid "Kernel NET/ROM routing table\n" + msgstr "Tuuma NET/ROM ruutingutabel\n" + + #: ../lib/netrom_gr.c:52 ++#, c-format + msgid "Destination Mnemonic Quality Neighbour Iface\n" + msgstr "Sihtpunkt Mnemoonika Kvaliteet Naaber Liides\n" + + #: ../lib/netrom_sr.c:34 ++#, c-format + msgid "netrom usage\n" + msgstr "netrom kasutus\n" + + #: ../lib/netrom_sr.c:44 ++#, c-format + msgid "NET/ROM: this needs to be written\n" + msgstr "NET/ROM osa vajab mbertegemist\n" + + #: ../lib/ppp.c:44 ++#, c-format + msgid "You cannot start PPP with this program.\n" + msgstr "Sellest programmist ei saa PPP-d kivitada\n" + + #: ../lib/ppp_ac.c:38 ++#, c-format + msgid "Sorry, use pppd!\n" + msgstr "Palun kasutage pppd'd\n" + +@@ -2234,287 +2680,314 @@ msgid "Node address must be ten digits" + msgstr "Slme aadress peab olema kmnekohaline" + + #: ../lib/rose_gr.c:51 ++#, c-format + msgid "ROSE not configured in this system.\n" + msgstr "ROSE pole antud ssteemis konfigureeritud\n" + + #: ../lib/rose_gr.c:54 ++#, c-format + msgid "Kernel ROSE routing table\n" + msgstr "Tuuma ROSE ruutingutabel\n" + +-#: ../lib/tr.c:70 ../lib/tr.c:85 ++#: ../lib/tr.c:86 ../lib/tr.c:101 + #, c-format + msgid "in_tr(%s): invalid token ring address!\n" + msgstr "in_tr(%s): vigane token ring-aadress\n" + +-#: ../lib/tr.c:97 ++#: ../lib/tr.c:113 + #, c-format + msgid "in_tr(%s): trailing : ignored!\n" + msgstr "in_tr(%s): ignoreerin lpetavat koolonit\n" + +-#: ../lib/tr.c:109 ++#: ../lib/tr.c:125 + #, c-format + msgid "in_tr(%s): trailing junk!\n" + msgstr "in_tr(%s): sodi lpus\n" + +-#: ../lib/interface.c:164 ++#: ../lib/interface.c:176 + #, c-format + msgid "warning: no inet socket available: %s\n" + msgstr "Hoiatus: `inet' sokleid ei ole: %s\n" + +-#: ../lib/interface.c:316 ++#: ../lib/interface.c:325 + #, c-format + msgid "Warning: cannot open %s (%s). Limited output.\n" + msgstr "Hoiatus: ei saa avada faili %s (%s). Vljund on piiratud.\n" + + #. Give better error message for this case. +-#: ../lib/interface.c:556 ++#: ../lib/interface.c:571 + msgid "Device not found" + msgstr "Liidest ei leitud" + +-#: ../lib/interface.c:560 ++#: ../lib/interface.c:575 + #, c-format + msgid "%s: error fetching interface information: %s\n" + msgstr "%s: viga liidese info ksimisel: %s\n" + +-#: ../lib/interface.c:593 ++#: ../lib/interface.c:608 + msgid " - no statistics available -" + msgstr " - statistikat ei ole -" + +-#: ../lib/interface.c:597 ++#: ../lib/interface.c:612 ++#, c-format + msgid "[NO FLAGS]" + msgstr "[LIPPE POLE]" + +-#: ../lib/interface.c:673 ++#: ../lib/interface.c:688 + #, c-format + msgid "%-9.9s Link encap:%s " + msgstr "%-9.9s kapseldus:%s " + +-#: ../lib/interface.c:678 ++#: ../lib/interface.c:693 + #, c-format + msgid "HWaddr %s " + msgstr "HWaddr %s " + +-#: ../lib/interface.c:681 ++#: ../lib/interface.c:696 + #, c-format + msgid "Media:%s" + msgstr "meedia:%s" + +-#: ../lib/interface.c:683 ++#: ../lib/interface.c:698 ++#, c-format + msgid "(auto)" + msgstr "(auto)" + +-#: ../lib/interface.c:690 ++#: ../lib/interface.c:705 + #, c-format + msgid " %s addr:%s " + msgstr " %s aadress:%s " + +-#: ../lib/interface.c:693 ++#: ../lib/interface.c:708 + #, c-format + msgid " P-t-P:%s " + msgstr " P-t-P:%s " + +-#: ../lib/interface.c:696 ++#: ../lib/interface.c:711 + #, c-format + msgid " Bcast:%s " + msgstr " bcast:%s " + +-#: ../lib/interface.c:698 ++#: ../lib/interface.c:713 + #, c-format + msgid " Mask:%s\n" + msgstr " mask:%s\n" + +-#: ../lib/interface.c:715 ++#: ../lib/interface.c:730 + #, c-format + msgid " inet6 addr: %s/%d" + msgstr " inet6 aadr: %s/%d" + +-#: ../lib/interface.c:717 ++#: ../lib/interface.c:732 ++#, c-format + msgid " Scope:" + msgstr " skoop:" + +-#: ../lib/interface.c:720 ++#: ../lib/interface.c:735 ++#, c-format + msgid "Global" + msgstr "globaalne" + +-#: ../lib/interface.c:723 ++#: ../lib/interface.c:738 ++#, c-format + msgid "Link" + msgstr "hendus" + +-#: ../lib/interface.c:726 ++#: ../lib/interface.c:741 ++#, c-format + msgid "Site" + msgstr "site" + +-#: ../lib/interface.c:729 ++#: ../lib/interface.c:744 ++#, c-format + msgid "Compat" + msgstr "hilduvus" + +-#: ../lib/interface.c:732 ++#: ../lib/interface.c:747 ++#, c-format + msgid "Host" + msgstr "host" + +-#: ../lib/interface.c:735 ++#: ../lib/interface.c:750 ++#, c-format + msgid "Unknown" + msgstr "tundmatu" + +-#: ../lib/interface.c:750 ++#: ../lib/interface.c:765 + #, c-format + msgid " IPX/Ethernet II addr:%s\n" + msgstr " IPX/Ethernet II aadr:%s\n" + +-#: ../lib/interface.c:753 ++#: ../lib/interface.c:768 + #, c-format + msgid " IPX/Ethernet SNAP addr:%s\n" + msgstr " IPX/Ethernet SNAP aadr:%s\n" + +-#: ../lib/interface.c:756 ++#: ../lib/interface.c:771 + #, c-format + msgid " IPX/Ethernet 802.2 addr:%s\n" + msgstr " IPX/Ethernet 802.2 aadr:%s\n" + +-#: ../lib/interface.c:759 ++#: ../lib/interface.c:774 + #, c-format + msgid " IPX/Ethernet 802.3 addr:%s\n" + msgstr " IPX/Ethernet 802.3 aadr:%s\n" + +-#: ../lib/interface.c:769 ++#: ../lib/interface.c:784 + #, c-format + msgid " EtherTalk Phase 2 addr:%s\n" + msgstr " EtherTalk Phase 2 aadr:%s\n" + +-#: ../lib/interface.c:778 ++#: ../lib/interface.c:793 + #, c-format + msgid " econet addr:%s\n" + msgstr " econeti aadr:%s\n" + +-#: ../lib/interface.c:785 ++#: ../lib/interface.c:800 ++#, c-format + msgid "[NO FLAGS] " + msgstr "[LIPPE POLE]" + +-#: ../lib/interface.c:787 ++#: ../lib/interface.c:802 ++#, c-format + msgid "UP " + msgstr "UP " + +-#: ../lib/interface.c:789 ++#: ../lib/interface.c:804 ++#, c-format + msgid "BROADCAST " + msgstr "BROADCAST " + +-#: ../lib/interface.c:791 ++#: ../lib/interface.c:806 ++#, c-format + msgid "DEBUG " + msgstr "DEBUG " + +-#: ../lib/interface.c:793 ++#: ../lib/interface.c:808 ++#, c-format + msgid "LOOPBACK " + msgstr "LOOPBACK " + +-#: ../lib/interface.c:795 ++#: ../lib/interface.c:810 ++#, c-format + msgid "POINTOPOINT " + msgstr "POINTOPOINT " + +-#: ../lib/interface.c:797 ++#: ../lib/interface.c:812 ++#, c-format + msgid "NOTRAILERS " + msgstr "NOTRAILERS " + +-#: ../lib/interface.c:799 ++#: ../lib/interface.c:814 ++#, c-format + msgid "RUNNING " + msgstr "RUNNING " + +-#: ../lib/interface.c:801 ++#: ../lib/interface.c:816 ++#, c-format + msgid "NOARP " + msgstr "NOARP " + +-#: ../lib/interface.c:803 ++#: ../lib/interface.c:818 ++#, c-format + msgid "PROMISC " + msgstr "PROMISC " + +-#: ../lib/interface.c:805 ++#: ../lib/interface.c:820 ++#, c-format + msgid "ALLMULTI " + msgstr "ALLMULTI " + +-#: ../lib/interface.c:807 ++#: ../lib/interface.c:822 ++#, c-format + msgid "SLAVE " + msgstr "SLAVE " + +-#: ../lib/interface.c:809 ++#: ../lib/interface.c:824 ++#, c-format + msgid "MASTER " + msgstr "MASTER " + +-#: ../lib/interface.c:811 ++#: ../lib/interface.c:826 ++#, c-format + msgid "MULTICAST " + msgstr "MULTICAST " + +-#: ../lib/interface.c:814 ++#: ../lib/interface.c:829 ++#, c-format + msgid "DYNAMIC " + msgstr "DYNAMIC " + + #. DONT FORGET TO ADD THE FLAGS IN ife_print_short +-#: ../lib/interface.c:817 ++#: ../lib/interface.c:832 + #, c-format + msgid " MTU:%d Metric:%d" + msgstr " MTU:%d meetrika:%d" + +-#: ../lib/interface.c:821 ++#: ../lib/interface.c:836 + #, c-format + msgid " Outfill:%d Keepalive:%d" + msgstr " lalhoidepakettide intervall:%d lalhoidetaimaut:%d" + +-#: ../lib/interface.c:835 ++#: ../lib/interface.c:850 + #, c-format + msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" + msgstr "RX pakette:%llu vigu:%lu ra visatud:%lu letit:%lu kaadri vigu:%lu\n" + +-#: ../lib/interface.c:840 ++#: ../lib/interface.c:855 + #, c-format + msgid " compressed:%lu\n" + msgstr " pakitud:%lu\n" + +-#: ../lib/interface.c:852 ++#: ../lib/interface.c:895 + #, c-format + msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" + msgstr "TX pakette:%llu vigu:%lu ra visatud:%lu letit:%lu carrier:%lu\n" + +-#: ../lib/interface.c:856 ++#: ../lib/interface.c:899 + #, c-format + msgid " collisions:%lu " + msgstr " kollisioone:%lu " + +-#: ../lib/interface.c:858 ++#: ../lib/interface.c:901 + #, c-format + msgid "compressed:%lu " + msgstr "pakitud:%lu " + +-#: ../lib/interface.c:860 ++#: ../lib/interface.c:903 + #, c-format + msgid "txqueuelen:%d " + msgstr "txqueuelen:%d " + +-#: ../lib/interface.c:862 ++#: ../lib/interface.c:905 + #, c-format + msgid "RX bytes:%llu (%lu.%lu %s) TX bytes:%llu (%lu.%lu %s)\n" + msgstr "RX baite:%llu (%lu.%lu %s) TX baite:%llu (%lu.%lu %s)\n" + +-#: ../lib/interface.c:873 ++#: ../lib/interface.c:916 + #, c-format + msgid "Interrupt:%d " + msgstr "katkestus:%d " + + #. Only print devices using it for + #. I/O maps +-#: ../lib/interface.c:876 ++#: ../lib/interface.c:919 + #, c-format + msgid "Base address:0x%x " + msgstr "baasaadress:0x%x " + +-#: ../lib/interface.c:878 ++#: ../lib/interface.c:921 + #, c-format + msgid "Memory:%lx-%lx " + msgstr "mlu:%lx-%lx " + +-#: ../lib/interface.c:881 ++#: ../lib/interface.c:924 + #, c-format + msgid "DMA chan:%x " + msgstr "DMA kanal:%x " + + #: ../lib/sockets.c:63 ++#, c-format + msgid "No usable address families found.\n" + msgstr "Ei leidnud htegi kasutatavat aadressiperekonda\n" + +@@ -2538,29 +3011,32 @@ msgstr "iptunnel: %s on vigane IPv4 aadr + msgid "ip: argument is wrong: %s\n" + msgstr "iptunnel: vale argument %s\n" + +-#: ../ipmaddr.c:58 ++#: ../ipmaddr.c:61 ++#, c-format + msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n" + msgstr "Kasutamine: ipmaddr [ add | del ] MULTIAADR dev STRING\n" + +-#: ../ipmaddr.c:59 ++#: ../ipmaddr.c:62 ++#, c-format + msgid " ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n" + msgstr " ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n" + +-#: ../ipmaddr.c:60 ++#: ../ipmaddr.c:63 ++#, c-format + msgid " ipmaddr -V | -version\n" + msgstr " ipmaddr -V | -version\n" + +-#: ../ipmaddr.c:260 ++#: ../ipmaddr.c:263 + #, c-format + msgid "family %d " + msgstr "perekond %d " + +-#: ../ipmaddr.c:269 ++#: ../ipmaddr.c:272 + #, c-format + msgid " users %d" + msgstr " kasutajaid %d" + +-#: ../ipmaddr.c:355 ++#: ../ipmaddr.c:358 + msgid "Cannot create socket" + msgstr "Ei saa avada soklit" + +@@ -2575,6 +3051,7 @@ msgid "slattach: tty_lock: (%s): %s\n" + msgstr "slattach: tty_lock: (%s): %s\n" + + #: ../slattach.c:192 ++#, c-format + msgid "slattach: cannot write PID file\n" + msgstr "slattach: ei saa PID faili kirjutada\n" + +@@ -2594,18 +3071,22 @@ msgid "slattach: tty_hangup(RAISE): %s\n + msgstr "slattach: tty_hangup(RAISE): %s\n" + + #: ../slattach.c:468 ++#, c-format + msgid "slattach: tty name too long\n" + msgstr "slattach: terminali nimi on liiga pikk\n" + + #: ../slattach.c:498 ++#, c-format + msgid "slattach: tty_open: cannot get current state!\n" + msgstr "slattach: tty_open: ei saa lugeda jooksvat olekut\n" + + #: ../slattach.c:505 ++#, c-format + msgid "slattach: tty_open: cannot get current line disc!\n" + msgstr "slattach: tty_open: liiniprotokolli ksimine ebannestus\n" + + #: ../slattach.c:513 ++#, c-format + msgid "slattach: tty_open: cannot set RAW mode!\n" + msgstr "slattach: tty_open: ei saa seada RAW moodi\n" + +@@ -2615,6 +3096,7 @@ msgid "slattach: tty_open: cannot set %s + msgstr "slattach: tty_open: ei saa seada kiiruseks %s bps\n" + + #: ../slattach.c:530 ++#, c-format + msgid "slattach: tty_open: cannot set 8N1 mode!\n" + msgstr "slattach: tty_open: ei saa seada 8N1 moodi\n" + +@@ -2637,3 +3119,20 @@ msgstr " pordil %s" + #, c-format + msgid " interface %s\n" + msgstr " liides %s\n" ++ ++#~ msgid "" ++#~ " arp [-v] [] [-i ] -s [netmask ] pub " ++#~ "<-''-\n" ++#~ msgstr "" ++#~ " arp [-v] [] [-i ] -s [netmask ] " ++#~ "pub\n" ++ ++#~ msgid "%s: unknown interface: %s\n" ++#~ msgstr "ifconfig: tundmatu liides %s: %s\n" ++ ++#~ msgid " -n, --numeric dont resolve names\n" ++#~ msgstr "" ++#~ " -n, --numeric mitte lahendada numbreid nimedeks\n" ++ ++#~ msgid "Routing table for `ddp' not yet supported.\n" ++#~ msgstr "`ddp' jaoks ruutingutabelit veel ei oska\n" +Index: net-tools/po/cs.po +=================================================================== +--- net-tools.orig/po/cs.po ++++ net-tools/po/cs.po +@@ -5,7 +5,8 @@ + msgid "" + msgstr "" + "Project-Id-Version: net-tools-1.51\n" +-"POT-Creation-Date: 2000-02-14 02:31+0100\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2007-06-30 12:28+0900\n" + "PO-Revision-Date: 1999-08-29 23:20+0200\n" + "Last-Translator: Ji Pavlovsk \n" + "Language-Team: Czech \n" +@@ -13,96 +14,110 @@ msgstr "" + "Content-Type: text/plain; charset=iso-8859-2\n" + "Content-Transfer-Encoding: 8bit\n" + +-#: ../arp.c:110 ../arp.c:269 ++#: ../arp.c:112 ../arp.c:279 ++#, c-format + msgid "arp: need host name\n" + msgstr "arp: je teba jmno potae\n" + +-#: ../arp.c:207 ../arp.c:221 ++#: ../arp.c:215 ../arp.c:230 + #, c-format + msgid "No ARP entry for %s\n" + msgstr "Pro %s neexistuje ARP poloka\n" + +-#: ../arp.c:239 ++#: ../arp.c:248 + #, c-format + msgid "arp: cant get HW-Address for `%s': %s.\n" + msgstr "arp: HW adresu `%s' nelze zjistit: %s\n" + +-#: ../arp.c:243 ++#: ../arp.c:252 ++#, c-format + msgid "arp: protocol type mismatch.\n" + msgstr "arp: chybn zadan typ protokolu\n" + +-#: ../arp.c:252 ++#: ../arp.c:261 + #, c-format + msgid "arp: device `%s' has HW address %s `%s'.\n" + msgstr "arp: zazen `%s' m Hw adresu %s `%s'.\n" + +-#: ../arp.c:282 ++#: ../arp.c:293 ++#, c-format + msgid "arp: need hardware address\n" + msgstr "arp: je teba hardwarov adresa\n" + +-#: ../arp.c:290 ++#: ../arp.c:301 ++#, c-format + msgid "arp: invalid hardware address\n" + msgstr "arp: nesprvn hardwarov adresa\n" + +-#: ../arp.c:387 ++#: ../arp.c:398 + #, c-format + msgid "arp: cannot open etherfile %s !\n" + msgstr "arp: databzi ethernetovch adres %s nelze otevt!\n" + +-#: ../arp.c:403 ++#: ../arp.c:414 + #, c-format + msgid "arp: format error on line %u of etherfile %s !\n" + msgstr "arp: syntaktick chyba na dku %u databze ethernetovch adres %s!\n" + +-#: ../arp.c:416 ++#: ../arp.c:427 + #, c-format + msgid "arp: cannot set entry on line %u of etherfile %s !\n" + msgstr "" + "arp: poloku na dku %u databze ethernetovch adres %s nelze nastavit!\n" + +-#: ../arp.c:437 +-msgid "Address\t\t\tHWtype\tHWaddress\t Flags Mask\t\t Iface\n" ++#: ../arp.c:448 ++#, fuzzy, c-format ++msgid "" ++"Address HWtype HWaddress Flags Mask " ++"Iface\n" + msgstr "Adresa\t\t\t HWtyp\t HWadresa\t Pz Maska\t\t Rozhran\n" + +-#: ../arp.c:467 ++#: ../arp.c:476 ++#, fuzzy ++msgid "" ++msgstr " rozhran %s\n" ++ ++#: ../arp.c:478 + msgid "(incomplete)" + msgstr "(nekompletn)" + +-#: ../arp.c:484 ++#: ../arp.c:495 + #, c-format + msgid "%s (%s) at " + msgstr "%s (%s) na " + +-#: ../arp.c:490 ++#: ../arp.c:501 ++#, c-format + msgid " " + msgstr "" + +-#: ../arp.c:496 ++#: ../arp.c:507 + #, c-format + msgid "netmask %s " + msgstr "sov maska %s " + +-#: ../arp.c:513 ++#: ../arp.c:524 + #, c-format + msgid "on %s\n" + msgstr "na %s\n" + +-#: ../arp.c:592 ++#: ../arp.c:605 + #, c-format + msgid "Entries: %d\tSkipped: %d\tFound: %d\n" + msgstr "Poloky: %d\tVynechno: %d\tNalezeno: %d\n" + +-#: ../arp.c:596 ++#: ../arp.c:609 + #, c-format + msgid "%s (%s) -- no entry\n" + msgstr "%s (%s) -- dn poloka\n" + +-#: ../arp.c:598 ++#: ../arp.c:611 + #, c-format + msgid "arp: in %d entries no match found.\n" + msgstr "arp: dn z poloek (%d) nevyhovuje.\n" + +-#: ../arp.c:613 ++#: ../arp.c:626 ++#, c-format + msgid "" + "Usage:\n" + " arp [-vn] [] [-i ] [-a] [] <-Display ARP " +@@ -112,49 +127,46 @@ msgstr "" + " arp [-vn] [] [-i [-a] [] <-Zobraz ARP " + "cache\n" + +-#: ../arp.c:614 ++#: ../arp.c:627 ++#, fuzzy, c-format + msgid "" +-" arp [-v] [-i ] -d [pub][nopub] <-Delete ARP " ++" arp [-v] [-i ] -d [pub] <-Delete ARP " + "entry\n" + msgstr "" + " arp [-v] [-i ] -d [pub][nopub] <-Smae poloku " + "ARP\n" + +-#: ../arp.c:615 +-#, fuzzy ++#: ../arp.c:628 ++#, fuzzy, c-format + msgid "" +-" arp [-vnD] [] [-i ] -f [] <-Add entry from " ++" arp [-vnD] [] [-i ] -f [] <-Add entry from " + "file\n" + msgstr "" + " arp [-vnD] [] [-i ] -f <-Pid poloku " + "ze\n" + " souboru\n" + +-#: ../arp.c:616 ++#: ../arp.c:629 ++#, fuzzy, c-format + msgid "" +-" arp [-v] [] [-i ] -s [temp][nopub] <-Add " ++" arp [-v] [] [-i ] -s [temp] <-Add " + "entry\n" + msgstr "" + " arp [-v] [ [-i -s [temp][nopub] <-Pid " + "poloku\n" + +-#: ../arp.c:617 +-msgid "" +-" arp [-v] [] [-i ] -s [netmask ] pub " +-"<-''-\n" +-msgstr "" +-" arp [-v] [] [-i ] -s [smask ] <-''-\n" +- +-#: ../arp.c:618 ++#: ../arp.c:630 ++#, fuzzy, c-format + msgid "" +-" arp [-v] [] [-i ] -Ds [netmask ] pub " ++" arp [-v] [] [-i ] -Ds [netmask ] pub " + "<-''-\n" + "\n" + msgstr "" + " arp [-v] [ [-i -Ds [smask ] pub " + "<-''-\n" + +-#: ../arp.c:620 ++#: ../arp.c:632 ++#, c-format + msgid "" + " -a display (all) hosts in alternative (BSD) " + "style\n" +@@ -162,126 +174,134 @@ msgstr "" + " -a zobraz jmna vech pota alternativnm\n" + " (BSD) zpsobem\n" + +-#: ../arp.c:621 ++#: ../arp.c:633 ++#, c-format + msgid " -s, --set set a new ARP entry\n" + msgstr " -s, --set nastav novou ARP poloku\n" + +-#: ../arp.c:622 ++#: ../arp.c:634 ++#, c-format + msgid " -d, --delete delete a specified entry\n" + msgstr " -d, --delete smae zadanou ARP poloku\n" + +-#: ../arp.c:623 ../netstat.c:1436 ../route.c:85 ++#: ../arp.c:635 ../netstat.c:1503 ../route.c:86 ++#, c-format + msgid " -v, --verbose be verbose\n" + msgstr "" + " -v, --verbose bude vypisovat podrobn zprvy\n" + " o innosti\n" + +-#: ../arp.c:624 ../netstat.c:1437 ../route.c:86 +-msgid " -n, --numeric dont resolve names\n" ++#: ../arp.c:636 ../netstat.c:1504 ../route.c:87 ++#, fuzzy, c-format ++msgid " -n, --numeric don't resolve names\n" + msgstr "" + " -n, --numeric nebude pevdt seln adresy\n" + " na kanonick jmna\n" + +-#: ../arp.c:625 ++#: ../arp.c:637 ++#, c-format + msgid "" + " -i, --device specify network interface (e.g. eth0)\n" + msgstr " -i, --device zadv sov rozhran (nap. eth0)\n" + +-#: ../arp.c:626 ++#: ../arp.c:638 ++#, c-format + msgid " -D, --use-device read from given device\n" + msgstr " -D, --use-device te ze zadanho zazen\n" + +-#: ../arp.c:627 +-#, fuzzy ++#: ../arp.c:639 ++#, fuzzy, c-format + msgid " -A, -p, --protocol specify protocol family\n" + msgstr " -r, --route vype smrovac tabulku\n" + +-#: ../arp.c:628 +-#, fuzzy ++#: ../arp.c:640 ++#, fuzzy, c-format + msgid "" +-" -f, --file read new entries from file or from " +-"/etc/ethers\n" ++" -f, --file read new entries from file or from /etc/" ++"ethers\n" + "\n" + msgstr "" + " -f, --file te nov poloky ze souboru\n" + "\n" + +-#: ../arp.c:630 ../rarp.c:181 ++#: ../arp.c:642 ../rarp.c:182 + #, c-format + msgid " =Use '-H ' to specify hardware address type. Default: %s\n" + msgstr "" + " =Pouijte '-H pro zadn hardwarovho typu adresy.\n" + " Implicitn: %s\n" + +-#: ../arp.c:631 ../rarp.c:182 ++#: ../arp.c:643 ../rarp.c:183 ++#, c-format + msgid " List of possible hardware types (which support ARP):\n" + msgstr " Seznam monch hardwarovch typ (podporujcch ARP):\n" + +-#: ../arp.c:664 ++#: ../arp.c:677 ../arp.c:762 + #, c-format + msgid "%s: hardware type not supported!\n" + msgstr "hardwarov typ %s nen podporovn!\n" + +-#: ../arp.c:668 ++#: ../arp.c:681 + #, c-format + msgid "%s: address family not supported!\n" + msgstr "tda adres %s nen podporovna!\n" + +-#: ../arp.c:703 ++#: ../arp.c:716 ++#, c-format + msgid "arp: -N not yet supported.\n" + msgstr "arp: pepna -N nen zatm podporovn\n" + +-#: ../arp.c:713 ++#: ../arp.c:726 + #, c-format + msgid "arp: %s: unknown address family.\n" + msgstr "arp: neznm tda adres %s.\n" + +-#: ../arp.c:722 ++#: ../arp.c:735 + #, c-format + msgid "arp: %s: unknown hardware type.\n" + msgstr "arp: neznm hardwarov typ %s.\n" + +-#: ../arp.c:741 ++#: ../arp.c:754 + #, c-format + msgid "arp: %s: kernel only supports 'inet'.\n" + msgstr "arp: %s: jdro podporuje pouze 'inet'.\n" + +-#: ../arp.c:746 ++#: ../arp.c:767 + #, c-format + msgid "arp: %s: hardware type without ARP support.\n" + msgstr "arp: hardwarov typ %s nepodporuje ARP.\n" + +-#: ../hostname.c:69 ++#: ../hostname.c:71 + #, c-format + msgid "Setting nodename to `%s'\n" + msgstr "Nastavuji jmno uzlu na `%s'\n" + +-#: ../hostname.c:74 ++#: ../hostname.c:76 + #, c-format + msgid "%s: you must be root to change the node name\n" + msgstr "%s: jmno uzlu me zmnit pouze superuivatel\n" + +-#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116 ++#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117 + #, c-format + msgid "%s: name too long\n" + msgstr "jmno %s je pli dlouh\n" + +-#: ../hostname.c:89 ++#: ../hostname.c:91 + #, c-format + msgid "Setting hostname to `%s'\n" + msgstr "Nastavuji jmno potae na `%s'\n" + +-#: ../hostname.c:94 ++#: ../hostname.c:96 + #, c-format + msgid "%s: you must be root to change the host name\n" + msgstr "%s: jmno potae me zmnit pouze superuivatel\n" + +-#: ../hostname.c:108 ++#: ../hostname.c:109 + #, c-format + msgid "Setting domainname to `%s'\n" + msgstr "Nastavuji jmno domny na `%s'\n" + +-#: ../hostname.c:113 ++#: ../hostname.c:114 + #, c-format + msgid "%s: you must be root to change the domain name\n" + msgstr "%s: jmno domny me zmnit pouze superuivatel\n" +@@ -306,26 +326,29 @@ msgstr "Vsledek: h_aliases=`%s'\n" + msgid "Result: h_addr_list=`%s'\n" + msgstr "Vsledek: h_addr_list=`%s'\n" + +-#: ../hostname.c:209 ++#: ../hostname.c:208 + #, c-format + msgid "%s: can't open `%s'\n" + msgstr "%s: `%s' nelze otevt\n" + +-#: ../hostname.c:223 ++#: ../hostname.c:222 ++#, c-format + msgid "Usage: hostname [-v] {hostname|-F file} set hostname (from file)\n" + msgstr "" + "Pouit:\n" + " hostname [-v] {jmno|-F soubor} nastav jmno potae (ze " + "souboru)\n" + +-#: ../hostname.c:224 ++#: ../hostname.c:223 ++#, c-format + msgid "" + " domainname [-v] {nisdomain|-F file} set NIS domainname (from file)\n" + msgstr "" + " domainname [-v] {jmno|-F soubor} nastav jmno NIS domny (ze\n" + " souboru)\n" + +-#: ../hostname.c:226 ++#: ../hostname.c:225 ++#, c-format + msgid "" + " nodename [-v] {nodename|-F file} set DECnet node name (from " + "file)\n" +@@ -333,11 +356,13 @@ msgstr "" + " nodename [-v] {jmno|-F soubor} nastav jmno DECnet uzlu (ze\n" + " souboru)\n" + +-#: ../hostname.c:228 ++#: ../hostname.c:227 ++#, c-format + msgid " hostname [-v] [-d|-f|-s|-a|-i|-y|-n] display formatted name\n" + msgstr " hostname [-v] [-d|-f|-s|-a|-i|-y|-n] vype formtovan jmno\n" + +-#: ../hostname.c:229 ++#: ../hostname.c:228 ++#, c-format + msgid "" + " hostname [-v] display hostname\n" + "\n" +@@ -345,7 +370,8 @@ msgstr "" + " hostname [-v] vype jmno potae\n" + "\n" + +-#: ../hostname.c:230 ++#: ../hostname.c:229 ++#, c-format + msgid "" + " hostname -V|--version|-h|--help print info and exit\n" + "\n" +@@ -353,7 +379,8 @@ msgstr "" + " hostname -V|--version|-h|--help vype informace a skon\n" + "\n" + +-#: ../hostname.c:231 ++#: ../hostname.c:230 ++#, c-format + msgid "" + " dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" + "\n" +@@ -361,35 +388,43 @@ msgstr "" + " dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" + "\n" + +-#: ../hostname.c:232 ++#: ../hostname.c:231 ++#, c-format + msgid " -s, --short short host name\n" + msgstr " -s, --short krtk jmno potae\n" + +-#: ../hostname.c:233 ++#: ../hostname.c:232 ++#, c-format + msgid " -a, --alias alias names\n" + msgstr " -a, --alias pezdvky\n" + +-#: ../hostname.c:234 ++#: ../hostname.c:233 ++#, c-format + msgid " -i, --ip-address addresses for the hostname\n" + msgstr " -i, --ip-address adresy odpovdajc jmnu potae\n" + +-#: ../hostname.c:235 ++#: ../hostname.c:234 ++#, c-format + msgid " -f, --fqdn, --long long host name (FQDN)\n" + msgstr " -f, --fqdn, --long dlouh jmno potae (kanonick)\n" + +-#: ../hostname.c:236 ++#: ../hostname.c:235 ++#, c-format + msgid " -d, --domain DNS domain name\n" + msgstr " -d, --domain jmno DNS domny\n" + +-#: ../hostname.c:237 ++#: ../hostname.c:236 ++#, c-format + msgid " -y, --yp, --nis NIS/YP domainname\n" + msgstr " -y, --yp, --nis jmno NIS/YP domny\n" + +-#: ../hostname.c:239 ++#: ../hostname.c:238 ++#, c-format + msgid " -n, --node DECnet node name\n" + msgstr " -n, --node jmno DECnet uzlu\n" + +-#: ../hostname.c:241 ++#: ../hostname.c:240 ++#, c-format + msgid "" + " -F, --file read hostname or NIS domainname from given file\n" + "\n" +@@ -397,7 +432,8 @@ msgstr "" + " -F, --file te jmno potae i nis domny ze souboru\n" + "\n" + +-#: ../hostname.c:243 ++#: ../hostname.c:242 ++#, c-format + msgid "" + " This command can read or set the hostname or the NIS domainname. You can\n" + " also read the DNS domain or the FQDN (fully qualified domain name).\n" +@@ -412,6 +448,7 @@ msgid "%s: You can't change the DNS doma + msgstr "%s: Tmto pkazem nelze DNS jmno domny zmnit\n" + + #: ../hostname.c:339 ++#, c-format + msgid "" + "\n" + "Unless you are using bind or NIS for host lookups you can change the DNS\n" +@@ -421,6 +458,7 @@ msgstr "" + "zmnit\n" + + #: ../hostname.c:340 ++#, c-format + msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n" + msgstr "" + "DNS jmno domny (je soust kanonickho jmna potae) v souboru\n" +@@ -441,349 +479,223 @@ msgstr "getdomainname()=`%s'\n" + msgid "getnodename()=`%s'\n" + msgstr "getnodename()=`%s'\n" + +-#: ../ifconfig.c:159 +-#, c-format +-msgid "%-9.9s Link encap:%s " +-msgstr "%-9.9s Zapouzden:%s " ++#: ../ifconfig.c:107 ++#, fuzzy, c-format ++msgid "" ++"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " ++"Flg\n" ++msgstr "" ++"Rozhr MTU Met P-OK P-CHYB P-ZAH P-PT OD-OK OD-CHYB OD-ZAH OD-PT " ++"PZ\n" + +-#: ../ifconfig.c:164 +-#, c-format +-msgid "HWaddr %s " +-msgstr "HWadr %s " ++#: ../ifconfig.c:129 ../ifconfig.c:161 ++#, fuzzy, c-format ++msgid "%s: ERROR while getting interface flags: %s\n" ++msgstr "%s: chyba pi zskvn informac o rozhran %s\n" + +-#: ../ifconfig.c:167 ++#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862 ++#: ../ifconfig.c:973 + #, c-format +-msgid "Media:%s" +-msgstr "Mdium:%s" ++msgid "No support for INET on this system.\n" ++msgstr "Tento systm nepodporuje INET.\n" + +-#: ../ifconfig.c:169 +-msgid "(auto)" +-msgstr "(auto)" ++#: ../ifconfig.c:193 ++#, fuzzy, c-format ++msgid "%s: ERROR while testing interface flags: %s\n" ++msgstr "%s: chyba pi zskvn informac o rozhran %s\n" + +-#: ../ifconfig.c:176 +-#, c-format +-msgid " %s addr:%s " +-msgstr " %s adr:%s " ++#: ../ifconfig.c:202 ++#, fuzzy, c-format ++msgid "" ++"Usage:\n" ++" ifconfig [-a] [-v] [-s] [[]
]\n" ++msgstr "" ++"Pouit:\n" ++" ifconfig [-a] [-i] [-v] [[] ]\n" + +-#: ../ifconfig.c:179 ++#: ../ifconfig.c:204 + #, c-format +-msgid " P-t-P:%s " +-msgstr " P-t-P:%s " ++msgid " [add
[/]]\n" ++msgstr " [add [/]]\n" + +-# V ostatnch katalozch se pekld Broadcast -> vesmrov vysln. +-# Tudi bcast -> Vesmr :) +-#: ../ifconfig.c:182 ++#: ../ifconfig.c:205 + #, c-format +-msgid " Bcast:%s " +-msgstr " Vesmr:%s " ++msgid " [del
[/]]\n" ++msgstr " [del [/]]\n" + +-#: ../ifconfig.c:184 ++#: ../ifconfig.c:206 + #, c-format +-msgid " Mask:%s\n" +-msgstr "Maska:%s\n" ++msgid " [[-]broadcast [
]] [[-]pointopoint [
]]\n" ++msgstr " [[-]broadcast []] [[-]pointopoint []]\n" + +-#: ../ifconfig.c:201 ++#: ../ifconfig.c:207 + #, c-format +-msgid " inet6 addr: %s/%d" +-msgstr " inet6-adr: %s/%d" ++msgid " [netmask
] [dstaddr
] [tunnel
]\n" ++msgstr " [netmask ] [dstaddr ] [tunnel ]\n" + +-#: ../ifconfig.c:203 +-msgid " Scope:" +-msgstr " Rozsah:" ++#: ../ifconfig.c:210 ++#, c-format ++msgid " [outfill ] [keepalive ]\n" ++msgstr " [outfill ] [keepalive ]\n" + +-#: ../ifconfig.c:206 +-msgid "Global" +-msgstr "Globl" ++#: ../ifconfig.c:212 ++#, c-format ++msgid " [hw
] [metric ] [mtu ]\n" ++msgstr " [hw ] [metric ] [mtu ]\n" + +-#: ../ifconfig.c:209 +-msgid "Link" +-msgstr "Linka" ++#: ../ifconfig.c:213 ++#, c-format ++msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" ++msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" + +-#: ../ifconfig.c:212 +-msgid "Site" +-msgstr "Stanovit" ++#: ../ifconfig.c:214 ++#, c-format ++msgid " [multicast] [[-]promisc]\n" ++msgstr " [multicast] [[-]promisc]\n" + + #: ../ifconfig.c:215 +-msgid "Compat" +-msgstr "Kompatibilita" ++#, c-format ++msgid " [mem_start ] [io_addr ] [irq ] [media ]\n" ++msgstr " [mem_start ] [io_addr ] [irq ] [media ]\n" + +-#: ../ifconfig.c:218 +-msgid "Host" +-msgstr "Pota" ++#: ../ifconfig.c:217 ++#, c-format ++msgid " [txqueuelen ]\n" ++msgstr " [txqueuelen dlka]\n" + +-#: ../ifconfig.c:221 +-msgid "Unknown" +-msgstr "Neznm." ++#: ../ifconfig.c:220 ++#, c-format ++msgid " [[-]dynamic]\n" ++msgstr " [[-]dynamic]\n" + +-#: ../ifconfig.c:236 ++#: ../ifconfig.c:222 + #, c-format +-msgid " IPX/Ethernet II addr:%s\n" +-msgstr " IPX/Ethernet II adr: %s\n" ++msgid "" ++" [up|down] ...\n" ++"\n" ++msgstr "" ++" [up|down] ...\n" ++"\n" + +-#: ../ifconfig.c:239 ++#: ../ifconfig.c:224 + #, c-format +-msgid " IPX/Ethernet SNAP addr:%s\n" +-msgstr " IPX/Ethernet SNAP adr:%s\n" ++msgid " =Hardware Type.\n" ++msgstr " =Hardwarov Typ.\n" + +-#: ../ifconfig.c:242 ++#: ../ifconfig.c:225 + #, c-format +-msgid " IPX/Ethernet 802.2 addr:%s\n" +-msgstr " IPX/Ethernet 802.2 adr:%s\n" ++msgid " List of possible hardware types:\n" ++msgstr " Seznam monch hardwarovch typ:\n" + +-#: ../ifconfig.c:245 ++#. 1 = ARPable ++#: ../ifconfig.c:227 + #, c-format +-msgid " IPX/Ethernet 802.3 addr:%s\n" +-msgstr " IPX/Ethernet 802.3 adr:%s\n" ++msgid " =Address family. Default: %s\n" ++msgstr " =tda adres. Implicitn: %s\n" + +-#: ../ifconfig.c:255 ++#: ../ifconfig.c:228 + #, c-format +-msgid " EtherTalk Phase 2 addr:%s\n" +-msgstr " EtherTalk Phase 2 adr:%s\n" ++msgid " List of possible address families:\n" ++msgstr " Seznam monch td adres:\n" + +-#: ../ifconfig.c:264 ++#: ../ifconfig.c:303 + #, c-format +-msgid " econet addr:%s\n" +-msgstr " econet adr:%s\n" ++msgid "ifconfig: option `%s' not recognised.\n" ++msgstr "" + +-# Hic sunt leones ... +-#: ../ifconfig.c:270 +-msgid "[NO FLAGS] " +-msgstr "[DN PZNAKY]" ++#: ../ifconfig.c:305 ../ifconfig.c:962 ++#, c-format ++msgid "ifconfig: `--help' gives usage information.\n" ++msgstr "" + +-#: ../ifconfig.c:272 +-msgid "UP " +-msgstr "AKTIVOVNO " ++#: ../ifconfig.c:380 ++#, c-format ++msgid "Unknown media type.\n" ++msgstr "Neznm typ mdia.\n" + +-#: ../ifconfig.c:274 +-msgid "BROADCAST " +-msgstr "VESMROV_VYSLN " ++#: ../ifconfig.c:417 ++#, c-format ++msgid "" ++"Warning: Interface %s still in promisc mode... maybe other application is " ++"running?\n" ++msgstr "" + +-#: ../ifconfig.c:276 +-msgid "DEBUG " +-msgstr "DEBUG " ++#: ../ifconfig.c:429 ++#, c-format ++msgid "Warning: Interface %s still in MULTICAST mode.\n" ++msgstr "" + +-#: ../ifconfig.c:278 +-msgid "LOOPBACK " +-msgstr "SMYKA " ++#: ../ifconfig.c:441 ++#, c-format ++msgid "Warning: Interface %s still in ALLMULTI mode.\n" ++msgstr "" + +-#: ../ifconfig.c:280 +-msgid "POINTOPOINT " +-msgstr "POINTOPOINT " ++#: ../ifconfig.c:465 ++#, c-format ++msgid "Warning: Interface %s still in DYNAMIC mode.\n" ++msgstr "" + +-# ?? +-#: ../ifconfig.c:282 +-msgid "NOTRAILERS " +-msgstr "NOTRAILERS " ++#: ../ifconfig.c:523 ++#, c-format ++msgid "Warning: Interface %s still in BROADCAST mode.\n" ++msgstr "" + +-#: ../ifconfig.c:284 +-msgid "RUNNING " +-msgstr "B̮ " ++#: ../ifconfig.c:652 ++#, c-format ++msgid "Warning: Interface %s still in POINTOPOINT mode.\n" ++msgstr "" + +-#: ../ifconfig.c:286 +-msgid "NOARP " +-msgstr "NEARP " ++#: ../ifconfig.c:684 ++#, c-format ++msgid "hw address type `%s' has no handler to set address. failed.\n" ++msgstr "" + +-#: ../ifconfig.c:288 +-msgid "PROMISC " +-msgstr "PROMISK " ++#: ../ifconfig.c:693 ++#, c-format ++msgid "%s: invalid %s address.\n" ++msgstr "%s: adresa %s je nesprvn.\n" + +-#: ../ifconfig.c:290 +-msgid "ALLMULTI " +-msgstr "ALLMULTI " ++#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913 ++#, c-format ++msgid "No support for INET6 on this system.\n" ++msgstr "Tento systm nepodporuje INET6.\n" + +-#: ../ifconfig.c:292 +-msgid "SLAVE " +-msgstr "SLAVE " ++#: ../ifconfig.c:780 ../ifconfig.c:871 ++#, c-format ++msgid "Interface %s not initialized\n" ++msgstr "" + +-#: ../ifconfig.c:294 +-msgid "MASTER " +-msgstr "MASTER " ++#: ../ifconfig.c:792 ../ifconfig.c:882 ++#, fuzzy, c-format ++msgid "Bad address.\n" ++msgstr "%s: adresa %s je nesprvn.\n" + +-#: ../ifconfig.c:296 +-msgid "MULTICAST " +-msgstr "MULTICAST " +- +-#: ../ifconfig.c:299 +-msgid "DYNAMIC " +-msgstr "DYNAMIC " +- +-#: ../ifconfig.c:302 +-#, c-format +-msgid " MTU:%d Metric:%d" +-msgstr " MTU:%d Metrika:%d" +- +-#: ../ifconfig.c:306 +-#, c-format +-msgid " Outfill:%d Keepalive:%d" +-msgstr " Outfill:%d Keepalive:%d" +- +-#: ../ifconfig.c:320 +-#, c-format +-msgid "RX packets:%lu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" +-msgstr "pijmutch paket:%lu chyb:%lu zahozeno:%lu peteen:%lu rmc:%lu\n" +- +-#: ../ifconfig.c:325 +-#, c-format +-msgid " compressed:%lu\n" +-msgstr " komprimovno:%lu\n" +- +-# carrier? +-#: ../ifconfig.c:329 +-#, c-format +-msgid "TX packets:%lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" +-msgstr "odeslanch paket:%lu chyb:%lu zahozeno:%lu peteen:%lu penos:%lu\n" +- +-#: ../ifconfig.c:333 +-#, c-format +-msgid " collisions:%lu " +-msgstr " koliz:%lu " +- +-#: ../ifconfig.c:335 +-#, c-format +-msgid "compressed:%lu " +-msgstr "komprimovno:%lu " +- +-#: ../ifconfig.c:337 +-#, c-format +-msgid "txqueuelen:%d " +-msgstr "dlka odchoz fronty:%d " +- +-#: ../ifconfig.c:345 +-#, c-format +-msgid "Interrupt:%d " +-msgstr "Peruen:%d " +- +-#. Only print devices using it for +-#. I/O maps +-#: ../ifconfig.c:348 +-#, c-format +-msgid "Base address:0x%x " +-msgstr "Vstupn/Vstupn port:0x%x " +- +-#: ../ifconfig.c:350 +-#, c-format +-msgid "Memory:%lx-%lx " +-msgstr "Pam:%lx-%lx " +- +-#: ../ifconfig.c:353 +-#, c-format +-msgid "DMA chan:%x " +-msgstr "Kanl DMA:%x " +- +-#: ../ifconfig.c:384 ../ifconfig.c:405 +-#, c-format +-msgid "%s: unknown interface: %s\n" +-msgstr "%s: rozhran %s nen znmo\n" +- +-#: ../ifconfig.c:421 +-msgid "" +-"Usage:\n" +-" ifconfig [-a] [-i] [-v] [[]
]\n" +-msgstr "" +-"Pouit:\n" +-" ifconfig [-a] [-i] [-v] [[] ]\n" +- +-#: ../ifconfig.c:425 +-msgid " [add
[/]]\n" +-msgstr " [add [/]]\n" +- +-#: ../ifconfig.c:427 +-msgid " [del
[/]]\n" +-msgstr " [del [/]]\n" +- +-#: ../ifconfig.c:432 +-msgid " [[-]broadcast [
]] [[-]pointopoint [
]]\n" +-msgstr " [[-]broadcast []] [[-]pointopoint []]\n" +- +-#: ../ifconfig.c:433 +-msgid " [netmask
] [dstaddr
] [tunnel
]\n" +-msgstr " [netmask ] [dstaddr ] [tunnel ]\n" +- +-#: ../ifconfig.c:436 +-msgid " [outfill ] [keepalive ]\n" +-msgstr " [outfill ] [keepalive ]\n" +- +-#: ../ifconfig.c:438 +-msgid " [hw
] [metric ] [mtu ]\n" +-msgstr " [hw ] [metric ] [mtu ]\n" +- +-#: ../ifconfig.c:439 +-msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" +-msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" +- +-#: ../ifconfig.c:440 +-msgid " [multicast] [[-]promisc]\n" +-msgstr " [multicast] [[-]promisc]\n" +- +-#: ../ifconfig.c:441 +-msgid " [mem_start ] [io_addr ] [irq ] [media ]\n" +-msgstr " [mem_start ] [io_addr ] [irq ] [media ]\n" +- +-#: ../ifconfig.c:443 +-msgid " [txqueuelen ]\n" +-msgstr " [txqueuelen dlka]\n" +- +-#: ../ifconfig.c:446 +-msgid " [[-]dynamic]\n" +-msgstr " [[-]dynamic]\n" +- +-#: ../ifconfig.c:448 +-msgid "" +-" [up|down] ...\n" +-"\n" +-msgstr "" +-" [up|down] ...\n" +-"\n" +- +-#: ../ifconfig.c:450 +-msgid " =Hardware Type.\n" +-msgstr " =Hardwarov Typ.\n" +- +-#: ../ifconfig.c:451 +-msgid " List of possible hardware types:\n" +-msgstr " Seznam monch hardwarovch typ:\n" +- +-#. 1 = ARPable +-#: ../ifconfig.c:453 +-#, c-format +-msgid " =Address family. Default: %s\n" +-msgstr " =tda adres. Implicitn: %s\n" +- +-#: ../ifconfig.c:454 +-msgid " List of possible address families:\n" +-msgstr " Seznam monch td adres:\n" +- +-#: ../ifconfig.c:593 +-msgid "Unknown media type.\n" +-msgstr "Neznm typ mdia.\n" +- +-#: ../ifconfig.c:881 ++#: ../ifconfig.c:885 + #, c-format +-msgid "%s: invalid %s address.\n" +-msgstr "%s: adresa %s je nesprvn.\n" +- +-#: ../ifconfig.c:920 ../ifconfig.c:963 ../ifconfig.c:1011 +-msgid "No support for INET6 on this system.\n" +-msgstr "Tento systm nepodporuje INET6.\n" +- +-#: ../ifconfig.c:983 + msgid "Address deletion not supported on this system.\n" + msgstr "Tento systm nepodporuje mazn adres.\n" + +-#: ../ifconfig.c:1066 +-msgid "No support for INET on this system.\n" +-msgstr "Tento systm nepodporuje INET.\n" ++#: ../ifconfig.c:957 ++#, fuzzy, c-format ++msgid "ifconfig: Cannot set address for this protocol family.\n" ++msgstr "Nevm, jak nastavit adresu tdy %d.\n" + +-#: ../ifconfig.c:1076 ++#: ../ifconfig.c:983 ++#, c-format + msgid "No support for ECONET on this system.\n" + msgstr "Tento systm nepodporuje ECONET.\n" + +-#: ../ifconfig.c:1084 ++#: ../ifconfig.c:991 + #, c-format + msgid "Don't know how to set addresses for family %d.\n" + msgstr "Nevm, jak nastavit adresu tdy %d.\n" + +-#: ../netstat.c:383 ++#: ../ifconfig.c:1021 ++#, c-format ++msgid "WARNING: at least one error occured. (%d)\n" ++msgstr "" ++ ++#: ../netstat.c:434 + #, c-format + msgid "" + "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n" +@@ -792,7 +704,8 @@ msgstr "" + "jste\n" + "byl superuivatelem)\n" + +-#: ../netstat.c:387 ++#: ../netstat.c:438 ++#, c-format + msgid "" + "(Not all processes could be identified, non-owned process info\n" + " will not be shown, you would have to be root to see it all.)\n" +@@ -801,199 +714,223 @@ msgstr "" + "pouze o procesech, jich jste vlastnkem. Aby jste mohl vidt ve, musel\n" + "byste bt superuivatelem.)\n" + +-#: ../netstat.c:394 ../netstat.c:1089 ../netstat.c:1166 ++#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266 + msgid "LISTENING" + msgstr "NASLOUCH" + +-#: ../netstat.c:395 ++#: ../netstat.c:446 + msgid "CONN SENT" + msgstr "CONN ODESLN" + +-#: ../netstat.c:396 ../netstat.c:1168 ++#: ../netstat.c:447 ../netstat.c:1268 + msgid "DISC SENT" + msgstr "DISC ODESLN" + +-#: ../netstat.c:397 ../netstat.c:464 ../netstat.c:809 ../netstat.c:1169 ++#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269 + msgid "ESTABLISHED" + msgstr "SPOJENO" + +-#: ../netstat.c:419 ++#: ../netstat.c:470 ++#, c-format + msgid "Active NET/ROM sockets\n" + msgstr "Aktivn NET/ROM sokety\n" + +-#: ../netstat.c:420 ++#: ../netstat.c:471 ++#, c-format + msgid "" +-"User Dest Source Device State Vr/Vs Send-Q " +-"Recv-Q\n" ++"User Dest Source Device State Vr/Vs Send-Q Recv-" ++"Q\n" + msgstr "" +-"Uivatel Cl Zdroj Zazen Stav Vr/Vs Odch-F " +-"Pch-F\n" ++"Uivatel Cl Zdroj Zazen Stav Vr/Vs Odch-F Pch-" ++"F\n" + +-#: ../netstat.c:430 ../netstat.c:1208 ++#: ../netstat.c:481 ../netstat.c:1308 + #, c-format + msgid "Problem reading data from %s\n" + msgstr "Chyba pi ten dat z %s\n" + + # nsledujc radji ponechat v originle ?! +-#: ../netstat.c:465 ++#: ../netstat.c:516 + msgid "SYN_SENT" + msgstr "SYN_SENT" + +-#: ../netstat.c:466 ++#: ../netstat.c:517 + msgid "SYN_RECV" + msgstr "SYN_RECV" + +-#: ../netstat.c:467 ++#: ../netstat.c:518 + msgid "FIN_WAIT1" + msgstr "FIN_WAIT1" + +-#: ../netstat.c:468 ++#: ../netstat.c:519 + msgid "FIN_WAIT2" + msgstr "FIN_WAIT2" + +-#: ../netstat.c:469 ++#: ../netstat.c:520 + msgid "TIME_WAIT" + msgstr "TIME_WAIT" + +-#: ../netstat.c:470 ++#: ../netstat.c:521 + msgid "CLOSE" + msgstr "ZAVEN" + +-#: ../netstat.c:471 ++#: ../netstat.c:522 + msgid "CLOSE_WAIT" + msgstr "CLOSE_WAIT" + +-#: ../netstat.c:472 ++#: ../netstat.c:523 + msgid "LAST_ACK" + msgstr "POSLEDN ACK" + +-#: ../netstat.c:473 ++#: ../netstat.c:524 + msgid "LISTEN" + msgstr "LISTEN" + +-#: ../netstat.c:474 ++#: ../netstat.c:525 + msgid "CLOSING" + msgstr "ZAVR" + +-#: ../netstat.c:544 ++#: ../netstat.c:596 + #, c-format + msgid "warning, got bogus igmp6 line %d.\n" + msgstr "varovn, nesmysln igmp6 dek %d.\n" + +-#: ../netstat.c:549 ../netstat.c:587 ../netstat.c:670 ../netstat.c:803 +-#: ../netstat.c:935 ../netstat.c:940 ++#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898 ++#: ../netstat.c:1032 ../netstat.c:1037 + #, c-format + msgid "netstat: unsupported address family %d !\n" + msgstr "netstat: tda adres %d nen podporovna !\n" + +-#: ../netstat.c:562 ../netstat.c:567 ../netstat.c:575 ../netstat.c:582 ++#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634 + #, c-format + msgid "warning, got bogus igmp line %d.\n" + msgstr "varovn, nesmysln igmp dek %d.\n" + +-#: ../netstat.c:666 ++#: ../netstat.c:677 ++#, fuzzy, c-format ++msgid "Active X.25 sockets\n" ++msgstr "Aktivn AX.25 sokety\n" ++ ++#. IMHO, Vr/Vs is not very usefull --SF ++#: ../netstat.c:679 ++#, fuzzy, c-format ++msgid "" ++"Dest Source Device LCI State Vr/Vs Send-Q Recv-" ++"Q\n" ++msgstr "Cl Zdroj Zaz Stav Vr/Vs Odhod-F Pch-F\n" ++ ++#: ../netstat.c:759 ++#, c-format + msgid "warning, got bogus tcp line.\n" + msgstr "varovn, nesmysln tcp dek.\n" + +-#: ../netstat.c:704 ../netstat.c:855 ../netstat.c:975 ++#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075 + #, c-format + msgid "off (0.00/%ld/%d)" + msgstr "vyp (0.00/%ld/%d)" + +-#: ../netstat.c:708 ++#: ../netstat.c:804 + #, fuzzy, c-format + msgid "on (%2.2f/%ld/%d)" + msgstr "zap%d (%2.2f/%ld/%d)" + +-#: ../netstat.c:713 ++#: ../netstat.c:809 + #, fuzzy, c-format + msgid "keepalive (%2.2f/%ld/%d)" + msgstr "zap%d (%2.2f/%ld/%d)" + +-#: ../netstat.c:718 ++#: ../netstat.c:814 + #, fuzzy, c-format + msgid "timewait (%2.2f/%ld/%d)" + msgstr "zap%d (%2.2f/%ld/%d)" + +-#: ../netstat.c:723 ../netstat.c:864 ../netstat.c:985 ++#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085 + #, c-format + msgid "unkn-%d (%2.2f/%ld/%d)" + msgstr "nezn-%d (%2.2f/%ld/%d)" + +-#: ../netstat.c:799 ++#: ../netstat.c:894 ++#, c-format + msgid "warning, got bogus udp line.\n" + msgstr "varovn, nesmysln udp dek.\n" + +-#: ../netstat.c:817 ../netstat.c:1075 ../netstat.c:1108 ++#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208 + msgid "UNKNOWN" + msgstr "NEZNM" + +-#: ../netstat.c:860 ../netstat.c:980 ++#: ../netstat.c:958 ../netstat.c:1080 + #, c-format + msgid "on%d (%2.2f/%ld/%d)" + msgstr "zap%d (%2.2f/%ld/%d)" + +-#: ../netstat.c:949 ++#: ../netstat.c:1046 ++#, c-format + msgid "warning, got bogus raw line.\n" + msgstr "varovn, nesmysln 'raw' dek.\n" + +-#: ../netstat.c:1028 ++#: ../netstat.c:1128 ++#, c-format + msgid "warning, got bogus unix line.\n" + msgstr "varovn, netstat 'unix' dek.\n" + +-#: ../netstat.c:1055 ++#: ../netstat.c:1155 + msgid "STREAM" + msgstr "STREAM" + +-#: ../netstat.c:1059 ++#: ../netstat.c:1159 + msgid "DGRAM" + msgstr "DGRAM" + +-#: ../netstat.c:1063 ++#: ../netstat.c:1163 + msgid "RAW" + msgstr "RAW" + +-#: ../netstat.c:1067 ++#: ../netstat.c:1167 + msgid "RDM" + msgstr "RDM" + +-#: ../netstat.c:1071 ++#: ../netstat.c:1171 + msgid "SEQPACKET" + msgstr "SEQPACKET" + +-#: ../netstat.c:1080 ++#: ../netstat.c:1180 + msgid "FREE" + msgstr "NEALOKOVN" + +-#: ../netstat.c:1096 ++#: ../netstat.c:1196 + msgid "CONNECTING" + msgstr "SPOJUJE" + +-#: ../netstat.c:1100 ++#: ../netstat.c:1200 + msgid "CONNECTED" + msgstr "SPOJEN" + +-#: ../netstat.c:1104 ++#: ../netstat.c:1204 + msgid "DISCONNECTING" + msgstr "ODPOJUJE" + +-#: ../netstat.c:1135 ++#: ../netstat.c:1235 ++#, c-format + msgid "Active UNIX domain sockets " + msgstr "Aktivn sokety domny UNIX " + +-#: ../netstat.c:1137 ../netstat.c:1666 ++#: ../netstat.c:1237 ../netstat.c:1756 ++#, c-format + msgid "(servers and established)" + msgstr "(servery a navzan spojen)" + +-#: ../netstat.c:1140 ../netstat.c:1669 ++#: ../netstat.c:1240 ../netstat.c:1759 ++#, c-format + msgid "(only servers)" + msgstr "(pouze servery)" + +-#: ../netstat.c:1142 ../netstat.c:1671 ++#: ../netstat.c:1242 ../netstat.c:1761 ++#, c-format + msgid "(w/o servers)" + msgstr "(w/o servery)" + +-#: ../netstat.c:1145 ++#: ../netstat.c:1245 ++#, c-format + msgid "" + "\n" + "Proto RefCnt Flags Type State I-Node" +@@ -1001,90 +938,92 @@ msgstr "" + "\n" + "Proto ta Pznaky Typ Stav I-Uzel" + +-#: ../netstat.c:1147 ++#: ../netstat.c:1247 ++#, c-format + msgid " Path\n" + msgstr " Cesta\n" + +-#: ../netstat.c:1167 ++#: ../netstat.c:1267 + msgid "SABM SENT" + msgstr "SABM ODESLN" + +-#: ../netstat.c:1170 ++#: ../netstat.c:1270 + msgid "RECOVERY" + msgstr "OBNOVA" + +-#: ../netstat.c:1184 ++#: ../netstat.c:1284 ++#, c-format + msgid "Active AX.25 sockets\n" + msgstr "Aktivn AX.25 sokety\n" + +-#: ../netstat.c:1185 ++#: ../netstat.c:1285 ++#, c-format + msgid "Dest Source Device State Vr/Vs Send-Q Recv-Q\n" + msgstr "Cl Zdroj Zaz Stav Vr/Vs Odhod-F Pch-F\n" + +-#: ../netstat.c:1228 ++#: ../netstat.c:1328 + #, c-format + msgid "problem reading data from %s\n" + msgstr "chyba pi ten dat z %s\n" + +-#: ../netstat.c:1279 ++#: ../netstat.c:1379 ++#, c-format + msgid "" + "Active IPX sockets\n" + "Proto Recv-Q Send-Q Local Address Foreign Address " + "State" + msgstr "" + "Aktivn IPX sokety\n" +-"Proto Pch-F Odch-F Lokl adresa Vzdlen adresa " +-" Stav" ++"Proto Pch-F Odch-F Lokl adresa Vzdlen " ++"adresa Stav" + +-#: ../netstat.c:1281 ++#: ../netstat.c:1381 ++#, c-format + msgid " User" + msgstr " Uivatel" + +-#: ../netstat.c:1315 ++#: ../netstat.c:1415 + msgid "ESTAB" + msgstr "SPOJEN" + +-#: ../netstat.c:1323 ++#: ../netstat.c:1423 + msgid "UNK." + msgstr "NEZ." + +-#: ../netstat.c:1367 +-msgid " - no statistics available -" +-msgstr " - statistick data nejsou dostupn -" +- +-#: ../netstat.c:1370 +-msgid "[NO FLAGS]" +-msgstr "[DN PZNAKY]" +- +-#: ../netstat.c:1400 ++#: ../netstat.c:1461 ++#, c-format + msgid "Kernel Interface table\n" + msgstr "Tabulka rozhran v jdru\n" + +-#: ../netstat.c:1401 ++#: ../netstat.c:1465 ++#, fuzzy, c-format + msgid "" +-"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " ++"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " + "Flg\n" + msgstr "" + "Rozhr MTU Met P-OK P-CHYB P-ZAH P-PT OD-OK OD-CHYB OD-ZAH OD-PT " + "PZ\n" + +-#: ../netstat.c:1404 ++#: ../netstat.c:1469 + msgid "missing interface information" + msgstr "chyb informace o rozhran" + +-#: ../netstat.c:1425 ++#: ../netstat.c:1492 ++#, c-format + msgid "" +-"usage: netstat [-veenNcCF] [] -r netstat " +-"{-V|--version|-h|--help}\n" ++"usage: netstat [-veenNcCF] [] -r netstat {-V|--version|-h|--" ++"help}\n" + msgstr "" +-"Pouit: netstat [--veenNcCF] [] -r netstat " +-"{-V|--version|-h|--help}\n" ++"Pouit: netstat [--veenNcCF] [] -r netstat {-V|--version|-h|--" ++"help}\n" + +-#: ../netstat.c:1426 ++#: ../netstat.c:1493 ++#, c-format + msgid " netstat [-vnNcaeol] [ ...]\n" + msgstr " netstat [-vnNcaeol] [ ...]\n" + +-#: ../netstat.c:1427 ++#: ../netstat.c:1494 ++#, c-format + msgid "" + " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" + "\n" +@@ -1092,27 +1031,32 @@ msgstr "" + " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" + "\n" + +-#: ../netstat.c:1429 ++#: ../netstat.c:1496 ++#, c-format + msgid " -r, --route display routing table\n" + msgstr " -r, --route vype smrovac tabulku\n" + +-#: ../netstat.c:1430 ++#: ../netstat.c:1497 ++#, c-format + msgid " -i, --interfaces display interface table\n" + msgstr " -i, --interfaces vype tabulku rozhran\n" + +-#: ../netstat.c:1431 ++#: ../netstat.c:1498 ++#, c-format + msgid " -g, --groups display multicast group memberships\n" + msgstr "" + " -g, --groups vype lenstv v multicast skupinch\n" + +-#: ../netstat.c:1432 ++#: ../netstat.c:1499 ++#, c-format + msgid "" + " -s, --statistics display networking statistics (like SNMP)\n" + msgstr "" + " -s, --statistics vype statistiku sov aktivity (jako " + "SNMP)\n" + +-#: ../netstat.c:1434 ++#: ../netstat.c:1501 ++#, c-format + msgid "" + " -M, --masquerade display masqueraded connections\n" + "\n" +@@ -1120,20 +1064,45 @@ msgstr "" + " -M, --masquerade vype maskovan spojen\n" + "\n" + +-#: ../netstat.c:1438 ../route.c:87 ++#: ../netstat.c:1505 ++#, fuzzy, c-format ++msgid " --numeric-hosts don't resolve host names\n" ++msgstr "" ++" -n, --numeric nebude pevdt seln adresy\n" ++" na kanonick jmna\n" ++ ++#: ../netstat.c:1506 ++#, fuzzy, c-format ++msgid " --numeric-ports don't resolve port names\n" ++msgstr "" ++" -n, --numeric nebude pevdt seln adresy\n" ++" na kanonick jmna\n" ++ ++#: ../netstat.c:1507 ++#, fuzzy, c-format ++msgid " --numeric-users don't resolve user names\n" ++msgstr "" ++" -n, --numeric nebude pevdt seln adresy\n" ++" na kanonick jmna\n" ++ ++#: ../netstat.c:1508 ++#, c-format + msgid " -N, --symbolic resolve hardware names\n" + msgstr " -N, --symbolic pevede hw jmna\n" + +-#: ../netstat.c:1439 ../route.c:88 ++#: ../netstat.c:1509 ../route.c:88 ++#, c-format + msgid " -e, --extend display other/more information\n" + msgstr " -e, --extend vype podrobnj informace\n" + +-#: ../netstat.c:1440 ++#: ../netstat.c:1510 ++#, c-format + msgid " -p, --programs display PID/Program name for sockets\n" + msgstr "" + " -p, --programs vype PID/jmno programu pro sokety\n" + +-#: ../netstat.c:1441 ++#: ../netstat.c:1511 ++#, c-format + msgid "" + " -c, --continuous continuous listing\n" + "\n" +@@ -1141,23 +1110,27 @@ msgstr "" + " -c, --continuous neperuovan vpis\n" + "\n" + +-#: ../netstat.c:1442 ++#: ../netstat.c:1512 ++#, c-format + msgid " -l, --listening display listening server sockets\n" + msgstr "" + " -l, --listening vype sokety, na nich je naslouchno\n" + +-#: ../netstat.c:1443 ++#: ../netstat.c:1513 ++#, c-format + msgid "" + " -a, --all, --listening display all sockets (default: connected)\n" + msgstr "" + " -a, --all, --listening vype vechny sokety (implicitn: " + "spojen)\n" + +-#: ../netstat.c:1444 ++#: ../netstat.c:1514 ++#, c-format + msgid " -o, --timers display timers\n" + msgstr " -o, --timers zobraz asovae\n" + +-#: ../netstat.c:1445 ../route.c:89 ++#: ../netstat.c:1515 ../route.c:89 ++#, c-format + msgid "" + " -F, --fib display Forwarding Information Base " + "(default)\n" +@@ -1165,112 +1138,126 @@ msgstr "" + " -F, --fib zobraz Forwarding Infomation Base\n" + " (implicitn)\n" + +-#: ../netstat.c:1446 ../route.c:90 ++#: ../netstat.c:1516 ../route.c:90 ++#, c-format + msgid "" + " -C, --cache display routing cache instead of FIB\n" + "\n" + msgstr " -C, --cache msto FIB zobraz smrovac cache\n" + +-#: ../netstat.c:1448 ++#: ../netstat.c:1518 ++#, c-format + msgid "" +-" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx " +-"--netrom\n" ++" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" ++"netrom\n" + msgstr "" +-" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx " +-"--netrom\n" ++" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" ++"netrom\n" + +-#: ../netstat.c:1449 ../route.c:92 +-#, c-format +-msgid " =Use '-A ' or '--' Default: %s\n" ++#: ../netstat.c:1519 ++#, fuzzy, c-format ++msgid " =Use '-6|-4' or '-A ' or '--'; default: %s\n" + msgstr " =Pouijte '-A ' or '--' Implicitn: %s\n" + +-#: ../netstat.c:1450 ../route.c:93 ++#: ../netstat.c:1520 ../route.c:93 ++#, c-format + msgid " List of possible address families (which support routing):\n" + msgstr " Seznam monch td adres (podporujcch smrovn):\n" + +-#: ../netstat.c:1663 ++#: ../netstat.c:1753 ++#, c-format + msgid "Active Internet connections " + msgstr "Aktivn Internetov spojen " + +-#: ../netstat.c:1673 ++#: ../netstat.c:1763 ++#, c-format + msgid "" + "\n" +-"Proto Recv-Q Send-Q Local Address Foreign Address State " +-" " ++"Proto Recv-Q Send-Q Local Address Foreign Address " ++"State " + msgstr "" + "\n" + "Proto Pch-F Odch-F Mstn Adresa Vzdlen Adresa Stav " + +-#: ../netstat.c:1675 ++#: ../netstat.c:1765 ++#, c-format + msgid " User Inode " + msgstr " Uivatel I-uzel " + +-#: ../netstat.c:1678 ++#: ../netstat.c:1768 ++#, c-format + msgid " Timer" + msgstr " asova" + +-#: ../netstat.c:1708 ++#: ../netstat.c:1798 ++#, c-format + msgid "IPv4 Group Memberships\n" + msgstr "lenstv v IPv4 skupinch\n" + +-#: ../netstat.c:1709 ++#: ../netstat.c:1799 ++#, c-format + msgid "Interface RefCnt Group\n" + msgstr "Rozhran ta Skupina\n" + +-#: ../rarp.c:43 ++#: ../rarp.c:44 + msgid "This kernel does not support RARP.\n" + msgstr "Toto jdro nepodporuje RARP.\n" + +-#: ../rarp.c:82 ++#: ../rarp.c:83 + #, c-format + msgid "no RARP entry for %s.\n" + msgstr "pro %s neexistuje RARP poloka.\n" + +-#: ../rarp.c:95 ++#: ../rarp.c:96 + #, c-format + msgid "%s: bad hardware address\n" + msgstr "hardwarov adresa %s je nesprvn\n" + +-#: ../rarp.c:127 ++#: ../rarp.c:128 + #, c-format + msgid "rarp: cannot open file %s:%s.\n" + msgstr "rarp: soubor %s:%s nelze otevt.\n" + +-#: ../rarp.c:139 ++#: ../rarp.c:140 + #, c-format + msgid "rarp: format error at %s:%u\n" + msgstr "rarp: syntaktick chyba na dku %2$u souboru %1$s\n" + +-#: ../rarp.c:143 ../rarp.c:287 ++#: ../rarp.c:144 ../rarp.c:289 + #, c-format + msgid "rarp: %s: unknown host\n" + msgstr "rarp: pota %s nen znm\n" + +-#: ../rarp.c:146 ++#: ../rarp.c:147 + #, c-format + msgid "rarp: cannot set entry from %s:%u\n" + msgstr "rarp: nelze nastavit poloku z dku %2$u souboru %1$s\n" + +-#: ../rarp.c:175 ++#: ../rarp.c:176 ++#, c-format + msgid "Usage: rarp -a list entries in cache.\n" + msgstr "Pouit: rarp -a vype poloky z cache.\n" + +-#: ../rarp.c:176 ++#: ../rarp.c:177 ++#, c-format + msgid " rarp -d delete entry from cache.\n" + msgstr " rarp -d smae poloku z cache.\n" + +-#: ../rarp.c:177 ++#: ../rarp.c:178 ++#, c-format + msgid " rarp [] -s add entry to cache.\n" + msgstr "" + " rarp [] -s pid poloku do cache.\n" + +-#: ../rarp.c:178 ++#: ../rarp.c:179 ++#, c-format + msgid "" + " rarp -f add entries from /etc/ethers.\n" + msgstr "" + " rarp -f pid poloky z /etc/ethers.\n" + +-#: ../rarp.c:179 ++#: ../rarp.c:180 ++#, c-format + msgid "" + " rarp -V display program version.\n" + "\n" +@@ -1279,24 +1266,26 @@ msgstr "" + "programu.\n" + "\n" + +-#: ../rarp.c:236 ++#: ../rarp.c:238 + #, c-format + msgid "%s: illegal option mix.\n" + msgstr "Kombinace pepna %s je nesprvn.\n" + +-#: ../rarp.c:267 ++#: ../rarp.c:269 + #, c-format + msgid "rarp: %s: unknown hardware type.\n" + msgstr "rarp: hardwarov typ %s nen znm.\n" + +-#: ../route.c:79 ++#: ../route.c:80 ++#, c-format + msgid "" + "Usage: route [-nNvee] [-FC] [] List kernel routing tables\n" + msgstr "" + "Pouit: route [-nNvee] [-FC] [] Zobraz smrovac tabulky v " + "jdru\n" + +-#: ../route.c:80 ++#: ../route.c:81 ++#, c-format + msgid "" + " route [-v] [-FC] {add|del|flush} ... Modify routing table for AF.\n" + "\n" +@@ -1305,14 +1294,16 @@ msgstr "" + "AF.\n" + "\n" + +-#: ../route.c:82 ++#: ../route.c:83 ++#, c-format + msgid "" + " route {-h|--help} [] Detailed usage syntax for " + "specified AF.\n" + msgstr "" + " route {-h|--help [] Npovda pro pouit s AF.\n" + +-#: ../route.c:83 ++#: ../route.c:84 ++#, c-format + msgid "" + " route {-V|--version} Display version/author and " + "exit.\n" +@@ -1321,15 +1312,23 @@ msgstr "" + " route {-V|--version} Vype oznaen verze a autora\n" + " programu.\n" + ++#: ../route.c:92 ++#, fuzzy, c-format ++msgid " =Use '-A ' or '--'; default: %s\n" ++msgstr " =Pouijte '-A ' or '--' Implicitn: %s\n" ++ + #: ../plipconfig.c:66 ++#, c-format + msgid "Usage: plipconfig [-a] [-i] [-v] interface\n" + msgstr "Pouit: plipconfig [-a] [-i] [-v] rozhran\n" + + #: ../plipconfig.c:67 ++#, c-format + msgid " [nibble NN] [trigger NN]\n" + msgstr " [nibble NN] [trigger NN]\n" + + #: ../plipconfig.c:68 ++#, c-format + msgid " plipconfig -V | --version\n" + msgstr " plipconfig -V | --version\n" + +@@ -1338,25 +1337,30 @@ msgstr " plipconfig -V | --version + msgid "%s\tnibble %lu trigger %lu\n" + msgstr "%s\tnibble %lu trigger %lu\n" + +-#: ../iptunnel.c:79 ++#: ../iptunnel.c:85 ++#, c-format + msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n" + msgstr "Pouit: iptunnel { add | change | del | show } [ JMNO ]\n" + +-#: ../iptunnel.c:80 ++#: ../iptunnel.c:86 ++#, c-format + msgid "" + " [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n" + msgstr "" + " [ mode { ipip | gre | sit } ] [ vzdlen ADR ] [ mstn ADR ]\n" + +-#: ../iptunnel.c:81 ++#: ../iptunnel.c:87 ++#, c-format + msgid " [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n" + msgstr " [ [i|o]seq ] [ [i|o]key KL ] [ [i|o]csum ]\n" + +-#: ../iptunnel.c:82 ++#: ../iptunnel.c:88 ++#, c-format + msgid " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n" + msgstr " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev ZAZEN ]\n" + +-#: ../iptunnel.c:83 ++#: ../iptunnel.c:89 ++#, c-format + msgid "" + " iptunnel -V | --version\n" + "\n" +@@ -1364,450 +1368,737 @@ msgstr "" + " iptunnel -V | --version\n" + "\n" + +-#: ../iptunnel.c:84 ++#: ../iptunnel.c:90 ++#, c-format + msgid "Where: NAME := STRING\n" + msgstr "Kde: JMNO := ETZEC\n" + +-#: ../iptunnel.c:85 ++#: ../iptunnel.c:91 ++#, c-format + msgid " ADDR := { IP_ADDRESS | any }\n" + msgstr " ADR := { IP-ADRESA | any }\n" + +-#: ../iptunnel.c:86 ++#: ../iptunnel.c:92 ++#, c-format + msgid " TOS := { NUMBER | inherit }\n" + msgstr " TOS := { SLO | inherit }\n" + +-#: ../iptunnel.c:87 ++#: ../iptunnel.c:93 ++#, c-format + msgid " TTL := { 1..255 | inherit }\n" + msgstr " TTL := { 1..255 | inherit }\n" + +-#: ../iptunnel.c:88 ++#: ../iptunnel.c:94 ++#, c-format + msgid " KEY := { DOTTED_QUAD | NUMBER }\n" + msgstr " KL := { DOTTED_QUAD | SLO }\n" + +-#: ../iptunnel.c:326 ++#: ../iptunnel.c:332 ++#, c-format + msgid "Keys are not allowed with ipip and sit.\n" + msgstr "S ipip a sit nejsou kle povoleny.\n" + +-#: ../iptunnel.c:346 ++#: ../iptunnel.c:352 ++#, c-format + msgid "Broadcast tunnel requires a source address.\n" + msgstr "Tunel se vesmrovm vyslnm vyaduje zdrojovou adresu.\n" + +-#: ../iptunnel.c:361 ++#: ../iptunnel.c:367 ++#, c-format + msgid "ttl != 0 and noptmudisc are incompatible\n" + msgstr "ttl != 0 a noptmudisc se navzjem vyluuj\n" + +-#: ../iptunnel.c:373 ++#: ../iptunnel.c:379 ++#, c-format + msgid "cannot determine tunnel mode (ipip, gre or sit)\n" + msgstr "reim tunelu (ipip, gre i sit) nelze zjistit\n" + +-#: ../iptunnel.c:411 ++#: ../iptunnel.c:417 + #, c-format + msgid "%s: %s/ip remote %s local %s " + msgstr "%s: %s/ip vzdlen %s mstn %s " + +-#: ../iptunnel.c:415 ++#: ../iptunnel.c:421 + msgid "unknown" + msgstr "Neznm." + +-#: ../iptunnel.c:447 ++#: ../iptunnel.c:453 ++#, c-format + msgid " Drop packets out of sequence.\n" + msgstr " Zahazuje pakety mimo poad.\n" + +-#: ../iptunnel.c:449 ++#: ../iptunnel.c:455 ++#, c-format + msgid " Checksum in received packet is required.\n" + msgstr " Pijman pakety mus mt kontroln souet.\n" + + # ??? +-#: ../iptunnel.c:451 ++#: ../iptunnel.c:457 ++#, c-format + msgid " Sequence packets on output.\n" + msgstr " ad odchoz pakety.\n" + +-#: ../iptunnel.c:453 ++#: ../iptunnel.c:459 ++#, c-format + msgid " Checksum output packets.\n" + msgstr " Odchoz pakety budou mt kontroln souet.\n" + +-#: ../iptunnel.c:481 ++#: ../iptunnel.c:487 ++#, c-format + msgid "Wrong format of /proc/net/dev. Sorry.\n" + msgstr "Lituji, formt /proc/net/dev je chybn.\n" + +-#: ../iptunnel.c:494 ++#: ../iptunnel.c:500 + #, c-format + msgid "Failed to get type of [%s]\n" + msgstr "Typ [%s] se nepodailo zjistit.\n" + +-#: ../iptunnel.c:510 ++#: ../iptunnel.c:516 ++#, c-format + msgid "RX: Packets Bytes Errors CsumErrs OutOfSeq Mcasts\n" + msgstr "RX: Pakety Bajty Chyby CsumChyb MimoPo Mcasts\n" + +-#: ../iptunnel.c:513 ++#: ../iptunnel.c:519 ++#, c-format + msgid "TX: Packets Bytes Errors DeadLoop NoRoute NoBufs\n" + msgstr "TX: Pakety Bajty Chyby DeadLoop NoRoute NoBufs\n" + +-#: ../statistics.c:45 ++#: ../statistics.c:47 + msgid "ICMP input histogram:" + msgstr "histogram ICMP vstupu:" + +-#: ../statistics.c:46 ++#: ../statistics.c:48 + msgid "ICMP output histogram:" + msgstr "histogram ICMP vstupu:" + +-#: ../statistics.c:63 ++#: ../statistics.c:65 + #, c-format + msgid "Forwarding is %s" + msgstr "Pedvn je %s" + +-#: ../statistics.c:64 +-#, c-format +-msgid "Default TTL is %d" ++#: ../statistics.c:66 ++#, fuzzy, c-format ++msgid "Default TTL is %u" + msgstr "Implicitn TTL je %d" + +-#: ../statistics.c:65 +-#, c-format +-msgid "%d total packets received" ++#: ../statistics.c:67 ++#, fuzzy, c-format ++msgid "%u total packets received" + msgstr "celkem pijmutch paket: %d" + +-#: ../statistics.c:66 +-#, c-format +-msgid "%d with invalid headers" ++#: ../statistics.c:68 ++#, fuzzy, c-format ++msgid "%u with invalid headers" + msgstr "s nesprvnmi hlavikami: %d" + +-#: ../statistics.c:67 +-#, c-format +-msgid "%d with invalid addresses" ++#: ../statistics.c:69 ++#, fuzzy, c-format ++msgid "%u with invalid addresses" + msgstr "s nesprvnmi adresami: %d" + +-#: ../statistics.c:68 +-#, c-format +-msgid "%d forwarded" ++#: ../statistics.c:70 ++#, fuzzy, c-format ++msgid "%u forwarded" + msgstr "pedno: %d" + +-#: ../statistics.c:69 +-#, c-format +-msgid "%d with unknown protocol" ++#: ../statistics.c:71 ++#, fuzzy, c-format ++msgid "%u with unknown protocol" + msgstr "s neznmm protokolem: %d" + +-#: ../statistics.c:70 +-#, c-format +-msgid "%d incoming packets discarded" ++#: ../statistics.c:72 ++#, fuzzy, c-format ++msgid "%u incoming packets discarded" + msgstr "poet zahozench pchozch paket: %d" + +-#: ../statistics.c:71 +-#, c-format +-msgid "%d incoming packets delivered" ++#: ../statistics.c:73 ++#, fuzzy, c-format ++msgid "%u incoming packets delivered" + msgstr "poet doruench pchozch paket: %d" + +-#: ../statistics.c:72 +-#, c-format +-msgid "%d requests sent out" ++#: ../statistics.c:74 ++#, fuzzy, c-format ++msgid "%u requests sent out" + msgstr "poet odeslanch poadavk: %d" + + #. ? +-#: ../statistics.c:73 +-#, c-format +-msgid "%d outgoing packets dropped" ++#: ../statistics.c:75 ++#, fuzzy, c-format ++msgid "%u outgoing packets dropped" + msgstr "poet zahozench odchozch paket: %d" + +-#: ../statistics.c:74 +-#, c-format +-msgid "%d dropped because of missing route" ++#: ../statistics.c:76 ++#, fuzzy, c-format ++msgid "%u dropped because of missing route" + msgstr "zahozeno kvli chybjc cest: %d" + +-#: ../statistics.c:75 +-#, c-format +-msgid "%d fragments dropped after timeout" ++#: ../statistics.c:77 ++#, fuzzy, c-format ++msgid "%u fragments dropped after timeout" + msgstr "poet fragment zahozench po vypren asu: %d" + +-#: ../statistics.c:76 +-#, c-format +-msgid "%d reassemblies required" ++#: ../statistics.c:78 ++#, fuzzy, c-format ++msgid "%u reassemblies required" + msgstr "poet nutnch znovusestaven: %d" + + #. ? +-#: ../statistics.c:77 +-#, c-format +-msgid "%d packets reassembled ok" ++#: ../statistics.c:79 ++#, fuzzy, c-format ++msgid "%u packets reassembled ok" + msgstr "poet v podku znovu sestavench paket: %d" + +-#: ../statistics.c:78 +-#, c-format +-msgid "%d packet reassembles failed" ++#: ../statistics.c:80 ++#, fuzzy, c-format ++msgid "%u packet reassembles failed" + msgstr "poet paket, je se nepodailo znovu sestavit: %d" + +-#: ../statistics.c:79 +-#, c-format +-msgid "%d fragments received ok" ++#: ../statistics.c:81 ++#, fuzzy, c-format ++msgid "%u fragments received ok" + msgstr "poet v podku pijmutch fragment: %d" + +-#: ../statistics.c:80 +-#, c-format +-msgid "%d fragments failed" ++#: ../statistics.c:82 ++#, fuzzy, c-format ++msgid "%u fragments failed" + msgstr "poet chybnch fragment: %d" + +-#: ../statistics.c:81 +-#, c-format +-msgid "%d fragments created" ++#: ../statistics.c:83 ++#, fuzzy, c-format ++msgid "%u fragments created" + msgstr "poet vytvoench fragment: %d" + +-#: ../statistics.c:86 +-#, c-format +-msgid "%d ICMP messages received" ++#: ../statistics.c:88 ++#, fuzzy, c-format ++msgid "%u ICMP messages received" + msgstr "poet pijmutch ICMP zprv: %d" + +-#: ../statistics.c:87 +-#, c-format +-msgid "%d input ICMP message failed." ++#: ../statistics.c:89 ++#, fuzzy, c-format ++msgid "%u input ICMP message failed." + msgstr "poet chybnch pchozch ICMP zprv: %d" + +-#: ../statistics.c:88 ../statistics.c:101 +-#, c-format +-msgid "destination unreachable: %d" ++#: ../statistics.c:90 ../statistics.c:103 ++#, fuzzy, c-format ++msgid "destination unreachable: %u" + msgstr "adrest nedostupn: %d" + +-#: ../statistics.c:89 +-#, c-format +-msgid "timeout in transit: %d" ++#: ../statistics.c:91 ++#, fuzzy, c-format ++msgid "timeout in transit: %u" + msgstr "vyprel as pi penosu: %d" + +-#: ../statistics.c:90 ../statistics.c:103 +-#, c-format +-msgid "wrong parameters: %d" ++#: ../statistics.c:92 ../statistics.c:105 ++#, fuzzy, c-format ++msgid "wrong parameters: %u" + msgstr "chybn parametry: %d" + + #. ? +-#: ../statistics.c:91 +-#, c-format +-msgid "source quenchs: %d" ++#: ../statistics.c:93 ++#, fuzzy, c-format ++msgid "source quenches: %u" + msgstr "zen toku dat: %d" + +-#: ../statistics.c:92 +-#, c-format +-msgid "redirects: %d" ++#: ../statistics.c:94 ++#, fuzzy, c-format ++msgid "redirects: %u" + msgstr "zmna cesty: %d" + +-#: ../statistics.c:93 +-#, c-format +-msgid "echo requests: %d" ++#: ../statistics.c:95 ++#, fuzzy, c-format ++msgid "echo requests: %u" + msgstr "dost o echo: %d" + +-#: ../statistics.c:94 ../statistics.c:107 +-#, c-format +-msgid "echo replies: %d" ++#: ../statistics.c:96 ../statistics.c:109 ++#, fuzzy, c-format ++msgid "echo replies: %u" + msgstr "odpov na dost o echo: %d" + +-#: ../statistics.c:95 +-#, c-format +-msgid "timestamp request: %d" ++#: ../statistics.c:97 ++#, fuzzy, c-format ++msgid "timestamp request: %u" + msgstr "dost o as: %d" + +-#: ../statistics.c:96 +-#, c-format +-msgid "timestamp reply: %d" ++#: ../statistics.c:98 ++#, fuzzy, c-format ++msgid "timestamp reply: %u" + msgstr "odpov na dost o as: %d" + +-#: ../statistics.c:97 +-#, c-format +-msgid "address mask request: %d" ++#: ../statistics.c:99 ++#, fuzzy, c-format ++msgid "address mask request: %u" + msgstr "dost o masku podst: %d" + + #. ? +-#: ../statistics.c:98 +-msgid "address mask replies" +-msgstr "odpovdi na dost o masku podst" ++#: ../statistics.c:100 ../statistics.c:113 ++#, fuzzy, c-format ++msgid "address mask replies: %u" ++msgstr "odpov na dost o masku podst: %d" + + #. ? +-#: ../statistics.c:99 +-#, c-format +-msgid "%d ICMP messages sent" ++#: ../statistics.c:101 ++#, fuzzy, c-format ++msgid "%u ICMP messages sent" + msgstr "poet odeslanch ICMP zprv: %d" + +-#: ../statistics.c:100 +-#, c-format +-msgid "%d ICMP messages failed" ++#: ../statistics.c:102 ++#, fuzzy, c-format ++msgid "%u ICMP messages failed" + msgstr "poet chybnch ICMP zprv: %d" + +-#: ../statistics.c:102 +-#, c-format +-msgid "time exceeded: %d" ++#: ../statistics.c:104 ++#, fuzzy, c-format ++msgid "time exceeded: %u" + msgstr "vypren ivotnosti: %d" + + #. ? +-#: ../statistics.c:104 +-#, c-format +-msgid "source quench: %d" ++#: ../statistics.c:106 ++#, fuzzy, c-format ++msgid "source quench: %u" + msgstr "zen toku dat: %d" + +-#: ../statistics.c:105 +-#, c-format +-msgid "redirect: %d" ++#: ../statistics.c:107 ++#, fuzzy, c-format ++msgid "redirect: %u" + msgstr "zmna cesty: %d" + +-#: ../statistics.c:106 +-#, c-format +-msgid "echo request: %d" ++#: ../statistics.c:108 ++#, fuzzy, c-format ++msgid "echo request: %u" + msgstr "dost o echo: %d" + +-#: ../statistics.c:108 +-#, c-format +-msgid "timestamp requests: %d" ++#: ../statistics.c:110 ++#, fuzzy, c-format ++msgid "timestamp requests: %u" + msgstr "dost o as: %d" + +-#: ../statistics.c:109 +-#, c-format +-msgid "timestamp replies: %d" ++#: ../statistics.c:111 ++#, fuzzy, c-format ++msgid "timestamp replies: %u" + msgstr "odpov na dost o as: %d" + +-#: ../statistics.c:110 +-#, c-format +-msgid "address mask requests: %d" ++#: ../statistics.c:112 ++#, fuzzy, c-format ++msgid "address mask requests: %u" + msgstr "dost o masku podst: %d" + +-#: ../statistics.c:111 +-#, c-format +-msgid "address mask replies: %d" +-msgstr "odpov na dost o masku podst: %d" +- +-#: ../statistics.c:116 ++#: ../statistics.c:118 + #, c-format + msgid "RTO algorithm is %s" + msgstr "RTO algoritmus je %s" + +-#: ../statistics.c:120 +-#, c-format +-msgid "%d active connections openings" ++#: ../statistics.c:122 ++#, fuzzy, c-format ++msgid "%u active connections openings" + msgstr "poet aktivn navzanch spojen: %d" + +-#: ../statistics.c:121 +-#, c-format +-msgid "%d passive connection openings" ++#: ../statistics.c:123 ++#, fuzzy, c-format ++msgid "%u passive connection openings" + msgstr "poet pasivn navzanch spojen: %d" + +-#: ../statistics.c:122 +-#, c-format +-msgid "%d failed connection attempts" ++#: ../statistics.c:124 ++#, fuzzy, c-format ++msgid "%u failed connection attempts" + msgstr "poet nespnch pokus o spojen: %d" + +-#: ../statistics.c:123 +-#, c-format +-msgid "%d connection resets received" ++#: ../statistics.c:125 ++#, fuzzy, c-format ++msgid "%u connection resets received" + msgstr "poet pijmutch reset: %d" + +-#: ../statistics.c:124 +-#, c-format +-msgid "%d connections established" ++#: ../statistics.c:126 ++#, fuzzy, c-format ++msgid "%u connections established" + msgstr "poet navzanch spojen: %d" + +-#: ../statistics.c:125 +-#, c-format +-msgid "%d segments received" ++#: ../statistics.c:127 ++#, fuzzy, c-format ++msgid "%u segments received" + msgstr "poet pijmutch segment: %d" + +-#: ../statistics.c:126 +-#, c-format +-msgid "%d segments send out" ++#: ../statistics.c:128 ++#, fuzzy, c-format ++msgid "%u segments send out" + msgstr "poet odeslanch segment: %d" + +-#: ../statistics.c:127 +-#, c-format +-msgid "%d segments retransmited" ++#: ../statistics.c:129 ++#, fuzzy, c-format ++msgid "%u segments retransmited" + msgstr "poet penesench segment: %d" + +-#: ../statistics.c:128 +-#, c-format +-msgid "%d bad segments received." ++#: ../statistics.c:130 ++#, fuzzy, c-format ++msgid "%u bad segments received." + msgstr "poet chybnch pchozch segment: %d." + +-#: ../statistics.c:129 +-#, c-format +-msgid "%d resets sent" ++#: ../statistics.c:131 ++#, fuzzy, c-format ++msgid "%u resets sent" + msgstr "poet odeslanch reset: %d" + +-#: ../statistics.c:134 +-#, c-format +-msgid "%d packets received" ++#: ../statistics.c:136 ++#, fuzzy, c-format ++msgid "%u packets received" + msgstr "poet pijmutch paket: %d" + +-#: ../statistics.c:135 +-#, c-format +-msgid "%d packets to unknown port received." ++#: ../statistics.c:137 ++#, fuzzy, c-format ++msgid "%u packets to unknown port received." + msgstr "poet paket pijmutch pro neznm port: %d." + +-#: ../statistics.c:136 +-#, c-format +-msgid "%d packet receive errors" ++#: ../statistics.c:138 ++#, fuzzy, c-format ++msgid "%u packet receive errors" + msgstr "poet chyb pi pjmu paket: %d" + +-#: ../statistics.c:137 +-#, c-format +-msgid "%d packets sent" ++#: ../statistics.c:139 ++#, fuzzy, c-format ++msgid "%u packets sent" + msgstr "poet odeslanch paket: %d" + +-#: ../statistics.c:142 +-#, c-format +-msgid "%d SYN cookies sent" ++#: ../statistics.c:144 ++#, fuzzy, c-format ++msgid "%u SYN cookies sent" + msgstr "poet odeslanch SYN cookies: %d" + +-#: ../statistics.c:143 +-#, c-format +-msgid "%d SYN cookies received" ++#: ../statistics.c:145 ++#, fuzzy, c-format ++msgid "%u SYN cookies received" + msgstr "poet pijmutch SYN cookies: %d" + +-#: ../statistics.c:144 +-#, c-format +-msgid "%d invalid SYN cookies received" ++#: ../statistics.c:146 ++#, fuzzy, c-format ++msgid "%u invalid SYN cookies received" + msgstr "poet chybnch pchozch SYN cookies: %d" + +-#: ../statistics.c:146 +-#, c-format +-msgid "%d resets received for embryonic SYN_RECV sockets" ++#: ../statistics.c:148 ++#, fuzzy, c-format ++msgid "%u resets received for embryonic SYN_RECV sockets" + msgstr "poet reset pijmutch pro sokety ve stavu SYN_PCH: %d" + +-#: ../statistics.c:148 +-#, c-format +-msgid "%d packets pruned from receive queue because of socket buffer overrun" ++#: ../statistics.c:150 ++#, fuzzy, c-format ++msgid "%u packets pruned from receive queue because of socket buffer overrun" + msgstr "poet paket odstrannch z fronty kvli peteen bufferu soketu: %d" + + #. obsolete: 2.2.0 doesn't do that anymore +-#: ../statistics.c:151 +-#, c-format +-msgid "%d packets pruned from out-of-order queue" ++#: ../statistics.c:153 ++#, fuzzy, c-format ++msgid "%u packets pruned from receive queue" + msgstr "poet paket odstrannch z fronty mimo-poad: %d" + +-#: ../statistics.c:152 +-#, c-format ++#: ../statistics.c:154 ++#, fuzzy, c-format + msgid "" +-"%d packets dropped from out-of-order queue because of socket buffer overrun" ++"%u packets dropped from out-of-order queue because of socket buffer overrun" + msgstr "" + "poet paket zahozench z fronty mimo-poad kvli peteen bufferu soketu: " + "%d" + +-#: ../statistics.c:154 +-#, c-format +-msgid "%d ICMP packets dropped because they were out-of-window" ++#: ../statistics.c:156 ++#, fuzzy, c-format ++msgid "%u ICMP packets dropped because they were out-of-window" + msgstr "poet ICMP paket zahozench, protoe byly mimo-okno: %d" + +-#: ../statistics.c:156 +-#, c-format +-msgid "%d ICMP packets dropped because socket was locked" ++#: ../statistics.c:158 ++#, fuzzy, c-format ++msgid "%u ICMP packets dropped because socket was locked" + msgstr "poet ICMP paket zahozench kvli zamenmu soketu: %d" + ++#: ../statistics.c:160 ++#, c-format ++msgid "%u TCP sockets finished time wait in fast timer" ++msgstr "" ++ ++#: ../statistics.c:161 ++#, c-format ++msgid "%u time wait sockets recycled by time stamp" ++msgstr "" ++ ++#: ../statistics.c:162 ++#, c-format ++msgid "%u TCP sockets finished time wait in slow timer" ++msgstr "" ++ ++#: ../statistics.c:163 ++#, c-format ++msgid "%u passive connections rejected because of time stamp" ++msgstr "" ++ ++#: ../statistics.c:165 ++#, c-format ++msgid "%u active connections rejected because of time stamp" ++msgstr "" ++ ++#: ../statistics.c:167 ++#, c-format ++msgid "%u packets rejects in established connections because of timestamp" ++msgstr "" ++ ++#: ../statistics.c:169 ++#, fuzzy, c-format ++msgid "%u delayed acks sent" ++msgstr "poet odeslanch paket: %d" ++ ++#: ../statistics.c:170 ++#, c-format ++msgid "%u delayed acks further delayed because of locked socket" ++msgstr "" ++ ++#: ../statistics.c:172 ++#, c-format ++msgid "Quick ack mode was activated %u times" ++msgstr "" ++ ++#: ../statistics.c:173 ++#, c-format ++msgid "%u times the listen queue of a socket overflowed" ++msgstr "" ++ ++#: ../statistics.c:175 ++#, c-format ++msgid "%u SYNs to LISTEN sockets ignored" ++msgstr "" ++ ++#: ../statistics.c:176 ++#, c-format ++msgid "%u packets directly queued to recvmsg prequeue." ++msgstr "" ++ ++#: ../statistics.c:178 ++#, c-format ++msgid "%u of bytes directly received from backlog" ++msgstr "" ++ ++#: ../statistics.c:180 ++#, c-format ++msgid "%u of bytes directly received from prequeue" ++msgstr "" ++ ++#: ../statistics.c:182 ++#, fuzzy, c-format ++msgid "%u packets dropped from prequeue" ++msgstr "poet paket odstrannch z fronty mimo-poad: %d" ++ ++#: ../statistics.c:183 ++#, fuzzy, c-format ++msgid "%u packet headers predicted" ++msgstr "poet pijmutch paket: %d" ++ ++#: ../statistics.c:184 ++#, c-format ++msgid "%u packets header predicted and directly queued to user" ++msgstr "" ++ ++#: ../statistics.c:186 ++#, c-format ++msgid "Ran %u times out of system memory during packet sending" ++msgstr "" ++ ++#: ../statistics.c:188 ++#, fuzzy, c-format ++msgid "%u acknowledgments not containing data received" ++msgstr "poet paket pijmutch pro neznm port: %d." ++ ++#: ../statistics.c:189 ++#, c-format ++msgid "%u predicted acknowledgments" ++msgstr "" ++ ++#: ../statistics.c:190 ++#, c-format ++msgid "%u times recovered from packet loss due to fast retransmit" ++msgstr "" ++ ++#: ../statistics.c:191 ++#, c-format ++msgid "%u times recovered from packet loss due to SACK data" ++msgstr "" ++ ++#: ../statistics.c:192 ++#, fuzzy, c-format ++msgid "%u bad SACKs received" ++msgstr "poet chybnch pchozch segment: %d." ++ ++#: ../statistics.c:193 ++#, c-format ++msgid "Detected reordering %u times using FACK" ++msgstr "" ++ ++#: ../statistics.c:194 ++#, c-format ++msgid "Detected reordering %u times using SACK" ++msgstr "" ++ ++#: ../statistics.c:195 ++#, c-format ++msgid "Detected reordering %u times using time stamp" ++msgstr "" ++ ++#: ../statistics.c:196 ++#, c-format ++msgid "Detected reordering %u times using reno fast retransmit" ++msgstr "" ++ ++#: ../statistics.c:197 ++#, c-format ++msgid "%u congestion windows fully recovered" ++msgstr "" ++ ++#: ../statistics.c:198 ++#, c-format ++msgid "%u congestion windows partially recovered using Hoe heuristic" ++msgstr "" ++ ++#: ../statistics.c:199 ++#, c-format ++msgid "%u congestion window recovered using DSACK" ++msgstr "" ++ ++#: ../statistics.c:200 ++#, c-format ++msgid "%u congestion windows recovered after partial ack" ++msgstr "" ++ ++#: ../statistics.c:201 ++#, fuzzy, c-format ++msgid "%u retransmits lost" ++msgstr "poet odeslanch reset: %d" ++ ++#: ../statistics.c:202 ++#, c-format ++msgid "%u timeouts after reno fast retransmit" ++msgstr "" ++ ++#: ../statistics.c:203 ++#, c-format ++msgid "%u timeouts after SACK recovery" ++msgstr "" ++ ++#: ../statistics.c:204 ++#, c-format ++msgid "%u timeouts in loss state" ++msgstr "" ++ ++#: ../statistics.c:205 ++#, fuzzy, c-format ++msgid "%u fast retransmits" ++msgstr "poet penesench segment: %d" ++ ++#: ../statistics.c:206 ++#, c-format ++msgid "%u forward retransmits" ++msgstr "" ++ ++#: ../statistics.c:207 ++#, c-format ++msgid "%u retransmits in slow start" ++msgstr "" ++ ++#: ../statistics.c:208 ++#, c-format ++msgid "%u other TCP timeouts" ++msgstr "" ++ ++#: ../statistics.c:209 ++#, fuzzy, c-format ++msgid "%u reno fast retransmits failed" ++msgstr "poet penesench segment: %d" ++ ++#: ../statistics.c:210 ++#, fuzzy, c-format ++msgid "%u sack retransmits failed" ++msgstr "poet paket, je se nepodailo znovu sestavit: %d" ++ ++#: ../statistics.c:211 ++#, c-format ++msgid "%u times receiver scheduled too late for direct processing" ++msgstr "" ++ ++#: ../statistics.c:212 ++#, fuzzy, c-format ++msgid "%u packets collapsed in receive queue due to low socket buffer" ++msgstr "poet paket odstrannch z fronty kvli peteen bufferu soketu: %d" ++ ++#: ../statistics.c:213 ++#, c-format ++msgid "%u DSACKs sent for old packets" ++msgstr "" ++ ++#: ../statistics.c:214 ++#, c-format ++msgid "%u DSACKs sent for out of order packets" ++msgstr "" ++ ++#: ../statistics.c:215 ++#, fuzzy, c-format ++msgid "%u DSACKs received" ++msgstr "poet pijmutch paket: %d" ++ ++#: ../statistics.c:216 ++#, fuzzy, c-format ++msgid "%u DSACKs for out of order packets received" ++msgstr "celkem pijmutch paket: %d" ++ ++#: ../statistics.c:217 ++#, fuzzy, c-format ++msgid "%u connections reset due to unexpected SYN" ++msgstr "poet pijmutch reset: %d" ++ ++#: ../statistics.c:218 ++#, fuzzy, c-format ++msgid "%u connections reset due to unexpected data" ++msgstr "poet pijmutch reset: %d" ++ ++#: ../statistics.c:219 ++#, fuzzy, c-format ++msgid "%u connections reset due to early user close" ++msgstr "poet pijmutch reset: %d" ++ ++#: ../statistics.c:220 ++#, c-format ++msgid "%u connections aborted due to memory pressure" ++msgstr "" ++ ++#: ../statistics.c:221 ++#, fuzzy, c-format ++msgid "%u connections aborted due to timeout" ++msgstr "poet pijmutch reset: %d" ++ + #: ../statistics.c:222 ++#, c-format ++msgid "%u connections aborted after user close in linger timeout" ++msgstr "" ++ ++#: ../statistics.c:223 ++#, c-format ++msgid "%u times unabled to send RST due to no memory" ++msgstr "" ++ ++#: ../statistics.c:224 ++#, c-format ++msgid "TCP ran low on memory %u times" ++msgstr "" ++ ++#: ../statistics.c:225 ++#, c-format ++msgid "%u TCP data loss events" ++msgstr "" ++ ++#: ../statistics.c:292 + msgid "enabled" + msgstr "zapnuto" + +-#: ../statistics.c:222 ++#: ../statistics.c:292 + msgid "disabled" + msgstr "vypnuto" + +-#: ../statistics.c:272 +-#, c-format +-msgid "unknown title %s\n" +-msgstr "titulek %s je neznm\n" +- +-#: ../statistics.c:298 ++#: ../statistics.c:375 + msgid "error parsing /proc/net/snmp" + msgstr "chyba pi zpracovn /proc/net/snmp" + +-#: ../statistics.c:311 ++#: ../statistics.c:388 + msgid "cannot open /proc/net/snmp" + msgstr "/proc/net/snmp nelze otevt" + +@@ -1821,89 +2112,95 @@ msgstr "Hardwarov typ `%s' nen podporo + msgid "Cannot change line discipline to `%s'.\n" + msgstr "Linkovou disciplnu nelze na `%s' zmnit.\n" + +-#: ../lib/af.c:145 ../lib/hw.c:148 ++#: ../lib/af.c:153 ../lib/hw.c:161 + msgid "UNSPEC" + msgstr "NEZNM" + +-#: ../lib/af.c:147 ++#: ../lib/af.c:155 + msgid "UNIX Domain" + msgstr "Domna UNIX" + +-#: ../lib/af.c:150 ++#: ../lib/af.c:158 + msgid "DARPA Internet" + msgstr "DARPA Internet" + +-#: ../lib/af.c:153 ++#: ../lib/af.c:161 + msgid "IPv6" + msgstr "IPv6" + +-#: ../lib/af.c:156 ../lib/hw.c:169 ++#: ../lib/af.c:164 ../lib/hw.c:182 + msgid "AMPR AX.25" + msgstr "AMPR AX.25" + +-#: ../lib/af.c:159 ../lib/hw.c:175 ++#: ../lib/af.c:167 ../lib/hw.c:188 + msgid "AMPR NET/ROM" + msgstr "AMPR NET/ROM" + +-#: ../lib/af.c:162 ++#: ../lib/af.c:170 + msgid "Novell IPX" + msgstr "Novell IPX" + +-#: ../lib/af.c:165 ++#: ../lib/af.c:173 + msgid "Appletalk DDP" + msgstr "Appletalk DDP" + +-#: ../lib/af.c:168 ../lib/hw.c:207 ++#: ../lib/af.c:176 ../lib/hw.c:223 + msgid "Econet" + msgstr "Econet" + +-#: ../lib/af.c:171 ../lib/hw.c:172 ++#: ../lib/af.c:179 ++msgid "CCITT X.25" ++msgstr "" ++ ++#: ../lib/af.c:182 ../lib/hw.c:185 + msgid "AMPR ROSE" + msgstr "AMPR ROSE" + +-#: ../lib/af.c:174 ../lib/hw.c:160 ++#: ../lib/af.c:185 ../lib/hw.c:173 + msgid "Ash" + msgstr "Ash" + +-#: ../lib/af.c:232 ++#: ../lib/af.c:243 ++#, c-format + msgid "Please don't supply more than one address family.\n" + msgstr "Nezadvejte vce ne jednu tdu adres.\n" + +-#: ../lib/af.c:293 ++#: ../lib/af.c:304 ++#, c-format + msgid "Too much address family arguments.\n" + msgstr "Bylo zadno pli mnoho td adres.\n" + +-#: ../lib/af.c:304 ++#: ../lib/af.c:315 + #, c-format + msgid "Unknown address family `%s'.\n" + msgstr "Tda adres `%s' nen znma.\n" + +-#: ../lib/arcnet.c:53 ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 +-#: ../lib/fddi.c:67 ../lib/hippi.c:68 ../lib/inet.c:244 ../lib/inet.c:259 +-#: ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 ../lib/rose.c:71 +-#: ../lib/rose.c:126 ../lib/unix.c:56 ../lib/unix.c:76 +-msgid "[NONE SET]" +-msgstr "[NENASTAVENO]" +- +-#: ../lib/arcnet.c:81 ../lib/arcnet.c:96 ++#: ../lib/arcnet.c:70 ../lib/arcnet.c:85 + #, c-format + msgid "in_arcnet(%s): invalid arcnet address!\n" + msgstr "in_arcnet(%s): chybn arcnet adresa!\n" + +-#: ../lib/arcnet.c:108 ++#: ../lib/arcnet.c:97 + #, c-format + msgid "in_arcnet(%s): trailing : ignored!\n" + msgstr "in_arcnet(%s): nadbyten : ignorovno!\n" + +-#: ../lib/arcnet.c:120 ++#: ../lib/arcnet.c:109 + #, c-format + msgid "in_arcnet(%s): trailing junk!\n" + msgstr "in_arcnet(%s): nadbyten znaky!\n" + + #: ../lib/ash.c:81 ++#, c-format + msgid "Malformed Ash address" + msgstr "Chybn Ash adresa" + ++#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244 ++#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 ++#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76 ++msgid "[NONE SET]" ++msgstr "[NENASTAVENO]" ++ + #: ../lib/ax25.c:97 ../lib/netrom.c:100 + msgid "Invalid callsign" + msgstr "Nesprvn volac znak" +@@ -1913,22 +2210,21 @@ msgid "Callsign too long" + msgstr "Volac znak je pli dlouh." + + #: ../lib/ax25_gr.c:47 ++#, c-format + msgid "AX.25 not configured in this system.\n" + msgstr "AX.25 nen na tomto systmu nakonfigurovno.\n" + + #: ../lib/ax25_gr.c:50 ++#, c-format + msgid "Kernel AX.25 routing table\n" + msgstr "Smrovac tabulka v jdru pro AX.25\n" + + #. xxx + #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55 ++#, c-format + msgid "Destination Iface Use\n" + msgstr "Adrest Rozhran Uit\n" + +-#: ../lib/ddp_gr.c:21 +-msgid "Routing table for `ddp' not yet supported.\n" +-msgstr "Smrovac tabulka pro `ddp' nen zatm podporovna.\n" +- + #: ../lib/ether.c:74 ../lib/ether.c:91 + #, c-format + msgid "in_ether(%s): invalid ether address!\n" +@@ -1944,153 +2240,171 @@ msgstr "in_ether(%s): nadbyten : ignor + msgid "in_ether(%s): trailing junk!\n" + msgstr "in_ether(%s): nadbyten znaky!\n" + +-#: ../lib/fddi.c:95 ../lib/fddi.c:110 ++#: ../lib/fddi.c:84 ../lib/fddi.c:99 + #, c-format + msgid "in_fddi(%s): invalid fddi address!\n" + msgstr "in_fddi(%s): chybn fddi adresa!\n" + +-#: ../lib/fddi.c:122 ++#: ../lib/fddi.c:111 + #, c-format + msgid "in_fddi(%s): trailing : ignored!\n" + msgstr "in_fddi(%s): nadbyten : ignorovno!\n" + +-#: ../lib/fddi.c:134 ++#: ../lib/fddi.c:123 + #, c-format + msgid "in_fddi(%s): trailing junk!\n" + msgstr "in_fddi(%s): nadbyten znaky!\n" + +-#: ../lib/getroute.c:97 ../lib/setroute.c:76 ++#: ../lib/getroute.c:101 ../lib/setroute.c:80 + #, c-format + msgid "Address family `%s' not supported.\n" + msgstr "Tda adres `%s' nen podporovna.\n" + +-#: ../lib/getroute.c:103 ../lib/setroute.c:80 ++#: ../lib/getroute.c:107 ../lib/setroute.c:84 + #, c-format + msgid "No routing for address family `%s'.\n" + msgstr "Pro tdu adres `%s' nen dn smrovn.\n" + +-#: ../lib/hippi.c:96 ../lib/hippi.c:111 ++#: ../lib/hippi.c:84 ../lib/hippi.c:99 + #, c-format + msgid "in_hippi(%s): invalid hippi address!\n" + msgstr "in_hippi(%s): chybn hippi adresa!\n" + +-#: ../lib/hippi.c:123 ++#: ../lib/hippi.c:111 + #, c-format + msgid "in_hippi(%s): trailing : ignored!\n" + msgstr "in_hippi(%s): nadbyten : ignorovno!\n" + +-#: ../lib/hippi.c:134 ++#: ../lib/hippi.c:122 + #, c-format + msgid "in_hippi(%s): trailing junk!\n" + msgstr "in_hippi(%s): nadbyten znaky!\n" + +-#: ../lib/hw.c:147 ++#: ../lib/hw.c:160 + msgid "Local Loopback" + msgstr "Mstn smyka" + +-#: ../lib/hw.c:150 ++#: ../lib/hw.c:163 + msgid "Serial Line IP" + msgstr "IP po sriov lince" + +-#: ../lib/hw.c:151 ++#: ../lib/hw.c:164 + msgid "VJ Serial Line IP" + msgstr "Vj IP po sriov lince" + +-#: ../lib/hw.c:152 ++#: ../lib/hw.c:165 + msgid "6-bit Serial Line IP" + msgstr "6bitov IP po sriov lince" + +-#: ../lib/hw.c:153 ++#: ../lib/hw.c:166 + msgid "VJ 6-bit Serial Line IP" + msgstr "6bitov VJ IP po sriov lince" + +-#: ../lib/hw.c:154 ++#: ../lib/hw.c:167 + msgid "Adaptive Serial Line IP" + msgstr "Adaptivn IP po sriov lince" + +-#: ../lib/hw.c:157 ++#: ../lib/hw.c:170 + msgid "Ethernet" + msgstr "Ethernet" + +-#: ../lib/hw.c:163 ++#: ../lib/hw.c:176 + msgid "Fiber Distributed Data Interface" + msgstr "Fiber Distributed Data Interface" + +-#: ../lib/hw.c:166 ++#: ../lib/hw.c:179 + msgid "HIPPI" + msgstr "HIPPI" + +-#: ../lib/hw.c:178 ++#: ../lib/hw.c:191 ++msgid "generic X.25" ++msgstr "" ++ ++#: ../lib/hw.c:194 + msgid "IPIP Tunnel" + msgstr "IPIP Tunnel" + +-#: ../lib/hw.c:181 ++#: ../lib/hw.c:197 + msgid "Point-to-Point Protocol" + msgstr "Point-to-Point Protokol" + +-#: ../lib/hw.c:184 ++#: ../lib/hw.c:200 + msgid "(Cisco)-HDLC" + msgstr "(Cisco)-HDLC" + +-#: ../lib/hw.c:185 ++#: ../lib/hw.c:201 + msgid "LAPB" + msgstr "LAPB" + +-#: ../lib/hw.c:188 ++#: ../lib/hw.c:204 + msgid "ARCnet" + msgstr "ARCnet" + +-#: ../lib/hw.c:191 ++#: ../lib/hw.c:207 + msgid "Frame Relay DLCI" + msgstr "Frame Relay DLCI" + +-#: ../lib/hw.c:192 ++#: ../lib/hw.c:208 + msgid "Frame Relay Access Device" + msgstr "Pstupov zazen Frame Relay" + +-#: ../lib/hw.c:195 ++#: ../lib/hw.c:211 + msgid "IPv6-in-IPv4" + msgstr "IPv6-in-IPv4" + +-#: ../lib/hw.c:198 ++#: ../lib/hw.c:214 + msgid "IrLAP" + msgstr "IrLAP" + +-#: ../lib/hw.c:201 ++#: ../lib/hw.c:217 + msgid "16/4 Mbps Token Ring" + msgstr "Token Ring 16/4 Mb/s" + +-#: ../lib/hw.c:203 ++#: ../lib/hw.c:219 + #, fuzzy + msgid "16/4 Mbps Token Ring (New)" + msgstr "Token Ring 16/4 Mb/s" + ++#: ../lib/hw.c:226 ++msgid "Generic EUI-64" ++msgstr "" ++ + #: ../lib/inet.c:153 ../lib/inet6.c:79 + #, c-format + msgid "rresolve: unsupport address family %d !\n" + msgstr "rresolve: tda adres %d nen podporovna!\n" + +-#: ../lib/inet6_gr.c:79 ++#: ../lib/inet6.c:131 ++#, fuzzy ++msgid "[UNKNOWN]" ++msgstr "NEZNM" ++ ++#: ../lib/inet6_gr.c:71 ++#, c-format + msgid "INET6 (IPv6) not configured in this system.\n" + msgstr "INET6 (IPv6) nen na tomto systmu nakonfigurovno.\n" + +-#: ../lib/inet6_gr.c:82 ++#: ../lib/inet6_gr.c:74 ++#, c-format + msgid "Kernel IPv6 routing table\n" + msgstr "Smrovac tabulka v jdru pro IPv6\n" + +-#: ../lib/inet6_gr.c:84 ++#: ../lib/inet6_gr.c:76 ++#, c-format + msgid "" +-"Destination Next Hop " +-" Flags Metric Ref Use Iface\n" ++"Destination Next " ++"Hop Flags Metric Ref Use Iface\n" + msgstr "" +-"Adrest Dal Smrova " +-" Pzn Metrika Odkaz Uit Rozhran\n" ++"Adrest Dal " ++"Smrova Pzn Metrika Odkaz Uit Rozhran\n" + +-#: ../lib/inet6_gr.c:158 ++#: ../lib/inet6_gr.c:150 ++#, c-format + msgid "Kernel IPv6 Neighbour Cache\n" + msgstr "Cache soused v jdru pro IPv6\n" + +-#: ../lib/inet6_gr.c:161 ++#: ../lib/inet6_gr.c:153 ++#, c-format + msgid "" + "Neighbour HW Address Iface Flags " + "Ref State\n" +@@ -2098,7 +2412,8 @@ msgstr "" + "Soused HW Adresa Rozhran Pzn " + "Odkazy Stav\n" + +-#: ../lib/inet6_gr.c:165 ++#: ../lib/inet6_gr.c:157 ++#, c-format + msgid "" + "Neighbour HW Address Iface Flags " + "Ref State Stale(sec) Delete(sec)\n" +@@ -2107,30 +2422,37 @@ msgstr "" + "Pznaky Odkazy Stav Prol(sec) Smazat(sec)\n" + + #: ../lib/inet6_sr.c:46 ++#, c-format + msgid "Usage: inet6_route [-vF] del Target\n" + msgstr "Pouit: inet6_route [-vF] del Cl\n" + + #: ../lib/inet6_sr.c:47 ++#, c-format + msgid " inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n" + msgstr " inet6_route [-vF] add Cl [gw Gw] [metrika M] [[dev] If]\n" + + #: ../lib/inet6_sr.c:48 ++#, c-format + msgid " inet6_route [-FC] flush NOT supported\n" + msgstr " inet6_route [-FC] flush NEN podporovno\n" + +-#: ../lib/inet6_sr.c:182 ++#: ../lib/inet6_sr.c:188 ++#, c-format + msgid "Flushing `inet6' routing table not supported\n" + msgstr "Smrovac tabulku `inet6' nelze vyprazdovat\n" + + #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220 ++#, c-format + msgid "INET (IPv4) not configured in this system.\n" + msgstr "INET (IPv4) nen na tomto systmu nakonfigurovno.\n" + + #: ../lib/inet_gr.c:53 ++#, c-format + msgid "Kernel IP routing table\n" + msgstr "Smrovac tabulka v jdru pro IP\n" + + #: ../lib/inet_gr.c:56 ++#, c-format + msgid "" + "Destination Gateway Genmask Flags Metric Ref Use " + "Iface\n" +@@ -2139,6 +2461,7 @@ msgstr "" + "Rozhran\n" + + #: ../lib/inet_gr.c:59 ++#, c-format + msgid "" + "Destination Gateway Genmask Flags MSS Window irtt " + "Iface\n" +@@ -2147,6 +2470,7 @@ msgstr "" + "Rozhran\n" + + #: ../lib/inet_gr.c:62 ++#, c-format + msgid "" + "Destination Gateway Genmask Flags Metric Ref Use " + "Iface MSS Window irtt\n" +@@ -2155,10 +2479,12 @@ msgstr "" + "Rozhran MSS Okno irtt\n" + + #: ../lib/inet_gr.c:237 ++#, c-format + msgid "Kernel IP routing cache\n" + msgstr "Smrovac cache v jdru pro IP\n" + + #: ../lib/inet_gr.c:258 ++#, c-format + msgid "" + "Source Destination Gateway Flags Metric Ref Use " + "Iface\n" +@@ -2167,6 +2493,7 @@ msgstr "" + "Rozhran\n" + + #: ../lib/inet_gr.c:261 ++#, c-format + msgid "" + "Source Destination Gateway Flags MSS Window irtt " + "Iface\n" +@@ -2175,6 +2502,7 @@ msgstr "" + "Rozhran\n" + + #: ../lib/inet_gr.c:266 ++#, c-format + msgid "" + "Source Destination Gateway Flags Metric Ref Use " + "Iface MSS Window irtt HH Arp\n" +@@ -2183,6 +2511,7 @@ msgstr "" + "Rozhran MSS Okno irtt HH Arp\n" + + #: ../lib/inet_gr.c:290 ++#, c-format + msgid "" + "Source Destination Gateway Flags Metric Ref Use " + "Iface MSS Window irtt TOS HHRef HHUptod SpecDst\n" +@@ -2190,7 +2519,8 @@ msgstr "" + "Odeslatel Adrest Maska Pzn Metrik Odkazy Ut " + "Rozhran MSS Okno irtt TOS HHOdk HHAktul ZvltCl\n" + +-#: ../lib/inet_sr.c:50 ++#: ../lib/inet_sr.c:51 ++#, c-format + msgid "" + "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] " + "[[dev] If]\n" +@@ -2198,29 +2528,34 @@ msgstr "" + "Pouit: inet_route [-vF] del {-host|-net} Cl[/prefix] [gw Gw] [metrika M] " + "[[dev] If]\n" + +-#: ../lib/inet_sr.c:51 ++#: ../lib/inet_sr.c:52 ++#, c-format + msgid "" + " inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n" + msgstr "" + " inet_route [-vF] add {-host|-net} Cl[/prefix] [gw Gw] [metrika M]\n" + +-#: ../lib/inet_sr.c:52 ++#: ../lib/inet_sr.c:53 ++#, c-format + msgid "" + " [netmask N] [mss Mss] [window W] [irtt I]\n" + msgstr "" + " [netmask N] [mss Mss] [window W] [irtt I]\n" + +-#: ../lib/inet_sr.c:53 ++#: ../lib/inet_sr.c:54 ++#, c-format + msgid " [mod] [dyn] [reinstate] [[dev] If]\n" + msgstr " [mod] [dyn] [reinstate] [[dev] If]\n" + +-#: ../lib/inet_sr.c:54 ++#: ../lib/inet_sr.c:55 ++#, c-format + msgid "" + " inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n" + msgstr "" + " inet_route [-vF] add {-host|-net} Cl/[prefix] [metrika M] reject\n" + +-#: ../lib/inet_sr.c:55 ++#: ../lib/inet_sr.c:56 ++#, c-format + msgid " inet_route [-FC] flush NOT supported\n" + msgstr " inet_route [-FC] flush NEN podporovno\n" + +@@ -2230,15 +2565,17 @@ msgid "route: %s: cannot use a NETWORK a + msgstr "route: %s: s nelze pout jako brnu!\n" + + #: ../lib/inet_sr.c:174 +-#, fuzzy ++#, fuzzy, c-format + msgid "route: Invalid MSS/MTU.\n" + msgstr "route: Nesprvn NSS.\n" + + #: ../lib/inet_sr.c:187 ++#, c-format + msgid "route: Invalid window.\n" + msgstr "route: Nesprvn okno.\n" + + #: ../lib/inet_sr.c:203 ++#, c-format + msgid "route: Invalid initial rtt.\n" + msgstr "route: Nesprvn zahajovac rtt.\n" + +@@ -2253,75 +2590,92 @@ msgid "route: bogus netmask %s\n" + msgstr "route: sov maska %s je nesprvn\n" + + #: ../lib/inet_sr.c:270 ++#, c-format + msgid "route: netmask doesn't match route address\n" + msgstr "route: sov maska nevyhovuje adrese cesty\n" + + #: ../lib/inet_sr.c:306 ++#, c-format + msgid "Flushing `inet' routing table not supported\n" + msgstr "Smrovac cache `inet' nelze vyprazdovat\n" + + #: ../lib/inet_sr.c:310 ++#, c-format + msgid "Modifying `inet' routing cache not supported\n" + msgstr "Smrovac cache `inet' nelze mnit\n" + + #: ../lib/ipx_gr.c:52 ++#, c-format + msgid "IPX not configured in this system.\n" + msgstr "IPX nen na tomto systmu nakonfigurovno.\n" + + #: ../lib/ipx_gr.c:56 ++#, c-format + msgid "Kernel IPX routing table\n" + msgstr "Smrovac tabulka v jdru pro IPX\n" + + #. xxx + #: ../lib/ipx_gr.c:57 ++#, c-format + msgid "Destination Router Net Router Node\n" + msgstr "Cl Smrova S Smrova Uzel\n" + + #: ../lib/ipx_sr.c:33 ++#, c-format + msgid "IPX: this needs to be written\n" + msgstr "IPX: toto je teba uloit\n" + +-#: ../lib/masq_info.c:197 ++#: ../lib/masq_info.c:198 ++#, c-format + msgid "IP masquerading entries\n" + msgstr "IP maskovac poloky\n" + +-#: ../lib/masq_info.c:200 ++#: ../lib/masq_info.c:201 ++#, c-format + msgid "prot expire source destination ports\n" + msgstr "prot ivot zdroj cl porty\n" + +-#: ../lib/masq_info.c:203 ++#: ../lib/masq_info.c:204 ++#, c-format + msgid "" +-"prot expire initseq delta prevd source destination " +-" ports\n" ++"prot expire initseq delta prevd source " ++"destination ports\n" + msgstr "" +-"prot ivot zahajsek delta pedchd zdroj cl " +-" porty\n" ++"prot ivot zahajsek delta pedchd zdroj " ++"cl porty\n" + + #: ../lib/netrom_gr.c:48 ++#, c-format + msgid "NET/ROM not configured in this system.\n" + msgstr "NET/ROM nen na tomto systmu nakonfigurovno.\n" + + #: ../lib/netrom_gr.c:51 ++#, c-format + msgid "Kernel NET/ROM routing table\n" + msgstr "Smrovac tabulka v jdru pro NET/ROM\n" + + #: ../lib/netrom_gr.c:52 ++#, c-format + msgid "Destination Mnemonic Quality Neighbour Iface\n" + msgstr "Cl Mnemonika Kvalita Soused Rozhran\n" + + #: ../lib/netrom_sr.c:34 ++#, c-format + msgid "netrom usage\n" + msgstr "pouit netrom\n" + + #: ../lib/netrom_sr.c:44 ++#, c-format + msgid "NET/ROM: this needs to be written\n" + msgstr "NET/ROM: toto je poteba uloit\n" + + #: ../lib/ppp.c:44 ++#, c-format + msgid "You cannot start PPP with this program.\n" + msgstr "Tmto programem nelze PPP spustit.\n" + + #: ../lib/ppp_ac.c:38 ++#, c-format + msgid "Sorry, use pppd!\n" + msgstr "Lituji, pouijte pppd!\n" + +@@ -2330,49 +2684,319 @@ msgid "Node address must be ten digits" + msgstr "Adresa uzlu mus mt 10 slic" + + #: ../lib/rose_gr.c:51 ++#, c-format + msgid "ROSE not configured in this system.\n" + msgstr "ROSE nen na tomto systmu nakonfigurovno.\n" + + #: ../lib/rose_gr.c:54 ++#, c-format + msgid "Kernel ROSE routing table\n" + msgstr "Smrovac tabulka v jdru pro ROSE\n" + +-#: ../lib/tr.c:70 ../lib/tr.c:85 ++#: ../lib/tr.c:86 ../lib/tr.c:101 + #, c-format + msgid "in_tr(%s): invalid token ring address!\n" + msgstr "in_tr(%s): nesprvn token ring adresa!\n" + +-#: ../lib/tr.c:97 ++#: ../lib/tr.c:113 + #, c-format + msgid "in_tr(%s): trailing : ignored!\n" + msgstr "in_tr(%s): nadbyten: ignorovno!\n" + +-#: ../lib/tr.c:109 ++#: ../lib/tr.c:125 + #, c-format + msgid "in_tr(%s): trailing junk!\n" + msgstr "in_tr(%s): nadbyten znaky!\n" + +-#: ../lib/interface.c:124 ++#: ../lib/interface.c:176 + #, c-format + msgid "warning: no inet socket available: %s\n" + msgstr "varovn: nen dostupn dn inet soket: %s\n" + +-#: ../lib/interface.c:270 ++#: ../lib/interface.c:325 + #, c-format + msgid "Warning: cannot open %s (%s). Limited output.\n" + msgstr "" + + #. Give better error message for this case. +-#: ../lib/interface.c:504 ++#: ../lib/interface.c:571 + msgid "Device not found" + msgstr "Zazen nebylo nalezeno" + +-#: ../lib/interface.c:508 ++#: ../lib/interface.c:575 + #, c-format + msgid "%s: error fetching interface information: %s\n" + msgstr "%s: chyba pi zskvn informac o rozhran %s\n" + +-#: ../lib/sockets.c:59 ++#: ../lib/interface.c:608 ++msgid " - no statistics available -" ++msgstr " - statistick data nejsou dostupn -" ++ ++#: ../lib/interface.c:612 ++#, c-format ++msgid "[NO FLAGS]" ++msgstr "[DN PZNAKY]" ++ ++#: ../lib/interface.c:688 ++#, c-format ++msgid "%-9.9s Link encap:%s " ++msgstr "%-9.9s Zapouzden:%s " ++ ++#: ../lib/interface.c:693 ++#, c-format ++msgid "HWaddr %s " ++msgstr "HWadr %s " ++ ++#: ../lib/interface.c:696 ++#, c-format ++msgid "Media:%s" ++msgstr "Mdium:%s" ++ ++#: ../lib/interface.c:698 ++#, c-format ++msgid "(auto)" ++msgstr "(auto)" ++ ++#: ../lib/interface.c:705 ++#, c-format ++msgid " %s addr:%s " ++msgstr " %s adr:%s " ++ ++#: ../lib/interface.c:708 ++#, c-format ++msgid " P-t-P:%s " ++msgstr " P-t-P:%s " ++ ++# V ostatnch katalozch se pekld Broadcast -> vesmrov vysln. ++# Tudi bcast -> Vesmr :) ++#: ../lib/interface.c:711 ++#, c-format ++msgid " Bcast:%s " ++msgstr " Vesmr:%s " ++ ++#: ../lib/interface.c:713 ++#, c-format ++msgid " Mask:%s\n" ++msgstr "Maska:%s\n" ++ ++#: ../lib/interface.c:730 ++#, c-format ++msgid " inet6 addr: %s/%d" ++msgstr " inet6-adr: %s/%d" ++ ++#: ../lib/interface.c:732 ++#, c-format ++msgid " Scope:" ++msgstr " Rozsah:" ++ ++#: ../lib/interface.c:735 ++#, c-format ++msgid "Global" ++msgstr "Globl" ++ ++#: ../lib/interface.c:738 ++#, c-format ++msgid "Link" ++msgstr "Linka" ++ ++#: ../lib/interface.c:741 ++#, c-format ++msgid "Site" ++msgstr "Stanovit" ++ ++#: ../lib/interface.c:744 ++#, c-format ++msgid "Compat" ++msgstr "Kompatibilita" ++ ++#: ../lib/interface.c:747 ++#, c-format ++msgid "Host" ++msgstr "Pota" ++ ++#: ../lib/interface.c:750 ++#, c-format ++msgid "Unknown" ++msgstr "Neznm." ++ ++#: ../lib/interface.c:765 ++#, c-format ++msgid " IPX/Ethernet II addr:%s\n" ++msgstr " IPX/Ethernet II adr: %s\n" ++ ++#: ../lib/interface.c:768 ++#, c-format ++msgid " IPX/Ethernet SNAP addr:%s\n" ++msgstr " IPX/Ethernet SNAP adr:%s\n" ++ ++#: ../lib/interface.c:771 ++#, c-format ++msgid " IPX/Ethernet 802.2 addr:%s\n" ++msgstr " IPX/Ethernet 802.2 adr:%s\n" ++ ++#: ../lib/interface.c:774 ++#, c-format ++msgid " IPX/Ethernet 802.3 addr:%s\n" ++msgstr " IPX/Ethernet 802.3 adr:%s\n" ++ ++#: ../lib/interface.c:784 ++#, c-format ++msgid " EtherTalk Phase 2 addr:%s\n" ++msgstr " EtherTalk Phase 2 adr:%s\n" ++ ++#: ../lib/interface.c:793 ++#, c-format ++msgid " econet addr:%s\n" ++msgstr " econet adr:%s\n" ++ ++# Hic sunt leones ... ++#: ../lib/interface.c:800 ++#, c-format ++msgid "[NO FLAGS] " ++msgstr "[DN PZNAKY]" ++ ++#: ../lib/interface.c:802 ++#, c-format ++msgid "UP " ++msgstr "AKTIVOVNO " ++ ++#: ../lib/interface.c:804 ++#, c-format ++msgid "BROADCAST " ++msgstr "VESMROV_VYSLN " ++ ++#: ../lib/interface.c:806 ++#, c-format ++msgid "DEBUG " ++msgstr "DEBUG " ++ ++#: ../lib/interface.c:808 ++#, c-format ++msgid "LOOPBACK " ++msgstr "SMYKA " ++ ++#: ../lib/interface.c:810 ++#, c-format ++msgid "POINTOPOINT " ++msgstr "POINTOPOINT " ++ ++# ?? ++#: ../lib/interface.c:812 ++#, c-format ++msgid "NOTRAILERS " ++msgstr "NOTRAILERS " ++ ++#: ../lib/interface.c:814 ++#, c-format ++msgid "RUNNING " ++msgstr "B̮ " ++ ++#: ../lib/interface.c:816 ++#, c-format ++msgid "NOARP " ++msgstr "NEARP " ++ ++#: ../lib/interface.c:818 ++#, c-format ++msgid "PROMISC " ++msgstr "PROMISK " ++ ++#: ../lib/interface.c:820 ++#, c-format ++msgid "ALLMULTI " ++msgstr "ALLMULTI " ++ ++#: ../lib/interface.c:822 ++#, c-format ++msgid "SLAVE " ++msgstr "SLAVE " ++ ++#: ../lib/interface.c:824 ++#, c-format ++msgid "MASTER " ++msgstr "MASTER " ++ ++#: ../lib/interface.c:826 ++#, c-format ++msgid "MULTICAST " ++msgstr "MULTICAST " ++ ++#: ../lib/interface.c:829 ++#, c-format ++msgid "DYNAMIC " ++msgstr "DYNAMIC " ++ ++#. DONT FORGET TO ADD THE FLAGS IN ife_print_short ++#: ../lib/interface.c:832 ++#, c-format ++msgid " MTU:%d Metric:%d" ++msgstr " MTU:%d Metrika:%d" ++ ++#: ../lib/interface.c:836 ++#, c-format ++msgid " Outfill:%d Keepalive:%d" ++msgstr " Outfill:%d Keepalive:%d" ++ ++#: ../lib/interface.c:850 ++#, fuzzy, c-format ++msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" ++msgstr "pijmutch paket:%lu chyb:%lu zahozeno:%lu peteen:%lu rmc:%lu\n" ++ ++#: ../lib/interface.c:855 ++#, c-format ++msgid " compressed:%lu\n" ++msgstr " komprimovno:%lu\n" ++ ++# carrier? ++#: ../lib/interface.c:895 ++#, fuzzy, c-format ++msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" ++msgstr "odeslanch paket:%lu chyb:%lu zahozeno:%lu peteen:%lu penos:%lu\n" ++ ++#: ../lib/interface.c:899 ++#, c-format ++msgid " collisions:%lu " ++msgstr " koliz:%lu " ++ ++#: ../lib/interface.c:901 ++#, c-format ++msgid "compressed:%lu " ++msgstr "komprimovno:%lu " ++ ++#: ../lib/interface.c:903 ++#, c-format ++msgid "txqueuelen:%d " ++msgstr "dlka odchoz fronty:%d " ++ ++#: ../lib/interface.c:905 ++#, c-format ++msgid "RX bytes:%llu (%lu.%lu %s) TX bytes:%llu (%lu.%lu %s)\n" ++msgstr "" ++ ++#: ../lib/interface.c:916 ++#, c-format ++msgid "Interrupt:%d " ++msgstr "Peruen:%d " ++ ++#. Only print devices using it for ++#. I/O maps ++#: ../lib/interface.c:919 ++#, c-format ++msgid "Base address:0x%x " ++msgstr "Vstupn/Vstupn port:0x%x " ++ ++#: ../lib/interface.c:921 ++#, c-format ++msgid "Memory:%lx-%lx " ++msgstr "Pam:%lx-%lx " ++ ++#: ../lib/interface.c:924 ++#, c-format ++msgid "DMA chan:%x " ++msgstr "Kanl DMA:%x " ++ ++#: ../lib/sockets.c:63 ++#, c-format + msgid "No usable address families found.\n" + msgstr "Nebyla nalezena dn pouiteln tda adres.\n" + +@@ -2396,29 +3020,32 @@ msgstr "ip: %s nen platnou IPv4 adresou + msgid "ip: argument is wrong: %s\n" + msgstr "ip: argument %s je nesprvn\n" + +-#: ../ipmaddr.c:56 ++#: ../ipmaddr.c:61 ++#, c-format + msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n" + msgstr " Usage: ipmaddr [ add | del ] MULTIADR dev ETZEC\n" + +-#: ../ipmaddr.c:57 ++#: ../ipmaddr.c:62 ++#, c-format + msgid " ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n" + msgstr " ipmaddr show [ dev ETZEC ] [ ipv4 | ipv6 | link | all ]\n" + +-#: ../ipmaddr.c:58 ++#: ../ipmaddr.c:63 ++#, c-format + msgid " ipmaddr -V | -version\n" + msgstr " ipmaddr -V | -version\n" + +-#: ../ipmaddr.c:258 ++#: ../ipmaddr.c:263 + #, c-format + msgid "family %d " + msgstr "tda %d " + +-#: ../ipmaddr.c:267 ++#: ../ipmaddr.c:272 + #, c-format + msgid " users %d" + msgstr " uivatel %d" + +-#: ../ipmaddr.c:353 ++#: ../ipmaddr.c:358 + msgid "Cannot create socket" + msgstr "Soket nelze vytvoit" + +@@ -2433,6 +3060,7 @@ msgid "slattach: tty_lock: (%s): %s\n" + msgstr "slattach: tty_lock: (%s): %s\n" + + #: ../slattach.c:192 ++#, c-format + msgid "slattach: cannot write PID file\n" + msgstr "slattach: do PID souboru nelze zapisovat\n" + +@@ -2451,44 +3079,77 @@ msgstr "slattach: tty_hangup(DROP): %s\n + msgid "slattach: tty_hangup(RAISE): %s\n" + msgstr "slattach: tty_hangup(RAISE): %s\n" + +-#: ../slattach.c:486 ++#: ../slattach.c:468 ++#, fuzzy, c-format ++msgid "slattach: tty name too long\n" ++msgstr "jmno %s je pli dlouh\n" ++ ++#: ../slattach.c:498 ++#, c-format + msgid "slattach: tty_open: cannot get current state!\n" + msgstr "slattach: tty_open: aktuln stav nelze zjistit!\n" + +-#: ../slattach.c:493 ++#: ../slattach.c:505 ++#, c-format + msgid "slattach: tty_open: cannot get current line disc!\n" + msgstr "slattach: tty_open: aktuln linkovou disciplnu nelze zjistit!\n" + +-#: ../slattach.c:501 ++#: ../slattach.c:513 ++#, c-format + msgid "slattach: tty_open: cannot set RAW mode!\n" + msgstr "slattach: tty_open: reim RAW nelze nastavit!\n" + +-#: ../slattach.c:508 ++#: ../slattach.c:520 + #, c-format + msgid "slattach: tty_open: cannot set %s bps!\n" + msgstr "slattach: tty_open: %s bps nelze nastavit!\n" + +-#: ../slattach.c:518 ++#: ../slattach.c:530 ++#, c-format + msgid "slattach: tty_open: cannot set 8N1 mode!\n" + msgstr "slattach: tty_open: reim 8N1 nelze nastavit!\n" + +-#: ../slattach.c:686 ++#: ../slattach.c:672 ++#, c-format ++msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n" ++msgstr "" ++ ++#: ../slattach.c:704 + #, c-format + msgid "%s started" + msgstr "protokol %s sputn" + +-#: ../slattach.c:687 ++#: ../slattach.c:705 + #, c-format + msgid " on %s" + msgstr " na %s" + +-#: ../slattach.c:688 ++#: ../slattach.c:706 + #, c-format + msgid " interface %s\n" + msgstr " rozhran %s\n" + + #~ msgid "" +-#~ " This comand can read or set the hostname or the NIS domainname. You can\n" ++#~ " arp [-v] [] [-i ] -s [netmask ] pub " ++#~ "<-''-\n" ++#~ msgstr "" ++#~ " arp [-v] [] [-i ] -s [smask ] <-''-\n" ++ ++#~ msgid "%s: unknown interface: %s\n" ++#~ msgstr "%s: rozhran %s nen znmo\n" ++ ++#~ msgid "address mask replies" ++#~ msgstr "odpovdi na dost o masku podst" ++ ++#~ msgid "unknown title %s\n" ++#~ msgstr "titulek %s je neznm\n" ++ ++#~ msgid "Routing table for `ddp' not yet supported.\n" ++#~ msgstr "Smrovac tabulka pro `ddp' nen zatm podporovna.\n" ++ ++#~ msgid "" ++#~ " This comand can read or set the hostname or the NIS domainname. You " ++#~ "can\n" + #~ msgstr "" + #~ " Tento program zjiuje a nastavuje jmno potae i NIS domny. Me " + #~ "tak\n" +@@ -2500,7 +3161,8 @@ msgstr " rozhran %s\n" + #~ msgid "" + #~ " Unless you are using bind or NIS for host lookups you can change the\n" + #~ msgstr "" +-#~ " Pokud nepouvte bind i NIS pro vyhledvn jmen pota, pak mete\n" ++#~ " Pokud nepouvte bind i NIS pro vyhledvn jmen pota, pak " ++#~ "mete\n" + + #~ msgid "" + #~ " FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n" +Index: net-tools/po/Makefile +=================================================================== +--- net-tools.orig/po/Makefile ++++ net-tools/po/Makefile +@@ -3,13 +3,13 @@ INSTALL_PROGRAM= ${INSTALL} + INSTALL_DATA= ${INSTALL} -m 644 + INSTALLNLSDIR=${BASEDIR}/usr/share/locale + +-TUPDATE = tupdate ++TUPDATE = msgmerge + + NLSPACKAGE = net-tools + + -include ../config.make + ifeq ($(I18N),1) +-CATALOGS = de.mo fr.mo pt_BR.mo et_EE.mo cs.mo ++CATALOGS = de.mo fr.mo pt_BR.mo et_EE.mo cs.mo ja.mo + else + CATALOGS = + endif +@@ -49,7 +49,7 @@ update-po: Makefile + lang=`echo $$cat | sed 's/.mo//'`; \ + mv $$lang.po $$lang.old.po; \ + echo "$$lang:"; \ +- if $(TUPDATE) $(NLSPACKAGE).pot $$lang.old.po > $$lang.po; then \ ++ if $(TUPDATE) $$lang.old.po $(NLSPACKAGE).pot > $$lang.po; then \ + rm -f $$lang.old.po; \ + else \ + echo "tupdate for $$cat failed!"; \ +Index: net-tools/po/de.po +=================================================================== +--- net-tools.orig/po/de.po ++++ net-tools/po/de.po +@@ -1,106 +1,121 @@ +-# $Id: de.po,v 1.10 2000/08/01 03:19:48 ecki Exp $ ++# $Id: de.po,v 1.11 2003/10/25 21:15:09 ecki Exp $ + # German translation for net-tools 1.51 + # Copyright (C) 1999 Ralf Bchle + msgid "" + msgstr "" + "Project-Id-Version: net-tools 1.51\n" +-"POT-Creation-Date: 2000-02-14 02:31+0100\n" +-"PO-Revision-Date: 1998-03-01 00:02+0100\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2007-06-30 12:28+0900\n" ++"PO-Revision-Date: 2005-06-13 00:02+0100\n" + "Last-Translator: Ralf Bchle \n" + "Language-Team:\n" + "MIME-Version: 1.0\n" +-"Content-Type: text/plain; charset=iso8859-1\n" ++"Content-Type: text/plain; charset=iso-8859-1\n" + "Content-Transfer-Encoding: 8bit\n" + +-#: ../arp.c:110 ../arp.c:269 ++#: ../arp.c:112 ../arp.c:279 ++#, c-format + msgid "arp: need host name\n" +-msgstr "arp: Hostname mu angegeben werden\n" ++msgstr "arp: Hostname muss angegeben werden\n" + +-#: ../arp.c:207 ../arp.c:221 ++#: ../arp.c:215 ../arp.c:230 + #, c-format + msgid "No ARP entry for %s\n" +-msgstr "Kein ARP Eintrag fr %s\n" ++msgstr "Kein ARP-Eintrag fr %s\n" + +-#: ../arp.c:239 ++#: ../arp.c:248 + #, c-format + msgid "arp: cant get HW-Address for `%s': %s.\n" + msgstr "rarp: Kann Eintrag aus %s : %u nicht setzen.\n" + +-#: ../arp.c:243 ++#: ../arp.c:252 ++#, c-format + msgid "arp: protocol type mismatch.\n" + msgstr "arp: unpassende Protokolltypen.\n" + +-#: ../arp.c:252 ++#: ../arp.c:261 + #, c-format + msgid "arp: device `%s' has HW address %s `%s'.\n" +-msgstr "arp: Gert ,,%s'' hat HW-Adresse %s ,,%s''.\n" ++msgstr "arp: Gert %s hat HW-Adresse %s %s.\n" + +-#: ../arp.c:282 ++#: ../arp.c:293 ++#, c-format + msgid "arp: need hardware address\n" +-msgstr "arp: Hardwareadresse mu angegeben werden\n" ++msgstr "arp: Hardwareadresse muss angegeben werden\n" + +-#: ../arp.c:290 ++#: ../arp.c:301 ++#, c-format + msgid "arp: invalid hardware address\n" + msgstr "arp: ungltige Hardwareadresse\n" + +-#: ../arp.c:387 ++#: ../arp.c:398 + #, c-format + msgid "arp: cannot open etherfile %s !\n" + msgstr "arp: Kann %s nicht ffnen!\n" + +-#: ../arp.c:403 ++#: ../arp.c:414 + #, c-format + msgid "arp: format error on line %u of etherfile %s !\n" + msgstr "arp: Formatfehler in Zeile %u von Etherfile %s.\n" + +-#: ../arp.c:416 ++#: ../arp.c:427 + #, c-format + msgid "arp: cannot set entry on line %u of etherfile %s !\n" + msgstr "arp: Kann Eintrag auf Zeile %u von Etherdatei %s nicht setzen!\n" + +-#: ../arp.c:437 +-msgid "Address\t\t\tHWtype\tHWaddress\t Flags Mask\t\t Iface\n" ++#: ../arp.c:448 ++#, fuzzy, c-format ++msgid "" ++"Address HWtype HWaddress Flags Mask " ++"Iface\n" + msgstr "Adresse\t\t\tHWTyp\tHWAdresse\t Flags Maske\t\t Iface\n" + +-#: ../arp.c:467 ++#: ../arp.c:476 ++#, fuzzy ++msgid "" ++msgstr " Schnittstelle: %s\n" ++ ++#: ../arp.c:478 + msgid "(incomplete)" +-msgstr "(unvollsndig)" ++msgstr "(unvollstndig)" + +-#: ../arp.c:484 ++#: ../arp.c:495 + #, c-format + msgid "%s (%s) at " + msgstr "%s (%s) auf " + +-#: ../arp.c:490 ++#: ../arp.c:501 ++#, c-format + msgid " " + msgstr " " + +-#: ../arp.c:496 ++#: ../arp.c:507 + #, c-format + msgid "netmask %s " + msgstr "netzmaske %s " + +-#: ../arp.c:513 ++#: ../arp.c:524 + #, c-format + msgid "on %s\n" + msgstr "auf %s\n" + +-#: ../arp.c:592 ++#: ../arp.c:605 + #, c-format + msgid "Entries: %d\tSkipped: %d\tFound: %d\n" + msgstr "Eintrge: %d Ignoriert: %d Gefunden: %d\n" + +-#: ../arp.c:596 ++#: ../arp.c:609 + #, c-format + msgid "%s (%s) -- no entry\n" + msgstr "%s (%s) -- kein Eintrag\n" + +-#: ../arp.c:598 ++#: ../arp.c:611 + #, c-format + msgid "arp: in %d entries no match found.\n" +-msgstr "arp: In %d Eintrgen wurde kein Zutreffender gefunden.\n" ++msgstr "arp: In %d Eintrgen wurde kein zutreffender gefunden.\n" + +-#: ../arp.c:613 ++#: ../arp.c:626 ++#, c-format + msgid "" + "Usage:\n" + " arp [-vn] [] [-i ] [-a] [] <-Display ARP " +@@ -109,157 +124,165 @@ msgstr "" + "Benutzung:\n" + " arp [-vn] [] [-i ] [-a] []\n" + +-#: ../arp.c:614 ++#: ../arp.c:627 ++#, fuzzy, c-format + msgid "" +-" arp [-v] [-i ] -d [pub][nopub] <-Delete ARP " ++" arp [-v] [-i ] -d [pub] <-Delete ARP " + "entry\n" + msgstr " arp [-v] [-i ] -d [pub][nopub]\n" + +-#: ../arp.c:615 ++#: ../arp.c:628 ++#, fuzzy, c-format + msgid "" +-" arp [-vnD] [] [-i ] -f [] <-Add entry from " ++" arp [-vnD] [] [-i ] -f [] <-Add entry from " + "file\n" + msgstr " arp [-vnD] [] [-i ] -f <- Eintrag aus Datei hinzufgen\n" + +-#: ../arp.c:616 ++#: ../arp.c:629 ++#, fuzzy, c-format + msgid "" +-" arp [-v] [] [-i ] -s [temp][nopub] <-Add " ++" arp [-v] [] [-i ] -s [temp] <-Add " + "entry\n" + msgstr "" + " arp [-v] [] [-i ] -s [temp][nopub]\n" + +-#: ../arp.c:617 +-msgid "" +-" arp [-v] [] [-i ] -s [netmask ] pub " +-"<-''-\n" +-msgstr "" +-" arp [-v] [] [-i ] -s [netmask ] pub\n" +- +-#: ../arp.c:618 ++#: ../arp.c:630 ++#, fuzzy, c-format + msgid "" +-" arp [-v] [] [-i ] -Ds [netmask ] pub " ++" arp [-v] [] [-i ] -Ds [netmask ] pub " + "<-''-\n" + "\n" + msgstr " arp [-v] [] [-i ] -Ds [netmask ] pub\n" + +-#: ../arp.c:620 ++#: ../arp.c:632 ++#, c-format + msgid "" + " -a display (all) hosts in alternative (BSD) " + "style\n" + msgstr " -a Alle Hosts im BSD-Format anzeigen\n" + +-#: ../arp.c:621 ++#: ../arp.c:633 ++#, c-format + msgid " -s, --set set a new ARP entry\n" + msgstr " -s, --set Neuen ARP-Eintrag setzen\n" + +-#: ../arp.c:622 ++#: ../arp.c:634 ++#, c-format + msgid " -d, --delete delete a specified entry\n" + msgstr " -d, --delete Einen bestimmten Eintrag lschen\n" + +-#: ../arp.c:623 ../netstat.c:1436 ../route.c:85 ++#: ../arp.c:635 ../netstat.c:1503 ../route.c:86 ++#, c-format + msgid " -v, --verbose be verbose\n" + msgstr " -v, --verbose Ausfhrliche Ausgaben\n" + +-#: ../arp.c:624 ../netstat.c:1437 ../route.c:86 +-msgid " -n, --numeric dont resolve names\n" ++#: ../arp.c:636 ../netstat.c:1504 ../route.c:87 ++#, fuzzy, c-format ++msgid " -n, --numeric don't resolve names\n" + msgstr " -n, --numeric Adressen nicht nach Namen auflsen\n" + +-#: ../arp.c:625 ++#: ../arp.c:637 ++#, c-format + msgid "" + " -i, --device specify network interface (e.g. eth0)\n" +-msgstr " -i, --device Netzwerksgert (z.B. eth0) angeben\n" ++msgstr " -i, --device Netzwerkgert (z.B. eth0) angeben\n" + +-#: ../arp.c:626 ++#: ../arp.c:638 ++#, c-format + msgid " -D, --use-device read from given device\n" + msgstr " -D, --use-device von gegebenem Gert lesen\n" + +-#: ../arp.c:627 ++#: ../arp.c:639 ++#, c-format + msgid " -A, -p, --protocol specify protocol family\n" + msgstr " -A, -p, --protocol Routentabelle anzeigen\n" + +-#: ../arp.c:628 ++#: ../arp.c:640 ++#, c-format + msgid "" +-" -f, --file read new entries from file or from " +-"/etc/ethers\n" ++" -f, --file read new entries from file or from /etc/" ++"ethers\n" + "\n" + msgstr "" + " -f, --file Neue Eintrge aus Datei lesen\n" + "\n" + +-#: ../arp.c:630 ../rarp.c:181 ++#: ../arp.c:642 ../rarp.c:182 + #, c-format + msgid " =Use '-H ' to specify hardware address type. Default: %s\n" + msgstr " ='-H ' um Hardwareadresstyp anzugeben. Standard: %s\n" + +-#: ../arp.c:631 ../rarp.c:182 ++#: ../arp.c:643 ../rarp.c:183 ++#, c-format + msgid " List of possible hardware types (which support ARP):\n" + msgstr " Liste mglicher Hardwaretypen, die ARP untersttzen:\n" + +-#: ../arp.c:664 ++#: ../arp.c:677 ../arp.c:762 + #, c-format + msgid "%s: hardware type not supported!\n" + msgstr "%s: Hardwaretyp nicht untersttzt!\n" + +-#: ../arp.c:668 ++#: ../arp.c:681 + #, c-format + msgid "%s: address family not supported!\n" + msgstr "%s: Adressfamilie nicht untersttzt!\n" + +-#: ../arp.c:703 ++#: ../arp.c:716 ++#, c-format + msgid "arp: -N not yet supported.\n" + msgstr "arp: -N noch nicht untersttzt.\n" + +-#: ../arp.c:713 ++#: ../arp.c:726 + #, c-format + msgid "arp: %s: unknown address family.\n" + msgstr "arp: %s: unbekannte Adressfamilie.\n" + +-#: ../arp.c:722 ++#: ../arp.c:735 + #, c-format + msgid "arp: %s: unknown hardware type.\n" + msgstr "arp: %s: unbekannter Hardwaretyp.\n" + +-#: ../arp.c:741 ++#: ../arp.c:754 + #, c-format + msgid "arp: %s: kernel only supports 'inet'.\n" +-msgstr "arp: %s: Kernel untersttzt nur ,,inet''.\n" ++msgstr "arp: %s: Kernel untersttzt nur inet.\n" + +-#: ../arp.c:746 ++#: ../arp.c:767 + #, c-format + msgid "arp: %s: hardware type without ARP support.\n" + msgstr "arp: %s: Hardware untersttzt kein ARP.\n" + +-#: ../hostname.c:69 ++#: ../hostname.c:71 + #, c-format + msgid "Setting nodename to `%s'\n" +-msgstr "Rechnernamen auf ,,%s'' setzen\n" ++msgstr "Rechnernamen auf %s setzen\n" + +-#: ../hostname.c:74 ++#: ../hostname.c:76 + #, c-format + msgid "%s: you must be root to change the node name\n" + msgstr "%s: Nur Root darf den Rechnernamen ndern\n" + +-#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116 ++#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117 + #, c-format + msgid "%s: name too long\n" + msgstr "%s: name zu lang\n" + +-#: ../hostname.c:89 ++#: ../hostname.c:91 + #, c-format + msgid "Setting hostname to `%s'\n" +-msgstr "Setze Hostname auf ,,%s''\n" ++msgstr "Setze Hostname auf %s\n" + +-#: ../hostname.c:94 ++#: ../hostname.c:96 + #, c-format + msgid "%s: you must be root to change the host name\n" +-msgstr "%s: Nur Root darf then Rechnernamen ndern\n" ++msgstr "%s: Nur Root darf den Rechnernamen ndern\n" + +-#: ../hostname.c:108 ++#: ../hostname.c:109 + #, c-format + msgid "Setting domainname to `%s'\n" +-msgstr "Setze domainname auf ,,%s''\n" ++msgstr "Setze domainname auf %s\n" + +-#: ../hostname.c:113 ++#: ../hostname.c:114 + #, c-format + msgid "%s: you must be root to change the domain name\n" + msgstr "%s: Nur Root darf den Domainnamen ndern\n" +@@ -267,51 +290,56 @@ msgstr "%s: Nur Root darf den Domainname + #: ../hostname.c:131 + #, c-format + msgid "Resolving `%s' ...\n" +-msgstr "Lse ,,%s'' auf ...\n" ++msgstr "Lse %s auf ...\n" + + #: ../hostname.c:137 + #, c-format + msgid "Result: h_name=`%s'\n" +-msgstr "Ergebnis: h_name=,,%s''\n" ++msgstr "Ergebnis: h_name=%s\n" + + #: ../hostname.c:142 + #, c-format + msgid "Result: h_aliases=`%s'\n" +-msgstr "Ergebnis: h_aliases=,,%s''\n" ++msgstr "Ergebnis: h_aliases=%s\n" + + #: ../hostname.c:147 + #, c-format + msgid "Result: h_addr_list=`%s'\n" +-msgstr "Ergebnis: h_addr_list=,,%s''\n" ++msgstr "Ergebnis: h_addr_list=%s\n" + +-#: ../hostname.c:209 ++#: ../hostname.c:208 + #, c-format + msgid "%s: can't open `%s'\n" +-msgstr "%s: Kann ,,%s'' nicht ffnen\n" ++msgstr "%s: Kann %s nicht ffnen\n" + +-#: ../hostname.c:223 ++#: ../hostname.c:222 ++#, c-format + msgid "Usage: hostname [-v] {hostname|-F file} set hostname (from file)\n" + msgstr "" + "Benutzung: hostname [-v] {Hostname|-F Datei} Hostname (aus Datei) setzen\n" + +-#: ../hostname.c:224 ++#: ../hostname.c:223 ++#, c-format + msgid "" + " domainname [-v] {nisdomain|-F file} set NIS domainname (from file)\n" + msgstr "" +-" domainname [-v] {nisdomain|-F file} NIS Domainname (aus Datei) " ++" domainname [-v] {nisdomain|-F file} NIS-Domainname (aus Datei) " + "setzen.\n" + +-#: ../hostname.c:226 ++#: ../hostname.c:225 ++#, c-format + msgid "" + " nodename [-v] {nodename|-F file} set DECnet node name (from " + "file)\n" + msgstr " nodename [-v] {Rechnername|-F Datei}\n" + +-#: ../hostname.c:228 ++#: ../hostname.c:227 ++#, c-format + msgid " hostname [-v] [-d|-f|-s|-a|-i|-y|-n] display formatted name\n" + msgstr " hostname [-v] [-d|-f|-s|-a|-i|-y|-n]\n" + +-#: ../hostname.c:229 ++#: ../hostname.c:228 ++#, c-format + msgid "" + " hostname [-v] display hostname\n" + "\n" +@@ -319,7 +347,8 @@ msgstr "" + " hostname [-v] Hostnamen anzeigen\n" + "\n" + +-#: ../hostname.c:230 ++#: ../hostname.c:229 ++#, c-format + msgid "" + " hostname -V|--version|-h|--help print info and exit\n" + "\n" +@@ -328,7 +357,8 @@ msgstr "" + "beenden.\n" + "\n" + +-#: ../hostname.c:231 ++#: ../hostname.c:230 ++#, c-format + msgid "" + " dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" + "\n" +@@ -336,43 +366,52 @@ msgstr "" + " dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" + "\n" + +-#: ../hostname.c:232 ++#: ../hostname.c:231 ++#, c-format + msgid " -s, --short short host name\n" + msgstr " -s, --short Kurzer Hostname\n" + +-#: ../hostname.c:233 ++#: ../hostname.c:232 ++#, c-format + msgid " -a, --alias alias names\n" + msgstr " -a, --alias Namensalias\n" + +-#: ../hostname.c:234 ++#: ../hostname.c:233 ++#, c-format + msgid " -i, --ip-address addresses for the hostname\n" + msgstr " -i, --ip-address Adressen fr den Hostnamen\n" + +-#: ../hostname.c:235 ++#: ../hostname.c:234 ++#, c-format + msgid " -f, --fqdn, --long long host name (FQDN)\n" + msgstr " -f, --fqdn, --long Langer Hostname (FQDN)\n" + +-#: ../hostname.c:236 ++#: ../hostname.c:235 ++#, c-format + msgid " -d, --domain DNS domain name\n" +-msgstr " -d, --domain DNS Domainname\n" ++msgstr " -d, --domain DNS-Domainname\n" + +-#: ../hostname.c:237 ++#: ../hostname.c:236 ++#, c-format + msgid " -y, --yp, --nis NIS/YP domainname\n" +-msgstr " -y, --yp, --nis NIS/YP Domainname\n" ++msgstr " -y, --yp, --nis NIS/YP-Domainname\n" + +-#: ../hostname.c:239 ++#: ../hostname.c:238 ++#, c-format + msgid " -n, --node DECnet node name\n" +-msgstr " -n, --node DECnet Knotennamen\n" ++msgstr " -n, --node DECnet-Knotennamen\n" + +-#: ../hostname.c:241 ++#: ../hostname.c:240 ++#, c-format + msgid "" + " -F, --file read hostname or NIS domainname from given file\n" + "\n" + msgstr "" +-" -F, --file Hostnamen oder NIS Domainnamen aus Datei lesen\n" ++" -F, --file Hostnamen oder NIS-Domainnamen aus Datei lesen\n" + "\n" + +-#: ../hostname.c:243 ++#: ../hostname.c:242 ++#, c-format + msgid "" + " This command can read or set the hostname or the NIS domainname. You can\n" + " also read the DNS domain or the FQDN (fully qualified domain name).\n" +@@ -380,395 +419,268 @@ msgid "" + " FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n" + " part of the FQDN) in the /etc/hosts file.\n" + msgstr "" +-" Dies Kommando setzt oder gibt den Hostnamen oder NIS Domainnamen aus.\n" +-" Es ist ebenfalls mglich die DNS Domain oder den FQDN (langen Hostnamen)\n" ++" Dies Kommando setzt oder gibt den Hostnamen oder NIS-Domainnamen aus.\n" ++" Es ist ebenfalls mglich die DNS-Domain oder den FQDN (langen Hostnamen)\n" + " ausgeben zu lassen. Auer wenn DNS oder NIS als Namensdienst verwendet\n" +-" wird, knnen FQDN (Fully Qualified Domain Name) und DNS Domainname (welcher\n" ++" wird, knnen FQDN (Fully Qualified Domain Name) und DNS-Domainname (welcher\n" + " Teil des FQDNs ist) in /etc/hosts gendert werden.\n" + + #: ../hostname.c:338 + #, c-format + msgid "%s: You can't change the DNS domain name with this command\n" +-msgstr "%s: Mit diesem Program kann der DNS Domainname nicht gendert werden\n" ++msgstr "%s: Mit diesem Programm kann der DNS-Domainname nicht gendert werden\n" + + #: ../hostname.c:339 ++#, c-format + msgid "" + "\n" + "Unless you are using bind or NIS for host lookups you can change the DNS\n" + msgstr "" + "\n" +-"Wenn Bind oder NIS nicht zur Hostnamensauflsung benutzt werden, kann der " +-"DNS\n" ++"Wenn Bind oder NIS nicht zur Hostnamensauflsung benutzt werden, kann der DNS\n" + + #: ../hostname.c:340 ++#, c-format + msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n" +-msgstr "" +-"Domainname (welcher Teil des FQDN ist) in der Datei /etc/hosts gendert " +-"werden.\n" ++msgstr "Domainname (welcher Teil des FQDN ist) in der Datei /etc/hosts gendert werden.\n" + + #: ../hostname.c:357 + #, c-format + msgid "gethostname()=`%s'\n" +-msgstr "gethostname()=,,%s''\n" ++msgstr "gethostname()=%s\n" + + #: ../hostname.c:374 + #, c-format + msgid "getdomainname()=`%s'\n" +-msgstr "getdomainname()=,,%s''\n" ++msgstr "getdomainname()=%s\n" + + #: ../hostname.c:389 + #, c-format + msgid "getnodename()=`%s'\n" +-msgstr "getnodename()=,,%s''\n" ++msgstr "getnodename()=%s\n" + +-#: ../ifconfig.c:159 +-#, c-format +-msgid "%-9.9s Link encap:%s " +-msgstr "%-9.9s Protokoll:%s " ++#: ../ifconfig.c:107 ++#, fuzzy, c-format ++msgid "" ++"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " ++"Flg\n" ++msgstr "SStelle MTU Met RX-OK RX-Feh RX-DRP RX-lf TX-OK TX-Feh TX-DRP TX-b Flg\n" + +-#: ../ifconfig.c:164 +-#, c-format +-msgid "HWaddr %s " +-msgstr "Hardware Adresse %s " ++#: ../ifconfig.c:129 ../ifconfig.c:161 ++#, fuzzy, c-format ++msgid "%s: ERROR while getting interface flags: %s\n" ++msgstr "%s: Fehler beim Auslesen der Schnittstelleninformation: %s\n" + +-#: ../ifconfig.c:167 ++#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862 ++#: ../ifconfig.c:973 + #, c-format +-msgid "Media:%s" +-msgstr "Medium:%s" ++msgid "No support for INET on this system.\n" ++msgstr "INET ist auf diesem System nicht verfgbar.\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] [[]
]\n" ++msgstr "" ++"Syntax:\n" ++" ifconfig [-a] [-i] [-v] [[] ]\n" + +-#: ../ifconfig.c:179 ++#: ../ifconfig.c:204 + #, c-format +-msgid " P-t-P:%s " +-msgstr " P-z-P:%s " ++msgid " [add
[/]]\n" ++msgstr " [add [/]]\n" + +-#: ../ifconfig.c:182 ++#: ../ifconfig.c:205 + #, c-format +-msgid " Bcast:%s " +-msgstr " Bcast:%s " ++msgid " [del
[/]]\n" ++msgstr " [del [/]]\n" + +-#: ../ifconfig.c:184 ++#: ../ifconfig.c:206 + #, c-format +-msgid " Mask:%s\n" +-msgstr " Maske:%s\n" ++msgid " [[-]broadcast [
]] [[-]pointopoint [
]]\n" ++msgstr " [[-]broadcast []] [[-]pointopoint []]\n" + +-#: ../ifconfig.c:201 ++#: ../ifconfig.c:207 + #, c-format +-msgid " inet6 addr: %s/%d" +-msgstr " inet6 Adresse: %s/%d" +- +-#: ../ifconfig.c:203 +-msgid " Scope:" +-msgstr " Gltigkeitsbereich:" +- +-#: ../ifconfig.c:206 +-msgid "Global" +-msgstr "Global" ++msgid " [netmask
] [dstaddr
] [tunnel
]\n" ++msgstr " [netmask ] [dstaddr ] [tunnel ]\n" + +-#: ../ifconfig.c:209 +-msgid "Link" +-msgstr "Verbindung" ++#: ../ifconfig.c:210 ++#, c-format ++msgid " [outfill ] [keepalive ]\n" ++msgstr " [outfill ] [keepalive ]\n" + + #: ../ifconfig.c:212 +-msgid "Site" +-msgstr "Standort" +- +-#: ../ifconfig.c:215 +-msgid "Compat" +-msgstr "Kompatibilitt" +- +-#: ../ifconfig.c:218 +-msgid "Host" +-msgstr "Maschine" +- +-#: ../ifconfig.c:221 +-msgid "Unknown" +-msgstr "Unbekannt" +- +-#: ../ifconfig.c:236 + #, c-format +-msgid " IPX/Ethernet II addr:%s\n" +-msgstr " IPX/Ethernet II Adresse:%s\n" ++msgid " [hw
] [metric ] [mtu ]\n" ++msgstr " [hw ] [metric ] [mtu ]\n" + +-#: ../ifconfig.c:239 ++#: ../ifconfig.c:213 + #, c-format +-msgid " IPX/Ethernet SNAP addr:%s\n" +-msgstr " IPX/Ethernet SNAP Adresse:%s\n" ++msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" ++msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" + +-#: ../ifconfig.c:242 ++#: ../ifconfig.c:214 + #, c-format +-msgid " IPX/Ethernet 802.2 addr:%s\n" +-msgstr " IPX/Ethernet 802.2 Adresse:%s\n" ++msgid " [multicast] [[-]promisc]\n" ++msgstr " [multicast] [[-]promisc]\n" + +-#: ../ifconfig.c:245 ++#: ../ifconfig.c:215 + #, c-format +-msgid " IPX/Ethernet 802.3 addr:%s\n" +-msgstr " IPX/Ethernet 802.3 Adresse:%s\n" ++msgid " [mem_start ] [io_addr ] [irq ] [media ]\n" ++msgstr " [mem_start ] [io_addr ] [irq ] [media ]\n" + +-#: ../ifconfig.c:255 ++#: ../ifconfig.c:217 + #, c-format +-msgid " EtherTalk Phase 2 addr:%s\n" +-msgstr " EtherTalk Phase 2 Adresse:%s\n" ++msgid " [txqueuelen ]\n" ++msgstr " [txqueuelen ]\n" + +-#: ../ifconfig.c:264 ++#: ../ifconfig.c:220 + #, c-format +-msgid " econet addr:%s\n" +-msgstr " econet Adresse:%s\n" +- +-#: ../ifconfig.c:270 +-msgid "[NO FLAGS] " +-msgstr "[KEINE FLAGS] " +- +-#: ../ifconfig.c:272 +-msgid "UP " +-msgstr "UP " +- +-#: ../ifconfig.c:274 +-msgid "BROADCAST " +-msgstr "BROADCAST " +- +-#: ../ifconfig.c:276 +-msgid "DEBUG " +-msgstr "DEBUG " +- +-#: ../ifconfig.c:278 +-msgid "LOOPBACK " +-msgstr "LOOPBACK " +- +-#: ../ifconfig.c:280 +-msgid "POINTOPOINT " +-msgstr "PUNKTZUPUNKT " +- +-#: ../ifconfig.c:282 +-msgid "NOTRAILERS " +-msgstr "NOTRAILERS " ++msgid " [[-]dynamic]\n" ++msgstr " [[-]dynamic]\n" + +-#: ../ifconfig.c:284 +-msgid "RUNNING " +-msgstr "RUNNING " ++#: ../ifconfig.c:222 ++#, c-format ++msgid "" ++" [up|down] ...\n" ++"\n" ++msgstr "" ++" [up|down] ...\n" ++"\n" + +-#: ../ifconfig.c:286 +-msgid "NOARP " +-msgstr "NOARP " ++#: ../ifconfig.c:224 ++#, c-format ++msgid " =Hardware Type.\n" ++msgstr " =Hardwaretyp.\n" + +-#: ../ifconfig.c:288 +-msgid "PROMISC " +-msgstr "PROMISC " ++#: ../ifconfig.c:225 ++#, c-format ++msgid " List of possible hardware types:\n" ++msgstr " Liste mglicher Hardwaretypen:\n" + +-#: ../ifconfig.c:290 +-msgid "ALLMULTI " +-msgstr "ALLMULTI " ++#. 1 = ARPable ++#: ../ifconfig.c:227 ++#, c-format ++msgid " =Address family. Default: %s\n" ++msgstr " =Adressfamilie. Standardwert: %s\n" + +-#: ../ifconfig.c:292 +-msgid "SLAVE " +-msgstr "SLAVE " ++#: ../ifconfig.c:228 ++#, c-format ++msgid " List of possible address families:\n" ++msgstr " List der mglichen Adressfamilien:\n" + +-#: ../ifconfig.c:294 +-msgid "MASTER " +-msgstr "MASTER " ++#: ../ifconfig.c:303 ++#, c-format ++msgid "ifconfig: option `%s' not recognised.\n" ++msgstr "" + +-#: ../ifconfig.c:296 +-msgid "MULTICAST " +-msgstr "MULTICAST " ++#: ../ifconfig.c:305 ../ifconfig.c:962 ++#, c-format ++msgid "ifconfig: `--help' gives usage information.\n" ++msgstr "" + +-#: ../ifconfig.c:299 +-msgid "DYNAMIC " +-msgstr "DYNAMIC " ++#: ../ifconfig.c:380 ++#, c-format ++msgid "Unknown media type.\n" ++msgstr "Typ des Mediums unbekannt.\n" + +-#: ../ifconfig.c:302 ++#: ../ifconfig.c:417 + #, c-format +-msgid " MTU:%d Metric:%d" +-msgstr " MTU:%d Metric:%d" ++msgid "" ++"Warning: Interface %s still in promisc mode... maybe other application is " ++"running?\n" ++msgstr "" + +-#: ../ifconfig.c:306 ++#: ../ifconfig.c:429 + #, c-format +-msgid " Outfill:%d Keepalive:%d" +-msgstr " Outfill:%d Keepalive:%d" ++msgid "Warning: Interface %s still in MULTICAST mode.\n" ++msgstr "" + +-#: ../ifconfig.c:320 ++#: ../ifconfig.c:441 + #, c-format +-msgid "RX packets:%lu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" ++msgid "Warning: Interface %s still in ALLMULTI mode.\n" + msgstr "" +-"Empfangene Pakete:%lu Fehler:%lu Weggeworfen:%lu berlauf:%lu Rahmen:%lu\n" + +-#: ../ifconfig.c:325 ++#: ../ifconfig.c:465 + #, c-format +-msgid " compressed:%lu\n" +-msgstr " komprimiert:%lu\n" ++msgid "Warning: Interface %s still in DYNAMIC mode.\n" ++msgstr "" + +-#: ../ifconfig.c:329 ++#: ../ifconfig.c:523 + #, c-format +-msgid "TX packets:%lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" ++msgid "Warning: Interface %s still in BROADCAST mode.\n" + msgstr "" +-"Verschickte Pakete:%lu Fehler:%lu Weggeworfen:%lu berlauf:%lu Trger:%lu\n" + +-#: ../ifconfig.c:333 ++#: ../ifconfig.c:652 + #, c-format +-msgid " collisions:%lu " +-msgstr " Kollisionen:%lu " ++msgid "Warning: Interface %s still in POINTOPOINT mode.\n" ++msgstr "" + +-#: ../ifconfig.c:335 ++#: ../ifconfig.c:684 + #, c-format +-msgid "compressed:%lu " +-msgstr "Komprimiert:%lu " ++msgid "hw address type `%s' has no handler to set address. failed.\n" ++msgstr "" + +-#: ../ifconfig.c:337 ++#: ../ifconfig.c:693 + #, c-format +-msgid "txqueuelen:%d " +-msgstr "Sendewarteschlangenlnge:%d " ++msgid "%s: invalid %s address.\n" ++msgstr "%s: ungltige %s Adresse.\n" + +-#: ../ifconfig.c:345 ++#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913 + #, c-format +-msgid "Interrupt:%d " +-msgstr "Interrupt:%d " +- +-#. Only print devices using it for +-#. I/O maps +-#: ../ifconfig.c:348 +-#, c-format +-msgid "Base address:0x%x " +-msgstr "Basisadresse:0x%x " +- +-#: ../ifconfig.c:350 +-#, c-format +-msgid "Memory:%lx-%lx " +-msgstr "Speicher:%lx-%lx " +- +-#: ../ifconfig.c:353 +-#, c-format +-msgid "DMA chan:%x " +-msgstr "DMA Kanal:%x " ++msgid "No support for INET6 on this system.\n" ++msgstr "INET6 ist auf diesem System nicht verfgbar.\n" + +-#: ../ifconfig.c:384 ../ifconfig.c:405 ++#: ../ifconfig.c:780 ../ifconfig.c:871 + #, c-format +-msgid "%s: unknown interface: %s\n" +-msgstr "%s: unbekannte Schnittstelle: %s\n" +- +-#: ../ifconfig.c:421 +-msgid "" +-"Usage:\n" +-" ifconfig [-a] [-i] [-v] [[]
]\n" +-msgstr "" +-"Syntax:\n" +-" ifconfig [-a] [-i] [-v] [[] ]\n" +- +-#: ../ifconfig.c:425 +-msgid " [add
[/]]\n" +-msgstr " [add [/]]\n" +- +-#: ../ifconfig.c:427 +-msgid " [del
[/]]\n" +-msgstr " [del [/]]\n" +- +-#: ../ifconfig.c:432 +-msgid " [[-]broadcast [
]] [[-]pointopoint [
]]\n" +-msgstr " [[-]broadcast []] [[-]pointopoint []]\n" +- +-#: ../ifconfig.c:433 +-msgid " [netmask
] [dstaddr
] [tunnel
]\n" +-msgstr " [netmask ] [dstaddr ] [tunnel ]\n" +- +-#: ../ifconfig.c:436 +-msgid " [outfill ] [keepalive ]\n" +-msgstr " [outfill ] [keepalive ]\n" +- +-#: ../ifconfig.c:438 +-msgid " [hw
] [metric ] [mtu ]\n" +-msgstr " [hw ] [metric ] [mtu ]\n" +- +-#: ../ifconfig.c:439 +-msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" +-msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" +- +-#: ../ifconfig.c:440 +-msgid " [multicast] [[-]promisc]\n" +-msgstr " [multicast] [[-]promisc]\n" +- +-#: ../ifconfig.c:441 +-msgid " [mem_start ] [io_addr ] [irq ] [media ]\n" +-msgstr " [mem_start ] [io_addr ] [irq ] [media ]\n" +- +-#: ../ifconfig.c:443 +-msgid " [txqueuelen ]\n" +-msgstr " [txqueuelen ]\n" +- +-#: ../ifconfig.c:446 +-msgid " [[-]dynamic]\n" +-msgstr " [[-]dynamic]\n" +- +-#: ../ifconfig.c:448 +-msgid "" +-" [up|down] ...\n" +-"\n" ++msgid "Interface %s not initialized\n" + msgstr "" +-" [up|down] ...\n" +-"\n" +- +-#: ../ifconfig.c:450 +-msgid " =Hardware Type.\n" +-msgstr " =Hardwaretyp.\n" +- +-#: ../ifconfig.c:451 +-msgid " List of possible hardware types:\n" +-msgstr " Liste mglicher Hardwaretypen:\n" +- +-#. 1 = ARPable +-#: ../ifconfig.c:453 +-#, c-format +-msgid " =Address family. Default: %s\n" +-msgstr " =Adressfamilie. Standardwert: %s\n" +- +-#: ../ifconfig.c:454 +-msgid " List of possible address families:\n" +-msgstr " List der mglichen Adressfamilien:\n" +- +-#: ../ifconfig.c:593 +-msgid "Unknown media type.\n" +-msgstr "Typ des Mediums unbekannt.\n" + +-#: ../ifconfig.c:881 +-#, c-format +-msgid "%s: invalid %s address.\n" ++#: ../ifconfig.c:792 ../ifconfig.c:882 ++#, fuzzy, c-format ++msgid "Bad address.\n" + msgstr "%s: ungltige %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 verfgbar.\n" +- +-#: ../ifconfig.c:983 ++#: ../ifconfig.c:885 ++#, c-format + msgid "Address deletion not supported on this system.\n" +-msgstr "Das Lschen von Adressen ist auf diesem System nicht untersttzt.\n" ++msgstr "Das Lschen von Adressen wird auf diesem System nicht untersttzt.\n" + +-#: ../ifconfig.c:1066 +-msgid "No support for INET on this system.\n" +-msgstr "INET ist auf diesem System nicht verfgbar.\n" ++#: ../ifconfig.c:957 ++#, fuzzy, c-format ++msgid "ifconfig: Cannot set address for this protocol family.\n" ++msgstr "Kann die Adressen der Familie %d nicht setzen.\n" + +-#: ../ifconfig.c:1076 ++#: ../ifconfig.c:983 ++#, c-format + msgid "No support for ECONET on this system.\n" + msgstr "ECONET wird auf diesem System nicht untersttzt.\n" + +-#: ../ifconfig.c:1084 ++#: ../ifconfig.c:991 + #, c-format + msgid "Don't know how to set addresses for family %d.\n" + msgstr "Kann die Adressen der Familie %d nicht setzen.\n" + +-#: ../netstat.c:383 ++#: ../ifconfig.c:1021 ++#, c-format ++msgid "WARNING: at least one error occured. (%d)\n" ++msgstr "" ++ ++#: ../netstat.c:434 + #, c-format + msgid "" + "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n" +-msgstr "" +-"(Fr \"-p\": geteuid()=%d konnte keine Information gelesen werden; sie " +-"sollten Root sein.)\n" ++msgstr "(Fr \"-p\": geteuid()=%d konnte keine Information gelesen werden; sie sollten Root sein.)\n" + +-#: ../netstat.c:387 ++#: ../netstat.c:438 ++#, c-format + msgid "" + "(Not all processes could be identified, non-owned process info\n" + " will not be shown, you would have to be root to see it all.)\n" +@@ -776,198 +688,220 @@ msgstr "" + "(Es konnten nicht alle Prozesse identifiziert werden; Informationen ber\n" + "nicht-eigene Processe werden nicht angezeigt; Root kann sie anzeigen.)\n" + +-#: ../netstat.c:394 ../netstat.c:1089 ../netstat.c:1166 ++#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266 + msgid "LISTENING" + msgstr "HRT" + +-#: ../netstat.c:395 ++#: ../netstat.c:446 + msgid "CONN SENT" + msgstr "VERBINGSAUFBAU GESCHICKT" + +-#: ../netstat.c:396 ../netstat.c:1168 ++#: ../netstat.c:447 ../netstat.c:1268 + msgid "DISC SENT" + msgstr "VERBINDUNGSABBAU GESCHICKT" + +-#: ../netstat.c:397 ../netstat.c:464 ../netstat.c:809 ../netstat.c:1169 ++#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269 + msgid "ESTABLISHED" + msgstr "VERBUNDEN" + +-#: ../netstat.c:419 ++#: ../netstat.c:470 ++#, c-format + msgid "Active NET/ROM sockets\n" + msgstr "Aktive NET/ROM Sockets\n" + +-#: ../netstat.c:420 ++#: ../netstat.c:471 ++#, c-format + msgid "" +-"User Dest Source Device State Vr/Vs Send-Q " +-"Recv-Q\n" +-msgstr "" +-"Benutzer Ziel Quelle Gert Zustand Vr/Vs Send-Q " +-"Recv-Q\n" ++"User Dest Source Device State Vr/Vs Send-Q Recv-" ++"Q\n" ++msgstr "Benutzer Ziel Quelle Gert Zustand Vr/Vs Send-Q Recv-Q\n" + +-#: ../netstat.c:430 ../netstat.c:1208 ++#: ../netstat.c:481 ../netstat.c:1308 + #, c-format + msgid "Problem reading data from %s\n" + msgstr "Probleme beim Lesen von %s\n" + +-#: ../netstat.c:465 ++#: ../netstat.c:516 + msgid "SYN_SENT" + msgstr "SYN_SENT" + +-#: ../netstat.c:466 ++#: ../netstat.c:517 + msgid "SYN_RECV" + msgstr "SYN_RECV" + +-#: ../netstat.c:467 ++#: ../netstat.c:518 + msgid "FIN_WAIT1" + msgstr "FIN_WAIT1" + +-#: ../netstat.c:468 ++#: ../netstat.c:519 + msgid "FIN_WAIT2" + msgstr "FIN_WAIT2" + +-#: ../netstat.c:469 ++#: ../netstat.c:520 + msgid "TIME_WAIT" + msgstr "TIME_WAIT" + +-#: ../netstat.c:470 ++#: ../netstat.c:521 + msgid "CLOSE" + msgstr "CLOSE" + +-#: ../netstat.c:471 ++#: ../netstat.c:522 + msgid "CLOSE_WAIT" + msgstr "CLOSE_WAIT" + +-#: ../netstat.c:472 ++#: ../netstat.c:523 + msgid "LAST_ACK" + msgstr "LAST_ACK" + +-#: ../netstat.c:473 ++#: ../netstat.c:524 + msgid "LISTEN" + msgstr "LISTEN" + +-#: ../netstat.c:474 ++#: ../netstat.c:525 + msgid "CLOSING" + msgstr "CLOSING" + +-#: ../netstat.c:544 ++#: ../netstat.c:596 + #, c-format + msgid "warning, got bogus igmp6 line %d.\n" + msgstr "Warnung, fehlerhafte igmp6 line %d.\n" + +-#: ../netstat.c:549 ../netstat.c:587 ../netstat.c:670 ../netstat.c:803 +-#: ../netstat.c:935 ../netstat.c:940 ++#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898 ++#: ../netstat.c:1032 ../netstat.c:1037 + #, c-format + msgid "netstat: unsupported address family %d !\n" + msgstr "netstat: Nicht untersttzte Adressfamilie %d!\n" + +-#: ../netstat.c:562 ../netstat.c:567 ../netstat.c:575 ../netstat.c:582 ++#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634 + #, c-format + msgid "warning, got bogus igmp line %d.\n" + msgstr "Warnung, fehlerhafte igmp-Zeile %d.\n" + +-#: ../netstat.c:666 ++#: ../netstat.c:677 ++#, fuzzy, c-format ++msgid "Active X.25 sockets\n" ++msgstr "Aktive AX.25 Sockets\n" ++ ++#. IMHO, Vr/Vs is not very usefull --SF ++#: ../netstat.c:679 ++#, fuzzy, c-format ++msgid "" ++"Dest Source Device LCI State Vr/Vs Send-Q Recv-" ++"Q\n" ++msgstr "Ziel Quelle Gert Zustand Vr/Vs Send-Q Empf-Q\n" ++ ++#: ../netstat.c:759 ++#, c-format + msgid "warning, got bogus tcp line.\n" + msgstr "Warnung, fehlerhafte TCP Zeile.\n" + +-#: ../netstat.c:704 ../netstat.c:855 ../netstat.c:975 ++#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075 + #, c-format + msgid "off (0.00/%ld/%d)" + msgstr "aus (0.00/%ld/%d)" + +-#: ../netstat.c:708 ++#: ../netstat.c:804 + #, c-format + msgid "on (%2.2f/%ld/%d)" + msgstr "ein (%2.2f/%ld/%d)" + +-#: ../netstat.c:713 ++#: ../netstat.c:809 + #, fuzzy, c-format + msgid "keepalive (%2.2f/%ld/%d)" + msgstr "ein%d (%2.2f/%ld/%d)" + +-#: ../netstat.c:718 ++#: ../netstat.c:814 + #, fuzzy, c-format + msgid "timewait (%2.2f/%ld/%d)" + msgstr "ein%d (%2.2f/%ld/%d)" + +-#: ../netstat.c:723 ../netstat.c:864 ../netstat.c:985 ++#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085 + #, c-format + msgid "unkn-%d (%2.2f/%ld/%d)" + msgstr "unkn-%d (%2.2f/%ld/%d)" + +-#: ../netstat.c:799 ++#: ../netstat.c:894 ++#, c-format + msgid "warning, got bogus udp line.\n" + msgstr "Warnung, fehlerhafe UDP-Zeile.\n" + +-#: ../netstat.c:817 ../netstat.c:1075 ../netstat.c:1108 ++#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208 + msgid "UNKNOWN" + msgstr "UNBEKANNT" + +-#: ../netstat.c:860 ../netstat.c:980 ++#: ../netstat.c:958 ../netstat.c:1080 + #, c-format + msgid "on%d (%2.2f/%ld/%d)" + msgstr "ein%d (%2.2f/%ld/%d)" + +-#: ../netstat.c:949 ++#: ../netstat.c:1046 ++#, c-format + msgid "warning, got bogus raw line.\n" + msgstr "Warnung, fehlerhafte raw-Zeile.\n" + +-#: ../netstat.c:1028 ++#: ../netstat.c:1128 ++#, c-format + msgid "warning, got bogus unix line.\n" + msgstr "Warnung, fehlerhafte UNIX-Zeile.\n" + +-#: ../netstat.c:1055 ++#: ../netstat.c:1155 + msgid "STREAM" + msgstr "STREAM" + +-#: ../netstat.c:1059 ++#: ../netstat.c:1159 + msgid "DGRAM" + msgstr "DGRAM" + +-#: ../netstat.c:1063 ++#: ../netstat.c:1163 + msgid "RAW" + msgstr "RAW" + +-#: ../netstat.c:1067 ++#: ../netstat.c:1167 + msgid "RDM" + msgstr "RDM" + +-#: ../netstat.c:1071 ++#: ../netstat.c:1171 + msgid "SEQPACKET" +-msgstr "SEQPACKET" ++msgstr "SEQPAKET" + +-#: ../netstat.c:1080 ++#: ../netstat.c:1180 + msgid "FREE" + msgstr "FREI" + +-#: ../netstat.c:1096 ++#: ../netstat.c:1196 + msgid "CONNECTING" + msgstr "VERBINDUNGSAUFBAU" + +-#: ../netstat.c:1100 ++#: ../netstat.c:1200 + msgid "CONNECTED" + msgstr "VERBUNDEN" + +-#: ../netstat.c:1104 ++#: ../netstat.c:1204 + msgid "DISCONNECTING" + msgstr "VERBINDUNGSABBAU" + +-#: ../netstat.c:1135 ++#: ../netstat.c:1235 ++#, c-format + msgid "Active UNIX domain sockets " +-msgstr "Aktive Sockets in der UNIX Domne " ++msgstr "Aktive Sockets in der UNIX-Domne " + +-#: ../netstat.c:1137 ../netstat.c:1666 ++#: ../netstat.c:1237 ../netstat.c:1756 ++#, c-format + msgid "(servers and established)" + msgstr "(Server und stehende Verbindungen)" + +-#: ../netstat.c:1140 ../netstat.c:1669 ++#: ../netstat.c:1240 ../netstat.c:1759 ++#, c-format + msgid "(only servers)" + msgstr "(Nur Server)" + +-#: ../netstat.c:1142 ../netstat.c:1671 ++#: ../netstat.c:1242 ../netstat.c:1761 ++#, c-format + msgid "(w/o servers)" + msgstr "(ohne Server)" + +-#: ../netstat.c:1145 ++#: ../netstat.c:1245 ++#, c-format + msgid "" + "\n" + "Proto RefCnt Flags Type State I-Node" +@@ -975,90 +909,90 @@ msgstr "" + "\n" + "Proto RefZh Flaggen Typ Zustand I-Node" + +-#: ../netstat.c:1147 ++#: ../netstat.c:1247 ++#, c-format + msgid " Path\n" + msgstr " Pfad\n" + +-#: ../netstat.c:1167 ++#: ../netstat.c:1267 + msgid "SABM SENT" + msgstr "SABM GESCHICKT" + +-#: ../netstat.c:1170 ++#: ../netstat.c:1270 + msgid "RECOVERY" + msgstr "WIEDERHERSTELLUNG" + +-#: ../netstat.c:1184 ++#: ../netstat.c:1284 ++#, c-format + msgid "Active AX.25 sockets\n" + msgstr "Aktive AX.25 Sockets\n" + +-#: ../netstat.c:1185 ++#: ../netstat.c:1285 ++#, c-format + msgid "Dest Source Device State Vr/Vs Send-Q Recv-Q\n" + msgstr "Ziel Quelle Gert Zustand Vr/Vs Send-Q Empf-Q\n" + +-#: ../netstat.c:1228 ++#: ../netstat.c:1328 + #, c-format + msgid "problem reading data from %s\n" + msgstr "Problem beim Lesen von Daten von %s\n" + +-#: ../netstat.c:1279 ++#: ../netstat.c:1379 ++#, c-format + msgid "" + "Active IPX sockets\n" + "Proto Recv-Q Send-Q Local Address Foreign Address " + "State" + msgstr "" + "Aktive IPX Sockets\n" +-"Proto Recv-Q Send-Q Lokale Adresse Gegenaddress " ++"Proto Recv-Q Send-Q Lokale Adresse Gegenadresse " + "Zustand" + +-#: ../netstat.c:1281 ++#: ../netstat.c:1381 ++#, c-format + msgid " User" + msgstr " Benutzer" + +-#: ../netstat.c:1315 ++#: ../netstat.c:1415 + msgid "ESTAB" + msgstr "VERBUNDEN" + +-#: ../netstat.c:1323 ++#: ../netstat.c:1423 + msgid "UNK." + msgstr "UNB." + +-#: ../netstat.c:1367 +-msgid " - no statistics available -" +-msgstr " - keine Statistiken verfgbar -" +- +-#: ../netstat.c:1370 +-msgid "[NO FLAGS]" +-msgstr "[KEINE FLAGS]" +- +-#: ../netstat.c:1400 ++#: ../netstat.c:1461 ++#, c-format + msgid "Kernel Interface table\n" +-msgstr "Kernel Schnittstellentabelle\n" ++msgstr "Kernel-Schnittstellentabelle\n" + +-#: ../netstat.c:1401 ++#: ../netstat.c:1465 ++#, fuzzy, c-format + msgid "" +-"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " +-"Flg\n" +-msgstr "" +-"SStelle MTU Met RX-OK RX-Feh RX-DRP RX-lf TX-OK TX-Feh TX-DRP TX-b " ++"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " + "Flg\n" ++msgstr "SStelle MTU Met RX-OK RX-Feh RX-DRP RX-lf TX-OK TX-Feh TX-DRP TX-b Flg\n" + +-#: ../netstat.c:1404 ++#: ../netstat.c:1469 + msgid "missing interface information" +-msgstr "Fehlende Interfaceinformation" ++msgstr "Fehlende Interfaceinformationen" + +-#: ../netstat.c:1425 ++#: ../netstat.c:1492 ++#, c-format + msgid "" +-"usage: netstat [-veenNcCF] [] -r netstat " +-"{-V|--version|-h|--help}\n" ++"usage: netstat [-veenNcCF] [] -r netstat {-V|--version|-h|--" ++"help}\n" + msgstr "" + "Benutzung: netstat [-veenNcCF] [] -r\n" + " netstat {-V|--version|-h|--help}\n" + +-#: ../netstat.c:1426 ++#: ../netstat.c:1493 ++#, c-format + msgid " netstat [-vnNcaeol] [ ...]\n" + msgstr " netstat [-vnNcaeol] [ ...]\n" + +-#: ../netstat.c:1427 ++#: ../netstat.c:1494 ++#, c-format + msgid "" + " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" + "\n" +@@ -1066,27 +1000,32 @@ msgstr "" + " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" + "\n" + +-#: ../netstat.c:1429 ++#: ../netstat.c:1496 ++#, c-format + msgid " -r, --route display routing table\n" + msgstr " -r, --route Routentabelle anzeigen\n" + +-#: ../netstat.c:1430 ++#: ../netstat.c:1497 ++#, c-format + msgid " -i, --interfaces display interface table\n" + msgstr " -i, --interfaces Schnittstellentabelle auflisten\n" + +-#: ../netstat.c:1431 ++#: ../netstat.c:1498 ++#, c-format + msgid " -g, --groups display multicast group memberships\n" + msgstr "" + " -g, --groups Mitgliedschaft in Multicastgruppen " + "anzeigen\n" + +-#: ../netstat.c:1432 ++#: ../netstat.c:1499 ++#, c-format + msgid "" + " -s, --statistics display networking statistics (like SNMP)\n" + msgstr "" + " -s, --statistics Netzwerksstatistiken anzeigen (wie SNMP)\n" + +-#: ../netstat.c:1434 ++#: ../netstat.c:1501 ++#, c-format + msgid "" + " -M, --masquerade display masqueraded connections\n" + "\n" +@@ -1094,23 +1033,38 @@ msgstr "" + " -M, --masquerade Maskierte Verbindungen auflisten\n" + "\n" + +-#: ../netstat.c:1438 ../route.c:87 ++#: ../netstat.c:1505 ++#, fuzzy, c-format ++msgid " --numeric-hosts don't resolve host names\n" ++msgstr " -n, --numeric Adressen nicht nach Namen auflsen\n" ++ ++#: ../netstat.c:1506 ++#, fuzzy, c-format ++msgid " --numeric-ports don't resolve port names\n" ++msgstr " -n, --numeric Adressen nicht nach Namen auflsen\n" ++ ++#: ../netstat.c:1507 ++#, fuzzy, c-format ++msgid " --numeric-users don't resolve user names\n" ++msgstr " -n, --numeric Adressen nicht nach Namen auflsen\n" ++ ++#: ../netstat.c:1508 ++#, c-format + msgid " -N, --symbolic resolve hardware names\n" + msgstr " -N, --symbolic Hardwarenamen auflsen\n" + +-#: ../netstat.c:1439 ../route.c:88 +-#, fuzzy ++#: ../netstat.c:1509 ../route.c:88 ++#, fuzzy, c-format + msgid " -e, --extend display other/more information\n" +-msgstr "" +-" -e, --extend Weitere / zustzliche Informationen " +-"anzeigen\n" ++msgstr " -e, --extend Weitere / zustzliche Informationen anzeigen\n" + +-#: ../netstat.c:1440 ++#: ../netstat.c:1510 ++#, c-format + msgid " -p, --programs display PID/Program name for sockets\n" +-msgstr "" +-" -p, --programs PID/Programmnamen fr Sockets anzeigen\n" ++msgstr " -p, --programs PID/Programmnamen fr Sockets anzeigen\n" + +-#: ../netstat.c:1441 ++#: ../netstat.c:1511 ++#, c-format + msgid "" + " -c, --continuous continuous listing\n" + "\n" +@@ -1118,24 +1072,27 @@ msgstr "" + " -c, --continuous Anzeige laufend aktualisieren\n" + "\n" + +-#: ../netstat.c:1442 ++#: ../netstat.c:1512 ++#, c-format + msgid " -l, --listening display listening server sockets\n" + msgstr "" + " -l, --listening Empfangsbereite Serversockets auflisten\n" + +-#: ../netstat.c:1443 ++#: ../netstat.c:1513 ++#, c-format + msgid "" + " -a, --all, --listening display all sockets (default: connected)\n" + msgstr "" + " -a, --all, --listening Alle Sockets anzeigen (normal: nur " + "verbundene)\n" + +-#: ../netstat.c:1444 ++#: ../netstat.c:1514 ++#, c-format + msgid " -o, --timers display timers\n" + msgstr " -o, --timers Timer auflisten\n" + +-#: ../netstat.c:1445 ../route.c:89 +-#, fuzzy ++#: ../netstat.c:1515 ../route.c:89 ++#, fuzzy, c-format + msgid "" + " -F, --fib display Forwarding Information Base " + "(default)\n" +@@ -1143,7 +1100,8 @@ msgstr "" + " -F, --fib Forwarding Infomation Base anzeigen " + "(Standard)\n" + +-#: ../netstat.c:1446 ../route.c:90 ++#: ../netstat.c:1516 ../route.c:90 ++#, c-format + msgid "" + " -C, --cache display routing cache instead of FIB\n" + "\n" +@@ -1151,110 +1109,118 @@ msgstr "" + " -C, --cache Routencache statt FIB anzeigen\n" + "\n" + +-#: ../netstat.c:1448 ++#: ../netstat.c:1518 ++#, c-format + msgid "" +-" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx " +-"--netrom\n" ++" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" ++"netrom\n" + msgstr "" +-" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx " +-"--netrom\n" ++" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" ++"netrom\n" + +-#: ../netstat.c:1449 ../route.c:92 +-#, c-format +-msgid " =Use '-A ' or '--' Default: %s\n" ++#: ../netstat.c:1519 ++#, fuzzy, c-format ++msgid " =Use '-6|-4' or '-A ' or '--'; default: %s\n" + msgstr " =,,-A '' or ,,--'' benutzen. Standard: %s\n" + +-#: ../netstat.c:1450 ../route.c:93 ++#: ../netstat.c:1520 ../route.c:93 ++#, c-format + msgid " List of possible address families (which support routing):\n" + msgstr " Liste mglicher Adressfamilien, die Routen untersttzen:\n" + +-#: ../netstat.c:1663 ++#: ../netstat.c:1753 ++#, c-format + msgid "Active Internet connections " + msgstr "Aktive Internetverbindungen " + +-#: ../netstat.c:1673 ++#: ../netstat.c:1763 ++#, c-format + msgid "" + "\n" +-"Proto Recv-Q Send-Q Local Address Foreign Address State " +-" " ++"Proto Recv-Q Send-Q Local Address Foreign Address " ++"State " + msgstr "" + "\n" +-"Proto Recv-Q Send-Q Local Address Foreign Address State " +-" " ++"Proto Recv-Q Send-Q Local Address Foreign Address " ++"State " + +-#: ../netstat.c:1675 ++#: ../netstat.c:1765 ++#, c-format + msgid " User Inode " + msgstr " Benutzer Inode " + +-#: ../netstat.c:1678 ++#: ../netstat.c:1768 ++#, c-format + msgid " Timer" + msgstr " Timer" + +-#: ../netstat.c:1708 ++#: ../netstat.c:1798 ++#, c-format + msgid "IPv4 Group Memberships\n" +-msgstr "IPv4 Gruppenmitgliedschaften\n" ++msgstr "IPv4-Gruppenmitgliedschaften\n" + +-#: ../netstat.c:1709 ++#: ../netstat.c:1799 ++#, c-format + msgid "Interface RefCnt Group\n" + msgstr "Schnittstelle RefZh Grupp\n" + +-#: ../rarp.c:43 ++#: ../rarp.c:44 + msgid "This kernel does not support RARP.\n" + msgstr "Dieser Kernel untersttzt kein RARP.\n" + +-#: ../rarp.c:82 ++#: ../rarp.c:83 + #, c-format + msgid "no RARP entry for %s.\n" +-msgstr "Kein RARP Eintrag fr %s.\n" ++msgstr "Kein RARP-Eintrag fr %s.\n" + +-#: ../rarp.c:95 ++#: ../rarp.c:96 + #, c-format + msgid "%s: bad hardware address\n" + msgstr "%s: fehlerhafte Hardwareadresse\n" + +-#: ../rarp.c:127 ++#: ../rarp.c:128 + #, c-format + msgid "rarp: cannot open file %s:%s.\n" + msgstr "rarp: kann Datei %s:%s nicht ffnen.\n" + +-#: ../rarp.c:139 ++#: ../rarp.c:140 + #, c-format + msgid "rarp: format error at %s:%u\n" + msgstr "rarp: Formatfehler bei %s:%u\n" + +-#: ../rarp.c:143 ../rarp.c:287 ++#: ../rarp.c:144 ../rarp.c:289 + #, c-format + msgid "rarp: %s: unknown host\n" + msgstr "rarp: %s: Unbekannter Host\n" + +-#: ../rarp.c:146 ++#: ../rarp.c:147 + #, c-format + msgid "rarp: cannot set entry from %s:%u\n" + msgstr "rarp: Kann Eintrag aus %s:%u nicht setzen.\n" + +-#: ../rarp.c:175 ++#: ../rarp.c:176 ++#, c-format + msgid "Usage: rarp -a list entries in cache.\n" +-msgstr "" +-"Benutzung: rarp -a Eintrge im Cache listen.\n" ++msgstr "Benutzung: rarp -a Eintrge im Cache listen.\n" + +-#: ../rarp.c:176 ++#: ../rarp.c:177 ++#, c-format + msgid " rarp -d delete entry from cache.\n" +-msgstr "" +-" rarp -d Eintrag aus dem Cache lschen.\n" ++msgstr " rarp -d Eintrag aus dem Cache lschen.\n" + +-#: ../rarp.c:177 ++#: ../rarp.c:178 ++#, c-format + msgid " rarp [] -s add entry to cache.\n" +-msgstr "" +-" rarp [] -s Eintrag zum Cache zufgen.\n" ++msgstr " rarp [] -s Eintrag zum Cache zufgen.\n" + +-#: ../rarp.c:178 ++#: ../rarp.c:179 ++#, c-format + msgid "" + " rarp -f add entries from /etc/ethers.\n" +-msgstr "" +-" rarp -f Eintrge aus /etc/ethers " +-"zufgen.\n" ++msgstr " rarp -f Eintrge aus /etc/ethers zufgen.\n" + +-#: ../rarp.c:179 ++#: ../rarp.c:180 ++#, c-format + msgid "" + " rarp -V display program version.\n" + "\n" +@@ -1262,24 +1228,26 @@ msgstr "" + " rarp -V Programmversion anzeigen.\n" + "\n" + +-#: ../rarp.c:236 ++#: ../rarp.c:238 + #, c-format + msgid "%s: illegal option mix.\n" + msgstr "%s: Unerlaubte Mischung von Optionen.\n" + +-#: ../rarp.c:267 ++#: ../rarp.c:269 + #, c-format + msgid "rarp: %s: unknown hardware type.\n" +-msgstr "rarp: %s: unknown hardware type.\n" ++msgstr "rarp: %s: unbekannter Hardwaretyp.\n" + +-#: ../route.c:79 ++#: ../route.c:80 ++#, c-format + msgid "" + "Usage: route [-nNvee] [-FC] [] List kernel routing tables\n" + msgstr "" + "Benutzung: route [-nNvee] [-FC] [] Kernelroutentabelle " + "anzeigen\n" + +-#: ../route.c:80 ++#: ../route.c:81 ++#, c-format + msgid "" + " route [-v] [-FC] {add|del|flush} ... Modify routing table for AF.\n" + "\n" +@@ -1287,14 +1255,15 @@ msgstr "" + " route [-v] [-FC] {add|del|flush} ... Routentabelle fr AF ndern.\n" + "\n" + +-#: ../route.c:82 ++#: ../route.c:83 ++#, c-format + msgid "" + " route {-h|--help} [] Detailed usage syntax for " + "specified AF.\n" +-msgstr "" +-" route {-h|--help} [] Genaue Syntax fr AF anzeigen.\n" ++msgstr " route {-h|--help} [] Genaue Syntax fr AF anzeigen.\n" + +-#: ../route.c:83 ++#: ../route.c:84 ++#, c-format + msgid "" + " route {-V|--version} Display version/author and " + "exit.\n" +@@ -1304,590 +1273,891 @@ msgstr "" + "Ende.\n" + "\n" + ++#: ../route.c:92 ++#, fuzzy, c-format ++msgid " =Use '-A ' or '--'; default: %s\n" ++msgstr " =,,-A '' or ,,--'' benutzen. Standard: %s\n" ++ + #: ../plipconfig.c:66 ++#, c-format + msgid "Usage: plipconfig [-a] [-i] [-v] interface\n" + msgstr "Benutzung: plipconfig [-a] [-i] [-v] Interface\n" + + #: ../plipconfig.c:67 ++#, c-format + msgid " [nibble NN] [trigger NN]\n" + msgstr " [nibble NN] [trigger NN]\n" + + #: ../plipconfig.c:68 +-#, fuzzy ++#, c-format + msgid " plipconfig -V | --version\n" +-msgstr " plipconfig -V\n" ++msgstr " plipconfig -V | --version\n" + + #: ../plipconfig.c:74 + #, c-format + msgid "%s\tnibble %lu trigger %lu\n" + msgstr "%s\tnibble %lu trigger %lu\n" + +-#: ../iptunnel.c:79 ++#: ../iptunnel.c:85 ++#, c-format + msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n" + msgstr "Benutzung: iptunnel { add | change | del | show } [ NAME ]\n" + +-#: ../iptunnel.c:80 ++#: ../iptunnel.c:86 ++#, c-format + msgid "" + " [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n" + msgstr " [ mode { ipip | gre | sit } ] [ remote ADR ] [ local ADR ]\n" + +-#: ../iptunnel.c:81 ++#: ../iptunnel.c:87 ++#, c-format + msgid " [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n" + msgstr " [ [i|o]seq ] [ [i|o]key SCHLSSEL ] [ [i|o]csum ]\n" + +-#: ../iptunnel.c:82 +-#, fuzzy ++#: ../iptunnel.c:88 ++#, c-format + msgid " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n" +-msgstr "" +-" [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_GERt ]\n" +-"\n" ++msgstr " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_GERt ]\n" + +-#: ../iptunnel.c:83 ++#: ../iptunnel.c:89 ++#, c-format + msgid "" + " iptunnel -V | --version\n" + "\n" + msgstr "" ++" iptunnel -V | --version\n" ++"\n" + +-#: ../iptunnel.c:84 ++#: ../iptunnel.c:90 ++#, c-format + msgid "Where: NAME := STRING\n" + msgstr "Wobei: NAME := ZEICHENKETTE\n" + +-#: ../iptunnel.c:85 ++#: ../iptunnel.c:91 ++#, c-format + msgid " ADDR := { IP_ADDRESS | any }\n" + msgstr " ADR := { IP_ADRESSE | any }\n" + +-#: ../iptunnel.c:86 ++#: ../iptunnel.c:92 ++#, c-format + msgid " TOS := { NUMBER | inherit }\n" + msgstr " TOS := { NUMBER | inherit }\n" + +-#: ../iptunnel.c:87 ++#: ../iptunnel.c:93 ++#, c-format + msgid " TTL := { 1..255 | inherit }\n" + msgstr " TTL := { 1..255 | inherit }\n" + +-#: ../iptunnel.c:88 ++#: ../iptunnel.c:94 ++#, c-format + msgid " KEY := { DOTTED_QUAD | NUMBER }\n" + msgstr " KEY := { DOTTED_QUAD | ZAHL }\n" + +-#: ../iptunnel.c:326 ++#: ../iptunnel.c:332 ++#, c-format + msgid "Keys are not allowed with ipip and sit.\n" + msgstr "Schlssel sind mit ipip und sit nicht erlaubt.\n" + +-#: ../iptunnel.c:346 ++#: ../iptunnel.c:352 ++#, c-format + msgid "Broadcast tunnel requires a source address.\n" + msgstr "Ein Broadcasttunnel ist nur mit einer Quelladresse mglich\n" + +-#: ../iptunnel.c:361 ++#: ../iptunnel.c:367 ++#, c-format + msgid "ttl != 0 and noptmudisc are incompatible\n" + msgstr "ttl != 0 und noptmudisc sind inkompatibel\n" + +-#: ../iptunnel.c:373 ++#: ../iptunnel.c:379 ++#, c-format + msgid "cannot determine tunnel mode (ipip, gre or sit)\n" + msgstr "" + "Die Tunnelbetriebsart (ipip, fre oder sit) kann nicht festgestellt werden\n" + +-#: ../iptunnel.c:411 ++#: ../iptunnel.c:417 + #, c-format + msgid "%s: %s/ip remote %s local %s " + msgstr "%s: %s/ip Gegenseite %s lokal %s " + +-#: ../iptunnel.c:415 ++#: ../iptunnel.c:421 + msgid "unknown" + msgstr "Unbekannt" + +-#: ../iptunnel.c:447 ++#: ../iptunnel.c:453 ++#, c-format + msgid " Drop packets out of sequence.\n" + msgstr " Pakete auer der Reihenfolge fallenlassen.\n" + +-#: ../iptunnel.c:449 ++#: ../iptunnel.c:455 ++#, c-format + msgid " Checksum in received packet is required.\n" + msgstr " Prfsumme im empfangenen Paket wird bentigt.\n" + +-#: ../iptunnel.c:451 ++#: ../iptunnel.c:457 ++#, c-format + msgid " Sequence packets on output.\n" + msgstr " Pakete in Reihenfolge ausgeben.\n" + +-#: ../iptunnel.c:453 ++#: ../iptunnel.c:459 ++#, c-format + msgid " Checksum output packets.\n" + msgstr " Prfsumme fr ausgegebene Pakete berechnen.\n" + +-#: ../iptunnel.c:481 ++#: ../iptunnel.c:487 ++#, c-format + msgid "Wrong format of /proc/net/dev. Sorry.\n" +-msgstr "Falsches Format von /proc/net/dev. Tut mir leid\n" ++msgstr "Falsches Format von /proc/net/dev. Tut mir leid.\n" + +-#: ../iptunnel.c:494 ++#: ../iptunnel.c:500 + #, c-format + msgid "Failed to get type of [%s]\n" + msgstr "Kann den Typ von [%s] nicht holen\n" + +-#: ../iptunnel.c:510 ++#: ../iptunnel.c:516 ++#, c-format + msgid "RX: Packets Bytes Errors CsumErrs OutOfSeq Mcasts\n" + msgstr "RX: Pakete Bytes Fehler CsumErrs OutOfSeq Mcasts\n" + +-#: ../iptunnel.c:513 ++#: ../iptunnel.c:519 ++#, c-format + msgid "TX: Packets Bytes Errors DeadLoop NoRoute NoBufs\n" + msgstr "TX: Pakete Bytes Fehler DeadLoop NoRoute NoBufs\n" + +-#: ../statistics.c:45 ++#: ../statistics.c:47 + msgid "ICMP input histogram:" +-msgstr "ICMP Eingabehistogramm:" ++msgstr "ICMP-Eingabehistogramm:" + +-#: ../statistics.c:46 ++#: ../statistics.c:48 + msgid "ICMP output histogram:" +-msgstr "ICMP Ausgabehistogramm:" ++msgstr "ICMP-Ausgabehistogramm:" + +-#: ../statistics.c:63 ++#: ../statistics.c:65 + #, c-format + msgid "Forwarding is %s" + msgstr "Weiterleitung ist %s" + +-#: ../statistics.c:64 +-#, c-format +-msgid "Default TTL is %d" ++#: ../statistics.c:66 ++#, fuzzy, c-format ++msgid "Default TTL is %u" + msgstr "Standard-TTL ist %d" + +-#: ../statistics.c:65 +-#, c-format +-msgid "%d total packets received" +-msgstr "%d Pakete insgesamt empfangen" ++#: ../statistics.c:67 ++#, fuzzy, c-format ++msgid "%u total packets received" ++msgstr "%d Pakete insgesamt empfangen" + +-#: ../statistics.c:66 +-#, c-format +-msgid "%d with invalid headers" +-msgstr "%d with ungltigen Headern" ++#: ../statistics.c:68 ++#, fuzzy, c-format ++msgid "%u with invalid headers" ++msgstr "%d mit ungltigen Headern" + +-#: ../statistics.c:67 +-#, c-format +-msgid "%d with invalid addresses" ++#: ../statistics.c:69 ++#, fuzzy, c-format ++msgid "%u with invalid addresses" + msgstr "%d mit ungltigen Adressen" + +-#: ../statistics.c:68 +-#, c-format +-msgid "%d forwarded" ++#: ../statistics.c:70 ++#, fuzzy, c-format ++msgid "%u forwarded" + msgstr "%d weitergeleitet" + +-#: ../statistics.c:69 +-#, c-format +-msgid "%d with unknown protocol" ++#: ../statistics.c:71 ++#, fuzzy, c-format ++msgid "%u with unknown protocol" + msgstr "%d mit unbekanntem Protokoll" + +-#: ../statistics.c:70 +-#, c-format +-msgid "%d incoming packets discarded" ++#: ../statistics.c:72 ++#, fuzzy, c-format ++msgid "%u incoming packets discarded" + msgstr "%d eingehende Pakete weggeworfen" + +-#: ../statistics.c:71 +-#, c-format +-msgid "%d incoming packets delivered" ++#: ../statistics.c:73 ++#, fuzzy, c-format ++msgid "%u incoming packets delivered" + msgstr "%d eingehende Pakete zugestellt" + +-#: ../statistics.c:72 +-#, c-format +-msgid "%d requests sent out" ++#: ../statistics.c:74 ++#, fuzzy, c-format ++msgid "%u requests sent out" + msgstr "%d Anfragen ausgesandt" + + #. ? +-#: ../statistics.c:73 +-#, c-format +-msgid "%d outgoing packets dropped" ++#: ../statistics.c:75 ++#, fuzzy, c-format ++msgid "%u outgoing packets dropped" + msgstr "%d ausgehende Pakete weggeworfen" + +-#: ../statistics.c:74 +-#, c-format +-msgid "%d dropped because of missing route" ++#: ../statistics.c:76 ++#, fuzzy, c-format ++msgid "%u dropped because of missing route" + msgstr "%d weggeworfen wegen fehlender Route" + +-#: ../statistics.c:75 +-#, c-format +-msgid "%d fragments dropped after timeout" ++#: ../statistics.c:77 ++#, fuzzy, c-format ++msgid "%u fragments dropped after timeout" + msgstr "%d Fragmente nach Timeout weggeworfen" + +-#: ../statistics.c:76 +-#, c-format +-msgid "%d reassemblies required" ++#: ../statistics.c:78 ++#, fuzzy, c-format ++msgid "%u reassemblies required" + msgstr "%d Wiederzusammenstellungen ntig" + + #. ? +-#: ../statistics.c:77 +-#, c-format +-msgid "%d packets reassembled ok" ++#: ../statistics.c:79 ++#, fuzzy, c-format ++msgid "%u packets reassembled ok" + msgstr "%d Fragmente korrekt empfangen" + +-#: ../statistics.c:78 +-#, c-format +-msgid "%d packet reassembles failed" ++#: ../statistics.c:80 ++#, fuzzy, c-format ++msgid "%u packet reassembles failed" + msgstr "%d fehlgeschlagene Paketdefragmentierungen" + +-#: ../statistics.c:79 +-#, c-format +-msgid "%d fragments received ok" ++#: ../statistics.c:81 ++#, fuzzy, c-format ++msgid "%u fragments received ok" + msgstr "%d Fragmente korrekt empfangen" + +-#: ../statistics.c:80 +-#, c-format +-msgid "%d fragments failed" +-msgstr "%d Fragmente Fehlgeschlagen" ++#: ../statistics.c:82 ++#, fuzzy, c-format ++msgid "%u fragments failed" ++msgstr "%d Fragmente fehlgeschlagen" + +-#: ../statistics.c:81 +-#, c-format +-msgid "%d fragments created" ++#: ../statistics.c:83 ++#, fuzzy, c-format ++msgid "%u fragments created" + msgstr "%d Fragmente erzeugt" + +-#: ../statistics.c:86 +-#, c-format +-msgid "%d ICMP messages received" +-msgstr "%d ICMP Nachrichten empfangen" ++#: ../statistics.c:88 ++#, fuzzy, c-format ++msgid "%u ICMP messages received" ++msgstr "%d ICMP-Nachrichten empfangen" + +-#: ../statistics.c:87 +-#, c-format +-msgid "%d input ICMP message failed." +-msgstr "%d eingegangene ICMP Nachrichten fehlgeschlagen" ++#: ../statistics.c:89 ++#, fuzzy, c-format ++msgid "%u input ICMP message failed." ++msgstr "%d eingegangene ICMP-Nachrichten fehlgeschlagen" + +-#: ../statistics.c:88 ../statistics.c:101 +-#, c-format +-msgid "destination unreachable: %d" ++#: ../statistics.c:90 ../statistics.c:103 ++#, fuzzy, c-format ++msgid "destination unreachable: %u" + msgstr "Ziel unerreichbar: %d" + +-#: ../statistics.c:89 +-#, c-format +-msgid "timeout in transit: %d" ++#: ../statistics.c:91 ++#, fuzzy, c-format ++msgid "timeout in transit: %u" + msgstr "Timeout beim Transit: %d" + +-#: ../statistics.c:90 ../statistics.c:103 +-#, c-format +-msgid "wrong parameters: %d" ++#: ../statistics.c:92 ../statistics.c:105 ++#, fuzzy, c-format ++msgid "wrong parameters: %u" + msgstr "Fehlerhafte Parameter: %d" + + #. ? +-#: ../statistics.c:91 +-#, c-format +-msgid "source quenchs: %d" ++#: ../statistics.c:93 ++#, fuzzy, c-format ++msgid "source quenches: %u" + msgstr "Source Quenchs: %d" + +-#: ../statistics.c:92 +-#, c-format +-msgid "redirects: %d" ++#: ../statistics.c:94 ++#, fuzzy, c-format ++msgid "redirects: %u" + msgstr "Umleitungen: %d" + +-#: ../statistics.c:93 +-#, c-format +-msgid "echo requests: %d" +-msgstr "Echo Requests: %d" ++#: ../statistics.c:95 ++#, fuzzy, c-format ++msgid "echo requests: %u" ++msgstr "Echo Anfragen: %d" + +-#: ../statistics.c:94 ../statistics.c:107 +-#, c-format +-msgid "echo replies: %d" ++#: ../statistics.c:96 ../statistics.c:109 ++#, fuzzy, c-format ++msgid "echo replies: %u" + msgstr "Echo Antworten: %d" + +-#: ../statistics.c:95 +-#, c-format +-msgid "timestamp request: %d" ++#: ../statistics.c:97 ++#, fuzzy, c-format ++msgid "timestamp request: %u" + msgstr "Zeitstempelanfragen: %d" + +-#: ../statistics.c:96 +-#, c-format +-msgid "timestamp reply: %d" ++#: ../statistics.c:98 ++#, fuzzy, c-format ++msgid "timestamp reply: %u" + msgstr "Zeitstempelantworten: %d" + +-#: ../statistics.c:97 +-#, c-format +-msgid "address mask request: %d" ++#: ../statistics.c:99 ++#, fuzzy, c-format ++msgid "address mask request: %u" + msgstr "Adressmaskenanfragen: %d" + + #. ? +-#: ../statistics.c:98 +-msgid "address mask replies" +-msgstr "Adressmaskenantworten" ++#: ../statistics.c:100 ../statistics.c:113 ++#, fuzzy, c-format ++msgid "address mask replies: %u" ++msgstr "Adressmaskenantworten: %d" + + #. ? +-#: ../statistics.c:99 +-#, c-format +-msgid "%d ICMP messages sent" ++#: ../statistics.c:101 ++#, fuzzy, c-format ++msgid "%u ICMP messages sent" + msgstr "%d ICMP-Nachrichten geschickt" + +-#: ../statistics.c:100 +-#, c-format +-msgid "%d ICMP messages failed" +-msgstr "%d ICMP Nachrichten fehlgeschlagen" +- + #: ../statistics.c:102 +-#, c-format +-msgid "time exceeded: %d" ++#, fuzzy, c-format ++msgid "%u ICMP messages failed" ++msgstr "%d ICMP-Nachrichten fehlgeschlagen" ++ ++#: ../statistics.c:104 ++#, fuzzy, c-format ++msgid "time exceeded: %u" + msgstr "Zeitberschreitung: %d" + + #. ? +-#: ../statistics.c:104 +-#, c-format +-msgid "source quench: %d" ++#: ../statistics.c:106 ++#, fuzzy, c-format ++msgid "source quench: %u" + msgstr "Source Quench: %d" + +-#: ../statistics.c:105 +-#, c-format +-msgid "redirect: %d" ++#: ../statistics.c:107 ++#, fuzzy, c-format ++msgid "redirect: %u" + msgstr "Umleitungen: %d" + +-#: ../statistics.c:106 +-#, c-format +-msgid "echo request: %d" ++#: ../statistics.c:108 ++#, fuzzy, c-format ++msgid "echo request: %u" + msgstr "Echo Anfragen: %d" + +-#: ../statistics.c:108 +-#, c-format +-msgid "timestamp requests: %d" ++#: ../statistics.c:110 ++#, fuzzy, c-format ++msgid "timestamp requests: %u" + msgstr "Zeitstempel Anfragen: %d" + +-#: ../statistics.c:109 +-#, c-format +-msgid "timestamp replies: %d" ++#: ../statistics.c:111 ++#, fuzzy, c-format ++msgid "timestamp replies: %u" + msgstr "Zeitstempel Antworten: %d" + +-#: ../statistics.c:110 +-#, c-format +-msgid "address mask requests: %d" ++#: ../statistics.c:112 ++#, fuzzy, c-format ++msgid "address mask requests: %u" + msgstr "Adressmaskenanfragen: %d" + +-#: ../statistics.c:111 ++#: ../statistics.c:118 + #, c-format +-msgid "address mask replies: %d" +-msgstr "Adressmaskenantworten: %d" ++msgid "RTO algorithm is %s" ++msgstr "RTO-Algorithmus ist %s" ++ ++#: ../statistics.c:122 ++#, fuzzy, c-format ++msgid "%u active connections openings" ++msgstr "%d Verbindungen aktiv geffnet" ++ ++#: ../statistics.c:123 ++#, fuzzy, c-format ++msgid "%u passive connection openings" ++msgstr "%d Verbindungen passiv geffnet" ++ ++#: ../statistics.c:124 ++#, fuzzy, c-format ++msgid "%u failed connection attempts" ++msgstr "%d fehlerhafte Verbindungsversuche" ++ ++#: ../statistics.c:125 ++#, fuzzy, c-format ++msgid "%u connection resets received" ++msgstr "%d Verbindungsrcksetzungen empfangen" ++ ++#: ../statistics.c:126 ++#, fuzzy, c-format ++msgid "%u connections established" ++msgstr "%d Verbindungen aufgebaut" ++ ++#: ../statistics.c:127 ++#, fuzzy, c-format ++msgid "%u segments received" ++msgstr "%d Segmente empfangen" ++ ++#: ../statistics.c:128 ++#, fuzzy, c-format ++msgid "%u segments send out" ++msgstr "%d Segmente abgeschickt" ++ ++#: ../statistics.c:129 ++#, fuzzy, c-format ++msgid "%u segments retransmited" ++msgstr "%d Segmente erneut geschickt" ++ ++#: ../statistics.c:130 ++#, fuzzy, c-format ++msgid "%u bad segments received." ++msgstr "%d fehlerhafte Segmente empfangen." ++ ++#: ../statistics.c:131 ++#, fuzzy, c-format ++msgid "%u resets sent" ++msgstr "%d Rcksetzungen geschickt" ++ ++#: ../statistics.c:136 ++#, fuzzy, c-format ++msgid "%u packets received" ++msgstr "%d Pakete empfangen" ++ ++#: ../statistics.c:137 ++#, fuzzy, c-format ++msgid "%u packets to unknown port received." ++msgstr "%d Pakete fr unbekannte Ports empfangen." ++ ++#: ../statistics.c:138 ++#, fuzzy, c-format ++msgid "%u packet receive errors" ++msgstr "%d Paketempfangsfehler" ++ ++#: ../statistics.c:139 ++#, fuzzy, c-format ++msgid "%u packets sent" ++msgstr "%d Pakete geschickt" ++ ++#: ../statistics.c:144 ++#, fuzzy, c-format ++msgid "%u SYN cookies sent" ++msgstr "%d SYN-Cookies verschickt" ++ ++#: ../statistics.c:145 ++#, fuzzy, c-format ++msgid "%u SYN cookies received" ++msgstr "%d SYN-Cookies empfangen" + +-#: ../statistics.c:116 ++#: ../statistics.c:146 ++#, fuzzy, c-format ++msgid "%u invalid SYN cookies received" ++msgstr "%d ungltige SYN-Cookies empfangen" ++ ++#: ../statistics.c:148 ++#, fuzzy, c-format ++msgid "%u resets received for embryonic SYN_RECV sockets" ++msgstr "%d Rcksetzungen fr embrionische SYN_RECV-Sockets" ++ ++#: ../statistics.c:150 ++#, fuzzy, c-format ++msgid "%u packets pruned from receive queue because of socket buffer overrun" ++msgstr "%d Pakete wegen Socketpufferberlauf aus der Empfangswarteschlange weggeworfen" ++ ++#. obsolete: 2.2.0 doesn't do that anymore ++#: ../statistics.c:153 ++#, fuzzy, c-format ++msgid "%u packets pruned from receive queue" ++msgstr "%d Pakete aus der ungeordneten Warteschlange weggeworfen" ++ ++#: ../statistics.c:154 ++#, fuzzy, c-format ++msgid "" ++"%u packets dropped from out-of-order queue because of socket buffer overrun" ++msgstr "%d Pakete aus der ungeordneten Warteschlange wegen Pufferberlauf weggeworfen" ++ ++#: ../statistics.c:156 ++#, fuzzy, c-format ++msgid "%u ICMP packets dropped because they were out-of-window" ++msgstr "%d ICMP-Pakete weggeworfen die auerhalb des Fensters waren" ++ ++#: ../statistics.c:158 ++#, fuzzy, c-format ++msgid "%u ICMP packets dropped because socket was locked" ++msgstr "%d ICMP-Pakete verworfen weil Socket gesperrt war" ++ ++#: ../statistics.c:160 + #, c-format +-msgid "RTO algorithm is %s" +-msgstr "RTO Algorithmus is %s" ++msgid "%u TCP sockets finished time wait in fast timer" ++msgstr "" + +-#: ../statistics.c:120 ++#: ../statistics.c:161 + #, c-format +-msgid "%d active connections openings" +-msgstr "%d Verbindungen aktiv geffnet" ++msgid "%u time wait sockets recycled by time stamp" ++msgstr "" + +-#: ../statistics.c:121 ++#: ../statistics.c:162 + #, c-format +-msgid "%d passive connection openings" +-msgstr "%d Verbindungen passiv geffnet" ++msgid "%u TCP sockets finished time wait in slow timer" ++msgstr "" + +-#: ../statistics.c:122 ++#: ../statistics.c:163 + #, c-format +-msgid "%d failed connection attempts" +-msgstr "%d fehlerhafte Verbindungsversuche" ++msgid "%u passive connections rejected because of time stamp" ++msgstr "" + +-#: ../statistics.c:123 ++#: ../statistics.c:165 + #, c-format +-msgid "%d connection resets received" +-msgstr "%d Verbindungsrcksetzungen empfangen" ++msgid "%u active connections rejected because of time stamp" ++msgstr "" + +-#: ../statistics.c:124 ++#: ../statistics.c:167 + #, c-format +-msgid "%d connections established" +-msgstr "%d Verbindungen aufgebaut" ++msgid "%u packets rejects in established connections because of timestamp" ++msgstr "" + +-#: ../statistics.c:125 ++#: ../statistics.c:169 ++#, fuzzy, c-format ++msgid "%u delayed acks sent" ++msgstr "%d Pakete geschickt" ++ ++#: ../statistics.c:170 + #, c-format +-msgid "%d segments received" +-msgstr "%d Segmente empfangen" ++msgid "%u delayed acks further delayed because of locked socket" ++msgstr "" + +-#: ../statistics.c:126 ++#: ../statistics.c:172 + #, c-format +-msgid "%d segments send out" +-msgstr "%d Segmente abgeschickt" ++msgid "Quick ack mode was activated %u times" ++msgstr "" + +-#: ../statistics.c:127 ++#: ../statistics.c:173 + #, c-format +-msgid "%d segments retransmited" +-msgstr "%d Segmente erneut geschickt" ++msgid "%u times the listen queue of a socket overflowed" ++msgstr "" + +-#: ../statistics.c:128 ++#: ../statistics.c:175 + #, c-format +-msgid "%d bad segments received." +-msgstr "%d fehlerhafte Segmente empfangen." ++msgid "%u SYNs to LISTEN sockets ignored" ++msgstr "" + +-#: ../statistics.c:129 ++#: ../statistics.c:176 + #, c-format +-msgid "%d resets sent" +-msgstr "%d Rcksetzungen geschickt" ++msgid "%u packets directly queued to recvmsg prequeue." ++msgstr "" + +-#: ../statistics.c:134 ++#: ../statistics.c:178 + #, c-format +-msgid "%d packets received" ++msgid "%u of bytes directly received from backlog" ++msgstr "" ++ ++#: ../statistics.c:180 ++#, c-format ++msgid "%u of bytes directly received from prequeue" ++msgstr "" ++ ++#: ../statistics.c:182 ++#, fuzzy, c-format ++msgid "%u packets dropped from prequeue" ++msgstr "%d Pakete aus der ungeordneten Warteschlange weggeworfen" ++ ++#: ../statistics.c:183 ++#, fuzzy, c-format ++msgid "%u packet headers predicted" + msgstr "%d Pakete empfangen" + +-#: ../statistics.c:135 ++#: ../statistics.c:184 + #, c-format +-msgid "%d packets to unknown port received." ++msgid "%u packets header predicted and directly queued to user" ++msgstr "" ++ ++#: ../statistics.c:186 ++#, c-format ++msgid "Ran %u times out of system memory during packet sending" ++msgstr "" ++ ++#: ../statistics.c:188 ++#, fuzzy, c-format ++msgid "%u acknowledgments not containing data received" + msgstr "%d Pakete fr unbekannte Ports empfangen." + +-#: ../statistics.c:136 ++#: ../statistics.c:189 + #, c-format +-msgid "%d packet receive errors" +-msgstr "%d Paketempfangsfehler" ++msgid "%u predicted acknowledgments" ++msgstr "" + +-#: ../statistics.c:137 ++#: ../statistics.c:190 + #, c-format +-msgid "%d packets sent" +-msgstr "%d Pakete geschickt" ++msgid "%u times recovered from packet loss due to fast retransmit" ++msgstr "" + +-#: ../statistics.c:142 ++#: ../statistics.c:191 + #, c-format +-msgid "%d SYN cookies sent" +-msgstr "%d SYN-Cookies verschickt" ++msgid "%u times recovered from packet loss due to SACK data" ++msgstr "" + +-#: ../statistics.c:143 ++#: ../statistics.c:192 ++#, fuzzy, c-format ++msgid "%u bad SACKs received" ++msgstr "%d fehlerhafte Segmente empfangen." ++ ++#: ../statistics.c:193 + #, c-format +-msgid "%d SYN cookies received" +-msgstr "%d SYN-Cookies empfangen" ++msgid "Detected reordering %u times using FACK" ++msgstr "" + +-#: ../statistics.c:144 ++#: ../statistics.c:194 + #, c-format +-msgid "%d invalid SYN cookies received" +-msgstr "%d ungltige SYN-Cookies empfangen" ++msgid "Detected reordering %u times using SACK" ++msgstr "" + +-#: ../statistics.c:146 ++#: ../statistics.c:195 + #, c-format +-msgid "%d resets received for embryonic SYN_RECV sockets" +-msgstr "%d Rcksetzungen fuer embrionische SYN_RECV Sockets" ++msgid "Detected reordering %u times using time stamp" ++msgstr "" + +-#: ../statistics.c:148 ++#: ../statistics.c:196 + #, c-format +-msgid "%d packets pruned from receive queue because of socket buffer overrun" ++msgid "Detected reordering %u times using reno fast retransmit" + msgstr "" +-"%d Pakete wegen Socketpufferberlauf aus der Empfangswarteschlange " +-"weggeworfen" + +-#. obsolete: 2.2.0 doesn't do that anymore +-#: ../statistics.c:151 ++#: ../statistics.c:197 + #, c-format +-msgid "%d packets pruned from out-of-order queue" +-msgstr "%d Pakete aus der ungeordneten Warteschlange weggeworfen" ++msgid "%u congestion windows fully recovered" ++msgstr "" + +-#: ../statistics.c:152 ++#: ../statistics.c:198 + #, c-format +-msgid "" +-"%d packets dropped from out-of-order queue because of socket buffer overrun" ++msgid "%u congestion windows partially recovered using Hoe heuristic" + msgstr "" +-"%d Pakete aus der ungeordneten Warteschlange wegen Pufferberlauf weggeworfen" + +-#: ../statistics.c:154 ++#: ../statistics.c:199 + #, c-format +-msgid "%d ICMP packets dropped because they were out-of-window" +-msgstr "%d ICMP Pakete weggeworfen die auserhalb des Fensters waren" ++msgid "%u congestion window recovered using DSACK" ++msgstr "" + +-#: ../statistics.c:156 ++#: ../statistics.c:200 ++#, c-format ++msgid "%u congestion windows recovered after partial ack" ++msgstr "" ++ ++#: ../statistics.c:201 ++#, fuzzy, c-format ++msgid "%u retransmits lost" ++msgstr "%d Rcksetzungen geschickt" ++ ++#: ../statistics.c:202 ++#, c-format ++msgid "%u timeouts after reno fast retransmit" ++msgstr "" ++ ++#: ../statistics.c:203 ++#, c-format ++msgid "%u timeouts after SACK recovery" ++msgstr "" ++ ++#: ../statistics.c:204 ++#, c-format ++msgid "%u timeouts in loss state" ++msgstr "" ++ ++#: ../statistics.c:205 ++#, fuzzy, c-format ++msgid "%u fast retransmits" ++msgstr "%d Segmente erneut geschickt" ++ ++#: ../statistics.c:206 ++#, c-format ++msgid "%u forward retransmits" ++msgstr "" ++ ++#: ../statistics.c:207 ++#, c-format ++msgid "%u retransmits in slow start" ++msgstr "" ++ ++#: ../statistics.c:208 ++#, c-format ++msgid "%u other TCP timeouts" ++msgstr "" ++ ++#: ../statistics.c:209 ++#, fuzzy, c-format ++msgid "%u reno fast retransmits failed" ++msgstr "%d Segmente erneut geschickt" ++ ++#: ../statistics.c:210 ++#, fuzzy, c-format ++msgid "%u sack retransmits failed" ++msgstr "%d fehlgeschlagene Paketdefragmentierungen" ++ ++#: ../statistics.c:211 ++#, c-format ++msgid "%u times receiver scheduled too late for direct processing" ++msgstr "" ++ ++#: ../statistics.c:212 ++#, fuzzy, c-format ++msgid "%u packets collapsed in receive queue due to low socket buffer" ++msgstr "%d Pakete wegen Socketpufferberlauf aus der Empfangswarteschlange weggeworfen" ++ ++#: ../statistics.c:213 ++#, c-format ++msgid "%u DSACKs sent for old packets" ++msgstr "" ++ ++#: ../statistics.c:214 ++#, c-format ++msgid "%u DSACKs sent for out of order packets" ++msgstr "" ++ ++#: ../statistics.c:215 ++#, fuzzy, c-format ++msgid "%u DSACKs received" ++msgstr "%d Pakete empfangen" ++ ++#: ../statistics.c:216 ++#, fuzzy, c-format ++msgid "%u DSACKs for out of order packets received" ++msgstr "%d Pakete insgesamt empfangen" ++ ++#: ../statistics.c:217 ++#, fuzzy, c-format ++msgid "%u connections reset due to unexpected SYN" ++msgstr "%d Verbindungsrcksetzungen empfangen" ++ ++#: ../statistics.c:218 ++#, fuzzy, c-format ++msgid "%u connections reset due to unexpected data" ++msgstr "%d Verbindungsrcksetzungen empfangen" ++ ++#: ../statistics.c:219 ++#, fuzzy, c-format ++msgid "%u connections reset due to early user close" ++msgstr "%d Verbindungsrcksetzungen empfangen" ++ ++#: ../statistics.c:220 + #, c-format +-msgid "%d ICMP packets dropped because socket was locked" +-msgstr "%d ICMP Pakete verworfen weil Socket gesperrt war" ++msgid "%u connections aborted due to memory pressure" ++msgstr "" ++ ++#: ../statistics.c:221 ++#, fuzzy, c-format ++msgid "%u connections aborted due to timeout" ++msgstr "%d Verbindungsrcksetzungen empfangen" + + #: ../statistics.c:222 ++#, c-format ++msgid "%u connections aborted after user close in linger timeout" ++msgstr "" ++ ++#: ../statistics.c:223 ++#, c-format ++msgid "%u times unabled to send RST due to no memory" ++msgstr "" ++ ++#: ../statistics.c:224 ++#, c-format ++msgid "TCP ran low on memory %u times" ++msgstr "" ++ ++#: ../statistics.c:225 ++#, c-format ++msgid "%u TCP data loss events" ++msgstr "" ++ ++#: ../statistics.c:292 + msgid "enabled" + msgstr "aktiviert" + +-#: ../statistics.c:222 ++#: ../statistics.c:292 + msgid "disabled" + msgstr "deaktiviert" + +-#: ../statistics.c:272 +-#, c-format +-msgid "unknown title %s\n" +-msgstr "Unbekannter Titel %s\n" +- +-#: ../statistics.c:298 ++#: ../statistics.c:375 + msgid "error parsing /proc/net/snmp" + msgstr "Fehler beim Parsen von /proc/net/snmp" + +-#: ../statistics.c:311 ++#: ../statistics.c:388 + msgid "cannot open /proc/net/snmp" + msgstr "Kann /proc/net/snmp nicht ffnen" + + #: ../lib/activate.c:69 + #, c-format + msgid "Hardware type `%s' not supported.\n" +-msgstr "Hardwaretyp ,,%s'' nicht untersttzt.\n" ++msgstr "Hardwaretyp %s nicht untersttzt.\n" + + #: ../lib/activate.c:73 + #, c-format + msgid "Cannot change line discipline to `%s'.\n" +-msgstr "Kann line discipline nicht auf ``%s'' setzen.\n" ++msgstr "Kann line discipline nicht auf %s setzen.\n" + +-#: ../lib/af.c:145 ../lib/hw.c:148 ++#: ../lib/af.c:153 ../lib/hw.c:161 + msgid "UNSPEC" + msgstr "UNSPEC" + +-#: ../lib/af.c:147 ++#: ../lib/af.c:155 + msgid "UNIX Domain" +-msgstr "UNIX Domain" ++msgstr "UNIX-Domain" + +-#: ../lib/af.c:150 ++#: ../lib/af.c:158 + msgid "DARPA Internet" +-msgstr "DARPA Internet" ++msgstr "DARPA-Internet" + +-#: ../lib/af.c:153 ++#: ../lib/af.c:161 + msgid "IPv6" + msgstr "IPv6" + +-#: ../lib/af.c:156 ../lib/hw.c:169 ++#: ../lib/af.c:164 ../lib/hw.c:182 + msgid "AMPR AX.25" + msgstr "AMPR AX.25" + +-#: ../lib/af.c:159 ../lib/hw.c:175 ++#: ../lib/af.c:167 ../lib/hw.c:188 + msgid "AMPR NET/ROM" + msgstr "AMPR NET/ROM" + +-#: ../lib/af.c:162 ++#: ../lib/af.c:170 + msgid "Novell IPX" + msgstr "" + +-#: ../lib/af.c:165 ++#: ../lib/af.c:173 + msgid "Appletalk DDP" + msgstr "Appletalk DDP" + +-#: ../lib/af.c:168 ../lib/hw.c:207 ++#: ../lib/af.c:176 ../lib/hw.c:223 + msgid "Econet" + msgstr "Econet" + +-#: ../lib/af.c:171 ../lib/hw.c:172 ++#: ../lib/af.c:179 ++msgid "CCITT X.25" ++msgstr "" ++ ++#: ../lib/af.c:182 ../lib/hw.c:185 + msgid "AMPR ROSE" + msgstr "AMPR ROSE" + +-#: ../lib/af.c:174 ../lib/hw.c:160 ++#: ../lib/af.c:185 ../lib/hw.c:173 + msgid "Ash" + msgstr "Ash" + +-#: ../lib/af.c:232 ++#: ../lib/af.c:243 ++#, c-format + msgid "Please don't supply more than one address family.\n" + msgstr "Bitte nur eine Adressfamilie angeben.\n" + +-#: ../lib/af.c:293 ++#: ../lib/af.c:304 ++#, c-format + msgid "Too much address family arguments.\n" + msgstr "Zu viele Adressfamilien angegeben.\n" + +-#: ../lib/af.c:304 ++#: ../lib/af.c:315 + #, c-format + msgid "Unknown address family `%s'.\n" +-msgstr "Unbekannte Adressfamilie `%s'.\n" +- +-#: ../lib/arcnet.c:53 ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 +-#: ../lib/fddi.c:67 ../lib/hippi.c:68 ../lib/inet.c:244 ../lib/inet.c:259 +-#: ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 ../lib/rose.c:71 +-#: ../lib/rose.c:126 ../lib/unix.c:56 ../lib/unix.c:76 +-msgid "[NONE SET]" +-msgstr "[NICHT GESETZT]" ++msgstr "Unbekannte Adressfamilie %s.\n" + +-#: ../lib/arcnet.c:81 ../lib/arcnet.c:96 ++#: ../lib/arcnet.c:70 ../lib/arcnet.c:85 + #, c-format + msgid "in_arcnet(%s): invalid arcnet address!\n" + msgstr "in_arcnet(%s): Ungltige ARCnet-Adresse!\n" + +-#: ../lib/arcnet.c:108 ++#: ../lib/arcnet.c:97 + #, c-format + msgid "in_arcnet(%s): trailing : ignored!\n" + msgstr "in_arcnet(%s): angehngt : ignoriert!\n" + +-#: ../lib/arcnet.c:120 ++#: ../lib/arcnet.c:109 + #, c-format + msgid "in_arcnet(%s): trailing junk!\n" + msgstr "in_arcnet(%s): Nachfolgender Mll!\n" + + #: ../lib/ash.c:81 ++#, c-format + msgid "Malformed Ash address" +-msgstr "Fehlerhafte Ash Adresse" ++msgstr "Fehlerhafte Ash-Adresse" ++ ++#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244 ++#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 ++#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76 ++msgid "[NONE SET]" ++msgstr "[NICHT GESETZT]" + + #: ../lib/ax25.c:97 ../lib/netrom.c:100 + msgid "Invalid callsign" +@@ -1898,22 +2168,21 @@ msgid "Callsign too long" + msgstr "Rufzeichen zu lang" + + #: ../lib/ax25_gr.c:47 ++#, c-format + msgid "AX.25 not configured in this system.\n" + msgstr "AX.25 ist auf diesem System nicht konfiguriert.\n" + + #: ../lib/ax25_gr.c:50 ++#, c-format + msgid "Kernel AX.25 routing table\n" + msgstr "Kernel AX.25 Routentabelle\n" + + #. xxx + #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55 ++#, c-format + msgid "Destination Iface Use\n" + msgstr "Ziel SStelle Benutzer\n" + +-#: ../lib/ddp_gr.c:21 +-msgid "Routing table for `ddp' not yet supported.\n" +-msgstr "DDP-Routentabelle wird noch nicht untersttzt.\n" +- + #: ../lib/ether.c:74 ../lib/ether.c:91 + #, c-format + msgid "in_ether(%s): invalid ether address!\n" +@@ -1929,153 +2198,168 @@ msgstr "in_ether(%s): angehngt : ignori + msgid "in_ether(%s): trailing junk!\n" + msgstr "in_ether(%s): Nachfolgender Mll!\n" + +-#: ../lib/fddi.c:95 ../lib/fddi.c:110 ++#: ../lib/fddi.c:84 ../lib/fddi.c:99 + #, c-format + msgid "in_fddi(%s): invalid fddi address!\n" + msgstr "in_fddi(%s): Ungltige FDDI-Adresse!\n" + +-#: ../lib/fddi.c:122 ++#: ../lib/fddi.c:111 + #, c-format + msgid "in_fddi(%s): trailing : ignored!\n" + msgstr "in_fddi(%s): nachfolgend : ignoriert!\n" + +-#: ../lib/fddi.c:134 ++#: ../lib/fddi.c:123 + #, c-format + msgid "in_fddi(%s): trailing junk!\n" + msgstr "in_fddi(%s): Nachfolgender Mll!\n" + +-#: ../lib/getroute.c:97 ../lib/setroute.c:76 ++#: ../lib/getroute.c:101 ../lib/setroute.c:80 + #, c-format + msgid "Address family `%s' not supported.\n" + msgstr "Adressfamilie `%s' wird nicht untersttzt.\n" + +-#: ../lib/getroute.c:103 ../lib/setroute.c:80 ++#: ../lib/getroute.c:107 ../lib/setroute.c:84 + #, c-format + msgid "No routing for address family `%s'.\n" + msgstr "Kein Routen fr Adressfamilie `%s'.\n" + +-#: ../lib/hippi.c:96 ../lib/hippi.c:111 ++#: ../lib/hippi.c:84 ../lib/hippi.c:99 + #, c-format + msgid "in_hippi(%s): invalid hippi address!\n" + msgstr "in_hippi(%s): Ungltige HIPPI-Adresse!\n" + +-#: ../lib/hippi.c:123 ++#: ../lib/hippi.c:111 + #, c-format + msgid "in_hippi(%s): trailing : ignored!\n" + msgstr "in_hippi(%s): nachfolgend : ignoriert!\n" + +-#: ../lib/hippi.c:134 ++#: ../lib/hippi.c:122 + #, c-format + msgid "in_hippi(%s): trailing junk!\n" + msgstr "in_hippi(%s): Nachfolgender Mll!\n" + +-#: ../lib/hw.c:147 ++#: ../lib/hw.c:160 + msgid "Local Loopback" + msgstr "Lokale Schleife" + +-#: ../lib/hw.c:150 ++#: ../lib/hw.c:163 + msgid "Serial Line IP" + msgstr "Serielle IP" + +-#: ../lib/hw.c:151 ++#: ../lib/hw.c:164 + msgid "VJ Serial Line IP" + msgstr "Serielle VJ-IP" + +-#: ../lib/hw.c:152 ++#: ../lib/hw.c:165 + msgid "6-bit Serial Line IP" + msgstr "6-bit Serielle IP" + +-#: ../lib/hw.c:153 ++#: ../lib/hw.c:166 + msgid "VJ 6-bit Serial Line IP" + msgstr "VJ 6-bit Serielle IP" + +-#: ../lib/hw.c:154 ++#: ../lib/hw.c:167 + msgid "Adaptive Serial Line IP" + msgstr "Adaptive Serielle IP" + +-#: ../lib/hw.c:157 ++#: ../lib/hw.c:170 + msgid "Ethernet" + msgstr "Ethernet" + +-#: ../lib/hw.c:163 ++#: ../lib/hw.c:176 + msgid "Fiber Distributed Data Interface" + msgstr "Fiber Distributed Data Interface" + +-#: ../lib/hw.c:166 ++#: ../lib/hw.c:179 + msgid "HIPPI" + msgstr "HIPPI" + +-#: ../lib/hw.c:178 ++#: ../lib/hw.c:191 ++msgid "generic X.25" ++msgstr "" ++ ++#: ../lib/hw.c:194 + msgid "IPIP Tunnel" + msgstr "IPIP Tunnel" + +-#: ../lib/hw.c:181 ++#: ../lib/hw.c:197 + msgid "Point-to-Point Protocol" +-msgstr "Punkt-zu-Punkt Verbindung" ++msgstr "Punkt-zu-Punkt-Verbindung" + +-#: ../lib/hw.c:184 ++#: ../lib/hw.c:200 + msgid "(Cisco)-HDLC" + msgstr "(Cisco)-HDLC" + +-#: ../lib/hw.c:185 ++#: ../lib/hw.c:201 + msgid "LAPB" + msgstr "LAPB" + +-#: ../lib/hw.c:188 ++#: ../lib/hw.c:204 + msgid "ARCnet" + msgstr "ARCnet" + +-#: ../lib/hw.c:191 ++#: ../lib/hw.c:207 + msgid "Frame Relay DLCI" + msgstr "Frame Relay DLCI" + +-#: ../lib/hw.c:192 ++#: ../lib/hw.c:208 + msgid "Frame Relay Access Device" + msgstr "Frame Relay Access Device" + +-#: ../lib/hw.c:195 ++#: ../lib/hw.c:211 + msgid "IPv6-in-IPv4" + msgstr "IPv6-nach-IPv4" + +-#: ../lib/hw.c:198 +-#, fuzzy ++#: ../lib/hw.c:214 + msgid "IrLAP" +-msgstr "LAPB" ++msgstr "IrLAP" + +-#: ../lib/hw.c:201 ++#: ../lib/hw.c:217 + msgid "16/4 Mbps Token Ring" + msgstr "" + +-#: ../lib/hw.c:203 ++#: ../lib/hw.c:219 + msgid "16/4 Mbps Token Ring (New)" + msgstr "" + ++#: ../lib/hw.c:226 ++msgid "Generic EUI-64" ++msgstr "" ++ + #: ../lib/inet.c:153 ../lib/inet6.c:79 + #, c-format + msgid "rresolve: unsupport address family %d !\n" + msgstr "rresolve: nicht untersttzte Adressfamilie %d !\n" + +-#: ../lib/inet6_gr.c:79 ++#: ../lib/inet6.c:131 ++#, fuzzy ++msgid "[UNKNOWN]" ++msgstr "UNBEKANNT" ++ ++#: ../lib/inet6_gr.c:71 ++#, c-format + msgid "INET6 (IPv6) not configured in this system.\n" + msgstr "INET6 (IPv6) ist auf diesem System nicht konfiguriert.\n" + +-#: ../lib/inet6_gr.c:82 ++#: ../lib/inet6_gr.c:74 ++#, c-format + msgid "Kernel IPv6 routing table\n" +-msgstr "Kernel IPv6 Routentabelle\n" ++msgstr "Kernel-IPv6-Routentabelle\n" + +-#: ../lib/inet6_gr.c:84 ++#: ../lib/inet6_gr.c:76 ++#, c-format + msgid "" +-"Destination Next Hop " +-" Flags Metric Ref Use Iface\n" +-msgstr "" +-"Ziel Nchster Hop " +-" Flags Metric Ref Benutzer Iface\n" ++"Destination Next " ++"Hop Flags Metric Ref Use Iface\n" ++msgstr "Ziel Nchster Hop Flags Metric Ref Benutzer Iface\n" + +-#: ../lib/inet6_gr.c:158 ++#: ../lib/inet6_gr.c:150 ++#, c-format + msgid "Kernel IPv6 Neighbour Cache\n" + msgstr "Kernel IPv6 Nachbarcache\n" + +-#: ../lib/inet6_gr.c:161 ++#: ../lib/inet6_gr.c:153 ++#, c-format + msgid "" + "Neighbour HW Address Iface Flags " + "Ref State\n" +@@ -2083,39 +2367,45 @@ msgstr "" + "Nachbar HW-Adresse Iface Flags " + "Ref Zustand\n" + +-#: ../lib/inet6_gr.c:165 ++#: ../lib/inet6_gr.c:157 ++#, c-format + msgid "" + "Neighbour HW Address Iface Flags " + "Ref State Stale(sec) Delete(sec)\n" +-msgstr "" +-"Nachbar HW-Adresse Iface Flags " +-"Ref Zustand Stale(sec) Lschen(sec)\n" ++msgstr "Nachbar HW-Adresse Iface Flags Ref Zustand Stale(sec) Lschen(sec)\n" + + #: ../lib/inet6_sr.c:46 ++#, c-format + msgid "Usage: inet6_route [-vF] del Target\n" + msgstr "Benutzung: inet6_route [-vF] del Ziel\n" + + #: ../lib/inet6_sr.c:47 ++#, c-format + msgid " inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n" + msgstr " inet6_route [-vF] add Ziel [gw Gateway] [metric M] [[dev] If]\n" + + #: ../lib/inet6_sr.c:48 ++#, c-format + msgid " inet6_route [-FC] flush NOT supported\n" + msgstr " inet6_route [-FC] flush NICHT untersttzt\n" + +-#: ../lib/inet6_sr.c:182 ++#: ../lib/inet6_sr.c:188 ++#, c-format + msgid "Flushing `inet6' routing table not supported\n" +-msgstr ",,Flush'' fr IPv6 Routentabelle nicht untersttzt\n" ++msgstr "Flush fr IPv6-Routentabelle nicht untersttzt\n" + + #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220 ++#, c-format + msgid "INET (IPv4) not configured in this system.\n" + msgstr "INET (IPv4) ist auf diesem System nicht konfiguriert.\n" + + #: ../lib/inet_gr.c:53 ++#, c-format + msgid "Kernel IP routing table\n" +-msgstr "Kernel IP Routentabelle\n" ++msgstr "Kernel-IP-Routentabelle\n" + + #: ../lib/inet_gr.c:56 ++#, c-format + msgid "" + "Destination Gateway Genmask Flags Metric Ref Use " + "Iface\n" +@@ -2124,6 +2414,7 @@ msgstr "" + "Iface\n" + + #: ../lib/inet_gr.c:59 ++#, c-format + msgid "" + "Destination Gateway Genmask Flags MSS Window irtt " + "Iface\n" +@@ -2132,6 +2423,7 @@ msgstr "" + "Iface\n" + + #: ../lib/inet_gr.c:62 ++#, c-format + msgid "" + "Destination Gateway Genmask Flags Metric Ref Use " + "Iface MSS Window irtt\n" +@@ -2140,10 +2432,12 @@ msgstr "" + "Iface MSS Fenster irtt\n" + + #: ../lib/inet_gr.c:237 ++#, c-format + msgid "Kernel IP routing cache\n" +-msgstr "Kernel IP Routencache\n" ++msgstr "Kernel-IP-Routencache\n" + + #: ../lib/inet_gr.c:258 ++#, c-format + msgid "" + "Source Destination Gateway Flags Metric Ref Use " + "Iface\n" +@@ -2152,6 +2446,7 @@ msgstr "" + "Iface\n" + + #: ../lib/inet_gr.c:261 ++#, c-format + msgid "" + "Source Destination Gateway Flags MSS Window irtt " + "Iface\n" +@@ -2160,6 +2455,7 @@ msgstr "" + "Iface\n" + + #: ../lib/inet_gr.c:266 ++#, c-format + msgid "" + "Source Destination Gateway Flags Metric Ref Use " + "Iface MSS Window irtt HH Arp\n" +@@ -2168,6 +2464,7 @@ msgstr "" + "Iface MSS Fenster irtt HH Arp\n" + + #: ../lib/inet_gr.c:290 ++#, c-format + msgid "" + "Source Destination Gateway Flags Metric Ref Use " + "Iface MSS Window irtt TOS HHRef HHUptod SpecDst\n" +@@ -2175,37 +2472,39 @@ msgstr "" + "Quelle Ziel Gateway Flags Metrik Ref Ben " + "Iface MSS Window irtt TOS HHRef HHUptod SpecDst\n" + +-#: ../lib/inet_sr.c:50 ++#: ../lib/inet_sr.c:51 ++#, c-format + msgid "" + "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] " + "[[dev] If]\n" +-msgstr "" +-"Benutzung: inet_route [-vF] del {-host|-net} Ziel[/prefix] [gw Gw] [metric " +-"M] [[dev] If]\n" ++msgstr "Benutzung: inet_route [-vF] del {-host|-net} Ziel[/Prfix] [gw Gw] [metric M] [[dev] If]\n" + +-#: ../lib/inet_sr.c:51 ++#: ../lib/inet_sr.c:52 ++#, c-format + msgid "" + " inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n" +-msgstr "" +-" inet_route [-vF] add {-host|-net} Ziel[/Prefix] [gw Gw] [metric M]\n" ++msgstr " inet_route [-vF] add {-host|-net} Ziel[/Prfix] [gw Gw] [metric M]\n" + +-#: ../lib/inet_sr.c:52 ++#: ../lib/inet_sr.c:53 ++#, c-format + msgid "" + " [netmask N] [mss Mss] [window W] [irtt I]\n" + msgstr "" + " [netmask N] [mss Mss] [window W] [irtt I]\n" + +-#: ../lib/inet_sr.c:53 ++#: ../lib/inet_sr.c:54 ++#, c-format + msgid " [mod] [dyn] [reinstate] [[dev] If]\n" + msgstr " [mod] [dyn] [reinstate] [[dev] If]\n" + +-#: ../lib/inet_sr.c:54 ++#: ../lib/inet_sr.c:55 ++#, c-format + msgid "" + " inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n" +-msgstr "" +-" inet_route [-vF] add {-host|-net} Ziel[/Prfix] [metric M] reject\n" ++msgstr " inet_route [-vF] add {-host|-net} Ziel[/Prfix] [metric M] reject\n" + +-#: ../lib/inet_sr.c:55 ++#: ../lib/inet_sr.c:56 ++#, c-format + msgid " inet_route [-FC] flush NOT supported\n" + msgstr " inet_route [-FC] flush NICHT untersttzt\n" + +@@ -2215,15 +2514,17 @@ msgid "route: %s: cannot use a NETWORK a + msgstr "route: %s: Netzadresse als Gateway ungltig!\n" + + #: ../lib/inet_sr.c:174 +-#, fuzzy ++#, fuzzy, c-format + msgid "route: Invalid MSS/MTU.\n" + msgstr "route: Ungltige MSS.\n" + + #: ../lib/inet_sr.c:187 ++#, c-format + msgid "route: Invalid window.\n" + msgstr "route: Ungltige Fenstergre.\n" + + #: ../lib/inet_sr.c:203 ++#, c-format + msgid "route: Invalid initial rtt.\n" + msgstr "route: Ungltige Start-RTT.\n" + +@@ -2238,126 +2539,408 @@ msgid "route: bogus netmask %s\n" + msgstr "Route: Fehlerhafte Netzmaske %s\n" + + #: ../lib/inet_sr.c:270 ++#, c-format + msgid "route: netmask doesn't match route address\n" + msgstr "route: Netzmaske passt nicht zur Routenadresse\n" + + #: ../lib/inet_sr.c:306 ++#, c-format + msgid "Flushing `inet' routing table not supported\n" +-msgstr ",,Flush'' der Inet-Routentabelle nicht untersttzt\n" ++msgstr "Flush der Inet-Routentabelle nicht untersttzt\n" + + #: ../lib/inet_sr.c:310 ++#, c-format + msgid "Modifying `inet' routing cache not supported\n" +-msgstr "nderung des ,,Inet'' Routencaches nicht untersttzt\n" ++msgstr "nderung des Inet Routencaches nicht untersttzt\n" + + #: ../lib/ipx_gr.c:52 ++#, c-format + msgid "IPX not configured in this system.\n" + msgstr "IPX ist auf diesem System nicht konfiguriert.\n" + + #: ../lib/ipx_gr.c:56 ++#, c-format + msgid "Kernel IPX routing table\n" +-msgstr "Kernel IPX Routentabelle\n" ++msgstr "Kernel-IPX-Routentabelle\n" + + #. xxx + #: ../lib/ipx_gr.c:57 ++#, c-format + msgid "Destination Router Net Router Node\n" +-msgstr "Ziel Router Netz Router Knoten\n" ++msgstr "Ziel Router-Netz Router-Knoten\n" + + #: ../lib/ipx_sr.c:33 ++#, c-format + msgid "IPX: this needs to be written\n" +-msgstr "IPX: dies mu noch geschrieben werden\n" ++msgstr "IPX: dies muss noch geschrieben werden\n" + +-#: ../lib/masq_info.c:197 ++#: ../lib/masq_info.c:198 ++#, c-format + msgid "IP masquerading entries\n" + msgstr "IP-Maskierungseintrge\n" + +-#: ../lib/masq_info.c:200 ++#: ../lib/masq_info.c:201 ++#, c-format + msgid "prot expire source destination ports\n" + msgstr "Prot expire Quelle Ziel Ports\n" + +-#: ../lib/masq_info.c:203 ++#: ../lib/masq_info.c:204 ++#, c-format + msgid "" +-"prot expire initseq delta prevd source destination " +-" ports\n" ++"prot expire initseq delta prevd source " ++"destination ports\n" + msgstr "" +-"Prot Ablauf Anf-Seq Delta Prevd Quelle Ziel " +-" Ports\n" ++"Prot Ablauf Anf-Seq Delta Prevd Quelle " ++"Ziel Ports\n" + + #: ../lib/netrom_gr.c:48 ++#, c-format + msgid "NET/ROM not configured in this system.\n" + msgstr "NET/ROM ist auf diesem System nicht verfgbar.\n" + + #: ../lib/netrom_gr.c:51 ++#, c-format + msgid "Kernel NET/ROM routing table\n" +-msgstr "Kernel NET/ROM Routentabelle\n" ++msgstr "Kernel-NET/ROM-Routentabelle\n" + + #: ../lib/netrom_gr.c:52 ++#, c-format + msgid "Destination Mnemonic Quality Neighbour Iface\n" + msgstr "Ziel Mnemonic Qualitt Nachbar Iface\n" + + #: ../lib/netrom_sr.c:34 ++#, c-format + msgid "netrom usage\n" +-msgstr "NET/ROM Benutzung\n" ++msgstr "NET/ROM-Benutzung\n" + + #: ../lib/netrom_sr.c:44 ++#, c-format + msgid "NET/ROM: this needs to be written\n" +-msgstr "NET/ROM: Dies mu noch geschrieben werden\n" ++msgstr "NET/ROM: Dies muss noch geschrieben werden\n" + + #: ../lib/ppp.c:44 ++#, c-format + msgid "You cannot start PPP with this program.\n" + msgstr "Mit diesem Programm kann PPP nicht gestartet werden.\n" + + #: ../lib/ppp_ac.c:38 ++#, c-format + msgid "Sorry, use pppd!\n" +-msgstr "Bitte benutzen sie pppd.\n" ++msgstr "Bitte benutzen Sie pppd.\n" + + #: ../lib/rose.c:87 + msgid "Node address must be ten digits" +-msgstr "Knotenadresse mu zehn Ziffern haben" ++msgstr "Knotenadresse muss zehn Ziffern haben" + + #: ../lib/rose_gr.c:51 ++#, c-format + msgid "ROSE not configured in this system.\n" + msgstr "ROSE ist auf diesem System nicht verfgbar.\n" + + #: ../lib/rose_gr.c:54 ++#, c-format + msgid "Kernel ROSE routing table\n" +-msgstr "ROSE Kernel Routentabelle\n" ++msgstr "ROSE-Kernel-Routentabelle\n" + +-#: ../lib/tr.c:70 ../lib/tr.c:85 ++#: ../lib/tr.c:86 ../lib/tr.c:101 + #, c-format + msgid "in_tr(%s): invalid token ring address!\n" + msgstr "in_tr(%s): ungltige Tokenringadresse!\n" + +-#: ../lib/tr.c:97 ++#: ../lib/tr.c:113 + #, c-format + msgid "in_tr(%s): trailing : ignored!\n" + msgstr "in_tr(%s): nachfolgend : ignoriert!\n" + +-#: ../lib/tr.c:109 ++#: ../lib/tr.c:125 + #, c-format + msgid "in_tr(%s): trailing junk!\n" + msgstr "in_tr(%s): nachfolgender Mll!\n" + +-#: ../lib/interface.c:124 ++#: ../lib/interface.c:176 + #, c-format + msgid "warning: no inet socket available: %s\n" +-msgstr "Warnung: Keine INET Sockets verfgbar: %s\n" ++msgstr "Warnung: Keine INET-Sockets verfgbar: %s\n" + +-#: ../lib/interface.c:270 ++#: ../lib/interface.c:325 + #, c-format + msgid "Warning: cannot open %s (%s). Limited output.\n" + msgstr "" + + #. Give better error message for this case. +-#: ../lib/interface.c:504 ++#: ../lib/interface.c:571 + msgid "Device not found" + msgstr "Gert nicht gefunden" + +-#: ../lib/interface.c:508 ++#: ../lib/interface.c:575 + #, c-format + msgid "%s: error fetching interface information: %s\n" + msgstr "%s: Fehler beim Auslesen der Schnittstelleninformation: %s\n" + +-#: ../lib/sockets.c:59 ++#: ../lib/interface.c:608 ++msgid " - no statistics available -" ++msgstr " - keine Statistiken verfgbar -" ++ ++#: ../lib/interface.c:612 ++#, c-format ++msgid "[NO FLAGS]" ++msgstr "[KEINE FLAGS]" ++ ++#: ../lib/interface.c:688 ++#, c-format ++msgid "%-9.9s Link encap:%s " ++msgstr "%-9.9s Protokoll:%s " ++ ++#: ../lib/interface.c:693 ++#, c-format ++msgid "HWaddr %s " ++msgstr "Hardware Adresse %s " ++ ++#: ../lib/interface.c:696 ++#, c-format ++msgid "Media:%s" ++msgstr "Medium:%s" ++ ++#: ../lib/interface.c:698 ++#, c-format ++msgid "(auto)" ++msgstr "(auto)" ++ ++#: ../lib/interface.c:705 ++#, c-format ++msgid " %s addr:%s " ++msgstr " %s Adresse:%s " ++ ++#: ../lib/interface.c:708 ++#, c-format ++msgid " P-t-P:%s " ++msgstr " P-z-P:%s " ++ ++#: ../lib/interface.c:711 ++#, c-format ++msgid " Bcast:%s " ++msgstr " Bcast:%s " ++ ++#: ../lib/interface.c:713 ++#, c-format ++msgid " Mask:%s\n" ++msgstr " Maske:%s\n" ++ ++#: ../lib/interface.c:730 ++#, c-format ++msgid " inet6 addr: %s/%d" ++msgstr " inet6-Adresse: %s/%d" ++ ++#: ../lib/interface.c:732 ++#, c-format ++msgid " Scope:" ++msgstr " Gltigkeitsbereich:" ++ ++#: ../lib/interface.c:735 ++#, c-format ++msgid "Global" ++msgstr "Global" ++ ++#: ../lib/interface.c:738 ++#, c-format ++msgid "Link" ++msgstr "Verbindung" ++ ++#: ../lib/interface.c:741 ++#, c-format ++msgid "Site" ++msgstr "Standort" ++ ++#: ../lib/interface.c:744 ++#, c-format ++msgid "Compat" ++msgstr "Kompatibilitt" ++ ++#: ../lib/interface.c:747 ++#, c-format ++msgid "Host" ++msgstr "Maschine" ++ ++#: ../lib/interface.c:750 ++#, c-format ++msgid "Unknown" ++msgstr "Unbekannt" ++ ++#: ../lib/interface.c:765 ++#, c-format ++msgid " IPX/Ethernet II addr:%s\n" ++msgstr " IPX/Ethernet II Adresse:%s\n" ++ ++#: ../lib/interface.c:768 ++#, c-format ++msgid " IPX/Ethernet SNAP addr:%s\n" ++msgstr " IPX/Ethernet SNAP Adresse:%s\n" ++ ++#: ../lib/interface.c:771 ++#, c-format ++msgid " IPX/Ethernet 802.2 addr:%s\n" ++msgstr " IPX/Ethernet 802.2 Adresse:%s\n" ++ ++#: ../lib/interface.c:774 ++#, c-format ++msgid " IPX/Ethernet 802.3 addr:%s\n" ++msgstr " IPX/Ethernet 802.3 Adresse:%s\n" ++ ++#: ../lib/interface.c:784 ++#, c-format ++msgid " EtherTalk Phase 2 addr:%s\n" ++msgstr " EtherTalk Phase 2 Adresse:%s\n" ++ ++#: ../lib/interface.c:793 ++#, c-format ++msgid " econet addr:%s\n" ++msgstr " econet Adresse:%s\n" ++ ++#: ../lib/interface.c:800 ++#, c-format ++msgid "[NO FLAGS] " ++msgstr "[KEINE FLAGS] " ++ ++#: ../lib/interface.c:802 ++#, c-format ++msgid "UP " ++msgstr "UP " ++ ++#: ../lib/interface.c:804 ++#, c-format ++msgid "BROADCAST " ++msgstr "BROADCAST " ++ ++#: ../lib/interface.c:806 ++#, c-format ++msgid "DEBUG " ++msgstr "DEBUG " ++ ++#: ../lib/interface.c:808 ++#, c-format ++msgid "LOOPBACK " ++msgstr "LOOPBACK " ++ ++#: ../lib/interface.c:810 ++#, c-format ++msgid "POINTOPOINT " ++msgstr "PUNKTZUPUNKT " ++ ++#: ../lib/interface.c:812 ++#, c-format ++msgid "NOTRAILERS " ++msgstr "NOTRAILERS " ++ ++#: ../lib/interface.c:814 ++#, c-format ++msgid "RUNNING " ++msgstr "RUNNING " ++ ++#: ../lib/interface.c:816 ++#, c-format ++msgid "NOARP " ++msgstr "NOARP " ++ ++#: ../lib/interface.c:818 ++#, c-format ++msgid "PROMISC " ++msgstr "PROMISC " ++ ++#: ../lib/interface.c:820 ++#, c-format ++msgid "ALLMULTI " ++msgstr "ALLMULTI " ++ ++#: ../lib/interface.c:822 ++#, c-format ++msgid "SLAVE " ++msgstr "SLAVE " ++ ++#: ../lib/interface.c:824 ++#, c-format ++msgid "MASTER " ++msgstr "MASTER " ++ ++#: ../lib/interface.c:826 ++#, c-format ++msgid "MULTICAST " ++msgstr "MULTICAST " ++ ++#: ../lib/interface.c:829 ++#, c-format ++msgid "DYNAMIC " ++msgstr "DYNAMIC " ++ ++#. DONT FORGET TO ADD THE FLAGS IN ife_print_short ++#: ../lib/interface.c:832 ++#, c-format ++msgid " MTU:%d Metric:%d" ++msgstr " MTU:%d Metrik:%d" ++ ++#: ../lib/interface.c:836 ++#, c-format ++msgid " Outfill:%d Keepalive:%d" ++msgstr " Outfill:%d Keepalive:%d" ++ ++#: ../lib/interface.c:850 ++#, fuzzy, c-format ++msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" ++msgstr "Empfangene Pakete:%lu Fehler:%lu Weggeworfen:%lu berlauf:%lu Rahmen:%lu\n" ++ ++#: ../lib/interface.c:855 ++#, c-format ++msgid " compressed:%lu\n" ++msgstr " komprimiert:%lu\n" ++ ++#: ../lib/interface.c:895 ++#, fuzzy, c-format ++msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" ++msgstr "Verschickte Pakete:%lu Fehler:%lu Weggeworfen:%lu berlauf:%lu Trger:%lu\n" ++ ++#: ../lib/interface.c:899 ++#, c-format ++msgid " collisions:%lu " ++msgstr " Kollisionen:%lu " ++ ++#: ../lib/interface.c:901 ++#, c-format ++msgid "compressed:%lu " ++msgstr "Komprimiert:%lu " ++ ++#: ../lib/interface.c:903 ++#, c-format ++msgid "txqueuelen:%d " ++msgstr "Sendewarteschlangenlnge:%d " ++ ++#: ../lib/interface.c:905 ++#, c-format ++msgid "RX bytes:%llu (%lu.%lu %s) TX bytes:%llu (%lu.%lu %s)\n" ++msgstr "" ++ ++#: ../lib/interface.c:916 ++#, c-format ++msgid "Interrupt:%d " ++msgstr "Interrupt:%d " ++ ++#. Only print devices using it for ++#. I/O maps ++#: ../lib/interface.c:919 ++#, c-format ++msgid "Base address:0x%x " ++msgstr "Basisadresse:0x%x " ++ ++#: ../lib/interface.c:921 ++#, c-format ++msgid "Memory:%lx-%lx " ++msgstr "Speicher:%lx-%lx " ++ ++#: ../lib/interface.c:924 ++#, c-format ++msgid "DMA chan:%x " ++msgstr "DMA Kanal:%x " ++ ++#: ../lib/sockets.c:63 ++#, c-format + msgid "No usable address families found.\n" + msgstr "Keine benutzbaren Adressfamilien gefunden.\n" + +@@ -2369,41 +2952,44 @@ msgstr "ip: %s ist eine ungltige INET-A + #: ../lib/util-ank.c:238 + #, c-format + msgid "ip: %s is invalid inet prefix\n" +-msgstr "ip: %s ist ein ungltiges INET-Prefix\n" ++msgstr "ip: %s ist ein ungltiges INET-Prfix\n" + + #: ../lib/util-ank.c:248 + #, c-format + msgid "ip: %s is invalid IPv4 address\n" +-msgstr "ip: %s ist eine ungltige IPv4 Adresse\n" ++msgstr "ip: %s ist eine ungltige IPv4-Adresse\n" + + #: ../lib/util-ank.c:256 + #, c-format + msgid "ip: argument is wrong: %s\n" + msgstr "ip: Fehlerhaftes Argument: %s\n" + +-#: ../ipmaddr.c:56 ++#: ../ipmaddr.c:61 ++#, c-format + msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n" + msgstr "Benutzung: ipmaddr [ add | del ] MULTIADR dev NAME\n" + +-#: ../ipmaddr.c:57 ++#: ../ipmaddr.c:62 ++#, c-format + msgid " ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n" + msgstr " ipmaddr show [ dev NAME ] [ ipv4 | ipv6 | link | all ]\n" + +-#: ../ipmaddr.c:58 ++#: ../ipmaddr.c:63 ++#, c-format + msgid " ipmaddr -V | -version\n" + msgstr "" + +-#: ../ipmaddr.c:258 ++#: ../ipmaddr.c:263 + #, c-format + msgid "family %d " + msgstr "familie %d " + +-#: ../ipmaddr.c:267 ++#: ../ipmaddr.c:272 + #, c-format + msgid " users %d" + msgstr " Benutzer %d" + +-#: ../ipmaddr.c:353 ++#: ../ipmaddr.c:358 + msgid "Cannot create socket" + msgstr "Kann Socket nicht ffnen" + +@@ -2418,13 +3004,14 @@ msgid "slattach: tty_lock: (%s): %s\n" + msgstr "slattach: tty_lock: (%s): %s\n" + + #: ../slattach.c:192 ++#, c-format + msgid "slattach: cannot write PID file\n" + msgstr "slattach: Kann PID-Datei nicht schreiben\n" + + #: ../slattach.c:202 + #, c-format + msgid "slattach: tty_lock: UUCP user %s unknown!\n" +-msgstr "slattach: tty_lock: UUCP Benutzer %s unbekannt!\n" ++msgstr "slattach: tty_lock: UUCP-Benutzer %s unbekannt!\n" + + #: ../slattach.c:430 + #, c-format +@@ -2436,39 +3023,71 @@ msgstr "slattach: tty_hangup(DROP): %s\n + msgid "slattach: tty_hangup(RAISE): %s\n" + msgstr "slattach: tty_hangup(RAISE): %s\n" + +-#: ../slattach.c:486 ++#: ../slattach.c:468 ++#, fuzzy, c-format ++msgid "slattach: tty name too long\n" ++msgstr "%s: name zu lang\n" ++ ++#: ../slattach.c:498 ++#, c-format + msgid "slattach: tty_open: cannot get current state!\n" + msgstr "slattach: tty_open: kann aktuellen Zustand nicht auslesen!\n" + +-#: ../slattach.c:493 ++#: ../slattach.c:505 ++#, c-format + msgid "slattach: tty_open: cannot get current line disc!\n" + msgstr "" + "slattach: tty_open: Kann augenblicklichen Leitungszustand nicht auslesen!\n" + +-#: ../slattach.c:501 ++#: ../slattach.c:513 ++#, c-format + msgid "slattach: tty_open: cannot set RAW mode!\n" + msgstr "slattach: tty_open: Kann RAW-Modus nicht setzen!\n" + +-#: ../slattach.c:508 ++#: ../slattach.c:520 + #, c-format + msgid "slattach: tty_open: cannot set %s bps!\n" + msgstr "slattach: tty_open: Kann %s bps nicht setzen!\n" + +-#: ../slattach.c:518 ++#: ../slattach.c:530 ++#, c-format + msgid "slattach: tty_open: cannot set 8N1 mode!\n" + msgstr "slattach: tty_open: Kann 8N1-Modus nicht setzen!\n" + +-#: ../slattach.c:686 ++#: ../slattach.c:672 ++#, c-format ++msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n" ++msgstr "" ++ ++#: ../slattach.c:704 + #, c-format + msgid "%s started" + msgstr "%s gestartet" + +-#: ../slattach.c:687 ++#: ../slattach.c:705 + #, c-format + msgid " on %s" + msgstr " auf %s" + +-#: ../slattach.c:688 ++#: ../slattach.c:706 + #, c-format + msgid " interface %s\n" + msgstr " Schnittstelle: %s\n" ++ ++msgid "" ++" arp [-v] [] [-i ] -s [netmask ] pub " ++"<-''-\n" ++msgstr "" ++" arp [-v] [] [-i ] -s [netmask ] pub\n" ++ ++msgid "%s: unknown interface: %s\n" ++msgstr "%s: unbekannte Schnittstelle: %s\n" ++ ++msgid "address mask replies" ++msgstr "Adressmaskenantworten" ++ ++msgid "unknown title %s\n" ++msgstr "Unbekannter Titel %s\n" ++ ++msgid "Routing table for `ddp' not yet supported.\n" ++msgstr "DDP-Routentabelle wird noch nicht untersttzt.\n" +Index: net-tools/po/ja.po +=================================================================== +--- /dev/null ++++ net-tools/po/ja.po +@@ -0,0 +1,3133 @@ ++# Net-tool Japanese locale data ++# Kenshi Muto , 2007. ++# Yasuyuki Furukawa , 1999. ++# ++msgid "" ++msgstr "" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2007-06-30 12:28+0900\n" ++"PO-Revision-Date: 2007-07-04 20:47+0900\n" ++"Last-Translator: Kenshi Muto \n" ++"Language-Team: Japanese\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8-bit\n" ++ ++#: ../arp.c:112 ../arp.c:279 ++#, c-format ++msgid "arp: need host name\n" ++msgstr "arp: ホスト名が必要です\n" ++ ++#: ../arp.c:215 ../arp.c:230 ++#, c-format ++msgid "No ARP entry for %s\n" ++msgstr "%sのARPエントリがありません\n" ++ ++#: ../arp.c:248 ++#, c-format ++msgid "arp: cant get HW-Address for `%s': %s.\n" ++msgstr "arp: '%s'のハードウェアアドレスを取得できません: %s.\n" ++ ++#: ../arp.c:252 ++#, c-format ++msgid "arp: protocol type mismatch.\n" ++msgstr "arp: プロトコルタイプが適合しません.\n" ++ ++#: ../arp.c:261 ++#, c-format ++msgid "arp: device `%s' has HW address %s `%s'.\n" ++msgstr "arp: デバイス`%s'はハードウェアアドレス%s `%s'です.\n" ++ ++#: ../arp.c:293 ++#, c-format ++msgid "arp: need hardware address\n" ++msgstr "arp: ハードウェアアドレスが必要です\n" ++ ++#: ../arp.c:301 ++#, c-format ++msgid "arp: invalid hardware address\n" ++msgstr "arp: ハードウェアアドレスが不適当です\n" ++ ++#: ../arp.c:398 ++#, c-format ++msgid "arp: cannot open etherfile %s !\n" ++msgstr "arp: etherファイル%sが開けません!\n" ++ ++#: ../arp.c:414 ++#, c-format ++msgid "arp: format error on line %u of etherfile %s !\n" ++msgstr "arp: %u行(ファイル%s)にフォーマットエラーがあります!\n" ++ ++#: ../arp.c:427 ++#, c-format ++msgid "arp: cannot set entry on line %u of etherfile %s !\n" ++msgstr "arp: etherファイル%u行(%s)のエントリを設定できません!\n" ++ ++#: ../arp.c:448 ++#, c-format ++msgid "" ++"Address HWtype HWaddress Flags Mask " ++"Iface\n" ++msgstr "アドレス HWタイプ HWアドレス フラグ マスク インタフェース\n" ++ ++#: ../arp.c:476 ++msgid "" ++msgstr "<起点インタフェース>" ++ ++#: ../arp.c:478 ++msgid "(incomplete)" ++msgstr "(不完全)" ++ ++# translatable? ++#: ../arp.c:495 ++#, c-format ++msgid "%s (%s) at " ++msgstr "%s (%s) at " ++ ++#: ../arp.c:501 ++#, c-format ++msgid " " ++msgstr "<不完全> " ++ ++#: ../arp.c:507 ++#, c-format ++msgid "netmask %s " ++msgstr "ネットマスク %s " ++ ++# translatable? ++#: ../arp.c:524 ++#, c-format ++msgid "on %s\n" ++msgstr "on %s\n" ++ ++#: ../arp.c:605 ++#, c-format ++msgid "Entries: %d\tSkipped: %d\tFound: %d\n" ++msgstr "エントリ: %d\tスキップ: %d\t発見: %d\n" ++ ++#: ../arp.c:609 ++#, c-format ++msgid "%s (%s) -- no entry\n" ++msgstr "%s (%s) -- エントリなし\n" ++ ++#: ../arp.c:611 ++#, c-format ++msgid "arp: in %d entries no match found.\n" ++msgstr "arp: %dのエントリ中, 一致するものが見つかりません.\n" ++ ++#: ../arp.c:626 ++#, c-format ++msgid "" ++"Usage:\n" ++" arp [-vn] [] [-i ] [-a] [] <-Display ARP " ++"cache\n" ++msgstr "" ++"使用法:\n" ++" arp [-vn] [] [-i <インタフェース>]\n" ++" [-a] [<ホスト名>] ‥‥ ARPキャッシュの表" ++"示\n" ++ ++#: ../arp.c:627 ++#, c-format ++msgid "" ++" arp [-v] [-i ] -d [pub] <-Delete ARP " ++"entry\n" ++msgstr " arp [-v] [-i <インタフェース>] -d <ホスト名> [pub] ‥‥ARPエントリを削除\n" ++ ++#: ../arp.c:628 ++#, c-format ++msgid "" ++" arp [-vnD] [] [-i ] -f [] <-Add entry from " ++"file\n" ++msgstr "" ++" arp [-vnD] [] [-i <インタフェース>] \n" ++" -f <ファイル名> ‥‥ファイルからエントリを追加\n" ++ ++#: ../arp.c:629 ++#, c-format ++msgid "" ++" arp [-v] [] [-i ] -s [temp] <-Add " ++"entry\n" ++msgstr "" ++" arp [-v] [] [-i <インタフェース>]\n" ++" -s <ホスト名> <ハードウェアアドレス> [temp] ‥‥エントリを追加\n" ++ ++# FIXME:What does '' mean? ++#: ../arp.c:630 ++#, c-format ++msgid "" ++" arp [-v] [] [-i ] -Ds [netmask ] pub " ++"<-''-\n" ++"\n" ++msgstr "" ++" arp [-v] [] [-i <インタフェース>] -Ds <ホスト名>\n" ++" <インタフェース> [netmask <ネットマスク>] pub ‥‥ 〃\n" ++ ++#: ../arp.c:632 ++#, c-format ++msgid "" ++" -a display (all) hosts in alternative (BSD) " ++"style\n" ++msgstr "" ++" -a 新しい(BSD)スタイルでエントリされた全ホストを表示" ++"する\n" ++ ++#: ../arp.c:633 ++#, c-format ++msgid " -s, --set set a new ARP entry\n" ++msgstr " -s, --set 新規ARPエントリを設定する\n" ++ ++#: ../arp.c:634 ++#, c-format ++msgid " -d, --delete delete a specified entry\n" ++msgstr " -d, --delete 指定エントリを削除する\n" ++ ++#: ../arp.c:635 ../netstat.c:1503 ../route.c:86 ++#, c-format ++msgid " -v, --verbose be verbose\n" ++msgstr " -v, --verbose 詳細表示を行なう\n" ++ ++#: ../arp.c:636 ../netstat.c:1504 ../route.c:87 ++#, c-format ++msgid " -n, --numeric don't resolve names\n" ++msgstr " -n, --numeric 名前のレゾルブをしない\n" ++ ++#: ../arp.c:637 ++#, c-format ++msgid "" ++" -i, --device specify network interface (e.g. eth0)\n" ++msgstr " -i, --device ネットワークインタフェースの指定(例 eth0)\n" ++ ++#: ../arp.c:638 ++#, c-format ++msgid " -D, --use-device read from given device\n" ++msgstr "" ++" -D, --use-device 与えられたデバイスから\n" ++" を読み込む\n" ++ ++#: ../arp.c:639 ++#, c-format ++msgid " -A, -p, --protocol specify protocol family\n" ++msgstr " -A, -p, --protocol プロトコルファミリを指定する\n" ++ ++#: ../arp.c:640 ++#, c-format ++msgid "" ++" -f, --file read new entries from file or from /etc/" ++"ethers\n" ++"\n" ++msgstr " -f, --file /etc/ethersファイルから新規エントリを読み込む\n\n" ++ ++#: ../arp.c:642 ../rarp.c:182 ++#, c-format ++msgid " =Use '-H ' to specify hardware address type. Default: %s\n" ++msgstr " =ハードウェアアドレスタイプを指定するには'-H 'を使って下さい。標準: %s\n" ++ ++#: ../arp.c:643 ../rarp.c:183 ++#, c-format ++msgid " List of possible hardware types (which support ARP):\n" ++msgstr " (ARPをサポートした)指定可能なハードウェアタイプのリスト:\n" ++ ++#: ../arp.c:677 ../arp.c:762 ++#, c-format ++msgid "%s: hardware type not supported!\n" ++msgstr "%s: ハードウェアタイプがサポートされていません!\n" ++ ++#: ../arp.c:681 ++#, c-format ++msgid "%s: address family not supported!\n" ++msgstr "%s: アドレスファミリがサポートされていません!\n" ++ ++#: ../arp.c:716 ++#, c-format ++msgid "arp: -N not yet supported.\n" ++msgstr "arp: -Nはまだサポートしていません.\n" ++ ++#: ../arp.c:726 ++#, c-format ++msgid "arp: %s: unknown address family.\n" ++msgstr "arp: %s: 不明なアドレスファミリです.\n" ++ ++#: ../arp.c:735 ++#, c-format ++msgid "arp: %s: unknown hardware type.\n" ++msgstr "arp: %s: 不明なハードウェアタイプです.\n" ++ ++#: ../arp.c:754 ++#, c-format ++msgid "arp: %s: kernel only supports 'inet'.\n" ++msgstr "arp: %s: カーネルは'inet'以外はサポートしていません.\n" ++ ++#: ../arp.c:767 ++#, c-format ++msgid "arp: %s: hardware type without ARP support.\n" ++msgstr "arp: %s: ARPサポートのないハードウェアタイプです.\n" ++ ++#: ../hostname.c:71 ++#, c-format ++msgid "Setting nodename to `%s'\n" ++msgstr "ノード名を`%s'へ設定しました\n" ++ ++#: ../hostname.c:76 ++#, c-format ++msgid "%s: you must be root to change the node name\n" ++msgstr "%s: ノード名の変更はルートでなければなりません\n" ++ ++#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117 ++#, c-format ++msgid "%s: name too long\n" ++msgstr "%s: 名前が長すぎます\n" ++ ++#: ../hostname.c:91 ++#, c-format ++msgid "Setting hostname to `%s'\n" ++msgstr "ホスト名を`%s'へ設定しました\n" ++ ++#: ../hostname.c:96 ++#, c-format ++msgid "%s: you must be root to change the host name\n" ++msgstr "%s: ホスト名の変更はルートでなければなりません\n" ++ ++#: ../hostname.c:109 ++#, c-format ++msgid "Setting domainname to `%s'\n" ++msgstr "ドメインを`%s'へ設定しました\n" ++ ++#: ../hostname.c:114 ++#, c-format ++msgid "%s: you must be root to change the domain name\n" ++msgstr "%s: ドメイン名の変更はルートでなければなりません\n" ++ ++#: ../hostname.c:131 ++#, c-format ++msgid "Resolving `%s' ...\n" ++msgstr "`%s'をレゾルブ中 ...\n" ++ ++#: ../hostname.c:137 ++#, c-format ++msgid "Result: h_name=`%s'\n" ++msgstr "結果: h_name=`%s'\n" ++ ++#: ../hostname.c:142 ++#, c-format ++msgid "Result: h_aliases=`%s'\n" ++msgstr "結果: h_aliases=`%s'\n" ++ ++#: ../hostname.c:147 ++#, c-format ++msgid "Result: h_addr_list=`%s'\n" ++msgstr "結果: h_addr_list=`%s'\n" ++ ++#: ../hostname.c:208 ++#, c-format ++msgid "%s: can't open `%s'\n" ++msgstr "%s: `%s'を開けません\n" ++ ++#: ../hostname.c:222 ++#, c-format ++msgid "Usage: hostname [-v] {hostname|-F file} set hostname (from file)\n" ++msgstr "使用法: hostname [-v] {ホスト名|-F ファイル} (ファイルによる)ホスト名の設定\n" ++ ++#: ../hostname.c:223 ++#, c-format ++msgid "" ++" domainname [-v] {nisdomain|-F file} set NIS domainname (from file)\n" ++msgstr " domainname [-v] {NISドメイン|-F ファイル} (ファイルによる)NISドメイン名の設定\n" ++ ++#: ../hostname.c:225 ++#, c-format ++msgid "" ++" nodename [-v] {nodename|-F file} set DECnet node name (from " ++"file)\n" ++msgstr "" ++"nodename [-v] {ノード名|-F ファイル} (ファイルによる)DECnetノード名の設定\n" ++ ++#: ../hostname.c:227 ++#, c-format ++msgid " hostname [-v] [-d|-f|-s|-a|-i|-y|-n] display formatted name\n" ++msgstr " hostname [-v] [-d|-f|-s|-a|-i|-y] 形式を指定して表示\n" ++ ++#: ../hostname.c:228 ++#, c-format ++msgid "" ++" hostname [-v] display hostname\n" ++"\n" ++msgstr "" ++" hostname [-v] ホスト名の出力\n" ++"\n" ++ ++#: ../hostname.c:229 ++#, c-format ++msgid "" ++" hostname -V|--version|-h|--help print info and exit\n" ++"\n" ++msgstr "" ++" hostname -V|--version|-h|--help 諸情報を出力して終了\n" ++"\n" ++"\n" ++ ++#: ../hostname.c:230 ++#, c-format ++msgid "" ++" dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" ++"\n" ++msgstr " dnsdomainname=ホスト名 -d, {yp,nis,}domainname=ホスト名 -y\n\n" ++ ++#: ../hostname.c:231 ++#, c-format ++msgid " -s, --short short host name\n" ++msgstr " -s, --short 短縮ホスト名\n" ++ ++#: ../hostname.c:232 ++#, c-format ++msgid " -a, --alias alias names\n" ++msgstr " -a, --alias エイリアス名\n" ++ ++#: ../hostname.c:233 ++#, c-format ++msgid " -i, --ip-address addresses for the hostname\n" ++msgstr " -i, --ip-address ホスト名に対するアドレス\n" ++ ++#: ../hostname.c:234 ++#, c-format ++msgid " -f, --fqdn, --long long host name (FQDN)\n" ++msgstr " -f, --fqdn, --long ロングホスト名(FQDN)\n" ++ ++#: ../hostname.c:235 ++#, c-format ++msgid " -d, --domain DNS domain name\n" ++msgstr " -d, --domain DNSドメイン名\n" ++ ++#: ../hostname.c:236 ++#, c-format ++msgid " -y, --yp, --nis NIS/YP domainname\n" ++msgstr " -y, --yp, --nis NIS/YPドメイン名\n" ++ ++#: ../hostname.c:238 ++#, c-format ++msgid " -n, --node DECnet node name\n" ++msgstr " -n, --node DECnetノード名\n" ++ ++#: ../hostname.c:240 ++#, c-format ++msgid "" ++" -F, --file read hostname or NIS domainname from given file\n" ++"\n" ++msgstr " -F, --file 指定のファイルからホスト名かNISドメイン名を読み込む\n\n" ++ ++#: ../hostname.c:242 ++#, c-format ++msgid "" ++" This command can read or set the hostname or the NIS domainname. You can\n" ++" also read the DNS domain or the FQDN (fully qualified domain name).\n" ++" Unless you are using bind or NIS for host lookups you can change the\n" ++" FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n" ++" part of the FQDN) in the /etc/hosts file.\n" ++msgstr "" ++" このコマンドでは、ホスト名またはNISドメイン名を読み込みまたは設定できます。\n" ++" DNSドメインまたはFDN(完全修飾ドメイン名)を読み込むこともできます。\n" ++" ホスト名の参照にBindおよび, NISも使わない場合, /etc/hostsファイルにある\n" ++" FQDNや, (FQDNの一部分の)ドメイン名を変更できます.\n" ++ ++#: ../hostname.c:338 ++#, c-format ++msgid "%s: You can't change the DNS domain name with this command\n" ++msgstr "%s: このコマンドではDNSドメイン名は変更できません.\n" ++ ++#: ../hostname.c:339 ++#, c-format ++msgid "" ++"\n" ++"Unless you are using bind or NIS for host lookups you can change the DNS\n" ++msgstr "" ++"\n" ++"ホスト名の参照にBindおよび, NISも使わない場合、/etc/hostsファイル\n" ++ ++#: ../hostname.c:340 ++#, c-format ++msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n" ++msgstr "にあるFQDNや, (FQDNの一部分の)ドメイン名を変更できます.\n" ++ ++#: ../hostname.c:357 ++#, c-format ++msgid "gethostname()=`%s'\n" ++msgstr "gethostname()=`%s'\n" ++ ++#: ../hostname.c:374 ++#, c-format ++msgid "getdomainname()=`%s'\n" ++msgstr "getdomainname()=`%s'\n" ++ ++#: ../hostname.c:389 ++#, c-format ++msgid "getnodename()=`%s'\n" ++msgstr "getnodename()=`%s'\n" ++ ++#: ../ifconfig.c:107 ++#, c-format ++msgid "" ++"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " ++"Flg\n" ++msgstr "Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR フラグ\n" ++ ++#: ../ifconfig.c:129 ../ifconfig.c:161 ++#, c-format ++msgid "%s: ERROR while getting interface flags: %s\n" ++msgstr "%s: インタフェースフラグの取得中にエラーが発生しました:%s\n" ++ ++#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862 ++#: ../ifconfig.c:973 ++#, c-format ++msgid "No support for INET on this system.\n" ++msgstr "INETはこのシステムではサポートされていません.\n" ++ ++#: ../ifconfig.c:193 ++#, c-format ++msgid "%s: ERROR while testing interface flags: %s\n" ++msgstr "%s: インタフェースフラグのテスト中にエラーが発生しました: %s\n" ++ ++#: ../ifconfig.c:202 ++#, c-format ++msgid "" ++"Usage:\n" ++" ifconfig [-a] [-v] [-s] [[]
]\n" ++msgstr "" ++"使用法:\n" ++" ifconfig [-a] [-v] [-s] <インタフェース> [[] <アドレス>]\n" ++ ++#: ../ifconfig.c:204 ++#, c-format ++msgid " [add
[/]]\n" ++msgstr " [add <アドレス>[/<プレフィックス長>]]\n" ++ ++#: ../ifconfig.c:205 ++#, c-format ++msgid " [del
[/]]\n" ++msgstr " [del <アドレス>[/<プレフィックス長>]]\n" ++ ++#: ../ifconfig.c:206 ++#, c-format ++msgid " [[-]broadcast [
]] [[-]pointopoint [
]]\n" ++msgstr " [[-]broadcast [<アドレス>]] [[-]pointopoint [<アドレス>]]\n" ++ ++#: ../ifconfig.c:207 ++#, c-format ++msgid " [netmask
] [dstaddr
] [tunnel
]\n" ++msgstr " [netmask <アドレス>] [dstaddr <アドレス>] [tunnel <アドレス>]\n" ++ ++#: ../ifconfig.c:210 ++#, c-format ++msgid " [outfill ] [keepalive ]\n" ++msgstr " [outfill <数値>] [keepalive <数値>]\n" ++ ++#: ../ifconfig.c:212 ++#, c-format ++msgid " [hw
] [metric ] [mtu ]\n" ++msgstr " [hw <アドレス>] [metric <数値>] [mtu <数値>]\n" ++ ++#: ../ifconfig.c:213 ++#, c-format ++msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" ++msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" ++ ++#: ../ifconfig.c:214 ++#, c-format ++msgid " [multicast] [[-]promisc]\n" ++msgstr " [multicast] [[-]promisc]\n" ++ ++#: ../ifconfig.c:215 ++#, c-format ++msgid " [mem_start ] [io_addr ] [irq ] [media ]\n" ++msgstr " [mem_start <開始アドレス>] [io_addr ] [irq <番号>] [media <タイプ>]\n" ++ ++#: ../ifconfig.c:217 ++#, c-format ++msgid " [txqueuelen ]\n" ++msgstr " [txqueuelen ]\n" ++ ++#: ../ifconfig.c:220 ++#, c-format ++msgid " [[-]dynamic]\n" ++msgstr " [[-]dynamic]\n" ++ ++#: ../ifconfig.c:222 ++#, c-format ++msgid "" ++" [up|down] ...\n" ++"\n" ++msgstr " [up|down] ...\n\n" ++ ++#: ../ifconfig.c:224 ++#, c-format ++msgid " =Hardware Type.\n" ++msgstr " =ハードウェアタイプ.\n" ++ ++#: ../ifconfig.c:225 ++#, c-format ++msgid " List of possible hardware types:\n" ++msgstr " 利用可能なハードウェアタイプのリスト:\n" ++ ++#. 1 = ARPable ++#: ../ifconfig.c:227 ++#, c-format ++msgid " =Address family. Default: %s\n" ++msgstr " =アドレスファミリ. 標準: %s\n" ++ ++#: ../ifconfig.c:228 ++#, c-format ++msgid " List of possible address families:\n" ++msgstr " 利用可能なアドレスファミリのリスト:\n" ++ ++#: ../ifconfig.c:303 ++#, c-format ++msgid "ifconfig: option `%s' not recognised.\n" ++msgstr "ifconfig: オプション`%s'を解釈できません.\n" ++ ++#: ../ifconfig.c:305 ../ifconfig.c:962 ++#, c-format ++msgid "ifconfig: `--help' gives usage information.\n" ++msgstr "ifconfig: `--help'で使用法を見られます.\n" ++ ++#: ../ifconfig.c:380 ++#, c-format ++msgid "Unknown media type.\n" ++msgstr "不明なメディアタイプです.\n" ++ ++#: ../ifconfig.c:417 ++#, c-format ++msgid "" ++"Warning: Interface %s still in promisc mode... maybe other application is " ++"running?\n" ++msgstr "警告: インタフェース%sはまだpromiscモードです...恐らく他のアプリケーションが実行中ではありませんか?\n" ++ ++#: ../ifconfig.c:429 ++#, c-format ++msgid "Warning: Interface %s still in MULTICAST mode.\n" ++msgstr "警告: インタフェース%sはまだMULTICASTモードです.\n" ++ ++#: ../ifconfig.c:441 ++#, c-format ++msgid "Warning: Interface %s still in ALLMULTI mode.\n" ++msgstr "警告: インタフェース%sはまだALLMULTIモードです.\n" ++ ++#: ../ifconfig.c:465 ++#, c-format ++msgid "Warning: Interface %s still in DYNAMIC mode.\n" ++msgstr "警告: インタフェース%sはまだDYNAMICモードです.\n" ++ ++#: ../ifconfig.c:523 ++#, c-format ++msgid "Warning: Interface %s still in BROADCAST mode.\n" ++msgstr "警告: インタフェース%sはまだBROADCASTモードです.\n" ++ ++#: ../ifconfig.c:652 ++#, c-format ++msgid "Warning: Interface %s still in POINTOPOINT mode.\n" ++msgstr "警告: インタフェース%sはまだPOINTOPOINTモードです.\n" ++ ++#: ../ifconfig.c:684 ++#, c-format ++msgid "hw address type `%s' has no handler to set address. failed.\n" ++msgstr "ハードウェアアドレスタイプ`%s'はアドレスを設定するハンドラを持っていません. 失敗しました.\n" ++ ++#: ../ifconfig.c:693 ++#, c-format ++msgid "%s: invalid %s address.\n" ++msgstr "%s: 不適切なアドレスです(%s).\n" ++ ++#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913 ++#, c-format ++msgid "No support for INET6 on this system.\n" ++msgstr "INET6はこのシステムではサポートされていません.\n" ++ ++#: ../ifconfig.c:780 ../ifconfig.c:871 ++#, c-format ++msgid "Interface %s not initialized\n" ++msgstr "インタフェース%sは初期化されていません.\n" ++ ++#: ../ifconfig.c:792 ../ifconfig.c:882 ++#, c-format ++msgid "Bad address.\n" ++msgstr "不適切なアドレスです.\n" ++ ++#: ../ifconfig.c:885 ++#, c-format ++msgid "Address deletion not supported on this system.\n" ++msgstr "アドレス削除はこのシステムではサポートされていません.\n" ++ ++#: ../ifconfig.c:957 ++#, c-format ++msgid "ifconfig: Cannot set address for this protocol family.\n" ++msgstr "ifconfig:このプロトコルファミリにアドレスを設定できません.\n" ++ ++#: ../ifconfig.c:983 ++#, c-format ++msgid "No support for ECONET on this system.\n" ++msgstr "ECONETはこのシステムではサポートされていません.\n" ++ ++#: ../ifconfig.c:991 ++#, c-format ++msgid "Don't know how to set addresses for family %d.\n" ++msgstr "ファミリ%dのアドレスの設定方法が不明です.\n" ++ ++#: ../ifconfig.c:1021 ++#, c-format ++msgid "WARNING: at least one error occured. (%d)\n" ++msgstr "警告: 少なくとも1つのエラーが発生しました. (%d)\n" ++ ++#: ../netstat.c:434 ++#, c-format ++msgid "" ++"(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n" ++msgstr "(\"-p\"の情報を読み込めませんでした: geteuid()=%d しかしルートであるべきです.)\n" ++ ++#: ../netstat.c:438 ++#, c-format ++msgid "" ++"(Not all processes could be identified, non-owned process info\n" ++" will not be shown, you would have to be root to see it all.)\n" ++msgstr "" ++"(一部のプロセスが識別されますが, 所有していないプロセスの情報は\n" ++"表示されません。それら全てを見るにはルートになる必要があります.)\n" ++ ++# translatable? ++#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266 ++msgid "LISTENING" ++msgstr "LISTENING" ++ ++# translatable? ++#: ../netstat.c:446 ++msgid "CONN SENT" ++msgstr "CONN SENT" ++ ++# translatable? ++#: ../netstat.c:447 ../netstat.c:1268 ++msgid "DISC SENT" ++msgstr "DISC SENT" ++ ++# translatable? ++#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269 ++msgid "ESTABLISHED" ++msgstr "ESTABLISHED" ++ ++#: ../netstat.c:470 ++#, c-format ++msgid "Active NET/ROM sockets\n" ++msgstr "稼働中のNET/ROMソケット\n" ++ ++#: ../netstat.c:471 ++#, c-format ++msgid "" ++"User Dest Source Device State Vr/Vs Send-Q Recv-" ++"Q\n" ++msgstr "ユーザ 受信先 発信元 デバイス 状態 Vr/Vs 送信-Q 受信-Q\n" ++ ++#: ../netstat.c:481 ../netstat.c:1308 ++#, c-format ++msgid "Problem reading data from %s\n" ++msgstr "%sからのデータの読み込みに問題\n" ++ ++# translatable? ++#: ../netstat.c:516 ++msgid "SYN_SENT" ++msgstr "SYN_SENT" ++ ++# translatable? ++#: ../netstat.c:517 ++msgid "SYN_RECV" ++msgstr "SYN_RECV" ++ ++# translatable? ++#: ../netstat.c:518 ++msgid "FIN_WAIT1" ++msgstr "FIN_WAIT1" ++ ++# translatable? ++#: ../netstat.c:519 ++msgid "FIN_WAIT2" ++msgstr "FIN_WAIT2" ++ ++# translatable? ++#: ../netstat.c:520 ++msgid "TIME_WAIT" ++msgstr "TIME_WAIT" ++ ++# translatable? ++#: ../netstat.c:521 ++msgid "CLOSE" ++msgstr "CLOSE" ++ ++# translatable? ++#: ../netstat.c:522 ++msgid "CLOSE_WAIT" ++msgstr "CLOSE_WAIT" ++ ++# translatable? ++#: ../netstat.c:523 ++msgid "LAST_ACK" ++msgstr "LAST_ACK" ++ ++# translatable? ++#: ../netstat.c:524 ++msgid "LISTEN" ++msgstr "LISTEN" ++ ++# translatable? ++#: ../netstat.c:525 ++msgid "CLOSING" ++msgstr "CLOSING" ++ ++#: ../netstat.c:596 ++#, c-format ++msgid "warning, got bogus igmp6 line %d.\n" ++msgstr "警告, 偽のigmp6ライン%dを得ました.\n" ++ ++#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898 ++#: ../netstat.c:1032 ../netstat.c:1037 ++#, c-format ++msgid "netstat: unsupported address family %d !\n" ++msgstr "netstat: サポートしてないアドレスファミリ%dです!\n" ++ ++# c-format ++#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634 ++#, c-format ++msgid "warning, got bogus igmp line %d.\n" ++msgstr "警告, 偽のigmpライン%dを得ました.\n" ++ ++#: ../netstat.c:677 ++#, c-format ++msgid "Active X.25 sockets\n" ++msgstr "稼働中のX.25ソケット\n" ++ ++#. IMHO, Vr/Vs is not very usefull --SF ++#: ../netstat.c:679 ++#, c-format ++msgid "" ++"Dest Source Device LCI State Vr/Vs Send-Q Recv-" ++"Q\n" ++msgstr "受信先 発信元 デバイス LCI 状態 Vr/Vs 送信-Q 受信-Q\n" ++ ++#: ../netstat.c:759 ++#, c-format ++msgid "warning, got bogus tcp line.\n" ++msgstr "警告, 偽のTCPラインを得ました.\n" ++ ++#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075 ++#, c-format ++msgid "off (0.00/%ld/%d)" ++msgstr "オフ (0.00/%ld/%d)" ++ ++#: ../netstat.c:804 ++#, c-format ++msgid "on (%2.2f/%ld/%d)" ++msgstr "オン (%2.2f/%ld/%d)" ++ ++#: ../netstat.c:809 ++#, c-format ++msgid "keepalive (%2.2f/%ld/%d)" ++msgstr "キープアライブ (%2.2f/%ld/%d)" ++ ++#: ../netstat.c:814 ++#, c-format ++msgid "timewait (%2.2f/%ld/%d)" ++msgstr "時間待ち (%2.2f/%ld/%d)" ++ ++#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085 ++#, c-format ++msgid "unkn-%d (%2.2f/%ld/%d)" ++msgstr "不明-%d (%2.2f/%ld/%d)" ++ ++#: ../netstat.c:894 ++#, c-format ++msgid "warning, got bogus udp line.\n" ++msgstr "警告, 偽のUDPラインを得ました.\n" ++ ++#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208 ++msgid "UNKNOWN" ++msgstr "不明" ++ ++#: ../netstat.c:958 ../netstat.c:1080 ++#, c-format ++msgid "on%d (%2.2f/%ld/%d)" ++msgstr "オン%d (%2.2f/%ld/%d)" ++ ++#: ../netstat.c:1046 ++#, c-format ++msgid "warning, got bogus raw line.\n" ++msgstr "警告, 偽のRawラインを得ました.\n" ++ ++#: ../netstat.c:1128 ++#, c-format ++msgid "warning, got bogus unix line.\n" ++msgstr "警告, 偽のunixラインを得ました.\n" ++ ++# translatable? ++#: ../netstat.c:1155 ++msgid "STREAM" ++msgstr "STREAM" ++ ++# translatable? ++#: ../netstat.c:1159 ++msgid "DGRAM" ++msgstr "DGRAM" ++ ++# translatable? ++#: ../netstat.c:1163 ++msgid "RAW" ++msgstr "RAW" ++ ++# translatable? ++#: ../netstat.c:1167 ++msgid "RDM" ++msgstr "RDM" ++ ++# translatable? ++#: ../netstat.c:1171 ++msgid "SEQPACKET" ++msgstr "SEQPACKET" ++ ++# translatable? ++#: ../netstat.c:1180 ++msgid "FREE" ++msgstr "FREE" ++ ++# translatable? ++#: ../netstat.c:1196 ++msgid "CONNECTING" ++msgstr "CONNECTING" ++ ++# translatable? ++#: ../netstat.c:1200 ++msgid "CONNECTED" ++msgstr "CONNECTED" ++ ++# translatable? ++#: ../netstat.c:1204 ++msgid "DISCONNECTING" ++msgstr "DISCONNECTING" ++ ++#: ../netstat.c:1235 ++#, c-format ++msgid "Active UNIX domain sockets " ++msgstr "稼働中のUNIXドメインソケット " ++ ++#: ../netstat.c:1237 ../netstat.c:1756 ++#, c-format ++msgid "(servers and established)" ++msgstr "(サーバと確立)" ++ ++#: ../netstat.c:1240 ../netstat.c:1759 ++#, c-format ++msgid "(only servers)" ++msgstr "(サーバのみ)" ++ ++#: ../netstat.c:1242 ../netstat.c:1761 ++#, c-format ++msgid "(w/o servers)" ++msgstr "(w/oサーバ)" ++ ++#: ../netstat.c:1245 ++#, c-format ++msgid "" ++"\n" ++"Proto RefCnt Flags Type State I-Node" ++msgstr "" ++"\n" ++"Proto RefCnt フラグ タイプ 状態 Iノード" ++ ++#: ../netstat.c:1247 ++#, c-format ++msgid " Path\n" ++msgstr " パス\n" ++ ++# translatable? ++#: ../netstat.c:1267 ++msgid "SABM SENT" ++msgstr "SABM SENT" ++ ++# translatable? ++#: ../netstat.c:1270 ++msgid "RECOVERY" ++msgstr "RECOVERY" ++ ++#: ../netstat.c:1284 ++#, c-format ++msgid "Active AX.25 sockets\n" ++msgstr "稼働中のAX.25ソケット\n" ++ ++#: ../netstat.c:1285 ++#, c-format ++msgid "Dest Source Device State Vr/Vs Send-Q Recv-Q\n" ++msgstr "受信先 発信元 デバイス 状態 Vr/Vs 送信-Q 受信-Q\n" ++ ++#: ../netstat.c:1328 ++#, c-format ++msgid "problem reading data from %s\n" ++msgstr "%sからのデータ読み込み中に問題\n" ++ ++#: ../netstat.c:1379 ++#, c-format ++msgid "" ++"Active IPX sockets\n" ++"Proto Recv-Q Send-Q Local Address Foreign Address " ++"State" ++msgstr "" ++"稼働中のIPXソケット\n" ++"Proto 受信-Q 送信-Q 内部アドレス 外部アドレス 状" ++"態" ++ ++#: ../netstat.c:1381 ++#, c-format ++msgid " User" ++msgstr " ユーザ" ++ ++# translatable? ++#: ../netstat.c:1415 ++msgid "ESTAB" ++msgstr "ESTAB" ++ ++# translatable? ++#: ../netstat.c:1423 ++msgid "UNK." ++msgstr "UNK." ++ ++#: ../netstat.c:1461 ++#, c-format ++msgid "Kernel Interface table\n" ++msgstr "カーネルインタフェーステーブル\n" ++ ++#: ../netstat.c:1465 ++#, c-format ++msgid "" ++"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " ++"Flg\n" ++msgstr "Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR フラグ\n" ++ ++#: ../netstat.c:1469 ++msgid "missing interface information" ++msgstr "インタフェース情報が足りません" ++ ++#: ../netstat.c:1492 ++#, c-format ++msgid "" ++"usage: netstat [-veenNcCF] [] -r netstat {-V|--version|-h|--" ++"help}\n" ++msgstr "" ++"使用法: netstat [-veenNcCF] [<アドレスファミリ>] -r\n" ++" netstat {-V|--version|-h|--help}\n" ++ ++#: ../netstat.c:1493 ++#, c-format ++msgid " netstat [-vnNcaeol] [ ...]\n" ++msgstr " netstat [-vnNcaeol] [<ソケット> ...]\n" ++ ++#: ../netstat.c:1494 ++#, c-format ++msgid "" ++" netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" ++"\n" ++msgstr " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n\n" ++ ++#: ../netstat.c:1496 ++#, c-format ++msgid " -r, --route display routing table\n" ++msgstr " -r, --routing 経路テーブルの表示\n" ++ ++#: ../netstat.c:1497 ++#, c-format ++msgid " -i, --interfaces display interface table\n" ++msgstr " -i, --interfaces インタフェーステーブルの表示\n" ++ ++#: ../netstat.c:1498 ++#, c-format ++msgid " -g, --groups display multicast group memberships\n" ++msgstr " -g, --groups マルチキャスト・グループメンバシップの表示\n" ++ ++#: ../netstat.c:1499 ++#, c-format ++msgid "" ++" -s, --statistics display networking statistics (like SNMP)\n" ++msgstr "" ++" -s, --statistics (SNMPのように)ネットワーク統計を表示\n" ++ ++#: ../netstat.c:1501 ++#, c-format ++msgid "" ++" -M, --masquerade display masqueraded connections\n" ++"\n" ++msgstr "" ++" -M, --masquerade マスカレード接続の表示\n" ++"\n" ++ ++#: ../netstat.c:1505 ++#, c-format ++msgid " --numeric-hosts don't resolve host names\n" ++msgstr " --numeric-hosts ホスト名をレゾルブしない\n" ++ ++#: ../netstat.c:1506 ++#, c-format ++msgid " --numeric-ports don't resolve port names\n" ++msgstr " --numeric-ports ポート名をレゾルブしない\n" ++ ++#: ../netstat.c:1507 ++#, c-format ++msgid " --numeric-users don't resolve user names\n" ++msgstr " --numeric-users ユーザ名をレゾルブしない\n" ++ ++#: ../netstat.c:1508 ++#, c-format ++msgid " -N, --symbolic resolve hardware names\n" ++msgstr " -N, --symbolic ハードウェア名をレゾルブする\n" ++ ++#: ../netstat.c:1509 ../route.c:88 ++#, c-format ++msgid " -e, --extend display other/more information\n" ++msgstr " -e, --extend 他の情報や多くの情報を表示する\n" ++ ++#: ../netstat.c:1510 ++#, c-format ++msgid " -p, --programs display PID/Program name for sockets\n" ++msgstr " -p, --programs ソケットのPID/プログラム名を表示する\n" ++ ++#: ../netstat.c:1511 ++#, c-format ++msgid "" ++" -c, --continuous continuous listing\n" ++"\n" ++msgstr "" ++" -c, --continous 継続的な表示\n" ++"\n" ++ ++#: ../netstat.c:1512 ++#, c-format ++msgid " -l, --listening display listening server sockets\n" ++msgstr " -l, --listening サーバのlistenソケットの表示\n" ++ ++#: ../netstat.c:1513 ++#, c-format ++msgid "" ++" -a, --all, --listening display all sockets (default: connected)\n" ++msgstr " -a, --all, --listening 全ての情報を表示 (標準: connected)\n" ++ ++#: ../netstat.c:1514 ++#, c-format ++msgid " -o, --timers display timers\n" ++msgstr " -o, --timers タイマの表示\n" ++ ++#: ../netstat.c:1515 ../route.c:89 ++#, c-format ++msgid "" ++" -F, --fib display Forwarding Information Base " ++"(default)\n" ++msgstr " -F, --fib フォワード情報ベースを表示する(標準)\n" ++ ++#: ../netstat.c:1516 ../route.c:90 ++#, c-format ++msgid "" ++" -C, --cache display routing cache instead of FIB\n" ++"\n" ++msgstr " -C, --cache FIBのかわりに経路キャッシュを表示する\n\n" ++ ++#: ../netstat.c:1518 ++#, c-format ++msgid "" ++" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" ++"netrom\n" ++msgstr "" ++" <ソケット>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" ++"netrom\n" ++ ++#: ../netstat.c:1519 ++#, c-format ++msgid " =Use '-6|-4' or '-A ' or '--'; default: %s\n" ++msgstr " ='-6|-4'または'-A 'または'--'を利用; 標準: %s\n" ++ ++#: ../netstat.c:1520 ../route.c:93 ++#, c-format ++msgid " List of possible address families (which support routing):\n" ++msgstr " (ルーティングをサポートした)利用可能なアドレスファミリのリスト:\n" ++ ++#: ../netstat.c:1753 ++#, c-format ++msgid "Active Internet connections " ++msgstr "稼働中のインターネット接続 " ++ ++#: ../netstat.c:1763 ++#, c-format ++msgid "" ++"\n" ++"Proto Recv-Q Send-Q Local Address Foreign Address " ++"State " ++msgstr "" ++"\n" ++"Proto 受信-Q 送信-Q 内部アドレス 外部アドレス 状" ++"態 " ++ ++#: ../netstat.c:1765 ++#, c-format ++msgid " User Inode " ++msgstr " ユーザ Iノード " ++ ++#: ../netstat.c:1768 ++#, c-format ++msgid " Timer" ++msgstr "タイマ" ++ ++#: ../netstat.c:1798 ++#, c-format ++msgid "IPv4 Group Memberships\n" ++msgstr "IPv4グループメンバシップ\n" ++ ++#: ../netstat.c:1799 ++#, c-format ++msgid "Interface RefCnt Group\n" ++msgstr "インタフェース 参照Cnt グループ\n" ++ ++#: ../rarp.c:44 ++msgid "This kernel does not support RARP.\n" ++msgstr "このカーネルはRARPをサポートしていません.\n" ++ ++#: ../rarp.c:83 ++#, c-format ++msgid "no RARP entry for %s.\n" ++msgstr "%sのRARPエントリがありません.\n" ++ ++#: ../rarp.c:96 ++#, c-format ++msgid "%s: bad hardware address\n" ++msgstr "%s: 不正なハードウェアアドレスです\n" ++ ++#: ../rarp.c:128 ++#, c-format ++msgid "rarp: cannot open file %s:%s.\n" ++msgstr "rarp: ファイル%sを開けません:%s.\n" ++ ++#: ../rarp.c:140 ++#, c-format ++msgid "rarp: format error at %s:%u\n" ++msgstr "rarp: %s:%u行にフォーマットエラーがあります\n" ++ ++#: ../rarp.c:144 ../rarp.c:289 ++#, c-format ++msgid "rarp: %s: unknown host\n" ++msgstr "rarp: %s: 不明なホストです\n" ++ ++#: ../rarp.c:147 ++#, c-format ++msgid "rarp: cannot set entry from %s:%u\n" ++msgstr "rarp: %s:%u行からエントリを設定できません\n" ++ ++#: ../rarp.c:176 ++#, c-format ++msgid "Usage: rarp -a list entries in cache.\n" ++msgstr "" ++"使用法: rarp -a キャッシュエントリの表示.\n" ++ ++#: ../rarp.c:177 ++#, c-format ++msgid " rarp -d delete entry from cache.\n" ++msgstr "" ++" rarp -d <ホスト名> キャッシュからエントリを削除す" ++"る.\n" ++ ++#: ../rarp.c:178 ++#, c-format ++msgid " rarp [] -s add entry to cache.\n" ++msgstr "" ++" rarp [] -s <ホスト名> <ハードウェアアドレス>\n" ++" キャッシュへエントリを追加.\n" ++ ++#: ../rarp.c:179 ++#, c-format ++msgid "" ++" rarp -f add entries from /etc/ethers.\n" ++msgstr "" ++" rarp -f /etc/ethersからエントリ追加.\n" ++ ++#: ../rarp.c:180 ++#, c-format ++msgid "" ++" rarp -V display program version.\n" ++"\n" ++msgstr " rarp -V バージョン情報の出力.\n" ++ ++#: ../rarp.c:238 ++#, c-format ++msgid "%s: illegal option mix.\n" ++msgstr "%s: オプションの組合せが間違っています.\n" ++ ++#: ../rarp.c:269 ++#, c-format ++msgid "rarp: %s: unknown hardware type.\n" ++msgstr "rarp: %s: ハードウェアタイプが不明です.\n" ++ ++#: ../route.c:80 ++#, c-format ++msgid "" ++"Usage: route [-nNvee] [-FC] [] List kernel routing tables\n" ++msgstr "使用法:route [-nNvee] [-FC] [アドレスファミリ] カーネル経路テーブルの表示.\n" ++ ++#: ../route.c:81 ++#, c-format ++msgid "" ++" route [-v] [-FC] {add|del|flush} ... Modify routing table for AF.\n" ++"\n" ++msgstr "" ++" route [-v] [-FC] {add|del|flush}‥‥\n" ++"\t\t\t\t アドレスファミリの経路テーブルの設定.\n" ++"\n" ++ ++#: ../route.c:83 ++#, c-format ++msgid "" ++" route {-h|--help} [] Detailed usage syntax for " ++"specified AF.\n" ++msgstr "" ++" route {-h|--help} [アドレスファミリ]\n" ++" アドレスファミリ特定の文法の説明.\n" ++ ++#: ../route.c:84 ++#, c-format ++msgid "" ++" route {-V|--version} Display version/author and " ++"exit.\n" ++"\n" ++msgstr " route {-V|--version} バージョン/作者情報の出力と終了.\n\n" ++ ++#: ../route.c:92 ++#, c-format ++msgid " =Use '-A ' or '--'; default: %s\n" ++msgstr " ='-A 'または'--'を利用; 標準: %s\n" ++ ++#: ../plipconfig.c:66 ++#, c-format ++msgid "Usage: plipconfig [-a] [-i] [-v] interface\n" ++msgstr "使用法: plipconfig [-a] [-i] [-v] インタフェース\n" ++ ++#: ../plipconfig.c:67 ++#, c-format ++msgid " [nibble NN] [trigger NN]\n" ++msgstr " [nibble 数値] [trigger 数値]\n" ++ ++#: ../plipconfig.c:68 ++#, c-format ++msgid " plipconfig -V | --version\n" ++msgstr " plipconfig -V | --version\n" ++ ++# translatable? ++#: ../plipconfig.c:74 ++#, c-format ++msgid "%s\tnibble %lu trigger %lu\n" ++msgstr "%s\tnibble %lu trigger %lu\n" ++ ++#: ../iptunnel.c:85 ++#, c-format ++msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n" ++msgstr "Usage: iptunnel { add | change | del | show } [ NAME ]\n" ++ ++#: ../iptunnel.c:86 ++#, c-format ++msgid "" ++" [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n" ++msgstr " [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n" ++ ++#: ../iptunnel.c:87 ++#, c-format ++msgid " [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n" ++msgstr " [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n" ++ ++#: ../iptunnel.c:88 ++#, c-format ++msgid " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n" ++msgstr " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n" ++ ++#: ../iptunnel.c:89 ++#, c-format ++msgid "" ++" iptunnel -V | --version\n" ++"\n" ++msgstr " iptunnel -V | --version\n\n" ++ ++#: ../iptunnel.c:90 ++#, c-format ++msgid "Where: NAME := STRING\n" ++msgstr "意味: NAME := STRING\n" ++ ++#: ../iptunnel.c:91 ++#, c-format ++msgid " ADDR := { IP_ADDRESS | any }\n" ++msgstr " ADDR := { IP_ADDRESS | any }\n" ++ ++#: ../iptunnel.c:92 ++#, c-format ++msgid " TOS := { NUMBER | inherit }\n" ++msgstr " TOS := { NUMBER | inherit }\n" ++ ++#: ../iptunnel.c:93 ++#, c-format ++msgid " TTL := { 1..255 | inherit }\n" ++msgstr " TTL := { 1..255 | inherit }\n" ++ ++#: ../iptunnel.c:94 ++#, c-format ++msgid " KEY := { DOTTED_QUAD | NUMBER }\n" ++msgstr " KEY := { DOTTED_QUAD | NUMBER }\n" ++ ++#: ../iptunnel.c:332 ++#, c-format ++msgid "Keys are not allowed with ipip and sit.\n" ++msgstr "キーはipipおよびsitでは許可されません.\n" ++ ++#: ../iptunnel.c:352 ++#, c-format ++msgid "Broadcast tunnel requires a source address.\n" ++msgstr "ブロードキャストトンネルは発信元アドレスが必要です.\n" ++ ++#: ../iptunnel.c:367 ++#, c-format ++msgid "ttl != 0 and noptmudisc are incompatible\n" ++msgstr "ttl != 0およびnoptmudiscは矛盾します\n" ++ ++#: ../iptunnel.c:379 ++#, c-format ++msgid "cannot determine tunnel mode (ipip, gre or sit)\n" ++msgstr "トンネルモードを決定できません(ipip, greまたはsit)\n" ++ ++#: ../iptunnel.c:417 ++#, c-format ++msgid "%s: %s/ip remote %s local %s " ++msgstr "%s: %s/ip リモート%s ローカル%s " ++ ++#: ../iptunnel.c:421 ++msgid "unknown" ++msgstr "不明" ++ ++# FIXME: what does it mean? ++#: ../iptunnel.c:453 ++#, c-format ++msgid " Drop packets out of sequence.\n" ++msgstr " シーケンスから外れたパケットをドロップ.\n" ++ ++#: ../iptunnel.c:455 ++#, c-format ++msgid " Checksum in received packet is required.\n" ++msgstr " 受信パケットのチェックサムは必須です.\n" ++ ++# FIXME: what does it mean? ++#: ../iptunnel.c:457 ++#, c-format ++msgid " Sequence packets on output.\n" ++msgstr " 送信のシーケンスパケット.\n" ++ ++# FIXME: what does it mean? ++#: ../iptunnel.c:459 ++#, c-format ++msgid " Checksum output packets.\n" ++msgstr " 送信パケットのチェックサム.\n" ++ ++#: ../iptunnel.c:487 ++#, c-format ++msgid "Wrong format of /proc/net/dev. Sorry.\n" ++msgstr "/proc/net/devが不正なフォーマットです. すみません.\n" ++ ++#: ../iptunnel.c:500 ++#, c-format ++msgid "Failed to get type of [%s]\n" ++msgstr "[%s]のタイプの取得に失敗\n" ++ ++#: ../iptunnel.c:516 ++#, c-format ++msgid "RX: Packets Bytes Errors CsumErrs OutOfSeq Mcasts\n" ++msgstr "RX: パケット バイト エラー CsumErrs outOfSeq マルチキャスト\n" ++ ++#: ../iptunnel.c:519 ++#, c-format ++msgid "TX: Packets Bytes Errors DeadLoop NoRoute NoBufs\n" ++msgstr "TX: パケット バイト エラー DeadLoop NoRoute バッファなし\n" ++ ++#: ../statistics.c:47 ++msgid "ICMP input histogram:" ++msgstr "ICMP入力ヒストグラム:" ++ ++#: ../statistics.c:48 ++msgid "ICMP output histogram:" ++msgstr "ICMP出力ヒストグラム:" ++ ++#: ../statistics.c:65 ++#, c-format ++msgid "Forwarding is %s" ++msgstr "フォワードは%sです" ++ ++#: ../statistics.c:66 ++#, c-format ++msgid "Default TTL is %u" ++msgstr "標準TTLは%uです" ++ ++#: ../statistics.c:67 ++#, c-format ++msgid "%u total packets received" ++msgstr "合計%uパケットを受信" ++ ++#: ../statistics.c:68 ++#, c-format ++msgid "%u with invalid headers" ++msgstr "不適当なヘッダが%u" ++ ++#: ../statistics.c:69 ++#, c-format ++msgid "%u with invalid addresses" ++msgstr "不適当なアドレスが%u" ++ ++#: ../statistics.c:70 ++#, c-format ++msgid "%u forwarded" ++msgstr "%uの転送" ++ ++#: ../statistics.c:71 ++#, c-format ++msgid "%u with unknown protocol" ++msgstr "%uの不明なプロトコル" ++ ++#: ../statistics.c:72 ++#, c-format ++msgid "%u incoming packets discarded" ++msgstr "%uの受信パケットを破棄" ++ ++#: ../statistics.c:73 ++#, c-format ++msgid "%u incoming packets delivered" ++msgstr "%uの受信パケットを配送" ++ ++#: ../statistics.c:74 ++#, c-format ++msgid "%u requests sent out" ++msgstr "%uの要求を送信" ++ ++#. ? ++#: ../statistics.c:75 ++#, c-format ++msgid "%u outgoing packets dropped" ++msgstr "%uの送信パケットをドロップ" ++ ++#: ../statistics.c:76 ++#, c-format ++msgid "%u dropped because of missing route" ++msgstr "不明な経路で%uをドロップ" ++ ++#: ../statistics.c:77 ++#, c-format ++msgid "%u fragments dropped after timeout" ++msgstr "タイムアウト後に%uのフラグメントをドロップ" ++ ++#: ../statistics.c:78 ++#, c-format ++msgid "%u reassemblies required" ++msgstr "%uの再構築が必要" ++ ++#. ? ++#: ../statistics.c:79 ++#, c-format ++msgid "%u packets reassembled ok" ++msgstr "%uパケットの再構築に成功" ++ ++#: ../statistics.c:80 ++#, c-format ++msgid "%u packet reassembles failed" ++msgstr "%uパケットの再構築に失敗" ++ ++#: ../statistics.c:81 ++#, c-format ++msgid "%u fragments received ok" ++msgstr "%uフラグメントの受信に成功" ++ ++#: ../statistics.c:82 ++#, c-format ++msgid "%u fragments failed" ++msgstr "%uフラグメントで失敗" ++ ++#: ../statistics.c:83 ++#, c-format ++msgid "%u fragments created" ++msgstr "%uフラグメントを生成" ++ ++#: ../statistics.c:88 ++#, c-format ++msgid "%u ICMP messages received" ++msgstr "%uのICMPメッセージ受信" ++ ++#: ../statistics.c:89 ++#, c-format ++msgid "%u input ICMP message failed." ++msgstr "%uのICMPメッセージ入力失敗." ++ ++#: ../statistics.c:90 ../statistics.c:103 ++#, c-format ++msgid "destination unreachable: %u" ++msgstr "送信先到達不可: %u" ++ ++#: ../statistics.c:91 ++#, c-format ++msgid "timeout in transit: %u" ++msgstr "送信時間オーバ: %u" ++ ++#: ../statistics.c:92 ../statistics.c:105 ++#, c-format ++msgid "wrong parameters: %u" ++msgstr "謝ったパラメータ: %u" ++ ++#. ? ++#: ../statistics.c:93 ++#, c-format ++msgid "source quenches: %u" ++msgstr "発信元消滅: %u" ++ ++#: ../statistics.c:94 ++#, c-format ++msgid "redirects: %u" ++msgstr "リダイレクト: %u" ++ ++#: ../statistics.c:95 ++#, c-format ++msgid "echo requests: %u" ++msgstr "エコー要求: %u" ++ ++#: ../statistics.c:96 ../statistics.c:109 ++#, c-format ++msgid "echo replies: %u" ++msgstr "エコー応答: %u" ++ ++#: ../statistics.c:97 ++#, c-format ++msgid "timestamp request: %u" ++msgstr "タイムスタンプ要求: %u" ++ ++#: ../statistics.c:98 ++#, c-format ++msgid "timestamp reply: %u" ++msgstr "タイムスタンプ応答: %u" ++ ++#: ../statistics.c:99 ++#, c-format ++msgid "address mask request: %u" ++msgstr "アドレスマスク要求: %u" ++ ++#. ? ++#: ../statistics.c:100 ../statistics.c:113 ++#, c-format ++msgid "address mask replies: %u" ++msgstr "アドレスマスク応答: %u" ++ ++#. ? ++#: ../statistics.c:101 ++#, c-format ++msgid "%u ICMP messages sent" ++msgstr "%uのICMPメッセージ送信" ++ ++#: ../statistics.c:102 ++#, c-format ++msgid "%u ICMP messages failed" ++msgstr "%uのICMPメッセージ失敗" ++ ++#: ../statistics.c:104 ++#, c-format ++msgid "time exceeded: %u" ++msgstr "時間切れ: %u" ++ ++#. ? ++#: ../statistics.c:106 ++#, c-format ++msgid "source quench: %u" ++msgstr "発信元消滅: %u" ++ ++#: ../statistics.c:107 ++#, c-format ++msgid "redirect: %u" ++msgstr "リダイレクト: %u" ++ ++#: ../statistics.c:108 ++#, c-format ++msgid "echo request: %u" ++msgstr "エコー要求: %u" ++ ++#: ../statistics.c:110 ++#, c-format ++msgid "timestamp requests: %u" ++msgstr "タイムスタンプ要求: %u" ++ ++#: ../statistics.c:111 ++#, c-format ++msgid "timestamp replies: %u" ++msgstr "タイムスタンプ応答: %u" ++ ++#: ../statistics.c:112 ++#, c-format ++msgid "address mask requests: %u" ++msgstr "アドレスマスク要求: %u" ++ ++#: ../statistics.c:118 ++#, c-format ++msgid "RTO algorithm is %s" ++msgstr "RTOアルゴリズムは%sです" ++ ++#: ../statistics.c:122 ++#, c-format ++msgid "%u active connections openings" ++msgstr "%uの能動接続開始" ++ ++#: ../statistics.c:123 ++#, c-format ++msgid "%u passive connection openings" ++msgstr "%uの受動接続開始" ++ ++#: ../statistics.c:124 ++#, c-format ++msgid "%u failed connection attempts" ++msgstr "%uの接続試行失敗" ++ ++#: ../statistics.c:125 ++#, c-format ++msgid "%u connection resets received" ++msgstr "%uの接続リセット受信" ++ ++#: ../statistics.c:126 ++#, c-format ++msgid "%u connections established" ++msgstr "%uの接続確立" ++ ++#: ../statistics.c:127 ++#, c-format ++msgid "%u segments received" ++msgstr "%uセグメントの受信" ++ ++#: ../statistics.c:128 ++#, c-format ++msgid "%u segments send out" ++msgstr "%uセグメントの送信" ++ ++#: ../statistics.c:129 ++#, c-format ++msgid "%u segments retransmited" ++msgstr "%uセグメントの再転送" ++ ++#: ../statistics.c:130 ++#, c-format ++msgid "%u bad segments received." ++msgstr "%uの不正セグメント受信." ++ ++#: ../statistics.c:131 ++#, c-format ++msgid "%u resets sent" ++msgstr "%uのリセット送信" ++ ++#: ../statistics.c:136 ++#, c-format ++msgid "%u packets received" ++msgstr "%uパケット受信" ++ ++#: ../statistics.c:137 ++#, c-format ++msgid "%u packets to unknown port received." ++msgstr "不明なポートからの%uパケットの受信." ++ ++#: ../statistics.c:138 ++#, c-format ++msgid "%u packet receive errors" ++msgstr "%uのパケット受信エラー" ++ ++#: ../statistics.c:139 ++#, c-format ++msgid "%u packets sent" ++msgstr "%uのパケットを送信" ++ ++#: ../statistics.c:144 ++#, c-format ++msgid "%u SYN cookies sent" ++msgstr "%uのSYNクッキーを送信" ++ ++#: ../statistics.c:145 ++#, c-format ++msgid "%u SYN cookies received" ++msgstr "%uのSYNクッキーを受信" ++ ++#: ../statistics.c:146 ++#, c-format ++msgid "%u invalid SYN cookies received" ++msgstr "%uの不適当なSYNクッキーを受信" ++ ++#: ../statistics.c:148 ++#, c-format ++msgid "%u resets received for embryonic SYN_RECV sockets" ++msgstr "%uの未完成のSYN_RECVソケットに対するリセットを受信" ++ ++#: ../statistics.c:150 ++#, c-format ++msgid "%u packets pruned from receive queue because of socket buffer overrun" ++msgstr "%uのパケットをソケットバッファオーバランのため受信キューから除外" ++ ++#. obsolete: 2.2.0 doesn't do that anymore ++#: ../statistics.c:153 ++#, c-format ++msgid "%u packets pruned from receive queue" ++msgstr "%uのパケットを受信キューから除外" ++ ++#: ../statistics.c:154 ++#, c-format ++msgid "" ++"%u packets dropped from out-of-order queue because of socket buffer overrun" ++msgstr "%uのパケットがソケットバッファオーバーランのためout-of-orderキューからドロップ" ++ ++#: ../statistics.c:156 ++#, c-format ++msgid "%u ICMP packets dropped because they were out-of-window" ++msgstr "%uのICMPパケットがout-of-windowのためドロップ" ++ ++#: ../statistics.c:158 ++#, c-format ++msgid "%u ICMP packets dropped because socket was locked" ++msgstr "%uのICMPパケットをソケットのロックによってドロップ" ++ ++# FIXME: what does it mean? ++#: ../statistics.c:160 ++#, c-format ++msgid "%u TCP sockets finished time wait in fast timer" ++msgstr "%uのTCPソケットがファーストタイマでの時間待ちを完了" ++ ++# FIXME ++#: ../statistics.c:161 ++#, c-format ++msgid "%u time wait sockets recycled by time stamp" ++msgstr "%uの時間待ちソケットがタイムスタンプで再利用" ++ ++# FIXME ++#: ../statistics.c:162 ++#, c-format ++msgid "%u TCP sockets finished time wait in slow timer" ++msgstr "%uのTCPソケットがスロータイマでの時間待ちを完了" ++ ++#: ../statistics.c:163 ++#, c-format ++msgid "%u passive connections rejected because of time stamp" ++msgstr "%uの受動的接続がタイムスタンプのために拒否" ++ ++#: ../statistics.c:165 ++#, c-format ++msgid "%u active connections rejected because of time stamp" ++msgstr "%uの能動的接続がタイムスタンプのために拒否" ++ ++#: ../statistics.c:167 ++#, c-format ++msgid "%u packets rejects in established connections because of timestamp" ++msgstr "%uのパケットがタイムスタンプのために接続確立を拒否" ++ ++#: ../statistics.c:169 ++#, c-format ++msgid "%u delayed acks sent" ++msgstr "%uの遅延ackを送信" ++ ++# FIXME ++#: ../statistics.c:170 ++#, c-format ++msgid "%u delayed acks further delayed because of locked socket" ++msgstr "%uの遅延ackがロックされたソケットのためにさらに遅延" ++ ++#: ../statistics.c:172 ++#, c-format ++msgid "Quick ack mode was activated %u times" ++msgstr "クイックackモードが%u回稼働" ++ ++# FIXME ++#: ../statistics.c:173 ++#, c-format ++msgid "%u times the listen queue of a socket overflowed" ++msgstr "ソケットのリスンキューが%u回オーバフロー" ++ ++# FIXME ++#: ../statistics.c:175 ++#, c-format ++msgid "%u SYNs to LISTEN sockets ignored" ++msgstr "%uのソケットリスンSYNが無視" ++ ++#: ../statistics.c:176 ++#, c-format ++msgid "%u packets directly queued to recvmsg prequeue." ++msgstr "%uパケットをrecvmsgプレキューに直接キュー." ++ ++#: ../statistics.c:178 ++#, c-format ++msgid "%u of bytes directly received from backlog" ++msgstr "%uバイトをバックログから直接受信" ++ ++#: ../statistics.c:180 ++#, c-format ++msgid "%u of bytes directly received from prequeue" ++msgstr "%uバイトをプレキューから直接受信" ++ ++#: ../statistics.c:182 ++#, c-format ++msgid "%u packets dropped from prequeue" ++msgstr "%uのパケットをプレキューからドロップ" ++ ++#: ../statistics.c:183 ++#, c-format ++msgid "%u packet headers predicted" ++msgstr "%uのパケットヘッダを予測" ++ ++#: ../statistics.c:184 ++#, c-format ++msgid "%u packets header predicted and directly queued to user" ++msgstr "%uのパケットヘッダを予測してユーザに直接キュー" ++ ++#: ../statistics.c:186 ++#, c-format ++msgid "Ran %u times out of system memory during packet sending" ++msgstr "%u回のパケット送信中のシステムメモリあふれ" ++ ++#: ../statistics.c:188 ++#, c-format ++msgid "%u acknowledgments not containing data received" ++msgstr "データを含まない%uの承認の受信" ++ ++#: ../statistics.c:189 ++#, c-format ++msgid "%u predicted acknowledgments" ++msgstr "%uの予測承認" ++ ++#: ../statistics.c:190 ++#, c-format ++msgid "%u times recovered from packet loss due to fast retransmit" ++msgstr "高速な再送によるパケットロスの%u回の回復" ++ ++#: ../statistics.c:191 ++#, c-format ++msgid "%u times recovered from packet loss due to SACK data" ++msgstr "SACKデータによるパケットロスの%u回の回復" ++ ++#: ../statistics.c:192 ++#, c-format ++msgid "%u bad SACKs received" ++msgstr "%uの不正なSACKを受信" ++ ++#: ../statistics.c:193 ++#, c-format ++msgid "Detected reordering %u times using FACK" ++msgstr "FACKを使った%u回の検出された並べ替え" ++ ++#: ../statistics.c:194 ++#, c-format ++msgid "Detected reordering %u times using SACK" ++msgstr "SACKを使った%u回の検出された並べ替え" ++ ++#: ../statistics.c:195 ++#, c-format ++msgid "Detected reordering %u times using time stamp" ++msgstr "タイムスタンプを使った%u回の検出された並べ替え" ++ ++# FIXME:what does it mean? ++#: ../statistics.c:196 ++#, c-format ++msgid "Detected reordering %u times using reno fast retransmit" ++msgstr "高速再送を使った%u回の検出された並べ替え" ++ ++#: ../statistics.c:197 ++#, c-format ++msgid "%u congestion windows fully recovered" ++msgstr "%uの輻輳ウィンドウを完全に回復" ++ ++#: ../statistics.c:198 ++#, c-format ++msgid "%u congestion windows partially recovered using Hoe heuristic" ++msgstr "Hoeヒューリスティックを使って%uの輻輳ウィンドウを部分的に回復" ++ ++#: ../statistics.c:199 ++#, c-format ++msgid "%u congestion window recovered using DSACK" ++msgstr "DSACKを使って%uの輻輳ウィンドウを回復" ++ ++#: ../statistics.c:200 ++#, c-format ++msgid "%u congestion windows recovered after partial ack" ++msgstr "部分ack後に%uの輻輳ウィンドウを回復" ++ ++#: ../statistics.c:201 ++#, c-format ++msgid "%u retransmits lost" ++msgstr "%uの再送ロスト" ++ ++# FIXME ++#: ../statistics.c:202 ++#, c-format ++msgid "%u timeouts after reno fast retransmit" ++msgstr "高速再送後の%uのタイムアウト" ++ ++#: ../statistics.c:203 ++#, c-format ++msgid "%u timeouts after SACK recovery" ++msgstr "SACK復元後の%uのタイムアウト" ++ ++#: ../statistics.c:204 ++#, c-format ++msgid "%u timeouts in loss state" ++msgstr "状態ロスでの%uのタイムアウト" ++ ++#: ../statistics.c:205 ++#, c-format ++msgid "%u fast retransmits" ++msgstr "%uの高速再送" ++ ++#: ../statistics.c:206 ++#, c-format ++msgid "%u forward retransmits" ++msgstr "%uの転送再送" ++ ++#: ../statistics.c:207 ++#, c-format ++msgid "%u retransmits in slow start" ++msgstr "スロースタートでの%uの再送" ++ ++#: ../statistics.c:208 ++#, c-format ++msgid "%u other TCP timeouts" ++msgstr "%uのその他のTCPタイムアウト" ++ ++# FIXME ++#: ../statistics.c:209 ++#, c-format ++msgid "%u reno fast retransmits failed" ++msgstr "%dの高速再送失敗" ++ ++#: ../statistics.c:210 ++#, c-format ++msgid "%u sack retransmits failed" ++msgstr "%uのsack再送失敗" ++ ++# FIXME ++#: ../statistics.c:211 ++#, c-format ++msgid "%u times receiver scheduled too late for direct processing" ++msgstr "直接処理には遅すぎるとスケジュールされた%u回のレシーバ" ++ ++# FIXME ++#: ../statistics.c:212 ++#, c-format ++msgid "%u packets collapsed in receive queue due to low socket buffer" ++msgstr "%uのパケットを低ソケットバッファのために受信キューから除外" ++ ++#: ../statistics.c:213 ++#, c-format ++msgid "%u DSACKs sent for old packets" ++msgstr "%uのDSACKを古いパケットとして送信" ++ ++#: ../statistics.c:214 ++#, c-format ++msgid "%u DSACKs sent for out of order packets" ++msgstr "%uのDSACKを順序外パケットとして送信" ++ ++#: ../statistics.c:215 ++#, c-format ++msgid "%u DSACKs received" ++msgstr "%uのDSACKを受信" ++ ++#: ../statistics.c:216 ++#, c-format ++msgid "%u DSACKs for out of order packets received" ++msgstr "%uのDSACKを順序外パケットとして受信" ++ ++#: ../statistics.c:217 ++#, c-format ++msgid "%u connections reset due to unexpected SYN" ++msgstr "予期せぬSYNのために%uの接続をリセット" ++ ++#: ../statistics.c:218 ++#, c-format ++msgid "%u connections reset due to unexpected data" ++msgstr "予期せぬデータのために%uの接続をリセット" ++ ++#: ../statistics.c:219 ++#, c-format ++msgid "%u connections reset due to early user close" ++msgstr "早期のユーザのクローズのために%uの接続をリセット" ++ ++#: ../statistics.c:220 ++#, c-format ++msgid "%u connections aborted due to memory pressure" ++msgstr "メモリの制約のために%uの接続を中止" ++ ++#: ../statistics.c:221 ++#, c-format ++msgid "%u connections aborted due to timeout" ++msgstr "タイムアウトのために%uの接続を中止" ++ ++# FIXME ++#: ../statistics.c:222 ++#, c-format ++msgid "%u connections aborted after user close in linger timeout" ++msgstr "ユーザの長期タイムアウトでのクローズ後に%uの接続が中止" ++ ++#: ../statistics.c:223 ++#, c-format ++msgid "%u times unabled to send RST due to no memory" ++msgstr "メモリ不足のためにRSTの送信が%u回不能" ++ ++# FIXME ++#: ../statistics.c:224 ++#, c-format ++msgid "TCP ran low on memory %u times" ++msgstr "TCPが少ないメモリで%u回実行" ++ ++#: ../statistics.c:225 ++#, c-format ++msgid "%u TCP data loss events" ++msgstr "%uのTCPデータがイベントをロス" ++ ++#: ../statistics.c:292 ++msgid "enabled" ++msgstr "有効" ++ ++#: ../statistics.c:292 ++msgid "disabled" ++msgstr "無効" ++ ++#: ../statistics.c:375 ++msgid "error parsing /proc/net/snmp" ++msgstr "/proc/net/snmpの処理中にエラーが発生しました" ++ ++#: ../statistics.c:388 ++msgid "cannot open /proc/net/snmp" ++msgstr "/proc/net/snmpを開けません" ++ ++#: ../lib/activate.c:69 ++#, c-format ++msgid "Hardware type `%s' not supported.\n" ++msgstr "ハードウェアタイプ`%s'はサポートされていません.\n" ++ ++#: ../lib/activate.c:73 ++#, c-format ++msgid "Cannot change line discipline to `%s'.\n" ++msgstr "`%s'のline disciplineを変更できません.\n" ++ ++#: ../lib/af.c:153 ../lib/hw.c:161 ++msgid "UNSPEC" ++msgstr "不明なネット" ++ ++#: ../lib/af.c:155 ++msgid "UNIX Domain" ++msgstr "UNIXドメイン" ++ ++#: ../lib/af.c:158 ++msgid "DARPA Internet" ++msgstr "DARPAインターネット" ++ ++#: ../lib/af.c:161 ++msgid "IPv6" ++msgstr "IPv6" ++ ++#: ../lib/af.c:164 ../lib/hw.c:182 ++msgid "AMPR AX.25" ++msgstr "AMPR AX.25" ++ ++#: ../lib/af.c:167 ../lib/hw.c:188 ++msgid "AMPR NET/ROM" ++msgstr "AMPR NET/ROM" ++ ++#: ../lib/af.c:170 ++msgid "Novell IPX" ++msgstr "Novell IPX" ++ ++#: ../lib/af.c:173 ++msgid "Appletalk DDP" ++msgstr "アップルトークDDP" ++ ++#: ../lib/af.c:176 ../lib/hw.c:223 ++msgid "Econet" ++msgstr "エコネット" ++ ++#: ../lib/af.c:179 ++msgid "CCITT X.25" ++msgstr "CCITT X.25" ++ ++#: ../lib/af.c:182 ../lib/hw.c:185 ++msgid "AMPR ROSE" ++msgstr "AMPR ROSE" ++ ++#: ../lib/af.c:185 ../lib/hw.c:173 ++msgid "Ash" ++msgstr "Ash" ++ ++#: ../lib/af.c:243 ++#, c-format ++msgid "Please don't supply more than one address family.\n" ++msgstr "複数のアドレスファミリをしないで下さい.\n" ++ ++#: ../lib/af.c:304 ++#, c-format ++msgid "Too much address family arguments.\n" ++msgstr "アドレスファミリの引数が多すぎます.\n" ++ ++#: ../lib/af.c:315 ++#, c-format ++msgid "Unknown address family `%s'.\n" ++msgstr "不明なアドレスファミリです `%s'.\n" ++ ++#: ../lib/arcnet.c:70 ../lib/arcnet.c:85 ++#, c-format ++msgid "in_arcnet(%s): invalid arcnet address!\n" ++msgstr "in_arcnet(%s): 不適当なARCNETアドレスです!\n" ++ ++#: ../lib/arcnet.c:97 ++#, c-format ++msgid "in_arcnet(%s): trailing : ignored!\n" ++msgstr "in_arcnet(%s): trailing : 無効!\n" ++ ++# translatable? ++#: ../lib/arcnet.c:109 ++#, c-format ++msgid "in_arcnet(%s): trailing junk!\n" ++msgstr "in_arcnet(%s): trailing junk!\n" ++ ++#: ../lib/ash.c:81 ++#, c-format ++msgid "Malformed Ash address" ++msgstr "異常なAshアドレスです" ++ ++#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244 ++#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 ++#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76 ++msgid "[NONE SET]" ++msgstr "[設定なし]" ++ ++#: ../lib/ax25.c:97 ../lib/netrom.c:100 ++msgid "Invalid callsign" ++msgstr "不適当なコールサインです" ++ ++#: ../lib/ax25.c:110 ../lib/netrom.c:113 ++msgid "Callsign too long" ++msgstr "コールサインが長すぎます" ++ ++#: ../lib/ax25_gr.c:47 ++#, c-format ++msgid "AX.25 not configured in this system.\n" ++msgstr "AX.25はこのシステムでは設定されていません.\n" ++ ++#: ../lib/ax25_gr.c:50 ++#, c-format ++msgid "Kernel AX.25 routing table\n" ++msgstr "カーネル AX.25経路テーブル\n" ++ ++#. xxx ++#: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55 ++#, c-format ++msgid "Destination Iface Use\n" ++msgstr "送信先サイト Iface 使用数\n" ++ ++#: ../lib/ether.c:74 ../lib/ether.c:91 ++#, c-format ++msgid "in_ether(%s): invalid ether address!\n" ++msgstr "in_ether(%s): 不適当なイーサアドレス!\n" ++ ++#: ../lib/ether.c:105 ++#, c-format ++msgid "in_ether(%s): trailing : ignored!\n" ++msgstr "in_ether(%s): trailing : 無効!\n" ++ ++# translatable? ++#: ../lib/ether.c:117 ++#, c-format ++msgid "in_ether(%s): trailing junk!\n" ++msgstr "in_ether(%s): trailing junk!\n" ++ ++#: ../lib/fddi.c:84 ../lib/fddi.c:99 ++#, c-format ++msgid "in_fddi(%s): invalid fddi address!\n" ++msgstr "in_fddi(%s): 不適当なfddiアドレス!\n" ++ ++#: ../lib/fddi.c:111 ++#, c-format ++msgid "in_fddi(%s): trailing : ignored!\n" ++msgstr "in_fddi(%s): trailing : 無効!\n" ++ ++# translatable? ++#: ../lib/fddi.c:123 ++#, c-format ++msgid "in_fddi(%s): trailing junk!\n" ++msgstr "in_fddi(%s): trailing junk!\n" ++ ++#: ../lib/getroute.c:101 ../lib/setroute.c:80 ++#, c-format ++msgid "Address family `%s' not supported.\n" ++msgstr "アドレスファミリ`%s'はサポートされていません.\n" ++ ++#: ../lib/getroute.c:107 ../lib/setroute.c:84 ++#, c-format ++msgid "No routing for address family `%s'.\n" ++msgstr "アドレスファミリ`%s'への経路が見つかりません.\n" ++ ++#: ../lib/hippi.c:84 ../lib/hippi.c:99 ++#, c-format ++msgid "in_hippi(%s): invalid hippi address!\n" ++msgstr "in_hippi(%s): 不適当なhippiアドレスです!\n" ++ ++#: ../lib/hippi.c:111 ++#, c-format ++msgid "in_hippi(%s): trailing : ignored!\n" ++msgstr "in_hippi(%s): trailing : 無効!\n" ++ ++# translatable? ++#: ../lib/hippi.c:122 ++#, c-format ++msgid "in_hippi(%s): trailing junk!\n" ++msgstr "in_hippi(%s): trailing junk!\n" ++ ++#: ../lib/hw.c:160 ++msgid "Local Loopback" ++msgstr "ローカルループバック" ++ ++#: ../lib/hw.c:163 ++msgid "Serial Line IP" ++msgstr "シリアルラインIP" ++ ++#: ../lib/hw.c:164 ++msgid "VJ Serial Line IP" ++msgstr "VJシリアルラインIP" ++ ++#: ../lib/hw.c:165 ++msgid "6-bit Serial Line IP" ++msgstr "6ビットシリアルラインIP" ++ ++#: ../lib/hw.c:166 ++msgid "VJ 6-bit Serial Line IP" ++msgstr "VJ 6ビットシリアルラインIP" ++ ++#: ../lib/hw.c:167 ++msgid "Adaptive Serial Line IP" ++msgstr "AdaptiveシリアルラインIP" ++ ++#: ../lib/hw.c:170 ++msgid "Ethernet" ++msgstr "イーサネット" ++ ++# translatable? ++#: ../lib/hw.c:176 ++msgid "Fiber Distributed Data Interface" ++msgstr "Fiber Distributed Data Interface" ++ ++#: ../lib/hw.c:179 ++msgid "HIPPI" ++msgstr "HIPPI" ++ ++#: ../lib/hw.c:191 ++msgid "generic X.25" ++msgstr "ジェネリックX.25" ++ ++#: ../lib/hw.c:194 ++msgid "IPIP Tunnel" ++msgstr "IPIPトンネル" ++ ++#: ../lib/hw.c:197 ++msgid "Point-to-Point Protocol" ++msgstr "Point-to-Pointプロトコル" ++ ++#: ../lib/hw.c:200 ++msgid "(Cisco)-HDLC" ++msgstr "(Cisco)-HDLC" ++ ++#: ../lib/hw.c:201 ++msgid "LAPB" ++msgstr "LAPB" ++ ++#: ../lib/hw.c:204 ++msgid "ARCnet" ++msgstr "ARCネット" ++ ++#: ../lib/hw.c:207 ++msgid "Frame Relay DLCI" ++msgstr "フレームリレーDLCI" ++ ++#: ../lib/hw.c:208 ++msgid "Frame Relay Access Device" ++msgstr "フレームリレーアクセスデバイス" ++ ++#: ../lib/hw.c:211 ++msgid "IPv6-in-IPv4" ++msgstr "IPv6-in-IPv4" ++ ++#: ../lib/hw.c:214 ++msgid "IrLAP" ++msgstr "IrLAP" ++ ++#: ../lib/hw.c:217 ++msgid "16/4 Mbps Token Ring" ++msgstr "16/4 Mbpsトークンリング" ++ ++#: ../lib/hw.c:219 ++msgid "16/4 Mbps Token Ring (New)" ++msgstr "16/4 Mbpsトークンリング(新)" ++ ++#: ../lib/hw.c:226 ++msgid "Generic EUI-64" ++msgstr "ジェネリックEUI-64" ++ ++#: ../lib/inet.c:153 ../lib/inet6.c:79 ++#, c-format ++msgid "rresolve: unsupport address family %d !\n" ++msgstr "rresolve: アドレスファミリ%dをサポートしていません!\n" ++ ++#: ../lib/inet6.c:131 ++msgid "[UNKNOWN]" ++msgstr "[不明]" ++ ++#: ../lib/inet6_gr.c:71 ++#, c-format ++msgid "INET6 (IPv6) not configured in this system.\n" ++msgstr "INET6(IPv6)はこのシステムでは利用できるよう設定されていません.\n" ++ ++#: ../lib/inet6_gr.c:74 ++#, c-format ++msgid "Kernel IPv6 routing table\n" ++msgstr "カーネルIPv6 経路テーブル\n" ++ ++#: ../lib/inet6_gr.c:76 ++#, c-format ++msgid "" ++"Destination Next " ++"Hop Flags Metric Ref Use Iface\n" ++msgstr "送信先サイト 次回ホップ フラグ Metric Ref 使用数 インタフェース\n" ++ ++#: ../lib/inet6_gr.c:150 ++#, c-format ++msgid "Kernel IPv6 Neighbour Cache\n" ++msgstr "カーネルIPv6 近隣ネットワークのキャッシュ\n" ++ ++#: ../lib/inet6_gr.c:153 ++#, c-format ++msgid "" ++"Neighbour HW Address Iface Flags " ++"Ref State\n" ++msgstr "" ++"近隣サイト ハードウェアアドレス Iface フラグ " ++"Ref 状態\n" ++ ++#: ../lib/inet6_gr.c:157 ++#, c-format ++msgid "" ++"Neighbour HW Address Iface Flags " ++"Ref State Stale(sec) Delete(sec)\n" ++msgstr "" ++"近隣サイト ハードウェアアドレス Iface フラグ " ++"Ref 状態 Stale[秒] Delete[秒]\n" ++ ++#: ../lib/inet6_sr.c:46 ++#, c-format ++msgid "Usage: inet6_route [-vF] del Target\n" ++msgstr "使用法: inet6_route [-vF] del ターゲット\n" ++ ++#: ../lib/inet6_sr.c:47 ++#, c-format ++msgid " inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n" ++msgstr "" ++" inet6_route [-vF] add ターゲット \n" ++" [gw ゲートウェイ] [metric メトリック]\n" ++" [[dev] インタフェース]\n" ++ ++#: ../lib/inet6_sr.c:48 ++#, c-format ++msgid " inet6_route [-FC] flush NOT supported\n" ++msgstr " inet6_route [-FC] flush サポートしていません\n" ++ ++#: ../lib/inet6_sr.c:188 ++#, c-format ++msgid "Flushing `inet6' routing table not supported\n" ++msgstr "`inet6'経路テーブルのフラッシュはサポートしていません\n" ++ ++#: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220 ++#, c-format ++msgid "INET (IPv4) not configured in this system.\n" ++msgstr "INET(IPv4)はこのシステムでは利用できるように設定されていません.\n" ++ ++#: ../lib/inet_gr.c:53 ++#, c-format ++msgid "Kernel IP routing table\n" ++msgstr "カーネルIP経路テーブル\n" ++ ++#: ../lib/inet_gr.c:56 ++#, c-format ++msgid "" ++"Destination Gateway Genmask Flags Metric Ref Use " ++"Iface\n" ++msgstr "受信先サイト ゲートウェイ ネットマスク フラグ Metric Ref 使用数 インタフェース\n" ++ ++#: ../lib/inet_gr.c:59 ++#, c-format ++msgid "" ++"Destination Gateway Genmask Flags MSS Window irtt " ++"Iface\n" ++msgstr "受信先サイト ゲートウェイ ネットマスク フラグ MSS Window irtt インタフェース\n" ++ ++#: ../lib/inet_gr.c:62 ++#, c-format ++msgid "" ++"Destination Gateway Genmask Flags Metric Ref Use " ++"Iface MSS Window irtt\n" ++msgstr "" ++"受信先サイト ゲートウェイ ネットマスク フラグ Metric Ref 使用数 " ++"Iface MSS Window irtt\n" ++ ++#: ../lib/inet_gr.c:237 ++#, c-format ++msgid "Kernel IP routing cache\n" ++msgstr "カーネルIP経路キャッシュ\n" ++ ++#: ../lib/inet_gr.c:258 ++#, c-format ++msgid "" ++"Source Destination Gateway Flags Metric Ref Use " ++"Iface\n" ++msgstr "発信元サイト 受信先サイト ゲートウェイ フラグ Metric Ref 使用数 インタフェース\n" ++ ++#: ../lib/inet_gr.c:261 ++#, c-format ++msgid "" ++"Source Destination Gateway Flags MSS Window irtt " ++"Iface\n" ++msgstr "発信元サイト 受信先サイト ゲートウェイ フラグ MSS Window irtt インタフェース\n" ++ ++#: ../lib/inet_gr.c:266 ++#, c-format ++msgid "" ++"Source Destination Gateway Flags Metric Ref Use " ++"Iface MSS Window irtt HH Arp\n" ++msgstr "" ++"発信元サイト 受信先サイト ゲートウェイ フラグ Metric Ref 使用数 " ++"Iface MSS Window irtt HH Arp\n" ++ ++#: ../lib/inet_gr.c:290 ++#, c-format ++msgid "" ++"Source Destination Gateway Flags Metric Ref Use " ++"Iface MSS Window irtt TOS HHRef HHUptod SpecDst\n" ++msgstr "" ++"発信元サイト 受信先サイト ゲートウェイ フラグ Metric Ref 使用数 " ++"Iface MSS Window irtt TOS HHRef HHUptod SpecDst\n" ++ ++#: ../lib/inet_sr.c:51 ++#, c-format ++msgid "" ++"Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] " ++"[[dev] If]\n" ++msgstr "" ++"使用法:inet_route [-vF] del {-host|-net} 受信先[/プレフィックス]\n" ++" [gw ゲートウェイ] [metric メトリック]\n" ++" [[dev] インタフェース]\n" ++ ++#: ../lib/inet_sr.c:52 ++#, c-format ++msgid "" ++" inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n" ++msgstr "" ++" inet_route [-vF] add {-host|-net} 受信先[/プレフィックス]\n" ++" [gw ゲートウェイ] [metric メトリック]\n" ++ ++#: ../lib/inet_sr.c:53 ++#, c-format ++msgid "" ++" [netmask N] [mss Mss] [window W] [irtt I]\n" ++msgstr " [netmask ネットマスク] [mss Mss] [window W] [irtt I]\n" ++ ++#: ../lib/inet_sr.c:54 ++#, c-format ++msgid " [mod] [dyn] [reinstate] [[dev] If]\n" ++msgstr " [mod] [dyn] [reinstate] [[dev] インタフェース]\n" ++ ++#: ../lib/inet_sr.c:55 ++#, c-format ++msgid "" ++" inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n" ++msgstr "" ++" inet_route [-vF] add {-host|-net} 受信先[/プレフィックス]\n" ++" [metric メトリック] reject\n" ++ ++#: ../lib/inet_sr.c:56 ++#, c-format ++msgid " inet_route [-FC] flush NOT supported\n" ++msgstr " inet_route [-FC] flush サポートしていません\n" ++ ++#: ../lib/inet_sr.c:158 ++#, c-format ++msgid "route: %s: cannot use a NETWORK as gateway!\n" ++msgstr "route: %s: NETWORKをゲートウェイとして使えません!\n" ++ ++#: ../lib/inet_sr.c:174 ++#, c-format ++msgid "route: Invalid MSS/MTU.\n" ++msgstr "route: MSS/MTUが不適当です.\n" ++ ++#: ../lib/inet_sr.c:187 ++#, c-format ++msgid "route: Invalid window.\n" ++msgstr "route: windowが不適当です.\n" ++ ++#: ../lib/inet_sr.c:203 ++#, c-format ++msgid "route: Invalid initial rtt.\n" ++msgstr "route: 初期rttが不適当です.\n" ++ ++#: ../lib/inet_sr.c:261 ++#, c-format ++msgid "route: netmask %.8x doesn't make sense with host route\n" ++msgstr "route: ネットマスク%.8xがホスト経路を検出しません\n" ++ ++#: ../lib/inet_sr.c:265 ++#, c-format ++msgid "route: bogus netmask %s\n" ++msgstr "route: 偽のネットマスク`%s'です\n" ++ ++#: ../lib/inet_sr.c:270 ++#, c-format ++msgid "route: netmask doesn't match route address\n" ++msgstr "route: ネットマスクが経路アドレスと一致しません\n" ++ ++#: ../lib/inet_sr.c:306 ++#, c-format ++msgid "Flushing `inet' routing table not supported\n" ++msgstr "`inet'経路テーブルのフラッシュはサポートしていません\n" ++ ++#: ../lib/inet_sr.c:310 ++#, c-format ++msgid "Modifying `inet' routing cache not supported\n" ++msgstr "`inet'経路テーブルの変更はサポートしていません\n" ++ ++#: ../lib/ipx_gr.c:52 ++#, c-format ++msgid "IPX not configured in this system.\n" ++msgstr "IPXはこのシステムでは設定されていません.\n" ++ ++#: ../lib/ipx_gr.c:56 ++#, c-format ++msgid "Kernel IPX routing table\n" ++msgstr "カーネルIPX経路テーブル\n" ++ ++#. xxx ++#: ../lib/ipx_gr.c:57 ++#, c-format ++msgid "Destination Router Net Router Node\n" ++msgstr "送信先サイト ルータ ネット ルータノード\n" ++ ++#: ../lib/ipx_sr.c:33 ++#, c-format ++msgid "IPX: this needs to be written\n" ++msgstr "IPX: これは書き込みが必要です\n" ++ ++#: ../lib/masq_info.c:198 ++#, c-format ++msgid "IP masquerading entries\n" ++msgstr "IPマスカレード エントリ\n" ++ ++#: ../lib/masq_info.c:201 ++#, c-format ++msgid "prot expire source destination ports\n" ++msgstr "プロト expire 発信元サイト 送信先サイト ポート\n" ++ ++#: ../lib/masq_info.c:204 ++#, c-format ++msgid "" ++"prot expire initseq delta prevd source " ++"destination ports\n" ++msgstr "" ++"プロト expire 初期seq delta prevd 発信元サイト 受信先サイ" ++"ト ポート\n" ++ ++#: ../lib/netrom_gr.c:48 ++#, c-format ++msgid "NET/ROM not configured in this system.\n" ++msgstr "NET/ROMはこのシステムでは利用可能なように設定されていません.\n" ++ ++#: ../lib/netrom_gr.c:51 ++#, c-format ++msgid "Kernel NET/ROM routing table\n" ++msgstr "カーネルNET/ROM経路テーブル\n" ++ ++#: ../lib/netrom_gr.c:52 ++#, c-format ++msgid "Destination Mnemonic Quality Neighbour Iface\n" ++msgstr "受信先サイト ニーモニック 品質 近隣サイト インタフェース\n" ++ ++#: ../lib/netrom_sr.c:34 ++#, c-format ++msgid "netrom usage\n" ++msgstr "netrom使用法\n" ++ ++#: ../lib/netrom_sr.c:44 ++#, c-format ++msgid "NET/ROM: this needs to be written\n" ++msgstr "NET/ROM: これは書き込みが必要です\n" ++ ++#: ../lib/ppp.c:44 ++#, c-format ++msgid "You cannot start PPP with this program.\n" ++msgstr "このプログラムではPPPを開始できません. \n" ++ ++#: ../lib/ppp_ac.c:38 ++#, c-format ++msgid "Sorry, use pppd!\n" ++msgstr "申し訳ありませんが, pppdを使って下さい!\n" ++ ++#: ../lib/rose.c:87 ++msgid "Node address must be ten digits" ++msgstr "ノードアドレスは10進数でなければなりません" ++ ++#: ../lib/rose_gr.c:51 ++#, c-format ++msgid "ROSE not configured in this system.\n" ++msgstr "ROSEはこのシステムでは利用可能なように設定されていません\n" ++ ++#: ../lib/rose_gr.c:54 ++#, c-format ++msgid "Kernel ROSE routing table\n" ++msgstr "カーネルROSE経路テーブル\n" ++ ++#: ../lib/tr.c:86 ../lib/tr.c:101 ++#, c-format ++msgid "in_tr(%s): invalid token ring address!\n" ++msgstr "in_tr(%s): 不適当なトークンリングアドレスです!\n" ++ ++#: ../lib/tr.c:113 ++#, c-format ++msgid "in_tr(%s): trailing : ignored!\n" ++msgstr "in_tr(%s): trailing : 無効!\n" ++ ++# translatable? ++#: ../lib/tr.c:125 ++#, c-format ++msgid "in_tr(%s): trailing junk!\n" ++msgstr "in_tr(%s): trailing junk!\n" ++ ++#: ../lib/interface.c:176 ++#, c-format ++msgid "warning: no inet socket available: %s\n" ++msgstr "警告: Inetソケットは利用できません: %s\n" ++ ++#: ../lib/interface.c:325 ++#, c-format ++msgid "Warning: cannot open %s (%s). Limited output.\n" ++msgstr "警告: %sを開けません(%s). 限定された出力です.\n" ++ ++#. Give better error message for this case. ++#: ../lib/interface.c:571 ++msgid "Device not found" ++msgstr "デバイスが見つかりません" ++ ++#: ../lib/interface.c:575 ++#, c-format ++msgid "%s: error fetching interface information: %s\n" ++msgstr "%s: インタフェース情報を取得中にエラーが発生しました: %s\n" ++ ++#: ../lib/interface.c:608 ++msgid " - no statistics available -" ++msgstr " - 統計情報を利用できません -" ++ ++#: ../lib/interface.c:612 ++#, c-format ++msgid "[NO FLAGS]" ++msgstr "[フラグなし]" ++ ++#: ../lib/interface.c:688 ++#, c-format ++msgid "%-9.9s Link encap:%s " ++msgstr "%-9.9s リンク方法:%s " ++ ++#: ../lib/interface.c:693 ++#, c-format ++msgid "HWaddr %s " ++msgstr "ハードウェアアドレス %s " ++ ++#: ../lib/interface.c:696 ++#, c-format ++msgid "Media:%s" ++msgstr "メディア:%s" ++ ++#: ../lib/interface.c:698 ++#, c-format ++msgid "(auto)" ++msgstr "(自動)" ++ ++#: ../lib/interface.c:705 ++#, c-format ++msgid " %s addr:%s " ++msgstr " %sアドレス:%s" ++ ++#: ../lib/interface.c:708 ++#, c-format ++msgid " P-t-P:%s " ++msgstr " P-t-P:%s " ++ ++#: ../lib/interface.c:711 ++#, c-format ++msgid " Bcast:%s " ++msgstr " ブロードキャスト:%s " ++ ++#: ../lib/interface.c:713 ++#, c-format ++msgid " Mask:%s\n" ++msgstr " マスク:%s\n" ++ ++#: ../lib/interface.c:730 ++#, c-format ++msgid " inet6 addr: %s/%d" ++msgstr " inet6アドレス: %s/%d" ++ ++#: ../lib/interface.c:732 ++#, c-format ++msgid " Scope:" ++msgstr " 範囲:" ++ ++#: ../lib/interface.c:735 ++#, c-format ++msgid "Global" ++msgstr "グローバル" ++ ++#: ../lib/interface.c:738 ++#, c-format ++msgid "Link" ++msgstr "リンク" ++ ++#: ../lib/interface.c:741 ++#, c-format ++msgid "Site" ++msgstr "サイト" ++ ++# translatable? ++#: ../lib/interface.c:744 ++#, c-format ++msgid "Compat" ++msgstr "Compat" ++ ++#: ../lib/interface.c:747 ++#, c-format ++msgid "Host" ++msgstr "ホスト" ++ ++#: ../lib/interface.c:750 ++#, c-format ++msgid "Unknown" ++msgstr "不明" ++ ++#: ../lib/interface.c:765 ++#, c-format ++msgid " IPX/Ethernet II addr:%s\n" ++msgstr " IPX/イーサネットIIアドレス:%s\n" ++ ++#: ../lib/interface.c:768 ++#, c-format ++msgid " IPX/Ethernet SNAP addr:%s\n" ++msgstr " IPX/イーサネットSNAPアドレス:%s\n" ++ ++#: ../lib/interface.c:771 ++#, c-format ++msgid " IPX/Ethernet 802.2 addr:%s\n" ++msgstr " IPX/イーサネット802.2アドレス:%s\n" ++ ++#: ../lib/interface.c:774 ++#, c-format ++msgid " IPX/Ethernet 802.3 addr:%s\n" ++msgstr " IPX/イーサネット802.3アドレス:%s\n" ++ ++#: ../lib/interface.c:784 ++#, c-format ++msgid " EtherTalk Phase 2 addr:%s\n" ++msgstr " イーサトーク フェーズ2アドレス:%s\n" ++ ++#: ../lib/interface.c:793 ++#, c-format ++msgid " econet addr:%s\n" ++msgstr " エコネットアドレス:%s\n" ++ ++#: ../lib/interface.c:800 ++#, c-format ++msgid "[NO FLAGS] " ++msgstr "[フラグなし]" ++ ++# translatable? ++#: ../lib/interface.c:802 ++#, c-format ++msgid "UP " ++msgstr "UP " ++ ++# translatable? ++#: ../lib/interface.c:804 ++#, c-format ++msgid "BROADCAST " ++msgstr "BROADCAST " ++ ++# translatable? ++#: ../lib/interface.c:806 ++#, c-format ++msgid "DEBUG " ++msgstr "DEBUG " ++ ++# translatable? ++#: ../lib/interface.c:808 ++#, c-format ++msgid "LOOPBACK " ++msgstr "LOOPBACK " ++ ++# translatable? ++#: ../lib/interface.c:810 ++#, c-format ++msgid "POINTOPOINT " ++msgstr "POINTOPOINT " ++ ++# translatable? ++#: ../lib/interface.c:812 ++#, c-format ++msgid "NOTRAILERS " ++msgstr "NOTRAILERS " ++ ++# translatable? ++#: ../lib/interface.c:814 ++#, c-format ++msgid "RUNNING " ++msgstr "RUNNING " ++ ++# translatable? ++#: ../lib/interface.c:816 ++#, c-format ++msgid "NOARP " ++msgstr "NOARP " ++ ++# translatable? ++#: ../lib/interface.c:818 ++#, c-format ++msgid "PROMISC " ++msgstr "PROMISC " ++ ++# translatable? ++#: ../lib/interface.c:820 ++#, c-format ++msgid "ALLMULTI " ++msgstr "ALLMULTI " ++ ++# translatable? ++#: ../lib/interface.c:822 ++#, c-format ++msgid "SLAVE " ++msgstr "SLAVE " ++ ++# translatable? ++#: ../lib/interface.c:824 ++#, c-format ++msgid "MASTER " ++msgstr "MASTER " ++ ++# translatable? ++#: ../lib/interface.c:826 ++#, c-format ++msgid "MULTICAST " ++msgstr "MULTICAST " ++ ++# translatable? ++#: ../lib/interface.c:829 ++#, c-format ++msgid "DYNAMIC " ++msgstr "DYNAMIC " ++ ++#. DONT FORGET TO ADD THE FLAGS IN ife_print_short ++#: ../lib/interface.c:832 ++#, c-format ++msgid " MTU:%d Metric:%d" ++msgstr " MTU:%d メトリック:%d" ++ ++# translatable? ++#: ../lib/interface.c:836 ++#, c-format ++msgid " Outfill:%d Keepalive:%d" ++msgstr " Outfill:%d キープアライブ:%d" ++ ++#: ../lib/interface.c:850 ++#, c-format ++msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" ++msgstr "RXパケット:%llu エラー:%lu 損失:%lu オーバラン:%lu フレーム:%lu\n" ++ ++#: ../lib/interface.c:855 ++#, c-format ++msgid " compressed:%lu\n" ++msgstr " 圧縮:%lu\n" ++ ++#: ../lib/interface.c:895 ++#, c-format ++msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" ++msgstr "TXパケット:%llu エラー:%lu 損失:%lu オーバラン:%lu キャリア:%lu\n" ++ ++#: ../lib/interface.c:899 ++#, c-format ++msgid " collisions:%lu " ++msgstr " 衝突(Collisions):%lu " ++ ++#: ../lib/interface.c:901 ++#, c-format ++msgid "compressed:%lu " ++msgstr "圧縮:%lu " ++ ++#: ../lib/interface.c:903 ++#, c-format ++msgid "txqueuelen:%d " ++msgstr "TXキュー長:%d " ++ ++#: ../lib/interface.c:905 ++#, c-format ++msgid "RX bytes:%llu (%lu.%lu %s) TX bytes:%llu (%lu.%lu %s)\n" ++msgstr "RXバイト:%llu (%lu.%lu %s) TXバイト:%llu (%lu.%lu %s)\n" ++ ++#: ../lib/interface.c:916 ++#, c-format ++msgid "Interrupt:%d " ++msgstr "割り込み:%d " ++ ++#. Only print devices using it for ++#. I/O maps ++#: ../lib/interface.c:919 ++#, c-format ++msgid "Base address:0x%x " ++msgstr "ベースアドレス:0x%x " ++ ++#: ../lib/interface.c:921 ++#, c-format ++msgid "Memory:%lx-%lx " ++msgstr "メモリ:%lx-%lx " ++ ++#: ../lib/interface.c:924 ++#, c-format ++msgid "DMA chan:%x " ++msgstr "DMAチェイン:%x " ++ ++#: ../lib/sockets.c:63 ++#, c-format ++msgid "No usable address families found.\n" ++msgstr "利用可能なアドレスファミリが見つかりません.\n" ++ ++#: ../lib/util-ank.c:229 ++#, c-format ++msgid "ip: %s is invalid inet address\n" ++msgstr "ip: %sは不適切なInetアドレスです.\n" ++ ++#: ../lib/util-ank.c:238 ++#, c-format ++msgid "ip: %s is invalid inet prefix\n" ++msgstr "ip: %sは不適切なInetプレフィックスです\n" ++ ++#: ../lib/util-ank.c:248 ++#, c-format ++msgid "ip: %s is invalid IPv4 address\n" ++msgstr "ip: %sは不適切なIPv4アドレスです.\n" ++ ++#: ../lib/util-ank.c:256 ++#, c-format ++msgid "ip: argument is wrong: %s\n" ++msgstr "ip: 引数が間違っています: %s\n" ++ ++#: ../ipmaddr.c:61 ++#, c-format ++msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n" ++msgstr "使用法: ipmaddr [ add | del ] マルチキャストアドレス dev 文字列\n" ++ ++#: ../ipmaddr.c:62 ++#, c-format ++msgid " ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n" ++msgstr " ipmaddr show [ dev 文字列 ] [ ipv4 | ipv6 | link | all ]\n" ++ ++#: ../ipmaddr.c:63 ++#, c-format ++msgid " ipmaddr -V | -version\n" ++msgstr " ipmaddr -V | -version\n" ++ ++#: ../ipmaddr.c:263 ++#, c-format ++msgid "family %d " ++msgstr "ファミリ %d " ++ ++#: ../ipmaddr.c:272 ++#, c-format ++msgid " users %d" ++msgstr " ユーザ %d" ++ ++#: ../ipmaddr.c:358 ++msgid "Cannot create socket" ++msgstr "ソケットを作成できません" ++ ++#: ../slattach.c:180 ++#, c-format ++msgid "slattach: /dev/%s already locked!\n" ++msgstr "slattach: /dev/%s はすでにロックされています!\n" ++ ++#: ../slattach.c:186 ++#, c-format ++msgid "slattach: tty_lock: (%s): %s\n" ++msgstr "slattach: tty_lock: (%s): %s\n" ++ ++#: ../slattach.c:192 ++#, c-format ++msgid "slattach: cannot write PID file\n" ++msgstr "slattach: PIDファイルを書き込めません\n" ++ ++#: ../slattach.c:202 ++#, c-format ++msgid "slattach: tty_lock: UUCP user %s unknown!\n" ++msgstr "slattach: tty_lock: UUCPユーザ%sは不明です!\n" ++ ++#: ../slattach.c:430 ++#, c-format ++msgid "slattach: tty_hangup(DROP): %s\n" ++msgstr "slattach: tty_hangup(DROP): %s\n" ++ ++#: ../slattach.c:437 ++#, c-format ++msgid "slattach: tty_hangup(RAISE): %s\n" ++msgstr "slattach: tty_hangup(RAISE): %s\n" ++ ++#: ../slattach.c:468 ++#, c-format ++msgid "slattach: tty name too long\n" ++msgstr "slattach: tty名が長すぎます\n" ++ ++#: ../slattach.c:498 ++#, c-format ++msgid "slattach: tty_open: cannot get current state!\n" ++msgstr "slattach: tty_open: 現在の状態を得られません!\n" ++ ++#: ../slattach.c:505 ++#, c-format ++msgid "slattach: tty_open: cannot get current line disc!\n" ++msgstr "slattach: tty_open: 現在のライン・ディスクを得られません!\n" ++ ++#: ../slattach.c:513 ++#, c-format ++msgid "slattach: tty_open: cannot set RAW mode!\n" ++msgstr "slattach: tty_open: RAWモードを設定できません!\n" ++ ++#: ../slattach.c:520 ++#, c-format ++msgid "slattach: tty_open: cannot set %s bps!\n" ++msgstr "slattach: tty_open: %s bpsを設定できません!\n" ++ ++#: ../slattach.c:530 ++#, c-format ++msgid "slattach: tty_open: cannot set 8N1 mode!\n" ++msgstr "slattach: tty_open: 8N1モードへ設定できません!\n" ++ ++#: ../slattach.c:672 ++#, c-format ++msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n" ++msgstr "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n" ++ ++#: ../slattach.c:704 ++#, c-format ++msgid "%s started" ++msgstr "%sを開始しました" ++ ++#: ../slattach.c:705 ++#, c-format ++msgid " on %s" ++msgstr "(%s上)" ++ ++#: ../slattach.c:706 ++#, c-format ++msgid " interface %s\n" ++msgstr " インタフェース %s\n" +Index: net-tools/po/fr.po +=================================================================== +--- net-tools.orig/po/fr.po ++++ net-tools/po/fr.po +@@ -4,281 +4,286 @@ + msgid "" + msgstr "" + "Project-Id-Version: net-tools 1.51\n" +-"POT-Creation-Date: 2000-02-14 02:31+0100\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2007-06-30 12:28+0900\n" + "PO-Revision-Date: 1998-03-01 00:02+0100\n" + "Last-Translator: J.M.Vansteene \n" + "Language-Team:\n" + "MIME-Version: 1.0\n" +-"Content-Type: text/plain; charset=iso8859-1\n" ++"Content-Type: text/plain; charset=iso-8859-1\n" + "Content-Transfer-Encoding: 8bit\n" + +-#: ../arp.c:110 ../arp.c:269 ++#: ../arp.c:112 ../arp.c:279 ++#, c-format + msgid "arp: need host name\n" + msgstr "arp: ncessite un nom d'hte\n" + +-#: ../arp.c:207 ../arp.c:221 ++#: ../arp.c:215 ../arp.c:230 + #, c-format + msgid "No ARP entry for %s\n" + msgstr "Pas d'entre ARP pour %s\n" + +-#: ../arp.c:239 ++#: ../arp.c:248 + #, fuzzy, c-format + msgid "arp: cant get HW-Address for `%s': %s.\n" + msgstr "rarp: ne peut dfinir l'entre depuis %s:%u\n" + +-#: ../arp.c:243 ++#: ../arp.c:252 ++#, c-format + msgid "arp: protocol type mismatch.\n" + msgstr "" + +-#: ../arp.c:252 ++#: ../arp.c:261 + #, c-format + msgid "arp: device `%s' has HW address %s `%s'.\n" + msgstr "" + +-#: ../arp.c:282 ++#: ../arp.c:293 ++#, c-format + msgid "arp: need hardware address\n" + msgstr "arp: ncessite une adresse matriel\n" + +-#: ../arp.c:290 ++#: ../arp.c:301 ++#, c-format + msgid "arp: invalid hardware address\n" + msgstr "arp: adresse matriel invalide\n" + +-#: ../arp.c:387 ++#: ../arp.c:398 + #, c-format + msgid "arp: cannot open etherfile %s !\n" + msgstr "arp: ne peut ouvrir le fichier ether %s !\n" + +-#: ../arp.c:403 ++#: ../arp.c:414 + #, c-format + msgid "arp: format error on line %u of etherfile %s !\n" + msgstr "arp: erreur de format ligne %u du fichier ether %s !\n" + +-#: ../arp.c:416 ++#: ../arp.c:427 + #, c-format + msgid "arp: cannot set entry on line %u of etherfile %s !\n" + msgstr "arp: ne peut dfinir l'entre en ligne %u du fichier ether %s !\n" + +-#: ../arp.c:437 +-msgid "Address\t\t\tHWtype\tHWaddress\t Flags Mask\t\t Iface\n" ++#: ../arp.c:448 ++#, fuzzy, c-format ++msgid "" ++"Address HWtype HWaddress Flags Mask " ++"Iface\n" + msgstr "Adresse\t\t\tTypeMap\tAdresseMat\t Indicateurs\t\t Iface\n" + +-#: ../arp.c:467 ++#: ../arp.c:476 ++#, fuzzy ++msgid "" ++msgstr "%s: interface inconnue: %s\n" ++ ++#: ../arp.c:478 + msgid "(incomplete)" + msgstr "" + +-#: ../arp.c:484 ++#: ../arp.c:495 + #, c-format + msgid "%s (%s) at " + msgstr "" + +-#: ../arp.c:490 ++#: ../arp.c:501 ++#, c-format + msgid " " + msgstr "" + +-#: ../arp.c:496 ++#: ../arp.c:507 + #, c-format + msgid "netmask %s " + msgstr "" + +-#: ../arp.c:513 ++#: ../arp.c:524 + #, c-format + msgid "on %s\n" + msgstr "" + +-#: ../arp.c:592 ++#: ../arp.c:605 + #, c-format + msgid "Entries: %d\tSkipped: %d\tFound: %d\n" + msgstr "Entres: %d\tIgnores: %d\tTrouves: %d\n" + +-#: ../arp.c:596 ++#: ../arp.c:609 + #, c-format + msgid "%s (%s) -- no entry\n" + msgstr "" + +-#: ../arp.c:598 ++#: ../arp.c:611 + #, c-format + msgid "arp: in %d entries no match found.\n" + msgstr "arp: aucune correspondance trouve dans %d entres\n" + +-#: ../arp.c:613 ++#: ../arp.c:626 ++#, c-format + msgid "" + "Usage:\n" + " arp [-vn] [] [-i ] [-a] [] <-Display ARP " + "cache\n" + msgstr "" + "Syntaxe:\n" +-" arp [-vn] [] [-i ] [-a] [] <-Affiche cache " +-"ARP\n" ++" arp [-vn] [] [-i ] [-a] [] <-Affiche cache ARP\n" + +-#: ../arp.c:614 ++#: ../arp.c:627 ++#, fuzzy, c-format + msgid "" +-" arp [-v] [-i ] -d [pub][nopub] <-Delete ARP " ++" arp [-v] [-i ] -d [pub] <-Delete ARP " + "entry\n" +-msgstr "" +-" arp [-v] [-i ] -d [pub][nopub] <-Supprime entre " +-"ARP\n" ++msgstr " arp [-v] [-i ] -d [pub][nopub] <-Supprime entre ARP\n" + +-#: ../arp.c:615 +-#, fuzzy ++#: ../arp.c:628 ++#, fuzzy, c-format + msgid "" +-" arp [-vnD] [] [-i ] -f [] <-Add entry from " ++" arp [-vnD] [] [-i ] -f [] <-Add entry from " + "file\n" +-msgstr "" +-" arp [-vnD] [] [-i ] -f <-Ajout entre " +-"depuis fichier\n" ++msgstr " arp [-vnD] [] [-i ] -f <-Ajout entre depuis fichier\n" + +-#: ../arp.c:616 ++#: ../arp.c:629 ++#, fuzzy, c-format + msgid "" +-" arp [-v] [] [-i ] -s [temp][nopub] <-Add " ++" arp [-v] [] [-i ] -s [temp] <-Add " + "entry\n" +-msgstr "" +-" arp [-v] [] [-i ] -s [temp][nopub] <-Ajout " +-"entre\n" ++msgstr " arp [-v] [] [-i ] -s [temp][nopub] <-Ajout entre\n" + +-#: ../arp.c:617 +-msgid "" +-" arp [-v] [] [-i ] -s [netmask ] pub " +-"<-''-\n" +-msgstr "" +-" arp [-v] [] [-i ] -s [netmask ] pub " +-"<-''-\n" +- +-#: ../arp.c:618 ++#: ../arp.c:630 ++#, fuzzy, c-format + msgid "" +-" arp [-v] [] [-i ] -Ds [netmask ] pub " ++" arp [-v] [] [-i ] -Ds [netmask ] pub " + "<-''-\n" + "\n" + msgstr "" +-" arp [-v] [] [-i ] -Ds [netmask ] pub " +-"<-''-\n" ++" arp [-v] [] [-i ] -Ds [netmask ] pub <-''-\n" + "\n" + +-#: ../arp.c:620 ++#: ../arp.c:632 ++#, c-format + msgid "" + " -a display (all) hosts in alternative (BSD) " + "style\n" +-msgstr "" +-" -a affiche (tous) les htes en style BSD\n" ++msgstr " -a affiche (tous) les htes en style BSD\n" + +-#: ../arp.c:621 ++#: ../arp.c:633 ++#, c-format + msgid " -s, --set set a new ARP entry\n" + msgstr " -s, --set dfinit une nouvelle entre ARP\n" + +-#: ../arp.c:622 ++#: ../arp.c:634 ++#, c-format + msgid " -d, --delete delete a specified entry\n" + msgstr " -d, --delete supprime une entre\n" + +-#: ../arp.c:623 ../netstat.c:1436 ../route.c:85 ++#: ../arp.c:635 ../netstat.c:1503 ../route.c:86 ++#, c-format + msgid " -v, --verbose be verbose\n" + msgstr " -v, --verbose mode verbeux\n" + +-#: ../arp.c:624 ../netstat.c:1437 ../route.c:86 +-msgid " -n, --numeric dont resolve names\n" ++#: ../arp.c:636 ../netstat.c:1504 ../route.c:87 ++#, fuzzy, c-format ++msgid " -n, --numeric don't resolve names\n" + msgstr " -n, --numeric ne rsout pas les noms\n" + +-#: ../arp.c:625 ++#: ../arp.c:637 ++#, c-format + msgid "" + " -i, --device specify network interface (e.g. eth0)\n" +-msgstr "" +-" -i, --device spcifie l'interface rseau (p.ex. eth0)\n" ++msgstr " -i, --device spcifie l'interface rseau (p.ex. eth0)\n" + +-#: ../arp.c:626 ++#: ../arp.c:638 ++#, c-format + msgid " -D, --use-device read from given device\n" +-msgstr "" +-" -D, --use-device lit l' depuis le priphrique\n" ++msgstr " -D, --use-device lit l' depuis le priphrique\n" + +-#: ../arp.c:627 +-#, fuzzy ++#: ../arp.c:639 ++#, fuzzy, c-format + msgid " -A, -p, --protocol specify protocol family\n" + msgstr " -r, --route affiche la table de routage\n" + +-#: ../arp.c:628 +-#, fuzzy ++#: ../arp.c:640 ++#, fuzzy, c-format + msgid "" +-" -f, --file read new entries from file or from " +-"/etc/ethers\n" ++" -f, --file read new entries from file or from /etc/" ++"ethers\n" + "\n" + msgstr "" + " -f, --file lit les nouvelles entres dans le fichier\n" + "\n" + +-#: ../arp.c:630 ../rarp.c:181 ++#: ../arp.c:642 ../rarp.c:182 + #, c-format + msgid " =Use '-H ' to specify hardware address type. Default: %s\n" +-msgstr "" +-" =Utilisez '-H ' pour spcifier le type d'adresse matriel. Dfaut: " +-"%s\n" ++msgstr " =Utilisez '-H ' pour spcifier le type d'adresse matriel. Dfaut: %s\n" + +-#: ../arp.c:631 ../rarp.c:182 ++#: ../arp.c:643 ../rarp.c:183 ++#, c-format + msgid " List of possible hardware types (which support ARP):\n" + msgstr " Liste les types de matriels supportant ARP:\n" + +-#: ../arp.c:664 ++#: ../arp.c:677 ../arp.c:762 + #, c-format + msgid "%s: hardware type not supported!\n" + msgstr "%s: type de mattiel non support !\n" + +-#: ../arp.c:668 ++#: ../arp.c:681 + #, c-format + msgid "%s: address family not supported!\n" + msgstr "%s: famille d'adresses non supporte !\n" + +-#: ../arp.c:703 +-#, fuzzy ++#: ../arp.c:716 ++#, fuzzy, c-format + msgid "arp: -N not yet supported.\n" + msgstr "Table de routage pour `ddp' pas encore support.\n" + +-#: ../arp.c:713 ++#: ../arp.c:726 + #, c-format + msgid "arp: %s: unknown address family.\n" + msgstr "arp: %s: famille d'adresses inconnue.\n" + +-#: ../arp.c:722 ++#: ../arp.c:735 + #, c-format + msgid "arp: %s: unknown hardware type.\n" + msgstr "arp: %s: type de matriel inconnu.\n" + +-#: ../arp.c:741 ++#: ../arp.c:754 + #, c-format + msgid "arp: %s: kernel only supports 'inet'.\n" + msgstr "arp: %s: le noyau ne supporte que 'inet'.\n" + +-#: ../arp.c:746 ++#: ../arp.c:767 + #, c-format + msgid "arp: %s: hardware type without ARP support.\n" + msgstr "arp: %s: type de matriel sans support ARP.\n" + +-#: ../hostname.c:69 ++#: ../hostname.c:71 + #, c-format + msgid "Setting nodename to `%s'\n" + msgstr "Dfinit le nom de noeud `%s'\n" + +-#: ../hostname.c:74 ++#: ../hostname.c:76 + #, c-format + msgid "%s: you must be root to change the node name\n" + msgstr "%s: vous devez tre root pour changer le nom de noeud\n" + +-#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116 ++#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117 + #, c-format + msgid "%s: name too long\n" + msgstr "%s: nom trop long\n" + +-#: ../hostname.c:89 ++#: ../hostname.c:91 + #, c-format + msgid "Setting hostname to `%s'\n" + msgstr "Dfinit le nom d'hte `%s'\n" + +-#: ../hostname.c:94 ++#: ../hostname.c:96 + #, c-format + msgid "%s: you must be root to change the host name\n" + msgstr "%s: vous devez tre root pour changer le nom d'hte\n" + +-#: ../hostname.c:108 ++#: ../hostname.c:109 + #, c-format + msgid "Setting domainname to `%s'\n" + msgstr "Dfinit le nom de domaine `%s'\n" + +-#: ../hostname.c:113 ++#: ../hostname.c:114 + #, c-format + msgid "%s: you must be root to change the domain name\n" + msgstr "%s: vous devez tre root pour changer le nom de domaine\n" +@@ -303,38 +308,36 @@ msgstr "Rsultat : h_aliases=`%s'\n" + msgid "Result: h_addr_list=`%s'\n" + msgstr "Rsultat : h_addr_list=`%s'\n" + +-#: ../hostname.c:209 ++#: ../hostname.c:208 + #, c-format + msgid "%s: can't open `%s'\n" + msgstr "%s: ne peut ouvrir `%s'\n" + +-#: ../hostname.c:223 ++#: ../hostname.c:222 ++#, c-format + msgid "Usage: hostname [-v] {hostname|-F file} set hostname (from file)\n" +-msgstr "" +-"Syntaxe : hostname [-v] {hte|-F fichier} dfinit le nom d'hte (depuis " +-"le fichier)\n" ++msgstr "Syntaxe : hostname [-v] {hte|-F fichier} dfinit le nom d'hte (depuis le fichier)\n" + +-#: ../hostname.c:224 ++#: ../hostname.c:223 ++#, c-format + msgid "" + " domainname [-v] {nisdomain|-F file} set NIS domainname (from file)\n" +-msgstr "" +-" domainname [-v] {domaine_nis|-F fichier} dfinit le domaine NIS " +-"(depuis le fichier)\n" ++msgstr " domainname [-v] {domaine_nis|-F fichier} dfinit le domaine NIS (depuis le fichier)\n" + +-#: ../hostname.c:226 +-#, fuzzy ++#: ../hostname.c:225 ++#, fuzzy, c-format + msgid "" + " nodename [-v] {nodename|-F file} set DECnet node name (from " + "file)\n" +-msgstr "" +-" nodename [-v] {nom_noeud|-F fichier} Dfinit le nom de noeud " +-"DECnet (depuis le fichier)\n" ++msgstr " nodename [-v] {nom_noeud|-F fichier} Dfinit le nom de noeud DECnet (depuis le fichier)\n" + +-#: ../hostname.c:228 ++#: ../hostname.c:227 ++#, c-format + msgid " hostname [-v] [-d|-f|-s|-a|-i|-y|-n] display formatted name\n" + msgstr " hostname [-v] [-d|-f|-s|-a|-i|-y|-n] affiche le nom formatt\n" + +-#: ../hostname.c:229 ++#: ../hostname.c:228 ++#, c-format + msgid "" + " hostname [-v] display hostname\n" + "\n" +@@ -342,7 +345,8 @@ msgstr "" + " hostname [-v] affiche le nom d'hte\n" + "\n" + +-#: ../hostname.c:230 ++#: ../hostname.c:229 ++#, c-format + msgid "" + " hostname -V|--version|-h|--help print info and exit\n" + "\n" +@@ -350,7 +354,8 @@ msgstr "" + " hostname -V|--version|-h|--help affiche des infos et termine\n" + "\n" + +-#: ../hostname.c:231 ++#: ../hostname.c:230 ++#, c-format + msgid "" + " dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" + "\n" +@@ -358,45 +363,52 @@ msgstr "" + " dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" + "\n" + +-#: ../hostname.c:232 ++#: ../hostname.c:231 ++#, c-format + msgid " -s, --short short host name\n" + msgstr " -s, --short nom d'hte court\n" + +-#: ../hostname.c:233 ++#: ../hostname.c:232 ++#, c-format + msgid " -a, --alias alias names\n" + msgstr " -a, --alias noms d'alias\n" + +-#: ../hostname.c:234 ++#: ../hostname.c:233 ++#, c-format + msgid " -i, --ip-address addresses for the hostname\n" + msgstr " -i, --ip-address adresses de l'hte\n" + +-#: ../hostname.c:235 ++#: ../hostname.c:234 ++#, c-format + msgid " -f, --fqdn, --long long host name (FQDN)\n" + msgstr " -f, --fqdn, --long nom d'hte long (FQDN)\n" + +-#: ../hostname.c:236 ++#: ../hostname.c:235 ++#, c-format + msgid " -d, --domain DNS domain name\n" + msgstr " -d, --domain nom de domaine DNS\n" + +-#: ../hostname.c:237 ++#: ../hostname.c:236 ++#, c-format + msgid " -y, --yp, --nis NIS/YP domainname\n" + msgstr " -y, --yp, --nis nom de domaine NIS/YP\n" + +-#: ../hostname.c:239 ++#: ../hostname.c:238 ++#, c-format + msgid " -n, --node DECnet node name\n" + msgstr " -n, --node nom de noeud DECnet\n" + +-#: ../hostname.c:241 +-#, fuzzy ++#: ../hostname.c:240 ++#, fuzzy, c-format + msgid "" + " -F, --file read hostname or NIS domainname from given file\n" + "\n" + msgstr "" +-" -F, --file lit le nom d'hte ou le nom de domaine NIS depuis " +-"le fichier\n" ++" -F, --file lit le nom d'hte ou le nom de domaine NIS depuis le fichier\n" + "\n" + +-#: ../hostname.c:243 ++#: ../hostname.c:242 ++#, c-format + msgid "" + " This command can read or set the hostname or the NIS domainname. You can\n" + " also read the DNS domain or the FQDN (fully qualified domain name).\n" +@@ -411,15 +423,16 @@ msgid "%s: You can't change the DNS doma + msgstr "%s: Vous ne pouvez changer le nom de domaine DNS avec cette commande\n" + + #: ../hostname.c:339 ++#, c-format + msgid "" + "\n" + "Unless you are using bind or NIS for host lookups you can change the DNS\n" + msgstr "" + "\n" +-"Sauf si vous utilisez bind ou NIS pour les recherches d'htes, vous pouvez " +-"changer le\n" ++"Sauf si vous utilisez bind ou NIS pour les recherches d'htes, vous pouvez changer le\n" + + #: ../hostname.c:340 ++#, c-format + msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n" + msgstr "" + "nom de domaine DNS (qui fait partie du FQDN) dans le fichier /etc/hosts.\n" +@@ -439,554 +452,453 @@ msgstr "getdomainname()=`%s'\n" + msgid "getnodename()=`%s'\n" + msgstr "getnodename()=`%s'\n" + +-#: ../ifconfig.c:159 +-#, c-format +-msgid "%-9.9s Link encap:%s " +-msgstr "%-9.9s Lien encap:%s " ++#: ../ifconfig.c:107 ++#, fuzzy, c-format ++msgid "" ++"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " ++"Flg\n" ++msgstr "" ++"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " ++"Indic\n" + +-#: ../ifconfig.c:164 +-#, c-format +-msgid "HWaddr %s " +-msgstr "HWaddr %s " ++#: ../ifconfig.c:129 ../ifconfig.c:161 ++#, fuzzy, c-format ++msgid "%s: ERROR while getting interface flags: %s\n" ++msgstr "%s: erreur lors de la recherche d'infos sur l'interface: %s\n" + +-#: ../ifconfig.c:167 ++#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862 ++#: ../ifconfig.c:973 + #, c-format +-msgid "Media:%s" +-msgstr "Media:%s" ++msgid "No support for INET on this system.\n" ++msgstr "Pas de support de INET sur ce systme.\n" + +-#: ../ifconfig.c:169 +-msgid "(auto)" +-msgstr "(auto)" ++#: ../ifconfig.c:193 ++#, fuzzy, c-format ++msgid "%s: ERROR while testing interface flags: %s\n" ++msgstr "%s: erreur lors de la recherche d'infos sur l'interface: %s\n" + +-#: ../ifconfig.c:176 +-#, c-format +-msgid " %s addr:%s " +-msgstr " %s adr:%s " ++#: ../ifconfig.c:202 ++#, fuzzy, c-format ++msgid "" ++"Usage:\n" ++" ifconfig [-a] [-v] [-s] [[]
]\n" ++msgstr "" ++"Syntaxe:\n" ++" ifconfig [-a] [-i] [-v] [[] ]\n" + +-#: ../ifconfig.c:179 ++#: ../ifconfig.c:204 + #, c-format +-msgid " P-t-P:%s " +-msgstr " P-t-P:%s " ++msgid " [add
[/]]\n" ++msgstr " [add [/]]\n" + +-#: ../ifconfig.c:182 ++#: ../ifconfig.c:205 + #, c-format +-msgid " Bcast:%s " +-msgstr " Bcast:%s " ++msgid " [del
[/]]\n" ++msgstr " [del [/]]\n" + +-#: ../ifconfig.c:184 ++#: ../ifconfig.c:206 + #, c-format +-msgid " Mask:%s\n" +-msgstr " Masque:%s\n" ++msgid " [[-]broadcast [
]] [[-]pointopoint [
]]\n" ++msgstr " [[-]broadcast []] [[-]pointopoint []]\n" + +-#: ../ifconfig.c:201 +-#, c-format +-msgid " inet6 addr: %s/%d" +-msgstr " adr inet6: %s/%d" ++#: ../ifconfig.c:207 ++#, fuzzy, c-format ++msgid " [netmask
] [dstaddr
] [tunnel
]\n" ++msgstr " [netmask ] [dstaddr ] [tunnel ]\n" + +-#: ../ifconfig.c:203 +-msgid " Scope:" +-msgstr " Scope:" ++#: ../ifconfig.c:210 ++#, c-format ++msgid " [outfill ] [keepalive ]\n" ++msgstr " [outfill ] [keepalive ]\n" + +-#: ../ifconfig.c:206 +-msgid "Global" +-msgstr "Global" ++#: ../ifconfig.c:212 ++#, c-format ++msgid " [hw
] [metric ] [mtu ]\n" ++msgstr " [hw ] [metric ] [mtu ]\n" + +-#: ../ifconfig.c:209 +-msgid "Link" +-msgstr "Lien" ++#: ../ifconfig.c:213 ++#, c-format ++msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" ++msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" + +-#: ../ifconfig.c:212 +-msgid "Site" +-msgstr "Site" ++#: ../ifconfig.c:214 ++#, c-format ++msgid " [multicast] [[-]promisc]\n" ++msgstr " [multicast] [[-]promisc]\n" + + #: ../ifconfig.c:215 +-msgid "Compat" +-msgstr "Compat" ++#, c-format ++msgid " [mem_start ] [io_addr ] [irq ] [media ]\n" ++msgstr " [mem_start ] [io_addr ] [irq ] [media ]\n" + +-#: ../ifconfig.c:218 +-msgid "Host" +-msgstr "Hte" ++#: ../ifconfig.c:217 ++#, fuzzy, c-format ++msgid " [txqueuelen ]\n" ++msgstr " [txqueuelen longueur]\n" + +-#: ../ifconfig.c:221 +-msgid "Unknown" +-msgstr "Inconnu" ++#: ../ifconfig.c:220 ++#, c-format ++msgid " [[-]dynamic]\n" ++msgstr " [[-]dynamic]\n" + +-#: ../ifconfig.c:236 ++#: ../ifconfig.c:222 + #, c-format +-msgid " IPX/Ethernet II addr:%s\n" +-msgstr " adr IPX/Ethernet II:%s\n" ++msgid "" ++" [up|down] ...\n" ++"\n" ++msgstr "" ++" [up|down] ...\n" ++"\n" + +-#: ../ifconfig.c:239 ++#: ../ifconfig.c:224 + #, c-format +-msgid " IPX/Ethernet SNAP addr:%s\n" +-msgstr " adr IPX/Ethernet SNAP:%s\n" ++msgid " =Hardware Type.\n" ++msgstr " =Type de matriel.\n" + +-#: ../ifconfig.c:242 ++#: ../ifconfig.c:225 + #, c-format +-msgid " IPX/Ethernet 802.2 addr:%s\n" +-msgstr " adr IPX/Ethernet 802.2:%s\n" ++msgid " List of possible hardware types:\n" ++msgstr " Liste des types de matriels possibles:\n" + +-#: ../ifconfig.c:245 ++#. 1 = ARPable ++#: ../ifconfig.c:227 + #, c-format +-msgid " IPX/Ethernet 802.3 addr:%s\n" +-msgstr " adr IPX/Ethernet 802.3:%s\n" ++msgid " =Address family. Default: %s\n" ++msgstr " =famille d'Adresses. Dfaut: %s\n" + +-#: ../ifconfig.c:255 ++#: ../ifconfig.c:228 + #, c-format +-msgid " EtherTalk Phase 2 addr:%s\n" +-msgstr " adr EtherTalk Phase 2:%s\n" ++msgid " List of possible address families:\n" ++msgstr " Liste des familles d'adresses possibles:\n" + +-#: ../ifconfig.c:264 ++#: ../ifconfig.c:303 + #, c-format +-msgid " econet addr:%s\n" +-msgstr " adr econet:%s\n" ++msgid "ifconfig: option `%s' not recognised.\n" ++msgstr "" + +-#: ../ifconfig.c:270 +-msgid "[NO FLAGS] " +-msgstr "[PAS INDICATEURS] " ++#: ../ifconfig.c:305 ../ifconfig.c:962 ++#, c-format ++msgid "ifconfig: `--help' gives usage information.\n" ++msgstr "" + +-#: ../ifconfig.c:272 +-msgid "UP " +-msgstr "UP " ++#: ../ifconfig.c:380 ++#, c-format ++msgid "Unknown media type.\n" ++msgstr "Type de mdia inconnu.\n" + +-#: ../ifconfig.c:274 +-msgid "BROADCAST " +-msgstr "BROADCAST " ++#: ../ifconfig.c:417 ++#, c-format ++msgid "" ++"Warning: Interface %s still in promisc mode... maybe other application is " ++"running?\n" ++msgstr "" + +-#: ../ifconfig.c:276 +-msgid "DEBUG " +-msgstr "DEBUG " ++#: ../ifconfig.c:429 ++#, c-format ++msgid "Warning: Interface %s still in MULTICAST mode.\n" ++msgstr "" + +-#: ../ifconfig.c:278 +-msgid "LOOPBACK " +-msgstr "LOOPBACK " ++#: ../ifconfig.c:441 ++#, c-format ++msgid "Warning: Interface %s still in ALLMULTI mode.\n" ++msgstr "" + +-#: ../ifconfig.c:280 +-msgid "POINTOPOINT " +-msgstr "POINTOPOINT " ++#: ../ifconfig.c:465 ++#, c-format ++msgid "Warning: Interface %s still in DYNAMIC mode.\n" ++msgstr "" + +-#: ../ifconfig.c:282 +-msgid "NOTRAILERS " +-msgstr "NOTRAILERS " ++#: ../ifconfig.c:523 ++#, c-format ++msgid "Warning: Interface %s still in BROADCAST mode.\n" ++msgstr "" + +-#: ../ifconfig.c:284 +-msgid "RUNNING " +-msgstr "RUNNING " ++#: ../ifconfig.c:652 ++#, c-format ++msgid "Warning: Interface %s still in POINTOPOINT mode.\n" ++msgstr "" + +-#: ../ifconfig.c:286 +-msgid "NOARP " +-msgstr "NOARP " ++#: ../ifconfig.c:684 ++#, c-format ++msgid "hw address type `%s' has no handler to set address. failed.\n" ++msgstr "" + +-#: ../ifconfig.c:288 +-msgid "PROMISC " +-msgstr "PROMISC " ++#: ../ifconfig.c:693 ++#, c-format ++msgid "%s: invalid %s address.\n" ++msgstr "%s: adresse %s invalide.\n" + +-#: ../ifconfig.c:290 +-msgid "ALLMULTI " +-msgstr "ALLMULTI " +- +-#: ../ifconfig.c:292 +-msgid "SLAVE " +-msgstr "SLAVE " +- +-#: ../ifconfig.c:294 +-msgid "MASTER " +-msgstr "MASTER " +- +-#: ../ifconfig.c:296 +-msgid "MULTICAST " +-msgstr "MULTICAST " +- +-#: ../ifconfig.c:299 +-msgid "DYNAMIC " +-msgstr "DYNAMIC " +- +-#: ../ifconfig.c:302 +-#, c-format +-msgid " MTU:%d Metric:%d" +-msgstr " MTU:%d Metric:%d" +- +-#: ../ifconfig.c:306 +-#, c-format +-msgid " Outfill:%d Keepalive:%d" +-msgstr " Outfill:%d Keepalive:%d" +- +-#: ../ifconfig.c:320 +-#, c-format +-msgid "RX packets:%lu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" +-msgstr "Paquets Reus:%lu erreurs:%lu jets:%lu dbordements:%lu trames:%lu\n" +- +-#: ../ifconfig.c:325 +-#, c-format +-msgid " compressed:%lu\n" +-msgstr " compresss:%lu\n" +- +-#: ../ifconfig.c:329 +-#, c-format +-msgid "TX packets:%lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" +-msgstr "" +-"Paquets transmis:%lu erreurs:%lu jets:%lu dbordements:%lu carrier:%lu\n" +- +-#: ../ifconfig.c:333 ++#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913 + #, c-format +-msgid " collisions:%lu " +-msgstr " collisions:%lu " +- +-#: ../ifconfig.c:335 +-#, c-format +-msgid "compressed:%lu " +-msgstr "compresss:%lu " +- +-#: ../ifconfig.c:337 +-#, c-format +-msgid "txqueuelen:%d " +-msgstr "lg file transmission:%d " +- +-#: ../ifconfig.c:345 +-#, c-format +-msgid "Interrupt:%d " +-msgstr "Interruption:%d " +- +-#. Only print devices using it for +-#. I/O maps +-#: ../ifconfig.c:348 +-#, c-format +-msgid "Base address:0x%x " +-msgstr "Adresse de base:0x%x " +- +-#: ../ifconfig.c:350 +-#, c-format +-msgid "Memory:%lx-%lx " +-msgstr "Mmoire:%lx-%lx " +- +-#: ../ifconfig.c:353 +-#, c-format +-msgid "DMA chan:%x " +-msgstr "Canal DMA:%x " ++msgid "No support for INET6 on this system.\n" ++msgstr "Pas de support de INET6 sur ce systme.\n" + +-#: ../ifconfig.c:384 ../ifconfig.c:405 ++#: ../ifconfig.c:780 ../ifconfig.c:871 + #, c-format +-msgid "%s: unknown interface: %s\n" +-msgstr "%s: interface inconnue: %s\n" +- +-#: ../ifconfig.c:421 +-msgid "" +-"Usage:\n" +-" ifconfig [-a] [-i] [-v] [[]
]\n" +-msgstr "" +-"Syntaxe:\n" +-" ifconfig [-a] [-i] [-v] [[] ]\n" +- +-#: ../ifconfig.c:425 +-msgid " [add
[/]]\n" +-msgstr " [add [/]]\n" +- +-#: ../ifconfig.c:427 +-msgid " [del
[/]]\n" +-msgstr " [del [/]]\n" +- +-#: ../ifconfig.c:432 +-msgid " [[-]broadcast [
]] [[-]pointopoint [
]]\n" +-msgstr " [[-]broadcast []] [[-]pointopoint []]\n" +- +-#: ../ifconfig.c:433 +-#, fuzzy +-msgid " [netmask
] [dstaddr
] [tunnel
]\n" +-msgstr " [netmask ] [dstaddr ] [tunnel ]\n" +- +-#: ../ifconfig.c:436 +-msgid " [outfill ] [keepalive ]\n" +-msgstr " [outfill ] [keepalive ]\n" +- +-#: ../ifconfig.c:438 +-msgid " [hw
] [metric ] [mtu ]\n" +-msgstr " [hw ] [metric ] [mtu ]\n" +- +-#: ../ifconfig.c:439 +-msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" +-msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" +- +-#: ../ifconfig.c:440 +-msgid " [multicast] [[-]promisc]\n" +-msgstr " [multicast] [[-]promisc]\n" +- +-#: ../ifconfig.c:441 +-msgid " [mem_start ] [io_addr ] [irq ] [media ]\n" +-msgstr " [mem_start ] [io_addr ] [irq ] [media ]\n" +- +-#: ../ifconfig.c:443 +-#, fuzzy +-msgid " [txqueuelen ]\n" +-msgstr " [txqueuelen longueur]\n" +- +-#: ../ifconfig.c:446 +-msgid " [[-]dynamic]\n" +-msgstr " [[-]dynamic]\n" +- +-#: ../ifconfig.c:448 +-msgid "" +-" [up|down] ...\n" +-"\n" ++msgid "Interface %s not initialized\n" + msgstr "" +-" [up|down] ...\n" +-"\n" +- +-#: ../ifconfig.c:450 +-msgid " =Hardware Type.\n" +-msgstr " =Type de matriel.\n" +- +-#: ../ifconfig.c:451 +-msgid " List of possible hardware types:\n" +-msgstr " Liste des types de matriels possibles:\n" +- +-#. 1 = ARPable +-#: ../ifconfig.c:453 +-#, c-format +-msgid " =Address family. Default: %s\n" +-msgstr " =famille d'Adresses. Dfaut: %s\n" +- +-#: ../ifconfig.c:454 +-msgid " List of possible address families:\n" +-msgstr " Liste des familles d'adresses possibles:\n" +- +-#: ../ifconfig.c:593 +-msgid "Unknown media type.\n" +-msgstr "Type de mdia inconnu.\n" + +-#: ../ifconfig.c:881 +-#, c-format +-msgid "%s: invalid %s address.\n" ++#: ../ifconfig.c:792 ../ifconfig.c:882 ++#, fuzzy, c-format ++msgid "Bad address.\n" + msgstr "%s: adresse %s invalide.\n" + +-#: ../ifconfig.c:920 ../ifconfig.c:963 ../ifconfig.c:1011 +-msgid "No support for INET6 on this system.\n" +-msgstr "Pas de support de INET6 sur ce systme.\n" +- +-#: ../ifconfig.c:983 ++#: ../ifconfig.c:885 ++#, c-format + msgid "Address deletion not supported on this system.\n" + msgstr "Suppression d'adresses pas support par ce systme.\n" + +-#: ../ifconfig.c:1066 +-msgid "No support for INET on this system.\n" +-msgstr "Pas de support de INET sur ce systme.\n" ++#: ../ifconfig.c:957 ++#, fuzzy, c-format ++msgid "ifconfig: Cannot set address for this protocol family.\n" ++msgstr "Ne sait pas comment dfinir les adresses pour la famille %d.\n" + +-#: ../ifconfig.c:1076 ++#: ../ifconfig.c:983 ++#, c-format + msgid "No support for ECONET on this system.\n" + msgstr "Pas de support de ECONET sur ce systme.\n" + +-#: ../ifconfig.c:1084 ++#: ../ifconfig.c:991 + #, c-format + msgid "Don't know how to set addresses for family %d.\n" + msgstr "Ne sait pas comment dfinir les adresses pour la famille %d.\n" + +-#: ../netstat.c:383 ++#: ../ifconfig.c:1021 ++#, c-format ++msgid "WARNING: at least one error occured. (%d)\n" ++msgstr "" ++ ++#: ../netstat.c:434 + #, c-format + msgid "" + "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n" +-msgstr "" +-"(Pas d'infos lues pour \"-p\": geteuid()=%d mais vous devez tre root.)\n" ++msgstr "(Pas d'infos lues pour \"-p\": geteuid()=%d mais vous devez tre root.)\n" + +-#: ../netstat.c:387 ++#: ../netstat.c:438 ++#, c-format + msgid "" + "(Not all processes could be identified, non-owned process info\n" + " will not be shown, you would have to be root to see it all.)\n" + msgstr "" + "(Tous les processus ne peuvent tre identifis, les infos sur les processus\n" +-"non possds ne seront pas affiches, vous devez tre root pour les voir " +-"toutes.)\n" ++"non possds ne seront pas affiches, vous devez tre root pour les voir toutes.)\n" + +-#: ../netstat.c:394 ../netstat.c:1089 ../netstat.c:1166 ++#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266 + msgid "LISTENING" + msgstr "LISTENING" + +-#: ../netstat.c:395 ++#: ../netstat.c:446 + msgid "CONN SENT" + msgstr "CONN SENT" + +-#: ../netstat.c:396 ../netstat.c:1168 ++#: ../netstat.c:447 ../netstat.c:1268 + msgid "DISC SENT" + msgstr "DISC SENT" + +-#: ../netstat.c:397 ../netstat.c:464 ../netstat.c:809 ../netstat.c:1169 ++#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269 + msgid "ESTABLISHED" + msgstr "ESTABLISHED" + +-#: ../netstat.c:419 ++#: ../netstat.c:470 ++#, c-format + msgid "Active NET/ROM sockets\n" + msgstr "sockets NET/ROM actives\n" + +-#: ../netstat.c:420 ++#: ../netstat.c:471 ++#, c-format + msgid "" +-"User Dest Source Device State Vr/Vs Send-Q " +-"Recv-Q\n" ++"User Dest Source Device State Vr/Vs Send-Q Recv-" ++"Q\n" + msgstr "" +-"Utilisatr Dest Source Periph Etat Vr/Vs Send-Q " +-"Recv-Q\n" ++"Utilisatr Dest Source Periph Etat Vr/Vs Send-Q Recv-" ++"Q\n" + +-#: ../netstat.c:430 ../netstat.c:1208 ++#: ../netstat.c:481 ../netstat.c:1308 + #, c-format + msgid "Problem reading data from %s\n" + msgstr "" + +-#: ../netstat.c:465 ++#: ../netstat.c:516 + msgid "SYN_SENT" + msgstr "SYN_SENT" + +-#: ../netstat.c:466 ++#: ../netstat.c:517 + msgid "SYN_RECV" + msgstr "SYN_RECV" + +-#: ../netstat.c:467 ++#: ../netstat.c:518 + msgid "FIN_WAIT1" + msgstr "FIN_WAIT1" + +-#: ../netstat.c:468 ++#: ../netstat.c:519 + msgid "FIN_WAIT2" + msgstr "FIN_WAIT2" + +-#: ../netstat.c:469 ++#: ../netstat.c:520 + msgid "TIME_WAIT" + msgstr "TIME_WAIT" + +-#: ../netstat.c:470 ++#: ../netstat.c:521 + msgid "CLOSE" + msgstr "CLOSE" + +-#: ../netstat.c:471 ++#: ../netstat.c:522 + msgid "CLOSE_WAIT" + msgstr "CLOSE_WAIT" + +-#: ../netstat.c:472 ++#: ../netstat.c:523 + msgid "LAST_ACK" + msgstr "LAST_ACK" + +-#: ../netstat.c:473 ++#: ../netstat.c:524 + msgid "LISTEN" + msgstr "LISTEN" + +-#: ../netstat.c:474 ++#: ../netstat.c:525 + msgid "CLOSING" + msgstr "CLOSING" + +-#: ../netstat.c:544 ++#: ../netstat.c:596 + #, c-format + msgid "warning, got bogus igmp6 line %d.\n" + msgstr "attention, ligne igmp6 en erreur %d.\n" + +-#: ../netstat.c:549 ../netstat.c:587 ../netstat.c:670 ../netstat.c:803 +-#: ../netstat.c:935 ../netstat.c:940 ++#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898 ++#: ../netstat.c:1032 ../netstat.c:1037 + #, c-format + msgid "netstat: unsupported address family %d !\n" + msgstr "netstat: famille d'adresses pas supporte %d !\n" + +-#: ../netstat.c:562 ../netstat.c:567 ../netstat.c:575 ../netstat.c:582 ++#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634 + #, c-format + msgid "warning, got bogus igmp line %d.\n" + msgstr "attention, ligne igmp6 en erreur %d.\n" + +-#: ../netstat.c:666 ++#: ../netstat.c:677 ++#, fuzzy, c-format ++msgid "Active X.25 sockets\n" ++msgstr "Sockets AX.25 actives\n" ++ ++#. IMHO, Vr/Vs is not very usefull --SF ++#: ../netstat.c:679 ++#, fuzzy, c-format ++msgid "" ++"Dest Source Device LCI State Vr/Vs Send-Q Recv-" ++"Q\n" ++msgstr "Dest Source Periph Etat Vr/Vs Send-Q Recv-Q\n" ++ ++#: ../netstat.c:759 ++#, c-format + msgid "warning, got bogus tcp line.\n" + msgstr "attention, ligne tcp en erreur.\n" + +-#: ../netstat.c:704 ../netstat.c:855 ../netstat.c:975 ++#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075 + #, c-format + msgid "off (0.00/%ld/%d)" + msgstr "off (0.00/%ld/%d)" + +-#: ../netstat.c:708 ++#: ../netstat.c:804 + #, fuzzy, c-format + msgid "on (%2.2f/%ld/%d)" + msgstr "on%d (%2.2f/%ld/%d)" + +-#: ../netstat.c:713 ++#: ../netstat.c:809 + #, fuzzy, c-format + msgid "keepalive (%2.2f/%ld/%d)" + msgstr "on%d (%2.2f/%ld/%d)" + +-#: ../netstat.c:718 ++#: ../netstat.c:814 + #, fuzzy, c-format + msgid "timewait (%2.2f/%ld/%d)" + msgstr "on%d (%2.2f/%ld/%d)" + +-#: ../netstat.c:723 ../netstat.c:864 ../netstat.c:985 ++#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085 + #, c-format + msgid "unkn-%d (%2.2f/%ld/%d)" + msgstr "unkn-%d (%2.2f/%ld/%d)" + +-#: ../netstat.c:799 ++#: ../netstat.c:894 ++#, c-format + msgid "warning, got bogus udp line.\n" + msgstr "attention, ligne udp en erreur.\n" + +-#: ../netstat.c:817 ../netstat.c:1075 ../netstat.c:1108 ++#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208 + msgid "UNKNOWN" + msgstr "INCONNU" + +-#: ../netstat.c:860 ../netstat.c:980 ++#: ../netstat.c:958 ../netstat.c:1080 + #, c-format + msgid "on%d (%2.2f/%ld/%d)" + msgstr "on%d (%2.2f/%ld/%d)" + +-#: ../netstat.c:949 ++#: ../netstat.c:1046 ++#, c-format + msgid "warning, got bogus raw line.\n" + msgstr "attention, ligne raw en erreur.\n" + +-#: ../netstat.c:1028 ++#: ../netstat.c:1128 ++#, c-format + msgid "warning, got bogus unix line.\n" + msgstr "attention, ligne unix en erreur.\n" + +-#: ../netstat.c:1055 ++#: ../netstat.c:1155 + msgid "STREAM" + msgstr "STREAM" + +-#: ../netstat.c:1059 ++#: ../netstat.c:1159 + msgid "DGRAM" + msgstr "DGRAM" + +-#: ../netstat.c:1063 ++#: ../netstat.c:1163 + msgid "RAW" + msgstr "RAW" + +-#: ../netstat.c:1067 ++#: ../netstat.c:1167 + msgid "RDM" + msgstr "RDM" + +-#: ../netstat.c:1071 ++#: ../netstat.c:1171 + msgid "SEQPACKET" + msgstr "SEQPACKET" + +-#: ../netstat.c:1080 ++#: ../netstat.c:1180 + msgid "FREE" + msgstr "LIBRE" + +-#: ../netstat.c:1096 ++#: ../netstat.c:1196 + msgid "CONNECTING" + msgstr "ENCONNEXION" + +-#: ../netstat.c:1100 ++#: ../netstat.c:1200 + msgid "CONNECTED" + msgstr "CONNECTE" + +-#: ../netstat.c:1104 ++#: ../netstat.c:1204 + msgid "DISCONNECTING" + msgstr "ENDECONNEXION" + +-#: ../netstat.c:1135 ++#: ../netstat.c:1235 ++#, c-format + msgid "Active UNIX domain sockets " + msgstr "Sockets du domaine UNIX actives" + +-#: ../netstat.c:1137 ../netstat.c:1666 ++#: ../netstat.c:1237 ../netstat.c:1756 ++#, c-format + msgid "(servers and established)" + msgstr "(serveurs et tablies)" + +-#: ../netstat.c:1140 ../netstat.c:1669 ++#: ../netstat.c:1240 ../netstat.c:1759 ++#, c-format + msgid "(only servers)" + msgstr "(seulement serveurs)" + +-#: ../netstat.c:1142 ../netstat.c:1671 ++#: ../netstat.c:1242 ../netstat.c:1761 ++#, c-format + msgid "(w/o servers)" + msgstr "(sans serveurs)" + +-#: ../netstat.c:1145 ++#: ../netstat.c:1245 ++#, c-format + msgid "" + "\n" + "Proto RefCnt Flags Type State I-Node" +@@ -994,32 +906,36 @@ msgstr "" + "\n" + "Proto RefCpt Indicatrs Type Etat I-Node" + +-#: ../netstat.c:1147 ++#: ../netstat.c:1247 ++#, c-format + msgid " Path\n" + msgstr " Chemin\n" + +-#: ../netstat.c:1167 ++#: ../netstat.c:1267 + msgid "SABM SENT" + msgstr "SABM SENT" + +-#: ../netstat.c:1170 ++#: ../netstat.c:1270 + msgid "RECOVERY" + msgstr "RECOVERY" + +-#: ../netstat.c:1184 ++#: ../netstat.c:1284 ++#, c-format + msgid "Active AX.25 sockets\n" + msgstr "Sockets AX.25 actives\n" + +-#: ../netstat.c:1185 ++#: ../netstat.c:1285 ++#, c-format + msgid "Dest Source Device State Vr/Vs Send-Q Recv-Q\n" + msgstr "Dest Source Periph Etat Vr/Vs Send-Q Recv-Q\n" + +-#: ../netstat.c:1228 ++#: ../netstat.c:1328 + #, c-format + msgid "problem reading data from %s\n" + msgstr "" + +-#: ../netstat.c:1279 ++#: ../netstat.c:1379 ++#, c-format + msgid "" + "Active IPX sockets\n" + "Proto Recv-Q Send-Q Local Address Foreign Address " +@@ -1029,55 +945,53 @@ msgstr "" + "Proto Recv-Q Send-Q Adresse locale Adresse distante " + "Etat" + +-#: ../netstat.c:1281 ++#: ../netstat.c:1381 ++#, c-format + msgid " User" + msgstr "Utilisatr" + +-#: ../netstat.c:1315 ++#: ../netstat.c:1415 + msgid "ESTAB" + msgstr "ESTAB" + +-#: ../netstat.c:1323 ++#: ../netstat.c:1423 + msgid "UNK." + msgstr "UNK." + +-#: ../netstat.c:1367 +-msgid " - no statistics available -" +-msgstr "" +- +-#: ../netstat.c:1370 +-msgid "[NO FLAGS]" +-msgstr "[PAS INDICATEURS]" +- +-#: ../netstat.c:1400 ++#: ../netstat.c:1461 ++#, c-format + msgid "Kernel Interface table\n" + msgstr "Table d'interfaces noyau\n" + +-#: ../netstat.c:1401 ++#: ../netstat.c:1465 ++#, fuzzy, c-format + msgid "" +-"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " ++"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " + "Flg\n" + msgstr "" + "Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " + "Indic\n" + +-#: ../netstat.c:1404 ++#: ../netstat.c:1469 + msgid "missing interface information" + msgstr "informations d'interface manquantes" + +-#: ../netstat.c:1425 ++#: ../netstat.c:1492 ++#, c-format + msgid "" +-"usage: netstat [-veenNcCF] [] -r netstat " +-"{-V|--version|-h|--help}\n" ++"usage: netstat [-veenNcCF] [] -r netstat {-V|--version|-h|--" ++"help}\n" + msgstr "" +-"syntaxe: netstat [-veenNcCF] [] -r netstat " +-"{-V|--version|-h|--help}\n" ++"syntaxe: netstat [-veenNcCF] [] -r netstat {-V|--version|-h|--" ++"help}\n" + +-#: ../netstat.c:1426 ++#: ../netstat.c:1493 ++#, c-format + msgid " netstat [-vnNcaeol] [ ...]\n" + msgstr " netstat [-vnNcaeol] [ ...]\n" + +-#: ../netstat.c:1427 ++#: ../netstat.c:1494 ++#, c-format + msgid "" + " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" + "\n" +@@ -1085,27 +999,30 @@ msgstr "" + " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" + "\n" + +-#: ../netstat.c:1429 ++#: ../netstat.c:1496 ++#, c-format + msgid " -r, --route display routing table\n" + msgstr " -r, --route affiche la table de routage\n" + +-#: ../netstat.c:1430 ++#: ../netstat.c:1497 ++#, c-format + msgid " -i, --interfaces display interface table\n" + msgstr " -i, --interfaces affiche la table d'interfaces\n" + +-#: ../netstat.c:1431 ++#: ../netstat.c:1498 ++#, c-format + msgid " -g, --groups display multicast group memberships\n" + msgstr "" + " -g, --groups affiche les membres d'un groupe multicast\n" + +-#: ../netstat.c:1432 ++#: ../netstat.c:1499 ++#, c-format + msgid "" + " -s, --statistics display networking statistics (like SNMP)\n" +-msgstr "" +-" -s, --statistics affiche les statistiques rseau (comme " +-"SNMP)\n" ++msgstr " -s, --statistics affiche les statistiques rseau (comme SNMP)\n" + +-#: ../netstat.c:1434 ++#: ../netstat.c:1501 ++#, c-format + msgid "" + " -M, --masquerade display masqueraded connections\n" + "\n" +@@ -1113,23 +1030,41 @@ msgstr "" + " -M, --masquerade affiche les connexions masques\n" + "\n" + +-#: ../netstat.c:1438 ../route.c:87 ++#: ../netstat.c:1505 ++#, fuzzy, c-format ++msgid " --numeric-hosts don't resolve host names\n" ++msgstr " -n, --numeric ne rsout pas les noms\n" ++ ++#: ../netstat.c:1506 ++#, fuzzy, c-format ++msgid " --numeric-ports don't resolve port names\n" ++msgstr " -n, --numeric ne rsout pas les noms\n" ++ ++#: ../netstat.c:1507 ++#, fuzzy, c-format ++msgid " --numeric-users don't resolve user names\n" ++msgstr " -n, --numeric ne rsout pas les noms\n" ++ ++#: ../netstat.c:1508 ++#, c-format + msgid " -N, --symbolic resolve hardware names\n" + msgstr " -N, --symbolic rsoud les noms matriels\n" + +-#: ../netstat.c:1439 ../route.c:88 +-#, fuzzy ++#: ../netstat.c:1509 ../route.c:88 ++#, fuzzy, c-format + msgid " -e, --extend display other/more information\n" + msgstr "" + " -e, --extend affiche d'autres/plus d'informations\n" + +-#: ../netstat.c:1440 ++#: ../netstat.c:1510 ++#, c-format + msgid " -p, --programs display PID/Program name for sockets\n" + msgstr "" + " -p, --programs affiche le nom du programme/PID des " + "sockets\n" + +-#: ../netstat.c:1441 ++#: ../netstat.c:1511 ++#, c-format + msgid "" + " -c, --continuous continuous listing\n" + "\n" +@@ -1137,32 +1072,31 @@ msgstr "" + " -c, --continuous listing continu\n" + "\n" + +-#: ../netstat.c:1442 ++#: ../netstat.c:1512 ++#, c-format + msgid " -l, --listening display listening server sockets\n" +-msgstr "" +-" -l, --listening affiche les sockets du serveur l'coute\n" ++msgstr " -l, --listening affiche les sockets du serveur l'coute\n" + +-#: ../netstat.c:1443 ++#: ../netstat.c:1513 ++#, c-format + msgid "" + " -a, --all, --listening display all sockets (default: connected)\n" +-msgstr "" +-" -a, --all, --listening affiche toutes les prises (dfaut: " +-"connects)\n" ++msgstr " -a, --all, --listening affiche toutes les prises (dfaut: connects)\n" + +-#: ../netstat.c:1444 ++#: ../netstat.c:1514 ++#, c-format + msgid " -o, --timers display timers\n" + msgstr " -o, --timers affiche les timers\n" + +-#: ../netstat.c:1445 ../route.c:89 +-#, fuzzy ++#: ../netstat.c:1515 ../route.c:89 ++#, fuzzy, c-format + msgid "" + " -F, --fib display Forwarding Information Base " + "(default)\n" +-msgstr "" +-" -F, --fib affiche la Forwarding Infomation Base " +-"(dfaut)\n" ++msgstr " -F, --fib affiche la Forwarding Infomation Base (dfaut)\n" + +-#: ../netstat.c:1446 ../route.c:90 ++#: ../netstat.c:1516 ../route.c:90 ++#, c-format + msgid "" + " -C, --cache display routing cache instead of FIB\n" + "\n" +@@ -1170,110 +1104,118 @@ msgstr "" + " -C, --cache affiche le cache de routage au lieu de FIB\n" + "\n" + +-#: ../netstat.c:1448 ++#: ../netstat.c:1518 ++#, c-format + msgid "" +-" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx " +-"--netrom\n" ++" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" ++"netrom\n" + msgstr "" +-" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx " +-"--netrom\n" ++" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" ++"netrom\n" + +-#: ../netstat.c:1449 ../route.c:92 +-#, c-format +-msgid " =Use '-A ' or '--' Default: %s\n" ++#: ../netstat.c:1519 ++#, fuzzy, c-format ++msgid " =Use '-6|-4' or '-A ' or '--'; default: %s\n" + msgstr " =Utiliser '-A ' ou '--' Dfaut: %s\n" + +-#: ../netstat.c:1450 ../route.c:93 ++#: ../netstat.c:1520 ../route.c:93 ++#, c-format + msgid " List of possible address families (which support routing):\n" + msgstr " Liste les familles d'adresses possibles (supportant le routage):\n" + +-#: ../netstat.c:1663 ++#: ../netstat.c:1753 ++#, c-format + msgid "Active Internet connections " + msgstr "Connexions Internet actives " + +-#: ../netstat.c:1673 ++#: ../netstat.c:1763 ++#, c-format + msgid "" + "\n" +-"Proto Recv-Q Send-Q Local Address Foreign Address State " +-" " ++"Proto Recv-Q Send-Q Local Address Foreign Address " ++"State " + msgstr "" + "\n" +-"Proto Recv-Q Send-Q Adresse locale Adresse distante Etat " +-" " ++"Proto Recv-Q Send-Q Adresse locale Adresse distante " ++"Etat " + +-#: ../netstat.c:1675 ++#: ../netstat.c:1765 ++#, c-format + msgid " User Inode " + msgstr " Utilisatr Inode " + +-#: ../netstat.c:1678 ++#: ../netstat.c:1768 ++#, c-format + msgid " Timer" + msgstr " Timer" + +-#: ../netstat.c:1708 ++#: ../netstat.c:1798 ++#, c-format + msgid "IPv4 Group Memberships\n" + msgstr "" + +-#: ../netstat.c:1709 ++#: ../netstat.c:1799 ++#, c-format + msgid "Interface RefCnt Group\n" + msgstr "" + +-#: ../rarp.c:43 ++#: ../rarp.c:44 + msgid "This kernel does not support RARP.\n" + msgstr "Ce noyau ne supporte pas RARP.\n" + +-#: ../rarp.c:82 ++#: ../rarp.c:83 + #, c-format + msgid "no RARP entry for %s.\n" + msgstr "pas d'entre RARP pour %s.\n" + +-#: ../rarp.c:95 ++#: ../rarp.c:96 + #, c-format + msgid "%s: bad hardware address\n" + msgstr "%s: mauvaise adresse matriel\n" + +-#: ../rarp.c:127 ++#: ../rarp.c:128 + #, c-format + msgid "rarp: cannot open file %s:%s.\n" + msgstr "rarp: ne peut ouvrir le fichier %s:%s.\n" + +-#: ../rarp.c:139 ++#: ../rarp.c:140 + #, c-format + msgid "rarp: format error at %s:%u\n" + msgstr "rarp: erreur de format %s:%u\n" + +-#: ../rarp.c:143 ../rarp.c:287 ++#: ../rarp.c:144 ../rarp.c:289 + #, c-format + msgid "rarp: %s: unknown host\n" + msgstr "rarp: %s: hte inconnu\n" + +-#: ../rarp.c:146 ++#: ../rarp.c:147 + #, c-format + msgid "rarp: cannot set entry from %s:%u\n" + msgstr "rarp: ne peut dfinir l'entre depuis %s:%u\n" + +-#: ../rarp.c:175 ++#: ../rarp.c:176 ++#, c-format + msgid "Usage: rarp -a list entries in cache.\n" +-msgstr "" +-"Usage: rarp -a liste les entres en cache.\n" ++msgstr "Usage: rarp -a liste les entres en cache.\n" + +-#: ../rarp.c:176 ++#: ../rarp.c:177 ++#, c-format + msgid " rarp -d delete entry from cache.\n" +-msgstr "" +-" rarp -d supprime l'entre du cache.\n" ++msgstr " rarp -d supprime l'entre du cache.\n" + +-#: ../rarp.c:177 ++#: ../rarp.c:178 ++#, c-format + msgid " rarp [] -s add entry to cache.\n" +-msgstr "" +-" rarp [] -s ajoute l'entre au cache.\n" ++msgstr " rarp [] -s ajoute l'entre au cache.\n" + +-#: ../rarp.c:178 ++#: ../rarp.c:179 ++#, c-format + msgid "" + " rarp -f add entries from /etc/ethers.\n" +-msgstr "" +-" rarp -f ajoute les entres depuis " +-"/etc/ethers.\n" ++msgstr " rarp -f ajoute les entres depuis /etc/ethers.\n" + +-#: ../rarp.c:179 ++#: ../rarp.c:180 ++#, c-format + msgid "" + " rarp -V display program version.\n" + "\n" +@@ -1281,24 +1223,26 @@ msgstr "" + " rarp -V affiche la version.\n" + "\n" + +-#: ../rarp.c:236 ++#: ../rarp.c:238 + #, c-format + msgid "%s: illegal option mix.\n" + msgstr "%s: combinaison d'options illgales.\n" + +-#: ../rarp.c:267 ++#: ../rarp.c:269 + #, c-format + msgid "rarp: %s: unknown hardware type.\n" + msgstr "rarp: %s: type de matriel inconnu.\n" + +-#: ../route.c:79 ++#: ../route.c:80 ++#, c-format + msgid "" + "Usage: route [-nNvee] [-FC] [] List kernel routing tables\n" + msgstr "" + "Syntaxe: route [-nNvee] [-FC] [] Liste les tables de routage " + "noyau\n" + +-#: ../route.c:80 ++#: ../route.c:81 ++#, c-format + msgid "" + " route [-v] [-FC] {add|del|flush} ... Modify routing table for AF.\n" + "\n" +@@ -1307,15 +1251,15 @@ msgstr "" + "pour AF.\n" + "\n" + +-#: ../route.c:82 ++#: ../route.c:83 ++#, c-format + msgid "" + " route {-h|--help} [] Detailed usage syntax for " + "specified AF.\n" +-msgstr "" +-" route {-h|--help} [] Utilisation dtaille pour l'AF " +-"spcifi.\n" ++msgstr " route {-h|--help} [] Utilisation dtaille pour l'AF spcifi.\n" + +-#: ../route.c:83 ++#: ../route.c:84 ++#, c-format + msgid "" + " route {-V|--version} Display version/author and " + "exit.\n" +@@ -1325,16 +1269,23 @@ msgstr "" + "termine.\n" + "\n" + ++#: ../route.c:92 ++#, fuzzy, c-format ++msgid " =Use '-A ' or '--'; default: %s\n" ++msgstr " =Utiliser '-A ' ou '--' Dfaut: %s\n" ++ + #: ../plipconfig.c:66 ++#, c-format + msgid "Usage: plipconfig [-a] [-i] [-v] interface\n" + msgstr "Syntaxe: plipconfig [-a] [-i] [-v] interface\n" + + #: ../plipconfig.c:67 ++#, c-format + msgid " [nibble NN] [trigger NN]\n" + msgstr " [nibble NN] [trigger NN]\n" + + #: ../plipconfig.c:68 +-#, fuzzy ++#, fuzzy, c-format + msgid " plipconfig -V | --version\n" + msgstr " plipconfig -V\n" + +@@ -1343,474 +1294,763 @@ msgstr " plipconfig -V\n" + msgid "%s\tnibble %lu trigger %lu\n" + msgstr "%s\tnibble %lu trigger %lu\n" + +-#: ../iptunnel.c:79 ++#: ../iptunnel.c:85 ++#, c-format + msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n" + msgstr "" + +-#: ../iptunnel.c:80 ++#: ../iptunnel.c:86 ++#, c-format + msgid "" + " [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n" + msgstr "" + +-#: ../iptunnel.c:81 ++#: ../iptunnel.c:87 ++#, c-format + msgid " [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n" + msgstr "" + +-#: ../iptunnel.c:82 ++#: ../iptunnel.c:88 ++#, c-format + msgid " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n" + msgstr "" + +-#: ../iptunnel.c:83 ++#: ../iptunnel.c:89 ++#, c-format + msgid "" + " iptunnel -V | --version\n" + "\n" + msgstr "" + +-#: ../iptunnel.c:84 ++#: ../iptunnel.c:90 ++#, c-format + msgid "Where: NAME := STRING\n" + msgstr "" + +-#: ../iptunnel.c:85 ++#: ../iptunnel.c:91 ++#, c-format + msgid " ADDR := { IP_ADDRESS | any }\n" + msgstr "" + +-#: ../iptunnel.c:86 ++#: ../iptunnel.c:92 ++#, c-format + msgid " TOS := { NUMBER | inherit }\n" + msgstr "" + +-#: ../iptunnel.c:87 ++#: ../iptunnel.c:93 ++#, c-format + msgid " TTL := { 1..255 | inherit }\n" + msgstr "" + +-#: ../iptunnel.c:88 ++#: ../iptunnel.c:94 ++#, c-format + msgid " KEY := { DOTTED_QUAD | NUMBER }\n" + msgstr "" + +-#: ../iptunnel.c:326 ++#: ../iptunnel.c:332 ++#, c-format + msgid "Keys are not allowed with ipip and sit.\n" + msgstr "" + +-#: ../iptunnel.c:346 ++#: ../iptunnel.c:352 ++#, c-format + msgid "Broadcast tunnel requires a source address.\n" + msgstr "" + +-#: ../iptunnel.c:361 ++#: ../iptunnel.c:367 ++#, c-format + msgid "ttl != 0 and noptmudisc are incompatible\n" + msgstr "" + +-#: ../iptunnel.c:373 ++#: ../iptunnel.c:379 ++#, c-format + msgid "cannot determine tunnel mode (ipip, gre or sit)\n" + msgstr "" + +-#: ../iptunnel.c:411 ++#: ../iptunnel.c:417 + #, c-format + msgid "%s: %s/ip remote %s local %s " + msgstr "" + +-#: ../iptunnel.c:415 ++#: ../iptunnel.c:421 + #, fuzzy + msgid "unknown" + msgstr "Inconnu" + +-#: ../iptunnel.c:447 ++#: ../iptunnel.c:453 ++#, c-format + msgid " Drop packets out of sequence.\n" + msgstr "" + +-#: ../iptunnel.c:449 ++#: ../iptunnel.c:455 ++#, c-format + msgid " Checksum in received packet is required.\n" + msgstr "" + +-#: ../iptunnel.c:451 ++#: ../iptunnel.c:457 ++#, c-format + msgid " Sequence packets on output.\n" + msgstr "" + +-#: ../iptunnel.c:453 ++#: ../iptunnel.c:459 ++#, c-format + msgid " Checksum output packets.\n" + msgstr "" + +-#: ../iptunnel.c:481 ++#: ../iptunnel.c:487 ++#, c-format + msgid "Wrong format of /proc/net/dev. Sorry.\n" + msgstr "" + +-#: ../iptunnel.c:494 ++#: ../iptunnel.c:500 + #, c-format + msgid "Failed to get type of [%s]\n" + msgstr "" + +-#: ../iptunnel.c:510 ++#: ../iptunnel.c:516 ++#, c-format + msgid "RX: Packets Bytes Errors CsumErrs OutOfSeq Mcasts\n" + msgstr "" + +-#: ../iptunnel.c:513 ++#: ../iptunnel.c:519 ++#, c-format + msgid "TX: Packets Bytes Errors DeadLoop NoRoute NoBufs\n" + msgstr "" + +-#: ../statistics.c:45 ++#: ../statistics.c:47 + msgid "ICMP input histogram:" + msgstr "Histogramme d'entre ICMP" + +-#: ../statistics.c:46 ++#: ../statistics.c:48 + msgid "ICMP output histogram:" + msgstr "Histogramme de sortie ICMP" + +-#: ../statistics.c:63 ++#: ../statistics.c:65 + #, c-format + msgid "Forwarding is %s" + msgstr "Racheminement est %s" + +-#: ../statistics.c:64 +-#, c-format +-msgid "Default TTL is %d" ++#: ../statistics.c:66 ++#, fuzzy, c-format ++msgid "Default TTL is %u" + msgstr "TTL par dfaut est %d" + +-#: ../statistics.c:65 +-#, c-format +-msgid "%d total packets received" ++#: ../statistics.c:67 ++#, fuzzy, c-format ++msgid "%u total packets received" + msgstr "%d paquets totaux reus" + +-#: ../statistics.c:66 +-#, c-format +-msgid "%d with invalid headers" ++#: ../statistics.c:68 ++#, fuzzy, c-format ++msgid "%u with invalid headers" + msgstr "%d avec en-tte invalides" + +-#: ../statistics.c:67 +-#, c-format +-msgid "%d with invalid addresses" ++#: ../statistics.c:69 ++#, fuzzy, c-format ++msgid "%u with invalid addresses" + msgstr "%d avec adresses invalides" + +-#: ../statistics.c:68 +-#, c-format +-msgid "%d forwarded" ++#: ../statistics.c:70 ++#, fuzzy, c-format ++msgid "%u forwarded" + msgstr "%d rachemines" + +-#: ../statistics.c:69 +-#, c-format +-msgid "%d with unknown protocol" ++#: ../statistics.c:71 ++#, fuzzy, c-format ++msgid "%u with unknown protocol" + msgstr "%d avec protocole inconnu" + +-#: ../statistics.c:70 +-#, c-format +-msgid "%d incoming packets discarded" ++#: ../statistics.c:72 ++#, fuzzy, c-format ++msgid "%u incoming packets discarded" + msgstr "%d paquets entrant jets" + +-#: ../statistics.c:71 +-#, c-format +-msgid "%d incoming packets delivered" ++#: ../statistics.c:73 ++#, fuzzy, c-format ++msgid "%u incoming packets delivered" + msgstr "%d paquets entrant dlivrs" + +-#: ../statistics.c:72 +-#, c-format +-msgid "%d requests sent out" ++#: ../statistics.c:74 ++#, fuzzy, c-format ++msgid "%u requests sent out" + msgstr "%d requtes envoyes" + + #. ? +-#: ../statistics.c:73 +-#, c-format +-msgid "%d outgoing packets dropped" ++#: ../statistics.c:75 ++#, fuzzy, c-format ++msgid "%u outgoing packets dropped" + msgstr "%d paquets sortant jets" + +-#: ../statistics.c:74 +-#, c-format +-msgid "%d dropped because of missing route" ++#: ../statistics.c:76 ++#, fuzzy, c-format ++msgid "%u dropped because of missing route" + msgstr "%d jets pour cause de route manquante" + +-#: ../statistics.c:75 +-#, c-format +-msgid "%d fragments dropped after timeout" ++#: ../statistics.c:77 ++#, fuzzy, c-format ++msgid "%u fragments dropped after timeout" + msgstr "%d fragments jets aprs timeout" + +-#: ../statistics.c:76 +-#, c-format +-msgid "%d reassemblies required" ++#: ../statistics.c:78 ++#, fuzzy, c-format ++msgid "%u reassemblies required" + msgstr "%d ncessitant un rassemblage" + + #. ? +-#: ../statistics.c:77 +-#, c-format +-msgid "%d packets reassembled ok" ++#: ../statistics.c:79 ++#, fuzzy, c-format ++msgid "%u packets reassembled ok" + msgstr "%d paquets rassembls correctement" + +-#: ../statistics.c:78 +-#, c-format +-msgid "%d packet reassembles failed" ++#: ../statistics.c:80 ++#, fuzzy, c-format ++msgid "%u packet reassembles failed" + msgstr "%d paquets mal rassembls" + +-#: ../statistics.c:79 +-#, c-format +-msgid "%d fragments received ok" ++#: ../statistics.c:81 ++#, fuzzy, c-format ++msgid "%u fragments received ok" + msgstr "%d fragments reus correctement" + +-#: ../statistics.c:80 +-#, c-format +-msgid "%d fragments failed" ++#: ../statistics.c:82 ++#, fuzzy, c-format ++msgid "%u fragments failed" + msgstr "%d fragments en chec" + +-#: ../statistics.c:81 +-#, c-format +-msgid "%d fragments created" ++#: ../statistics.c:83 ++#, fuzzy, c-format ++msgid "%u fragments created" + msgstr "%d fragments crs" + +-#: ../statistics.c:86 +-#, c-format +-msgid "%d ICMP messages received" ++#: ../statistics.c:88 ++#, fuzzy, c-format ++msgid "%u ICMP messages received" + msgstr "%d messages ICMP reus" + +-#: ../statistics.c:87 +-#, c-format +-msgid "%d input ICMP message failed." ++#: ../statistics.c:89 ++#, fuzzy, c-format ++msgid "%u input ICMP message failed." + msgstr "%d messages d'entre ICMP en chec" + +-#: ../statistics.c:88 ../statistics.c:101 +-#, c-format +-msgid "destination unreachable: %d" ++#: ../statistics.c:90 ../statistics.c:103 ++#, fuzzy, c-format ++msgid "destination unreachable: %u" + msgstr "destination injoignable: %d" + +-#: ../statistics.c:89 +-#, c-format +-msgid "timeout in transit: %d" ++#: ../statistics.c:91 ++#, fuzzy, c-format ++msgid "timeout in transit: %u" + msgstr "timeout en transmission: %d" + +-#: ../statistics.c:90 ../statistics.c:103 +-#, c-format +-msgid "wrong parameters: %d" ++#: ../statistics.c:92 ../statistics.c:105 ++#, fuzzy, c-format ++msgid "wrong parameters: %u" + msgstr "mauvais paramtre: %d" + + #. ? +-#: ../statistics.c:91 +-#, c-format +-msgid "source quenchs: %d" ++#: ../statistics.c:93 ++#, fuzzy, c-format ++msgid "source quenches: %u" + msgstr "Source Quenchs: %d" + +-#: ../statistics.c:92 +-#, c-format +-msgid "redirects: %d" ++#: ../statistics.c:94 ++#, fuzzy, c-format ++msgid "redirects: %u" + msgstr "Redirections: %d" + +-#: ../statistics.c:93 +-#, c-format +-msgid "echo requests: %d" ++#: ../statistics.c:95 ++#, fuzzy, c-format ++msgid "echo requests: %u" + msgstr "requtes echo: %d" + +-#: ../statistics.c:94 ../statistics.c:107 +-#, c-format +-msgid "echo replies: %d" ++#: ../statistics.c:96 ../statistics.c:109 ++#, fuzzy, c-format ++msgid "echo replies: %u" + msgstr "rponses echo: %d" + +-#: ../statistics.c:95 +-#, c-format +-msgid "timestamp request: %d" ++#: ../statistics.c:97 ++#, fuzzy, c-format ++msgid "timestamp request: %u" + msgstr "requtes dates: %d" + +-#: ../statistics.c:96 +-#, c-format +-msgid "timestamp reply: %d" ++#: ../statistics.c:98 ++#, fuzzy, c-format ++msgid "timestamp reply: %u" + msgstr "rponses dates: %d" + +-#: ../statistics.c:97 +-#, c-format +-msgid "address mask request: %d" ++#: ../statistics.c:99 ++#, fuzzy, c-format ++msgid "address mask request: %u" + msgstr "requtes de masque d'adresse: %d" + + #. ? +-#: ../statistics.c:98 +-msgid "address mask replies" +-msgstr "rponses de masque d'adresses" ++#: ../statistics.c:100 ../statistics.c:113 ++#, fuzzy, c-format ++msgid "address mask replies: %u" ++msgstr "rponses de masque d'adresse: %d" + + #. ? +-#: ../statistics.c:99 +-#, c-format +-msgid "%d ICMP messages sent" ++#: ../statistics.c:101 ++#, fuzzy, c-format ++msgid "%u ICMP messages sent" + msgstr "%d messages ICMP envoys" + +-#: ../statistics.c:100 +-#, c-format +-msgid "%d ICMP messages failed" ++#: ../statistics.c:102 ++#, fuzzy, c-format ++msgid "%u ICMP messages failed" + msgstr "%d messages ICMP en chec" + +-#: ../statistics.c:102 +-#, c-format +-msgid "time exceeded: %d" ++#: ../statistics.c:104 ++#, fuzzy, c-format ++msgid "time exceeded: %u" + msgstr "temps dpass: %d" + + #. ? +-#: ../statistics.c:104 +-#, c-format +-msgid "source quench: %d" ++#: ../statistics.c:106 ++#, fuzzy, c-format ++msgid "source quench: %u" + msgstr "Source Quench: %d" + +-#: ../statistics.c:105 +-#, c-format +-msgid "redirect: %d" ++#: ../statistics.c:107 ++#, fuzzy, c-format ++msgid "redirect: %u" + msgstr "redirection: %d" + +-#: ../statistics.c:106 +-#, c-format +-msgid "echo request: %d" ++#: ../statistics.c:108 ++#, fuzzy, c-format ++msgid "echo request: %u" + msgstr "requte echo: %d" + +-#: ../statistics.c:108 +-#, c-format +-msgid "timestamp requests: %d" ++#: ../statistics.c:110 ++#, fuzzy, c-format ++msgid "timestamp requests: %u" + msgstr "requtes dates: %d" + +-#: ../statistics.c:109 +-#, c-format +-msgid "timestamp replies: %d" ++#: ../statistics.c:111 ++#, fuzzy, c-format ++msgid "timestamp replies: %u" + msgstr "rponses dates: %d" + +-#: ../statistics.c:110 +-#, c-format +-msgid "address mask requests: %d" ++#: ../statistics.c:112 ++#, fuzzy, c-format ++msgid "address mask requests: %u" + msgstr "requtes de masque d'adresse: %d" + +-#: ../statistics.c:111 +-#, c-format +-msgid "address mask replies: %d" +-msgstr "rponses de masque d'adresse: %d" +- +-#: ../statistics.c:116 ++#: ../statistics.c:118 + #, c-format + msgid "RTO algorithm is %s" + msgstr "algorithme RTO est %s" + +-#: ../statistics.c:120 +-#, c-format +-msgid "%d active connections openings" ++#: ../statistics.c:122 ++#, fuzzy, c-format ++msgid "%u active connections openings" + msgstr "%d ouvertures de connexions actives" + +-#: ../statistics.c:121 +-#, c-format +-msgid "%d passive connection openings" ++#: ../statistics.c:123 ++#, fuzzy, c-format ++msgid "%u passive connection openings" + msgstr "%d ouvertures de connexions passives" + +-#: ../statistics.c:122 +-#, c-format +-msgid "%d failed connection attempts" ++#: ../statistics.c:124 ++#, fuzzy, c-format ++msgid "%u failed connection attempts" + msgstr "%d tentatives de connexion choues" + +-#: ../statistics.c:123 +-#, c-format +-msgid "%d connection resets received" ++#: ../statistics.c:125 ++#, fuzzy, c-format ++msgid "%u connection resets received" + msgstr "%d rinitialisations de connexions reues" + +-#: ../statistics.c:124 +-#, c-format +-msgid "%d connections established" ++#: ../statistics.c:126 ++#, fuzzy, c-format ++msgid "%u connections established" + msgstr "%d connexions tablies" + +-#: ../statistics.c:125 +-#, c-format +-msgid "%d segments received" ++#: ../statistics.c:127 ++#, fuzzy, c-format ++msgid "%u segments received" + msgstr "%d segments reus" + +-#: ../statistics.c:126 +-#, c-format +-msgid "%d segments send out" ++#: ../statistics.c:128 ++#, fuzzy, c-format ++msgid "%u segments send out" + msgstr "%d segments envoys" + +-#: ../statistics.c:127 +-#, c-format +-msgid "%d segments retransmited" ++#: ../statistics.c:129 ++#, fuzzy, c-format ++msgid "%u segments retransmited" + msgstr "%d segments retransmis" + +-#: ../statistics.c:128 +-#, c-format +-msgid "%d bad segments received." ++#: ../statistics.c:130 ++#, fuzzy, c-format ++msgid "%u bad segments received." + msgstr "%d mauvais segments reus." + +-#: ../statistics.c:129 +-#, c-format +-msgid "%d resets sent" ++#: ../statistics.c:131 ++#, fuzzy, c-format ++msgid "%u resets sent" + msgstr "%d rinitialisations envoyes" + +-#: ../statistics.c:134 +-#, c-format +-msgid "%d packets received" ++#: ../statistics.c:136 ++#, fuzzy, c-format ++msgid "%u packets received" + msgstr "%d paquets reus" + +-#: ../statistics.c:135 +-#, c-format +-msgid "%d packets to unknown port received." ++#: ../statistics.c:137 ++#, fuzzy, c-format ++msgid "%u packets to unknown port received." + msgstr "%d paquets reus pour un port inconnu" + +-#: ../statistics.c:136 +-#, c-format +-msgid "%d packet receive errors" ++#: ../statistics.c:138 ++#, fuzzy, c-format ++msgid "%u packet receive errors" + msgstr "%d erreurs en rception de paquets" + +-#: ../statistics.c:137 ++#: ../statistics.c:139 ++#, fuzzy, c-format ++msgid "%u packets sent" ++msgstr "%d paquets envoys" ++ ++#: ../statistics.c:144 ++#, fuzzy, c-format ++msgid "%u SYN cookies sent" ++msgstr "%d SYN-Cookies reus" ++ ++#: ../statistics.c:145 ++#, fuzzy, c-format ++msgid "%u SYN cookies received" ++msgstr "%d SYN-Cookies reus" ++ ++#: ../statistics.c:146 ++#, fuzzy, c-format ++msgid "%u invalid SYN cookies received" ++msgstr "%d SYN-Cookies reus incorrects" ++ ++#: ../statistics.c:148 ++#, fuzzy, c-format ++msgid "%u resets received for embryonic SYN_RECV sockets" ++msgstr "%d rinitialisations reues 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 supprims de la file de rception en raison de tampon de sockets plein" ++ ++#. obsolete: 2.2.0 doesn't do that anymore ++#: ../statistics.c:153 ++#, fuzzy, c-format ++msgid "%u packets pruned from receive queue" ++msgstr "%d paquets supprims de la file hors service" ++ ++#: ../statistics.c:154 ++#, fuzzy, c-format ++msgid "" ++"%u packets dropped from out-of-order queue because of socket buffer overrun" ++msgstr "%d paquets jets de la file hors service en raison de tampon de sockets plein" ++ ++#: ../statistics.c:156 ++#, fuzzy, c-format ++msgid "%u ICMP packets dropped because they were out-of-window" ++msgstr "%d ICMP paquets jets car hors de la fentre" ++ ++#: ../statistics.c:158 ++#, fuzzy, c-format ++msgid "%u ICMP packets dropped because socket was locked" ++msgstr "%d paquets ICMP jets car la socket a t vrouille" ++ ++#: ../statistics.c:160 + #, c-format +-msgid "%d packets sent" ++msgid "%u TCP sockets finished time wait in fast timer" ++msgstr "" ++ ++#: ../statistics.c:161 ++#, c-format ++msgid "%u time wait sockets recycled by time stamp" ++msgstr "" ++ ++#: ../statistics.c:162 ++#, c-format ++msgid "%u TCP sockets finished time wait in slow timer" ++msgstr "" ++ ++#: ../statistics.c:163 ++#, c-format ++msgid "%u passive connections rejected because of time stamp" ++msgstr "" ++ ++#: ../statistics.c:165 ++#, c-format ++msgid "%u active connections rejected because of time stamp" ++msgstr "" ++ ++#: ../statistics.c:167 ++#, c-format ++msgid "%u packets rejects in established connections because of timestamp" ++msgstr "" ++ ++#: ../statistics.c:169 ++#, fuzzy, c-format ++msgid "%u delayed acks sent" + msgstr "%d paquets envoys" + +-#: ../statistics.c:142 ++#: ../statistics.c:170 + #, c-format +-msgid "%d SYN cookies sent" ++msgid "%u delayed acks further delayed because of locked socket" + msgstr "" + +-#: ../statistics.c:143 ++#: ../statistics.c:172 + #, c-format +-msgid "%d SYN cookies received" +-msgstr "%d SYN-Cookies reus" ++msgid "Quick ack mode was activated %u times" ++msgstr "" + +-#: ../statistics.c:144 ++#: ../statistics.c:173 + #, c-format +-msgid "%d invalid SYN cookies received" +-msgstr "%d SYN-Cookies reus incorrects" ++msgid "%u times the listen queue of a socket overflowed" ++msgstr "" + +-#: ../statistics.c:146 ++#: ../statistics.c:175 + #, c-format +-msgid "%d resets received for embryonic SYN_RECV sockets" +-msgstr "%d rinitialisations reues pour sockets SYN_RECV embryonnaires" ++msgid "%u SYNs to LISTEN sockets ignored" ++msgstr "" + +-#: ../statistics.c:148 ++#: ../statistics.c:176 + #, c-format +-msgid "%d packets pruned from receive queue because of socket buffer overrun" ++msgid "%u packets directly queued to recvmsg prequeue." + msgstr "" +-"%d paquets supprims de la file de rception en raison de tampon de sockets " +-"plein" + +-#. obsolete: 2.2.0 doesn't do that anymore +-#: ../statistics.c:151 ++#: ../statistics.c:178 ++#, c-format ++msgid "%u of bytes directly received from backlog" ++msgstr "" ++ ++#: ../statistics.c:180 + #, c-format +-msgid "%d packets pruned from out-of-order queue" ++msgid "%u of bytes directly received from prequeue" ++msgstr "" ++ ++#: ../statistics.c:182 ++#, fuzzy, c-format ++msgid "%u packets dropped from prequeue" + msgstr "%d paquets supprims de la file hors service" + +-#: ../statistics.c:152 ++#: ../statistics.c:183 ++#, fuzzy, c-format ++msgid "%u packet headers predicted" ++msgstr "%d paquets reus" ++ ++#: ../statistics.c:184 + #, c-format +-msgid "" +-"%d packets dropped from out-of-order queue because of socket buffer overrun" ++msgid "%u packets header predicted and directly queued to user" + msgstr "" +-"%d paquets jets de la file hors service en raison de tampon de sockets plein" + +-#: ../statistics.c:154 ++#: ../statistics.c:186 + #, c-format +-msgid "%d ICMP packets dropped because they were out-of-window" +-msgstr "%d ICMP paquets jets car hors de la fentre" ++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 reus pour un port inconnu" ++ ++#: ../statistics.c:189 + #, c-format +-msgid "%d ICMP packets dropped because socket was locked" +-msgstr "%d paquets ICMP jets car la socket a t vrouille" ++msgid "%u predicted acknowledgments" ++msgstr "" ++ ++#: ../statistics.c:190 ++#, c-format ++msgid "%u times recovered from packet loss due to fast retransmit" ++msgstr "" ++ ++#: ../statistics.c:191 ++#, c-format ++msgid "%u times recovered from packet loss due to SACK data" ++msgstr "" ++ ++#: ../statistics.c:192 ++#, fuzzy, c-format ++msgid "%u bad SACKs received" ++msgstr "%d mauvais segments reus." ++ ++#: ../statistics.c:193 ++#, c-format ++msgid "Detected reordering %u times using FACK" ++msgstr "" ++ ++#: ../statistics.c:194 ++#, c-format ++msgid "Detected reordering %u times using SACK" ++msgstr "" ++ ++#: ../statistics.c:195 ++#, c-format ++msgid "Detected reordering %u times using time stamp" ++msgstr "" ++ ++#: ../statistics.c:196 ++#, c-format ++msgid "Detected reordering %u times using reno fast retransmit" ++msgstr "" ++ ++#: ../statistics.c:197 ++#, c-format ++msgid "%u congestion windows fully recovered" ++msgstr "" ++ ++#: ../statistics.c:198 ++#, c-format ++msgid "%u congestion windows partially recovered using Hoe heuristic" ++msgstr "" ++ ++#: ../statistics.c:199 ++#, c-format ++msgid "%u congestion window recovered using DSACK" ++msgstr "" ++ ++#: ../statistics.c:200 ++#, c-format ++msgid "%u congestion windows recovered after partial ack" ++msgstr "" ++ ++#: ../statistics.c:201 ++#, fuzzy, c-format ++msgid "%u retransmits lost" ++msgstr "%d rinitialisations envoyes" ++ ++#: ../statistics.c:202 ++#, c-format ++msgid "%u timeouts after reno fast retransmit" ++msgstr "" ++ ++#: ../statistics.c:203 ++#, c-format ++msgid "%u timeouts after SACK recovery" ++msgstr "" ++ ++#: ../statistics.c:204 ++#, c-format ++msgid "%u timeouts in loss state" ++msgstr "" ++ ++#: ../statistics.c:205 ++#, fuzzy, c-format ++msgid "%u fast retransmits" ++msgstr "%d segments retransmis" ++ ++#: ../statistics.c:206 ++#, c-format ++msgid "%u forward retransmits" ++msgstr "" ++ ++#: ../statistics.c:207 ++#, c-format ++msgid "%u retransmits in slow start" ++msgstr "" ++ ++#: ../statistics.c:208 ++#, c-format ++msgid "%u other TCP timeouts" ++msgstr "" ++ ++#: ../statistics.c:209 ++#, fuzzy, c-format ++msgid "%u reno fast retransmits failed" ++msgstr "%d segments retransmis" ++ ++#: ../statistics.c:210 ++#, fuzzy, c-format ++msgid "%u sack retransmits failed" ++msgstr "%d paquets mal rassembls" ++ ++#: ../statistics.c:211 ++#, c-format ++msgid "%u times receiver scheduled too late for direct processing" ++msgstr "" ++ ++#: ../statistics.c:212 ++#, fuzzy, c-format ++msgid "%u packets collapsed in receive queue due to low socket buffer" ++msgstr "%d paquets supprims de la file de rception en raison de tampon de sockets plein" ++ ++#: ../statistics.c:213 ++#, c-format ++msgid "%u DSACKs sent for old packets" ++msgstr "" ++ ++#: ../statistics.c:214 ++#, c-format ++msgid "%u DSACKs sent for out of order packets" ++msgstr "" ++ ++#: ../statistics.c:215 ++#, fuzzy, c-format ++msgid "%u DSACKs received" ++msgstr "%d paquets reus" ++ ++#: ../statistics.c:216 ++#, fuzzy, c-format ++msgid "%u DSACKs for out of order packets received" ++msgstr "%d paquets totaux reus" ++ ++#: ../statistics.c:217 ++#, fuzzy, c-format ++msgid "%u connections reset due to unexpected SYN" ++msgstr "%d rinitialisations de connexions reues" ++ ++#: ../statistics.c:218 ++#, fuzzy, c-format ++msgid "%u connections reset due to unexpected data" ++msgstr "%d rinitialisations de connexions reues" ++ ++#: ../statistics.c:219 ++#, fuzzy, c-format ++msgid "%u connections reset due to early user close" ++msgstr "%d rinitialisations de connexions reues" ++ ++#: ../statistics.c:220 ++#, c-format ++msgid "%u connections aborted due to memory pressure" ++msgstr "" ++ ++#: ../statistics.c:221 ++#, fuzzy, c-format ++msgid "%u connections aborted due to timeout" ++msgstr "%d rinitialisations de connexions reues" + + #: ../statistics.c:222 ++#, c-format ++msgid "%u connections aborted after user close in linger timeout" ++msgstr "" ++ ++#: ../statistics.c:223 ++#, c-format ++msgid "%u times unabled to send RST due to no memory" ++msgstr "" ++ ++#: ../statistics.c:224 ++#, c-format ++msgid "TCP ran low on memory %u times" ++msgstr "" ++ ++#: ../statistics.c:225 ++#, c-format ++msgid "%u TCP data loss events" ++msgstr "" ++ ++#: ../statistics.c:292 + msgid "enabled" + msgstr "active" + +-#: ../statistics.c:222 ++#: ../statistics.c:292 + msgid "disabled" + msgstr "dsactive" + +-#: ../statistics.c:272 +-#, c-format +-msgid "unknown title %s\n" +-msgstr "titre inconnu %s\n" +- +-#: ../statistics.c:298 ++#: ../statistics.c:375 + msgid "error parsing /proc/net/snmp" + msgstr "erreur d'analyse de /proc/net/snmp" + +-#: ../statistics.c:311 ++#: ../statistics.c:388 + msgid "cannot open /proc/net/snmp" + msgstr "ne peut ouvrir /proc/net/snmp" + +@@ -1824,89 +2064,95 @@ msgstr "Type de matriel `%s' pas suppor + msgid "Cannot change line discipline to `%s'.\n" + msgstr "Ne peut changer la discipline de ligne `%s'.\n" + +-#: ../lib/af.c:145 ../lib/hw.c:148 ++#: ../lib/af.c:153 ../lib/hw.c:161 + msgid "UNSPEC" + msgstr "UNSPEC" + +-#: ../lib/af.c:147 ++#: ../lib/af.c:155 + msgid "UNIX Domain" + msgstr "Domaine UNIX" + +-#: ../lib/af.c:150 ++#: ../lib/af.c:158 + msgid "DARPA Internet" + msgstr "DARPA Internet" + +-#: ../lib/af.c:153 ++#: ../lib/af.c:161 + msgid "IPv6" + msgstr "IPv6" + +-#: ../lib/af.c:156 ../lib/hw.c:169 ++#: ../lib/af.c:164 ../lib/hw.c:182 + msgid "AMPR AX.25" + msgstr "AMPR AX.25" + +-#: ../lib/af.c:159 ../lib/hw.c:175 ++#: ../lib/af.c:167 ../lib/hw.c:188 + msgid "AMPR NET/ROM" + msgstr "AMPR NET/ROM" + +-#: ../lib/af.c:162 ++#: ../lib/af.c:170 + msgid "Novell IPX" + msgstr "" + +-#: ../lib/af.c:165 ++#: ../lib/af.c:173 + msgid "Appletalk DDP" + msgstr "Appletalk DDP" + +-#: ../lib/af.c:168 ../lib/hw.c:207 ++#: ../lib/af.c:176 ../lib/hw.c:223 + msgid "Econet" + msgstr "Econet" + +-#: ../lib/af.c:171 ../lib/hw.c:172 ++#: ../lib/af.c:179 ++msgid "CCITT X.25" ++msgstr "" ++ ++#: ../lib/af.c:182 ../lib/hw.c:185 + msgid "AMPR ROSE" + msgstr "AMPR ROSE" + +-#: ../lib/af.c:174 ../lib/hw.c:160 ++#: ../lib/af.c:185 ../lib/hw.c:173 + msgid "Ash" + msgstr "Ash" + +-#: ../lib/af.c:232 ++#: ../lib/af.c:243 ++#, c-format + msgid "Please don't supply more than one address family.\n" + msgstr "Ne fournissez pas plus d'une famille d'adresses SVP.\n" + +-#: ../lib/af.c:293 ++#: ../lib/af.c:304 ++#, c-format + msgid "Too much address family arguments.\n" + msgstr "Trop d'arguments de familles d'adresses.\n" + +-#: ../lib/af.c:304 ++#: ../lib/af.c:315 + #, c-format + msgid "Unknown address family `%s'.\n" + msgstr "Famille d'adresses inconnue `%s'.\n" + +-#: ../lib/arcnet.c:53 ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 +-#: ../lib/fddi.c:67 ../lib/hippi.c:68 ../lib/inet.c:244 ../lib/inet.c:259 +-#: ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 ../lib/rose.c:71 +-#: ../lib/rose.c:126 ../lib/unix.c:56 ../lib/unix.c:76 +-msgid "[NONE SET]" +-msgstr "[INDEFINI]" +- +-#: ../lib/arcnet.c:81 ../lib/arcnet.c:96 ++#: ../lib/arcnet.c:70 ../lib/arcnet.c:85 + #, c-format + msgid "in_arcnet(%s): invalid arcnet address!\n" + msgstr "in_arcnet(%s): adresse arcnet invalide !\n" + +-#: ../lib/arcnet.c:108 ++#: ../lib/arcnet.c:97 + #, c-format + msgid "in_arcnet(%s): trailing : ignored!\n" + msgstr "in_arcnet(%s): restant : ignor !\n" + +-#: ../lib/arcnet.c:120 ++#: ../lib/arcnet.c:109 + #, c-format + msgid "in_arcnet(%s): trailing junk!\n" + msgstr "in_arcnet(%s): le restant la poubelle !\n" + + #: ../lib/ash.c:81 ++#, c-format + msgid "Malformed Ash address" + msgstr "Adresse Ash malforme" + ++#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244 ++#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 ++#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76 ++msgid "[NONE SET]" ++msgstr "[INDEFINI]" ++ + #: ../lib/ax25.c:97 ../lib/netrom.c:100 + msgid "Invalid callsign" + msgstr "Signal d'appel invalide" +@@ -1916,22 +2162,21 @@ msgid "Callsign too long" + msgstr "Signal d'appel trop long" + + #: ../lib/ax25_gr.c:47 ++#, c-format + msgid "AX.25 not configured in this system.\n" + msgstr "AX.25 pas configur sur ce systme.\n" + + #: ../lib/ax25_gr.c:50 ++#, c-format + msgid "Kernel AX.25 routing table\n" + msgstr "Table de routage AX.25 du noyau\n" + + #. xxx + #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55 ++#, c-format + msgid "Destination Iface Use\n" + msgstr "Destination Iface Utilisation\n" + +-#: ../lib/ddp_gr.c:21 +-msgid "Routing table for `ddp' not yet supported.\n" +-msgstr "Table de routage pour `ddp' pas encore support.\n" +- + #: ../lib/ether.c:74 ../lib/ether.c:91 + #, c-format + msgid "in_ether(%s): invalid ether address!\n" +@@ -1947,153 +2192,171 @@ msgstr "in_ether(%s): restant ignor !\n + msgid "in_ether(%s): trailing junk!\n" + msgstr "in_ether(%s): le restant la poubelle !\n" + +-#: ../lib/fddi.c:95 ../lib/fddi.c:110 ++#: ../lib/fddi.c:84 ../lib/fddi.c:99 + #, c-format + msgid "in_fddi(%s): invalid fddi address!\n" + msgstr "in_fddi(%s): adresse fddi invalide!\n" + +-#: ../lib/fddi.c:122 ++#: ../lib/fddi.c:111 + #, c-format + msgid "in_fddi(%s): trailing : ignored!\n" + msgstr "in_fddi(%s): restant ignor !\n" + +-#: ../lib/fddi.c:134 ++#: ../lib/fddi.c:123 + #, c-format + msgid "in_fddi(%s): trailing junk!\n" + msgstr "in_fddi(%s): le restant la poubelle !\n" + +-#: ../lib/getroute.c:97 ../lib/setroute.c:76 ++#: ../lib/getroute.c:101 ../lib/setroute.c:80 + #, c-format + msgid "Address family `%s' not supported.\n" + msgstr "Famille d'adresses `%s' non supporte.\n" + +-#: ../lib/getroute.c:103 ../lib/setroute.c:80 ++#: ../lib/getroute.c:107 ../lib/setroute.c:84 + #, c-format + msgid "No routing for address family `%s'.\n" + msgstr "Pas de routage pour la famille d'adresses `%s'.\n" + +-#: ../lib/hippi.c:96 ../lib/hippi.c:111 ++#: ../lib/hippi.c:84 ../lib/hippi.c:99 + #, c-format + msgid "in_hippi(%s): invalid hippi address!\n" + msgstr "in_hippi(%s): adresse hippi invalide!\n" + +-#: ../lib/hippi.c:123 ++#: ../lib/hippi.c:111 + #, c-format + msgid "in_hippi(%s): trailing : ignored!\n" + msgstr "in_hippi(%s): restant ignor !\n" + +-#: ../lib/hippi.c:134 ++#: ../lib/hippi.c:122 + #, c-format + msgid "in_hippi(%s): trailing junk!\n" + msgstr "in_hippi(%s): le restant la poubelle !\n" + +-#: ../lib/hw.c:147 ++#: ../lib/hw.c:160 + msgid "Local Loopback" + msgstr "Boucle locale" + +-#: ../lib/hw.c:150 ++#: ../lib/hw.c:163 + msgid "Serial Line IP" + msgstr "IP ligne srie" + +-#: ../lib/hw.c:151 ++#: ../lib/hw.c:164 + msgid "VJ Serial Line IP" + msgstr "IP ligne srie - VJ " + +-#: ../lib/hw.c:152 ++#: ../lib/hw.c:165 + msgid "6-bit Serial Line IP" + msgstr "IP ligne srie - 6 bits" + +-#: ../lib/hw.c:153 ++#: ../lib/hw.c:166 + msgid "VJ 6-bit Serial Line IP" + msgstr "IP ligne srie - 6 bits VJ" + +-#: ../lib/hw.c:154 ++#: ../lib/hw.c:167 + msgid "Adaptive Serial Line IP" + msgstr "IP ligne srie adaptative" + +-#: ../lib/hw.c:157 ++#: ../lib/hw.c:170 + msgid "Ethernet" + msgstr "Ethernet" + +-#: ../lib/hw.c:163 ++#: ../lib/hw.c:176 + msgid "Fiber Distributed Data Interface" + msgstr "Fiber Distributed Data Interface" + +-#: ../lib/hw.c:166 ++#: ../lib/hw.c:179 + msgid "HIPPI" + msgstr "HIPPI" + +-#: ../lib/hw.c:178 ++#: ../lib/hw.c:191 ++msgid "generic X.25" ++msgstr "" ++ ++#: ../lib/hw.c:194 + msgid "IPIP Tunnel" + msgstr "IPIP Tunnel" + +-#: ../lib/hw.c:181 ++#: ../lib/hw.c:197 + msgid "Point-to-Point Protocol" + msgstr "Protocole Point--Point" + +-#: ../lib/hw.c:184 ++#: ../lib/hw.c:200 + msgid "(Cisco)-HDLC" + msgstr "(Cisco)-HDLC" + +-#: ../lib/hw.c:185 ++#: ../lib/hw.c:201 + msgid "LAPB" + msgstr "LAPB" + +-#: ../lib/hw.c:188 ++#: ../lib/hw.c:204 + msgid "ARCnet" + msgstr "ARCnet" + +-#: ../lib/hw.c:191 ++#: ../lib/hw.c:207 + msgid "Frame Relay DLCI" + msgstr "Frame Relay DLCI" + +-#: ../lib/hw.c:192 ++#: ../lib/hw.c:208 + msgid "Frame Relay Access Device" + msgstr "Priphriue d'accs Frame Relay" + +-#: ../lib/hw.c:195 ++#: ../lib/hw.c:211 + msgid "IPv6-in-IPv4" + msgstr "IPv6-dans-IPv4" + +-#: ../lib/hw.c:198 ++#: ../lib/hw.c:214 + #, fuzzy + msgid "IrLAP" + msgstr "LAPB" + +-#: ../lib/hw.c:201 ++#: ../lib/hw.c:217 + msgid "16/4 Mbps Token Ring" + msgstr "" + +-#: ../lib/hw.c:203 ++#: ../lib/hw.c:219 + msgid "16/4 Mbps Token Ring (New)" + msgstr "" + ++#: ../lib/hw.c:226 ++msgid "Generic EUI-64" ++msgstr "" ++ + #: ../lib/inet.c:153 ../lib/inet6.c:79 + #, c-format + msgid "rresolve: unsupport address family %d !\n" + msgstr "rresolve: famille d'adresses non suporte %d !\n" + +-#: ../lib/inet6_gr.c:79 ++#: ../lib/inet6.c:131 ++#, fuzzy ++msgid "[UNKNOWN]" ++msgstr "INCONNU" ++ ++#: ../lib/inet6_gr.c:71 ++#, c-format + msgid "INET6 (IPv6) not configured in this system.\n" + msgstr "INET6 (IPv6) pas configur sur ce systme.\n" + +-#: ../lib/inet6_gr.c:82 ++#: ../lib/inet6_gr.c:74 ++#, c-format + msgid "Kernel IPv6 routing table\n" + msgstr "Table de routage IPv6 du noyau\n" + +-#: ../lib/inet6_gr.c:84 ++#: ../lib/inet6_gr.c:76 ++#, c-format + msgid "" +-"Destination Next Hop " +-" Flags Metric Ref Use Iface\n" ++"Destination Next " ++"Hop Flags Metric Ref Use Iface\n" + msgstr "" +-"Destination Prochain Hop " +-" Indic Metric Ref Utilis. Iface\n" ++"Destination Prochain " ++"Hop Indic Metric Ref Utilis. Iface\n" + +-#: ../lib/inet6_gr.c:158 ++#: ../lib/inet6_gr.c:150 ++#, c-format + msgid "Kernel IPv6 Neighbour Cache\n" + msgstr "Cache voisin IPv6 du noyau\n" + +-#: ../lib/inet6_gr.c:161 ++#: ../lib/inet6_gr.c:153 ++#, c-format + msgid "" + "Neighbour HW Address Iface Flags " + "Ref State\n" +@@ -2101,39 +2364,45 @@ msgstr "" + "Voisin Adresse MAT Iface Indic " + "Ref Etat\n" + +-#: ../lib/inet6_gr.c:165 ++#: ../lib/inet6_gr.c:157 ++#, c-format + msgid "" + "Neighbour HW Address Iface Flags " + "Ref State Stale(sec) Delete(sec)\n" +-msgstr "" +-"Voisin Adresse MAT Iface Indic " +-"Ref Etat Bloqu(sec) Dtuit(sec)\n" ++msgstr "Voisin Adresse MAT Iface Indic Ref Etat Bloqu(sec) Dtuit(sec)\n" + + #: ../lib/inet6_sr.c:46 ++#, c-format + msgid "Usage: inet6_route [-vF] del Target\n" + msgstr "Syntaxe: inet6_route [-vF] del Cible\n" + + #: ../lib/inet6_sr.c:47 ++#, c-format + msgid " inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n" + msgstr " inet6_route [-vF] add Cible [gw Gw] [metric M] [[dev] If]\n" + + #: ../lib/inet6_sr.c:48 ++#, c-format + msgid " inet6_route [-FC] flush NOT supported\n" + msgstr " inet6_route [-FC] flush PAS support\n" + +-#: ../lib/inet6_sr.c:182 ++#: ../lib/inet6_sr.c:188 ++#, c-format + msgid "Flushing `inet6' routing table not supported\n" + msgstr "Flush de table de routage `inet6' pas support\n" + + #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220 ++#, c-format + msgid "INET (IPv4) not configured in this system.\n" + msgstr "INET (IPv4) pas configur sur ce systme.\n" + + #: ../lib/inet_gr.c:53 ++#, c-format + msgid "Kernel IP routing table\n" + msgstr "Table de routage IP du noyau\n" + + #: ../lib/inet_gr.c:56 ++#, c-format + msgid "" + "Destination Gateway Genmask Flags Metric Ref Use " + "Iface\n" +@@ -2142,26 +2411,26 @@ msgstr "" + "Iface\n" + + #: ../lib/inet_gr.c:59 ++#, c-format + msgid "" + "Destination Gateway Genmask Flags MSS Window irtt " + "Iface\n" +-msgstr "" +-"Destination Passerelle Genmask Indic MSS Fentre irtt " +-"Iface\n" ++msgstr "Destination Passerelle Genmask Indic MSS Fentre irtt Iface\n" + + #: ../lib/inet_gr.c:62 ++#, c-format + msgid "" + "Destination Gateway Genmask Flags Metric Ref Use " + "Iface MSS Window irtt\n" +-msgstr "" +-"Destination Passerelle Genmask Indic Metric Ref Use " +-"Iface MSS Fentre irtt\n" ++msgstr "Destination Passerelle Genmask Indic Metric Ref Use Iface MSS Fentre irtt\n" + + #: ../lib/inet_gr.c:237 ++#, c-format + msgid "Kernel IP routing cache\n" + msgstr "cache de routage IP du noyau\n" + + #: ../lib/inet_gr.c:258 ++#, c-format + msgid "" + "Source Destination Gateway Flags Metric Ref Use " + "Iface\n" +@@ -2170,30 +2439,28 @@ msgstr "" + "Iface\n" + + #: ../lib/inet_gr.c:261 ++#, c-format + msgid "" + "Source Destination Gateway Flags MSS Window irtt " + "Iface\n" +-msgstr "" +-"Source Destination Passerelle Indic MSS Fentre irtt " +-"Iface\n" ++msgstr "Source Destination Passerelle Indic MSS Fentre irtt Iface\n" + + #: ../lib/inet_gr.c:266 ++#, c-format + msgid "" + "Source Destination Gateway Flags Metric Ref Use " + "Iface MSS Window irtt HH Arp\n" +-msgstr "" +-"Source Destination Passerelle Indic Metric Ref Use " +-"Iface MSS Fentre irtt HH Arp\n" ++msgstr "Source Destination Passerelle Indic Metric Ref Use Iface MSS Fentre irtt HH Arp\n" + + #: ../lib/inet_gr.c:290 ++#, c-format + msgid "" + "Source Destination Gateway Flags Metric Ref Use " + "Iface MSS Window irtt TOS HHRef HHUptod SpecDst\n" +-msgstr "" +-"Source Destination Passerelle Flags Metric Ref Use " +-"Iface MSS Fentre irtt TOS HHRef HHUptod SpecDst\n" ++msgstr "Source Destination Passerelle Flags Metric Ref Use Iface MSS Fentre irtt TOS HHRef HHUptod SpecDst\n" + +-#: ../lib/inet_sr.c:50 ++#: ../lib/inet_sr.c:51 ++#, c-format + msgid "" + "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] " + "[[dev] If]\n" +@@ -2201,29 +2468,34 @@ msgstr "" + "Syntaxe: inet_route [-vF] del {-host|-net} Cible[/prefix] [gw Gw] [metric M] " + "[[dev] If]\n" + +-#: ../lib/inet_sr.c:51 ++#: ../lib/inet_sr.c:52 ++#, c-format + msgid "" + " inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n" + msgstr "" + " inet_route [-vF] add {-host|-net} Cible[/prefix] [gw Gw] [metric M]\n" + +-#: ../lib/inet_sr.c:52 ++#: ../lib/inet_sr.c:53 ++#, c-format + msgid "" + " [netmask N] [mss Mss] [window W] [irtt I]\n" + msgstr "" + " [netmask N] [mss Mss] [window W] [irtt I]\n" + +-#: ../lib/inet_sr.c:53 ++#: ../lib/inet_sr.c:54 ++#, c-format + msgid " [mod] [dyn] [reinstate] [[dev] If]\n" + msgstr " [mod] [dyn] [reinstate] [[dev] If]\n" + +-#: ../lib/inet_sr.c:54 ++#: ../lib/inet_sr.c:55 ++#, c-format + msgid "" + " inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n" + msgstr "" + " inet_route [-vF] add {-host|-net} Cible[/prefix] [metric M] reject\n" + +-#: ../lib/inet_sr.c:55 ++#: ../lib/inet_sr.c:56 ++#, c-format + msgid " inet_route [-FC] flush NOT supported\n" + msgstr " inet_route [-FC] flush PAS support\n" + +@@ -2233,15 +2505,17 @@ msgid "route: %s: cannot use a NETWORK a + msgstr "route: %s: ne peut utiliser un RESEAU comme passerelle!\n" + + #: ../lib/inet_sr.c:174 +-#, fuzzy ++#, fuzzy, c-format + msgid "route: Invalid MSS/MTU.\n" + msgstr "route: MSS invalide.\n" + + #: ../lib/inet_sr.c:187 ++#, c-format + msgid "route: Invalid window.\n" + msgstr "route: fentre invalide.\n" + + #: ../lib/inet_sr.c:203 ++#, c-format + msgid "route: Invalid initial rtt.\n" + msgstr "route: rtt initial invalide.\n" + +@@ -2256,75 +2530,92 @@ msgid "route: bogus netmask %s\n" + msgstr "route: netmask bogu %s\n" + + #: ../lib/inet_sr.c:270 ++#, c-format + msgid "route: netmask doesn't match route address\n" + msgstr "route: netmask ne correspond pas l'adresse de route\n" + + #: ../lib/inet_sr.c:306 ++#, c-format + msgid "Flushing `inet' routing table not supported\n" + msgstr "Flush de table de routage `inet' pas support\n" + + #: ../lib/inet_sr.c:310 ++#, c-format + msgid "Modifying `inet' routing cache not supported\n" + msgstr "Modification de cache de routage `inet' pas support\n" + + #: ../lib/ipx_gr.c:52 ++#, c-format + msgid "IPX not configured in this system.\n" + msgstr "IPX pas configur sur ce systme.\n" + + #: ../lib/ipx_gr.c:56 ++#, c-format + msgid "Kernel IPX routing table\n" + msgstr "Table de routage IPX du noyau\n" + + #. xxx + #: ../lib/ipx_gr.c:57 ++#, c-format + msgid "Destination Router Net Router Node\n" + msgstr "Destination Rseau Routeur Noeud Routeur\n" + + #: ../lib/ipx_sr.c:33 ++#, c-format + msgid "IPX: this needs to be written\n" + msgstr "IPX: ceci doit tre crit\n" + +-#: ../lib/masq_info.c:197 ++#: ../lib/masq_info.c:198 ++#, c-format + msgid "IP masquerading entries\n" + msgstr "Entres IP Masquerade\n" + +-#: ../lib/masq_info.c:200 ++#: ../lib/masq_info.c:201 ++#, c-format + msgid "prot expire source destination ports\n" + msgstr "prot expire source destination ports\n" + +-#: ../lib/masq_info.c:203 ++#: ../lib/masq_info.c:204 ++#, c-format + msgid "" +-"prot expire initseq delta prevd source destination " +-" ports\n" ++"prot expire initseq delta prevd source " ++"destination ports\n" + msgstr "" +-"prot expire initseq delta precd source destination " +-" ports\n" ++"prot expire initseq delta precd source " ++"destination ports\n" + + #: ../lib/netrom_gr.c:48 ++#, c-format + msgid "NET/ROM not configured in this system.\n" + msgstr "NET/ROM pas configur sur ce systme.\n" + + #: ../lib/netrom_gr.c:51 ++#, c-format + msgid "Kernel NET/ROM routing table\n" + msgstr "Table de routage NET/ROM du noyau\n" + + #: ../lib/netrom_gr.c:52 ++#, c-format + msgid "Destination Mnemonic Quality Neighbour Iface\n" + msgstr "Destination Mnemoniq Qualit Voisin Iface\n" + + #: ../lib/netrom_sr.c:34 ++#, c-format + msgid "netrom usage\n" + msgstr "utilisation netrom\n" + + #: ../lib/netrom_sr.c:44 ++#, c-format + msgid "NET/ROM: this needs to be written\n" + msgstr "NET/ROM: ceci doit tre crit\n" + + #: ../lib/ppp.c:44 ++#, c-format + msgid "You cannot start PPP with this program.\n" + msgstr "Vous ne pouvez dmarrer PPP avec ce programme.\n" + + #: ../lib/ppp_ac.c:38 ++#, c-format + msgid "Sorry, use pppd!\n" + msgstr "Dsol, utilisez pppd !\n" + +@@ -2333,49 +2624,314 @@ msgid "Node address must be ten digits" + msgstr "L'adresse de noeud doit avoir 10 chiffres" + + #: ../lib/rose_gr.c:51 ++#, c-format + msgid "ROSE not configured in this system.\n" + msgstr "ROSE pas configur sur ce systme.\n" + + #: ../lib/rose_gr.c:54 ++#, c-format + msgid "Kernel ROSE routing table\n" + msgstr "Table de routage ROSE du noyau\n" + +-#: ../lib/tr.c:70 ../lib/tr.c:85 ++#: ../lib/tr.c:86 ../lib/tr.c:101 + #, c-format + msgid "in_tr(%s): invalid token ring address!\n" + msgstr "in_tr(%s): adresse token-ring invalide !\n" + +-#: ../lib/tr.c:97 ++#: ../lib/tr.c:113 + #, c-format + msgid "in_tr(%s): trailing : ignored!\n" + msgstr "in_tr(%s): restant : ignor !\n" + +-#: ../lib/tr.c:109 ++#: ../lib/tr.c:125 + #, c-format + msgid "in_tr(%s): trailing junk!\n" + msgstr "in_tr(%s): restant la poubelle !\n" + +-#: ../lib/interface.c:124 ++#: ../lib/interface.c:176 + #, c-format + msgid "warning: no inet socket available: %s\n" + msgstr "attention: pas de socket inet disponible: %s\n" + +-#: ../lib/interface.c:270 ++#: ../lib/interface.c:325 + #, c-format + msgid "Warning: cannot open %s (%s). Limited output.\n" + msgstr "" + + #. Give better error message for this case. +-#: ../lib/interface.c:504 ++#: ../lib/interface.c:571 + msgid "Device not found" + msgstr "Priphrique non trouv" + +-#: ../lib/interface.c:508 ++#: ../lib/interface.c:575 + #, c-format + msgid "%s: error fetching interface information: %s\n" + msgstr "%s: erreur lors de la recherche d'infos sur l'interface: %s\n" + +-#: ../lib/sockets.c:59 ++#: ../lib/interface.c:608 ++msgid " - no statistics available -" ++msgstr "" ++ ++#: ../lib/interface.c:612 ++#, c-format ++msgid "[NO FLAGS]" ++msgstr "[PAS INDICATEURS]" ++ ++#: ../lib/interface.c:688 ++#, c-format ++msgid "%-9.9s Link encap:%s " ++msgstr "%-9.9s Lien encap:%s " ++ ++#: ../lib/interface.c:693 ++#, c-format ++msgid "HWaddr %s " ++msgstr "HWaddr %s " ++ ++#: ../lib/interface.c:696 ++#, c-format ++msgid "Media:%s" ++msgstr "Media:%s" ++ ++#: ../lib/interface.c:698 ++#, c-format ++msgid "(auto)" ++msgstr "(auto)" ++ ++#: ../lib/interface.c:705 ++#, c-format ++msgid " %s addr:%s " ++msgstr " %s adr:%s " ++ ++#: ../lib/interface.c:708 ++#, c-format ++msgid " P-t-P:%s " ++msgstr " P-t-P:%s " ++ ++#: ../lib/interface.c:711 ++#, c-format ++msgid " Bcast:%s " ++msgstr " Bcast:%s " ++ ++#: ../lib/interface.c:713 ++#, c-format ++msgid " Mask:%s\n" ++msgstr " Masque:%s\n" ++ ++#: ../lib/interface.c:730 ++#, c-format ++msgid " inet6 addr: %s/%d" ++msgstr " adr inet6: %s/%d" ++ ++#: ../lib/interface.c:732 ++#, c-format ++msgid " Scope:" ++msgstr " Scope:" ++ ++#: ../lib/interface.c:735 ++#, c-format ++msgid "Global" ++msgstr "Global" ++ ++#: ../lib/interface.c:738 ++#, c-format ++msgid "Link" ++msgstr "Lien" ++ ++#: ../lib/interface.c:741 ++#, c-format ++msgid "Site" ++msgstr "Site" ++ ++#: ../lib/interface.c:744 ++#, c-format ++msgid "Compat" ++msgstr "Compat" ++ ++#: ../lib/interface.c:747 ++#, c-format ++msgid "Host" ++msgstr "Hte" ++ ++#: ../lib/interface.c:750 ++#, c-format ++msgid "Unknown" ++msgstr "Inconnu" ++ ++#: ../lib/interface.c:765 ++#, c-format ++msgid " IPX/Ethernet II addr:%s\n" ++msgstr " adr IPX/Ethernet II:%s\n" ++ ++#: ../lib/interface.c:768 ++#, c-format ++msgid " IPX/Ethernet SNAP addr:%s\n" ++msgstr " adr IPX/Ethernet SNAP:%s\n" ++ ++#: ../lib/interface.c:771 ++#, c-format ++msgid " IPX/Ethernet 802.2 addr:%s\n" ++msgstr " adr IPX/Ethernet 802.2:%s\n" ++ ++#: ../lib/interface.c:774 ++#, c-format ++msgid " IPX/Ethernet 802.3 addr:%s\n" ++msgstr " adr IPX/Ethernet 802.3:%s\n" ++ ++#: ../lib/interface.c:784 ++#, c-format ++msgid " EtherTalk Phase 2 addr:%s\n" ++msgstr " adr EtherTalk Phase 2:%s\n" ++ ++#: ../lib/interface.c:793 ++#, c-format ++msgid " econet addr:%s\n" ++msgstr " adr econet:%s\n" ++ ++#: ../lib/interface.c:800 ++#, c-format ++msgid "[NO FLAGS] " ++msgstr "[PAS INDICATEURS] " ++ ++#: ../lib/interface.c:802 ++#, c-format ++msgid "UP " ++msgstr "UP " ++ ++#: ../lib/interface.c:804 ++#, c-format ++msgid "BROADCAST " ++msgstr "BROADCAST " ++ ++#: ../lib/interface.c:806 ++#, c-format ++msgid "DEBUG " ++msgstr "DEBUG " ++ ++#: ../lib/interface.c:808 ++#, c-format ++msgid "LOOPBACK " ++msgstr "LOOPBACK " ++ ++#: ../lib/interface.c:810 ++#, c-format ++msgid "POINTOPOINT " ++msgstr "POINTOPOINT " ++ ++#: ../lib/interface.c:812 ++#, c-format ++msgid "NOTRAILERS " ++msgstr "NOTRAILERS " ++ ++#: ../lib/interface.c:814 ++#, c-format ++msgid "RUNNING " ++msgstr "RUNNING " ++ ++#: ../lib/interface.c:816 ++#, c-format ++msgid "NOARP " ++msgstr "NOARP " ++ ++#: ../lib/interface.c:818 ++#, c-format ++msgid "PROMISC " ++msgstr "PROMISC " ++ ++#: ../lib/interface.c:820 ++#, c-format ++msgid "ALLMULTI " ++msgstr "ALLMULTI " ++ ++#: ../lib/interface.c:822 ++#, c-format ++msgid "SLAVE " ++msgstr "SLAVE " ++ ++#: ../lib/interface.c:824 ++#, c-format ++msgid "MASTER " ++msgstr "MASTER " ++ ++#: ../lib/interface.c:826 ++#, c-format ++msgid "MULTICAST " ++msgstr "MULTICAST " ++ ++#: ../lib/interface.c:829 ++#, c-format ++msgid "DYNAMIC " ++msgstr "DYNAMIC " ++ ++#. DONT FORGET TO ADD THE FLAGS IN ife_print_short ++#: ../lib/interface.c:832 ++#, c-format ++msgid " MTU:%d Metric:%d" ++msgstr " MTU:%d Metric:%d" ++ ++#: ../lib/interface.c:836 ++#, c-format ++msgid " Outfill:%d Keepalive:%d" ++msgstr " Outfill:%d Keepalive:%d" ++ ++#: ../lib/interface.c:850 ++#, fuzzy, c-format ++msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" ++msgstr "Paquets Reus:%lu erreurs:%lu jets:%lu dbordements:%lu trames:%lu\n" ++ ++#: ../lib/interface.c:855 ++#, c-format ++msgid " compressed:%lu\n" ++msgstr " compresss:%lu\n" ++ ++#: ../lib/interface.c:895 ++#, fuzzy, c-format ++msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" ++msgstr "Paquets transmis:%lu erreurs:%lu jets:%lu dbordements:%lu carrier:%lu\n" ++ ++#: ../lib/interface.c:899 ++#, c-format ++msgid " collisions:%lu " ++msgstr " collisions:%lu " ++ ++#: ../lib/interface.c:901 ++#, c-format ++msgid "compressed:%lu " ++msgstr "compresss:%lu " ++ ++#: ../lib/interface.c:903 ++#, c-format ++msgid "txqueuelen:%d " ++msgstr "lg file transmission:%d " ++ ++#: ../lib/interface.c:905 ++#, c-format ++msgid "RX bytes:%llu (%lu.%lu %s) TX bytes:%llu (%lu.%lu %s)\n" ++msgstr "" ++ ++#: ../lib/interface.c:916 ++#, c-format ++msgid "Interrupt:%d " ++msgstr "Interruption:%d " ++ ++#. Only print devices using it for ++#. I/O maps ++#: ../lib/interface.c:919 ++#, c-format ++msgid "Base address:0x%x " ++msgstr "Adresse de base:0x%x " ++ ++#: ../lib/interface.c:921 ++#, c-format ++msgid "Memory:%lx-%lx " ++msgstr "Mmoire:%lx-%lx " ++ ++#: ../lib/interface.c:924 ++#, c-format ++msgid "DMA chan:%x " ++msgstr "Canal DMA:%x " ++ ++#: ../lib/sockets.c:63 ++#, c-format + msgid "No usable address families found.\n" + msgstr "Pas de famille d'adresses utilisable trouve.\n" + +@@ -2399,29 +2955,32 @@ msgstr "ip: %s est une adresse IPv4 inva + msgid "ip: argument is wrong: %s\n" + msgstr "ip: argument incorrect: %s\n" + +-#: ../ipmaddr.c:56 ++#: ../ipmaddr.c:61 ++#, c-format + msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n" + msgstr "Syntaxe: ipmaddr [ add | del ] MULTIADR dev CHAINE\n" + +-#: ../ipmaddr.c:57 ++#: ../ipmaddr.c:62 ++#, c-format + msgid " ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n" + msgstr " ipmaddr show [ dev CHAINE ] [ ipv4 | ipv6 | link | all ]\n" + +-#: ../ipmaddr.c:58 ++#: ../ipmaddr.c:63 ++#, c-format + msgid " ipmaddr -V | -version\n" + msgstr "" + +-#: ../ipmaddr.c:258 ++#: ../ipmaddr.c:263 + #, c-format + msgid "family %d " + msgstr "" + +-#: ../ipmaddr.c:267 ++#: ../ipmaddr.c:272 + #, c-format + msgid " users %d" + msgstr "" + +-#: ../ipmaddr.c:353 ++#: ../ipmaddr.c:358 + msgid "Cannot create socket" + msgstr "Ne peut crer une socket" + +@@ -2436,6 +2995,7 @@ msgid "slattach: tty_lock: (%s): %s\n" + msgstr "" + + #: ../slattach.c:192 ++#, fuzzy, c-format + msgid "slattach: cannot write PID file\n" + msgstr "slattach: tty_lock: (%s): %s\n" + +@@ -2454,59 +3014,88 @@ msgstr "slattach: tty_hangup(DROP): %s\n + msgid "slattach: tty_hangup(RAISE): %s\n" + msgstr "slattach: tty_hangup(RAISE): %s\n" + +-#: ../slattach.c:486 ++#: ../slattach.c:468 ++#, fuzzy, c-format ++msgid "slattach: tty name too long\n" ++msgstr "%s: nom trop long\n" ++ ++#: ../slattach.c:498 ++#, c-format + msgid "slattach: tty_open: cannot get current state!\n" + msgstr "slattach: tty_open: ne peut obtenir l'tat courant !\n" + +-#: ../slattach.c:493 ++#: ../slattach.c:505 ++#, c-format + msgid "slattach: tty_open: cannot get current line disc!\n" + msgstr "" + "slattach: tty_open: ne peut obtenir la discipline de ligne actuelle !\n" + +-#: ../slattach.c:501 ++#: ../slattach.c:513 ++#, c-format + msgid "slattach: tty_open: cannot set RAW mode!\n" + msgstr "slattach: tty_open: ne peut activer le mode RAW !\n" + +-#: ../slattach.c:508 ++#: ../slattach.c:520 + #, c-format + msgid "slattach: tty_open: cannot set %s bps!\n" + msgstr "slattach: tty_open: ne peut passer %s bps!\n" + +-#: ../slattach.c:518 ++#: ../slattach.c:530 ++#, c-format + msgid "slattach: tty_open: cannot set 8N1 mode!\n" + msgstr "slattach: tty_open: ne peut activer le mode 8N1 !\n" + +-#: ../slattach.c:686 ++#: ../slattach.c:672 ++#, c-format ++msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n" ++msgstr "" ++ ++#: ../slattach.c:704 + #, c-format + msgid "%s started" + msgstr "" + +-#: ../slattach.c:687 ++#: ../slattach.c:705 + #, c-format + msgid " on %s" + msgstr "" + +-#: ../slattach.c:688 ++#: ../slattach.c:706 + #, fuzzy, c-format + msgid " interface %s\n" + msgstr "%s: interface inconnue: %s\n" + + #~ msgid "" +-#~ " This comand can get or set the hostname or the NIS domainname. You can\n" +-#~ msgstr "" +-#~ " Cette commande ne peut obtenir ou dfinir le nom d'hte ou le domaine " +-#~ "NIS. Vous pouvez\n" ++#~ " arp [-v] [] [-i ] -s [netmask ] pub " ++#~ "<-''-\n" ++#~ msgstr " arp [-v] [] [-i ] -s [netmask ] pub <-''-\n" ++ ++#~ msgid "%s: unknown interface: %s\n" ++#~ msgstr "%s: interface inconnue: %s\n" ++ ++#~ msgid "address mask replies" ++#~ msgstr "rponses de masque d'adresses" ++ ++#~ msgid "unknown title %s\n" ++#~ msgstr "titre inconnu %s\n" ++ ++#~ msgid "Routing table for `ddp' not yet supported.\n" ++#~ msgstr "Table de routage pour `ddp' pas encore support.\n" ++ ++#~ msgid "" ++#~ " This comand can get or set the hostname or the NIS domainname. You " ++#~ "can\n" ++#~ msgstr " Cette commande ne peut obtenir ou dfinir le nom d'hte ou le domaine NIS. Vous pouvez\n" + + #~ msgid "" + #~ " also get the DNS domain or the FQDN (fully qualified domain name).\n" + #~ msgstr "" +-#~ " aussi obtenir le domaine DNS ou le FQDN (fully qualified domain name).\n" ++#~ " aussi obtenir le domaine DNS ou le FQDN (fully qualified domain " ++#~ "name).\n" + + #~ msgid "" + #~ " Unless you are using bind or NIS for host lookups you can change the\n" +-#~ msgstr "" +-#~ " Sauf si vous utilisez bind ou NIS pour les recherches d'htes, vous " +-#~ "pouvez changer le\n" ++#~ msgstr " Sauf si vous utilisez bind ou NIS pour les recherches d'htes, vous pouvez changer le\n" + + #~ msgid "" + #~ " FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n" --- net-tools-1.60.orig/debian/patches/CVS-20071202-rarp.c_sync.patch +++ net-tools-1.60/debian/patches/CVS-20071202-rarp.c_sync.patch @@ -0,0 +1,41 @@ +Sync with upstream CVS, complete log: + +Revision 1.9 - Sun Dec 2 02:19:52 2007 UTC by ecki +more backoff + +Revision 1.8 - Sat Dec 1 19:36:55 2007 UTC by ecki +backoff proc_fopen usage from etherfile. + +Revision 1.7 - Sat Dec 1 18:51:09 2007 UTC by ecki +Page aligned fopen buffer + +Index: net-tools/rarp.c +=================================================================== +--- net-tools.orig/rarp.c ++++ net-tools/rarp.c +@@ -3,7 +3,7 @@ + * that maintains the kernel's RARP cache. It is derived + * from Fred N. van Kempen's arp command. + * +- * Version: $Id: rarp.c,v 1.6 2001/04/08 17:05:05 pb Exp $ ++ * Version: $Id: rarp.c,v 1.9 2007/12/02 02:19:52 ecki Exp $ + * + * Usage: rarp -d hostname Delete entry + * rarp -s hostname ethernet_address Add entry +@@ -40,6 +40,7 @@ + #include "net-support.h" + #include "version.h" + #include "pathnames.h" ++#include "proc.h" + + static char no_rarp_message[] = N_("This kernel does not support RARP.\n"); + +@@ -154,7 +155,7 @@ static int rarp_file(int fd, const char + + static int display_cache(void) + { +- FILE *fd = fopen(_PATH_PROCNET_RARP, "r"); ++ FILE *fd = proc_fopen(_PATH_PROCNET_RARP); + char buffer[256]; + if (fd == NULL) { + if (errno == ENOENT) --- net-tools-1.60.orig/debian/patches/CVS-20060927-mii-tool.c_sync.patch +++ net-tools-1.60/debian/patches/CVS-20060927-mii-tool.c_sync.patch @@ -0,0 +1,341 @@ +Sync with upstream CVS, complete log: + +Revision 1.9 - Wed Sep 27 20:59:18 2006 UTC by ecki + +GigE Support by Stephen Hemminger from +http://developer.osdl.org/shemminger/prototypes/mii-tool.tar.bz2 +with verbose register patch from Dean Gaudet + +Revision 1.8 - Thu Jun 3 22:18:26 2004 UTC by ecki + +added linebreak to version signature + +Revision 1.7 - Mon Oct 20 22:22:22 2003 UTC by ecki +make sure version string is helpful + +Revision 1.6 - Mon Oct 20 22:01:13 2003 UTC by ecki +patch to recognize more hardware without MII support (from Redhat Bug#77882, +notified by Tilmann Bubeck). + +Revision 1.5 - Sat Jun 28 03:19:04 2003 UTC by ecki +Use new style MII ioctls only. This will give you a warning, if compiled +with old kernel source tree. It will also not work if compiled with +new source on old kernels. The new ioctls also require root for reading, the +old didnt. This fixes Debian bug #133648. No fallback compatibility +is included for reasons of cleaner source. + +Revision 1.4 - Wed May 28 19:41:16 2003 UTC by ecki +make it compile on stricter gcc3.3 + +Revision 1.3 - Sun Sep 15 00:25:14 2002 UTC by ecki +Implemented the Sean Reifenschneider suggested fflush() to the --watch +function of mii-tool. + +Revision 1.2 - Fri Jun 14 01:08:20 2002 UTC by ecki +this fixes segfault on -A "" and -F "" in mii-tool reported in debian +bug #139027 + +Index: net-tools/mii-tool.c +=================================================================== +--- net-tools.orig/mii-tool.c ++++ net-tools/mii-tool.c +@@ -29,8 +29,7 @@ + http://www.national.com/pf/DP/DP83840.html + */ + +-static char version[] = +-"mii-tool.c 1.9 2000/04/28 00:56:08 (David Hinds)\n"; ++static char Version[] = "$Id: mii-tool.c,v 1.9 2006/09/27 20:59:18 ecki Exp $\n(Author: David Hinds based on Donald Becker's mii-diag)"; + + #include + #include +@@ -46,16 +45,19 @@ static char version[] = + #include + #include + #include ++#include ++ + #ifndef __GLIBC__ + #include + #include + #endif + #include "mii.h" ++#include "version.h" + + #define MAX_ETH 8 /* Maximum # of interfaces */ + + /* Table of known MII's */ +-static struct { ++static const struct { + u_short id1, id2; + char *name; + } mii_id[] = { +@@ -74,6 +76,9 @@ static struct { + { 0x0181, 0x4410, "Quality QS6612" }, + { 0x0282, 0x1c50, "SMSC 83C180" }, + { 0x0300, 0xe540, "TDK 78Q2120" }, ++ { 0x0141, 0x0c20, "Yukon 88E1011" }, ++ { 0x0141, 0x0cc0, "Yukon-EC 88E1111" }, ++ { 0x0141, 0x0c90, "Yukon-2 88E1112" }, + }; + #define NMII (sizeof(mii_id)/sizeof(mii_id[0])) + +@@ -137,40 +142,48 @@ static void mdio_write(int skfd, int loc + + const struct { + char *name; +- u_short value; ++ u_short value[2]; + } media[] = { + /* The order through 100baseT4 matches bits in the BMSR */ +- { "10baseT-HD", MII_AN_10BASET_HD }, +- { "10baseT-FD", MII_AN_10BASET_FD }, +- { "100baseTx-HD", MII_AN_100BASETX_HD }, +- { "100baseTx-FD", MII_AN_100BASETX_FD }, +- { "100baseT4", MII_AN_100BASET4 }, +- { "100baseTx", MII_AN_100BASETX_FD | MII_AN_100BASETX_HD }, +- { "10baseT", MII_AN_10BASET_FD | MII_AN_10BASET_HD }, ++ { "10baseT-HD", {MII_AN_10BASET_HD} }, ++ { "10baseT-FD", {MII_AN_10BASET_FD} }, ++ { "100baseTx-HD", {MII_AN_100BASETX_HD} }, ++ { "100baseTx-FD", {MII_AN_100BASETX_FD} }, ++ { "100baseT4", {MII_AN_100BASET4} }, ++ { "100baseTx", {MII_AN_100BASETX_FD | MII_AN_100BASETX_HD} }, ++ { "10baseT", {MII_AN_10BASET_FD | MII_AN_10BASET_HD} }, ++ ++ { "1000baseT-HD", {0, MII_BMCR2_1000HALF} }, ++ { "1000baseT-FD", {0, MII_BMCR2_1000FULL} }, ++ { "1000baseT", {0, MII_BMCR2_1000HALF|MII_BMCR2_1000FULL} }, + }; + #define NMEDIA (sizeof(media)/sizeof(media[0])) + + /* Parse an argument list of media types */ +-static int parse_media(char *arg) ++static int parse_media(char *arg, unsigned *bmcr2) + { + int mask, i; + char *s; + mask = strtoul(arg, &s, 16); + if ((*arg != '\0') && (*s == '\0')) { + if ((mask & MII_AN_ABILITY_MASK) && +- !(mask & ~MII_AN_ABILITY_MASK)) +- return mask; ++ !(mask & ~MII_AN_ABILITY_MASK)) { ++ *bmcr2 = 0; ++ return mask; ++ } + goto failed; +- } else { +- mask = 0; +- s = strtok(arg, ", "); +- do { ++ } ++ mask = 0; ++ *bmcr2 = 0; ++ s = strtok(arg, ", "); ++ do { + for (i = 0; i < NMEDIA; i++) +- if (strcasecmp(media[i].name, s) == 0) break; ++ if (s && strcasecmp(media[i].name, s) == 0) break; + if (i == NMEDIA) goto failed; +- mask |= media[i].value; +- } while ((s = strtok(NULL, ", ")) != NULL); +- } ++ mask |= media[i].value[0]; ++ *bmcr2 |= media[i].value[1]; ++ } while ((s = strtok(NULL, ", ")) != NULL); ++ + return mask; + failed: + fprintf(stderr, "Invalid media specification '%s'.\n", arg); +@@ -179,11 +192,24 @@ failed: + + /*--------------------------------------------------------------------*/ + +-static char *media_list(int mask, int best) ++static const char *media_list(unsigned mask, unsigned mask2, int best) + { + static char buf[100]; + int i; + *buf = '\0'; ++ ++ if (mask & MII_BMCR_SPEED1000) { ++ if (mask2 & MII_BMCR2_1000HALF) { ++ strcat(buf, " "); ++ strcat(buf, "1000baseT-HD"); ++ if (best) goto out; ++ } ++ if (mask2 & MII_BMCR2_1000FULL) { ++ strcat(buf, " "); ++ strcat(buf, "1000baseT-FD"); ++ if (best) goto out; ++ } ++ } + mask >>= 5; + for (i = 4; i >= 0; i--) { + if (mask & (1< 1) ? 32 : 8); i++) ++ for (i = 0; i < ((verbose > 1) ? 32 : MII_BASIC_MAX); i++) + mii_val[i] = mdio_read(sock, i); + +- if (mii_val[MII_BMCR] == 0xffff) { ++ if (mii_val[MII_BMCR] == 0xffff || mii_val[MII_BMSR] == 0x0000) { + fprintf(stderr, " No MII transceiver present!.\n"); + return -1; + } +@@ -217,6 +244,7 @@ int show_basic_mii(int sock, int phy_id) + /* Descriptive rename. */ + bmcr = mii_val[MII_BMCR]; bmsr = mii_val[MII_BMSR]; + advert = mii_val[MII_ANAR]; lkpar = mii_val[MII_ANLPAR]; ++ bmcr2 = mii_val[MII_CTRL1000]; lpa2 = mii_val[MII_STAT1000]; + + sprintf(buf, "%s: ", ifr.ifr_name); + if (bmcr & MII_BMCR_AN_ENA) { +@@ -224,7 +252,7 @@ int show_basic_mii(int sock, int phy_id) + if (advert & lkpar) { + strcat(buf, (lkpar & MII_AN_ACK) ? + "negotiated" : "no autonegotiation,"); +- strcat(buf, media_list(advert & lkpar, 1)); ++ strcat(buf, media_list(advert & lkpar, bmcr2 & lpa2>>2, 1)); + strcat(buf, ", "); + } else { + strcat(buf, "autonegotiation failed, "); +@@ -234,8 +262,10 @@ int show_basic_mii(int sock, int phy_id) + } + } else { + sprintf(buf+strlen(buf), "%s Mbit, %s duplex, ", +- (bmcr & MII_BMCR_100MBIT) ? "100" : "10", +- (bmcr & MII_BMCR_DUPLEX) ? "full" : "half"); ++ ((bmcr2 & (MII_BMCR2_1000HALF | MII_BMCR2_1000FULL)) & lpa2 >> 2) ++ ? "1000" ++ : (bmcr & MII_BMCR_100MBIT) ? "100" : "10", ++ (bmcr & MII_BMCR_DUPLEX) ? "full" : "half"); + } + strcat(buf, (bmsr & MII_BMSR_LINK_VALID) ? "link ok" : "no link"); + +@@ -296,12 +326,13 @@ int show_basic_mii(int sock, int phy_id) + if (bmsr & MII_BMSR_REMOTE_FAULT) + printf("remote fault, "); + printf((bmsr & MII_BMSR_LINK_VALID) ? "link ok" : "no link"); +- printf("\n capabilities:%s", media_list(bmsr >> 6, 0)); +- printf("\n advertising: %s", media_list(advert, 0)); ++ printf("\n capabilities:%s", media_list(bmsr >> 6, bmcr2, 0)); ++ printf("\n advertising: %s", media_list(advert, lpa2 >> 2, 0)); + if (lkpar & MII_AN_ABILITY_MASK) +- printf("\n link partner:%s", media_list(lkpar, 0)); ++ printf("\n link partner:%s", media_list(lkpar, bmcr2, 0)); + printf("\n"); + } ++ fflush(stdout); + return 0; + } + +@@ -329,7 +360,7 @@ static int do_one_xcvr(int skfd, char *i + printf("resetting the transceiver...\n"); + mdio_write(skfd, MII_BMCR, MII_BMCR_RESET); + } +- if (nway_advertise) { ++ if (nway_advertise > 0) { + mdio_write(skfd, MII_ANAR, nway_advertise | 1); + opt_restart = 1; + } +@@ -379,27 +410,38 @@ static void watch_one_xcvr(int skfd, cha + /*--------------------------------------------------------------------*/ + + const char *usage = +-"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...] +- -V, --version display version information +- -v, --verbose more verbose output +- -R, --reset reset MII to poweron state +- -r, --restart restart autonegotiation +- -w, --watch monitor for link status changes +- -l, --log with -w, write events to syslog +- -A, --advertise=media,... advertise only specified media +- -F, --force=media force specified media technology +-media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD, +- (to advertise both HD and FD) 100baseTx, 10baseT\n"; ++"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]\n" ++" -V, --version display version information\n" ++" -v, --verbose more verbose output\n" ++" -R, --reset reset MII to poweron state\n" ++" -r, --restart restart autonegotiation\n" ++" -w, --watch monitor for link status changes\n" ++" -l, --log with -w, write events to syslog\n" ++" -A, --advertise=media,... advertise only specified media\n" ++" -F, --force=media force specified media technology\n" ++"media: 1000baseTx-HD, 1000baseTx-FD,\n" ++" 100baseT4, 100baseTx-FD, 100baseTx-HD,\n" ++" 10baseT-FD, 10baseT-HD,\n" ++" (to advertise both HD and FD) 1000baseTx, 100baseTx, 10baseT\n"; ++ ++ ++static void version(void) ++{ ++ fprintf(stderr, "%s\n%s\n", Version, RELEASE); ++ exit(5); /* E_VERSION */ ++} ++ + + int main(int argc, char **argv) + { + int i, c, ret, errflag = 0; + char s[6]; ++ unsigned ctrl1000 = 0; + + while ((c = getopt_long(argc, argv, "A:F:p:lrRvVw?", longopts, 0)) != EOF) + switch (c) { +- case 'A': nway_advertise = parse_media(optarg); break; +- case 'F': fixed_speed = parse_media(optarg); break; ++ case 'A': nway_advertise = parse_media(optarg, &ctrl1000); break; ++ case 'F': fixed_speed = parse_media(optarg, &ctrl1000); break; + case 'p': override_phy = atoi(optarg); break; + case 'r': opt_restart++; break; + case 'R': opt_reset++; break; +@@ -411,6 +453,10 @@ int main(int argc, char **argv) + } + /* Check for a few inappropriate option combinations */ + if (opt_watch) verbose = 0; ++ ++ if ((nway_advertise < 0) || (fixed_speed < 0)) ++ return 2; ++ + if (errflag || (fixed_speed & (fixed_speed-1)) || + (fixed_speed && (opt_restart || nway_advertise))) { + fprintf(stderr, usage, argv[0]); +@@ -418,7 +464,7 @@ int main(int argc, char **argv) + } + + if (opt_version) +- printf(version); ++ version(); + + /* Open a basic socket. */ + if ((skfd = socket(AF_INET, SOCK_DGRAM,0)) < 0) { +@@ -426,6 +472,9 @@ int main(int argc, char **argv) + exit(-1); + } + ++ if (verbose > 1) ++ printf("Using SIOCGMIIPHY=0x%x\n", SIOCGMIIPHY); ++ + /* No remaining args means show all interfaces. */ + if (optind == argc) { + ret = 1; --- net-tools-1.60.orig/debian/patches/CVS-20081003-statistics.c_sync.patch +++ net-tools-1.60/debian/patches/CVS-20081003-statistics.c_sync.patch @@ -0,0 +1,385 @@ +Sync with upstream CVS, complete log: + +Revision 1.21 - Fri Oct 3 00:05:20 2008 UTC by ecki +Enable netstat -s for IPv6 (Debian Bug #453859 from Varun Chandramohan) + +Revision 1.20 - Sat Dec 1 18:44:56 2007 UTC by ecki +Faster pagesize aligned fopen for netstat -s (Eric Dumazet) + +Revision 1.19 - Sat Dec 1 18:29:05 2007 UTC by ecki +Better netstat -s error handling and larger buffers + +Revision 1.18 - Wed Feb 12 03:30:57 2003 UTC by ak +Add text for two new TCP statistics and fix some existing descriptions + +Revision 1.17 - Sun Apr 28 15:41:01 2002 UTC by ak +Fix some counter descriptions. Noted by Jamal Hadi. + +Revision 1.16 - Wed Oct 24 11:57:05 2001 UTC by ak +(Finally) update netstat -s for 2.4 statistics. + +Revision 1.15 - Fri Oct 19 09:28:01 2001 UTC by ak +Only print unknown statistics when their counter is > 0. + +Index: net-tools/statistics.c +=================================================================== +--- net-tools.orig/statistics.c ++++ net-tools/statistics.c +@@ -1,6 +1,6 @@ + /* + * Copyright 1997,1999,2000 Andi Kleen. Subject to the GPL. +- * $Id: statistics.c,v 1.14 2001/02/02 18:01:23 pb Exp $ ++ * $Id: statistics.c,v 1.21 2008/10/03 00:05:20 ecki Exp $ + * 19980630 - i18n - Arnaldo Carvalho de Melo + * 19981113 - i18n fixes - Arnaldo Carvalho de Melo + * 19990101 - added net/netstat, -t, -u, -w supprt - Bernd Eckenfels +@@ -11,6 +11,7 @@ + #include + #include "config.h" + #include "intl.h" ++#include "proc.h" + + /* #define WARN 1 */ + +@@ -83,6 +84,32 @@ struct entry Iptab[] = + {"FragCreates", N_("%u fragments created"), opt_number} + }; + ++struct entry Ip6tab[] = ++{ ++ {"Ip6InReceives", N_("%u total packets received"), number}, ++ {"Ip6InHdrErrors", N_("%u with invalid headers"), opt_number}, ++ {"Ip6InTooBigErrors", N_("%u with packets too big"), opt_number}, ++ {"Ip6InNoRoutes", N_("%u incoming packets with no route"), opt_number}, ++ {"Ip6InAddrErrors", N_("%u with invalid addresses"), opt_number}, ++ {"Ip6InUnknownProtos", N_("%u with unknown protocol"), opt_number}, ++ {"Ip6InTruncatedPkts", N_("%u with truncated packets"), opt_number}, ++ {"Ip6InDiscards", N_("%u incoming packets discarded"), number}, ++ {"Ip6InDelivers", N_("%u incoming packets delivered"), number}, ++ {"Ip6OutForwDatagrams", N_("%u forwarded"), number}, ++ {"Ip6OutRequests", N_("%u requests sent out"), number}, /*? */ ++ {"Ip6OutDiscards", N_("%u outgoing packets dropped"), opt_number}, ++ {"Ip6OutNoRoutes", N_("%u dropped because of missing route"), opt_number}, ++ {"Ip6ReasmTimeout", N_("%u fragments dropped after timeout"), opt_number}, ++ {"Ip6ReasmReqds", N_("%u reassemblies required"), opt_number}, /* ? */ ++ {"Ip6ReasmOKs", N_("%u packets reassembled ok"), opt_number}, ++ {"Ip6ReasmFails", N_("%u packet reassembles failed"), opt_number}, ++ {"Ip6FragOKs", N_("%u fragments received ok"), opt_number}, ++ {"Ip6FragFails", N_("%u fragments failed"), opt_number}, ++ {"Ip6FragCreates", N_("%u fragments created"), opt_number}, ++ {"Ip6InMcastPkts", N_("%u incoming multicast packets"), opt_number}, ++ {"Ip6OutMcastPkts", N_("%u outgoing multicast packets"), opt_number} ++}; ++ + struct entry Icmptab[] = + { + {"InMsgs", N_("%u ICMP messages received"), number}, +@@ -113,6 +140,41 @@ struct entry Icmptab[] = + {"OutAddrMaskReps", N_("address mask replies: %u"), i_outp_icmp | I_TITLE}, + }; + ++struct entry Icmp6tab[] = ++{ ++ {"Icmp6InMsgs", N_("%u ICMP messages received"), number}, ++ {"Icmp6InErrors", N_("%u input ICMP message failed."), number}, ++ {"Icmp6InDestUnreachs", N_("destination unreachable: %u"), i_inp_icmp | I_TITLE}, ++ {"Icmp6InPktTooBigs", N_("packets too big: %u"), i_inp_icmp | I_TITLE}, ++ {"Icmp6InTimeExcds", N_("received ICMPv6 time exceeded: %u"), i_inp_icmp | I_TITLE}, ++ {"Icmp6InParmProblems", N_("parameter problem: %u"), i_inp_icmp | I_TITLE}, ++ {"Icmp6InEchos", N_("echo requests: %u"), i_inp_icmp | I_TITLE}, ++ {"Icmp6InEchoReplies", N_("echo replies: %u"), i_inp_icmp | I_TITLE}, ++ {"Icmp6InGroupMembQueries", N_("group member queries: %u"), i_inp_icmp | I_TITLE}, ++ {"Icmp6InGroupMembResponses", N_("group member responses: %u"), i_inp_icmp | I_TITLE}, ++ {"Icmp6InGroupMembReductions", N_("group member reductions: %u"), i_inp_icmp | I_TITLE}, ++ {"Icmp6InRouterSolicits", N_("router solicits: %u"), i_inp_icmp | I_TITLE}, ++ {"Icmp6InRouterAdvertisements", N_("router advertisement: %u"), i_inp_icmp | I_TITLE}, ++ {"Icmp6InNeighborSolicits", N_("neighbour solicits: %u"), i_inp_icmp | I_TITLE}, ++ {"Icmp6InNeighborAdvertisements", N_("neighbour advertisement: %u"), i_inp_icmp | I_TITLE}, ++ {"Icmp6InRedirects", N_("redirects: %u"), i_inp_icmp | I_TITLE}, ++ {"Icmp6OutMsgs", N_("%u ICMP messages sent"), number}, ++ {"Icmp6OutDestUnreachs", N_("destination unreachable: %u"), i_outp_icmp | I_TITLE}, ++ {"Icmp6OutPktTooBigs", N_("packets too big: %u"), i_outp_icmp | I_TITLE}, ++ {"Icmp6OutTimeExcds", N_("sent ICMPv6 time exceeded: %u"), i_outp_icmp | I_TITLE}, ++ {"Icmp6OutParmProblems", N_("parameter problem: %u"), i_outp_icmp | I_TITLE}, ++ {"Icmp6OutEchos", N_("echo requests: %u"), i_outp_icmp | I_TITLE}, ++ {"Icmp6OutEchoReplies", N_("echo replies: %u"), i_outp_icmp | I_TITLE}, ++ {"Icmp6OutGroupMembQueries", N_("group member queries: %u"), i_outp_icmp | I_TITLE}, ++ {"Icmp6OutGroupMembResponses", N_("group member responses: %u"), i_outp_icmp | I_TITLE}, ++ {"Icmp6OutGroupMembReductions", N_("group member reductions: %u"), i_outp_icmp | I_TITLE}, ++ {"Icmp6OutRouterSolicits", N_("router solicits: %u"), i_outp_icmp | I_TITLE}, ++ {"Icmp6OutRouterAdvertisements ", N_("router advertisement: %u"), i_outp_icmp | I_TITLE}, ++ {"Icmp6OutNeighborSolicits", N_("neighbor solicits: %u"), i_outp_icmp | I_TITLE}, ++ {"Icmp6OutNeighborAdvertisements", N_("neighbor advertisements: %u"), i_outp_icmp | I_TITLE}, ++ {"Icmp6OutRedirects", N_("redirects: %u"), i_outp_icmp | I_TITLE}, ++}; ++ + struct entry Tcptab[] = + { + {"RtoAlgorithm", N_("RTO algorithm is %s"), i_rto_alg | I_STATIC}, +@@ -139,6 +201,14 @@ struct entry Udptab[] = + {"OutDatagrams", N_("%u packets sent"), number}, + }; + ++struct entry Udp6tab[] = ++{ ++ {"Udp6InDatagrams", N_("%u packets received"), number}, ++ {"Udp6NoPorts", N_("%u packets to unknown port received."), number}, ++ {"Udp6InErrors", N_("%u packet receive errors"), number}, ++ {"Udp6OutDatagrams", N_("%u packets sent"), number}, ++}; ++ + struct entry Tcpexttab[] = + { + {"SyncookiesSent", N_("%u SYN cookies sent"), opt_number}, +@@ -172,19 +242,59 @@ struct entry Tcpexttab[] = + { "DelayedACKLost", N_("Quick ack mode was activated %u times"), opt_number }, + { "ListenOverflows", N_("%u times the listen queue of a socket overflowed"), + opt_number }, +- { "ListenDrops", N_("%u SYNs to LISTEN sockets ignored"), opt_number }, ++ { "ListenDrops", N_("%u SYNs to LISTEN sockets dropped"), opt_number }, + { "TCPPrequeued", N_("%u packets directly queued to recvmsg prequeue."), + opt_number }, +- { "TCPDirectCopyFromBacklog", N_("%u packets directly received" +- " from backlog"), opt_number }, +- { "TCPDirectCopyFromPrequeue", N_("%u packets directly received" +- " from prequeue"), opt_number }, ++ { "TCPDirectCopyFromBacklog", N_("%u bytes directly in process context from backlog"), opt_number }, ++ { "TCPDirectCopyFromPrequeue", N_("%u bytes directly received in process context from prequeue"), ++ opt_number }, + { "TCPPrequeueDropped", N_("%u packets dropped from prequeue"), opt_number }, +- { "TCPHPHits", N_("%u packets header predicted"), number }, ++ { "TCPHPHits", N_("%u packet headers predicted"), number }, + { "TCPHPHitsToUser", N_("%u packets header predicted and " + "directly queued to user"), opt_number }, + { "SockMallocOOM", N_("Ran %u times out of system memory during " + "packet sending"), opt_number }, ++ { "TCPPureAcks", N_("%u acknowledgments not containing data payload received"), opt_number }, ++ { "TCPHPAcks", N_("%u predicted acknowledgments"), opt_number }, ++ { "TCPRenoRecovery", N_("%u times recovered from packet loss due to fast retransmit"), opt_number }, ++ { "TCPSackRecovery", N_("%u times recovered from packet loss by selective acknowledgements"), opt_number }, ++ { "TCPSACKReneging", N_("%u bad SACK blocks received"), opt_number }, ++ { "TCPFACKReorder", N_("Detected reordering %u times using FACK"), opt_number }, ++ { "TCPSACKReorder", N_("Detected reordering %u times using SACK"), opt_number }, ++ { "TCPTSReorder", N_("Detected reordering %u times using time stamp"), opt_number }, ++ { "TCPRenoReorder", N_("Detected reordering %u times using reno fast retransmit"), opt_number }, ++ { "TCPFullUndo", N_("%u congestion windows fully recovered without slow start"), opt_number }, ++ { "TCPPartialUndo", N_("%u congestion windows partially recovered using Hoe heuristic"), opt_number }, ++ { "TCPDSackUndo", N_("%u congestion window recovered without slow start using DSACK"), opt_number }, ++ { "TCPLossUndo", N_("%u congestion windows recovered without slow start after partial ack"), opt_number }, ++ { "TCPLostRetransmits", N_("%u retransmits lost"), opt_number }, ++ { "TCPRenoFailures", N_("%u timeouts after reno fast retransmit"), opt_number }, ++ { "TCPSackFailures", N_("%u timeouts after SACK recovery"), opt_number }, ++ { "TCPLossFailures", N_("%u timeouts in loss state"), opt_number }, ++ { "TCPFastRetrans", N_("%u fast retransmits"), opt_number }, ++ { "TCPForwardRetrans", N_("%u forward retransmits"), opt_number }, ++ { "TCPSlowStartRetrans", N_("%u retransmits in slow start"), opt_number }, ++ { "TCPTimeouts", N_("%u other TCP timeouts"), opt_number }, ++ { "TCPRenoRecoveryFailed", N_("%u reno fast retransmits failed"), opt_number }, ++ { "TCPSackRecoveryFail", N_("%u SACK retransmits failed"), opt_number }, ++ { "TCPSchedulerFailed", N_("%u times receiver scheduled too late for direct processing"), opt_number }, ++ { "TCPRcvCollapsed", N_("%u packets collapsed in receive queue due to low socket buffer"), opt_number }, ++ { "TCPDSACKOldSent", N_("%u DSACKs sent for old packets"), opt_number }, ++ { "TCPDSACKOfoSent", N_("%u DSACKs sent for out of order packets"), opt_number }, ++ { "TCPDSACKRecv", N_("%u DSACKs received"), opt_number }, ++ { "TCPDSACKOfoRecv", N_("%u DSACKs for out of order packets received"), opt_number }, ++ { "TCPAbortOnSyn", N_("%u connections reset due to unexpected SYN"), opt_number }, ++ { "TCPAbortOnData", N_("%u connections reset due to unexpected data"), opt_number }, ++ { "TCPAbortOnClose", N_("%u connections reset due to early user close"), opt_number }, ++ { "TCPAbortOnMemory", N_("%u connections aborted due to memory pressure"), opt_number }, ++ { "TCPAbortOnTimeout", N_("%u connections aborted due to timeout"), opt_number }, ++ { "TCPAbortOnLinger", N_("%u connections aborted after user close in linger timeout"), opt_number }, ++ { "TCPAbortFailed", N_("%u times unabled to send RST due to no memory"), opt_number }, ++ { "TCPMemoryPressures", N_("TCP ran low on memory %u times"), opt_number }, ++ { "TCPLoss", N_("%u TCP data loss events"), opt_number }, ++ { "TCPDSACKUndo", N_("%u congestion windows recovered without slow start by DSACK"), ++ opt_number }, ++ { "TCPRenoRecoveryFail", N_("%u classic Reno fast retransmits failed"), opt_number }, + }; + + struct tabtab { +@@ -204,6 +314,15 @@ struct tabtab snmptabs[] = + {NULL} + }; + ++struct tabtab snmp6tabs[] = ++{ ++ {"Ip6", Ip6tab, sizeof(Ip6tab), &f_raw}, ++ {"Icmp6", Icmp6tab, sizeof(Icmp6tab), &f_raw}, ++ {"Udp6", Udp6tab, sizeof(Udp6tab), &f_udp}, ++ {"Tcp6", Tcptab, sizeof(Tcptab), &f_tcp}, ++ {NULL} ++}; ++ + /* XXX IGMP */ + + int cmpentries(const void *a, const void *b) +@@ -222,7 +341,8 @@ void printval(struct tabtab *tab, char * + ent = bsearch(&key, tab->tab, tab->size / sizeof(struct entry), + sizeof(struct entry), cmpentries); + if (!ent) { /* try our best */ +- printf("%*s%s: %d\n", states[state].indent, "", title, val); ++ if (val) ++ printf("%*s%s: %d\n", states[state].indent, "", title, val); + return; + } + type = ent->type; +@@ -289,14 +409,17 @@ struct tabtab *newtable(struct tabtab *t + return &dummytab; + } + +-void process_fd(FILE *f) ++int process_fd(FILE *f, int all, char *filter) + { +- char buf1[1024], buf2[1024]; ++ char buf1[2048], buf2[2048]; + char *sp, *np, *p; + while (fgets(buf1, sizeof buf1, f)) { + int endflag; + struct tabtab *tab; + ++ if (buf1[0] == '\n') // skip empty first line in 2.6 kernels ++ continue; ++ + if (!fgets(buf2, sizeof buf2, f)) + break; + sp = strchr(buf1, ':'); +@@ -305,6 +428,10 @@ void process_fd(FILE *f) + goto formaterr; + *sp = '\0'; + ++ if (!all) ++ if (strncmp(buf1, filter, strlen(filter))) ++ continue; ++ + tab = newtable(snmptabs, buf1); + if (tab == NULL) { + printf("unknown %s\n", buf1); +@@ -330,13 +457,47 @@ void process_fd(FILE *f) + sp = p + 1; + } + } +- return; ++ return 0; + + formaterr: +- perror(_("error parsing /proc/net/snmp")); +- return; ++ return -1; ++} ++ ++void cpytitle(char *original, char *new) ++{ ++ char *ptr = original; ++ while(*ptr != '6' && *ptr != '\0') { ++ *new = *ptr; ++ new++; ++ ptr++; ++ } ++ *new = *ptr; ++ new++; ++ *new = '\0'; + } + ++void process6_fd(FILE *f) ++{ ++ char buf1[1024],buf2[50],buf3[1024]; ++ unsigned long val; ++ struct tabtab *tab = NULL; ++ int cpflg = 0; ++ ++ while (fgets(buf1, sizeof buf1, f)) { ++ sscanf(buf1, "%s %lu", buf2, &val); ++ if(!cpflg) { ++ cpytitle(buf2, buf3); ++ tab = newtable(snmp6tabs, buf3); ++ cpflg = 1; ++ } ++ if(!strstr(buf2, buf3)) { ++ cpytitle(buf2, buf3); ++ tab = newtable(snmp6tabs, buf3); ++ } ++ printval(tab, buf2, val); ++ } ++ ++} + + void parsesnmp(int flag_raw, int flag_tcp, int flag_udp) + { +@@ -344,22 +505,25 @@ void parsesnmp(int flag_raw, int flag_tc + + f_raw = flag_raw; f_tcp = flag_tcp; f_udp = flag_udp; + +- f = fopen("/proc/net/snmp", "r"); ++ f = proc_fopen("/proc/net/snmp"); + if (!f) { + perror(_("cannot open /proc/net/snmp")); + return; + } +- process_fd(f); ++ ++ if (process_fd(f, 1, NULL) < 0) ++ fprintf(stderr, _("Problem while parsing /proc/net/snmp\n")); + + if (ferror(f)) + perror("/proc/net/snmp"); + + fclose(f); + +- f = fopen("/proc/net/netstat", "r"); ++ f = proc_fopen("/proc/net/netstat"); + + if (f) { +- process_fd(f); ++ if (process_fd(f, 1, NULL) <0) ++ fprintf(stderr, _("Problem while parsing /proc/net/netstat\n")); + + if (ferror(f)) + perror("/proc/net/netstat"); +@@ -369,6 +533,33 @@ void parsesnmp(int flag_raw, int flag_tc + return; + } + ++void parsesnmp6(int flag_raw, int flag_tcp, int flag_udp) ++{ ++ FILE *f; ++ ++ f_raw = flag_raw; f_tcp = flag_tcp; f_udp = flag_udp; ++ ++ f = fopen("/proc/net/snmp6", "r"); ++ if (!f) { ++ perror(_("cannot open /proc/net/snmp6")); ++ return; ++ } ++ process6_fd(f); ++ if (ferror(f)) ++ perror("/proc/net/snmp6"); ++ ++ fclose(f); ++ f = fopen("/proc/net/snmp", "r"); ++ if (!f) { ++ perror(_("cannot open /proc/net/snmp")); ++ return; ++ } ++ process_fd(f, 0, "Tcp"); ++ if (ferror(f)) ++ perror("/proc/net/snmp"); ++ ++ fclose(f); ++} + + void inittab(void) + { +@@ -379,3 +570,13 @@ void inittab(void) + qsort(t->tab, t->size / sizeof(struct entry), + sizeof(struct entry), cmpentries); + } ++ ++void inittab6(void) ++{ ++ struct tabtab *t; ++ ++ for (t = snmp6tabs; t->title; t++) ++ qsort(t->tab, t->size / sizeof(struct entry), ++ sizeof(struct entry), cmpentries); ++} ++ --- net-tools-1.60.orig/debian/patches/CVS-20051204-slttach.c_sync.patch +++ net-tools-1.60/debian/patches/CVS-20051204-slttach.c_sync.patch @@ -0,0 +1,43 @@ +Sync with upstream CVS, complete log: + +Revision 1.11 - Sun Dec 4 05:15:36 2005 UTC by ecki +use file version + +Revision 1.10 - Sun Dec 4 05:14:08 2005 UTC by ecki +make slattach 3-wire -L mode work (no RTSCTS) (Debian Bug #175743) + +Index: net-tools/slattach.c +=================================================================== +--- net-tools.orig/slattach.c ++++ net-tools/slattach.c +@@ -73,7 +73,7 @@ + + + const char *Release = RELEASE, +- *Version = "@(#) slattach 1.21 (1999-11-21)", ++ *Version = "$Id: slattach.c,v 1.11 2005/12/04 05:15:36 ecki Exp $", + *Signature = "net-tools, Fred N. van Kempen et al."; + + +@@ -115,7 +115,7 @@ int opt_h = 0; /* "hangup" on carrier + int opt_k = 0; /* "keepalive" value */ + #endif + int opt_l = 0; /* "lock it" flag */ +-int opt_L = 0; /* clocal flag */ ++int opt_L = 0; /* 3-wire mode flag */ + int opt_m = 0; /* "set RAW mode" flag */ + int opt_n = 0; /* "set No Mesg" flag */ + #ifdef SIOCSOUTFILL +@@ -342,9 +342,11 @@ tty_set_raw(struct termios *tty) + tty->c_oflag = (0); /* output flags */ + tty->c_lflag = (0); /* local flags */ + speed = (tty->c_cflag & CBAUD); /* save current speed */ +- tty->c_cflag = (CRTSCTS | HUPCL | CREAD); /* UART flags */ ++ tty->c_cflag = (HUPCL | CREAD); /* UART flags */ + if (opt_L) + tty->c_cflag |= CLOCAL; ++ else ++ tty->c_cflag |= CRTSCTS; + tty->c_cflag |= speed; /* restore speed */ + return(0); + } --- net-tools-1.60.orig/debian/patches/Ubuntu_unit_conversion.patch +++ net-tools-1.60/debian/patches/Ubuntu_unit_conversion.patch @@ -0,0 +1,86 @@ +diff -u net-tools-1.60/lib/interface.c net-tools-1.60/lib/interface.c +--- net-tools-1.60/lib/interface.c ++++ net-tools-1.60/lib/interface.c +@@ -858,37 +858,37 @@ + tx = ptr->stats.tx_bytes; + short_rx = rx * 10; + short_tx = tx * 10; +- if (rx > 1125899906842624ull) { +- short_rx /= 1125899906842624ull; +- Rext = "PiB"; +- } else if (rx > 1099511627776ull) { +- short_rx /= 1099511627776ull; +- Rext = "TiB"; +- } else if (rx > 1073741824ull) { +- short_rx /= 1073741824ull; +- Rext = "GiB"; +- } else if (rx > 1048576) { +- short_rx /= 1048576; +- Rext = "MiB"; +- } else if (rx > 1024) { +- short_rx /= 1024; +- Rext = "KiB"; ++ if (rx > 1000000000000000ull) { ++ short_rx /= 1000000000000000ull; ++ Rext = "PB"; ++ } else if (rx > 1000000000000ull) { ++ short_rx /= 1000000000000ull; ++ Rext = "TB"; ++ } else if (rx > 1000000000ull) { ++ short_rx /= 1000000000ull; ++ Rext = "GB"; ++ } else if (rx > 1000000) { ++ short_rx /= 1000000; ++ Rext = "MB"; ++ } else if (rx > 1000) { ++ short_rx /= 1000; ++ Rext = "KB"; + } +- if (tx > 1125899906842624ull) { +- short_tx /= 1125899906842624ull; +- Text = "PiB"; +- } else if (tx > 1099511627776ull) { +- short_tx /= 1099511627776ull; +- Text = "TiB"; +- } else if (tx > 1073741824ull) { +- short_tx /= 1073741824ull; +- Text = "GiB"; +- } else if (tx > 1048576) { +- short_tx /= 1048576; +- Text = "MiB"; +- } else if (tx > 1024) { +- short_tx /= 1024; +- Text = "KiB"; ++ if (tx > 1000000000000000ull) { ++ short_tx /= 1000000000000000ull; ++ Text = "PB"; ++ } else if (tx > 1000000000000ull) { ++ short_tx /= 1000000000000ull; ++ Text = "TB"; ++ } else if (tx > 1000000000ull) { ++ short_tx /= 1000000000ull; ++ Text = "GB"; ++ } else if (tx > 1000000) { ++ short_tx /= 1000000; ++ Text = "MB"; ++ } else if (tx > 1000) { ++ short_tx /= 1000; ++ Text = "KB"; + } + + printf(" "); +diff -u net-tools-1.60/man/en_US/ifconfig.8 net-tools-1.60/man/en_US/ifconfig.8 +--- net-tools-1.60/man/en_US/ifconfig.8 ++++ net-tools-1.60/man/en_US/ifconfig.8 +@@ -194,11 +194,6 @@ + .BR iptables (8) + command. + .LP +-Since net\-tools 1.60\-4 ifconfig is printing byte counters and human readable +-counters with IEC 60027-2 units. So 1 KiB are 2^10 byte. Note, the numbers +-are truncated to one decimal (which can by quite a large error if you +-consider 0.1 PiB is 112.589.990.684.262 bytes :) +-.LP + Interrupt problems with Ethernet device drivers fail with EAGAIN + .I (SIOCSIIFLAGS: Resource temporarily unavailable) + it is most likely a interrupt conflict. See --- net-tools-1.60.orig/debian/patches/series +++ net-tools-1.60/debian/patches/series @@ -0,0 +1,25 @@ +CVS-20020730-route.c_opts_64.patch +CVS-20030911-nameif.c_sync.patch +CVS-20031011-hostname.c_sync.patch +CVS-20051204-arp.c_sync.patch +CVS-20051204-slttach.c_sync.patch +CVS-20060927-mii-tool.c_sync.patch +CVS-20061011-includes_sync.patch +CVS-20061011-ipmaddr.c_buffer_overflow.patch +CVS-20070316-netstat.c_sync.patch +CVS-20071202-rarp.c_sync.patch +CVS-20081002-ifconfig.c_sync.patch +CVS-20081003-statistics.c_sync.patch +CVS-lib_sync.patch +CVS-20081003-config.in_sync.patch +CVS-20081002-manpages_sync.patch +netstat.c-assorted_changes.patch +Bug#254243-netstat.c-wide-opt.patch +netstat.c-local_changes.patch +translations.patch +lib_local_changes.patch +local-manpages.patch +Bug#345331-socket_overflow.patch +Ubuntu_unit_conversion.patch +Bug#569509-iface_overflow.patch +Add_missing_headers.patch --- net-tools-1.60.orig/debian/patches/CVS-lib_sync.patch +++ net-tools-1.60/debian/patches/CVS-lib_sync.patch @@ -0,0 +1,1873 @@ +Sync with upstream CVS, for most files in lib/ + +Index: net-tools/lib/Makefile +=================================================================== +--- net-tools.orig/lib/Makefile ++++ net-tools/lib/Makefile +@@ -16,7 +16,7 @@ + # + + +-HWOBJS = hw.o loopback.o slip.o ether.o ax25.o ppp.o arcnet.o tr.o tunnel.o frame.o sit.o rose.o ash.o fddi.o hippi.o hdlclapb.o strip.o irda.o ec_hw.o x25.o ++HWOBJS = hw.o loopback.o slip.o ether.o ax25.o ppp.o arcnet.o tr.o tunnel.o frame.o sit.o rose.o ash.o fddi.o hippi.o hdlclapb.o strip.o irda.o ec_hw.o x25.o eui64.o ib.o + AFOBJS = unix.o inet.o inet6.o ax25.o ipx.o ddp.o ipx.o netrom.o af.o rose.o econet.o x25.o + AFGROBJS = inet_gr.o inet6_gr.o ipx_gr.o ddp_gr.o netrom_gr.o ax25_gr.o rose_gr.o getroute.o x25_gr.o + AFSROBJS = inet_sr.o inet6_sr.o netrom_sr.o ipx_sr.o setroute.o x25_sr.o +Index: net-tools/lib/ddp_gr.c +=================================================================== +--- net-tools.orig/lib/ddp_gr.c ++++ net-tools/lib/ddp_gr.c +@@ -1,3 +1,20 @@ ++/* ++ * lib/ddp_gr.c Prinbting of DDP (AppleTalk) routing table ++ * used by the NET-LIB. ++ * ++ * NET-LIB ++ * ++ * Version: $Id: ddp_gr.c,v 1.4 2002/06/02 05:25:15 ecki Exp $ ++ * ++ * Author: Ajax ++ * ++ * Modification: ++ * 2002-06-02 integrated into main source by Bernd Eckenfels ++ * ++ */ ++ ++/* TODO: name lookups (/etc/atalk.names? NBP?) */ ++ + #include "config.h" + + #if HAVE_AFATALK +@@ -16,9 +33,61 @@ + #include "pathnames.h" + #include "intl.h" + ++/* stolen from inet_gr.c */ ++#define flags_decode(i,o) do { \ ++ o[0] = '\0'; \ ++ if (i & RTF_UP) strcat(o, "U"); \ ++ if (i & RTF_GATEWAY) strcat(o, "G"); \ ++ if (i & RTF_REJECT) strcat(o, "!"); \ ++ if (i & RTF_HOST) strcat(o, "H"); \ ++ if (i & RTF_REINSTATE) strcat(o, "R"); \ ++ if (i & RTF_DYNAMIC) strcat(o, "D"); \ ++ if (i & RTF_MODIFIED) strcat(o, "M"); \ ++ if (i & RTF_DEFAULT) strcat(o, "d"); \ ++ if (i & RTF_ALLONLINK) strcat(o, "a"); \ ++ if (i & RTF_ADDRCONF) strcat(o, "c"); \ ++ if (i & RTF_NONEXTHOP) strcat(o, "o"); \ ++ if (i & RTF_EXPIRES) strcat(o, "e"); \ ++ if (i & RTF_CACHE) strcat(o, "c"); \ ++ if (i & RTF_FLOW) strcat(o, "f"); \ ++ if (i & RTF_POLICY) strcat(o, "p"); \ ++ if (i & RTF_LOCAL) strcat(o, "l"); \ ++ if (i & RTF_MTU) strcat(o, "u"); \ ++ if (i & RTF_WINDOW) strcat(o, "w"); \ ++ if (i & RTF_IRTT) strcat(o, "i"); \ ++ if (i & RTF_NOTCACHED) strcat(o, "n"); \ ++ } while (0) ++ + int DDP_rprint(int options) + { +- fprintf(stderr, _("Routing table for `ddp' not yet supported.\n")); +- return (1); ++ FILE *fp; ++ char *dest, *gw, *dev, *flags; ++ char oflags[32]; ++ char *hdr = "Destination Gateway Device Flags"; ++ ++ fp = fopen(_PATH_PROCNET_ATALK_ROUTE, "r"); ++ ++ if (!fp) { ++ perror("Error opening " _PATH_PROCNET_ATALK_ROUTE); ++ fprintf(stderr, "DDP (AppleTalk) not configured on this system.\n"); ++ return 1; ++ } ++ ++ fscanf(fp, "%as %as %as %as\n", &dest, &gw, &flags, &dev); ++ free(dest); free(gw); free(dev); free(flags); ++ ++ printf("%s\n", hdr); ++ ++ while (fscanf(fp, "%as %as %as %as\n", &dest, &gw, &flags, &dev) == 4) { ++ int iflags = atoi(flags); ++ flags_decode(iflags, oflags); ++ printf("%-16s%-16s%-16s%-s\n", dest, gw, dev, oflags); ++ free(dest); free(gw); free(dev); free(flags); ++ } ++ ++ fclose(fp); ++ ++ return 0; ++ + } + #endif +Index: net-tools/lib/ether.c +=================================================================== +--- net-tools.orig/lib/ether.c ++++ net-tools/lib/ether.c +@@ -2,7 +2,7 @@ + * lib/ether.c This file contains an implementation of the "Ethernet" + * support functions. + * +- * Version: $Id: ether.c,v 1.7 1999/09/27 11:00:47 philip Exp $ ++ * Version: $Id: ether.c,v 1.8 2002/07/30 05:17:29 ecki Exp $ + * + * Author: Fred N. van Kempen, + * Copyright 1993 MicroWalt Corporation +@@ -39,7 +39,7 @@ static char *pr_ether(unsigned char *ptr + { + static char buff[64]; + +- snprintf(buff, sizeof(buff), "%02X:%02X:%02X:%02X:%02X:%02X", ++ snprintf(buff, sizeof(buff), "%02x:%02x:%02x:%02x:%02x:%02x", + (ptr[0] & 0377), (ptr[1] & 0377), (ptr[2] & 0377), + (ptr[3] & 0377), (ptr[4] & 0377), (ptr[5] & 0377) + ); +Index: net-tools/lib/hw.c +=================================================================== +--- net-tools.orig/lib/hw.c ++++ net-tools/lib/hw.c +@@ -2,7 +2,7 @@ + * lib/hw.c This file contains the top-level part of the hardware + * support functions module. + * +- * Version: $Id: hw.c,v 1.17 2000/05/20 13:38:10 pb Exp $ ++ * Version: $Id: hw.c,v 1.19 2008/10/03 01:52:04 ecki Exp $ + * + * Maintainer: Bernd 'eckes' Eckenfels, + * +@@ -73,6 +73,10 @@ extern struct hwtype irda_hwtype; + + extern struct hwtype ec_hwtype; + ++extern struct hwtype ib_hwtype; ++ ++extern struct hwtype eui64_hwtype; ++ + static struct hwtype *hwtypes[] = + { + +@@ -144,6 +148,12 @@ static struct hwtype *hwtypes[] = + #if HAVE_HWX25 + &x25_hwtype, + #endif ++#if HAVE_HWIB ++ &ib_hwtype, ++#endif ++#if HAVE_HWEUI64 ++ &eui64_hwtype, ++#endif + &unspec_hwtype, + NULL + }; +@@ -217,6 +227,12 @@ void hwinit() + #if HAVE_HWEC + ec_hwtype.title = _("Econet"); + #endif ++#if HAVE_HWIB ++ ib_hwtype.title = _("InfiniBand"); ++#endif ++#if HAVE_HWEUI64 ++ eui64_hwtype.title = _("Generic EUI-64"); ++#endif + sVhwinit = 1; + } + +Index: net-tools/lib/inet.c +=================================================================== +--- net-tools.orig/lib/inet.c ++++ net-tools/lib/inet.c +@@ -3,7 +3,7 @@ + * support functions for the net-tools. + * (NET-3 base distribution). + * +- * Version: $Id: inet.c,v 1.13 1999/12/11 13:35:56 freitag Exp $ ++ * Version: $Id: inet.c,v 1.14 2003/10/19 11:57:37 pb Exp $ + * + * Author: Fred N. van Kempen, + * Copyright 1993 MicroWalt Corporation +@@ -144,7 +144,7 @@ static int INET_rresolve(char *name, siz + struct hostent *ent; + struct netent *np; + struct addr *pn; +- unsigned long ad, host_ad; ++ u_int32_t ad, host_ad; + int host = 0; + + /* Grmpf. -FvK */ +@@ -155,7 +155,7 @@ static int INET_rresolve(char *name, siz + errno = EAFNOSUPPORT; + return (-1); + } +- ad = (unsigned long) sin->sin_addr.s_addr; ++ ad = sin->sin_addr.s_addr; + #ifdef DEBUG + fprintf (stderr, "rresolve: %08lx, mask %08x, num %08x \n", ad, netmask, numeric); + #endif +Index: net-tools/lib/inet6.c +=================================================================== +--- net-tools.orig/lib/inet6.c ++++ net-tools/lib/inet6.c +@@ -3,7 +3,7 @@ + * support functions for the net-tools. + * (most of it copied from lib/inet.c 1.26). + * +- * Version: $Id: inet6.c,v 1.10 2000/10/28 11:04:00 pb Exp $ ++ * Version: $Id: inet6.c,v 1.12 2002/12/10 01:03:09 ecki Exp $ + * + * Author: Fred N. van Kempen, + * Copyright 1993 MicroWalt Corporation +@@ -44,6 +44,21 @@ + + extern int h_errno; /* some netdb.h versions don't export this */ + ++char * fix_v4_address(char *buf, struct in6_addr *in6) ++{ ++ if (IN6_IS_ADDR_V4MAPPED(in6->s6_addr)) { ++ char *s =strchr(buf, '.'); ++ if (s) { ++ while (s > buf && *s != ':') ++ --s; ++ if (*s == ':') ++s; ++ else s = NULL; ++ } ++ if (s) return s; ++ } ++ return buf; ++} ++ + static int INET6_resolve(char *name, struct sockaddr_in6 *sin6) + { + struct addrinfo req, *ai; +@@ -83,14 +98,14 @@ static int INET6_rresolve(char *name, st + return (-1); + } + if (numeric & 0x7FFF) { +- inet_ntop(AF_INET6, &sin6->sin6_addr, name, 80); ++ inet_ntop( AF_INET6, &sin6->sin6_addr, name, 80); + return (0); + } + if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) { + if (numeric & 0x8000) + strcpy(name, "default"); + else +- strcpy(name, "*"); ++ strcpy(name, "[::]"); + return (0); + } + +@@ -109,13 +124,14 @@ static void INET6_reserror(char *text) + } + + ++ + /* Display an Internet socket address. */ + static char *INET6_print(unsigned char *ptr) + { + static char name[80]; + + inet_ntop(AF_INET6, (struct in6_addr *) ptr, name, 80); +- return name; ++ return fix_v4_address(name, (struct in6_addr *)ptr); + } + + +@@ -129,13 +145,14 @@ static char *INET6_sprint(struct sockadd + return safe_strncpy(buff, _("[NONE SET]"), sizeof(buff)); + if (INET6_rresolve(buff, (struct sockaddr_in6 *) sap, numeric) != 0) + return safe_strncpy(buff, _("[UNKNOWN]"), sizeof(buff)); +- return (buff); ++ return (fix_v4_address(buff, &((struct sockaddr_in6 *)sap)->sin6_addr)); + } + + + static int INET6_getsock(char *bufp, struct sockaddr *sap) + { + struct sockaddr_in6 *sin6; ++ char *p; + + sin6 = (struct sockaddr_in6 *) sap; + sin6->sin6_family = AF_INET6; +@@ -143,7 +160,9 @@ static int INET6_getsock(char *bufp, str + + if (inet_pton(AF_INET6, bufp, sin6->sin6_addr.s6_addr) <= 0) + return (-1); +- ++ p = fix_v4_address(bufp, &sin6->sin6_addr); ++ if (p != bufp) ++ memcpy(bufp, p, strlen(p)+1); + return 16; /* ?;) */ + } + +Index: net-tools/lib/inet6_gr.c +=================================================================== +--- net-tools.orig/lib/inet6_gr.c ++++ net-tools/lib/inet6_gr.c +@@ -1,4 +1,4 @@ +-/* ++ /* + Modifications: + 1998-07-01 - Arnaldo Carvalho de Melo - GNU gettext instead of catgets, + snprintf instead of sprintf +@@ -71,11 +71,15 @@ int rprint_fib6(int ext, int numeric) + printf(_("INET6 (IPv6) not configured in this system.\n")); + return 1; + } +- printf(_("Kernel IPv6 routing table\n")); + +- printf(_("Destination " +- "Next Hop " +- "Flags Metric Ref Use Iface\n")); ++ if (numeric & RTF_CACHE) ++ printf(_("Kernel IPv6 routing cache\n")); ++ else ++ printf(_("Kernel IPv6 routing table\n")); ++ ++ printf(_("Destination " ++ "Next Hop " ++ "Flag Met Ref Use If\n")); + + while (fgets(buff, 1023, fp)) { + num = sscanf(buff, "%4s%4s%4s%4s%4s%4s%4s%4s %02x %4s%4s%4s%4s%4s%4s%4s%4s %02x %4s%4s%4s%4s%4s%4s%4s%4s %08x %08x %08x %08x %s\n", +@@ -87,13 +91,19 @@ int rprint_fib6(int ext, int numeric) + &slen, + naddr6p[0], naddr6p[1], naddr6p[2], naddr6p[3], + naddr6p[4], naddr6p[5], naddr6p[6], naddr6p[7], +- &metric, &use, &refcnt, &iflags, iface); ++ &metric, &refcnt, &use, &iflags, iface); + #if 0 + if (num < 23) + continue; + #endif +- if (!(iflags & RTF_UP)) +- continue; ++ if (iflags & RTF_CACHE) { ++ if (!(numeric & RTF_CACHE)) ++ continue; ++ } else { ++ if (numeric & RTF_CACHE) ++ continue; ++ } ++ + /* Fetch and resolve the target address. */ + snprintf(addr6, sizeof(addr6), "%s:%s:%s:%s:%s:%s:%s:%s", + addr6p[0], addr6p[1], addr6p[2], addr6p[3], +@@ -112,7 +122,12 @@ int rprint_fib6(int ext, int numeric) + inet6_aftype.sprint((struct sockaddr *) &snaddr6, 1)); + + /* Decode the flags. */ +- strcpy(flags, "U"); ++ ++ flags[0]=0; ++ if (iflags & RTF_UP) ++ strcat(flags, "U"); ++ if (iflags & RTF_REJECT) ++ strcat(flags, "!"); + if (iflags & RTF_GATEWAY) + strcat(flags, "G"); + if (iflags & RTF_HOST) +@@ -123,9 +138,19 @@ int rprint_fib6(int ext, int numeric) + strcat(flags, "A"); + if (iflags & RTF_CACHE) + strcat(flags, "C"); ++ if (iflags & RTF_ALLONLINK) ++ strcat(flags, "a"); ++ if (iflags & RTF_EXPIRES) ++ strcat(flags, "e"); ++ if (iflags & RTF_MODIFIED) ++ strcat(flags, "m"); ++ if (iflags & RTF_NONEXTHOP) ++ strcat(flags, "n"); ++ if (iflags & RTF_FLOW) ++ strcat(flags, "f"); + + /* Print the info. */ +- printf("%-43s %-39s %-5s %-6d %-2d %7d %-8s\n", ++ printf("%-30s %-26s %-4s %-3d %-1d%6d %s\n", + addr6, naddr6, flags, metric, refcnt, use, iface); + } + +@@ -144,8 +169,7 @@ int rprint_cache6(int ext, int numeric) + char addr6p[8][5], haddrp[6][3]; + + if (!fp) { +- ESYSNOT("nd_print", "ND Table"); +- return 1; ++ return rprint_fib6(ext, numeric | RTF_CACHE); + } + printf(_("Kernel IPv6 Neighbour Cache\n")); + +Index: net-tools/lib/inet_sr.c +=================================================================== +--- net-tools.orig/lib/inet_sr.c ++++ net-tools/lib/inet_sr.c +@@ -3,6 +3,7 @@ + 1998-07-01 - Arnaldo Carvalho de Melo - GNU gettext instead of catgets + 1999-10-07 - Kurt Garloff - for -host and gws: prefer host names + over networks (or even reject) ++ 2003-10-11 - Maik Broemme - gcc 3.x warnign fixes (default: break;) + */ + + #include "config.h" +@@ -104,7 +105,6 @@ static int INET_setroute(int action, int + isnet = 1; break; + case 2: + isnet = 0; break; +- default: + } + + /* Fill in the other fields. */ +Index: net-tools/lib/interface.c +=================================================================== +--- net-tools.orig/lib/interface.c ++++ net-tools/lib/interface.c +@@ -7,7 +7,7 @@ + 8/2000 Andi Kleen make the list operations a bit more efficient. + People are crazy enough to use thousands of aliases now. + +- $Id: interface.c,v 1.14 2001/02/10 19:31:15 pb Exp $ ++ $Id: interface.c,v 1.30 2005/08/23 22:46:51 ecki Exp $ + */ + + #include "config.h" +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + #if HAVE_AFIPX + #if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) +@@ -87,14 +88,20 @@ int procnetdev_vsn = 1; + + int ife_short; + ++int if_list_all = 0; /* do we have requested the complete proc list, yet? */ ++ + static struct interface *int_list, *int_last; + + static int if_readlist_proc(char *); + +-static struct interface *add_interface(char *name) ++static struct interface *if_cache_add(char *name) + { + struct interface *ife, **nextp, *new; + ++ if (!int_list) ++ int_last = NULL; ++ ++ /* the cache is sorted, so if we hit a smaller if, exit */ + for (ife = int_last; ife; ife = ife->prev) { + int n = nstrcmp(ife->name, name); + if (n == 0) +@@ -104,7 +111,7 @@ static struct interface *add_interface(c + } + new(new); + safe_strncpy(new->name, name, IFNAMSIZ); +- nextp = ife ? &ife->next : &int_list; ++ nextp = ife ? &ife->next : &int_list; // keep sorting + new->prev = ife; + new->next = *nextp; + if (new->next) +@@ -117,19 +124,22 @@ static struct interface *add_interface(c + + struct interface *lookup_interface(char *name) + { +- struct interface *ife = NULL; +- +- if (if_readlist_proc(name) < 0) +- return NULL; +- ife = add_interface(name); +- return ife; ++ /* if we have read all, use it */ ++ if (if_list_all) ++ return if_cache_add(name); ++ ++ /* otherwise we read a limited list */ ++ if (if_readlist_proc(name) < 0) ++ return NULL; ++ ++ return if_cache_add(name); + } + + int for_all_interfaces(int (*doit) (struct interface *, void *), void *cookie) + { + struct interface *ife; + +- if (!int_list && (if_readlist() < 0)) ++ if (!if_list_all && (if_readlist() < 0)) + return -1; + for (ife = int_list; ife; ife = ife->next) { + int err = doit(ife, cookie); +@@ -139,13 +149,15 @@ int for_all_interfaces(int (*doit) (stru + return 0; + } + +-int free_interface_list(void) ++int if_cache_free(void) + { + struct interface *ife; + while ((ife = int_list) != NULL) { + int_list = ife->next; + free(ife); + } ++ int_last = NULL; ++ if_list_all = 0; + return 0; + } + +@@ -180,7 +192,7 @@ static int if_readconf(void) + } + if (ifc.ifc_len == sizeof(struct ifreq) * numreqs) { + /* assume it overflowed and try again */ +- numreqs += 10; ++ numreqs *= 2; + continue; + } + break; +@@ -188,7 +200,7 @@ static int if_readconf(void) + + ifr = ifc.ifc_req; + for (n = 0; n < ifc.ifc_len; n += sizeof(struct ifreq)) { +- add_interface(ifr->ifr_name); ++ if_cache_add(ifr->ifr_name); + ifr++; + } + err = 0; +@@ -198,7 +210,7 @@ out: + return err; + } + +-static char *get_name(char *name, char *p) ++char *get_name(char *name, char *p) + { + while (isspace(*p)) + p++; +@@ -206,16 +218,19 @@ static char *get_name(char *name, char * + if (isspace(*p)) + break; + if (*p == ':') { /* could be an alias */ +- char *dot = p, *dotname = name; +- *name++ = *p++; +- while (isdigit(*p)) +- *name++ = *p++; +- if (*p != ':') { /* it wasn't, backup */ +- p = dot; +- name = dotname; ++ char *dot = p++; ++ while (*p && isdigit(*p)) p++; ++ if (*p == ':') { ++ /* Yes it is, backup and copy it. */ ++ p = dot; ++ *name++ = *p++; ++ while (*p && isdigit(*p)) { ++ *name++ = *p++; ++ } ++ } else { ++ /* No, it isn't */ ++ p = dot; + } +- if (*p == '\0') +- return NULL; + p++; + break; + } +@@ -225,7 +240,7 @@ static char *get_name(char *name, char * + return p; + } + +-static int procnetdev_version(char *buf) ++int procnetdev_version(char *buf) + { + if (strstr(buf, "compressed")) + return 3; +@@ -234,12 +249,12 @@ static int procnetdev_version(char *buf) + return 1; + } + +-static int get_dev_fields(char *bp, struct interface *ife) ++int get_dev_fields(char *bp, struct interface *ife) + { + switch (procnetdev_vsn) { + case 3: + sscanf(bp, +- "%llu %llu %lu %lu %lu %lu %lu %lu %llu %llu %lu %lu %lu %lu %lu %lu", ++ "%Lu %Lu %lu %lu %lu %lu %lu %lu %Lu %Lu %lu %lu %lu %lu %lu %lu", + &ife->stats.rx_bytes, + &ife->stats.rx_packets, + &ife->stats.rx_errors, +@@ -259,7 +274,7 @@ static int get_dev_fields(char *bp, stru + &ife->stats.tx_compressed); + break; + case 2: +- sscanf(bp, "%llu %llu %lu %lu %lu %lu %llu %llu %lu %lu %lu %lu %lu", ++ sscanf(bp, "%Lu %Lu %lu %lu %lu %lu %Lu %Lu %lu %lu %lu %lu %lu", + &ife->stats.rx_bytes, + &ife->stats.rx_packets, + &ife->stats.rx_errors, +@@ -277,7 +292,7 @@ static int get_dev_fields(char *bp, stru + ife->stats.rx_multicast = 0; + break; + case 1: +- sscanf(bp, "%llu %lu %lu %lu %lu %llu %lu %lu %lu %lu %lu", ++ sscanf(bp, "%Lu %lu %lu %lu %lu %Lu %lu %lu %lu %lu %lu", + &ife->stats.rx_packets, + &ife->stats.rx_errors, + &ife->stats.rx_dropped, +@@ -300,22 +315,16 @@ static int get_dev_fields(char *bp, stru + + static int if_readlist_proc(char *target) + { +- static int proc_read; + FILE *fh; + char buf[512]; + struct interface *ife; + int err; + +- if (proc_read) +- return 0; +- if (!target) +- proc_read = 1; +- + fh = fopen(_PATH_PROCNET_DEV, "r"); + if (!fh) { + fprintf(stderr, _("Warning: cannot open %s (%s). Limited output.\n"), + _PATH_PROCNET_DEV, strerror(errno)); +- return if_readconf(); ++ return -2; + } + fgets(buf, sizeof buf, fh); /* eat line */ + fgets(buf, sizeof buf, fh); +@@ -350,7 +359,7 @@ static int if_readlist_proc(char *target + while (fgets(buf, sizeof buf, fh)) { + char *s, name[IFNAMSIZ]; + s = get_name(name, buf); +- ife = add_interface(name); ++ ife = if_cache_add(name); + get_dev_fields(s, ife); + ife->statistics_valid = 1; + if (target && !strcmp(target,name)) +@@ -359,7 +368,6 @@ static int if_readlist_proc(char *target + if (ferror(fh)) { + perror(_PATH_PROCNET_DEV); + err = -1; +- proc_read = 0; + } + + #if 0 +@@ -371,9 +379,16 @@ static int if_readlist_proc(char *target + + int if_readlist(void) + { +- int err = if_readlist_proc(NULL); +- if (!err) +- err = if_readconf(); ++ /* caller will/should check not to call this too often ++ * (i.e. only if if_list_all == 0 ++ */ ++ int err = 0; ++ ++ err |= if_readlist_proc(NULL); ++ err |= if_readconf(); ++ ++ if_list_all = 1; ++ + return err; + } + +@@ -580,10 +595,10 @@ int do_if_print(struct interface *ife, v + void ife_print_short(struct interface *ptr) + { + printf("%-5.5s ", ptr->name); +- printf("%5d %3d", ptr->mtu, ptr->metric); ++ printf("%5d %-2d ", ptr->mtu, ptr->metric); + /* If needed, display the interface statistics. */ + if (ptr->statistics_valid) { +- printf("%8llu %6lu %6lu %6lu", ++ printf("%8llu %6lu %6lu %-6lu ", + ptr->stats.rx_packets, ptr->stats.rx_errors, + ptr->stats.rx_dropped, ptr->stats.rx_fifo_errors); + printf("%8llu %6lu %6lu %6lu ", +@@ -636,9 +651,10 @@ void ife_print_long(struct interface *pt + int hf; + int can_compress = 0; + unsigned long long rx, tx, short_rx, short_tx; +- char Rext[5]="b"; +- char Text[5]="b"; +- ++ const char *Rext = "B"; ++ const char *Text = "B"; ++ static char flags[200]; ++ + #if HAVE_AFIPX + static struct aftype *ipxtype = NULL; + #endif +@@ -670,32 +686,70 @@ void ife_print_long(struct interface *pt + if (hw == NULL) + hw = get_hwntype(-1); + +- printf(_("%-9.9s Link encap:%s "), ptr->name, hw->title); +- /* For some hardware types (eg Ash, ATM) we don't print the +- hardware address if it's null. */ +- if (hw->print != NULL && (! (hw_null_address(hw, ptr->hwaddr) && +- hw->suppress_null_addr))) +- printf(_("HWaddr %s "), hw->print(ptr->hwaddr)); +-#ifdef IFF_PORTSEL +- if (ptr->flags & IFF_PORTSEL) { +- printf(_("Media:%s"), if_port_text[ptr->map.port][0]); +- if (ptr->flags & IFF_AUTOMEDIA) +- printf(_("(auto)")); +- } ++ sprintf(flags, "flags=%d<", ptr->flags); ++ /* DONT FORGET TO ADD THE FLAGS IN ife_print_short, too */ ++ if (ptr->flags == 0) ++ strcat(flags,">"); ++ if (ptr->flags & IFF_UP) ++ strcat(flags,_("UP,")); ++ if (ptr->flags & IFF_BROADCAST) ++ strcat(flags,_("BROADCAST,")); ++ if (ptr->flags & IFF_DEBUG) ++ strcat(flags,_("DEBUG,")); ++ if (ptr->flags & IFF_LOOPBACK) ++ strcat(flags,_("LOOPBACK,")); ++ if (ptr->flags & IFF_POINTOPOINT) ++ strcat(flags,_("POINTOPOINT,")); ++ if (ptr->flags & IFF_NOTRAILERS) ++ strcat(flags,_("NOTRAILERS,")); ++ if (ptr->flags & IFF_RUNNING) ++ strcat(flags,_("RUNNING,")); ++ if (ptr->flags & IFF_NOARP) ++ strcat(flags,_("NOARP,")); ++ if (ptr->flags & IFF_PROMISC) ++ strcat(flags,_("PROMISC,")); ++ if (ptr->flags & IFF_ALLMULTI) ++ strcat(flags,_("ALLMULTI,")); ++ if (ptr->flags & IFF_SLAVE) ++ strcat(flags,_("SLAVE,")); ++ if (ptr->flags & IFF_MASTER) ++ strcat(flags,_("MASTER,")); ++ if (ptr->flags & IFF_MULTICAST) ++ strcat(flags,_("MULTICAST,")); ++#ifdef HAVE_DYNAMIC ++ if (ptr->flags & IFF_DYNAMIC) ++ strcat(flags,_("DYNAMIC,")); ++#endif ++ /* DONT FORGET TO ADD THE FLAGS IN ife_print_short */ ++ if (flags[strlen(flags)-1] == ',') ++ flags[strlen(flags)-1] = '>'; ++ else ++ flags[strlen(flags)-1] = 0; ++ ++ ++ printf(_("%s: %s mtu %d metric %d"), ++ ptr->name, flags, ptr->mtu, ptr->metric ? ptr->metric : 1); ++#ifdef SIOCSKEEPALIVE ++ if (ptr->outfill || ptr->keepalive) ++ printf(_(" outfill %d keepalive %d"), ++ ptr->outfill, ptr->keepalive); + #endif + printf("\n"); + ++ ++ + #if HAVE_AFINET + if (ptr->has_ip) { +- printf(_(" %s addr:%s "), ap->name, ++ printf(_(" %s %s"), ap->name, + ap->sprint(&ptr->addr, 1)); +- if (ptr->flags & IFF_POINTOPOINT) { +- printf(_(" P-t-P:%s "), ap->sprint(&ptr->dstaddr, 1)); +- } ++ printf(_(" netmask %s"), ap->sprint(&ptr->netmask, 1)); + if (ptr->flags & IFF_BROADCAST) { +- printf(_(" Bcast:%s "), ap->sprint(&ptr->broadaddr, 1)); ++ printf(_(" broadcast %s"), ap->sprint(&ptr->broadaddr, 1)); ++ } ++ if (ptr->flags & IFF_POINTOPOINT) { ++ printf(_(" destination %s"), ap->sprint(&ptr->dstaddr, 1)); + } +- printf(_(" Mask:%s\n"), ap->sprint(&ptr->netmask, 1)); ++ printf("\n"); + } + #endif + +@@ -712,29 +766,30 @@ void ife_print_long(struct interface *pt + addr6p[0], addr6p[1], addr6p[2], addr6p[3], + addr6p[4], addr6p[5], addr6p[6], addr6p[7]); + inet6_aftype.input(1, addr6, (struct sockaddr *) &sap); +- printf(_(" inet6 addr: %s/%d"), +- inet6_aftype.sprint((struct sockaddr *) &sap, 1), plen); +- printf(_(" Scope:")); +- switch (scope) { +- case 0: +- printf(_("Global")); +- break; +- case IPV6_ADDR_LINKLOCAL: +- printf(_("Link")); +- break; +- case IPV6_ADDR_SITELOCAL: +- printf(_("Site")); +- break; +- case IPV6_ADDR_COMPATv4: +- printf(_("Compat")); +- break; +- case IPV6_ADDR_LOOPBACK: +- printf(_("Host")); +- break; +- default: +- printf(_("Unknown")); ++ printf(_(" %s %s prefixlen %d"), ++ inet6_aftype.name, ++ inet6_aftype.sprint((struct sockaddr *) &sap, 1), ++ plen); ++ printf(_(" scopeid 0x%x"), scope); ++ ++ flags[0] = '<'; flags[1] = 0; ++ if (scope & IPV6_ADDR_COMPATv4) { ++ strcat(flags, _("compat,")); ++ scope -= IPV6_ADDR_COMPATv4; + } +- printf("\n"); ++ if (scope == 0) ++ strcat(flags, _("global,")); ++ if (scope & IPV6_ADDR_LINKLOCAL) ++ strcat(flags, _("link,")); ++ if (scope & IPV6_ADDR_SITELOCAL) ++ strcat(flags, _("site,")); ++ if (scope & IPV6_ADDR_LOOPBACK) ++ strcat(flags, _("host,")); ++ if (flags[strlen(flags)-1] == ',') ++ flags[strlen(flags)-1] = '>'; ++ else ++ flags[strlen(flags)-1] = 0; ++ printf("%s\n", flags); + } + } + fclose(f); +@@ -747,17 +802,17 @@ void ife_print_long(struct interface *pt + + if (ipxtype != NULL) { + if (ptr->has_ipx_bb) +- printf(_(" IPX/Ethernet II addr:%s\n"), +- ipxtype->sprint(&ptr->ipxaddr_bb, 1)); ++ printf(_(" %s Ethernet-II %s\n"), ++ ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_bb, 1)); + if (ptr->has_ipx_sn) +- printf(_(" IPX/Ethernet SNAP addr:%s\n"), +- ipxtype->sprint(&ptr->ipxaddr_sn, 1)); ++ printf(_(" %s Ethernet-SNAP %s\n"), ++ ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_sn, 1)); + if (ptr->has_ipx_e2) +- printf(_(" IPX/Ethernet 802.2 addr:%s\n"), +- ipxtype->sprint(&ptr->ipxaddr_e2, 1)); ++ printf(_(" %s Ethernet802.2 %s\n"), ++ ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_e2, 1)); + if (ptr->has_ipx_e3) +- printf(_(" IPX/Ethernet 802.3 addr:%s\n"), +- ipxtype->sprint(&ptr->ipxaddr_e3, 1)); ++ printf(_(" %s Ethernet802.3 %s\n"), ++ ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_e3, 1)); + } + #endif + +@@ -766,7 +821,7 @@ void ife_print_long(struct interface *pt + ddptype = get_afntype(AF_APPLETALK); + if (ddptype != NULL) { + if (ptr->has_ddp) +- printf(_(" EtherTalk Phase 2 addr:%s\n"), ddptype->sprint(&ptr->ddpaddr, 1)); ++ printf(_(" %s %s\n"), ddptype->name, ddptype->sprint(&ptr->ddpaddr, 1)); + } + #endif + +@@ -775,53 +830,30 @@ void ife_print_long(struct interface *pt + ectype = get_afntype(AF_ECONET); + if (ectype != NULL) { + if (ptr->has_econet) +- printf(_(" econet addr:%s\n"), ectype->sprint(&ptr->ecaddr, 1)); ++ printf(_(" %s %s\n"), ectype->name, ectype->sprint(&ptr->ecaddr, 1)); + } + #endif + +- printf(" "); +- /* DONT FORGET TO ADD THE FLAGS IN ife_print_short, too */ +- if (ptr->flags == 0) +- printf(_("[NO FLAGS] ")); +- if (ptr->flags & IFF_UP) +- printf(_("UP ")); +- if (ptr->flags & IFF_BROADCAST) +- printf(_("BROADCAST ")); +- if (ptr->flags & IFF_DEBUG) +- printf(_("DEBUG ")); +- if (ptr->flags & IFF_LOOPBACK) +- printf(_("LOOPBACK ")); +- if (ptr->flags & IFF_POINTOPOINT) +- printf(_("POINTOPOINT ")); +- if (ptr->flags & IFF_NOTRAILERS) +- printf(_("NOTRAILERS ")); +- if (ptr->flags & IFF_RUNNING) +- printf(_("RUNNING ")); +- if (ptr->flags & IFF_NOARP) +- printf(_("NOARP ")); +- if (ptr->flags & IFF_PROMISC) +- printf(_("PROMISC ")); +- if (ptr->flags & IFF_ALLMULTI) +- printf(_("ALLMULTI ")); +- if (ptr->flags & IFF_SLAVE) +- printf(_("SLAVE ")); +- if (ptr->flags & IFF_MASTER) +- printf(_("MASTER ")); +- if (ptr->flags & IFF_MULTICAST) +- printf(_("MULTICAST ")); +-#ifdef HAVE_DYNAMIC +- if (ptr->flags & IFF_DYNAMIC) +- printf(_("DYNAMIC ")); +-#endif +- /* DONT FORGET TO ADD THE FLAGS IN ife_print_short */ +- printf(_(" MTU:%d Metric:%d"), +- ptr->mtu, ptr->metric ? ptr->metric : 1); +-#ifdef SIOCSKEEPALIVE +- if (ptr->outfill || ptr->keepalive) +- printf(_(" Outfill:%d Keepalive:%d"), +- ptr->outfill, ptr->keepalive); ++ /* For some hardware types (eg Ash, ATM) we don't print the ++ hardware address if it's null. */ ++ if (hw->print != NULL && (! (hw_null_address(hw, ptr->hwaddr) && ++ hw->suppress_null_addr))) ++ printf(_(" %s %s"), hw->name, hw->print(ptr->hwaddr)); ++ else ++ printf(_(" %s"), hw->name); ++ if (ptr->tx_queue_len != -1) ++ printf(_(" txqueuelen %d"), ptr->tx_queue_len); ++ printf(" (%s)\n", hw->title); ++ ++#ifdef IFF_PORTSEL ++ if (ptr->flags & IFF_PORTSEL) { ++ printf(_(" media %s"), if_port_text[ptr->map.port][0]); ++ if (ptr->flags & IFF_AUTOMEDIA) ++ printf(_("autoselect")); ++ printf("\n"); ++ } + #endif +- printf("\n"); ++ + + /* If needed, display the interface statistics. */ + +@@ -830,55 +862,87 @@ void ife_print_long(struct interface *pt + * not for the aliases, although strictly speaking they're shared + * by all addresses. + */ +- printf(" "); +- +- printf(_("RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"), +- ptr->stats.rx_packets, ptr->stats.rx_errors, +- ptr->stats.rx_dropped, ptr->stats.rx_fifo_errors, +- ptr->stats.rx_frame_errors); +- if (can_compress) +- printf(_(" compressed:%lu\n"), ptr->stats.rx_compressed); +- + rx = ptr->stats.rx_bytes; +- tx = ptr->stats.tx_bytes; + short_rx = rx * 10; ++ if (rx > 1125899906842624ull) { ++ short_rx /= 1125899906842624ull; ++ Rext = "PiB"; ++ } else if (rx > 1099511627776ull) { ++ short_rx /= 1099511627776ull; ++ Rext = "TiB"; ++ } else if (rx > 1073741824ull) { ++ short_rx /= 1073741824ull; ++ Rext = "GiB"; ++ } else if (rx > 1048576) { ++ short_rx /= 1048576; ++ Rext = "MiB"; ++ } else if (rx > 1024) { ++ short_rx /= 1024; ++ Rext = "KiB"; ++ } ++ tx = ptr->stats.tx_bytes; + short_tx = tx * 10; +- if (rx > 1048576) { short_rx /= 1048576; strcpy(Rext, "Mb"); } +- else if (rx > 1024) { short_rx /= 1024; strcpy(Rext, "Kb"); } +- if (tx > 1048576) { short_tx /= 1048576; strcpy(Text, "Mb"); } +- else if (tx > 1024) { short_tx /= 1024; strcpy(Text, "Kb"); } +- +- printf(" "); +- printf(_("TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"), +- ptr->stats.tx_packets, ptr->stats.tx_errors, +- ptr->stats.tx_dropped, ptr->stats.tx_fifo_errors, +- ptr->stats.tx_carrier_errors); +- printf(_(" collisions:%lu "), ptr->stats.collisions); +- if (can_compress) +- printf(_("compressed:%lu "), ptr->stats.tx_compressed); +- if (ptr->tx_queue_len != -1) +- printf(_("txqueuelen:%d "), ptr->tx_queue_len); +- printf("\n "); +- printf(_("RX bytes:%llu (%lu.%lu %s) TX bytes:%llu (%lu.%lu %s)\n"), ++ if (tx > 1125899906842624ull) { ++ short_tx /= 1125899906842624ull; ++ Text = "PiB"; ++ } else if (tx > 1099511627776ull) { ++ short_tx /= 1099511627776ull; ++ Text = "TiB"; ++ } else if (tx > 1073741824ull) { ++ short_tx /= 1073741824ull; ++ Text = "GiB"; ++ } else if (tx > 1048576) { ++ short_tx /= 1048576; ++ Text = "MiB"; ++ } else if (tx > 1024) { ++ short_tx /= 1024; ++ Text = "KiB"; ++ } ++ ++ printf(" "); ++ printf(_("RX packets %llu bytes %llu (%lu.%lu %s)\n"), ++ ptr->stats.rx_packets, + rx, (unsigned long)(short_rx / 10), +- (unsigned long)(short_rx % 10), Rext, +- tx, (unsigned long)(short_tx / 10), +- (unsigned long)(short_tx % 10), Text); ++ (unsigned long)(short_rx % 10), Rext); ++ if (can_compress) { ++ printf(" "); ++ printf(_("RX compressed:%lu\n"), ptr->stats.rx_compressed); ++ } ++ printf(" "); ++ printf(_("RX errors %lu dropped %lu overruns %lu frame %lu\n"), ++ ptr->stats.rx_errors, ptr->stats.rx_dropped, ++ ptr->stats.rx_fifo_errors, ptr->stats.rx_frame_errors); ++ ++ ++ printf(" "); ++ printf(_("TX packets %llu bytes %llu (%lu.%lu %s)\n"), ++ ptr->stats.tx_packets, ++ tx, (unsigned long)(short_tx / 10), ++ (unsigned long)(short_tx % 10), Text); ++ if (can_compress) { ++ printf(" "); ++ printf(_("TX compressed %lu\n"), ptr->stats.tx_compressed); ++ } ++ printf(" "); ++ printf(_("TX errors %lu dropped %lu overruns %lu carrier %lu collisions %lu\n"), ++ ptr->stats.tx_errors, ++ ptr->stats.tx_dropped, ptr->stats.tx_fifo_errors, ++ ptr->stats.tx_carrier_errors, ptr->stats.collisions); + } + + if ((ptr->map.irq || ptr->map.mem_start || ptr->map.dma || +- ptr->map.base_addr)) { +- printf(" "); ++ ptr->map.base_addr >= 0x100)) { ++ printf(" device "); + if (ptr->map.irq) +- printf(_("Interrupt:%d "), ptr->map.irq); ++ printf(_("interrupt %d "), ptr->map.irq); + if (ptr->map.base_addr >= 0x100) /* Only print devices using it for + I/O maps */ +- printf(_("Base address:0x%x "), ptr->map.base_addr); ++ printf(_("base 0x%x "), ptr->map.base_addr); + if (ptr->map.mem_start) { +- printf(_("Memory:%lx-%lx "), ptr->map.mem_start, ptr->map.mem_end); ++ printf(_("memory 0x%lx-%lx "), ptr->map.mem_start, ptr->map.mem_end); + } + if (ptr->map.dma) +- printf(_("DMA chan:%x "), ptr->map.dma); ++ printf(_(" dma 0x%x"), ptr->map.dma); + printf("\n"); + } + printf("\n"); +Index: net-tools/lib/ipx.c +=================================================================== +--- net-tools.orig/lib/ipx.c ++++ net-tools/lib/ipx.c +@@ -133,6 +133,9 @@ static int IPX_input(int type, char *buf + char *ep; + int nbo; + ++ if (!sai) ++ return (-1); ++ + sai->sipx_family = AF_IPX; + sai->sipx_network = htonl(0); + sai->sipx_node[0] = sai->sipx_node[1] = sai->sipx_node[2] = +Index: net-tools/lib/ipx_gr.c +=================================================================== +--- net-tools.orig/lib/ipx_gr.c ++++ net-tools/lib/ipx_gr.c +@@ -38,21 +38,27 @@ int IPX_rprint(int options) + char net[128], router_net[128]; + char router_node[128]; + int num; +- FILE *fp = fopen(_PATH_PROCNET_IPX_ROUTE, "r"); ++ FILE *fp; + struct aftype *ap; + struct sockaddr sa; + +- if ((ap = get_afntype(AF_IPX)) == NULL) { +- EINTERN("lib/ipx_rt.c", "AF_IPX missing"); +- return (-1); +- } ++ fp = fopen(_PATH_PROCNET_IPX_ROUTE1, "r"); + + if (!fp) { +- perror(_PATH_PROCNET_IPX_ROUTE); +- printf(_("IPX not configured in this system.\n")); ++ fp = fopen(_PATH_PROCNET_IPX_ROUTE2, "r"); ++ } ++ ++ if (!fp) { ++ perror(NULL); ++ printf(_("IPX routing not in file %s or %s found.\n"), _PATH_PROCNET_IPX_ROUTE1, _PATH_PROCNET_IPX_ROUTE2); + return 1; + } + ++ if ((ap = get_afntype(AF_IPX)) == NULL) { ++ EINTERN("lib/ipx_rt.c", "AF_IPX missing"); ++ return (-1); ++ } ++ + printf(_("Kernel IPX routing table\n")); /* xxx */ + printf(_("Destination Router Net Router Node\n")); + +Index: net-tools/lib/irda.c +=================================================================== +--- net-tools.orig/lib/irda.c ++++ net-tools/lib/irda.c +@@ -1,13 +1,15 @@ + /********************************************************************* + * + * Filename: irda.c +- * Version: 0.1 +- * Description: A first attempt to make ifconfig understand IrDA ++ * Version: 0.2 ++ * Description: A second attempt to make ifconfig understand IrDA + * Status: Experimental. + * Author: Dag Brattli + * Created at: Wed Apr 21 09:03:09 1999 + * Modified at: Wed Apr 21 09:17:05 1999 + * Modified by: Dag Brattli ++ * Modified at: Wed May 1 11:51:44 CEST 2002 ++ * Modified by: Christoph Bartelmus + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as +@@ -59,9 +61,9 @@ + */ + static char *irda_print(unsigned char *ptr) + { +- static char buff[8]; ++ static char buff[12]; + +- sprintf(&buff[strlen(buff)], "%02x:%02x:%02x:%02x", ptr[3], ptr[2], ++ snprintf(buff, 12, "%02x:%02x:%02x:%02x", ptr[3], ptr[2], + ptr[1], ptr[0]); + + return (buff); +Index: net-tools/lib/net-features.h +=================================================================== +--- net-tools.orig/lib/net-features.h ++++ net-tools/lib/net-features.h +@@ -295,6 +295,13 @@ static char *Features = + "-" + #endif + "HDLC/LAPB " ++ ++#if HAVE_HWEUI64 ++"+" ++#else ++"-" ++#endif ++"EUI64 " + ; + + +Index: net-tools/lib/nstrcmp.c +=================================================================== +--- net-tools.orig/lib/nstrcmp.c ++++ net-tools/lib/nstrcmp.c +@@ -1,34 +1,157 @@ + /* Copyright 1998 by Andi Kleen. Subject to the GPL. */ +-/* $Id: nstrcmp.c,v 1.2 1998/11/15 20:11:38 freitag Exp $ */ ++/* rewritten by bernd eckenfels because of complicated alias semantic */ ++/* $Id: nstrcmp.c,v 1.4 2004/06/03 22:49:17 ecki Exp $ */ + #include + #include ++#include + #include "util.h" + +-/* like strcmp(), but knows about numbers */ +-int nstrcmp(const char *astr, const char *b) ++ ++/* return numerical :999 suffix or null. sideeffect: replace ':' with \0 */ ++char* cutalias(char* name) + { +- const char *a = astr; ++ int digit = 0; ++ int pos; ++ ++ for(pos=strlen(name); pos>0; pos--) ++ { ++ if (name[pos-1]==':' && digit) ++ { ++ name[pos-1]='\0'; ++ return name+pos; ++ } ++ if (!isdigit(name[pos-1])) ++ break; ++ digit = 1; ++ } ++ return NULL; ++} + +- while (*a == *b) { +- if (*a == '\0') +- return 0; +- a++; +- b++; +- } +- if (isdigit(*a)) { +- if (!isdigit(*b)) +- return -1; +- while (a > astr) { +- a--; +- if (!isdigit(*a)) { +- a++; +- break; +- } +- if (!isdigit(*b)) +- return -1; +- b--; ++ ++/* return index of last non digit or -1 if it does not end with digits */ ++int rindex_nondigit(char *name) ++{ ++ int pos = strlen(name); ++ ++ for(pos=strlen(name); pos>0; pos--) ++ { ++ if (!isdigit(name[pos-1])) ++ return pos; + } +- return atoi(a) > atoi(b) ? 1 : -1; +- } +- return *a - *b; ++ return 0; ++} ++ ++ ++/* like strcmp(), but knows about numbers and ':' alias suffix */ ++int nstrcmp(const char *ap, const char *bp) ++{ ++ char *a = (char*)strdup(ap); ++ char *b = (char*)strdup(bp); ++ char *an, *bn; ++ int av = 0, bv = 0; ++ char *aalias=cutalias(a); ++ char *balias=cutalias(b); ++ int aindex=rindex_nondigit(a); ++ int bindex=rindex_nondigit(b); ++ int complen=(aindex bindex) ++ { free(a); free(b); return 1; } ++ ++ if (aindex < bindex) ++ { free(a); free(b); return -1; } ++ ++ an = a+aindex; ++ bn = b+bindex; ++ ++ av = atoi(an); ++ bv = atoi(bn); ++ ++ if (av < bv) ++ { free(a); free(b); return -1; } ++ ++ if (av > bv) ++ { free(a); free(b); return 1; } ++ ++ av = -1; ++ if (aalias != NULL) ++ av = atoi(aalias); ++ ++ bv = -1; ++ if (balias != NULL) ++ bv = atoi(balias); ++ ++ free(a); free(b); ++ ++ if (av < bv) ++ return -1; ++ ++ if (av > bv) ++ return 1; ++ ++ return 0; ++} ++ ++ ++#ifdef NSTRCMP_TEST ++ ++int cs(int s) ++{ ++ if (s < 0) return -1; ++ if (s > 0) return 1; ++ return 0; ++} ++ ++ ++int dotest(char* a, char* b, int exp) ++{ ++ int res = nstrcmp(a, b); ++ int err = (cs(res) != cs(exp)); ++ printf("nstrcmp(\"%s\", \"%s\")=%d %d %s\n", a, b, res, exp, err?"WRONG":"OK"); ++ return err; + } ++ ++int main() ++{ ++ int err = 0; ++ ++ err |= dotest("eth1", "eth1", 0); ++ err |= dotest("eth0:1", "eth0:1", 0); ++ err |= dotest("lan", "lan", 0); ++ err |= dotest("100", "100", 0); ++ err |= dotest("", "", 0); ++ err |= dotest(":", ":", 0); ++ err |= dotest("a:b:c", "a:b:c", 0); ++ err |= dotest("a:", "a:", 0); ++ err |= dotest(":a", ":a", 0); ++ ++ err |= dotest("a", "aa", -1); ++ err |= dotest("eth0", "eth1", -1); ++ err |= dotest("eth1", "eth20", -1); ++ err |= dotest("eth20", "eth100", -1); ++ err |= dotest("eth1", "eth13", -1); ++ err |= dotest("eth", "eth2", -1); ++ err |= dotest("eth0:1", "eth0:2", -1); ++ err |= dotest("eth1:10", "eth13:10", -1); ++ err |= dotest("eth1:1", "eth1:13", -1); ++ err |= dotest("a", "a:", -1); ++ ++ err |= dotest("aa", "a", 1); ++ err |= dotest("eth2", "eth1", 1); ++ err |= dotest("eth13", "eth1", 1); ++ err |= dotest("eth2", "eth", 1); ++ err |= dotest("eth2:10", "eth2:1", 1); ++ err |= dotest("eth2:5", "eth2:4", 1); ++ err |= dotest("eth3:2", "eth2:3", 1); ++ err |= dotest("eth13:1", "eth1:0", 1); ++ err |= dotest("a:", "a", 1); ++ err |= dotest("a1b12", "a1b2", 1); ++ ++ return err; ++} ++ ++#endif +Index: net-tools/lib/pathnames.h +=================================================================== +--- net-tools.orig/lib/pathnames.h ++++ net-tools/lib/pathnames.h +@@ -1,4 +1,3 @@ +- + /* + * lib/pathnames.h This file contains the definitions of the path + * names used by the NET-LIB. +@@ -29,8 +28,10 @@ + #define _PATH_PROCNET_NR_NODES "/proc/net/nr_nodes" + #define _PATH_PROCNET_ARP "/proc/net/arp" + #define _PATH_PROCNET_AX25 "/proc/net/ax25" +-#define _PATH_PROCNET_IPX "/proc/net/ipx" +-#define _PATH_PROCNET_IPX_ROUTE "/proc/net/ipx_route" ++#define _PATH_PROCNET_IPX_SOCKET1 "/proc/net/ipx/socket" ++#define _PATH_PROCNET_IPX_SOCKET2 "/proc/net/ipx" ++#define _PATH_PROCNET_IPX_ROUTE1 "/proc/net/ipx/route" ++#define _PATH_PROCNET_IPX_ROUTE2 "/proc/net/ipx_route" + #define _PATH_PROCNET_ATALK "/proc/net/appletalk" + #define _PATH_PROCNET_IP_BLK "/proc/net/ip_block" + #define _PATH_PROCNET_IP_FWD "/proc/net/ip_forward" +@@ -45,6 +46,7 @@ + #define _PATH_PROCNET_X25 "/proc/net/x25" + #define _PATH_PROCNET_X25_ROUTE "/proc/net/x25_routes" + #define _PATH_PROCNET_DEV_MCAST "/proc/net/dev_mcast" ++#define _PATH_PROCNET_ATALK_ROUTE "/proc/net/atalk_route" + + /* pathname for the netlink device */ + #define _PATH_DEV_ROUTE "/dev/route" +Index: net-tools/lib/proc.c +=================================================================== +--- net-tools.orig/lib/proc.c ++++ net-tools/lib/proc.c +@@ -1,11 +1,12 @@ + /* Tolerant /proc file parser. Copyright 1998 Andi Kleen */ +-/* $Id: proc.c,v 1.4 1999/01/05 20:54:00 philip Exp $ */ ++/* $Id: proc.c,v 1.5 2007/12/01 18:44:57 ecki Exp $ */ + /* Fixme: cannot currently cope with removed fields */ + + #include + #include + #include + #include ++#include + + /* Caller must free return string. */ + +@@ -72,3 +73,22 @@ int proc_guess_fmt(char *name, FILE *fh, + va_end(ap); + return flag; + } ++ ++ ++FILE *proc_fopen(const char *name) ++{ ++ static char *buffer; ++ static size_t pagesz; ++ FILE *fd = fopen(name, "r"); ++ ++ if (fd == NULL) ++ return NULL; ++ ++ if (!buffer) { ++ pagesz = getpagesize(); ++ buffer = malloc(pagesz); ++ } ++ ++ setvbuf(fd, buffer, _IOFBF, pagesz); ++ return fd; ++} +Index: net-tools/lib/proc.h +=================================================================== +--- net-tools.orig/lib/proc.h ++++ net-tools/lib/proc.h +@@ -1,5 +1,7 @@ +- +- +-/* Generate a suitable scanf format for a column title line */ ++/* ++ * prototypes for proc.c ++ */ + char *proc_gen_fmt(char *name, int more, FILE * fh,...); + int proc_guess_fmt(char *name, FILE* fh,...); ++FILE *proc_fopen(const char *name); ++ +Index: net-tools/lib/tr.c +=================================================================== +--- net-tools.orig/lib/tr.c ++++ net-tools/lib/tr.c +@@ -2,7 +2,7 @@ + * lib/tr.c This file contains an implementation of the "Tokenring" + * support functions. + * +- * Version: $Id: tr.c,v 1.8 2000/02/02 08:56:30 freitag Exp $ ++ * Version: $Id: tr.c,v 1.9 2005/05/16 03:15:12 ecki Exp $ + * + * Author: Fred N. van Kempen, + * Copyright 1993 MicroWalt Corporation +@@ -30,8 +30,14 @@ + #include "net-support.h" + #include "pathnames.h" + #include "intl.h" ++#include "util.h" + ++ ++/* actual definition at the end of file */ + extern struct hwtype tr_hwtype; ++#ifdef ARPHRD_IEEE802_TR ++extern struct hwtype tr_hwtype1; ++#endif + + static char *pr_tr(unsigned char *ptr) + { +@@ -42,7 +48,7 @@ static char *pr_tr(unsigned char *ptr) + (ptr[3] & 0377), (ptr[4] & 0377), (ptr[5] & 0377) + ); + return (buff); +-} ++ } + + + static int in_tr(char *bufp, struct sockaddr *sap) +@@ -51,7 +57,17 @@ static int in_tr(char *bufp, struct sock + char c, *orig; + int i, val; + ++#ifdef ARPHRD_IEEE802_TR ++ if (kernel_version() < KRELEASE(2,3,30)) { ++ sap->sa_family = tr_hwtype.type; ++ } else { ++ sap->sa_family = tr_hwtype1.type; ++ } ++#else + sap->sa_family = tr_hwtype.type; ++ #warning "Limited functionality, no support for ARPHRD_IEEE802_TR (old kernel headers?)" ++#endif ++ + ptr = sap->sa_data; + + i = 0; +Index: net-tools/lib/util-ank.c +=================================================================== +--- net-tools.orig/lib/util-ank.c ++++ net-tools/lib/util-ank.c +@@ -293,7 +293,7 @@ int inet_addr_match(inet_prefix *a, inet + return 0; + } + +-const char *format_host(int af, void *addr, __u8 *abuf, int alen) ++const char *format_host(int af, void *addr, char *abuf, int alen) + { + #ifdef RESOLVE_HOSTNAMES + if (resolve_hosts) { +Index: net-tools/lib/util.h +=================================================================== +--- net-tools.orig/lib/util.h ++++ net-tools/lib/util.h +@@ -14,3 +14,6 @@ int nstrcmp(const char *, const char *); + + char *safe_strncpy(char *dst, const char *src, size_t size); + ++ ++#define netmin(a,b) ((a)<(b) ? (a) : (b)) ++#define netmax(a,b) ((a)>(b) ? (a) : (b)) +Index: net-tools/lib/x25_sr.c +=================================================================== +--- net-tools.orig/lib/x25_sr.c ++++ net-tools/lib/x25_sr.c +@@ -67,7 +67,7 @@ static int X25_setroute(int action, int + strcpy(target, *args++); + + /* Clean out the x25_route_struct structure. */ +- memset((char *) &rt, 0, sizeof(struct x25_route_struct)); ++ memset((char *) &rt, 0, sizeof(rt)); + + + if ((sigdigits = x25_aftype.input(0, target, (struct sockaddr *)&sx25)) < 0) { +@@ -76,8 +76,8 @@ static int X25_setroute(int action, int + } + rt.sigdigits=sigdigits; + +- /* x25_route_struct.address isn't type struct sockaddr_x25, Why? */ +- memcpy(&rt.address, &sx25.sx25_addr, sizeof(x25_address)); ++ /* this works with 2.4 and 2.6 headers struct x25_address vs. typedef */ ++ memcpy(&rt.address, &sx25.sx25_addr, sizeof(sx25.sx25_addr)); + + while (*args) { + if (!strcmp(*args,"device") || !strcmp(*args,"dev")) { +Index: net-tools/lib/eui64.c +=================================================================== +--- /dev/null ++++ net-tools/lib/eui64.c +@@ -0,0 +1,155 @@ ++/* ++ * lib/eui64.c This file contains support for generic EUI-64 hw addressing ++ * ++ * Version: $Id: eui64.c,v 1.1 2001/11/12 02:12:05 ecki Exp $ ++ * ++ * Author: Daniel Stodden ++ * Copyright 2001 Daniel Stodden ++ * ++ * blueprinted from ether.c ++ * Copyright 1993 MicroWalt Corporation ++ * ++ * This program is free software; you can redistribute it ++ * and/or modify it under the terms of the GNU General ++ * Public License as published by the Free Software ++ * Foundation; either version 2 of the License, or (at ++ * your option) any later version. ++ */ ++#include "config.h" ++ ++#if HAVE_HWEUI64 ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "net-support.h" ++#include "pathnames.h" ++#include "intl.h" ++ ++/* ++ * EUI-64 constants ++ */ ++ ++#define EUI64_ALEN 8 ++ ++#ifndef ARPHRD_EUI64 ++#define ARPHRD_EUI64 27 ++#warning "ARPHRD_EUI64 not defined in . Using private value 27" ++#endif ++ ++struct hwtype eui64_hwtype; ++ ++/* Display an EUI-64 address in readable format. */ ++static char *pr_eui64( unsigned char *ptr ) ++{ ++ static char buff[64]; ++ ++ snprintf(buff, sizeof(buff), "%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X", ++ (ptr[0] & 0377), (ptr[1] & 0377), (ptr[2] & 0377), (ptr[3] & 0377), ++ (ptr[4] & 0377), (ptr[5] & 0377), (ptr[6] & 0377), (ptr[7] & 0377) ++ ); ++ return (buff); ++} ++ ++/* Start the PPP encapsulation on the file descriptor. */ ++static int in_eui64( char *bufp, struct sockaddr *sap ) ++{ ++ unsigned char *ptr; ++ char c, *orig; ++ int i; ++ unsigned val; ++ ++ sap->sa_family = eui64_hwtype.type; ++ ptr = sap->sa_data; ++ ++ i = 0; ++ orig = bufp; ++ ++ while ((*bufp != '\0') && (i < EUI64_ALEN)) { ++ val = 0; ++ c = *bufp++; ++ if (isdigit(c)) ++ val = c - '0'; ++ else if (c >= 'a' && c <= 'f') ++ val = c - 'a' + 10; ++ else if (c >= 'A' && c <= 'F') ++ val = c - 'A' + 10; ++ else { ++#ifdef DEBUG ++ fprintf( stderr, _("in_eui64(%s): invalid eui64 address!\n"), ++ orig ); ++#endif ++ errno = EINVAL; ++ return (-1); ++ } ++ ++ val <<= 4; ++ c = *bufp; ++ if (isdigit(c)) ++ val |= c - '0'; ++ else if (c >= 'a' && c <= 'f') ++ val |= c - 'a' + 10; ++ else if (c >= 'A' && c <= 'F') ++ val |= c - 'A' + 10; ++ else if (c == ':' || c == 0) ++ val >>= 4; ++ else { ++#ifdef DEBUG ++ fprintf( stderr, _("in_eui64(%s): invalid eui64 address!\n"), ++ orig ); ++#endif ++ errno = EINVAL; ++ return (-1); ++ } ++ ++ if (c != 0) ++ bufp++; ++ ++ *ptr++ = (unsigned char) (val & 0377); ++ i++; ++ ++ /* We might get a semicolon here - not required. */ ++ if (*bufp == ':') { ++ if (i == EUI64_ALEN) { ++#ifdef DEBUG ++ fprintf(stderr, _("in_eui64(%s): trailing : ignored!\n"), ++ orig) ++#endif ++ ; /* nothing */ ++ } ++ bufp++; ++ } ++ } ++ ++ /* That's it. Any trailing junk? */ ++ if ((i == EUI64_ALEN) && (*bufp != '\0')) { ++#ifdef DEBUG ++ fprintf(stderr, _("in_eui64(%s): trailing junk!\n"), orig); ++ errno = EINVAL; ++ return (-1); ++#endif ++ } ++#ifdef DEBUG ++ fprintf(stderr, "in_eui64(%s): %s\n", orig, pr_eui64(sap->sa_data)); ++#endif ++ ++ return (0); ++} ++ ++struct hwtype eui64_hwtype = ++{ ++ "eui64", NULL, /*"EUI-64 addressing", */ ARPHRD_EUI64, EUI64_ALEN, ++ pr_eui64, in_eui64, NULL, 0 ++}; ++ ++ ++#endif /* HAVE_EUI64 */ +Index: net-tools/lib/ib.c +=================================================================== +--- /dev/null ++++ net-tools/lib/ib.c +@@ -0,0 +1,147 @@ ++/* ++ * lib/ib.c This file contains an implementation of the "Infiniband" ++ * support functions. ++ * ++ * Version: $Id: ib.c,v 1.1 2005/02/06 11:00:47 tduffy Exp $ ++ * ++ * Author: Fred N. van Kempen, ++ * Copyright 1993 MicroWalt Corporation ++ * Tom Duffy ++ * ++ * This program is free software; you can redistribute it ++ * and/or modify it under the terms of the GNU General ++ * Public License as published by the Free Software ++ * Foundation; either version 2 of the License, or (at ++ * your option) any later version. ++ */ ++#include "config.h" ++ ++#if HAVE_HWIB ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "net-support.h" ++#include "pathnames.h" ++#include "intl.h" ++#include "util.h" ++ ++extern struct hwtype ib_hwtype; ++ ++ ++/* Display an InfiniBand address in readable format. */ ++static char *pr_ib(unsigned char *ptr) ++{ ++ static char buff[128]; ++ char *pos; ++ unsigned int i; ++ ++ pos = buff; ++ for (i = 0; i < INFINIBAND_ALEN; i++) { ++ pos += sprintf(pos, "%02X:", (*ptr++ & 0377)); ++ } ++ buff[strlen(buff) - 1] = '\0'; ++ ++ /* snprintf(buff, sizeof(buff), "%02X:%02X:%02X:%02X:%02X:%02X", ++ (ptr[0] & 0377), (ptr[1] & 0377), (ptr[2] & 0377), ++ (ptr[3] & 0377), (ptr[4] & 0377), (ptr[5] & 0377) ++ ); ++ */ ++ return (buff); ++} ++ ++ ++/* Input an Infiniband address and convert to binary. */ ++static int in_ib(char *bufp, struct sockaddr *sap) ++{ ++ unsigned char *ptr; ++ char c, *orig; ++ int i; ++ unsigned val; ++ ++ sap->sa_family = ib_hwtype.type; ++ ptr = sap->sa_data; ++ ++ i = 0; ++ orig = bufp; ++ while ((*bufp != '\0') && (i < INFINIBAND_ALEN)) { ++ val = 0; ++ c = *bufp++; ++ if (isdigit(c)) ++ val = c - '0'; ++ else if (c >= 'a' && c <= 'f') ++ val = c - 'a' + 10; ++ else if (c >= 'A' && c <= 'F') ++ val = c - 'A' + 10; ++ else { ++#ifdef DEBUG ++ fprintf(stderr, _("in_ib(%s): invalid infiniband address!\n"), orig); ++#endif ++ errno = EINVAL; ++ return (-1); ++ } ++ val <<= 4; ++ c = *bufp; ++ if (isdigit(c)) ++ val |= c - '0'; ++ else if (c >= 'a' && c <= 'f') ++ val |= c - 'a' + 10; ++ else if (c >= 'A' && c <= 'F') ++ val |= c - 'A' + 10; ++ else if (c == ':' || c == 0) ++ val >>= 4; ++ else { ++#ifdef DEBUG ++ fprintf(stderr, _("in_ib(%s): invalid infiniband address!\n"), orig); ++#endif ++ errno = EINVAL; ++ return (-1); ++ } ++ if (c != 0) ++ bufp++; ++ *ptr++ = (unsigned char) (val & 0377); ++ i++; ++ ++ /* We might get a semicolon here - not required. */ ++ if (*bufp == ':') { ++ if (i == INFINIBAND_ALEN) { ++#ifdef DEBUG ++ fprintf(stderr, _("in_ib(%s): trailing : ignored!\n"), ++ orig) ++#endif ++ ; /* nothing */ ++ } ++ bufp++; ++ } ++ } ++ ++ /* That's it. Any trailing junk? */ ++ if ((i == INFINIBAND_ALEN) && (*bufp != '\0')) { ++#ifdef DEBUG ++ fprintf(stderr, _("in_ib(%s): trailing junk!\n"), orig); ++ errno = EINVAL; ++ return (-1); ++#endif ++ } ++#ifdef DEBUG ++ fprintf(stderr, "in_ib(%s): %s\n", orig, pr_ib(sap->sa_data)); ++#endif ++ ++ return (0); ++} ++ ++ ++struct hwtype ib_hwtype = ++{ ++ "infiniband", NULL, ARPHRD_INFINIBAND, INFINIBAND_ALEN, ++ pr_ib, in_ib, NULL ++}; ++ ++ ++#endif /* HAVE_HWIB */ --- net-tools-1.60.orig/debian/patches/CVS-20051204-arp.c_sync.patch +++ net-tools-1.60/debian/patches/CVS-20051204-arp.c_sync.patch @@ -0,0 +1,311 @@ +Sync with upstream CVS, complete log: + +Revision 1.25 - Sun Dec 4 02:57:15 2005 UTC by ecki +In order to fix alignment bugs with recent GCCs I have to use +sockaddr_storage instead of sockaddr for allocation. +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=340384 +Thanks to Blars Blarson, Jurij Smakov and Steve Langasek + +Revision 1.24 - Mon May 16 04:30:17 2005 UTC by ecki +desupport dontpub in arp.8 and arp -? (Debian Bug #203396) + +Revision 1.23 - Sat Feb 8 19:56:25 2003 UTC by ecki +fixed an logic error in the "not found" handling for deleting entries +also added a documentation comment and newer errno values for 2.4 +Thanks to niteowl@intrinsity.com for pointing out. + +Revision 1.22 - Tue Dec 10 01:01:24 2002 UTC by ecki +change confusing "*" into "" + +Revision 1.21 - Sun May 6 02:14:07 2001 UTC by ecki +changed a type arp -a now prints PUB instead of PUP for proxy arp entries + +Index: net-tools/arp.c +=================================================================== +--- net-tools.orig/arp.c ++++ net-tools/arp.c +@@ -8,7 +8,7 @@ + * NET-3 Networking Distribution for the LINUX operating + * system. + * +- * Version: $Id: arp.c,v 1.20 2001/04/08 17:05:05 pb Exp $ ++ * Version: $Id: arp.c,v 1.25 2005/12/04 02:57:15 ecki Exp $ + * + * Maintainer: Bernd 'eckes' Eckenfels, + * +@@ -100,9 +100,10 @@ static int arp_del(char **args) + { + char host[128]; + struct arpreq req; +- struct sockaddr sa; ++ struct sockaddr_storage ss; ++ struct sockaddr *sa; + int flags = 0; +- int err; ++ int deleted = 0; + + memset((char *) &req, 0, sizeof(req)); + +@@ -112,12 +113,13 @@ static int arp_del(char **args) + return (-1); + } + safe_strncpy(host, *args, (sizeof host)); +- if (ap->input(0, host, &sa) < 0) { ++ sa = (struct sockaddr *)&ss; ++ if (ap->input(0, host, sa) < 0) { + ap->herror(host); + return (-1); + } + /* If a host has more than one address, use the correct one! */ +- memcpy((char *) &req.arp_pa, (char *) &sa, sizeof(struct sockaddr)); ++ memcpy((char *) &req.arp_pa, (char *) sa, sizeof(struct sockaddr)); + + if (hw_set) + req.arp_ha.sa_family = hw->type; +@@ -148,7 +150,7 @@ static int arp_del(char **args) + continue; + } + if (!strcmp(*args, "dontpub")) { +-#ifdef HAVE_ATF_DONTPUB ++#ifdef ATF_DONTPUB + req.arp_flags |= ATF_DONTPUB; + #else + ENOSUPP("arp", "ATF_DONTPUB"); +@@ -157,7 +159,7 @@ static int arp_del(char **args) + continue; + } + if (!strcmp(*args, "auto")) { +-#ifdef HAVE_ATF_MAGIC ++#ifdef ATF_MAGIC + req.arp_flags |= ATF_MAGIC; + #else + ENOSUPP("arp", "ATF_MAGIC"); +@@ -177,11 +179,11 @@ static int arp_del(char **args) + usage(); + if (strcmp(*args, "255.255.255.255") != 0) { + strcpy(host, *args); +- if (ap->input(0, host, &sa) < 0) { ++ if (ap->input(0, host, sa) < 0) { + ap->herror(host); + return (-1); + } +- memcpy((char *) &req.arp_netmask, (char *) &sa, ++ memcpy((char *) &req.arp_netmask, (char *) sa, + sizeof(struct sockaddr)); + req.arp_flags |= ATF_NETMASK; + } +@@ -190,35 +192,41 @@ static int arp_del(char **args) + } + usage(); + } ++ ++ // if neighter priv nor pub is given, work on both + if (flags == 0) + flags = 3; + + strcpy(req.arp_dev, device); + +- err = -1; ++ /* unfortuatelly the kernel interface does not allow us to ++ delete private entries anlone, so we need this hack ++ to avoid "not found" errors if we try both. */ ++ deleted = 0; + + /* Call the kernel. */ + if (flags & 2) { + if (opt_v) +- fprintf(stderr, "arp: SIOCDARP(nopub)\n"); +- if ((err = ioctl(sockfd, SIOCDARP, &req) < 0)) { +- if (errno == ENXIO) { ++ fprintf(stderr, "arp: SIOCDARP(dontpub)\n"); ++ if (ioctl(sockfd, SIOCDARP, &req) < 0) { ++ if ((errno == ENXIO) || (errno == ENOENT)) { + if (flags & 1) +- goto nopub; ++ goto dontpub; + printf(_("No ARP entry for %s\n"), host); + return (-1); + } +- perror("SIOCDARP(priv)"); ++ perror("SIOCDARP(dontpub)"); + return (-1); +- } ++ } else ++ deleted = 1; + } +- if ((flags & 1) && (err)) { +- nopub: ++ if (!deleted && (flags & 1)) { ++ dontpub: + req.arp_flags |= ATF_PUBL; + if (opt_v) + fprintf(stderr, "arp: SIOCDARP(pub)\n"); + if (ioctl(sockfd, SIOCDARP, &req) < 0) { +- if (errno == ENXIO) { ++ if ((errno == ENXIO) || (errno == ENOENT)) { + printf(_("No ARP entry for %s\n"), host); + return (-1); + } +@@ -260,7 +268,8 @@ static int arp_set(char **args) + { + char host[128]; + struct arpreq req; +- struct sockaddr sa; ++ struct sockaddr_storage ss; ++ struct sockaddr *sa; + int flags; + + memset((char *) &req, 0, sizeof(req)); +@@ -271,12 +280,13 @@ static int arp_set(char **args) + return (-1); + } + safe_strncpy(host, *args++, (sizeof host)); +- if (ap->input(0, host, &sa) < 0) { ++ sa = (struct sockaddr *)&ss; ++ if (ap->input(0, host, sa) < 0) { + ap->herror(host); + return (-1); + } + /* If a host has more than one address, use the correct one! */ +- memcpy((char *) &req.arp_pa, (char *) &sa, sizeof(struct sockaddr)); ++ memcpy((char *) &req.arp_pa, (char *) sa, sizeof(struct sockaddr)); + + /* Fetch the hardware address. */ + if (*args == NULL) { +@@ -317,7 +327,7 @@ static int arp_set(char **args) + continue; + } + if (!strcmp(*args, "dontpub")) { +-#ifdef HAVE_ATF_DONTPUB ++#ifdef ATF_DONTPUB + flags |= ATF_DONTPUB; + #else + ENOSUPP("arp", "ATF_DONTPUB"); +@@ -326,7 +336,7 @@ static int arp_set(char **args) + continue; + } + if (!strcmp(*args, "auto")) { +-#ifdef HAVE_ATF_MAGIC ++#ifdef ATF_MAGIC + flags |= ATF_MAGIC; + #else + ENOSUPP("arp", "ATF_MAGIC"); +@@ -346,11 +356,11 @@ static int arp_set(char **args) + usage(); + if (strcmp(*args, "255.255.255.255") != 0) { + strcpy(host, *args); +- if (ap->input(0, host, &sa) < 0) { ++ if (ap->input(0, host, sa) < 0) { + ap->herror(host); + return (-1); + } +- memcpy((char *) &req.arp_netmask, (char *) &sa, ++ memcpy((char *) &req.arp_netmask, (char *) sa, + sizeof(struct sockaddr)); + flags |= ATF_NETMASK; + } +@@ -445,11 +455,11 @@ static void arp_disp_2(char *name, int t + strcat(flags, "M"); + if (arp_flags & ATF_PUBL) + strcat(flags, "P"); +-#ifdef HAVE_ATF_MAGIC ++#ifdef ATF_MAGIC + if (arp_flags & ATF_MAGIC) + strcat(flags, "A"); + #endif +-#ifdef HAVE_ATF_DONTPUB ++#ifdef ATF_DONTPUB + if (arp_flags & ATF_DONTPUB) + strcat(flags, "!"); + #endif +@@ -463,7 +473,7 @@ static void arp_disp_2(char *name, int t + + if (!(arp_flags & ATF_COM)) { + if (arp_flags & ATF_PUBL) +- printf("%-8.8s%-20.20s", "*", "*"); ++ printf("%-8.8s%-20.20s", "*", _("")); + else + printf("%-8.8s%-20.20s", "", _("(incomplete)")); + } else { +@@ -486,7 +496,7 @@ static void arp_disp(char *name, char *i + + if (!(arp_flags & ATF_COM)) { + if (arp_flags & ATF_PUBL) +- printf("* "); ++ printf(" "); + else + printf(_(" ")); + } else { +@@ -499,12 +509,12 @@ static void arp_disp(char *name, char *i + if (arp_flags & ATF_PERM) + printf("PERM "); + if (arp_flags & ATF_PUBL) +- printf("PUP "); +-#ifdef HAVE_ATF_MAGIC ++ printf("PUB "); ++#ifdef ATF_MAGIC + if (arp_flags & ATF_MAGIC) + printf("AUTO "); + #endif +-#ifdef HAVE_ATF_DONTPUB ++#ifdef ATF_DONTPUB + if (arp_flags & ATF_DONTPUB) + printf("DONTPUB "); + #endif +@@ -519,7 +529,8 @@ static void arp_disp(char *name, char *i + static int arp_show(char *name) + { + char host[100]; +- struct sockaddr sa; ++ struct sockaddr_storage ss; ++ struct sockaddr *sa; + char ip[100]; + char hwa[100]; + char mask[100]; +@@ -532,14 +543,15 @@ static int arp_show(char *name) + + host[0] = '\0'; + ++ sa = (struct sockaddr *)&ss; + if (name != NULL) { + /* Resolve the host name. */ + safe_strncpy(host, name, (sizeof host)); +- if (ap->input(0, host, &sa) < 0) { ++ if (ap->input(0, host, sa) < 0) { + ap->herror(host); + return (-1); + } +- safe_strncpy(host, ap->sprint(&sa, 1), sizeof(host)); ++ safe_strncpy(host, ap->sprint(sa, 1), sizeof(host)); + } + /* Open the PROCps kernel table. */ + if ((fp = fopen(_PATH_PROCNET_ARP, "r")) == NULL) { +@@ -575,10 +587,10 @@ static int arp_show(char *name) + if (opt_n) + hostname = "?"; + else { +- if (ap->input(0, ip, &sa) < 0) ++ if (ap->input(0, ip, sa) < 0) + hostname = ip; + else +- hostname = ap->sprint(&sa, opt_n | 0x8000); ++ hostname = ap->sprint(sa, opt_n | 0x8000); + if (strcmp(hostname, ip) == 0) + hostname = "?"; + } +@@ -612,11 +624,10 @@ static void version(void) + static void usage(void) + { + fprintf(stderr, _("Usage:\n arp [-vn] [] [-i ] [-a] [] <-Display ARP cache\n")); +- fprintf(stderr, _(" arp [-v] [-i ] -d [pub][nopub] <-Delete ARP entry\n")); +- fprintf(stderr, _(" arp [-vnD] [] [-i ] -f [] <-Add entry from file\n")); +- fprintf(stderr, _(" arp [-v] [] [-i ] -s [temp][nopub] <-Add entry\n")); +- fprintf(stderr, _(" arp [-v] [] [-i ] -s [netmask ] pub <-''-\n")); +- fprintf(stderr, _(" arp [-v] [] [-i ] -Ds [netmask ] pub <-''-\n\n")); ++ fprintf(stderr, _(" arp [-v] [-i ] -d [pub] <-Delete ARP entry\n")); ++ fprintf(stderr, _(" arp [-vnD] [] [-i ] -f [] <-Add entry from file\n")); ++ fprintf(stderr, _(" arp [-v] [] [-i ] -s [temp] <-Add entry\n")); ++ fprintf(stderr, _(" arp [-v] [] [-i ] -Ds [netmask ] pub <-''-\n\n")); + + fprintf(stderr, _(" -a display (all) hosts in alternative (BSD) style\n")); + fprintf(stderr, _(" -s, --set set a new ARP entry\n")); --- net-tools-1.60.orig/debian/patches/CVS-20030911-nameif.c_sync.patch +++ net-tools-1.60/debian/patches/CVS-20030911-nameif.c_sync.patch @@ -0,0 +1,90 @@ +Sync with upstream CVS, complete log: + +Revision 1.4 - Thu Sep 11 03:46:49 2003 UTC by ak +Fix off by one in name length checking + +Revision 1.3 - Thu Mar 6 23:26:52 2003 UTC by ecki +Fix Debian Bug#178209, Fix RedHat Bug#85748: nameif segfaults + +Revision 1.2 - Sun Nov 25 06:55:06 2001 UTC by ecki +fixed debian bug#111642 reported by Jonathan Amery +(newline missing in nameif usage) + +Index: net-tools/nameif.c +=================================================================== +--- net-tools.orig/nameif.c ++++ net-tools/nameif.c +@@ -3,7 +3,7 @@ + * Writen 2000 by Andi Kleen. + * Subject to the Gnu Public License, version 2. + * TODO: make it support token ring etc. +- * $Id: nameif.c,v 1.1 2000/10/18 17:26:29 ak Exp $ ++ * $Id: nameif.c,v 1.4 2003/09/11 03:46:49 ak Exp $ + */ + #ifndef _GNU_SOURCE + #define _GNU_SOURCE +@@ -117,7 +117,8 @@ int getmac(char *name, unsigned char *ma + } + + struct change { +- struct change *next,**pprev; ++ struct change *next; ++ int found; + char ifname[IFNAMSIZ+1]; + unsigned char mac[6]; + }; +@@ -139,10 +140,7 @@ int addchange(char *p, struct change *ch + ch->ifname, pos); + if (parsemac(p,ch->mac) < 0) + complain(_("cannot parse MAC `%s' at %s"), p, pos); +- if (clist) +- clist->pprev = &ch->next; + ch->next = clist; +- ch->pprev = &clist; + clist = ch; + return 0; + } +@@ -177,7 +175,7 @@ void readconf(void) + if (*p == '\0') + continue; + n = strcspn(p, " \t"); +- if (n > IFNAMSIZ) ++ if (n > IFNAMSIZ-1) + complain(_("interface name too long at line %d"), line); + memcpy(ch->ifname, p, n); + ch->ifname[n] = 0; +@@ -200,7 +198,7 @@ struct option lopt[] = { + + void usage(void) + { +- fprintf(stderr, _("usage: nameif [-c configurationfile] [-s] {ifname macaddress}")); ++ fprintf(stderr, _("usage: nameif [-c configurationfile] [-s] {ifname macaddress}\n")); + exit(1); + } + +@@ -277,21 +275,21 @@ int main(int ac, char **av) + ch = lookupmac(mac); + if (!ch) + continue; +- +- *ch->pprev = ch->next; ++ ++ ch->found = 1; + if (strcmp(p, ch->ifname)) { + if (setname(p, ch->ifname) < 0) + complain(_("cannot change name of %s to %s: %s"), + p, ch->ifname, strerror(errno)); + } +- free(ch); + } + fclose(ifh); + + while (clist) { + struct change *ch = clist; + clist = clist->next; +- warning(_("interface '%s' not found"), ch->ifname); ++ if (!ch->found) ++ warning(_("interface '%s' not found"), ch->ifname); + free(ch); + } + --- net-tools-1.60.orig/debian/patches/CVS-20020730-route.c_opts_64.patch +++ net-tools-1.60/debian/patches/CVS-20020730-route.c_opts_64.patch @@ -0,0 +1,39 @@ +Add support for -6 & -4 flags to route.c +From upstream CVS +Index: net-tools/route.c +=================================================================== +--- net-tools.orig/route.c ++++ net-tools/route.c +@@ -2,7 +2,7 @@ + * route This file contains an implementation of the command + * that manages the IP routing table in the kernel. + * +- * Version: $Id: route.c,v 1.9 2001/04/15 14:41:17 pb Exp $ ++ * Version: $Id: route.c,v 1.10 2002/07/30 05:24:20 ecki Exp $ + * + * Maintainer: Bernd 'eckes' Eckenfels, + * +@@ -142,7 +142,7 @@ int main(int argc, char **argv) + } + + /* Fetch the command-line arguments. */ +- while ((i = getopt_long(argc, argv, "A:eCFhnNVv?", longopts, &lop)) != EOF) ++ while ((i = getopt_long(argc, argv, "A:eCFhnN64Vv?", longopts, &lop)) != EOF) + switch (i) { + case -1: + break; +@@ -176,6 +176,14 @@ int main(int argc, char **argv) + if ((i = aftrans_opt(optarg))) + exit(i); + break; ++ case '6': ++ if ((i = aftrans_opt("inet6"))) ++ exit(i); ++ break; ++ case '4': ++ if ((i = aftrans_opt("inet"))) ++ exit(i); ++ break; + case 'V': + version(); + case 'h': --- net-tools-1.60.orig/debian/patches/lib_local_changes.patch +++ net-tools-1.60/debian/patches/lib_local_changes.patch @@ -0,0 +1,410 @@ +Changes extracted from diff.gz, not present in upstream's CVS. + +Index: net-tools/lib/ec_hw.c +=================================================================== +--- net-tools.orig/lib/ec_hw.c ++++ net-tools/lib/ec_hw.c +@@ -16,6 +16,8 @@ + + #if HAVE_HWEC + ++#include ++ + #include + #include "net-support.h" + +Index: net-tools/lib/fddi.c +=================================================================== +--- net-tools.orig/lib/fddi.c ++++ net-tools/lib/fddi.c +@@ -26,6 +26,7 @@ + #error "No FDDI Support in your current Kernelsource Tree." + #error "Disable HW Type FDDI" + #endif ++#include + #if __GLIBC__ >= 2 + #include + #else +Index: net-tools/lib/interface.c +=================================================================== +--- net-tools.orig/lib/interface.c ++++ net-tools/lib/interface.c +@@ -594,7 +594,7 @@ int do_if_print(struct interface *ife, v + + void ife_print_short(struct interface *ptr) + { +- printf("%-5.5s ", ptr->name); ++ printf("%-9s ", ptr->name); + printf("%5d %-2d ", ptr->mtu, ptr->metric); + /* If needed, display the interface statistics. */ + if (ptr->statistics_valid) { +@@ -653,8 +653,7 @@ void ife_print_long(struct interface *pt + unsigned long long rx, tx, short_rx, short_tx; + const char *Rext = "B"; + const char *Text = "B"; +- static char flags[200]; +- ++ + #if HAVE_AFIPX + static struct aftype *ipxtype = NULL; + #endif +@@ -686,70 +685,32 @@ void ife_print_long(struct interface *pt + if (hw == NULL) + hw = get_hwntype(-1); + +- sprintf(flags, "flags=%d<", ptr->flags); +- /* DONT FORGET TO ADD THE FLAGS IN ife_print_short, too */ +- if (ptr->flags == 0) +- strcat(flags,">"); +- if (ptr->flags & IFF_UP) +- strcat(flags,_("UP,")); +- if (ptr->flags & IFF_BROADCAST) +- strcat(flags,_("BROADCAST,")); +- if (ptr->flags & IFF_DEBUG) +- strcat(flags,_("DEBUG,")); +- if (ptr->flags & IFF_LOOPBACK) +- strcat(flags,_("LOOPBACK,")); +- if (ptr->flags & IFF_POINTOPOINT) +- strcat(flags,_("POINTOPOINT,")); +- if (ptr->flags & IFF_NOTRAILERS) +- strcat(flags,_("NOTRAILERS,")); +- if (ptr->flags & IFF_RUNNING) +- strcat(flags,_("RUNNING,")); +- if (ptr->flags & IFF_NOARP) +- strcat(flags,_("NOARP,")); +- if (ptr->flags & IFF_PROMISC) +- strcat(flags,_("PROMISC,")); +- if (ptr->flags & IFF_ALLMULTI) +- strcat(flags,_("ALLMULTI,")); +- if (ptr->flags & IFF_SLAVE) +- strcat(flags,_("SLAVE,")); +- if (ptr->flags & IFF_MASTER) +- strcat(flags,_("MASTER,")); +- if (ptr->flags & IFF_MULTICAST) +- strcat(flags,_("MULTICAST,")); +-#ifdef HAVE_DYNAMIC +- if (ptr->flags & IFF_DYNAMIC) +- strcat(flags,_("DYNAMIC,")); +-#endif +- /* DONT FORGET TO ADD THE FLAGS IN ife_print_short */ +- if (flags[strlen(flags)-1] == ',') +- flags[strlen(flags)-1] = '>'; +- else +- flags[strlen(flags)-1] = 0; +- +- +- printf(_("%s: %s mtu %d metric %d"), +- ptr->name, flags, ptr->mtu, ptr->metric ? ptr->metric : 1); +-#ifdef SIOCSKEEPALIVE +- if (ptr->outfill || ptr->keepalive) +- printf(_(" outfill %d keepalive %d"), +- ptr->outfill, ptr->keepalive); ++ printf(_("%-9s Link encap:%s "), ptr->name, hw->title); ++ /* For some hardware types (eg Ash, ATM) we don't print the ++ hardware address if it's null. */ ++ if (hw->print != NULL && (! (hw_null_address(hw, ptr->hwaddr) && ++ hw->suppress_null_addr))) ++ printf(_("HWaddr %s "), hw->print(ptr->hwaddr)); ++#ifdef IFF_PORTSEL ++ if (ptr->flags & IFF_PORTSEL) { ++ printf(_("Media:%s"), if_port_text[ptr->map.port][0]); ++ if (ptr->flags & IFF_AUTOMEDIA) ++ printf(_("(auto)")); ++ } + #endif + printf("\n"); + +- +- + #if HAVE_AFINET + if (ptr->has_ip) { +- printf(_(" %s %s"), ap->name, ++ printf(_(" %s addr:%s "), ap->name, + ap->sprint(&ptr->addr, 1)); +- printf(_(" netmask %s"), ap->sprint(&ptr->netmask, 1)); +- if (ptr->flags & IFF_BROADCAST) { +- printf(_(" broadcast %s"), ap->sprint(&ptr->broadaddr, 1)); +- } + if (ptr->flags & IFF_POINTOPOINT) { +- printf(_(" destination %s"), ap->sprint(&ptr->dstaddr, 1)); ++ printf(_(" P-t-P:%s "), ap->sprint(&ptr->dstaddr, 1)); + } +- printf("\n"); ++ if (ptr->flags & IFF_BROADCAST) { ++ printf(_(" Bcast:%s "), ap->sprint(&ptr->broadaddr, 1)); ++ } ++ printf(_(" Mask:%s\n"), ap->sprint(&ptr->netmask, 1)); + } + #endif + +@@ -757,7 +718,7 @@ void ife_print_long(struct interface *pt + /* FIXME: should be integrated into interface.c. */ + + if ((f = fopen(_PATH_PROCNET_IFINET6, "r")) != NULL) { +- while (fscanf(f, "%4s%4s%4s%4s%4s%4s%4s%4s %02x %02x %02x %02x %20s\n", ++ while (fscanf(f, "%4s%4s%4s%4s%4s%4s%4s%4s %08x %02x %02x %02x %20s\n", + addr6p[0], addr6p[1], addr6p[2], addr6p[3], + addr6p[4], addr6p[5], addr6p[6], addr6p[7], + &if_idx, &plen, &scope, &dad_status, devname) != EOF) { +@@ -766,30 +727,29 @@ void ife_print_long(struct interface *pt + addr6p[0], addr6p[1], addr6p[2], addr6p[3], + addr6p[4], addr6p[5], addr6p[6], addr6p[7]); + inet6_aftype.input(1, addr6, (struct sockaddr *) &sap); +- printf(_(" %s %s prefixlen %d"), +- inet6_aftype.name, +- inet6_aftype.sprint((struct sockaddr *) &sap, 1), +- plen); +- printf(_(" scopeid 0x%x"), scope); +- +- flags[0] = '<'; flags[1] = 0; +- if (scope & IPV6_ADDR_COMPATv4) { +- strcat(flags, _("compat,")); +- scope -= IPV6_ADDR_COMPATv4; ++ printf(_(" inet6 addr: %s/%d"), ++ inet6_aftype.sprint((struct sockaddr *) &sap, 1), plen); ++ printf(_(" Scope:")); ++ switch (scope) { ++ case 0: ++ printf(_("Global")); ++ break; ++ case IPV6_ADDR_LINKLOCAL: ++ printf(_("Link")); ++ break; ++ case IPV6_ADDR_SITELOCAL: ++ printf(_("Site")); ++ break; ++ case IPV6_ADDR_COMPATv4: ++ printf(_("Compat")); ++ break; ++ case IPV6_ADDR_LOOPBACK: ++ printf(_("Host")); ++ break; ++ default: ++ printf(_("Unknown")); + } +- if (scope == 0) +- strcat(flags, _("global,")); +- if (scope & IPV6_ADDR_LINKLOCAL) +- strcat(flags, _("link,")); +- if (scope & IPV6_ADDR_SITELOCAL) +- strcat(flags, _("site,")); +- if (scope & IPV6_ADDR_LOOPBACK) +- strcat(flags, _("host,")); +- if (flags[strlen(flags)-1] == ',') +- flags[strlen(flags)-1] = '>'; +- else +- flags[strlen(flags)-1] = 0; +- printf("%s\n", flags); ++ printf("\n"); + } + } + fclose(f); +@@ -802,17 +762,17 @@ void ife_print_long(struct interface *pt + + if (ipxtype != NULL) { + if (ptr->has_ipx_bb) +- printf(_(" %s Ethernet-II %s\n"), +- ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_bb, 1)); ++ printf(_(" IPX/Ethernet II addr:%s\n"), ++ ipxtype->sprint(&ptr->ipxaddr_bb, 1)); + if (ptr->has_ipx_sn) +- printf(_(" %s Ethernet-SNAP %s\n"), +- ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_sn, 1)); ++ printf(_(" IPX/Ethernet SNAP addr:%s\n"), ++ ipxtype->sprint(&ptr->ipxaddr_sn, 1)); + if (ptr->has_ipx_e2) +- printf(_(" %s Ethernet802.2 %s\n"), +- ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_e2, 1)); ++ printf(_(" IPX/Ethernet 802.2 addr:%s\n"), ++ ipxtype->sprint(&ptr->ipxaddr_e2, 1)); + if (ptr->has_ipx_e3) +- printf(_(" %s Ethernet802.3 %s\n"), +- ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_e3, 1)); ++ printf(_(" IPX/Ethernet 802.3 addr:%s\n"), ++ ipxtype->sprint(&ptr->ipxaddr_e3, 1)); + } + #endif + +@@ -821,7 +781,7 @@ void ife_print_long(struct interface *pt + ddptype = get_afntype(AF_APPLETALK); + if (ddptype != NULL) { + if (ptr->has_ddp) +- printf(_(" %s %s\n"), ddptype->name, ddptype->sprint(&ptr->ddpaddr, 1)); ++ printf(_(" EtherTalk Phase 2 addr:%s\n"), ddptype->sprint(&ptr->ddpaddr, 1)); + } + #endif + +@@ -830,30 +790,53 @@ void ife_print_long(struct interface *pt + ectype = get_afntype(AF_ECONET); + if (ectype != NULL) { + if (ptr->has_econet) +- printf(_(" %s %s\n"), ectype->name, ectype->sprint(&ptr->ecaddr, 1)); ++ printf(_(" econet addr:%s\n"), ectype->sprint(&ptr->ecaddr, 1)); + } + #endif + +- /* For some hardware types (eg Ash, ATM) we don't print the +- hardware address if it's null. */ +- if (hw->print != NULL && (! (hw_null_address(hw, ptr->hwaddr) && +- hw->suppress_null_addr))) +- printf(_(" %s %s"), hw->name, hw->print(ptr->hwaddr)); +- else +- printf(_(" %s"), hw->name); +- if (ptr->tx_queue_len != -1) +- printf(_(" txqueuelen %d"), ptr->tx_queue_len); +- printf(" (%s)\n", hw->title); +- +-#ifdef IFF_PORTSEL +- if (ptr->flags & IFF_PORTSEL) { +- printf(_(" media %s"), if_port_text[ptr->map.port][0]); +- if (ptr->flags & IFF_AUTOMEDIA) +- printf(_("autoselect")); +- printf("\n"); +- } ++ printf(" "); ++ /* DONT FORGET TO ADD THE FLAGS IN ife_print_short, too */ ++ if (ptr->flags == 0) ++ printf(_("[NO FLAGS] ")); ++ if (ptr->flags & IFF_UP) ++ printf(_("UP ")); ++ if (ptr->flags & IFF_BROADCAST) ++ printf(_("BROADCAST ")); ++ if (ptr->flags & IFF_DEBUG) ++ printf(_("DEBUG ")); ++ if (ptr->flags & IFF_LOOPBACK) ++ printf(_("LOOPBACK ")); ++ if (ptr->flags & IFF_POINTOPOINT) ++ printf(_("POINTOPOINT ")); ++ if (ptr->flags & IFF_NOTRAILERS) ++ printf(_("NOTRAILERS ")); ++ if (ptr->flags & IFF_RUNNING) ++ printf(_("RUNNING ")); ++ if (ptr->flags & IFF_NOARP) ++ printf(_("NOARP ")); ++ if (ptr->flags & IFF_PROMISC) ++ printf(_("PROMISC ")); ++ if (ptr->flags & IFF_ALLMULTI) ++ printf(_("ALLMULTI ")); ++ if (ptr->flags & IFF_SLAVE) ++ printf(_("SLAVE ")); ++ if (ptr->flags & IFF_MASTER) ++ printf(_("MASTER ")); ++ if (ptr->flags & IFF_MULTICAST) ++ printf(_("MULTICAST ")); ++#ifdef HAVE_DYNAMIC ++ if (ptr->flags & IFF_DYNAMIC) ++ printf(_("DYNAMIC ")); + #endif +- ++ /* DONT FORGET TO ADD THE FLAGS IN ife_print_short */ ++ printf(_(" MTU:%d Metric:%d"), ++ ptr->mtu, ptr->metric ? ptr->metric : 1); ++#ifdef SIOCSKEEPALIVE ++ if (ptr->outfill || ptr->keepalive) ++ printf(_(" Outfill:%d Keepalive:%d"), ++ ptr->outfill, ptr->keepalive); ++#endif ++ printf("\n"); + + /* If needed, display the interface statistics. */ + +@@ -862,8 +845,19 @@ void ife_print_long(struct interface *pt + * not for the aliases, although strictly speaking they're shared + * by all addresses. + */ ++ printf(" "); ++ ++ printf(_("RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"), ++ ptr->stats.rx_packets, ptr->stats.rx_errors, ++ ptr->stats.rx_dropped, ptr->stats.rx_fifo_errors, ++ ptr->stats.rx_frame_errors); ++ if (can_compress) ++ printf(_(" compressed:%lu\n"), ptr->stats.rx_compressed); ++ + rx = ptr->stats.rx_bytes; ++ tx = ptr->stats.tx_bytes; + short_rx = rx * 10; ++ short_tx = tx * 10; + if (rx > 1125899906842624ull) { + short_rx /= 1125899906842624ull; + Rext = "PiB"; +@@ -880,8 +874,6 @@ void ife_print_long(struct interface *pt + short_rx /= 1024; + Rext = "KiB"; + } +- tx = ptr->stats.tx_bytes; +- short_tx = tx * 10; + if (tx > 1125899906842624ull) { + short_tx /= 1125899906842624ull; + Text = "PiB"; +@@ -899,50 +891,37 @@ void ife_print_long(struct interface *pt + Text = "KiB"; + } + +- printf(" "); +- printf(_("RX packets %llu bytes %llu (%lu.%lu %s)\n"), +- ptr->stats.rx_packets, +- rx, (unsigned long)(short_rx / 10), +- (unsigned long)(short_rx % 10), Rext); +- if (can_compress) { +- printf(" "); +- printf(_("RX compressed:%lu\n"), ptr->stats.rx_compressed); +- } +- printf(" "); +- printf(_("RX errors %lu dropped %lu overruns %lu frame %lu\n"), +- ptr->stats.rx_errors, ptr->stats.rx_dropped, +- ptr->stats.rx_fifo_errors, ptr->stats.rx_frame_errors); +- +- +- printf(" "); +- printf(_("TX packets %llu bytes %llu (%lu.%lu %s)\n"), +- ptr->stats.tx_packets, +- tx, (unsigned long)(short_tx / 10), +- (unsigned long)(short_tx % 10), Text); +- if (can_compress) { +- printf(" "); +- printf(_("TX compressed %lu\n"), ptr->stats.tx_compressed); +- } +- printf(" "); +- printf(_("TX errors %lu dropped %lu overruns %lu carrier %lu collisions %lu\n"), +- ptr->stats.tx_errors, ++ printf(" "); ++ printf(_("TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"), ++ ptr->stats.tx_packets, ptr->stats.tx_errors, + ptr->stats.tx_dropped, ptr->stats.tx_fifo_errors, +- ptr->stats.tx_carrier_errors, ptr->stats.collisions); ++ ptr->stats.tx_carrier_errors); ++ printf(_(" collisions:%lu "), ptr->stats.collisions); ++ if (can_compress) ++ printf(_("compressed:%lu "), ptr->stats.tx_compressed); ++ if (ptr->tx_queue_len != -1) ++ printf(_("txqueuelen:%d "), ptr->tx_queue_len); ++ printf("\n "); ++ printf(_("RX bytes:%llu (%lu.%lu %s) TX bytes:%llu (%lu.%lu %s)\n"), ++ rx, (unsigned long)(short_rx / 10), ++ (unsigned long)(short_rx % 10), Rext, ++ tx, (unsigned long)(short_tx / 10), ++ (unsigned long)(short_tx % 10), Text); + } + + if ((ptr->map.irq || ptr->map.mem_start || ptr->map.dma || + ptr->map.base_addr >= 0x100)) { +- printf(" device "); ++ printf(" "); + if (ptr->map.irq) +- printf(_("interrupt %d "), ptr->map.irq); ++ printf(_("Interrupt:%d "), ptr->map.irq); + if (ptr->map.base_addr >= 0x100) /* Only print devices using it for + I/O maps */ +- printf(_("base 0x%x "), ptr->map.base_addr); ++ printf(_("Base address:0x%x "), ptr->map.base_addr); + if (ptr->map.mem_start) { +- printf(_("memory 0x%lx-%lx "), ptr->map.mem_start, ptr->map.mem_end); ++ printf(_("Memory:%lx-%lx "), ptr->map.mem_start, ptr->map.mem_end); + } + if (ptr->map.dma) +- printf(_(" dma 0x%x"), ptr->map.dma); ++ printf(_("DMA chan:%x "), ptr->map.dma); + printf("\n"); + } + printf("\n");