diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2012-09-26 01:10:42 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2018-05-31 22:51:55 +0200 |
| commit | 9664bee729d487bcc0a0bc35859f8e13d5421c75 (patch) | |
| tree | b428a16618e36ed864a8d76ea3435e19a452bf90 /source/a/util-linux | |
| parent | 75a4a592e5ccda30715f93563d741b83e0dcf39e (diff) | |
| download | current-9664bee729d487bcc0a0bc35859f8e13d5421c75.tar.gz current-9664bee729d487bcc0a0bc35859f8e13d5421c75.tar.xz | |
Slackware 14.0slackware-14.0
Wed Sep 26 01:10:42 UTC 2012
Slackware 14.0 x86_64 stable is released!
We're perfectionists here at Slackware, so this release has been a long
time a-brewing. But we think you'll agree that it was worth the wait.
Slackware 14.0 combines modern components, ease of use, and flexible
configuration... our "KISS" philosophy demands it.
The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a
dual-sided
32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware
project by picking up a copy from store.slackware.com. We're taking
pre-orders now, and offer a discount if you sign up for a subscription.
Thanks to everyone who helped make this happen. The Slackware team, the
upstream developers, and (of course) the awesome Slackware user
community.
Have fun! :-)
Diffstat (limited to 'source/a/util-linux')
| -rw-r--r-- | source/a/util-linux/0001-mount-old-fix-encryption-usage.patch | 88 | ||||
| -rw-r--r-- | source/a/util-linux/0002-fdisk-don-t-ignore-1MiB-granularity-on-512-byte-sect.patch | 31 | ||||
| -rw-r--r-- | source/a/util-linux/adjtimex_1.29-2.2.diff (renamed from source/a/util-linux/adjtimex_1.23-1.diff) | 4560 | ||||
| -rw-r--r-- | source/a/util-linux/column-fix_long_opts.diff | 15 | ||||
| -rw-r--r-- | source/a/util-linux/net-tools.config.h | 78 | ||||
| -rw-r--r-- | source/a/util-linux/net-tools.diff | 77 | ||||
| -rw-r--r-- | source/a/util-linux/net-tools_1.60-19.diff | 29401 | ||||
| -rwxr-xr-x | source/a/util-linux/util-linux.SlackBuild | 38 |
8 files changed, 3071 insertions, 31217 deletions
diff --git a/source/a/util-linux/0001-mount-old-fix-encryption-usage.patch b/source/a/util-linux/0001-mount-old-fix-encryption-usage.patch new file mode 100644 index 000000000..afe6e5c91 --- /dev/null +++ b/source/a/util-linux/0001-mount-old-fix-encryption-usage.patch @@ -0,0 +1,88 @@ +--- ./mount/mount.c.orig 2012-05-25 04:44:58.993195438 -0500 ++++ ./mount/mount.c 2012-08-02 12:04:52.455435631 -0500 +@@ -41,6 +41,7 @@ + #include "nls.h" + #include "blkdev.h" + #include "strutils.h" ++#include "xgetpass.h" + + #define DO_PS_FIDDLING + +@@ -1238,6 +1239,8 @@ + int looptype; + uintmax_t offset = 0, sizelimit = 0; + struct loopdev_cxt lc; ++ char *pwd = NULL; ++ int ret = EX_FAIL; + + /* + * In the case of a loop mount, either type is of the form lo@/dev/loop5 +@@ -1317,8 +1320,18 @@ + return EX_FAIL; + } + ++ if (opt_encryption) { ++#ifdef MCL_FUTURE ++ if (mlockall(MCL_CURRENT | MCL_FUTURE)) { ++ error(_("mount: couldn't lock into memory")); ++ return EX_FAIL; ++ } ++#endif ++ pwd = xgetpass(pfd, _("Password: ")); ++ } ++ + loopcxt_init(&lc, 0); +- /* loopcxt_enable_debug(&lc, 1); */ ++ /*loopcxt_enable_debug(&lc, 1);*/ + + if (*loopdev && **loopdev) + loopcxt_set_device(&lc, *loopdev); /* use loop=<devname> */ +@@ -1343,6 +1356,8 @@ + rc = loopcxt_set_offset(&lc, offset); + if (!rc && sizelimit) + rc = loopcxt_set_sizelimit(&lc, sizelimit); ++ if (!rc && opt_encryption && pwd) ++ loopcxt_set_encryption(&lc, opt_encryption, pwd); + if (!rc) + loopcxt_set_flags(&lc, loop_opts); + +@@ -1358,8 +1373,7 @@ + break; /* success */ + + if (rc != -EBUSY) { +- if (verbose) +- printf(_("mount: failed setting up loop device\n")); ++ error(_("mount: %s: failed setting up loop device: %m"), *loopfile); + if (!opt_loopdev) { + my_free(*loopdev); + *loopdev = NULL; +@@ -1399,9 +1413,15 @@ + } + } + +- return 0; ++ ret = 0; + err: +- return EX_FAIL; ++ if (pwd) { ++ char *p = pwd; ++ while (*p) ++ *p++ = '\0'; ++ free(pwd); ++ } ++ return ret; + } + + +--- ./mount/Makefile.am.orig 2012-05-25 04:44:58.000000000 -0500 ++++ ./mount/Makefile.am 2012-08-02 12:04:14.958439138 -0500 +@@ -23,7 +23,8 @@ + $(top_srcdir)/lib/at.c \ + $(top_srcdir)/lib/sysfs.c \ + $(top_srcdir)/lib/loopdev.c \ +- $(top_srcdir)/lib/strutils.c ++ $(top_srcdir)/lib/strutils.c \ ++ $(top_srcdir)/lib/xgetpass.c + + # generic flags for all programs + # -- note that pkg-config autoconf macros (pkg.m4) does not differentiate diff --git a/source/a/util-linux/0002-fdisk-don-t-ignore-1MiB-granularity-on-512-byte-sect.patch b/source/a/util-linux/0002-fdisk-don-t-ignore-1MiB-granularity-on-512-byte-sect.patch new file mode 100644 index 000000000..4d3622c32 --- /dev/null +++ b/source/a/util-linux/0002-fdisk-don-t-ignore-1MiB-granularity-on-512-byte-sect.patch @@ -0,0 +1,31 @@ +--- ./fdisk/fdisk.c.orig 2012-05-25 04:44:58.977195366 -0500 ++++ ./fdisk/fdisk.c 2012-08-02 12:00:59.692457377 -0500 +@@ -569,6 +569,19 @@ + lba_is_aligned(unsigned long long lba) + { + unsigned int granularity = max(phy_sector_size, min_io_size); ++ unsigned long long offset; ++ ++ if (grain > granularity) ++ granularity = grain; ++ offset = (lba * sector_size) & (granularity - 1); ++ ++ return !((granularity + alignment_offset - offset) & (granularity - 1)); ++} ++ ++static int ++lba_is_phy_aligned(unsigned long long lba) ++{ ++ unsigned int granularity = max(phy_sector_size, min_io_size); + unsigned long long offset = (lba * sector_size) & (granularity - 1); + + return !((granularity + alignment_offset - offset) & (granularity - 1)); +@@ -1808,7 +1821,7 @@ + static void + check_alignment(unsigned long long lba, int partition) + { +- if (!lba_is_aligned(lba)) ++ if (!lba_is_phy_aligned(lba)) + printf(_("Partition %i does not start on physical sector boundary.\n"), + partition + 1); + } diff --git a/source/a/util-linux/adjtimex_1.23-1.diff b/source/a/util-linux/adjtimex_1.29-2.2.diff index 8c250157e..62ac1db34 100644 --- a/source/a/util-linux/adjtimex_1.23-1.diff +++ b/source/a/util-linux/adjtimex_1.29-2.2.diff @@ -1,13 +1,107 @@ ---- adjtimex-1.23.orig/config.sub -+++ adjtimex-1.23/config.sub -@@ -0,0 +1,1622 @@ +--- adjtimex-1.29.orig/adjtimex.lsm ++++ adjtimex-1.29/adjtimex.lsm +@@ -1,7 +1,7 @@ + Begin4 + Title: adjtimex - display or set the kernel time variables + Version: 1.29 +-Entered-date: 2010-04-16 ++Entered-date: 2010-05-26 + Description: Display or set the kernel time variables. + This program gives you raw access to the kernel time variables. For + a machine connected to the Internet, or equipped with a precision +--- adjtimex-1.29.orig/config.h ++++ adjtimex-1.29/config.h +@@ -0,0 +1,80 @@ ++/* config.h. Generated from config.h.in by configure. */ ++/* config.h.in. Generated from configure.in by autoheader. */ ++ ++/* Define to 1 if you have the `gettimeofday' function. */ ++#define HAVE_GETTIMEOFDAY 1 ++ ++/* Define to 1 if you have the <inttypes.h> header file. */ ++#define HAVE_INTTYPES_H 1 ++ ++/* Define to 1 if you have the <linux/rtc.h> header file. */ ++#define HAVE_LINUX_RTC_H 1 ++ ++/* Define to 1 if you have the <memory.h> header file. */ ++#define HAVE_MEMORY_H 1 ++ ++/* Define to 1 if you have the `mktime' function. */ ++#define HAVE_MKTIME 1 ++ ++/* Define to 1 if you have the `putenv' function. */ ++#define HAVE_PUTENV 1 ++ ++/* Define to 1 if you have the `select' function. */ ++#define HAVE_SELECT 1 ++ ++/* Define to 1 if you have the <stdint.h> header file. */ ++#define HAVE_STDINT_H 1 ++ ++/* Define to 1 if you have the <stdlib.h> header file. */ ++#define HAVE_STDLIB_H 1 ++ ++/* Define to 1 if you have the <strings.h> header file. */ ++#define HAVE_STRINGS_H 1 ++ ++/* Define to 1 if you have the <string.h> header file. */ ++#define HAVE_STRING_H 1 ++ ++/* Define to 1 if you have the <sys/stat.h> header file. */ ++#define HAVE_SYS_STAT_H 1 ++ ++/* Define to 1 if you have the <sys/time.h> header file. */ ++#define HAVE_SYS_TIME_H 1 ++ ++/* Define to 1 if you have the <sys/types.h> header file. */ ++#define HAVE_SYS_TYPES_H 1 ++ ++/* Define to 1 if you have the <unistd.h> header file. */ ++#define HAVE_UNISTD_H 1 ++ ++/* Define to the address where bug reports for this package should be sent. */ ++#define PACKAGE_BUGREPORT "" ++ ++/* Define to the full name of this package. */ ++#define PACKAGE_NAME "" ++ ++/* Define to the full name and version of this package. */ ++#define PACKAGE_STRING "" ++ ++/* Define to the one symbol short name of this package. */ ++#define PACKAGE_TARNAME "" ++ ++/* Define to the version of this package. */ ++#define PACKAGE_VERSION "" ++ ++/* Define to 1 if you have the ANSI C header files. */ ++#define STDC_HEADERS 1 ++ ++/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ ++#define TIME_WITH_SYS_TIME 1 ++ ++/* Define to 1 if your <sys/time.h> declares `struct tm'. */ ++/* #undef TM_IN_SYS_TIME */ ++ ++/* Define to empty if `const' does not conform to ANSI C. */ ++/* #undef const */ ++ ++/* Define to `__inline__' or `__inline' if that's what the C compiler ++ calls it, or to nothing if 'inline' is not supported under any name. */ ++#ifndef __cplusplus ++/* #undef inline */ ++#endif +--- adjtimex-1.29.orig/config.sub ++++ adjtimex-1.29/config.sub +@@ -0,0 +1,1760 @@ +#! /bin/sh +# Configuration validation subroutine script. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -+# Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011 Free Software Foundation, Inc. + -+timestamp='2007-01-18' ++timestamp='2011-03-23' + +# This file is (in principle) common to ALL GNU software. +# The presence of a machine in this file suggests that SOME GNU software @@ -35,13 +129,16 @@ + + +# Please send patches to <config-patches@gnu.org>. Submit a context -+# diff and a properly formatted ChangeLog entry. ++# diff and a properly formatted GNU ChangeLog entry. +# +# Configuration subroutine to validate and canonicalize a configuration type. +# Supply the specified configuration type as an argument. +# If it is invalid, we print an error message on stderr and exit with code 1. +# Otherwise, we print the canonical config type on stdout and succeed. + ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD ++ +# This file is supposed to be the same for all GNU packages +# and recognize all the CPU types, system types and aliases +# that are meaningful with *any* GNU software. @@ -75,8 +172,9 @@ +version="\ +GNU config.sub ($timestamp) + -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -+Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free ++Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -123,8 +221,10 @@ +# Here we must recognize all the valid KERNEL-OS combinations. +maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` +case $maybe_os in -+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ -+ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ ++ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ ++ linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ ++ knetbsd*-gnu* | netbsd*-gnu* | \ ++ kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` @@ -151,10 +251,13 @@ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ -+ -apple | -axis | -knuth | -cray) ++ -apple | -axis | -knuth | -cray | -microblaze) + os= + basic_machine=$1 + ;; ++ -bluegene*) ++ os=-cnk ++ ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 @@ -169,10 +272,10 @@ + os=-chorusos + basic_machine=$1 + ;; -+ -chorusrdb) -+ os=-chorusrdb ++ -chorusrdb) ++ os=-chorusrdb + basic_machine=$1 -+ ;; ++ ;; + -hiux*) + os=-hiuxwe2 + ;; @@ -252,13 +355,16 @@ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ ++ | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ -+ | maxq | mb | microblaze | mcore | mep \ ++ | maxq | mb | microblaze | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ -+ | mips64vr | mips64vrel \ ++ | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ ++ | mips64r5900 | mips64r5900el \ ++ | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ @@ -271,28 +377,42 @@ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ ++ | moxie \ + | mt \ + | msp430 \ ++ | nds32 | nds32le | nds32be \ + | nios | nios2 \ + | ns16k | ns32k \ ++ | open8 \ + | or32 \ + | pdp10 | pdp11 | pj | pjl \ -+ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ ++ | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pyramid \ ++ | rx \ + | score \ -+ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ ++ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ -+ | spu | strongarm \ -+ | tahoe | thumb | tic4x | tic80 | tron \ ++ | spu \ ++ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ ++ | ubicom32 \ + | v850 | v850e \ + | we32k \ -+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ -+ | z8k) ++ | x86 | xc16x | xstormy16 | xtensa \ ++ | z8k | z80) + basic_machine=$basic_machine-unknown + ;; -+ m6811 | m68hc11 | m6812 | m68hc12) ++ c54x) ++ basic_machine=tic54x-unknown ++ ;; ++ c55x) ++ basic_machine=tic55x-unknown ++ ;; ++ c6x) ++ basic_machine=tic6x-unknown ++ ;; ++ m6811 | m68hc11 | m6812 | m68hc12 | picochip) + # Motorola 68HC11/12. + basic_machine=$basic_machine-unknown + os=-none @@ -303,6 +423,18 @@ + basic_machine=mt-unknown + ;; + ++ strongarm | thumb | xscale) ++ basic_machine=arm-unknown ++ ;; ++ ++ xscaleeb) ++ basic_machine=armeb-unknown ++ ;; ++ ++ xscaleel) ++ basic_machine=armel-unknown ++ ;; ++ + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. @@ -323,7 +455,7 @@ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ + | bfin-* | bs2000-* \ -+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ ++ | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ @@ -332,14 +464,17 @@ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ ++ | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ -+ | m88110-* | m88k-* | maxq-* | mcore-* \ ++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ -+ | mips64vr-* | mips64vrel-* \ ++ | mips64octeon-* | mips64octeonel-* \ + | mips64orion-* | mips64orionel-* \ ++ | mips64r5900-* | mips64r5900el-* \ ++ | mips64vr-* | mips64vrel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ @@ -354,27 +489,35 @@ + | mmix-* \ + | mt-* \ + | msp430-* \ ++ | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ ++ | open8-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ -+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ ++ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pyramid-* \ -+ | romp-* | rs6000-* \ -+ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ ++ | romp-* | rs6000-* | rx-* \ ++ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ -+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ -+ | tahoe-* | thumb-* \ ++ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ ++ | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ ++ | tile-* | tilegx-* \ + | tron-* \ ++ | ubicom32-* \ + | v850-* | v850e-* | vax-* \ + | we32k-* \ -+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ -+ | xstormy16-* | xtensa-* \ ++ | x86-* | x86_64-* | xc16x-* | xps100-* \ ++ | xstormy16-* | xtensa*-* \ + | ymp-* \ -+ | z8k-*) ++ | z8k-* | z80-*) ++ ;; ++ # Recognize the basic CPU types without company name, with glob match. ++ xtensa*) ++ basic_machine=$basic_machine-unknown + ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. @@ -392,7 +535,7 @@ + basic_machine=a29k-amd + os=-udi + ;; -+ abacus) ++ abacus) + basic_machine=abacus-unknown + ;; + adobe68k) @@ -438,6 +581,10 @@ + basic_machine=m68k-apollo + os=-bsd + ;; ++ aros) ++ basic_machine=i386-pc ++ os=-aros ++ ;; + aux) + basic_machine=m68k-apple + os=-aux @@ -446,10 +593,35 @@ + basic_machine=ns32k-sequent + os=-dynix + ;; ++ blackfin) ++ basic_machine=bfin-unknown ++ os=-linux ++ ;; ++ blackfin-*) ++ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; ++ bluegene*) ++ basic_machine=powerpc-ibm ++ os=-cnk ++ ;; ++ c54x-*) ++ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ c55x-*) ++ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ c6x-*) ++ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; ++ cegcc) ++ basic_machine=arm-unknown ++ os=-cegcc ++ ;; + convex-c1) + basic_machine=c1-convex + os=-bsd @@ -478,8 +650,8 @@ + basic_machine=craynv-cray + os=-unicosmp + ;; -+ cr16c) -+ basic_machine=cr16c-unknown ++ cr16 | cr16-*) ++ basic_machine=cr16-unknown + os=-elf + ;; + crds | unos) @@ -517,6 +689,10 @@ + basic_machine=m88k-motorola + os=-sysv3 + ;; ++ dicos) ++ basic_machine=i686-pc ++ os=-dicos ++ ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp @@ -671,6 +847,14 @@ + basic_machine=m68k-isi + os=-sysv + ;; ++ m68knommu) ++ basic_machine=m68k-unknown ++ os=-linux ++ ;; ++ m68knommu-*) ++ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; + m88k-omron*) + basic_machine=m88k-omron + ;; @@ -682,10 +866,17 @@ + basic_machine=ns32k-utek + os=-sysv + ;; ++ microblaze) ++ basic_machine=microblaze-xilinx ++ ;; + mingw32) + basic_machine=i386-pc + os=-mingw32 + ;; ++ mingw32ce) ++ basic_machine=arm-unknown ++ os=-mingw32ce ++ ;; + miniframe) + basic_machine=m68000-convergent + ;; @@ -782,6 +973,12 @@ + np1) + basic_machine=np1-gould + ;; ++ neo-tandem) ++ basic_machine=neo-tandem ++ ;; ++ nse-tandem) ++ basic_machine=nse-tandem ++ ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; @@ -812,6 +1009,14 @@ + basic_machine=i860-intel + os=-osf + ;; ++ parisc) ++ basic_machine=hppa-unknown ++ os=-linux ++ ;; ++ parisc-*) ++ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; + pbd) + basic_machine=sparc-tti + ;; @@ -856,9 +1061,10 @@ + ;; + power) basic_machine=power-ibm + ;; -+ ppc) basic_machine=powerpc-unknown ++ ppc | ppcbe) basic_machine=powerpc-unknown + ;; -+ ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ppc-* | ppcbe-*) ++ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle | ppc-le | powerpc-little) + basic_machine=powerpcle-unknown @@ -952,6 +1158,9 @@ + basic_machine=i860-stratus + os=-sysv4 + ;; ++ strongarm-* | thumb-*) ++ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + sun2) + basic_machine=m68000-sun + ;; @@ -1008,17 +1217,14 @@ + basic_machine=t90-cray + os=-unicos + ;; -+ tic54x | c54x*) -+ basic_machine=tic54x-unknown -+ os=-coff -+ ;; -+ tic55x | c55x*) -+ basic_machine=tic55x-unknown -+ os=-coff ++ # This must be matched before tile*. ++ tilegx*) ++ basic_machine=tilegx-unknown ++ os=-linux-gnu + ;; -+ tic6x | c6x*) -+ basic_machine=tic6x-unknown -+ os=-coff ++ tile*) ++ basic_machine=tile-unknown ++ os=-linux-gnu + ;; + tx39) + basic_machine=mipstx39-unknown @@ -1087,6 +1293,9 @@ + xps | xps100) + basic_machine=xps100-honeywell + ;; ++ xscale-* | xscalee[bl]-*) ++ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` ++ ;; + ymp) + basic_machine=ymp-cray + os=-unicos @@ -1095,6 +1304,10 @@ + basic_machine=z8k-unknown + os=-sim + ;; ++ z80-*-coff) ++ basic_machine=z80-unknown ++ os=-sim ++ ;; + none) + basic_machine=none-none + os=-none @@ -1133,7 +1346,7 @@ + we32k) + basic_machine=we32k-att + ;; -+ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) ++ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) @@ -1180,9 +1393,12 @@ +if [ x"$os" != x"" ] +then +case $os in -+ # First match some system type aliases -+ # that might get confused with valid system types. ++ # First match some system type aliases ++ # that might get confused with valid system types. + # -solaris* is a basic system type, with this one exception. ++ -auroraux) ++ os=-auroraux ++ ;; + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` + ;; @@ -1203,10 +1419,11 @@ + # Each alternative MUST END IN A *, to match a version number. + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ -+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ -+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ ++ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ ++ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ ++ | -sym* | -kopensolaris* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ -+ | -aos* \ ++ | -aos* | -aros* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ @@ -1215,9 +1432,10 @@ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ -+ | -chorusos* | -chorusrdb* \ ++ | -chorusos* | -chorusrdb* | -cegcc* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ ++ | -mingw32* | -linux-gnu* | -linux-android* \ ++ | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1225,7 +1443,7 @@ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ -+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) ++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) @@ -1264,7 +1482,7 @@ + -opened*) + os=-openedition + ;; -+ -os400*) ++ -os400*) + os=-os400 + ;; + -wince*) @@ -1313,7 +1531,7 @@ + -sinix*) + os=-sysv4 + ;; -+ -tpf*) ++ -tpf*) + os=-tpf + ;; + -triton*) @@ -1355,6 +1573,11 @@ + -zvmoe) + os=-zvmoe + ;; ++ -dicos*) ++ os=-dicos ++ ;; ++ -nacl*) ++ ;; + -none) + ;; + *) @@ -1377,10 +1600,10 @@ +# system, and we'll never get to this point. + +case $basic_machine in -+ score-*) ++ score-*) + os=-elf + ;; -+ spu-*) ++ spu-*) + os=-elf + ;; + *-acorn) @@ -1392,8 +1615,17 @@ + arm*-semi) + os=-aout + ;; -+ c4x-* | tic4x-*) -+ os=-coff ++ c4x-* | tic4x-*) ++ os=-coff ++ ;; ++ tic54x-*) ++ os=-coff ++ ;; ++ tic55x-*) ++ os=-coff ++ ;; ++ tic6x-*) ++ os=-coff + ;; + # This must come before the *-dec entry. + pdp10-*) @@ -1420,7 +1652,7 @@ + m68*-cisco) + os=-aout + ;; -+ mep-*) ++ mep-*) + os=-elf + ;; + mips*-cisco) @@ -1447,7 +1679,7 @@ + *-ibm) + os=-aix + ;; -+ *-knuth) ++ *-knuth) + os=-mmixware + ;; + *-wec) @@ -1552,7 +1784,7 @@ + -sunos*) + vendor=sun + ;; -+ -aix*) ++ -cnk*|-aix*) + vendor=ibm + ;; + -beos*) @@ -1623,16 +1855,97 @@ +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: ---- adjtimex-1.23.orig/config.guess -+++ adjtimex-1.23/config.guess -@@ -0,0 +1,1516 @@ +--- adjtimex-1.29.orig/Makefile ++++ adjtimex-1.29/Makefile +@@ -0,0 +1,78 @@ ++#### Start of system configuration section. -*-makefile-*- #### ++ srcdir = . ++VPATH = . ++ ++VERSION=1.29 ++ ++CFLAGS = -Wall -g -O2 -Wall ++prefix = /usr ++man1dir=${prefix}/share/man/man1 ++exec_prefix = ${prefix} ++bindir=/sbin ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++ ++INSTALL=/usr/bin/install -c ++ ++ ++# Extension (not including `.') for the manual page filenames. ++manext = 8 ++# Where to put the manual pages. ++mandir = $(prefix)/share/man/man$(manext) ++ ++#### End of system configuration section. #### ++ ++SRC = adjtimex.c adjtimex.8 mat.c mat.h install-sh configure.in \ ++ configure Makefile.in config.h.in README README.ru adjtimex.lsm \ ++ adjtimex.lsm.in COPYING COPYRIGHT ChangeLog ++ ++all: adjtimex adjtimex.lsm Makefile ++ ++configure config.h.in: configure.in ++ autoconf ++ autoheader ++Makefile config.h: Makefile.in config.h.in ++ ./configure ++ ++adjtimex: adjtimex.c mat.o config.h Makefile ++ $(CC) $(CFLAGS) -I. -DVERSION=\"$(VERSION)\" -o adjtimex \ ++ adjtimex.c mat.o -lm ++ ++mat.o: mat.c ++ $(CC) $(CFLAGS) -c mat.c ++ ++install: all ++ $(INSTALL) -g bin -m 755 -o root adjtimex $(bindir)/adjtimex ++ $(INSTALL) -d -g root -m 755 -o root $(mandir) ++ -$(INSTALL) -g root -m 644 -o root $(srcdir)/adjtimex.8 \ ++ $(mandir)/adjtimex.$(manext) ++ ++uninstall: ++ rm -f $(bindir)/adjtimex $(mandir)/adjtimex.$(manext) ++ ++clean: ++ rm -f core *.o ++veryclean: clean ++ rm -f adjtimex ++ ++adjtimex.lsm: adjtimex.lsm.in Makefile ++ sed -e 's/@VERSION@/$(VERSION)/' \ ++ -e "s/@DATE@/`date +%Y-%m-%d`/" \ ++ adjtimex.lsm.in >adjtimex.lsm ++ ++shar: $(SRC) ++ distname=adjtimex-$(VERSION); \ ++ shar $(SRC) >$$distname.shar ++ ++dist: $(SRC) ++ distname=adjtimex-$(VERSION); \ ++ rm -fr $$distname; \ ++ mkdir $$distname; \ ++ for file in $(SRC); do \ ++ ln $$file $$distname/$$file \ ++ || { echo copying $$file instead; cp -p $$file $$distname/$$file;}; \ ++ done; \ ++ chmod -R a+rX $$distname; \ ++ tar -chz -f $$distname.tar.gz $$distname; \ ++ rm -fr $$distname ++ +--- adjtimex-1.29.orig/config.guess ++++ adjtimex-1.29/config.guess +@@ -0,0 +1,1517 @@ +#! /bin/sh +# Attempt to guess a canonical system name. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -+# Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011 Free Software Foundation, Inc. + -+timestamp='2007-03-06' ++timestamp='2011-05-11' + +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by @@ -1655,16 +1968,16 @@ +# the same distribution terms that you use for the rest of that program. + + -+# Originally written by Per Bothner <per@bothner.com>. -+# Please send patches to <config-patches@gnu.org>. Submit a context -+# diff and a properly formatted ChangeLog entry. ++# Originally written by Per Bothner. Please send patches (context ++# diff format) to <config-patches@gnu.org> and include a ChangeLog ++# entry. +# +# This script attempts to guess a canonical system name similar to +# config.sub. If it succeeds, it prints the system name on stdout, and +# exits with 0. Otherwise, it exits with 1. +# -+# The plan is that this can be called by configure scripts if you -+# don't specify an explicit build system type. ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + +me=`echo "$0" | sed -e 's,.*/,,'` + @@ -1684,8 +1997,9 @@ +GNU config.guess ($timestamp) + +Originally written by Per Bothner. -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -+Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free ++Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -1798,7 +2112,7 @@ + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ -+ | grep __ELF__ >/dev/null ++ | grep -q __ELF__ + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? @@ -1808,7 +2122,7 @@ + fi + ;; + *) -+ os=netbsd ++ os=netbsd + ;; + esac + # The OS release @@ -1851,7 +2165,7 @@ + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + ;; + *5.*) -+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on @@ -1897,7 +2211,10 @@ + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -+ exit ;; ++ # Reset EXIT trap before exiting to avoid spurious non-zero exit code. ++ exitcode=$? ++ trap '' 0 ++ exit $exitcode ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead @@ -1923,7 +2240,7 @@ + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) -+ echo powerpc-ibm-os400 ++ echo powerpc-ibm-os400 + exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} @@ -1952,14 +2269,33 @@ + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7; exit ;; + esac ;; ++ s390x:SunOS:*:*) ++ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; -+ i86pc:SunOS:5.*:*) -+ echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) ++ echo i386-pc-auroraux${UNAME_RELEASE} ++ exit ;; ++ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) ++ eval $set_cc_for_build ++ SUN_ARCH="i386" ++ # If there is a compiler, see if it is configured for 64-bit objects. ++ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. ++ # This test works for both compilers. ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ SUN_ARCH="x86_64" ++ fi ++ fi ++ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize @@ -2003,23 +2339,23 @@ + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) -+ echo m68k-atari-mint${UNAME_RELEASE} ++ echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} -+ exit ;; ++ exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) -+ echo m68k-atari-mint${UNAME_RELEASE} ++ echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) -+ echo m68k-milan-mint${UNAME_RELEASE} -+ exit ;; ++ echo m68k-milan-mint${UNAME_RELEASE} ++ exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) -+ echo m68k-hades-mint${UNAME_RELEASE} -+ exit ;; ++ echo m68k-hades-mint${UNAME_RELEASE} ++ exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) -+ echo m68k-unknown-mint${UNAME_RELEASE} -+ exit ;; ++ echo m68k-unknown-mint${UNAME_RELEASE} ++ exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; @@ -2089,8 +2425,8 @@ + echo m88k-motorola-sysv3 + exit ;; + AViiON:dgux:*:*) -+ # DG/UX returns AViiON for all architectures -+ UNAME_PROCESSOR=`/usr/bin/uname -p` ++ # DG/UX returns AViiON for all architectures ++ UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ @@ -2103,7 +2439,7 @@ + else + echo i586-dg-dgux${UNAME_RELEASE} + fi -+ exit ;; ++ exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 + exit ;; @@ -2160,7 +2496,7 @@ + echo rs6000-ibm-aix3.2 + fi + exit ;; -+ *:AIX:*:[45]) ++ *:AIX:*:[4567]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 @@ -2203,52 +2539,52 @@ + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` -+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` -+ case "${sc_cpu_version}" in -+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 -+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 -+ 532) # CPU_PA_RISC2_0 -+ case "${sc_kernel_bits}" in -+ 32) HP_ARCH="hppa2.0n" ;; -+ 64) HP_ARCH="hppa2.0w" ;; ++ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` ++ case "${sc_cpu_version}" in ++ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 ++ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 ++ 532) # CPU_PA_RISC2_0 ++ case "${sc_kernel_bits}" in ++ 32) HP_ARCH="hppa2.0n" ;; ++ 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 -+ esac ;; -+ esac ++ esac ;; ++ esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build -+ sed 's/^ //' << EOF >$dummy.c -+ -+ #define _HPUX_SOURCE -+ #include <stdlib.h> -+ #include <unistd.h> -+ -+ int main () -+ { -+ #if defined(_SC_KERNEL_BITS) -+ long bits = sysconf(_SC_KERNEL_BITS); -+ #endif -+ long cpu = sysconf (_SC_CPU_VERSION); -+ -+ switch (cpu) -+ { -+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; -+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; -+ case CPU_PA_RISC2_0: -+ #if defined(_SC_KERNEL_BITS) -+ switch (bits) -+ { -+ case 64: puts ("hppa2.0w"); break; -+ case 32: puts ("hppa2.0n"); break; -+ default: puts ("hppa2.0"); break; -+ } break; -+ #else /* !defined(_SC_KERNEL_BITS) */ -+ puts ("hppa2.0"); break; -+ #endif -+ default: puts ("hppa1.0"); break; -+ } -+ exit (0); -+ } ++ sed 's/^ //' << EOF >$dummy.c ++ ++ #define _HPUX_SOURCE ++ #include <stdlib.h> ++ #include <unistd.h> ++ ++ int main () ++ { ++ #if defined(_SC_KERNEL_BITS) ++ long bits = sysconf(_SC_KERNEL_BITS); ++ #endif ++ long cpu = sysconf (_SC_CPU_VERSION); ++ ++ switch (cpu) ++ { ++ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; ++ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; ++ case CPU_PA_RISC2_0: ++ #if defined(_SC_KERNEL_BITS) ++ switch (bits) ++ { ++ case 64: puts ("hppa2.0w"); break; ++ case 32: puts ("hppa2.0n"); break; ++ default: puts ("hppa2.0"); break; ++ } break; ++ #else /* !defined(_SC_KERNEL_BITS) */ ++ puts ("hppa2.0"); break; ++ #endif ++ default: puts ("hppa1.0"); break; ++ } ++ exit (0); ++ } +EOF + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa @@ -2268,7 +2604,7 @@ + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | -+ grep __LP64__ >/dev/null ++ grep -q __LP64__ + then + HP_ARCH="hppa2.0w" + else @@ -2339,22 +2675,22 @@ + exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd -+ exit ;; ++ exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi -+ exit ;; ++ exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd -+ exit ;; ++ exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd -+ exit ;; ++ exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd -+ exit ;; ++ exit ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; @@ -2378,14 +2714,14 @@ + exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` -+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -+ exit ;; ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` ++ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit ;; + 5000:UNIX_System_V:4.*:*) -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` -+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` ++ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} @@ -2413,24 +2749,30 @@ + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; + i*:windows32*:*) -+ # uname -m includes "-pc" on this system. -+ echo ${UNAME_MACHINE}-mingw32 ++ # uname -m includes "-pc" on this system. ++ echo ${UNAME_MACHINE}-mingw32 + exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; -+ *:Interix*:[3456]*) -+ case ${UNAME_MACHINE} in -+ x86) ++ *:Interix*:*) ++ case ${UNAME_MACHINE} in ++ x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; -+ EM64T | authenticamd) ++ authenticamd | genuineintel | EM64T) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; ++ IA64) ++ echo ia64-unknown-interix${UNAME_RELEASE} ++ exit ;; + esac ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit ;; ++ 8664:Windows_NT:*) ++ echo x86_64-pc-mks ++ exit ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we @@ -2460,8 +2802,35 @@ + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; ++ alpha:Linux:*:*) ++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in ++ EV5) UNAME_MACHINE=alphaev5 ;; ++ EV56) UNAME_MACHINE=alphaev56 ;; ++ PCA56) UNAME_MACHINE=alphapca56 ;; ++ PCA57) UNAME_MACHINE=alphapca56 ;; ++ EV6) UNAME_MACHINE=alphaev6 ;; ++ EV67) UNAME_MACHINE=alphaev67 ;; ++ EV68*) UNAME_MACHINE=alphaev68 ;; ++ esac ++ objdump --private-headers /bin/sh | grep -q ld.so.1 ++ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi ++ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ++ exit ;; + arm*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ eval $set_cc_for_build ++ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_EABI__ ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ else ++ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_PCS_VFP ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ else ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf ++ fi ++ fi + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -2473,7 +2842,18 @@ + echo crisv32-axis-linux-gnu + exit ;; + frv:Linux:*:*) -+ echo frv-unknown-linux-gnu ++ echo frv-unknown-linux-gnu ++ exit ;; ++ i*86:Linux:*:*) ++ LIBC=gnu ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ #ifdef __dietlibc__ ++ LIBC=dietlibc ++ #endif ++EOF ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` ++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -2484,74 +2864,33 @@ + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; -+ mips:Linux:*:*) -+ eval $set_cc_for_build -+ sed 's/^ //' << EOF >$dummy.c -+ #undef CPU -+ #undef mips -+ #undef mipsel -+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) -+ CPU=mipsel -+ #else -+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) -+ CPU=mips -+ #else -+ CPU= -+ #endif -+ #endif -+EOF -+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -+ /^CPU/{ -+ s: ::g -+ p -+ }'`" -+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } -+ ;; -+ mips64:Linux:*:*) ++ mips:Linux:*:* | mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU -+ #undef mips64 -+ #undef mips64el ++ #undef ${UNAME_MACHINE} ++ #undef ${UNAME_MACHINE}el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) -+ CPU=mips64el ++ CPU=${UNAME_MACHINE}el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) -+ CPU=mips64 ++ CPU=${UNAME_MACHINE} + #else + CPU= + #endif + #endif +EOF -+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -+ /^CPU/{ -+ s: ::g -+ p -+ }'`" ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + or32:Linux:*:*) + echo or32-unknown-linux-gnu + exit ;; -+ ppc:Linux:*:*) -+ echo powerpc-unknown-linux-gnu -+ exit ;; -+ ppc64:Linux:*:*) -+ echo powerpc64-unknown-linux-gnu ++ padre:Linux:*:*) ++ echo sparc-unknown-linux-gnu + exit ;; -+ alpha:Linux:*:*) -+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -+ EV5) UNAME_MACHINE=alphaev5 ;; -+ EV56) UNAME_MACHINE=alphaev56 ;; -+ PCA56) UNAME_MACHINE=alphapca56 ;; -+ PCA57) UNAME_MACHINE=alphapca56 ;; -+ EV6) UNAME_MACHINE=alphaev6 ;; -+ EV67) UNAME_MACHINE=alphaev67 ;; -+ EV68*) UNAME_MACHINE=alphaev68 ;; -+ esac -+ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null -+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi -+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ++ parisc64:Linux:*:* | hppa64:Linux:*:*) ++ echo hppa64-unknown-linux-gnu + exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level @@ -2561,14 +2900,17 @@ + *) echo hppa-unknown-linux-gnu ;; + esac + exit ;; -+ parisc64:Linux:*:* | hppa64:Linux:*:*) -+ echo hppa64-unknown-linux-gnu ++ ppc64:Linux:*:*) ++ echo powerpc64-unknown-linux-gnu ++ exit ;; ++ ppc:Linux:*:*) ++ echo powerpc-unknown-linux-gnu + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux + exit ;; + sh64*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -2576,78 +2918,18 @@ + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; ++ tile*:Linux:*:*) ++ echo ${UNAME_MACHINE}-tilera-linux-gnu ++ exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; + x86_64:Linux:*:*) + echo x86_64-unknown-linux-gnu + exit ;; -+ xtensa:Linux:*:*) -+ echo xtensa-unknown-linux-gnu ++ xtensa*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; -+ i*86:Linux:*:*) -+ # The BFD linker knows what the default object file format is, so -+ # first see if it will tell us. cd to the root directory to prevent -+ # problems with other programs or directories called `ld' in the path. -+ # Set LC_ALL=C to ensure ld outputs messages in English. -+ ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ -+ | sed -ne '/supported targets:/!d -+ s/[ ][ ]*/ /g -+ s/.*supported targets: *// -+ s/ .*// -+ p'` -+ case "$ld_supported_targets" in -+ elf32-i386) -+ TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" -+ ;; -+ a.out-i386-linux) -+ echo "${UNAME_MACHINE}-pc-linux-gnuaout" -+ exit ;; -+ coff-i386) -+ echo "${UNAME_MACHINE}-pc-linux-gnucoff" -+ exit ;; -+ "") -+ # Either a pre-BFD a.out linker (linux-gnuoldld) or -+ # one that does not give us useful --help. -+ echo "${UNAME_MACHINE}-pc-linux-gnuoldld" -+ exit ;; -+ esac -+ # Determine whether the default compiler is a.out or elf -+ eval $set_cc_for_build -+ sed 's/^ //' << EOF >$dummy.c -+ #include <features.h> -+ #ifdef __ELF__ -+ # ifdef __GLIBC__ -+ # if __GLIBC__ >= 2 -+ LIBC=gnu -+ # else -+ LIBC=gnulibc1 -+ # endif -+ # else -+ LIBC=gnulibc1 -+ # endif -+ #else -+ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+ LIBC=gnu -+ #else -+ LIBC=gnuaout -+ #endif -+ #endif -+ #ifdef __dietlibc__ -+ LIBC=dietlibc -+ #endif -+EOF -+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -+ /^LIBC/{ -+ s: ::g -+ p -+ }'`" -+ test x"${LIBC}" != x && { -+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" -+ exit -+ } -+ test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } -+ ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both @@ -2655,11 +2937,11 @@ + echo i386-sequent-sysv4 + exit ;; + i*86:UNIX_SV:4.2MP:2.*) -+ # Unixware is an offshoot of SVR4, but it has its own version -+ # number series starting with 2... -+ # I am not positive that other SVR4 systems won't match this, ++ # Unixware is an offshoot of SVR4, but it has its own version ++ # number series starting with 2... ++ # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. -+ # Use sysv4.2uw... so that sysv4* matches it. ++ # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + exit ;; + i*86:OS/2:*:*) @@ -2676,7 +2958,7 @@ + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; -+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) ++ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit ;; + i*86:*DOS:*:*) @@ -2691,7 +2973,7 @@ + fi + exit ;; + i*86:*:5:[678]*) -+ # UnixWare 7.x, OpenUNIX and OpenServer 6. ++ # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; @@ -2719,10 +3001,13 @@ + exit ;; + pc:*:*:*) + # Left here for compatibility: -+ # uname -m prints for DJGPP always 'pc', but it prints nothing about -+ # the processor, so we play safe by assuming i386. -+ echo i386-pc-msdosdjgpp -+ exit ;; ++ # uname -m prints for DJGPP always 'pc', but it prints nothing about ++ # the processor, so we play safe by assuming i586. ++ # Note: whatever this is, it MUST be the same as what config.sub ++ # prints for the "djgpp" host, or else GDB configury will decide that ++ # this is a cross-build. ++ echo i586-pc-msdosdjgpp ++ exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 + exit ;; @@ -2757,8 +3042,18 @@ + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) -+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -+ && { echo i486-ncr-sysv4; exit; } ;; ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4; exit; } ;; ++ NCR*:*:4.2:* | MPRAS*:*:4.2:*) ++ OS_REL='.3' ++ test -r /etc/.relid \ ++ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} + exit ;; @@ -2771,7 +3066,7 @@ + rs6000:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} + exit ;; -+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) ++ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} + exit ;; + SM[BE]S:UNIX_SV:*:*) @@ -2791,10 +3086,10 @@ + echo ns32k-sni-sysv + fi + exit ;; -+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort -+ # says <Richard.M.Bartel@ccMail.Census.GOV> -+ echo i586-unisys-sysv4 -+ exit ;; ++ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort ++ # says <Richard.M.Bartel@ccMail.Census.GOV> ++ echo i586-unisys-sysv4 ++ exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes <hewes@openmarket.com>. + # How about differentiating between stratus architectures? -djm @@ -2820,11 +3115,11 @@ + exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then -+ echo mips-nec-sysv${UNAME_RELEASE} ++ echo mips-nec-sysv${UNAME_RELEASE} + else -+ echo mips-unknown-sysv${UNAME_RELEASE} ++ echo mips-unknown-sysv${UNAME_RELEASE} + fi -+ exit ;; ++ exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit ;; @@ -2834,6 +3129,9 @@ + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos + exit ;; ++ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. ++ echo i586-pc-haiku ++ exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; @@ -2861,6 +3159,16 @@ + *:Darwin:*:*) + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in ++ i386) ++ eval $set_cc_for_build ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ UNAME_PROCESSOR="x86_64" ++ fi ++ fi ;; + unknown) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} @@ -2876,6 +3184,9 @@ + *:QNX:*:4*) + echo i386-pc-qnx + exit ;; ++ NEO-?:NONSTOP_KERNEL:*:*) ++ echo neo-tandem-nsk${UNAME_RELEASE} ++ exit ;; + NSE-?:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; @@ -2921,13 +3232,13 @@ + echo pdp10-unknown-its + exit ;; + SEI:*:*:SEIUX) -+ echo mips-sei-seiux${UNAME_RELEASE} ++ echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) -+ UNAME_MACHINE=`(uname -p) 2>/dev/null` ++ UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; @@ -2942,6 +3253,9 @@ + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; ++ i*86:AROS:*:*) ++ echo ${UNAME_MACHINE}-pc-aros ++ exit ;; +esac + +#echo '(No uname command or uname output not recognized.)' 1>&2 @@ -2964,11 +3278,11 @@ +#include <sys/param.h> + printf ("m68k-sony-newsos%s\n", +#ifdef NEWSOS4 -+ "4" ++ "4" +#else -+ "" ++ "" +#endif -+ ); exit (0); ++ ); exit (0); +#endif +#endif + @@ -3102,9 +3416,9 @@ +the operating system you are using. It is advised that you +download the most up to date version of the config scripts from + -+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess ++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +and -+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub ++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + +If the version you run ($0) is already up to date, please +send the following data and any information you think might be @@ -3142,1211 +3456,236 @@ +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: ---- adjtimex-1.23.orig/debian/control -+++ adjtimex-1.23/debian/control -@@ -0,0 +1,20 @@ -+Source: adjtimex -+Section: admin -+Priority: optional -+Maintainer: James R. Van Zandt <jrv@debian.org> -+Build-Depends: debhelper (>= 5), po-debconf -+Standards-Version: 3.7.2 -+ -+Package: adjtimex -+Architecture: any -+Depends: ${shlibs:Depends}, debconf | debconf-2.0 -+Suggests: ntpdate -+Description: Utility to display or set the kernel time variables -+ This program gives you raw access to the kernel time variables. For -+ a machine connected to the Internet, or equipped with a precision -+ oscillator or radio clock, the best way to keep the system clock -+ correct is with ntpd. However, for a standalone or intermittently -+ connected machine, you may use adjtimex instead to at least correct -+ for systematic drift. adjtimex can optionally adjust the system -+ clock using the CMOS clock as a reference, and can log times for -+ long-term estimation of drift rates. ---- adjtimex-1.23.orig/debian/po/POTFILES.in -+++ adjtimex-1.23/debian/po/POTFILES.in +--- adjtimex-1.29.orig/debian/compat ++++ adjtimex-1.29/debian/compat @@ -0,0 +1 @@ -+[type: gettext/rfc822deb] templates ---- adjtimex-1.23.orig/debian/po/templates.pot -+++ adjtimex-1.23/debian/po/templates.pot -@@ -0,0 +1,59 @@ -+# SOME DESCRIPTIVE TITLE. -+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -+# This file is distributed under the same license as the PACKAGE package. -+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -+# -+#, fuzzy -+msgid "" -+msgstr "" -+"Project-Id-Version: PACKAGE VERSION\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\n" -+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -+"Language-Team: LANGUAGE <LL@li.org>\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=CHARSET\n" -+"Content-Transfer-Encoding: 8bit\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" ---- adjtimex-1.23.orig/debian/po/fr.po -+++ adjtimex-1.23/debian/po/fr.po -@@ -0,0 +1,87 @@ -+# translation of fr.po to French -+# -+# Translators, if you are not familiar with the PO format, gettext -+# documentation is worth reading, especially sections dedicated to -+# this format, e.g. by running: -+# info -n '(gettext)PO Files' -+# info -n '(gettext)Header Entry' -+# -+# Some information specific to po-debconf are available at -+# /usr/share/doc/po-debconf/README-trans -+# or http://www.debian.org/intl/l10n/po-debconf/README-trans -+# -+# Developers do not need to manually edit POT or PO files. -+# -+# Christian Perrier <bubulle@debian.org>, 2006. -+msgid "" -+msgstr "" -+"Project-Id-Version: fr\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\n" -+"PO-Revision-Date: 2006-12-17 14:01+0100\n" -+"Last-Translator: Christian Perrier <bubulle@debian.org>\n" -+"Language-Team: French <debian-l10n-french@lists.debian.org>\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"X-Generator: KBabel 1.11.4\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "" -+"Faut-il lancer adjtimex lors de l'installation et Ă chaque dĂ©marrage du " -+"système ?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+"Adjtimex peut ĂŞtre lancĂ© au dĂ©marrage du système afin de rĂ©gler les " -+"paramètres d'horloge du noyau en fonction des valeurs contenues dans /etc/" -+"default/adjtimex. Ne choisissez pas cette option si vous souhaitez " -+"simplement vous servir d'adjtimex pour consulter les paramètres actuels." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "Faut-il lancer adjtimexconfig lors de l'installation ?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+"Le script adjtimexconfig utilise adjtimex afin de trouver les valeurs " -+"appropriĂ©es pour les variables du noyau concernant le battement (« tick ») " -+"et la frĂ©quence d'horloge. Cela permettra Ă l'horloge du système d'ĂŞtre Ă " -+"peu près en accord avec l'horloge matĂ©rielle (parfois appelĂ©e « horloge " -+"CMOS »). Ces valeurs seront alors conservĂ©es dans le fichier de " -+"configuration /etc/default/adjtimex ce qui permettra de les restaurer Ă " -+"chaque dĂ©marrage quand /etc/init.d/adjtimex s'exĂ©cutera. " -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" -+"La durĂ©e d'exĂ©cution du script est de 70 secondes. Vous pouvez Ă©galement " -+"utiliser adjtimexconfig vous-mĂŞme plus tard ou dĂ©terminer les valeurs des " -+"variables du noyau d'une autre manière (il en existe plusieurs : voir la " -+"page de manuel d'adjtimex). Ces valeurs devront ensuite ĂŞtre placĂ©es dans /" -+"etc/default/adjtimex." ---- adjtimex-1.23.orig/debian/po/es.po -+++ adjtimex-1.23/debian/po/es.po -@@ -0,0 +1,81 @@ -+# -+# Translators, if you are not familiar with the PO format, gettext -+# documentation is worth reading, especially sections dedicated to -+# this format, e.g. by running: -+# info -n '(gettext)PO Files' -+# info -n '(gettext)Header Entry' -+# -+# Some information specific to po-debconf are available at -+# /usr/share/doc/po-debconf/README-trans -+# or http://www.debian.org/intl/l10n/po-debconf/README-trans -+# -+# Developers do not need to manually edit POT or PO files. -+# -+#, fuzzy -+msgid "" -+msgstr "" -+"Project-Id-Version: PACKAGE VERSION\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\n" -+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -+"Last-Translator: Vicente H. <vherrerv@supercable.es>\n" -+"Language-Team: LANGUAGE <LL@li.org>\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=ISO-8859-15\n" -+"Content-Transfer-Encoding: 8bit\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "żDebe ejecutarse adjtimex ahora y en cada arranque?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+#, fuzzy -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+"Adjtimex puede ser ejecutado en el arranque del sistema para poner los " -+"parámetros de tiempo del núcleo en /etc/default/adjtimex. Si usted solamente " -+"quiere usar adjtimex para inspeccionar los parámetros actuales, conteste \"No" -+"\"." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "żDebe ejecutarse adjtimexconfig ahora?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+"El guión adjtimexconfig usará adjtimex para encontrar los valores para el " -+"núcleo de la seńal y frecuencia que será tomada por el reloj del sistema " -+"para estar de acuerdo con el reloj del hardware (también conocido como el " -+"reloj CMOS). Este guión guardará los valores en el archivo de configuración /" -+"etc/default/adjtimex para que los ajustes sean restaurados en cada arranque " -+"del sistema, cuando /etc/init.d/adjtimex sea ejecutado." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" -+"El guión toma 70 seg. para ser ejecutado. O bien, usted mismo puede ejecutar " -+"adjtimexconfig más tarde, o determinar las variables del núcleo de varias " -+"formas (mire la página man de adjtimex) y anótelos en /etc/default/adjtimex." ---- adjtimex-1.23.orig/debian/po/pl.po -+++ adjtimex-1.23/debian/po/pl.po -@@ -0,0 +1,83 @@ -+# -+# Translators, if you are not familiar with the PO format, gettext -+# documentation is worth reading, especially sections dedicated to -+# this format, e.g. by running: -+# info -n '(gettext)PO Files' -+# info -n '(gettext)Header Entry' -+# -+# Some information specific to po-debconf are available at -+# /usr/share/doc/po-debconf/README-trans -+# or http://www.debian.org/intl/l10n/po-debconf/README-trans -+# -+# Developers do not need to manually edit POT or PO files. -+# -+#, fuzzy -+msgid "" -+msgstr "" -+"Project-Id-Version: PACKAGE VERSION\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\n" -+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -+"Last-Translator: Bartosz Zapałowski <zapal@debian.linux.org.pl>\n" -+"Language-Team: Polish Debian Documentation Project <pddp@debian.linux.org." -+"pl>\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=iso-8859-2\n" -+"Content-Transfer-Encoding: 8bit\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "" -+"Czy adjtimex ma być uruchomiany podczas instalacji i każdego startu systemu?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+"adjtimex może być uruchamiany podczas każdego uruchomienia systemu,by " -+"ustawić parametry czasu w j±drze na warto¶ci znajduj±ce się w pliku/etc/" -+"default/adjtimex. Nie wyrażaj zgody, je¶li chcesz używać adjtimextylko do " -+"sprawdzania aktualnych warto¶ci." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "Czy adjtimexconfig ma być uruchomiony podczas instalacji?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+"Skrypt adjtimexconfig skorzysta z programu adjtimex do znalezienia " -+"takichwarto¶ci parametrów j±dra tick i frequency, żeby zegar systemowy był " -+"zbliżonydo zegara sprzętowego (zegara CMOS). Następnie zapisze ustawienia w " -+"plikukonfiguracyjnym /etc/default/adjtimex, dzięki czemu warto¶ci te " -+"będ±przywrócane przy każdym starcie systemu w momencie wykonywania skryptu/" -+"etc/init.d/adjtimex." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" -+"Skrypt będzie działał przez 70 sekund. Możesz też uruchomić " -+"własnoręcznieadjtimexconfig w dowolnym czasie lub dobrać paramterty j±dra w " -+"innysposób (zapoznaj się ze stron± manuala adjtimex) i zapisać je w pliku/" -+"etc/default/adjtimex." ---- adjtimex-1.23.orig/debian/po/nl.po -+++ adjtimex-1.23/debian/po/nl.po -@@ -0,0 +1,82 @@ -+# -+# Translators, if you are not familiar with the PO format, gettext -+# documentation is worth reading, especially sections dedicated to -+# this format, e.g. by running: -+# info -n '(gettext)PO Files' -+# info -n '(gettext)Header Entry' -+# -+# Some information specific to po-debconf are available at -+# /usr/share/doc/po-debconf/README-trans -+# or http://www.debian.org/intl/l10n/po-debconf/README-trans -+# -+# Developers do not need to manually edit POT or PO files. -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: adjtimex\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\n" -+"PO-Revision-Date: 2003-10-04 16:05+0100\n" -+"Last-Translator: Michiel Sikkes <michiel@sikkes.xs4all.nl>\n" -+"Language-Team: Dutch <debian-l10n-dutch@lists.debian.org>\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" ++5 +--- adjtimex-1.29.orig/debian/changelog ++++ adjtimex-1.29/debian/changelog +@@ -0,0 +1,753 @@ ++adjtimex (1.29-2.2) unstable; urgency=low + -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "" -+"Wilt u dat adjtimex bij elke installatie en bij elke opstartprocedure " -+"gedraaid wordt?" ++ * Non-maintainer upload. ++ * Make the package multiarch-ready: add build-arch and build-indep ++ build targets ++ * Fix pending l10n issues. Debconf translations: ++ - Vietnamese (Clytie Siddall). Closes: #601529 ++ - Brazilian Portuguese (Flamarion Jorge). Closes: #610409 ++ - Dutch (Michiel Sikkes). Closes: #625744 + -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+"adjtimex kan gedraaid worden bij het opstarten van het systeem om de " -+"kerneltijd parameters in te stellen zoals gedefinieerd in /etc/default/" -+"adjtimex. Accepteer deze optie niet als u adjtimex wilt gebruiken om de " -+"huidige parameters te bekijken." ++ -- Christian Perrier <bubulle@debian.org> Mon, 04 Jul 2011 07:06:43 +0200 + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "Wilt u dat adjtimexconfig bij het installeren wordt gedraaid?" ++adjtimex (1.29-2.1) unstable; urgency=low + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+"Het adjtimexconfig script zal adjtimex gebruiken om de eigenschappen voor de " -+"kernelvariablen tick en frequency te vinden. Dit zal zorgen dat de " -+"systeemklok gelijk loopt met de hardware klok (ook bekend onder de naam CMOS " -+"klok). Het slaat deze eigenschappen op in het configuratiebestand /etc/" -+"default/adjtimex, dus de instellingen worden bij elke " -+"systeemopstartprocedure hersteld als /etc/init.d/adjtimex draait." ++ * Non-maintainer upload. ++ * Fix pending l10n issues. Debconf translations: ++ - Czech (Martin Sin). Closes: #589289 ++ - BokmĂĄl, Norwegian (Bjørn Steensrud). Closes: #600279 + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" -+"Het script doet er 70 seconden over om te draaien. Als alternatief kunt u " -+"adjtimexconfig later handmatig draaien, of de kerneleigenschappen op een " -+"andere manier bepalen (zie de adjtimex man-pagina) en deze zelf in /etc/" -+"default/adjtimex zetten." ---- adjtimex-1.23.orig/debian/po/da.po -+++ adjtimex-1.23/debian/po/da.po -@@ -0,0 +1,79 @@ -+# translation of adjtimex_1.16-1-da.po to Danish -+# translation of adjtimex_1.16-1_templates.po to Danish -+# -+# Translators, if you are not familiar with the PO format, gettext -+# documentation is worth reading, especially sections dedicated to -+# this format, e.g. by running: -+# info -n '(gettext)PO Files' -+# info -n '(gettext)Header Entry' -+# Some information specific to po-debconf are available at -+# /usr/share/doc/po-debconf/README-trans -+# or http://www.debian.org/intl/l10n/po-debconf/README-trans# -+# Developers do not need to manually edit POT or PO files. -+# Claus Hindsgaul <claus_h@image.dk>, 2004. -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: adjtimex_1.16-1-da\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\n" -+"PO-Revision-Date: 2004-03-24 17:57+0100\n" -+"Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n" -+"Language-Team: Danish <dansk@klid.dk>\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"X-Generator: KBabel 1.3.1\n" ++ -- Christian Perrier <bubulle@debian.org> Tue, 19 Oct 2010 07:14:50 +0200 + -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "Skal adjtimex køres under installation og ved hver opstart?" ++adjtimex (1.29-2) unstable; urgency=low + -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+"adjtimex kan køres under opstart af systemet for at sætte kernens " -+"tidsparametre til værdierne i /etC/default/adjtimex. AcceptĂ©r ikke dette, " -+"hvis du kun vil bruge adjtimex til at gennemse de aktuelle parametre." ++ * debian/postinst: check conffile for corruption (Closes:Bug#571633, ++ thanks to Savvas Radevic <vicedar@gmail.com> for the idea, though I ++ chose a different implementation.) + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "Skal adjtimexconfig køres under installationen?" ++ -- James R. Van Zandt <jrv@debian.org> Tue, 25 May 2010 20:49:21 -0400 + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+"Skriftet adjtimexconfig vil bruge adjtimex til at finde de værdier til " -+"kernevariablene tick og frequency, der vil fĂĄ systemuret til at passe med " -+"computerens indbyggede ur (CMOS-uret). Den gemmer derefter værdierne i " -+"opsætningsfilen /etc/default/edjtimex, sĂĄ indstillingerne bliver sat under " -+"hver opstart, nĂĄr skriptet /etC/init.d/adjtimex køres." ++adjtimex (1.29-1) unstable; urgency=low + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" -+"Det tager 70 sekunder at køre skriptet. Alternativt kan du selv køre " -+"adjtimexconfig senere, eller finde kernevariablene pĂĄ en anden mĂĄde (se " -+"manualsiden adjtimex) og installere dem i /etc/default/adjtimex." ---- adjtimex-1.23.orig/debian/po/ja.po -+++ adjtimex-1.23/debian/po/ja.po -@@ -0,0 +1,78 @@ -+# -+# Translators, if you are not familiar with the PO format, gettext -+# documentation is worth reading, especially sections dedicated to -+# this format, e.g. by running: -+# info -n '(gettext)PO Files' -+# info -n '(gettext)Header Entry' -+# -+# Some information specific to po-debconf are available at -+# /usr/share/doc/po-debconf/README-trans -+# or http://www.debian.org/intl/l10n/po-debconf/README-trans -+# -+# Developers do not need to manually edit POT or PO files. -+# -+#, fuzzy -+msgid "" -+msgstr "" -+"Project-Id-Version: PACKAGE VERSION\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\n" -+"PO-Revision-Date: 2003-11-21 00:02+0900\n" -+"Last-Translator: Hideki Yamane <henrich@samba.gr.jp>\n" -+"Language-Team: Japanese <debian-japanese@lists.debian.org>\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=EUC-JP\n" -+"Content-Transfer-Encoding: 8bit\n" ++ * New upstream release: Document the --force-adjust ++ option. --force-adjust suppresses warning printouts. Relax sanity ++ check to +- 1 percent. + -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "adjtimex ¤ňĄ¤ĄóĄąĄČˇĽĄë»ţ¤Ş¤č¤ÓËč˛ó¤ÎµŻĆ°»ţ¤ËĆ°şî¤µ¤»¤Ţ¤ą¤«?" ++ * debian/adjtimexconfig: Use --force-adjust option, so adjustment is ++ applied even if system clock is way off. (Thanks to Santiago Vila ++ <sanvila@unex.es> for helping to diagnose the problem. ++ Closes:Bug#557949, #559882) ++ ++ * debian/adjtimex.init: fix LSB comment header: require $local_fs, start ++ in S + -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+"adjtimex ¤ňĄ·ĄąĄĆĄŕ¤ÎµŻĆ°»ţ¤ËĆ°şî¤µ¤»¤ĆĄ«ˇĽĄÍĄë¤Î»ţ´ÖĄŃĄéĄáˇĽĄż¤ň /etc/" -+"default/adjtimex ¤ÎĂͤËŔßÄꤹ¤ë¤ł¤Č¤¬˛ÄÇ˝¤Ç¤ąˇŁ adjtimex ¤ň¸˝şß¤ÎĄŃĄéĄáˇĽĄż¤Î" -+"Ä´şş¤Ë¤Ŕ¤±¤Ë»Č¤¤¤ż¤¤¤Č¤¤¤¦ľěąç¤ĎĆ°şî¤ň¤µ¤»¤Ę¤¤¤Ç¤Ż¤Ŕ¤µ¤¤ˇŁ" ++ -- James R. Van Zandt <jrv@debian.org> Fri, 16 Apr 2010 20:08:49 -0400 + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "adjtimexconfig ¤ňĄ¤ĄóĄąĄČˇĽĄë»ţ¤ËĆ°şî¤µ¤»¤Ţ¤ą¤«?" ++adjtimex (1.28-4) unstable; urgency=low + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+"adjtimexconfig ĄąĄŻĄęĄ×ĄČ¤Ď adjtimex ¤ň»ČÍѤ·¤Ćˇ˘Ą·ĄąĄĆĄŕĄŻĄíĄĂĄŻ¤ňĄĎˇĽĄÉĄ¦Ą§" -+"Ą˘ĄŻĄíĄĂĄŻ (CMOS ĄŻĄíĄĂĄŻ¤Č¤·¤Ć¤âĂΤé¤ě¤Ć¤¤¤Ţ¤ą) ¤Č¤Ş¤Ş¤č¤˝Ć±´ü¤ą¤ë¤č¤¦¤ËĄ«ˇĽ" -+"ĄÍĄëĘŃżô tick ¤Č frequency ¤ËÍż¤¨¤ëĂͤň¸«¤Ä¤±¤Ţ¤ąˇŁ¤˝¤·¤Ćˇ˘¤ł¤ÎĂͤňŔßÄęĄŐĄˇĄ¤" -+"Ąë /etc/default/adjtimex ¤ËĘݸ¤ą¤ë¤ł¤Č¤ÇËč˛óµŻĆ°»ţ¤Ë /etc/init.d/adjtimex ¤¬" -+"Ć°şî¤ą¤ëşÝ¤ËŔßÄ꤬Éü¸µ¤µ¤ě¤Ţ¤ąˇŁ" ++ * Update debconf template translations: ++ Swedish (Thanks to Martin Bagge <brother@bsnet.se>, Closes:Bug#572579) + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" -+"ĄąĄŻĄęĄ×ĄČ¤ĎĆ°şî¤Ë 70 É䫤«¤ę¤Ţ¤ąˇŁĘ̲ň¤Č¤·¤Ć¤Ď adjtimexconfig ¤ň¸ĺ¤Ű¤ÉĽÂąÔ" -+"¤ą¤ëˇ˘¤Ţ¤ż¤ĎÂľ¤ÎĘýˡ¤ÇĄ«ˇĽĄÍĄëĘŃżô¤ň·č¤á¤Ć (adjtimex ¤Î man ĄÚˇĽĄ¸¤ň»˛ľČ) /" -+"etc/default/adjtimex ¤Ř¤ÎŔßÄę¤ňąÔ¤¦¤Ę¤É¤¬˛ÄÇ˝¤Ç¤ąˇŁ" ---- adjtimex-1.23.orig/debian/po/pt_BR.po -+++ adjtimex-1.23/debian/po/pt_BR.po -@@ -0,0 +1,82 @@ -+# -+# Translators, if you are not familiar with the PO format, gettext -+# documentation is worth reading, especially sections dedicated to -+# this format, e.g. by running: -+# info -n '(gettext)PO Files' -+# info -n '(gettext)Header Entry' -+# -+# Some information specific to po-debconf are available at -+# /usr/share/doc/po-debconf/README-trans -+# or http://www.debian.org/intl/l10n/po-debconf/README-trans -+# -+# Developers do not need to manually edit POT or PO files. -+# -+#, fuzzy -+msgid "" -+msgstr "" -+"Project-Id-Version: adjtimex_1.16-1\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\n" -+"PO-Revision-Date: 2004-01-17 20:55-0300\n" -+"Last-Translator: André Luís Lopes <andrelop@debian.org>\n" -+"Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=ISO-8859-1\n" -+"Content-Transfer-Encoding: 8bit\n" ++ -- James R. Van Zandt <jrv@debian.org> Wed, 17 Mar 2010 19:51:06 -0400 + -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "Executar o adjtimex durante a instalaçăo e a cada reinicializaçăo ?" ++adjtimex (1.28-3) unstable; urgency=low + -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+"O adjtimex pode ser executado na inicializaçăo do sistema para definir " -+"parâmetros de tempo de kernel para os valores em /etc/default/adjtimex. Năo " -+"aceite caso vocę somente queira usar o adjtimex para inspecionar os " -+"parâmetros atuais." ++ * Update debconf template translations: ++ Swedish (Thanks to Martin Bagge <brother@bsnet.se>, Closes:Bug#562932) ++ Russian (thanks to Yuri Kozlov <yuray@komyakino.ru>, Closes:Bug#563347) ++ Finnish (thanks to Esko =?UTF-8?Q?Araj=C3=A4rvi?= <edu@iki.fi>, ++ Closes:Bug#564508) + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "Executar o adjtimexconfig durante a instalaçăo ?" ++ * debian/control: bump standards version to 3.8.4 (no changes needed) + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+"O script adjtimex irá utilizar o adjtimex para encontrar valores para " -+"variáveis de kernel tick e frequency que farăo com que o relógio do sistema " -+"concorde aproimadamente com o relógio de hardware (também conhecido como " -+"relógio CMOS). Ele irá entăo gravar esses valores no arquivo de " -+"configuraçăo /etc/default/adjtimex de modo que as configuraçőes sejam " -+"restauradas a cada renicializaçăo, quando o /etc/init.d/adjtimex é executado." ++ -- James R. Van Zandt <jrv@debian.org> Mon, 08 Feb 2010 20:19:44 -0500 + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" -+"O script leva cerca de 70 segundos para ser executado. Alternativamente, " -+"vocę pode executar o adjtimexconfig vocę mesmo posteriormente, ou ainda " -+"determinar as variáveis de kernel usando uma das diversas maneiras possíveis " -+"(consulte a página de manul adjtimex) e instalar as mesmas em /etc/default/" -+"adjtimex." ---- adjtimex-1.23.orig/debian/po/de.po -+++ adjtimex-1.23/debian/po/de.po -@@ -0,0 +1,83 @@ -+# translation of adjtimex_1.21.1-2_de.po to German -+# -+# Translators, if you are not familiar with the PO format, gettext -+# documentation is worth reading, especially sections dedicated to -+# this format, e.g. by running: -+# info -n '(gettext)PO Files' -+# info -n '(gettext)Header Entry' -+# Some information specific to po-debconf are available at -+# /usr/share/doc/po-debconf/README-trans -+# or http://www.debian.org/intl/l10n/po-debconf/README-trans# -+# Developers do not need to manually edit POT or PO files. -+# -+# Erik Schanze <eriks@debian.org>, 2004-2007. -+msgid "" -+msgstr "" -+"Project-Id-Version: adjtimex_1.21.1-2_de\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\n" -+"PO-Revision-Date: 2007-08-06 20:50+0200\n" -+"Last-Translator: Erik Schanze <eriks@debian.org>\n" -+"Language-Team: German <debian-l10n-german@lists.debian.org>\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"X-Generator: KBabel 1.11.4\n" -+"Plural-Forms: nplurals=2; plural=(n != 1);\n" ++adjtimex (1.28-2) unstable; urgency=low + -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "" -+"Soll Adjtimex nach der Installation und bei jedem Hochfahren gestartet " -+"werden?" ++ * Move Swedish and Russian template translations to the correct directory ++ (thanks to Martin Bagge <brother@bsnet.se> for pointing out the ++ problem). + -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+"Adjtimex kann beim Hochfahren des Systems ablaufen, um die Zeitparameter im " -+"Kernel auf die Werte in /etc/defaults/adjtimex zu setzen. Stimmen Sie dem " -+"nicht zu, wenn Sie mit Adjtimex nur die aktuellen Parameter ermitteln wollen." ++ * debian/control: bump standards version to 3.8.3 (no changes needed) ++ ++ -- James R. Van Zandt <jrv@debian.org> Fri, 05 Feb 2010 21:42:54 -0500 + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "Soll »adjtimexconfig« zur Installation aufgerufen werden?" ++adjtimex (1.28-1) unstable; urgency=low + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+"Das Skript »adjtimexconfig« nutzt Adjtimex, um die Werte der Kernelvariablen " -+"»tick« und »frequency« zu finden, damit die Systemuhr ungefähr mit der " -+"Rechneruhr (auch bekannt als CMOS-Uhr) ĂĽbereinstimmt. Das Skript speichert " -+"diese Werte in der Konfigurationsdatei /etc/default/adjtimex, sodass die " -+"Einstellung bei jedem Systemstart wiederhergestellt wird, wenn /etc/init.d/" -+"adjtimex startet." ++ * New upstream release: (compare): Correctly apply +-500 ppm sanity ++ check (Thanks to Jacques luder <j.luder@laposte.net>) + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" -+"Das Skript benötigt 70 Sekunden, um durchzulaufen. Andererseits können Sie " -+"»adjtimexconfig« später selbst starten oder finden die Kernelvariablen auf " -+"einem anderen Weg (siehe Handbuchseite von Adjtimex) und speichern die Werte " -+"in der Datei /etc/default/adjtimex." ---- adjtimex-1.23.orig/debian/po/vi.po -+++ adjtimex-1.23/debian/po/vi.po -@@ -0,0 +1,75 @@ -+# Vietnamese Translation for adjtimex. -+# Copyright © 2005 Free Software Foundation, Inc. -+# Clytie Siddall <clytie@riverland.net.au>, 2005. -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: adjtimex 1.20-4\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\n" -+"PO-Revision-Date: 2005-05-04 15:44+0930\n" -+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" -+"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=utf-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"Plural-Forms: nplurals=1; plural=0\n" ++ * Update debconf template translations: ++ Swedish (thanks to: Martin Bagge <brother@bsnet.se>, ++ Closes:Bug#533567) ++ Russian (thanks to: Yuri Kozlov <yuray@komyakino.ru>, ++ Closes:Bug#532068) + -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "" -+"Bạn cĂł muốn chạy trình adjtimex khi cĂ i Ä‘áş·t vĂ mọi khi khởi Ä‘á»™ng khĂ´ng?" ++ -- James R. Van Zandt <jrv@debian.org> Sat, 07 Nov 2009 11:59:29 -0500 + -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+"Trình adjtimex (adjust time: Ä‘iá»u chỉnh thời gian) thì cĂł thá» chạy khi khởi " -+"Ä‘á»™ng hệ thống, Ä‘á» láşp những tham số thời gian của hạt nhân thĂ nh những giá " -+"trị trong /etc/default/adjtimex. Äừng hiệu lá»±c tĂąy chọn nĂ y náşżu bạn chỉ muốn " -+"sá» dụng trình adjtimex Ä‘á» kiá»m tra những tham số hiện thời." ++adjtimex (1.27.1-4) unstable; urgency=low + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "Bạn cĂł muốn chạy táşp lệnh adjtimexconfig khi cĂ i Ä‘áş·t khĂ´ng?" ++ * Update translations: ++ Japanese (thanks to: Hideki Yamane, henrich @ debian.or.jp. ++ Closes:Bug#538242) ++ Spanish (Thanks to Francisco Javier Cuadrado <fcocuadrado@gmail.com>, ++ Closes:Bug#538425) + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+"Táşp lệnh adjtimexconfig (adjust time configuration: Ä‘iá»u chỉnh cấu hình thời " -+"gian) thì sáş˝ dĂąng trinh adjtimex Ä‘á» tìm giá trị cho biáşżn hạt nhân «tick» vĂ " -+"«frequency» Ä‘á» khá»›p đồng hồ hệ thống xấp xi vá»›i đồng hồ phần cứng (cĹ©ng được " -+"biáşżt nhĆ° là đồng hồ CMOS). NhĆ° tháşż thì nĂł lĆ°u nhĆ°ng giá trị nĂ y trong táşp " -+"tin cấu hình /etc/default/adjtimex vì váşy sáş˝ phục hồi cách thiáşżt láşp ấy mọi " -+"khi khởi Ä‘á»™ng, khi chạy /etc/init.d/adjtimex." ++ -- James R. Van Zandt <jrv@debian.org> Sun, 26 Jul 2009 17:36:16 -0400 + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" -+"Táşp lệnh nĂ y chạy được 70 giây. Hoáş·c bạn cĂł thá» tá»± chạy táşp lệnh " -+"adjtimexconfig vĂ o lĂşc sau, hoáş·c quyáşżt định những biáşżn hạt nhân má»™t của vĂ i " -+"cách khác (hĂŁy xem trang hĆ°á»›ng dáş«n: lệnh\n" -+"man adjtimex\n" -+"mà «man» lĂ trình hiá»n thị trang hĆ°á»›ng dáş«n), vĂ cĂ i Ä‘áş·t chĂşng vĂ o /etc/" -+"default/adjtimex." ---- adjtimex-1.23.orig/debian/po/cs.po -+++ adjtimex-1.23/debian/po/cs.po -@@ -0,0 +1,67 @@ -+# Czech translation of adjtimex templates -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: adjtimex 1.20-3\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\n" -+"PO-Revision-Date: 2005-4-10 22:13+0200\n" -+"Last-Translator: Martin Sin <martin.sin@seznam.cz>\n" -+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=ISO-8859-2\n" -+"Content-Transfer-Encoding: 8bit\n" ++adjtimex (1.27.1-3) unstable; urgency=low + -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "Má být adjtimex spuątěn při instalaci a při kaľdém spuątění?" ++ * Update translations: ++ Japanese (thanks to: Hideki Yamane, henrich @ debian.or.jp. ++ Closes:Bug#525233) ++ Swedish (thanks to: Martin Bagge <brother@bsnet.se>. Closes:Bug#525924) ++ Spanish (thanks to: Francisco Javier Cuadrado <fcocuadrado@gmail.com>, ++ Closes:Bug#528621) ++ Russian (thanks to: Yuri Kozlov <yuray@komyakino.ru>, Closes:Bug#529047) ++ Czech (thanks to: Martin Sin <martin.sin@zshk.cz>, Closes:Bug#529652) + -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+"adjtimex můľe běľet při kaľdém startu systému a nastavit parametry jádra na " -+"hodnoty z /etc/default/adjtimex. Při nesouhlasu bude adjtimex nastaven na " -+"zjiątění aktuálních parametrů." ++ -- James R. Van Zandt <jrv@debian.org> Tue, 26 May 2009 20:47:42 -0400 + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "Má být adjtimexconfig spuątěn při instalaci?" ++adjtimex (1.27.1-2) unstable; urgency=low + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+"Skript adjtimexconfig pouľije adjtimex k nalezení hodnot pro proměnné " -+"časovače a frekvence jádra tak, ľe nastaví systémové hodiny přibliľně na " -+"hodnotu hardwarových hodin (také známých jako CMOS hodiny). Pak uloľí tyto " -+"hodnoty do konfiguračního souboru /etc/default/adjtimex aby mohlo být " -+"nastavení obnoveno při kaľdém startu, vľdy při spuątění /etc/init.d/adjtimex." ++ * Debconf templates and debian/control reviewed by the debian-l10n- ++ english team as part of the Smith review project. Closes: #519431 ++ * Update translation: ++ French (Closes:Bug#520986) + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" -+"Spuątění skriptu zabere 70 sekund. Nebo můľete spustit adjtimexconfig " -+"samostatně později, případně určit proměnné jádra jedním z několika různých " -+"způsobů (podívejte se na manuálovou stránku adjtimex) a umístěte je do /etc/" -+"default/adjtimex." ---- adjtimex-1.23.orig/debian/po/pt.po -+++ adjtimex-1.23/debian/po/pt.po -@@ -0,0 +1,71 @@ -+# 2005-10-27 - Marco Ferra <mferra@sdf.lonestar.org> (initial translation) -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: adjtimex 1.20-5\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\n" -+"PO-Revision-Date: 2005-10-27 01:11+0100\n" -+"Last-Translator: Marco Ferra <mferra@sdf.lonestar.org>\n" -+"Language-Team: Portuguese <traduz@debianpt.org>\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" ++ -- James R. Van Zandt <jrv@debian.org> Wed, 20 May 2009 22:03:38 -0400 + -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "" -+"Deve o adjtimex correr enquanto o instala e depois sempre que o sistema " -+"inicia?" ++adjtimex (1.27.1-1) unstable; urgency=low + -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+"O adjtimex pode correr quando o sistema inicia para ajustar os paramĂŞtros " -+"temporais do kernel para os valores especificados em /etc/default/adjtimex. " -+"Por favor recuse se apenas deseja usar o adjtimex para inspecionar os " -+"paramĂŞtros actuais." ++ * New upstream release. Provide workaround if linux/rtc.h ++ is missing (Closes:#308864) ++ ++ * debian/rules: delete config temporaries, but not config.h.in ++ * debian/control: bump version to 3.8.1 (no changes needed) ++ ++ * Update translations: ++ Japanese (Thanks to: henrich@debian.or.jp [188] Closes:Bug#522188) ++ Czech (Thanks to: martin.sin@zshk.cz [219] Closes:Bug#522193) ++ Swedish (Thanks to: brother@bsnet.se [194] Closes:Bug#522979) ++ Basque (Thanks to: pi+debian@beobide.net [207] Closes:Bug#523079) ++ Italian (Thanks to: vinz65@gmail.com [197] Closes:Bug#523419) ++ Spanish (Thanks to: fcocuadrado@gmail.com [193] Closes:Bug#523915) ++ Russian (Thanks to: yuray@komyakino.ru [223] Closes:Bug#524069) ++ German (Thanks to: schanzi_@gmx.de [226] Closes:Bug#524224) ++ Portuguese (Thanks to: carloslisboa@gmail.com [170] Closes:Bug#524283) ++ Danish (Thanks to: debian@overbygaard.dk [209] Closes:Bug#524368) ++ Galician (Thanks to: mvillarino@gmail.com [216] Closes:Bug#524397) ++ ++ -- James R. Van Zandt <jrv@debian.org> Sat, 18 Apr 2009 16:35:22 -0400 ++ ++adjtimex (1.27-1) unstable; urgency=low ++ ++ * New upstream release. If using update interrupt, sanity check the ++ delay. Sometimes the status includes an update complete flag, but it ++ actually didn't wait. Fall back to another method of reading RTC ++ (closes:Bug#517732) Calculate RTC correction as PPM of RTC time ++ (Thanks to Alain Guibert, closes:Bug#308863). ++ ++ * debian/control: add ${misc:Depends} per lintian warning. ++ ++ -- James R. Van Zandt <jrv@debian.org> Sun, 22 Mar 2009 21:54:51 -0400 + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "Deve o adjtimexconfig correr enquanto o instala?" ++adjtimex (1.26-2) unstable; urgency=low + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+"O script adjtimexconfig irá usar o comando adjtimex para encontrar os " -+"valores para variáveis do kernel que o farĂŁo aproximar e estar de acordo com " -+"o relĂłgio por hardware (tambem conhecido pelo CMOS clock). Este entĂŁo " -+"guarda esses valores no ficheiro /etc/default/adjtimex para que estes " -+"paramĂŞtros sejam reavidos sempre que o sistema inicia, nomeadamente quando " -+"o /etc/init.d/adjtimex corre." ++ * debian/templates: Clarify wording: ask about running "when installed ++ or upgraded" not just "at installation time" (thanks to Uwe Storbeck ++ <uwe@ibr.ch> and Michael Meskes <meskes@debian.org>, ++ Closes:Bug#514987) ++ ++ * debian/postinst: don't prepend path to command running adjtimexconfig ++ to silence lintian complaint. (The package management system already ++ puts /usr/sbin in path, because that's where install-info is.) + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" -+"Este script demora 70 segundos a correr. De forma alternativa pode correr o " -+"adjtimexconfig por si prĂłprio numa altura mais tarde ou determinar as " -+"variáveis do kernel de outras formas (leia a página do manual do adjtimex) e " -+"instale-os em /etc/default/adjtimex." ---- adjtimex-1.23.orig/debian/po/sv.po -+++ adjtimex-1.23/debian/po/sv.po -@@ -0,0 +1,77 @@ -+# Translators, if you are not familiar with the PO format, gettext -+# documentation is worth reading, especially sections dedicated to -+# this format, e.g. by running: -+# info -n '(gettext)PO Files' -+# info -n '(gettext)Header Entry' -+# Some information specific to po-debconf are available at -+# /usr/share/doc/po-debconf/README-trans -+# or http://www.debian.org/intl/l10n/po-debconf/README-trans -+# Developers do not need to manually edit POT or PO files. -+# , fuzzy -+# -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: adjtimex 1.20-5\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\n" -+"PO-Revision-Date: 2005-10-11 16:31+0200\n" -+"Last-Translator: Daniel Nylander <po@danielnylander.se>\n" -+"Language-Team: Swedish <sv@li.org>\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=iso-8859-1\n" -+"Content-Transfer-Encoding: 8bit\n" ++ -- James R. Van Zandt <jrv@debian.org> Sat, 14 Feb 2009 11:46:24 -0500 + -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "Ska adjtimex köras vid installation och vid varje uppstart?" ++adjtimex (1.26-1) unstable; urgency=low + -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+"adjtimex kan köra vid systemets uppstart för att sätta kärntidsparametrar " -+"till värdena i /etc/default/adjtimex. Acceptera inte om du bara vill använda " -+"adjtimex för att inspektera de nuvarande parametrarna." ++ * New upstream release. Fix a possible hang with the Intersil ISL1208, ++ one of those new non-PC-compatible RTCs. Cleanly exits with an error ++ message, instead of either hang or returning garbage. (Thanks to Alain ++ Guibert). ++ ++ * debian/control: bump Debian policy version to 3.8.0 (no changes needed) ++ ++ * debian/rules: use "filter" instead of "findstring" to parse ++ DEB_BUILD_OPTIONS. + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "Ska adjtimexconfig köras vid installationstid?" ++ -- James R. Van Zandt <jrv@debian.org> Sun, 17 Aug 2008 17:52:14 -0400 + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+"Skriptet adjtimexconfig kommer att använda adjtimex för att hitta värden för " -+"kärnvariablerna tick och frequency som gör att systemklockan kommer överens " -+"med hĺrdvaruklockan (ocksĺ kallad CMOS-klockan). Den sparar sedan dessa " -+"värden i konfigurationsfilen /etc/default/adjtimex sĺ att inställningarna " -+"kommer att användas vid varje uppstart, när /etc/init.d/adjtimex körs." ++adjtimex (1.25-1) unstable; urgency=low + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" -+"Skriptet tar 70 sekunder att köras. Alternativt kan du köra adjtimexconfig " -+"själv vid en senare tid eller bestämma variabler för kärnan pĺ ett eller " -+"flera sätt (se adjtimes manualsida) och installera dom i /etc/default/" -+"adjtimex)." ---- adjtimex-1.23.orig/debian/po/ru.po -+++ adjtimex-1.23/debian/po/ru.po -@@ -0,0 +1,80 @@ -+# translation of adjtimex_1.20-5_templates_ru.po to Russian -+# -+# Translators, if you are not familiar with the PO format, gettext -+# documentation is worth reading, especially sections dedicated to -+# this format, e.g. by running: -+# info -n '(gettext)PO Files' -+# info -n '(gettext)Header Entry' -+# Some information specific to po-debconf are available at -+# /usr/share/doc/po-debconf/README-trans -+# or http://www.debian.org/intl/l10n/po-debconf/README-trans# -+# Developers do not need to manually edit POT or PO files. -+# Yuri Kozlov <kozlov.y@gmail.com>, 2005. -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: template_adjtimex_1.20-5\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\n" -+"PO-Revision-Date: 2005-11-07 19:24+0300\n" -+"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n" -+"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"X-Generator: KBabel 1.9.1\n" ++ * New upstream release. Set an alarm to avoid blocking even if /dev/rtc ++ never becomes readable, then fall back to busywait. New --nointerrupt ++ option to force busywait without first waiting for the interrupt ++ timeout (thanks to Alain Guibert). (closes:Bug#477637,Bug#474337). ++ Update man page (closes:Bug#435956). + -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "Должен adjtimex быть Đ·Đ°ĐżŃщен ŃĐµĐąŃ‡Đ°Ń Đ¸ каждый раз при Ńтарте ŃиŃтемы?" ++ -- James R. Van Zandt <jrv@debian.org> Fri, 08 Aug 2008 19:43:38 -0400 + -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+"adjtimex можно Đ·Đ°ĐżŃŃкать при Ńтарте ŃиŃтемы для ŃŃтановки значений " -+"параметров времени ядра из файла /etc/default/adjtimex. Не ŃоглаŃайтеŃŃŚ, " -+"еŃли проŃŃ‚Đľ хотите иŃпользовать adjtimex для проверки текŃщих параметров." ++adjtimex (1.24-1) unstable; urgency=low + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "Должен adjtimexconfig быть Đ·Đ°ĐżŃщен ŃейчаŃ?" ++ * New upstream release + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+"Сценарий adjtimexconfig иŃпользŃет adjtimex для поиŃка значений переменных " -+"ядра импŃльŃĐ° Ńигнала и чаŃтоты, которые помогают ŃоглаŃовывать ŃиŃтемные " -+"чаŃŃ‹ Ń Đ°ĐżĐżĐ°Ń€Đ°Ń‚Đ˝Ń‹ĐĽĐ¸ чаŃами (Ń‚Đ°Đş называемые чаŃŃ‹ CMOS). Затем он Ńохраняет эти " -+"значения в конфигŃрационный файл /etc/default/adjtimex, для того чтобы " -+"воŃŃтанавливать их при каждой загрŃзке Ń ĐżĐľĐĽĐľŃ‰ŃŚŃŽ Ńценария /etc/init.d/" -+"adjtimex." ++ * adjtimex.c: Reorganize cmos_read_time() to properly integrate the ++ fallback case for when /dev/rtc has no interrupts. Make this fallback ++ actually work. fixes partially(?) Debian bug #460065 (Thanks to Alain ++ Guibert <alguibert@free.fr>) (closes:Bug#471203) + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" -+"ДлительноŃŃ‚ŃŚ работы Ńценария -- 70 ŃекŃнд. Đ’ качеŃтве альтернативы вы можете " -+"Đ·Đ°ĐżŃŃтить adjtimexconfig врŃчнŃŃŽ позже, или определить переменные ядра одним " -+"из неŃкольких Đ´Ń€Ńгих ŃпоŃобов (Ńмотрите ŃŃ‚Ń€Đ°Đ˝Đ¸Ń†Ń Ń€ŃководŃтва по adjtimex) и " -+"Ńохранить их в файл /etc/default/adjtimex." ---- adjtimex-1.23.orig/debian/README.Debian -+++ adjtimex-1.23/debian/README.Debian -@@ -0,0 +1,21 @@ -+adjtimex for DEBIAN -+---------------------- ++ * (cmos_read_time): Fix Y2K bug: read century from byte 50, instead of ++ assuming we're in the range 1969-2068. + -+This is the Debian Linux prepackaged version of adjtimex. ++ * Implement second kind of busywait (busywait_second_change): when ++ /dev/rtc interrupt is not available, fallbacks to loops around ++ ioctl(RTC_RD_TIME) until the RTC second changes. Patch applies to ++ adjtimex 1.23 above first no-interrupt-fallback.patch fixes ++ partially(?) Debian bug #460065 (Thanks to: Alain Guibert ++ <alguibert@free.fr>) + -+This package was put together by Jim Van Zandt <jrv@debian.org>, -+who also maintains the program and therefore used the master sources. ++ * (cmos_read_time) If /dev/rtc does not exist then automatically ++ fallback to /dev/rtc0, so it works even without symlink. (Thanks to: ++ Alain Guibert <alguibert@free.fr>) + -+further Information: ++ * adjtimex.c (main): fix typo in options handling (thanks to Miroslav ++ Lichvar <mlichvar@redhat.com>) + -+* adjtimex manpage -+* copying policy -+ /usr/share/doc/adjtimex/copyright -+ (or debian/copyright in the source package) -+* changelog for debian package -+ /usr/share/doc/adjtimex/changelog.Debian -+* adjtimex's README: -+ /usr/share/doc/adjtimex/README ++ * debian/control: bump Debian policy version to 3.7.3 (no changes needed) + ++ * debian/dirs: don't install empty directory /usr/bin + -+James R. Van Zandt <jrv@debian.org>, Sun, 7 Mar 1999 21:58:51 -0500 ---- adjtimex-1.23.orig/debian/templates -+++ adjtimex-1.23/debian/templates -@@ -0,0 +1,22 @@ -+Template: adjtimex/run_daemon -+Type: boolean -+Default: true -+_Description: Should adjtimex be run at installation and at every startup? -+ adjtimex can run at system startup to set the kernel time parameters to -+ the values in /etc/default/adjtimex. Don't accept if you just want to -+ use adjtimex to inspect the current parameters. ++ -- James R. Van Zandt <jrv@debian.org> Fri, 04 Apr 2008 22:05:01 -0400 + -+Template: adjtimex/compare_rtc -+Type: boolean -+Default: true -+_Description: Should adjtimexconfig be run at installation time? -+ The adjtimexconfig script will use adjtimex to find values for the kernel -+ variables tick and frequency that will make the system clock approximately -+ agree with the hardware clock (also known as the CMOS clock). It then -+ saves these values in the configuration file /etc/default/adjtimex so the -+ settings will be restored on every boot, when /etc/init.d/adjtimex runs. -+ . -+ The script takes 70 sec to run. Alternatively, you can run adjtimexconfig -+ yourself at a later time, or determine the kernel variables one of several -+ other ways (see the adjtimex man page) and install them in -+ /etc/default/adjtimex. ---- adjtimex-1.23.orig/debian/changelog -+++ adjtimex-1.23/debian/changelog -@@ -0,0 +1,530 @@ +adjtimex (1.23-1) unstable; urgency=low + + * New upstream release @@ -4877,15 +4216,146 @@ + * Really say what we're doing in postinst (Bug#3474) + + ---- adjtimex-1.23.orig/debian/dirs -+++ adjtimex-1.23/debian/dirs -@@ -0,0 +1,4 @@ -+usr/bin +--- adjtimex-1.29.orig/debian/adjtimexconfig.8 ++++ adjtimex-1.29/debian/adjtimexconfig.8 +@@ -0,0 +1,41 @@ ++.\"{{{ Title Emacs major mode should be: -*- nroff -*- ++.TH ADJTIMEXCONFIG 8 "April 27, 2003" ++.\"}}} ++.\"{{{ Name ++.SH NAME ++adjtimexconfig \- find kernel clock variables and save for reboots ++.\"}}} ++.\"{{{ Synopsis ++.SH SYNOPSIS ++.ad l ++.\" commands only ++.B /sbin/adjtimexconfig ++.\"}}} ++.\"{{{ Config ++.SH DESCRIPTION ++This script uses \fBadjtimex\fP(8) to find values for the kernel ++variables \fBtick\fP and \fBfrequency\fP that will make the system ++clock approximately agree with the CMOS clock. It then saves these ++values in the configuration file \fI/etc/default/adjtimex\fP so the ++settings will be restored on every boot, when ++\fI/etc/init.d/adjtimex\fP runs. ++.P ++\fPadjtimexconfig\fP uses the drift rate recorded in ++\fI/etc/adjtime\fP to adjust the times it reads from the CMOS clock. ++If you find the CMOS clock has a systematic drift, read the ++\fBclock\fP(8) or \fBhwclock\fP(8) manual page, modify ++\fI/etc/adjtime\fP as required, and run \fBadjtimexconfig\fP again. ++.SH AUTHOR ++Michael Meskes <meskes@debian.org>. ++.\"}}} ++.\"{{{ ++.SH FILES ++.nf ++\fI/etc/default/adjtimex\fP ++\fI/etc/init.d/adjtimex\fP ++.fi ++.\"}}} ++.\"{{{ See also ++.SH "SEE ALSO" ++.BR adjtimex "(8), "clock "(8), "hwclock "(8), "ntpd (8) ++.\"}}} +--- adjtimex-1.29.orig/debian/adjust ++++ adjtimex-1.29/debian/adjust +@@ -0,0 +1,15 @@ ++ mode: 16384 ++ offset: 0 ++ frequency: 0 ++ maxerror: 0 ++ esterror: 0 ++ status: 0 ++time_constant: 0 ++ precision: 0 ++ tolerance: 0 ++ tick: 0 ++ raw time: 0s 0us = 0.000000 ++for this kernel: ++ USER_HZ = 100 (nominally 100 ticks per second) ++ 9000 <= tick <= 11000 ++ -33554432 <= frequency <= 33554432 +--- adjtimex-1.29.orig/debian/dirs ++++ adjtimex-1.29/debian/dirs +@@ -0,0 +1,3 @@ +usr/sbin +sbin +usr/share/man/man8 ---- adjtimex-1.23.orig/debian/postrm -+++ adjtimex-1.23/debian/postrm +--- adjtimex-1.29.orig/debian/adjtimexconfig ++++ adjtimex-1.29/debian/adjtimexconfig +@@ -0,0 +1,67 @@ ++#!/bin/sh ++ ++conffile=/etc/default/adjtimex ++startfile=/etc/init.d/adjtimex ++ ++echo -n "Comparing clocks (this will take 70 sec)..." ++ ++# Get the parameters ++ ++/sbin/adjtimex --print --tick 0 >/etc/adj.adjust 2>/dev/null ++baseline=`awk '/<= tick/{print ($1+$NF)/2}' /etc/adj.adjust` ++hz=`awk '/USER_HZ/{print $3}' /etc/adj.adjust` ++/sbin/adjtimex --tick $baseline --frequency 0 ++/sbin/adjtimex --adjust --force-adjust >/etc/adj.adjust ++echo "done." ++ticks=`tail -n 1 /etc/adj.adjust|awk '{print $6}'` ++freq=`tail -n 1 /etc/adj.adjust|awk '{print $7}'` ++# cat /etc/adj.adjust ++# echo hz=$hz baseline=$baseline ticks=$ticks freq=$freq ++rm /etc/adj.adjust ++adjt=`awk "BEGIN{print (($ticks-$baseline)*$hz + $freq/65536.)*.0864}"` ++echo -n "Adjusting system time by ${adjt} sec/day to agree with CMOS clock..." ++ ++# Recreate /etc/adjtimex.conf if necessary ++ ++if [ -f $conffile ]; then ++# echo "using existing $conffile"; ++ true; ++else ++cat >$conffile <<EOF ++# $conffile - configuration file for adjtimex(8) ++# ++# you may adjust these values manually or by calling /usr/sbin/adjtimexconfig ++# ++# This file is sourced by $startfile ++# ++TICK=$TICK ++FREQ=$FREQ ++ ++EOF ++fi ++ ++# Reset values in $conffile ++ ++sed -e "s/^TICK=.*/TICK=$ticks/" \ ++ -e "s/^FREQ=.*/FREQ=$freq/" \ ++ $conffile >$conffile.TMP && \ ++ mv $conffile.TMP $conffile ++ ++# grep "TICK=" /etc/init.d/adjtimex | cut -d'#' -f1 > /etc/adj.tick ++# grep "FREQ=" /etc/init.d/adjtimex | cut -d'#' -f1 > /etc/adj.freq ++# ++# TICKLINE="`echo -n "TICK="$ticks" # old: "; cat /etc/adj.tick`" ++# FREQLINE="`echo -n "FREQ="$freq" # old: "; cat /etc/adj.freq`" ++# ++# cp /etc/init.d/adjtimex /etc/init.d/adjtimex.TMP ++# sed -e "s/^TICK=.*/$TICKLINE/" -e "s/^FREQ=.*/$FREQLINE/" \ ++# < /etc/init.d/adjtimex.TMP > /etc/init.d/adjtimex ++# ++# if [ -s /etc/init.d/adjtimex ] ++# then ++# rm -f /etc/init.d/adjtimex.TMP ++# fi ++# rm -f /etc/adj.tick /etc/adj.freq /etc/adj.adjust ++rm -f /etc/adj.adjust ++echo "done." ++ +--- adjtimex-1.29.orig/debian/postrm ++++ adjtimex-1.29/debian/postrm @@ -0,0 +1,25 @@ +#! /bin/sh -e + @@ -4912,8 +4382,79 @@ +esac + +#DEBHELPER# ---- adjtimex-1.23.orig/debian/copyright -+++ adjtimex-1.23/debian/copyright +--- adjtimex-1.29.orig/debian/control ++++ adjtimex-1.29/debian/control +@@ -0,0 +1,20 @@ ++Source: adjtimex ++Section: admin ++Priority: optional ++Maintainer: James R. Van Zandt <jrv@debian.org> ++Build-Depends: debhelper (>= 5), po-debconf ++Standards-Version: 3.8.4 ++ ++Package: adjtimex ++Architecture: any ++Depends: ${misc:Depends}, ${shlibs:Depends}, debconf | debconf-2.0 ++Suggests: ntpdate ++Description: kernel time variables configuration utility ++ This package provides a utility to manipulate the kernel time ++ variables. For a machine connected to the Internet, or equipped with ++ a precision oscillator or radio clock, the best way to keep the ++ system clock accurate is using NTP (Network Time Protocol). However, ++ for a standalone or intermittently connected machine, you may use ++ adjtimex instead to at least correct for systematic drift. It can ++ optionally adjust the system clock using the CMOS clock as a ++ reference, and can log times for long-term estimation of drift rates. +--- adjtimex-1.29.orig/debian/adjtimex.init ++++ adjtimex-1.29/debian/adjtimex.init +@@ -0,0 +1,45 @@ ++#!/bin/sh ++# ++# Run ADJTIMEX at startup. ++ ++### BEGIN INIT INFO ++# Provides: adjtimex ++# Required-Start: $local_fs ++# Required-Stop: ++# Should-Start: ++# Should-Stop: ++# Default-Start: S ++# Default-Stop: ++# Short-Description: set the kernel time variables ++# Description: set the kernel time variables ++### END INIT INFO ++ ++test -x /sbin/adjtimex || exit 0 ++ ++# default values ++TICK=10000 ++FREQ=0 ++ ++# values in $cfg take precedence over the values here ++cfg=/etc/default/adjtimex ++ ++if [ -f $cfg ]; then ++ . $cfg ++fi ++ ++case "$1" in ++ start|restart|force-reload) ++ echo -n "Regulating system clock..." ++ /sbin/adjtimex -tick "$TICK" -frequency "$FREQ" ++ echo "done." ++ ;; ++ stop|status) ++ ;; ++ *) ++ echo "/etc/init.d/adjtimex: unknown command $1" >&2 ++ echo "Usage: /etc/init.d/adjtimex {start|stop|restart|force-reload}" >&2 ++ exit 3 ++ ;; ++esac ++ ++exit 0 +--- adjtimex-1.29.orig/debian/copyright ++++ adjtimex-1.29/debian/copyright @@ -0,0 +1,28 @@ +This package was debianized by James R. Van Zandt jrv@debian.org on +Thu, 11 Dec 1997 21:48:01 -0500. @@ -4943,9 +4484,63 @@ +On Debian GNU/Linux systems, the complete text of the GNU Public +License can be found in `/usr/share/common-licenses/' + ---- adjtimex-1.23.orig/debian/rules -+++ adjtimex-1.23/debian/rules -@@ -0,0 +1,113 @@ +--- adjtimex-1.29.orig/debian/templates ++++ adjtimex-1.29/debian/templates +@@ -0,0 +1,35 @@ ++# These templates have been reviewed by the debian-l10n-english ++# team ++# ++# If modifications/additions/rewording are needed, please ask ++# debian-l10n-english@lists.debian.org for advice. ++# ++# Even minor modifications require translation updates and such ++# changes should be coordinated with translators and reviewers. ++ ++Template: adjtimex/run_daemon ++Type: boolean ++Default: true ++_Description: Should adjtimex be run at installation and at every startup? ++ Running adjtimex at system startup will set the kernel time parameters to ++ the values in /etc/default/adjtimex. ++ . ++ You should not choose this option if you just want to ++ use adjtimex to inspect the current parameters. ++ ++Template: adjtimex/compare_rtc ++Type: boolean ++Default: true ++#flag:comment:2 ++# Translators: do not translate "tick" and "frequency" ++_Description: Run adjtimexconfig when adjtimex is installed or upgraded? ++ The adjtimexconfig script will use adjtimex to find values for the kernel ++ variables "tick" and "frequency" that will make the system clock approximately ++ agree with the hardware clock (also known as the CMOS clock). It then ++ saves these values in the configuration file /etc/default/adjtimex so the ++ settings will be restored on every boot, when /etc/init.d/adjtimex runs. ++ . ++ The script takes 70 seconds to run, so running it for every upgrade ++ may be a waste of time. Alternatively, you can run adjtimexconfig ++ manually when needed, or determine the kernel variables by using other ++ methods and set them manually in /etc/default/adjtimex. +--- adjtimex-1.29.orig/debian/docs ++++ adjtimex-1.29/debian/docs +@@ -0,0 +1,2 @@ ++README ++README.ru +--- adjtimex-1.29.orig/debian/config ++++ adjtimex-1.29/debian/config +@@ -0,0 +1,8 @@ ++#! /bin/sh -e ++ ++# Source debconf library. ++. /usr/share/debconf/confmodule ++ ++db_input medium adjtimex/run_daemon || true ++db_input medium adjtimex/compare_rtc || true ++db_go +--- adjtimex-1.29.orig/debian/rules ++++ adjtimex-1.29/debian/rules +@@ -0,0 +1,117 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. @@ -4968,23 +4563,27 @@ +INSTALL_SCRIPT = $(INSTALL) -p -o root -g root -m 755 +INSTALL_DIR = $(INSTALL) -p -d -o root -g root -m 755 + -+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) ++ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) +CFLAGS += -O0 +else +CFLAGS += -O2 +endif -+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) ++ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) +INSTALL_PROGRAM += -s +endif -+ ++# parallel build isn't worth while + +config.status: configure + dh_testdir + # configure the package. + ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info ++ touch config.h + ++build: build-arch build-indep + -+build: build-stamp ++build-arch: build-stamp ++ ++build-indep: build-stamp + +build-stamp: config.status + dh_testdir @@ -5003,7 +4602,7 @@ + # clean up after the build process. + debconf-updatepo + [ ! -f Makefile ] || $(MAKE) veryclean -+ rm -rf adjtimex *.o config.* ++ rm -rf adjtimex *.o config.cache config.log config.status + -test -r /usr/share/misc/config.sub && \ + cp -f /usr/share/misc/config.sub config.sub + -test -r /usr/share/misc/config.guess && \ @@ -5059,139 +4658,9 @@ + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install ---- adjtimex-1.23.orig/debian/docs -+++ adjtimex-1.23/debian/docs -@@ -0,0 +1,2 @@ -+README -+README.ru ---- adjtimex-1.23.orig/debian/adjtimexconfig -+++ adjtimex-1.23/debian/adjtimexconfig -@@ -0,0 +1,67 @@ -+#!/bin/sh -+ -+conffile=/etc/default/adjtimex -+startfile=/etc/init.d/adjtimex -+ -+echo -n "Comparing clocks (this will take 70 sec)..." -+ -+# Get the parameters -+ -+/sbin/adjtimex --print --tick 0 >/etc/adj.adjust 2>/dev/null -+baseline=`awk '/<= tick/{print ($1+$NF)/2}' /etc/adj.adjust` -+hz=`awk '/USER_HZ/{print $3}' /etc/adj.adjust` -+/sbin/adjtimex --tick $baseline --frequency 0 -+/sbin/adjtimex --adjust >/etc/adj.adjust -+echo "done." -+ticks=`tail -n 1 /etc/adj.adjust|awk '{print $6}'` -+freq=`tail -n 1 /etc/adj.adjust|awk '{print $7}'` -+# cat /etc/adj.adjust -+# echo hz=$hz baseline=$baseline ticks=$ticks freq=$freq -+rm /etc/adj.adjust -+adjt=`awk "BEGIN{print (($ticks-$baseline)*$hz + $freq/65536.)*.0864}"` -+echo -n "Adjusting system time by ${adjt} sec/day to agree with CMOS clock..." -+ -+# Recreate /etc/adjtimex.conf if necessary -+ -+if [ -f $conffile ]; then -+# echo "using existing $conffile"; -+ true; -+else -+cat >$conffile <<EOF -+# $conffile - configuration file for adjtimex(8) -+# -+# you may adjust these values manually or by calling /usr/sbin/adjtimexconfig -+# -+# This file is sourced by $startfile -+# -+TICK=$TICK -+FREQ=$FREQ -+ -+EOF -+fi -+ -+# Reset values in $conffile -+ -+sed -e "s/^TICK=.*/TICK=$ticks/" \ -+ -e "s/^FREQ=.*/FREQ=$freq/" \ -+ $conffile >$conffile.TMP && \ -+ mv $conffile.TMP $conffile -+ -+# grep "TICK=" /etc/init.d/adjtimex | cut -d'#' -f1 > /etc/adj.tick -+# grep "FREQ=" /etc/init.d/adjtimex | cut -d'#' -f1 > /etc/adj.freq -+# -+# TICKLINE="`echo -n "TICK="$ticks" # old: "; cat /etc/adj.tick`" -+# FREQLINE="`echo -n "FREQ="$freq" # old: "; cat /etc/adj.freq`" -+# -+# cp /etc/init.d/adjtimex /etc/init.d/adjtimex.TMP -+# sed -e "s/^TICK=.*/$TICKLINE/" -e "s/^FREQ=.*/$FREQLINE/" \ -+# < /etc/init.d/adjtimex.TMP > /etc/init.d/adjtimex -+# -+# if [ -s /etc/init.d/adjtimex ] -+# then -+# rm -f /etc/init.d/adjtimex.TMP -+# fi -+# rm -f /etc/adj.tick /etc/adj.freq /etc/adj.adjust -+rm -f /etc/adj.adjust -+echo "done." -+ ---- adjtimex-1.23.orig/debian/adjtimexconfig.8 -+++ adjtimex-1.23/debian/adjtimexconfig.8 -@@ -0,0 +1,41 @@ -+.\"{{{ Title Emacs major mode should be: -*- nroff -*- -+.TH ADJTIMEXCONFIG 8 "April 27, 2003" -+.\"}}} -+.\"{{{ Name -+.SH NAME -+adjtimexconfig \- find kernel clock variables and save for reboots -+.\"}}} -+.\"{{{ Synopsis -+.SH SYNOPSIS -+.ad l -+.\" commands only -+.B /sbin/adjtimexconfig -+.\"}}} -+.\"{{{ Config -+.SH DESCRIPTION -+This script uses \fBadjtimex\fP(8) to find values for the kernel -+variables \fBtick\fP and \fBfrequency\fP that will make the system -+clock approximately agree with the CMOS clock. It then saves these -+values in the configuration file \fI/etc/default/adjtimex\fP so the -+settings will be restored on every boot, when -+\fI/etc/init.d/adjtimex\fP runs. -+.P -+\fPadjtimexconfig\fP uses the drift rate recorded in -+\fI/etc/adjtime\fP to adjust the times it reads from the CMOS clock. -+If you find the CMOS clock has a systematic drift, read the -+\fBclock\fP(8) or \fBhwclock\fP(8) manual page, modify -+\fI/etc/adjtime\fP as required, and run \fBadjtimexconfig\fP again. -+.SH AUTHOR -+Michael Meskes <meskes@debian.org>. -+.\"}}} -+.\"{{{ -+.SH FILES -+.nf -+\fI/etc/default/adjtimex\fP -+\fI/etc/init.d/adjtimex\fP -+.fi -+.\"}}} -+.\"{{{ See also -+.SH "SEE ALSO" -+.BR adjtimex "(8), "clock "(8), "hwclock "(8), "ntpd (8) -+.\"}}} ---- adjtimex-1.23.orig/debian/config -+++ adjtimex-1.23/debian/config -@@ -0,0 +1,8 @@ -+#! /bin/sh -e -+ -+# Source debconf library. -+. /usr/share/debconf/confmodule -+ -+db_input medium adjtimex/run_daemon || true -+db_input medium adjtimex/compare_rtc || true -+db_go ---- adjtimex-1.23.orig/debian/postinst -+++ adjtimex-1.23/debian/postinst -@@ -0,0 +1,119 @@ +--- adjtimex-1.29.orig/debian/postinst ++++ adjtimex-1.29/debian/postinst +@@ -0,0 +1,123 @@ +#! /bin/sh + +set -e @@ -5282,6 +4751,10 @@ +case "$1" in + configure) + ++# A previous installation may have left a corrupt conffile. ++# The regexp matches only blank lines, comments, and integer assignments: ++ egrep -qv '^([:space:]*(#.*)?|[:space:]*[a-zA-Z][a-zA-Z0-9]*[:space:]*=[:space:]*[0-9]+[:space:]*)$' $conffile && rm -f $conffile ++ + create_adjtimex_conf + + db_get adjtimex/run_daemon @@ -5297,7 +4770,7 @@ + + db_get adjtimex/compare_rtc + if [ "$RET" = "true" ]; then -+ /usr/sbin/adjtimexconfig ++ adjtimexconfig + fi + + ;; @@ -5311,146 +4784,1781 @@ +esac + +#DEBHELPER# ---- adjtimex-1.23.orig/debian/adjtimex.init -+++ adjtimex-1.23/debian/adjtimex.init -@@ -0,0 +1,45 @@ -+#!/bin/sh +--- adjtimex-1.29.orig/debian/README.Debian ++++ adjtimex-1.29/debian/README.Debian +@@ -0,0 +1,21 @@ ++adjtimex for DEBIAN ++---------------------- ++ ++This is the Debian Linux prepackaged version of adjtimex. ++ ++This package was put together by Jim Van Zandt <jrv@debian.org>, ++who also maintains the program and therefore used the master sources. ++ ++further Information: ++ ++* adjtimex manpage ++* copying policy ++ /usr/share/doc/adjtimex/copyright ++ (or debian/copyright in the source package) ++* changelog for debian package ++ /usr/share/doc/adjtimex/changelog.Debian ++* adjtimex's README: ++ /usr/share/doc/adjtimex/README ++ ++ ++James R. Van Zandt <jrv@debian.org>, Sun, 7 Mar 1999 21:58:51 -0500 +--- adjtimex-1.29.orig/debian/po/fr.po ++++ adjtimex-1.29/debian/po/fr.po +@@ -0,0 +1,90 @@ ++# Translation of adjtimex debconf screen to French ++# Copyright (C) 2005-2009 Debian French l10n team <debian-l10n-french@lists.debian.org> ++# This file is distributed under the same license as the adjtimex package. +# -+# Run ADJTIMEX at startup. ++# Christian Perrier <bubulle@debian.org>, 2006, 2009. ++# Translators: ++msgid "" ++msgstr "" ++"Project-Id-Version: fr\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2009-03-17 07:45+0100\n" ++"Last-Translator: Christian Perrier <bubulle@debian.org>\n" ++"Language-Team: French <debian-l10n-french@lists.debian.org>\n" ++"Language: fr\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: KBabel 1.11.4\n" + -+### BEGIN INIT INFO -+# Provides: adjtimex -+# Required-Start: -+# Required-Stop: -+# Should-Start: -+# Should-Stop: -+# Default-Start: 2 3 4 5 -+# Default-Stop: 0 1 6 -+# Short-Description: set the kernel time variables -+# Description: set the kernel time variables -+### END INIT INFO ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "" ++"Faut-il lancer adjtimex lors de l'installation et Ă chaque dĂ©marrage du " ++"système ?" + -+test -x /sbin/adjtimex || exit 0 ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Adjtimex peut ĂŞtre lancĂ© au dĂ©marrage du système afin de rĂ©gler les " ++"paramètres d'horloge du noyau en fonction des valeurs contenues dans /etc/" ++"default/adjtimex." + -+# default values -+TICK=10000 -+FREQ=0 -+ -+# values in $cfg take precedence over the values here -+cfg=/etc/default/adjtimex ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Vous ne devriez pas choisir cette option si vous souhaitez simplement vous " ++"servir d'adjtimex pour consulter les paramètres actuels." + -+if [ -f $cfg ]; then -+ . $cfg -+fi ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "" ++"Faut-il lancer adjtimexconfig lors de l'installation ou de la mise Ă jour ?" + -+case "$1" in -+ start|restart|force-reload) -+ echo -n "Regulating system clock..." -+ /sbin/adjtimex -tick "$TICK" -frequency "$FREQ" -+ echo "done." -+ ;; -+ stop|status) -+ ;; -+ *) -+ echo "/etc/init.d/adjtimex: unknown command $1" >&2 -+ echo "Usage: /etc/init.d/adjtimex {start|stop|restart|force-reload}" >&2 -+ exit 3 -+ ;; -+esac ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Le script adjtimexconfig utilise adjtimex afin de trouver les valeurs " ++"appropriĂ©es pour les variables du noyau concernant le battement (« tick ») " ++"et la frĂ©quence d'horloge. Cela permettra Ă l'horloge du système d'ĂŞtre Ă " ++"peu près en accord avec l'horloge matĂ©rielle (parfois appelĂ©e « horloge " ++"CMOS »). Ces valeurs seront alors conservĂ©es dans le fichier de " ++"configuration /etc/default/adjtimex ce qui permettra de les restaurer Ă " ++"chaque dĂ©marrage quand /etc/init.d/adjtimex s'exĂ©cutera. " + -+exit 0 ---- adjtimex-1.23.orig/debian/adjust -+++ adjtimex-1.23/debian/adjust -@@ -0,0 +1,15 @@ -+ mode: 16384 -+ offset: 0 -+ frequency: 0 -+ maxerror: 0 -+ esterror: 0 -+ status: 0 -+time_constant: 0 -+ precision: 0 -+ tolerance: 0 -+ tick: 0 -+ raw time: 0s 0us = 0.000000 -+for this kernel: -+ USER_HZ = 100 (nominally 100 ticks per second) -+ 9000 <= tick <= 11000 -+ -33554432 <= frequency <= 33554432 ---- adjtimex-1.23.orig/debian/compat -+++ adjtimex-1.23/debian/compat ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"La durĂ©e d'exĂ©cution du script est de 70 secondes, ce qui peut ĂŞtre vu comme " ++"une perte de temps au dĂ©marrage. Vous pouvez Ă©galement utiliser " ++"adjtimexconfig vous-mĂŞme plus tard ou dĂ©terminer les valeurs des variables " ++"du noyau d'une autre manière. Ces valeurs devront ensuite ĂŞtre placĂ©es dans /" ++"etc/default/adjtimex." +--- adjtimex-1.29.orig/debian/po/it.po ++++ adjtimex-1.29/debian/po/it.po +@@ -0,0 +1,85 @@ ++# ITALIAN TRANSLATION OF ADJTIMEX'S.PO-DEBCONF FILE ++# COPYRIGHT (C) 2009 THE ADJTIMEX'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the adjtimex package. ++# ++# Vincenzo Campanella <vinz65@gmail.com>, 2009. ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex 1.26-3\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2009-04-01 14:15+0200\n" ++"Last-Translator: Vincenzo Campanella <vinz65@gmail.com>\n" ++"Language-Team: Italian <tp@lists.linux.it>\n" ++"Language: it\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: KBabel 1.11.4\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "Eseguire adjtimex all'installazione e con ogni avvio del sistema?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"L'esecuzione di adjtimex all'avvio del sistema imposterĂ i parametri di " ++"tempo del kernel ai valori contenuti in «/etc/default/adjtimex»." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Non si dovrebbe scegliere questa opzione se si prevede di usare adjtimex " ++"solo per verificare i parametri attuali." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Eseguire adjtimexconfig quando adjtimex viene installato o aggiornato?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Lo script adjtimexconfig userĂ adjtimex per trovare i valori delle variabili " ++"del kernel «tick» e «frequency» per fare in modo che l'orario del sistema " ++"coincida approssimativamente a quello dell'orologio dell'hardware (anche " ++"conosciuto come orologio CMOS). Questi valori vengono poi salvati nel file " ++"di configurazione «/etc/default/adjtimex», in modo che le impostazioni " ++"vengano ripristinate a ogni avvio, quando «/etc/init.d/adjtimex» viene " ++"eseguito." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Lo script necessita di 70 secondi per essere eseguito, per cui lanciarlo a " ++"ogni aggiornamento potrebbe essere uno spreco di tempo. In alternativa è " ++"possibile eseguire manualmente adjtimexconfig quando è necessario, oppure " ++"determinare le variabili del kernel usando altri metodi e impostandole " ++"manualmente in «/etc/default/adjtimex»." +--- adjtimex-1.29.orig/debian/po/pt_BR.po ++++ adjtimex-1.29/debian/po/pt_BR.po +@@ -0,0 +1,96 @@ ++# ++# Translators, if you are not familiar with the PO format, gettext ++# documentation is worth reading, especially sections dedicated to ++# this format, e.g. by running: ++# info -n '(gettext)PO Files' ++# info -n '(gettext)Header Entry' ++# ++# Some information specific to po-debconf are available at ++# /usr/share/doc/po-debconf/README-trans ++# or http://www.debian.org/intl/l10n/po-debconf/README-trans ++# ++# Developers do not need to manually edit POT or PO files. ++# AndrĂ© LuĂs Lopes <andrelop@debian.org>, 2010. ++# Flamarion Jorge <jorge.flamarion@gmail.com>, 2010. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex 1.29-2.1\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2010-11-11 22:16-0200\n" ++"Last-Translator: Flamarion Jorge <jorge.flamarion@gmail.com>\n" ++"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian." ++"org>\n" ++"Language: \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=2; plural=(n > 1);\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "O adjtimex deve ser executado na instalação e em cada inicialização?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Executar o adjtimex na inicialização do sistema configurará os parâmetros de " ++"tempo do kernel para os valores em /etc/default/adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"VocĂŞ nĂŁo deve escolher esta opção se vocĂŞ apenas quer usar o adjtimex para " ++"inspecionar os parâmetros atuais." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "" ++"Executar o adjtimexconfig quando o adjtimex for instalado ou atualizado?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"O script adjtimexconfig usará o adjtimex para encontrar valores para as " ++"variáveis \"tick\" e \"frequency\" do kernel, que farĂŁo o relĂłgio do sistema " ++"o mais prĂłximo do relĂłgio do hardware (tambĂ©m conhecido como o relĂłgio da " ++"CMOS). Ele entĂŁo salva estes valores no arquivo de configuração /etc/default/" ++"adjtimex, assim as configurações serĂŁo restauradas a cada inicialização, " ++"quando o /etc/init.d/adjtimex executar." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"O script leva 70 segundos para rodar, portanto rodá-lo a cada atualização " ++"pode ser um desperdĂcio de tempo. Alternativamente, vocĂŞ pode executar o " ++"adjtimexconfig manualmente quando necessário, ou determinar as variáveis de " ++"kernel usando outros mĂ©todos e configurá-las manualmente em /etc/default/" ++"adjtimex." +--- adjtimex-1.29.orig/debian/po/templates.pot ++++ adjtimex-1.29/debian/po/templates.pot +@@ -0,0 +1,68 @@ ++# SOME DESCRIPTIVE TITLE. ++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the PACKAGE package. ++# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. ++# ++#, fuzzy ++msgid "" ++msgstr "" ++"Project-Id-Version: PACKAGE VERSION\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" ++"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" ++"Language-Team: LANGUAGE <LL@li.org>\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=CHARSET\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" +--- adjtimex-1.29.orig/debian/po/gl.po ++++ adjtimex-1.29/debian/po/gl.po +@@ -0,0 +1,85 @@ ++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the PACKAGE package. ++# ++# marce villarino <mvillarino@users.sourceforge.net>, 2009. ++msgid "" ++msgstr "" ++"Project-Id-Version: templates_[OK3397]\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2009-04-16 22:09+0200\n" ++"Last-Translator: marce villarino <mvillarino@users.sourceforge.net>\n" ++"Language-Team: Galician <proxecto@trasno.ent>\n" ++"Language: gl\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: Lokalize 0.2\n" ++"Plural-Forms: nplurals=2; plural=n != 1;\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "" ++"Debe executarse adjtimex durante a instalaciĂłn e con cada inicio do sistema?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Se executa adjtimex durante o inicio do sistema axustará os parámetros de " ++"hora do nĂşcleo cos valores que haxa en /etc/default/adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Non deberĂa escoller esta opciĂłn se sĂł desexa empregar adjtimex para " ++"inspeccionar os parámetros actuais." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Desexa executar adjtimexconfig se instala ou actualiza?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"O script adjtimexconfig empregará adjtimex para achar valores paras as " ++"variábeis do nĂşcleo «tick» e «frequency» que fagan que o reloxo do sistema " ++"se corresponda aproximadamente co do hardware (o chamado reloxo da BIOS). " ++"Logo garda eses valores no ficheiro de configuraciĂłn /etc/default/adjtimex " ++"de xeito que os valores se restauren en cada arranque, cando se executa /etc/" ++"init.d/adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"O script tarda 70 segundos en executarse, pode que executalo cada vez que se " ++"actualice pode ser un desperdicio de tempo. En alternativa, pode executar " ++"adjtimexconfig manualmente cando o precise, ou determinar as variábeis do " ++"nĂşcleo empregando outros mĂ©todos e axustalas manualmente en /etc/default/" ++"adjtimex." +--- adjtimex-1.29.orig/debian/po/vi.po ++++ adjtimex-1.29/debian/po/vi.po +@@ -0,0 +1,82 @@ ++# Vietnamese Translation for adjtimex. ++# Copyright © 2010 Free Software Foundation, Inc. ++# Clytie Siddall <clytie@riverland.net.au>, 2005-2010. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex 1.29-2.1\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2010-10-27 14:39+1030\n" ++"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" ++"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n" ++"Language: vi\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=1; plural=0;\n" ++"X-Generator: LocFactoryEditor 1.8\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "adjtimex cĂł nĂŞn chạy vĂ o lĂşc cĂ i Ä‘áş·t vĂ khi nĂ o khởi Ä‘á»™ng khĂ´ng?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Chạy adjtimex vĂ o lĂşc khởi chạy hệ thống thì láşp các tham số thời gian của " ++"hạt nhân thĂ nh những giá trị trong táşp tin « /etc/default/adjtimex »." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"KhĂ´ng nĂŞn báşt tuỳ chọn nĂ y náşżu bạn chỉ muốn sá» dụng adjtimex Ä‘á» kiá»m tra " ++"những tham số hiện thời." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Chạy adjtimexconfig khi adjtimex được cĂ i Ä‘áş·t hay nâng cấp ?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"VÄn lệnh cấu hình adjtimexconfig thì sá» dụng adjtimex Ä‘á» tìm giá trị cho hai " ++"biáşżn hạt nhân « tick » và « frequency », Ä‘á» lĂ m cho đồng hồ hệ thống tương " ++"ứng xấp xỉ vá»›i đồng hồ phần cứng (cĹ©ng được gọi nhĆ° là đồng hồ CMOS). VÄn " ++"lệnh nĂ y lĆ°u các giá trị Ä‘Ăł vĂ o táşp tin cấu hình « /etc/default/adjtimex », " ++"Ä‘á» phục hồi thiáşżt láşp khi nĂ o việc khởi Ä‘á»™ng chạy « /etc/init.d/adjtimex »." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"VÄn lệnh nĂ y chạy trong khoảng 70 giây thì cĂł thá» lĂ bạn khĂ´ng muốn chạy nĂł " ++"vĂ o má»—i lĂşc nâng cấp. Bạn cĹ©ng cĂł thá» chạy adjtimexconfig báş±ng tay khi cần " ++"thiáşżt, hoáş·c quyáşżt định những biáşżn hạt nhân báş±ng phương pháp khác vĂ láşp báş±ng " ++"tay trong táşp tin « /etc/default/adjtimex »." +--- adjtimex-1.29.orig/debian/po/fi.po ++++ adjtimex-1.29/debian/po/fi.po +@@ -0,0 +1,84 @@ ++# Copyright (C) 2009 ++# This file is distributed under the same license as the adjtimex package. ++# ++# Esko Arajärvi <edu@iki.fi>, 2010. ++msgid "" ++msgstr "" ++"Project-Id-Version: \n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2010-01-09 22:59+0200\n" ++"Last-Translator: Esko Arajärvi <edu@iki.fi>\n" ++"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n" ++"Language: fi\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: Lokalize 1.0\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "" ++"Tulisiko adjtimex ajaa asennuksen yhteydessä ja aina kun järjestelmä " ++"käynnistetään?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Jos adjtimex ajetaan käynnistettäessä järjestelmä, ytimen aikaparametrit " ++"asetetaan tiedostossa /etc/default/adjtimex annettuihin arvoihin." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Ă„lä valitse tätä vaihtoehtoa, jos haluat käyttää adjtimexiä vain nykyisten " ++"parametriarvojen tarkasteluun." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Tulisiko adjtimexconfig ajaa, kun adjtimex asennetaan tai päivitetään?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Komentosarja adjtimexconfig etsii ohjelman adjtimex avulla ytimen " ++"muuttujille ”tick” ja ”frequency” arvot, joilla järjestelmän kello näyttää " ++"suunnilleen samaa kuin laitteiston kello (CMOS-kello). Se tallentaa nämä " ++"arvot asetustiedostoon /etc/default/adjtimex, jolloin ne palautetaan " ++"järjestelmän käynnistyessä, kun /etc/init.d/adjtimex ajetaan." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Komentosarjan ajaminen kestää 70 sekuntia, joten sen ajaminen jokaisen " ++"päivityksen yhteydessä saattaa olla ajanhukkaa. Voit vaihtoehtoisesti ajaa " ++"adjtimexconfigin käsin tarvittaessa tai määrittää ytimen muuttujien arvot " ++"muilla keinoin ja asettaa ne käsin tiedostoon /etc/default/adjtimex." +--- adjtimex-1.29.orig/debian/po/pl.po ++++ adjtimex-1.29/debian/po/pl.po +@@ -0,0 +1,123 @@ ++# ++# Translators, if you are not familiar with the PO format, gettext ++# documentation is worth reading, especially sections dedicated to ++# this format, e.g. by running: ++# info -n '(gettext)PO Files' ++# info -n '(gettext)Header Entry' ++# ++# Some information specific to po-debconf are available at ++# /usr/share/doc/po-debconf/README-trans ++# or http://www.debian.org/intl/l10n/po-debconf/README-trans ++# ++# Developers do not need to manually edit POT or PO files. ++# ++#, fuzzy ++msgid "" ++msgstr "" ++"Project-Id-Version: PACKAGE VERSION\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" ++"Last-Translator: Bartosz Zapałowski <zapal@debian.linux.org.pl>\n" ++"Language-Team: Polish Debian Documentation Project <pddp@debian.linux.org." ++"pl>\n" ++"Language: \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=iso-8859-2\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "" ++"Czy adjtimex ma być uruchomiany podczas instalacji i każdego startu systemu?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++#, fuzzy ++#| msgid "" ++#| "adjtimex can run at system startup to set the kernel time parameters to " ++#| "the values in /etc/default/adjtimex. Don't accept if you just want to use " ++#| "adjtimex to inspect the current parameters." ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"adjtimex może być uruchamiany podczas każdego uruchomienia systemu,by " ++"ustawić parametry czasu w j±drze na warto¶ci znajduj±ce się w pliku/etc/" ++"default/adjtimex. Nie wyrażaj zgody, je¶li chcesz używać adjtimextylko do " ++"sprawdzania aktualnych warto¶ci." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++#, fuzzy ++#| msgid "" ++#| "adjtimex can run at system startup to set the kernel time parameters to " ++#| "the values in /etc/default/adjtimex. Don't accept if you just want to use " ++#| "adjtimex to inspect the current parameters." ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"adjtimex może być uruchamiany podczas każdego uruchomienia systemu,by " ++"ustawić parametry czasu w j±drze na warto¶ci znajduj±ce się w pliku/etc/" ++"default/adjtimex. Nie wyrażaj zgody, je¶li chcesz używać adjtimextylko do " ++"sprawdzania aktualnych warto¶ci." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++#, fuzzy ++#| msgid "Should adjtimexconfig be run at installation time?" ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Czy adjtimexconfig ma być uruchomiony podczas instalacji?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++#, fuzzy ++#| msgid "" ++#| "The adjtimexconfig script will use adjtimex to find values for the kernel " ++#| "variables tick and frequency that will make the system clock " ++#| "approximately agree with the hardware clock (also known as the CMOS " ++#| "clock). It then saves these values in the configuration file /etc/" ++#| "default/adjtimex so the settings will be restored on every boot, when /" ++#| "etc/init.d/adjtimex runs." ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Skrypt adjtimexconfig skorzysta z programu adjtimex do znalezienia " ++"takichwarto¶ci parametrów j±dra tick i frequency, żeby zegar systemowy był " ++"zbliżonydo zegara sprzętowego (zegara CMOS). Następnie zapisze ustawienia w " ++"plikukonfiguracyjnym /etc/default/adjtimex, dzięki czemu warto¶ci te " ++"będ±przywrócane przy każdym starcie systemu w momencie wykonywania skryptu/" ++"etc/init.d/adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++#, fuzzy ++#| msgid "" ++#| "The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " ++#| "yourself at a later time, or determine the kernel variables one of " ++#| "several other ways (see the adjtimex man page) and install them in /etc/" ++#| "default/adjtimex." ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Skrypt będzie działał przez 70 sekund. Możesz też uruchomić " ++"własnoręcznieadjtimexconfig w dowolnym czasie lub dobrać paramterty j±dra w " ++"innysposób (zapoznaj się ze stron± manuala adjtimex) i zapisać je w pliku/" ++"etc/default/adjtimex." +--- adjtimex-1.29.orig/debian/po/ru.po ++++ adjtimex-1.29/debian/po/ru.po +@@ -0,0 +1,95 @@ ++# translation of adjtimex_1.28-1_ru.po to Russian ++# ++# Translators, if you are not familiar with the PO format, gettext ++# documentation is worth reading, especially sections dedicated to ++# this format, e.g. by running: ++# info -n '(gettext)PO Files' ++# info -n '(gettext)Header Entry' ++# Some information specific to po-debconf are available at ++# /usr/share/doc/po-debconf/README-trans ++# or http://www.debian.org/intl/l10n/po-debconf/README-trans# ++# Developers do not need to manually edit POT or PO files. ++# ++# Yuri Kozlov <kozlov.y@gmail.com>, 2005. ++# Yuri Kozlov <yuray@komyakino.ru>, 2009, 2010. ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex 1.28-1\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2010-01-02 09:43+0300\n" ++"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" ++"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" ++"Language: ru\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: KBabel 1.11.4\n" ++"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" ++"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "Đ—Đ°ĐżŃŃтить adjtimex ŃĐµĐąŃ‡Đ°Ń Đ¸ каждый раз при Ńтарте ŃиŃтемы?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Đ—Đ°ĐżŃŃĐş adjtimex при включении компьютера выполнит наŃŃ‚Ń€ĐľĐąĐşŃ Đ·Đ˝Đ°Ń‡ĐµĐ˝Đ¸Đą " ++"параметров времени ядра из файла /etc/default/adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Ответьте отрицательно, еŃли проŃŃ‚Đľ хотите иŃпользовать adjtimex для проверки " ++"текŃщих параметров." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Đ—Đ°ĐżŃŃкать adjtimexconfig при ŃŃтановке или обновлении adjtimex?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Сценарий adjtimexconfig иŃпользŃет adjtimex при поиŃке значений переменных " ++"ядра \"tick\" и \"frequency\", которые помогают ŃоглаŃовывать ŃиŃтемные чаŃŃ‹ " ++"Ń Đ°ĐżĐżĐ°Ń€Đ°Ń‚Đ˝Ń‹ĐĽĐ¸ чаŃами (Ń‚Đ°Đş называемые чаŃŃ‹ CMOS). Затем он Ńохраняет эти " ++"значения в файл наŃтройки /etc/default/adjtimex для того, чтобы " ++"воŃŃтанавливать их Ń ĐżĐľĐĽĐľŃ‰ŃŚŃŽ Ńценария /etc/init.d/adjtimex при каждом " ++"Đ·Đ°ĐżŃŃке ŃиŃтемы." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"ДлительноŃŃ‚ŃŚ работы Ńценария -- 70 ŃекŃнд, ĐżĐľŃŤŃ‚ĐľĐĽŃ ĐżŃ€Đ¸ каждом обновлении " ++"бŃдет такая задержка в работе. Đ’ качеŃтве альтернативы вы можете Đ·Đ°ĐżŃŃтить " ++"adjtimexconfig врŃчнŃŃŽ позже, или определить переменные ядра одним из " ++"неŃкольких Đ´Ń€Ńгих ŃпоŃобов (Ńмотрите ŃправочнŃŃŽ ŃŃ‚Ń€Đ°Đ˝Đ¸Ń†Ń ĐżĐľ adjtimex) и " ++"Ńохранить их в файл /etc/default/adjtimex." +--- adjtimex-1.29.orig/debian/po/ja.po ++++ adjtimex-1.29/debian/po/ja.po +@@ -0,0 +1,91 @@ ++#
++# Translators, if you are not familiar with the PO format, gettext
++# documentation is worth reading, especially sections dedicated to
++# this format, e.g. by running:
++# info -n '(gettext)PO Files'
++# info -n '(gettext)Header Entry'
++#
++# Some information specific to po-debconf are available at
++# /usr/share/doc/po-debconf/README-trans
++# or http://www.debian.org/intl/l10n/po-debconf/README-trans
++#
++# Developers do not need to manually edit POT or PO files.
++#
++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex 1.27.1-3\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2009-07-24 18:05+0900\n" ++"Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n" ++"Language-Team: Japanese <debian-japanese@lists.debian.org>\n" ++"Language: ja\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "adjtimex をイăłă‚ąăăĽă«ć™‚ăŠă‚ăłćŻŽĺ›žă®čµ·ĺ‹•ć™‚ă«ĺ‹•ä˝śă•ă›ăľă™ă‹?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"ă‚·ă‚ąă†ă ă®čµ·ĺ‹•ć™‚ă«ă‚«ăĽăŤă«ă§ă®ć™‚é–“ă®ă‘ă©ăˇăĽă‚żă‚’ /etc/default/adjtimex ă®ĺ€¤ă«" ++"č¨ĺ®šă™ă‚‹ă‚ă†ă« adjtimex を動作ă•ă›ă‚‹ă“ă¨ăŚă§ăŤăľă™ă€‚" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"ă‚·ă‚ąă†ă ă®čµ·ĺ‹•ć™‚ă«ă‚«ăĽăŤă«ă§ă®ć™‚é–“ă®ă‘ă©ăˇăĽă‚żă‚’ /etc/default/adjtimex ă®ĺ€¤ă«" ++"č¨ĺ®šă™ă‚‹ă‚ă†ă« adjtimex を動作ă•ă›ă‚‹ă“ă¨ăŚă§ăŤăľă™ă€‚" ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "" ++"adjtimexconfig ă‚’ adjtimex をイăłă‚ąăăĽă«ă€ă‚ă‚‹ă„ăŻă‚˘ăă—ă‚°ă¬ăĽă‰ă—ăźć™‚ă«ĺ®źčˇŚ" ++"ă—ăľă™ă‹?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"adjtimexconfig ă‚ąă‚ŻăŞă—ă㯠adjtimex を使用ă—ă¦ă€ă‚·ă‚ąă†ă ă‚Żăăă‚Żă‚’ăŹăĽă‰ă‚¦ă‚§" ++"アクăăă‚Ż (CMOS ă‚Żăăă‚Żă¨ă—ă¦ă‚‚知られă¦ă„ăľă™) ă¨ăŠăŠă‚ăťĺŚćśźă™ă‚‹ă‚ă†ă«ă‚«ăĽ" ++"ăŤă«ĺ¤‰ć•°ă€Śtick」ă¨ă€Śfrequency」ă«ä¸Žăる値を見ă¤ă‘ăľă™ă€‚ăťă—ă¦ă€ă“ă®ĺ€¤ă‚’č¨ĺ®š" ++"ă•ă‚ˇă‚¤ă« /etc/default/adjtimex ă«äżťĺă™ă‚‹ă“ă¨ă§ćŻŽĺ›žčµ·ĺ‹•ć™‚ă« /etc/init.d/" ++"adjtimex ăŚĺ‹•ä˝śă™ă‚‹éš›ă«č¨ĺ®šăŚĺľ©ĺ…ă•ă‚Śăľă™ă€‚" ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"ă‚ąă‚ŻăŞă—ăăŻĺ‹•ä˝śă« 70 秒もă‹ă‹ă‚‹ă®ă§ă‚˘ăă—ă‚°ă¬ăĽă‰ă®ĺş¦ă«ćŻŽĺ›žĺ®źčˇŚă™ă‚‹ă®ăŻć™‚é–“" ++"ă®ç„ˇé§„ă§ă™ă€‚ĺĄč§Łă¨ă—ă¦ăŻ adjtimexconfig を後ă»ă©ĺ®źčˇŚă™ă‚‹ă€ăľăźăŻä»–ă®ć–ąćł•ă§" ++"ă‚«ăĽăŤă«ĺ¤‰ć•°ă‚’決ă‚ă¦ă€ć‰‹ĺ‹•ă§ /etc/default/adjtimex ă¸ă®č¨ĺ®šă‚’行ă†ă€ăŞă©ăŚĺŹŻč˝" ++"ă§ă™ă€‚" +--- adjtimex-1.29.orig/debian/po/nb.po ++++ adjtimex-1.29/debian/po/nb.po +@@ -0,0 +1,82 @@ ++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the PACKAGE package. ++# ++# Bjørn Steensrud <bjornst@skogkatt.homelinux.org>, 2010. ++msgid "" ++msgstr "" ++"Project-Id-Version: \n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2010-10-15 14:50+0200\n" ++"Last-Translator: Bjørn Steensrud <bjornst@skogkatt.homelinux.org>\n" ++"Language-Team: Norwegian BokmĂĄl <i18n-nb@lister.ping.uio.no>\n" ++"Language: \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: Lokalize 1.0\n" ++"Plural-Forms: nplurals=2; plural=n != 1;\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "Skal adjtimex kjøres ved installasjon og hver gang systemet startes?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Om adjtimex kjøres ved oppstart blir kjernens tidsparametre satt til " ++"verdiene i /etc/default/adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Du bør ikke velge dette hvis du bare vil bruke adjtimex til ĂĄ se hva de " ++"gjeldende parametrene er." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Skal adjtimexconfig kjøres nĂĄr adjtimex installeres eller oppgraderes?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Skriptet adjtimexconfig vil bruke adjtimex til ĂĄ finne verdier for kjerne- " ++"variablene «tick» og «frequency» som vil fĂĄ systemklokka til ĂĄ gĂĄ omtrent " ++"lik maskinklokka (ogsĂĄ kalt CMOS-klokka). Deretter lagres disse verdiene i " ++"oppsettsfila /etc/default/adjtimex, slik at de blir tilbakestilt ved hver " ++"oppstart nĂĄt /etc/init.d/adjtimex kjører." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Skriptet tar 70 sekunder ĂĄ kjøre, sĂĄ det kan være bortkastet tid ĂĄ kjøre det " ++"ved hver oppgradering. Du kan ellers kjøre adjtimexconfig manuelt nĂĄr det " ++"trengs, eller bestemme kjernevariablene pĂĄ annen mĂĄte og sette dem inn " ++"manuelt i /etc/default/adjtimex." +--- adjtimex-1.29.orig/debian/po/sv.po ++++ adjtimex-1.29/debian/po/sv.po +@@ -0,0 +1,85 @@ ++# Translation of adjtimex debconf template to Swedish ++# Copyright (C) 2009 Martin Bagge <brother@bsnet.se> ++# This file is distributed under the same license as the adjtimex package. ++# ++# Martin Bagge <brother@bsnet.se>, 2009 ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex 1.20-5\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2010-03-17 19:49-0400\n" ++"Last-Translator: Martin Bagge <brother@bsnet.se>\n" ++"Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n" ++"Language: sv\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=utf-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Poedit-Language: Swedish\n" ++"X-Poedit-Country: Sweden\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "Ska adjtimex köras vid installation och vid varje uppstart?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"adjtimex kan köra vid systemets uppstart för att sätta kärntidsparametrar " ++"till värdena i /etc/default/adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Aktivera inte denna funktion om du endast vill använda adjtime för att " ++"inspektera aktuella parameterar." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "" ++"Ska adjtimexconfig köras efter installation eller uppgradering av adjtimex?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Skriptet adjtimexconfig kommer att använda adjtimex för att hitta värden för " ++"kärnvariablerna \"tick\" och \"frequency\" som gör att systemklockan kommer " ++"överens med hĂĄrdvaruklockan (ocksĂĄ kallad CMOS-klockan). Den sparar sedan " ++"dessa värden i konfigurationsfilen /etc/default/adjtimex sĂĄ att " ++"inställningarna kommer att användas vid varje uppstart, när /etc/init.d/" ++"adjtimex körs." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Skriptet tar 70 sekunder att köra vilket innebär att det kan vara slöseri " ++"med tid att köra vid varje uppgradering. Alternativt kan du köra " ++"adjtimexconfig själv när det behövs eller bestämma variabler för kärnan pĂĄ " ++"andra sätt och ange dessa i /etc/default/adjtimex." +--- adjtimex-1.29.orig/debian/po/POTFILES.in ++++ adjtimex-1.29/debian/po/POTFILES.in @@ -0,0 +1 @@ -+5 ---- adjtimex-1.23.orig/Makefile -+++ adjtimex-1.23/Makefile -@@ -0,0 +1,70 @@ -+# Generated automatically from Makefile.in by configure. -+#### Start of system configuration section. -*-makefile-*- #### -+ srcdir = . ++[type: gettext/rfc822deb] templates +--- adjtimex-1.29.orig/debian/po/pt.po ++++ adjtimex-1.29/debian/po/pt.po +@@ -0,0 +1,83 @@ ++# 2005-10-27 - Marco Ferra <mferra@sdf.lonestar.org> (initial translation) ++# 2009, Carlos Lisboa <carloslisboa@gmail.com> ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex 1.20-5\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2009-04-15 22:00+0100\n" ++"Last-Translator: Carlos Lisboa <carloslisboa@gmail.com>\n" ++"Language-Team: Portuguese <traduz@debianpt.org>\n" ++"Language: pt\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" + -+VERSION=1.22 ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "" ++"Deve o adjtimex correr enquanto o instala e depois sempre que o sistema " ++"inicia?" + -+CFLAGS = -g -O2 -Wall -+prefix = /usr -+man1dir=${prefix}/share/man/man1 -+exec_prefix = ${prefix} -+bindir=/sbin ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Correr o adjtimex no arranque do sistema irá colocar os parâmetros de tempo " ++"do kernel para os valores em /etc/default/adjtimex." + -+INSTALL=/usr/bin/install -c ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"NĂŁo deve escolher esta opção se apenas deseja usar o adjtimex para verificar " ++"os parâmetros actuais." + -+# Extension (not including `.') for the manual page filenames. -+manext = 8 -+# Where to put the manual pages. -+mandir = $(prefix)/share/man/man$(manext) ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Correr o adjtimexconfig quando o adjtimex Ă© instalado ou actualizado?" + -+#### End of system configuration section. #### ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"O script adjtimexconfig irá usar adjtimex para encontrar valores para as " ++"variáveis do kernel \"tick\" e \"frequency\" que irĂŁo tornar o relĂłgio do " ++"sistema em concordância com o relĂłgio de hardware (tambĂ©m conhecido por " ++"relĂłgio CMOS). Irá entĂŁo guardar os valores no ficheiro de configuração /etc/" ++"default/adjtimex para que as configurações sejam restauradas em cada " ++"arranque, quando o /etc/init.d/adjtimex Ă© corrido." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Este script demora 70 segundos a correr, podendo ser um desperdĂcio de tempo " ++"corrĂŞ-lo em cada actualização. Como alternativa, pode correr o " ++"adjtimexconfig manualmente quando necessário, ou determine as variáveis do " ++"kernel usando outro mĂ©todo e configure-as manualmente em /etc/default/" ++"adjtimex." +--- adjtimex-1.29.orig/debian/po/de.po ++++ adjtimex-1.29/debian/po/de.po +@@ -0,0 +1,96 @@ ++# translation of adjtimex_1.26-3_de.po to German ++# ++# Translators, if you are not familiar with the PO format, gettext ++# documentation is worth reading, especially sections dedicated to ++# this format, e.g. by running: ++# info -n '(gettext)PO Files' ++# info -n '(gettext)Header Entry' ++# Some information specific to po-debconf are available at ++# /usr/share/doc/po-debconf/README-trans ++# or http://www.debian.org/intl/l10n/po-debconf/README-trans# ++# Developers do not need to manually edit POT or PO files. ++# ++# Erik Schanze <eriks@debian.org>, 2004-2009. ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex_1.26-3_de\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2009-04-15 18:02+0200\n" ++"Last-Translator: Erik Schanze <eriks@debian.org>\n" ++"Language-Team: German <debian-l10n-german@lists.debian.org>\n" ++"Language: de\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: KBabel 1.11.4\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" + -+SHELL = /bin/sh ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "" ++"Soll Adjtimex nach der Installation und bei jedem Hochfahren gestartet " ++"werden?" + -+SRC = adjtimex.c adjtimex.8 mat.c mat.h install-sh configure.in \ -+ configure Makefile.in README README.ru adjtimex.lsm adjtimex.lsm.in \ -+ COPYING COPYRIGHT ChangeLog ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Wird Adjtimex beim Hochfahren des Systems gestartet, werden die " ++"Zeitparameter im Kernel auf die Werte in /etc/defaults/adjtimex gesetzt." + -+all: adjtimex adjtimex.lsm ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Stimmen Sie nicht zu, wenn Sie mit Adjtimex nur die aktuellen Parameter " ++"ermitteln wollen." + -+adjtimex: adjtimex.c mat.o -+ $(CC) $(CFLAGS) -I. -DVERSION=\"$(VERSION)\" -o adjtimex adjtimex.c \ -+ mat.o -lm ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "" ++"Adjtimexconfig zur Installation oder Aktualisierung von Adjtimex aufrufen?" + -+adjtimex.lsm: adjtimex.lsm.in Makefile.in -+ sed -e 's/@VERSION@/$(VERSION)/' \ -+ -e "s/@DATE@/`date +%d%b%y|tr [a-z] [A-Z]`/" \ -+ adjtimex.lsm.in >adjtimex.lsm ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Das Skript »adjtimexconfig« nutzt Adjtimex, um die Werte der Kernelvariablen " ++"»tick« und »frequency« zu finden, damit die Systemuhr ungefähr mit der " ++"Rechneruhr (auch bekannt als CMOS-Uhr) ĂĽbereinstimmt. Das Skript speichert " ++"diese Werte in der Konfigurationsdatei /etc/default/adjtimex, sodass die " ++"Einstellung bei jedem Systemstart wiederhergestellt wird, wenn /etc/init.d/" ++"adjtimex ausgefĂĽhrt wird." + -+mat.o: mat.c -+ $(CC) $(CFLAGS) -c mat.c ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Das Skript benötigt 70 Sekunden, um durchzulaufen, es bei jeder " ++"Aktualisierung laufen zu lassen, dĂĽrfte Zeitverschwendung sein. Andererseits " ++"können Sie »adjtimexconfig« selbst bei Bedarf starten oder Sie finden die " ++"Kernelvariablen auf einem anderen Weg heraus (siehe Handbuchseite von " ++"Adjtimex) und speichern die Werte in der Datei /etc/default/adjtimex." +--- adjtimex-1.29.orig/debian/po/eu.po ++++ adjtimex-1.29/debian/po/eu.po +@@ -0,0 +1,84 @@ ++# translation of adjtimex-eu.po to Euskara ++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the PACKAGE package. ++# ++# Piarres Beobide <pi@beobide.net>, 2009. ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex-eu\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2009-04-08 12:49+0200\n" ++"Last-Translator: Piarres Beobide <pi@beobide.net>\n" ++"Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n" ++"Language: \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: KBabel 1.11.4\n" + -+install: all -+ $(INSTALL) -g bin -m 755 -o root adjtimex $(bindir)/adjtimex -+ $(INSTALL) -d -g root -m 755 -o root $(mandir) -+ -$(INSTALL) -g root -m 644 -o root $(srcdir)/adjtimex.8 \ -+ $(mandir)/adjtimex.$(manext) ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "Adjtimex instalazio eta abiarazte bakoitzean exekutatu behar al da?" + -+uninstall: -+ rm -f $(bindir)/adjtimex $(mandir)/adjtimex.$(manext) ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Adjtimex sistema abiaraztean exekutatzean kernelaren denbora parametroak /" ++"etc/default/adjtimex-eko balioetara ezarriko dira." + -+clean: -+ rm -f core *.o -+veryclean: clean -+ rm -f adjtimex ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Ez zenuke aukera hau aukeratu beharko adjtimex uneko parametroak begiratzeko " ++"bakarrik erabili nahi baduzu." + -+shar: $(SRC) -+ distname=adjtimex-$(VERSION); \ -+ shar $(SRC) >$$distname.shar ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Adjtimexconfig exekutatu adjtimex instalatu edo bertsio-berritzean?" + -+dist: $(SRC) -+ distname=adjtimex-$(VERSION); \ -+ rm -fr $$distname; \ -+ mkdir $$distname; \ -+ for file in $(SRC); do \ -+ ln $$file $$distname/$$file \ -+ || { echo copying $$file instead; cp -p $$file $$distname/$$file;}; \ -+ done; \ -+ chmod -R a+rX $$distname; \ -+ tar -chz -f $$distname.tar.gz $$distname; \ -+ rm -fr $$distname ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Adjtimexconfig script-ak adjtimex erabiliko du kerneleko \"tick\" eta " ++"\"frequency\" aldagaien balioa aurkitzeko honekin sistema erlojuak hardware " ++"erlojuarekin (CMOS ordularia bezala ere ezagutua) bat egingo du. Orduan " ++"balio hauek /etc/default/adjtimex konfigurazio fitxategian gordeko ditu Abio " ++"bakoitzean balio horiek berrezarri daitezen /etc/init.d/adjtimex " ++"exekutatzean." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Script-ak 70 segundu behar ditu exekutatzeko, beraz berau bertsio-berritze " ++"bakoitzean exekutatzea denbora galtze bat izan daiteke. Bestela behar " ++"duzunean adjtimexconfig eskuz konfiguratu dezakezu edo kernel aldagaiak " ++"beste metodo batez atzeman eta /etc/default/adjtimex fitxategian eskuz ipini " ++"ditzakezu." +--- adjtimex-1.29.orig/debian/po/da.po ++++ adjtimex-1.29/debian/po/da.po +@@ -0,0 +1,92 @@ ++# translation of adjtimex_1.16-1-da.po to Danish ++# translation of adjtimex_1.16-1_templates.po to Danish ++# ++# Translators, if you are not familiar with the PO format, gettext ++# documentation is worth reading, especially sections dedicated to ++# this format, e.g. by running: ++# info -n '(gettext)PO Files' ++# info -n '(gettext)Header Entry' ++# Some information specific to po-debconf are available at ++# /usr/share/doc/po-debconf/README-trans ++# or http://www.debian.org/intl/l10n/po-debconf/README-trans# ++# Developers do not need to manually edit POT or PO files. ++# Claus Hindsgaul <claus_h@image.dk>, 2004. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex_1.16-1-da\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2009-04-16 16:56+0200\n" ++"Last-Translator: Frank Damgaard <debian@overbygaard.dk>\n" ++"Language-Team: Danish\n" ++"Language: \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: KBabel 1.3.1\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "Skal adjtimex køres under installation og ved hver opstart?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Køres adjtimex under opstart af systemet, sættes kernens tidsparametre til " ++"værdierne i /etc/default/adjtimex. " ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Vælg ikke dette hvis du ønsker at bruge adjtimex til at gemmense de aktuelle " ++"parametre." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Skal adjtimexconfig køres ved installation eller opgradering?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Skriptet adjtimexconfig vil bruge adjtimex til at finde de værdier til " ++"kernevariablene \"tick\" og \"frequency\", der vil fĂĄ systemuret til at " ++"passe med computerens indbyggede ur (CMOS-uret). Den gemmer derefter " ++"værdierne i opsætningsfilen /etc/default/edjtimex, sĂĄ indstillingerne bliver " ++"sat under hver opstart, nĂĄr skriptet /etC/init.d/adjtimex køres." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Det tager 70 sekunder at køre skriptet, sĂĄ at køre skriptet ved hver " ++"opgradering kan være spild af tid. Alternativt kan du selv køre " ++"adjtimexconfig nĂĄr der er behov, eller finde kernevariablene pĂĄ en anden " ++"mĂĄde og sætte dem manuelt i /etc/default/adjtimex." +--- adjtimex-1.29.orig/debian/po/nl.po ++++ adjtimex-1.29/debian/po/nl.po +@@ -0,0 +1,86 @@ ++# Dutch translation of adjtimex debconf templates. ++# Copyright (C) 2003-2011 THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the adjtimex package. ++# Michiel Sikkes <michiel@sikkes.xs4all.nl>, 2003. ++# Jeroen Schot <schot@a-eskwadraat.nl>, 2011. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex_1.29-2.1\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2011-05-05 17:49+0200\n" ++"Last-Translator: Michiel Sikkes <michiel@sikkes.xs4all.nl>\n" ++"Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n" ++"Language: nl\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "" ++"Wilt u dat adjtimex bij de installatie en bij elke opstartprocedure gedraaid " ++"wordt?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Het draaien van adjtimex bij het opstarten van het systeem zal " ++"tijdparameters van de kernel instellen zoals gedefinieerd in /etc/default/" ++"adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Accepteer deze optie niet als u adjtimex alleen wilt gebruiken om de huidige " ++"parameters te bekijken." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "" ++"Wilt u dat adjtimexconfig bij het installeren en opwaarderen wordt gedraaid?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Het adjtimexconfig-script zal adjtimex gebruiken om de eigenschappen voor de " ++"kernelvariabelen \"tick\" en \"frequency\" te vinden. Dit zal er voor zorgen " ++"dat de systeemklok gelijk loopt met de hardware-klok (ook bekend onder de " ++"naam CMOS-klok). Deze eigenschappen worden opgeslagen in het " ++"configuratiebestand /etc/default/adjtimex, dus de instellingen worden bij " ++"elke systeemopstartprocedure hersteld als /etc/init.d/adjtimex draait." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Het script doet er 70 seconden over om te draaien. Als alternatief kunt u " ++"adjtimexconfig later handmatig draaien, of de kernelvariabelen op een andere " ++"manier bepalen en deze zelf in /etc/default/adjtimex zetten." +--- adjtimex-1.29.orig/debian/po/cs.po ++++ adjtimex-1.29/debian/po/cs.po +@@ -0,0 +1,78 @@ ++# Czech translation of adjtimex templates ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex 1.29-2\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2010-07-16 14:53+0200\n" ++"Last-Translator: Martin Sin <martin.sin@zshk.cz>\n" ++"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n" ++"Language: cs\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=utf-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "Má bĂ˝t adjtimex spuštÄ›n po instalaci a pĹ™i kaĹľdĂ©m spuštÄ›nĂ poÄŤĂtaÄŤe?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"SpuštÄ›nĂ adjtimex pĹ™i startu poÄŤĂtaÄŤe nastavĂ ÄŤasovĂ© parametry jádra na " ++"hodnoty uloĹľenĂ© v /etc/default/adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Pokud chcete pouĹľĂvat adjtimex pouze ke zjištÄ›nĂ aktuálnĂch hodnot, pak tuto " ++"moĹľnost nemusĂte pouĹľĂvat." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Spustit adjtimexconfig po instalaci nebo aktualizaci adjtimex?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Skript adjtimexconfig pouĹľije adjtimex k nalezenĂ hodnot „tick“ a " ++"„frequency“ jádra tak, Ĺľe nastavĂ systĂ©movĂ© hodiny pĹ™ibliĹľnÄ› na hodnoty tÄ›ch " ++"hardwarovĂ˝ch (takĂ© známĂ˝ch jako CMOS hodiny). Tyto hodnoty pak uložà do " ++"konfiguraÄŤnĂho souboru /etc/default/adjtimex, aby mohlo bĂ˝t nastavenĂ " ++"obnoveno pĹ™i kaĹľdĂ©m startu, vĹľdy pĹ™i spuštÄ›nĂ /etc/init.d/adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"SpuštÄ›nĂ skriptu zabere 70 sekund, takĹľe jeho spuštÄ›nĂ pĹ™i kaĹľdĂ© aktualizaci " ++"mĹŻĹľe bĂ˝t ztrátou ÄŤasu. VolitelnÄ› mĹŻĹľete adjtimexconfig spustit podle potĹ™eby " ++"takĂ© ruÄŤnÄ› nebo urÄŤit promÄ›nnĂ© jádra jinĂ˝mi zpĹŻsoby a nastavit je ruÄŤnÄ› v " ++"souboru /etc/default/adjtimex." +--- adjtimex-1.29.orig/debian/po/es.po ++++ adjtimex-1.29/debian/po/es.po +@@ -0,0 +1,108 @@ ++# adjtimex po-debconf translation to Spanish ++# Copyright (C) 2009 Software in the Public Interest ++# This file is distributed under the same license as the adjtimex package. ++# ++# Changes: ++# - Initial translation ++# Vicente H. <vherrerv@supercable.es> ++# ++# - Updates ++# Francisco Javier Cuadrado <fcocuadrado@gmail.com>, 2009 ++# ++# Traductores, si no conocen el formato PO, merece la pena leer la ++# documentaciĂłn de gettext, especialmente las secciones dedicadas a este ++# formato, por ejemplo ejecutando: ++# info -n '(gettext)PO Files' ++# info -n '(gettext)Header Entry' ++# ++# Equipo de traducciĂłn al español, por favor lean antes de traducir ++# los siguientes documentos: ++# ++# - El proyecto de traducciĂłn de Debian al español ++# http://www.debian.org/intl/spanish/coordinacion ++# especialmente las notas de traducciĂłn en ++# http://www.debian.org/intl/spanish/notas ++# ++# - La guĂa de traducciĂłn de po's de debconf: ++# /usr/share/doc/po-debconf/README-trans ++# o http://www.debian.org/intl/l10n/po-debconf/README-trans ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex 1.27.1-3\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2009-07-25 20:18+0100\n" ++"Last-Translator: Francisco Javier Cuadrado <fcocuadrado@gmail.com>\n" ++"Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n" ++"Language: \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "ÂżSe debe ejecutar adjtimex ahora y en cada arranque?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Ejecutar adjtimex al inicio del sistema configurará los parámetros de tiempo " ++"del nĂşcleo a los valores del archivo «/etc/default/adjtimex»." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"No deberĂa escoger esta opciĂłn si sĂłlo quiere utilizar adjtimex para " ++"inspeccionar los parámetros actuales." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "ÂżDesea ejecutar adjtimexconfig cuando adjtimex se instale o actualice?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"El script adjtimexconfig utilizará adjtimex para encontrar los valores de " ++"las variables «tick» y «frecuency» del nĂşcleo que harán que el reloj del " ++"sistema concuerde aproximadamente con el reloj del hardware (tambiĂ©n " ++"conocido como reloj CMOS). Entonces, se guardan estos valores en el archivo " ++"de configuraciĂłn «/etc/default/adjtimex» de modo que los valores se " ++"restaurarán en cada arranque, cuando el script «/etc/init.d/adjtimex» se " ++"ejecute." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"El script tarda 70 segundos para ejecutarse, por lo que ejecutarlo en cada " ++"actualizaciĂłn puede ser una pĂ©rdida de tiempo. De forma alternativa, puede " ++"ejecutar manualmente ajdtimexconfig cuando lo necesite, o determinar las " ++"variables del nĂşcleo utilizando otros mĂ©todos e configurándolas en el " ++"archivo «/etc/default/adjtimex»." diff --git a/source/a/util-linux/column-fix_long_opts.diff b/source/a/util-linux/column-fix_long_opts.diff new file mode 100644 index 000000000..e5215db7b --- /dev/null +++ b/source/a/util-linux/column-fix_long_opts.diff @@ -0,0 +1,15 @@ +diff -Naur util-linux-2.21.2/text-utils/column.c util-linux-2.21.2.patched//text-utils/column.c +--- util-linux-2.21.2/text-utils/column.c 2012-05-25 05:44:59.000000000 -0400 ++++ util-linux-2.21.2.patched//text-utils/column.c 2012-08-14 05:22:17.000000000 -0400 +@@ -121,9 +121,9 @@ + { + { "help", 0, 0, 'h' }, + { "version", 0, 0, 'V' }, +- { "columns", 0, 0, 'c' }, ++ { "columns", 1, 0, 'c' }, + { "table", 0, 0, 't' }, +- { "separator", 0, 0, 's' }, ++ { "separator", 1, 0, 's' }, + { "fillrows", 0, 0, 'x' }, + { NULL, 0, 0, 0 }, + }; diff --git a/source/a/util-linux/net-tools.config.h b/source/a/util-linux/net-tools.config.h new file mode 100644 index 000000000..e271f863f --- /dev/null +++ b/source/a/util-linux/net-tools.config.h @@ -0,0 +1,78 @@ +/* +* config.h Automatically generated configuration includefile +* +* NET-TOOLS A collection of programs that form the base set of the +* NET-3 Networking Distribution for the LINUX operating +* system. +* +* DO NOT EDIT DIRECTLY +* +*/ + +/* + * + * Internationalization + * + * The net-tools package has currently been translated to French, + * German and Brazilian Portugese. Other translations are, of + * course, welcome. Answer `n' here if you have no support for + * internationalization on your system. + * + */ +#define I18N 1 + +/* + * + * Protocol Families. + * + */ +#define HAVE_AFUNIX 1 +#define HAVE_AFINET 1 +#define HAVE_AFINET6 1 +#define HAVE_AFIPX 1 +#define HAVE_AFATALK 1 +#define HAVE_AFAX25 1 +#define HAVE_AFNETROM 1 +#define HAVE_AFROSE 0 +#define HAVE_AFX25 1 +#define HAVE_AFECONET 0 +#define HAVE_AFDECnet 0 +#define HAVE_AFASH 0 +#define HAVE_AFBLUETOOTH 1 + +/* + * + * Device Hardware types. + * + */ +#define HAVE_HWETHER 1 +#define HAVE_HWARC 1 +#define HAVE_HWSLIP 1 +#define HAVE_HWPPP 1 +#define HAVE_HWTUNNEL 1 +#define HAVE_HWSTRIP 1 +#define HAVE_HWTR 1 +#define HAVE_HWAX25 1 +#define HAVE_HWROSE 0 +#define HAVE_HWNETROM 1 +#define HAVE_HWX25 1 +#define HAVE_HWFR 1 +#define HAVE_HWSIT 0 +#define HAVE_HWFDDI 1 +#define HAVE_HWHIPPI 1 +#define HAVE_HWASH 0 +#define HAVE_HWHDLCLAPB 0 +#define HAVE_HWIRDA 1 +#define HAVE_HWEC 0 +#define HAVE_HWEUI64 1 +#define HAVE_HWIB 1 + +/* + * + * Other Features. + * + */ +#define HAVE_FW_MASQUERADE 1 +#define HAVE_IP_TOOLS 1 +#define HAVE_MII 1 +#define HAVE_SELINUX 0 diff --git a/source/a/util-linux/net-tools.diff b/source/a/util-linux/net-tools.diff deleted file mode 100644 index a19af2026..000000000 --- a/source/a/util-linux/net-tools.diff +++ /dev/null @@ -1,77 +0,0 @@ ---- ./config.h.orig Wed Mar 21 21:23:31 2001 -+++ ./config.h Wed Mar 21 21:23:12 2001 -@@ -0,0 +1,74 @@ -+/* -+* config.h Automatically generated configuration includefile -+* -+* NET-TOOLS A collection of programs that form the base set of the -+* NET-3 Networking Distribution for the LINUX operating -+* system. -+* -+* DO NOT EDIT DIRECTLY -+* -+*/ -+ -+/* -+ * -+ * Internationalization -+ * -+ * The net-tools package has currently been translated to French, -+ * German and Brazilian Portugese. Other translations are, of -+ * course, welcome. Answer `n' here if you have no support for -+ * internationalization on your system. -+ * -+ */ -+#define I18N 1 -+ -+/* -+ * -+ * Protocol Families. -+ * -+ */ -+#define HAVE_AFUNIX 1 -+#define HAVE_AFINET 1 -+#define HAVE_AFINET6 1 -+#define HAVE_AFIPX 1 -+#define HAVE_AFATALK 1 -+#define HAVE_AFAX25 1 -+#define HAVE_AFNETROM 1 -+#define HAVE_AFROSE 0 -+#define HAVE_AFX25 1 -+#define HAVE_AFECONET 0 -+#define HAVE_AFDECnet 0 -+#define HAVE_AFASH 0 -+ -+/* -+ * -+ * Device Hardware types. -+ * -+ */ -+#define HAVE_HWETHER 1 -+#define HAVE_HWARC 1 -+#define HAVE_HWSLIP 1 -+#define HAVE_HWPPP 1 -+#define HAVE_HWTUNNEL 1 -+#define HAVE_HWSTRIP 1 -+#define HAVE_HWTR 1 -+#define HAVE_HWAX25 1 -+#define HAVE_HWROSE 0 -+#define HAVE_HWNETROM 1 -+#define HAVE_HWX25 1 -+#define HAVE_HWFR 1 -+#define HAVE_HWSIT 0 -+#define HAVE_HWFDDI 0 -+#define HAVE_HWHIPPI 0 -+#define HAVE_HWASH 0 -+#define HAVE_HWHDLCLAPB 0 -+#define HAVE_HWIRDA 1 -+#define HAVE_HWEC 0 -+ -+/* -+ * -+ * Other Features. -+ * -+ */ -+#define HAVE_FW_MASQUERADE 1 -+#define HAVE_IP_TOOLS 1 -+#define HAVE_MII 1 diff --git a/source/a/util-linux/net-tools_1.60-19.diff b/source/a/util-linux/net-tools_1.60-19.diff deleted file mode 100644 index f754f02d5..000000000 --- a/source/a/util-linux/net-tools_1.60-19.diff +++ /dev/null @@ -1,29401 +0,0 @@ ---- net-tools-1.60.orig/lib/ether.c -+++ net-tools-1.60/lib/ether.c -@@ -2,7 +2,7 @@ - * lib/ether.c This file contains an implementation of the "Ethernet" - * support functions. - * -- * Version: $Id: ether.c,v 1.7 1999/09/27 11:00:47 philip Exp $ -+ * Version: $Id: ether.c,v 1.8 2002/07/30 05:17:29 ecki Exp $ - * - * Author: Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> - * Copyright 1993 MicroWalt Corporation -@@ -39,7 +39,7 @@ - { - static char 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) - ); ---- net-tools-1.60.orig/lib/inet6.c -+++ net-tools-1.60/lib/inet6.c -@@ -3,7 +3,7 @@ - * support functions for the net-tools. - * (most of it copied from lib/inet.c 1.26). - * -- * Version: $Id: inet6.c,v 1.10 2000/10/28 11:04:00 pb Exp $ -+ * Version: $Id: inet6.c,v 1.12 2002/12/10 01:03:09 ecki Exp $ - * - * Author: Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> - * Copyright 1993 MicroWalt Corporation -@@ -44,6 +44,21 @@ - - extern int h_errno; /* some netdb.h versions don't export this */ - -+char * fix_v4_address(char *buf, struct in6_addr *in6) -+{ -+ if (IN6_IS_ADDR_V4MAPPED(in6->s6_addr)) { -+ char *s =strchr(buf, '.'); -+ if (s) { -+ while (s > buf && *s != ':') -+ --s; -+ if (*s == ':') ++s; -+ else s = NULL; -+ } -+ if (s) return s; -+ } -+ return buf; -+} -+ - static int INET6_resolve(char *name, struct sockaddr_in6 *sin6) - { - struct addrinfo req, *ai; -@@ -83,14 +98,14 @@ - 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 @@ - } - - -+ - /* 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 @@ - 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 @@ - - 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; /* ?;) */ - } - ---- net-tools-1.60.orig/lib/inet6_gr.c -+++ net-tools-1.60/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 @@ - 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 @@ - &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 @@ - 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 @@ - 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 @@ - 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")); - ---- net-tools-1.60.orig/lib/ipx_gr.c -+++ net-tools-1.60/lib/ipx_gr.c -@@ -38,21 +38,27 @@ - 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")); - ---- net-tools-1.60.orig/lib/proc.c -+++ net-tools-1.60/lib/proc.c -@@ -1,11 +1,12 @@ - /* Tolerant /proc file parser. Copyright 1998 Andi Kleen */ --/* $Id: proc.c,v 1.4 1999/01/05 20:54:00 philip Exp $ */ -+/* $Id: proc.c,v 1.5 2007/12/01 18:44:57 ecki Exp $ */ - /* Fixme: cannot currently cope with removed fields */ - - #include <string.h> - #include <stdarg.h> - #include <stdio.h> - #include <ctype.h> -+#include <unistd.h> - - /* Caller must free return string. */ - -@@ -72,3 +73,22 @@ - 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; -+} ---- net-tools-1.60.orig/lib/proc.h -+++ net-tools-1.60/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); -+ ---- net-tools-1.60.orig/lib/util-ank.c -+++ net-tools-1.60/lib/util-ank.c -@@ -293,7 +293,7 @@ - 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) { ---- net-tools-1.60.orig/lib/Makefile -+++ net-tools-1.60/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 - 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 ---- net-tools-1.60.orig/lib/ddp_gr.c -+++ net-tools-1.60/lib/ddp_gr.c -@@ -1,3 +1,20 @@ -+/* -+ * lib/ddp_gr.c Prinbting of DDP (AppleTalk) routing table -+ * used by the NET-LIB. -+ * -+ * NET-LIB -+ * -+ * Version: $Id: ddp_gr.c,v 1.4 2002/06/02 05:25:15 ecki Exp $ -+ * -+ * Author: Ajax <ajax@firest0rm.org> -+ * -+ * Modification: -+ * 2002-06-02 integrated into main source by Bernd Eckenfels -+ * -+ */ -+ -+/* TODO: name lookups (/etc/atalk.names? NBP?) */ -+ - #include "config.h" - - #if HAVE_AFATALK -@@ -16,9 +33,61 @@ - #include "pathnames.h" - #include "intl.h" - -+/* stolen from inet_gr.c */ -+#define flags_decode(i,o) do { \ -+ o[0] = '\0'; \ -+ if (i & RTF_UP) strcat(o, "U"); \ -+ if (i & RTF_GATEWAY) strcat(o, "G"); \ -+ if (i & RTF_REJECT) strcat(o, "!"); \ -+ if (i & RTF_HOST) strcat(o, "H"); \ -+ if (i & RTF_REINSTATE) strcat(o, "R"); \ -+ if (i & RTF_DYNAMIC) strcat(o, "D"); \ -+ if (i & RTF_MODIFIED) strcat(o, "M"); \ -+ if (i & RTF_DEFAULT) strcat(o, "d"); \ -+ if (i & RTF_ALLONLINK) strcat(o, "a"); \ -+ if (i & RTF_ADDRCONF) strcat(o, "c"); \ -+ if (i & RTF_NONEXTHOP) strcat(o, "o"); \ -+ if (i & RTF_EXPIRES) strcat(o, "e"); \ -+ if (i & RTF_CACHE) strcat(o, "c"); \ -+ if (i & RTF_FLOW) strcat(o, "f"); \ -+ if (i & RTF_POLICY) strcat(o, "p"); \ -+ if (i & RTF_LOCAL) strcat(o, "l"); \ -+ if (i & RTF_MTU) strcat(o, "u"); \ -+ if (i & RTF_WINDOW) strcat(o, "w"); \ -+ if (i & RTF_IRTT) strcat(o, "i"); \ -+ if (i & RTF_NOTCACHED) strcat(o, "n"); \ -+ } while (0) -+ - int DDP_rprint(int options) - { -- fprintf(stderr, _("Routing table for `ddp' not yet supported.\n")); -- return (1); -+ FILE *fp; -+ char *dest, *gw, *dev, *flags; -+ char oflags[32]; -+ char *hdr = "Destination Gateway Device Flags"; -+ -+ fp = fopen(_PATH_PROCNET_ATALK_ROUTE, "r"); -+ -+ if (!fp) { -+ perror("Error opening " _PATH_PROCNET_ATALK_ROUTE); -+ fprintf(stderr, "DDP (AppleTalk) not configured on this system.\n"); -+ return 1; -+ } -+ -+ fscanf(fp, "%as %as %as %as\n", &dest, &gw, &flags, &dev); -+ free(dest); free(gw); free(dev); free(flags); -+ -+ printf("%s\n", hdr); -+ -+ while (fscanf(fp, "%as %as %as %as\n", &dest, &gw, &flags, &dev) == 4) { -+ int iflags = atoi(flags); -+ flags_decode(iflags, oflags); -+ printf("%-16s%-16s%-16s%-s\n", dest, gw, dev, oflags); -+ free(dest); free(gw); free(dev); free(flags); -+ } -+ -+ fclose(fp); -+ -+ return 0; -+ - } - #endif ---- net-tools-1.60.orig/lib/hw.c -+++ net-tools-1.60/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.18 2001/11/12 02:12:05 ecki Exp $ - * - * Maintainer: Bernd 'eckes' Eckenfels, <net-tools@lina.inka.de> - * -@@ -73,6 +73,8 @@ - - extern struct hwtype ec_hwtype; - -+extern struct hwtype eui64_hwtype; -+ - static struct hwtype *hwtypes[] = - { - -@@ -144,6 +146,9 @@ - #if HAVE_HWX25 - &x25_hwtype, - #endif -+#if HAVE_HWEUI64 -+ &eui64_hwtype, -+#endif - &unspec_hwtype, - NULL - }; -@@ -217,6 +222,9 @@ - #if HAVE_HWEC - ec_hwtype.title = _("Econet"); - #endif -+#if HAVE_HWEUI64 -+ eui64_hwtype.title = _("Generic EUI-64"); -+#endif - sVhwinit = 1; - } - ---- net-tools-1.60.orig/lib/inet.c -+++ net-tools-1.60/lib/inet.c -@@ -3,7 +3,7 @@ - * support functions for the net-tools. - * (NET-3 base distribution). - * -- * Version: $Id: inet.c,v 1.13 1999/12/11 13:35:56 freitag Exp $ -+ * Version: $Id: inet.c,v 1.14 2003/10/19 11:57:37 pb Exp $ - * - * Author: Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> - * Copyright 1993 MicroWalt Corporation -@@ -144,7 +144,7 @@ - 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 @@ - 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 ---- net-tools-1.60.orig/lib/inet_sr.c -+++ net-tools-1.60/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 @@ - isnet = 1; break; - case 2: - isnet = 0; break; -- default: - } - - /* Fill in the other fields. */ ---- net-tools-1.60.orig/lib/ipx.c -+++ net-tools-1.60/lib/ipx.c -@@ -133,6 +133,9 @@ - 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] = ---- net-tools-1.60.orig/lib/interface.c -+++ net-tools-1.60/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.28 2003/05/29 02:09:14 ecki Exp $ - */ - - #include "config.h" -@@ -23,6 +23,7 @@ - #include <string.h> - #include <unistd.h> - #include <ctype.h> -+#include <string.h> - - #if HAVE_AFIPX - #if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) -@@ -87,14 +88,20 @@ - - int 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 @@ - } - 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 @@ - - 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 @@ - 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 @@ - } - if (ifc.ifc_len == sizeof(struct ifreq) * numreqs) { - /* assume it overflowed and try again */ -- numreqs += 10; -+ numreqs *= 2; - continue; - } - break; -@@ -188,7 +200,7 @@ - - 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 @@ - 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 @@ - 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 @@ - return p; - } - --static int procnetdev_version(char *buf) -+int procnetdev_version(char *buf) - { - if (strstr(buf, "compressed")) - return 3; -@@ -234,12 +249,12 @@ - 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 @@ - &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 @@ - 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 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 @@ - 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 @@ - if (ferror(fh)) { - perror(_PATH_PROCNET_DEV); - err = -1; -- proc_read = 0; - } - - #if 0 -@@ -371,9 +379,16 @@ - - 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; - } - -@@ -579,11 +594,11 @@ - - void ife_print_short(struct interface *ptr) - { -- printf("%-5.5s ", ptr->name); -- printf("%5d %3d", ptr->mtu, ptr->metric); -+ printf("%-9s ", ptr->name); -+ 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,8 +651,8 @@ - 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"; - - #if HAVE_AFIPX - static struct aftype *ipxtype = NULL; -@@ -670,7 +685,7 @@ - if (hw == NULL) - hw = get_hwntype(-1); - -- printf(_("%-9.9s Link encap:%s "), ptr->name, hw->title); -+ 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) && -@@ -843,10 +858,38 @@ - tx = ptr->stats.tx_bytes; - short_rx = rx * 10; - 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"); } -+ 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 (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(_("TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"), -@@ -867,7 +910,7 @@ - } - - if ((ptr->map.irq || ptr->map.mem_start || ptr->map.dma || -- ptr->map.base_addr)) { -+ ptr->map.base_addr >= 0x100)) { - printf(" "); - if (ptr->map.irq) - printf(_("Interrupt:%d "), ptr->map.irq); ---- net-tools-1.60.orig/lib/net-features.h -+++ net-tools-1.60/lib/net-features.h -@@ -295,6 +295,13 @@ - "-" - #endif - "HDLC/LAPB " -+ -+#if HAVE_HWEUI64 -+"+" -+#else -+"-" -+#endif -+"EUI64 " - ; - - ---- net-tools-1.60.orig/lib/nstrcmp.c -+++ net-tools-1.60/lib/nstrcmp.c -@@ -1,34 +1,157 @@ - /* Copyright 1998 by Andi Kleen. Subject to the GPL. */ --/* $Id: nstrcmp.c,v 1.2 1998/11/15 20:11:38 freitag Exp $ */ -+/* rewritten by bernd eckenfels because of complicated alias semantic */ -+/* $Id: nstrcmp.c,v 1.4 2004/06/03 22:49:17 ecki Exp $ */ - #include <ctype.h> - #include <stdlib.h> -+#include <string.h> - #include "util.h" - --/* like strcmp(), but knows about numbers */ --int nstrcmp(const char *astr, const char *b) -+ -+/* return numerical :999 suffix or null. sideeffect: replace ':' with \0 */ -+char* cutalias(char* name) - { -- const char *a = astr; -+ int digit = 0; -+ int pos; -+ -+ for(pos=strlen(name); pos>0; pos--) -+ { -+ if (name[pos-1]==':' && digit) -+ { -+ name[pos-1]='\0'; -+ return name+pos; -+ } -+ if (!isdigit(name[pos-1])) -+ break; -+ digit = 1; -+ } -+ return NULL; -+} - -- while (*a == *b) { -- if (*a == '\0') -- return 0; -- a++; -- b++; -- } -- if (isdigit(*a)) { -- if (!isdigit(*b)) -- return -1; -- while (a > astr) { -- a--; -- if (!isdigit(*a)) { -- a++; -- break; -- } -- if (!isdigit(*b)) -- return -1; -- b--; -+ -+/* return index of last non digit or -1 if it does not end with digits */ -+int rindex_nondigit(char *name) -+{ -+ int pos = strlen(name); -+ -+ for(pos=strlen(name); pos>0; pos--) -+ { -+ if (!isdigit(name[pos-1])) -+ return pos; - } -- return atoi(a) > atoi(b) ? 1 : -1; -- } -- return *a - *b; -+ return 0; -+} -+ -+ -+/* like strcmp(), but knows about numbers and ':' alias suffix */ -+int nstrcmp(const char *ap, const char *bp) -+{ -+ char *a = (char*)strdup(ap); -+ char *b = (char*)strdup(bp); -+ char *an, *bn; -+ int av = 0, bv = 0; -+ char *aalias=cutalias(a); -+ char *balias=cutalias(b); -+ int aindex=rindex_nondigit(a); -+ int bindex=rindex_nondigit(b); -+ int complen=(aindex<bindex)?aindex:bindex; -+ int res = strncmp(a, b, complen); -+ -+ if (res != 0) -+ { free(a); free(b); return res; } -+ -+ if (aindex > bindex) -+ { free(a); free(b); return 1; } -+ -+ if (aindex < bindex) -+ { free(a); free(b); return -1; } -+ -+ an = a+aindex; -+ bn = b+bindex; -+ -+ av = atoi(an); -+ bv = atoi(bn); -+ -+ if (av < bv) -+ { free(a); free(b); return -1; } -+ -+ if (av > bv) -+ { free(a); free(b); return 1; } -+ -+ av = -1; -+ if (aalias != NULL) -+ av = atoi(aalias); -+ -+ bv = -1; -+ if (balias != NULL) -+ bv = atoi(balias); -+ -+ free(a); free(b); -+ -+ if (av < bv) -+ return -1; -+ -+ if (av > bv) -+ return 1; -+ -+ return 0; -+} -+ -+ -+#ifdef NSTRCMP_TEST -+ -+int cs(int s) -+{ -+ if (s < 0) return -1; -+ if (s > 0) return 1; -+ return 0; -+} -+ -+ -+int dotest(char* a, char* b, int exp) -+{ -+ int res = nstrcmp(a, b); -+ int err = (cs(res) != cs(exp)); -+ printf("nstrcmp(\"%s\", \"%s\")=%d %d %s\n", a, b, res, exp, err?"WRONG":"OK"); -+ return err; - } -+ -+int main() -+{ -+ int err = 0; -+ -+ err |= dotest("eth1", "eth1", 0); -+ err |= dotest("eth0:1", "eth0:1", 0); -+ err |= dotest("lan", "lan", 0); -+ err |= dotest("100", "100", 0); -+ err |= dotest("", "", 0); -+ err |= dotest(":", ":", 0); -+ err |= dotest("a:b:c", "a:b:c", 0); -+ err |= dotest("a:", "a:", 0); -+ err |= dotest(":a", ":a", 0); -+ -+ err |= dotest("a", "aa", -1); -+ err |= dotest("eth0", "eth1", -1); -+ err |= dotest("eth1", "eth20", -1); -+ err |= dotest("eth20", "eth100", -1); -+ err |= dotest("eth1", "eth13", -1); -+ err |= dotest("eth", "eth2", -1); -+ err |= dotest("eth0:1", "eth0:2", -1); -+ err |= dotest("eth1:10", "eth13:10", -1); -+ err |= dotest("eth1:1", "eth1:13", -1); -+ err |= dotest("a", "a:", -1); -+ -+ err |= dotest("aa", "a", 1); -+ err |= dotest("eth2", "eth1", 1); -+ err |= dotest("eth13", "eth1", 1); -+ err |= dotest("eth2", "eth", 1); -+ err |= dotest("eth2:10", "eth2:1", 1); -+ err |= dotest("eth2:5", "eth2:4", 1); -+ err |= dotest("eth3:2", "eth2:3", 1); -+ err |= dotest("eth13:1", "eth1:0", 1); -+ err |= dotest("a:", "a", 1); -+ err |= dotest("a1b12", "a1b2", 1); -+ -+ return err; -+} -+ -+#endif ---- net-tools-1.60.orig/lib/pathnames.h -+++ net-tools-1.60/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" ---- net-tools-1.60.orig/lib/tr.c -+++ net-tools-1.60/lib/tr.c -@@ -2,7 +2,7 @@ - * lib/tr.c This file contains an implementation of the "Tokenring" - * support functions. - * -- * Version: $Id: tr.c,v 1.8 2000/02/02 08:56:30 freitag Exp $ -+ * Version: $Id: tr.c,v 1.9 2005/05/16 03:15:12 ecki Exp $ - * - * Author: Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> - * Copyright 1993 MicroWalt Corporation -@@ -30,8 +30,14 @@ - #include "net-support.h" - #include "pathnames.h" - #include "intl.h" -+#include "util.h" - -+ -+/* actual definition at the end of file */ - extern struct hwtype tr_hwtype; -+#ifdef ARPHRD_IEEE802_TR -+extern struct hwtype tr_hwtype1; -+#endif - - static char *pr_tr(unsigned char *ptr) - { -@@ -42,7 +48,7 @@ - (ptr[3] & 0377), (ptr[4] & 0377), (ptr[5] & 0377) - ); - return (buff); --} -+ } - - - static int in_tr(char *bufp, struct sockaddr *sap) -@@ -51,7 +57,17 @@ - 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; ---- net-tools-1.60.orig/lib/util.h -+++ net-tools-1.60/lib/util.h -@@ -14,3 +14,6 @@ - - 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)) ---- net-tools-1.60.orig/lib/irda.c -+++ net-tools-1.60/lib/irda.c -@@ -1,13 +1,15 @@ - /********************************************************************* - * - * Filename: irda.c -- * Version: 0.1 -- * Description: A first attempt to make ifconfig understand IrDA -+ * Version: 0.2 -+ * Description: A second attempt to make ifconfig understand IrDA - * Status: Experimental. - * Author: Dag Brattli <dagb@cs.uit.no> - * Created at: Wed Apr 21 09:03:09 1999 - * Modified at: Wed Apr 21 09:17:05 1999 - * Modified by: Dag Brattli <dagb@cs.uit.no> -+ * Modified at: Wed May 1 11:51:44 CEST 2002 -+ * Modified by: Christoph Bartelmus <christoph@bartelmus.de> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as -@@ -59,9 +61,9 @@ - */ - static char *irda_print(unsigned char *ptr) - { -- static char buff[8]; -+ static char buff[12]; - -- sprintf(&buff[strlen(buff)], "%02x:%02x:%02x:%02x", ptr[3], ptr[2], -+ snprintf(buff, 12, "%02x:%02x:%02x:%02x", ptr[3], ptr[2], - ptr[1], ptr[0]); - - return (buff); ---- net-tools-1.60.orig/lib/x25_sr.c -+++ net-tools-1.60/lib/x25_sr.c -@@ -67,7 +67,7 @@ - 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 @@ - } - 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")) { ---- net-tools-1.60.orig/lib/eui64.c -+++ net-tools-1.60/lib/eui64.c -@@ -0,0 +1,155 @@ -+/* -+ * lib/eui64.c This file contains support for generic EUI-64 hw addressing -+ * -+ * Version: $Id: eui64.c,v 1.1 2001/11/12 02:12:05 ecki Exp $ -+ * -+ * Author: Daniel Stodden <stodden@in.tum.de> -+ * Copyright 2001 Daniel Stodden -+ * -+ * blueprinted from ether.c -+ * Copyright 1993 MicroWalt Corporation -+ * -+ * This program is free software; you can redistribute it -+ * and/or modify it under the terms of the GNU General -+ * Public License as published by the Free Software -+ * Foundation; either version 2 of the License, or (at -+ * your option) any later version. -+ */ -+#include "config.h" -+ -+#if HAVE_HWEUI64 -+ -+#include <sys/types.h> -+#include <sys/ioctl.h> -+#include <sys/socket.h> -+#include <net/if_arp.h> -+#include <stdlib.h> -+#include <stdio.h> -+#include <ctype.h> -+#include <errno.h> -+#include <fcntl.h> -+#include <string.h> -+#include <termios.h> -+#include <unistd.h> -+#include "net-support.h" -+#include "pathnames.h" -+#include "intl.h" -+ -+/* -+ * EUI-64 constants -+ */ -+ -+#define EUI64_ALEN 8 -+ -+#ifndef ARPHRD_EUI64 -+#define ARPHRD_EUI64 27 -+#warning "ARPHRD_EUI64 not defined in <net/if_arp.h>. Using private value 27" -+#endif -+ -+struct hwtype eui64_hwtype; -+ -+/* Display an EUI-64 address in readable format. */ -+static char *pr_eui64( unsigned char *ptr ) -+{ -+ static char buff[64]; -+ -+ snprintf(buff, sizeof(buff), "%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X", -+ (ptr[0] & 0377), (ptr[1] & 0377), (ptr[2] & 0377), (ptr[3] & 0377), -+ (ptr[4] & 0377), (ptr[5] & 0377), (ptr[6] & 0377), (ptr[7] & 0377) -+ ); -+ return (buff); -+} -+ -+/* Start the PPP encapsulation on the file descriptor. */ -+static int in_eui64( char *bufp, struct sockaddr *sap ) -+{ -+ unsigned char *ptr; -+ char c, *orig; -+ int i; -+ unsigned val; -+ -+ sap->sa_family = eui64_hwtype.type; -+ ptr = sap->sa_data; -+ -+ i = 0; -+ orig = bufp; -+ -+ while ((*bufp != '\0') && (i < EUI64_ALEN)) { -+ val = 0; -+ c = *bufp++; -+ if (isdigit(c)) -+ val = c - '0'; -+ else if (c >= 'a' && c <= 'f') -+ val = c - 'a' + 10; -+ else if (c >= 'A' && c <= 'F') -+ val = c - 'A' + 10; -+ else { -+#ifdef DEBUG -+ fprintf( stderr, _("in_eui64(%s): invalid eui64 address!\n"), -+ orig ); -+#endif -+ errno = EINVAL; -+ return (-1); -+ } -+ -+ val <<= 4; -+ c = *bufp; -+ if (isdigit(c)) -+ val |= c - '0'; -+ else if (c >= 'a' && c <= 'f') -+ val |= c - 'a' + 10; -+ else if (c >= 'A' && c <= 'F') -+ val |= c - 'A' + 10; -+ else if (c == ':' || c == 0) -+ val >>= 4; -+ else { -+#ifdef DEBUG -+ fprintf( stderr, _("in_eui64(%s): invalid eui64 address!\n"), -+ orig ); -+#endif -+ errno = EINVAL; -+ return (-1); -+ } -+ -+ if (c != 0) -+ bufp++; -+ -+ *ptr++ = (unsigned char) (val & 0377); -+ i++; -+ -+ /* We might get a semicolon here - not required. */ -+ if (*bufp == ':') { -+ if (i == EUI64_ALEN) { -+#ifdef DEBUG -+ fprintf(stderr, _("in_eui64(%s): trailing : ignored!\n"), -+ orig) -+#endif -+ ; /* nothing */ -+ } -+ bufp++; -+ } -+ } -+ -+ /* That's it. Any trailing junk? */ -+ if ((i == EUI64_ALEN) && (*bufp != '\0')) { -+#ifdef DEBUG -+ fprintf(stderr, _("in_eui64(%s): trailing junk!\n"), orig); -+ errno = EINVAL; -+ return (-1); -+#endif -+ } -+#ifdef DEBUG -+ fprintf(stderr, "in_eui64(%s): %s\n", orig, pr_eui64(sap->sa_data)); -+#endif -+ -+ return (0); -+} -+ -+struct hwtype eui64_hwtype = -+{ -+ "eui64", NULL, /*"EUI-64 addressing", */ ARPHRD_EUI64, EUI64_ALEN, -+ pr_eui64, in_eui64, NULL, 0 -+}; -+ -+ -+#endif /* HAVE_EUI64 */ ---- net-tools-1.60.orig/rarp.c -+++ net-tools-1.60/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 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/slattach.c -+++ net-tools-1.60/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_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->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/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/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/include/mii.h -+++ net-tools-1.60/include/mii.h -@@ -6,11 +6,14 @@ - * Copyright (C) 2000 David A. Hinds -- dhinds@pcmcia.sourceforge.org - */ - --#ifndef _LINUX_MII_H --#define _LINUX_MII_H -+#ifndef _NETTOOL_MII_H -+#define _NETTOOLS_MII_H -+ -+#include <linux/sockios.h> - - /* network interface ioctl's for MII commands */ - #ifndef SIOCGMIIPHY -+#warning "SIOCGMIIPHY is not defined by your kernel source" - #define SIOCGMIIPHY (SIOCDEVPRIVATE) /* Read from current PHY */ - #define SIOCGMIIREG (SIOCDEVPRIVATE+1) /* Read any PHY register */ - #define SIOCSMIIREG (SIOCDEVPRIVATE+2) /* Write any PHY register */ -@@ -38,6 +41,7 @@ - #define MII_BMCR_RESTART 0x0200 - #define MII_BMCR_DUPLEX 0x0100 - #define MII_BMCR_COLTEST 0x0080 -+#define MII_BMCR_SPEED1000 0x0040 - - /* Basic Mode Status Register */ - #define MII_BMSR 0x01 -@@ -83,4 +87,17 @@ - #define MII_ANER_PAGE_RX 0x0002 - #define MII_ANER_LP_AN_ABLE 0x0001 - --#endif /* _LINUX_MII_H */ -+#define MII_CTRL1000 0x09 -+#define MII_BMCR2_1000FULL 0x0200 -+#define MII_BMCR2_1000HALF 0x0100 -+ -+#define MII_STAT1000 0x0a -+#define MII_LPA2_1000LOCALOK 0x2000 -+#define MII_LPA2_1000REMRXOK 0x1000 -+#define MII_LPA2_1000FULL 0x0800 -+#define MII_LPA2_1000HALF 0x0400 -+ -+/* Last register we need for show_basic_mii() */ -+#define MII_BASIC_MAX (MII_STAT1000+1) -+ -+#endif /* _NETTOOLS_MII_H */ ---- net-tools-1.60.orig/man/en_US/rarp.8 -+++ net-tools-1.60/man/en_US/rarp.8 -@@ -61,8 +61,8 @@ - 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. ---- net-tools-1.60.orig/man/en_US/arp.8 -+++ net-tools-1.60/man/en_US/arp.8 -@@ -1,56 +1,111 @@ --.TH ARP 8 "5 Jan 1999" "net-tools" "Linux Programmer's Manual" -+.TH ARP 8 "2007-12-01" "net-tools" "Linux Programmer'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" -@@ -76,21 +131,13 @@ - 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 @@ - .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 @@ - and published entries have the - .B P - flag. -+.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 -+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 @@ - .SH SEE ALSO - rarp(8), route(8), ifconfig(8), netstat(8) - .SH AUTHORS --Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> with a lot of improvements --from net-tools Maintainer Bernd Eckenfels <net-tools@lina.inka.de>. -+Fred N. van Kempen <waltje@uwalt.nl.mugnet.org>, Bernd Eckenfels <net-tools@lina.inka.de>. ---- net-tools-1.60.orig/man/en_US/ethers.5 -+++ net-tools-1.60/man/en_US/ethers.5 -@@ -1,4 +1,4 @@ --.TH ETHERS 5 "April 26th, 1996" "" "File formats" -+.TH ETHERS 5 "May 15th, 2005" "" "File formats" - .SH NAME \"{{{roff}}}\"{{{ - ethers \- Ethernet address to IP number database - .\"}}} -@@ -10,8 +10,8 @@ - \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 -+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 , ---- net-tools-1.60.orig/man/en_US/ifconfig.8 -+++ net-tools-1.60/man/en_US/ifconfig.8 -@@ -1,10 +1,10 @@ --.TH IFCONFIG 8 "14 August 2000" "net-tools" "Linux Programmer's Manual" -+.TH IFCONFIG 8 "2007-12-02" "net-tools" "Linux Programmer'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 -@@ -41,11 +41,27 @@ - (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 -@@ -173,11 +189,20 @@ - 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 @@ - While appletalk DDP and IPX addresses will be displayed they cannot be - altered by this command. - .SH SEE ALSO --route(8), netstat(8), arp(8), rarp(8), ipchains(8) -+route(8), netstat(8), arp(8), rarp(8), ipchains(8), iptables(8), ifup(8), interfaces(5). -+.br -+http://physics.nist.gov/cuu/Units/binary.html - Prefixes for binary multiples - .SH AUTHORS - Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> - .br -@@ -198,3 +225,5 @@ - Phil Blundell, <Philip.Blundell@pobox.com> - .br - Andi Kleen -+.br -+Bernd Eckenfels, <net-tools@lina.inka.de> ---- net-tools-1.60.orig/man/en_US/netstat.8 -+++ net-tools-1.60/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 "2007-12-02" "net-tools" "Linux Programmer's Manual" - - .SH NAME - netstat \- Print network connections, routing tables, interface statistics, masquerade connections, and multicast memberships -@@ -23,7 +23,7 @@ - .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 @@ - .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 @@ - .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 @@ - 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" -@@ -165,12 +171,11 @@ - .SS "\-a, \-\-all" - Show both listening and non-listening sockets. With the - .B --interfaces --option, show interfaces that are not marked -+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 -@@ -221,7 +226,7 @@ - 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 -@@ -438,7 +443,7 @@ - .P - .SH AUTHORS - The netstat user interface was written by Fred Baumgarten --<dc6iq@insu1.etec.uni-karlsruhe.de> the man page basically -+<dc6iq@insu1.etec.uni-karlsruhe.de>, the man page basically - by Matt Welsh <mdw@tc.cornell.edu>. It was updated by - Alan Cox <Alan.Cox@linux.org> but could do with a bit more - work. It was updated again by Tuan Hoang ---- net-tools-1.60.orig/man/en_US/route.8 -+++ net-tools-1.60/man/en_US/route.8 -@@ -1,4 +1,4 @@ --.TH ROUTE 8 "2 January 2000" "net-tools" "Linux Programmer'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 -@@ -141,7 +141,7 @@ - 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,17 +179,20 @@ - - .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. -+adds a route to the local network 192.56.76.x via -+"eth0". The word "dev" can be omitted here. -+ -+.TP -+.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 -@@ -289,7 +292,7 @@ - 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 @@ - Linus Torvalds for pl15. Alan Cox added the mss and window options for - Linux 1.1.22. irtt support and merged with netstat from Bernd Eckenfels. - .SH AUTHOR --Currently maintained by Phil Blundell <Philip.Blundell@pobox.com>. -+Currently maintained by Phil Blundell <Philip.Blundell@pobox.com> and Bernd Eckenfels <net-tools@lina.inka.de>. ---- net-tools-1.60.orig/man/en_US/slattach.8 -+++ net-tools-1.60/man/en_US/slattach.8 -@@ -1,4 +1,4 @@ --.TH SLATTACH 8 "12 Feb 1994" "" "" -+.TH SLATTACH 8 "10 Oct 2006" "" "" - .SH NAME - slattach \- attach a network interface to a serial line - .SH SYNOPSIS -@@ -24,6 +24,7 @@ - .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. -+.TP - .B "[-v]" - Enable verbose output. Useful in shell scripts. - .TP -@@ -41,7 +42,7 @@ - .TP - .B "[-e]" - Exit right after initializing device, instead of waiting for the --line to hangup. -+line to hang up. - .TP - .B "[-L]" - Enable 3 wire operation. The terminal is moved into CLOCAL mode, -@@ -50,8 +51,8 @@ - .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" ---- net-tools-1.60.orig/man/en_US/mii-tool.8 -+++ net-tools-1.60/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 "2000/04/25 22:58:19" "net-tools" -+.TH MII-TOOL 8 "2004/03/28 23:30:00" "net-tools" - - .SH NAME - mii-tool \- view, manipulate media-independent interface status -@@ -72,7 +72,24 @@ - 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 ---- net-tools-1.60.orig/man/fr_FR/arp.8 -+++ net-tools-1.60/man/fr_FR/arp.8 -@@ -140,8 +140,8 @@ - Similaire ŕ l'option - .B \-s - , mais cette fois les informations d'adresses sont prises dans le fichier --.B nom_de_fichier --. Ceci peut ętre utilisé si les entrées ARP ŕ configurer sont -+.BR nom_de_fichier . -+Ceci peut ętre utilisé si les entrées ARP ŕ configurer sont - nombreuses. Le nom du fichier de données est trčs souvent nommé - .B /etc/ethers - , mais ce n'est pas officiel. -@@ -160,8 +160,8 @@ - .LP - Chaque entrée complčte se trouvant dans le cache ARP est marquée de - l'indicateur --.B C --. Les entrées permanentes sont marquées de l'indicateur -+.BR C . -+Les entrées permanentes sont marquées de l'indicateur - .B M - et les entrées 'pub' ont l'indicateur - .B P ---- net-tools-1.60.orig/man/fr_FR/hostname.1 -+++ net-tools-1.60/man/fr_FR/hostname.1 -@@ -84,8 +84,8 @@ - .LP - .B hostname - fournit le nom du systčme tel qu'il est retourné par la fonction --.BR getdomainname (2) --. Ceci est connu comme nom de domaine YP/NIS du systčme. -+.BR getdomainname (2). -+Ceci est connu comme nom de domaine YP/NIS du systčme. - - - .LP -@@ -145,8 +145,8 @@ - .LP - La façon dont vous pouvez le changer dépend de la configuration - (habituellement dans --.IR /etc/host.conf ) --. Si le fichier 'hosts' est analysé avant d'interroger le DNS ou -+.IR /etc/host.conf ). -+Si le fichier 'hosts' est analysé avant d'interroger le DNS ou - NIS) vous pouvez le changer dans le fichier - .IR /etc/hosts . - ---- net-tools-1.60.orig/man/fr_FR/ifconfig.8 -+++ net-tools-1.60/man/fr_FR/ifconfig.8 -@@ -1,4 +1,4 @@ --.TH IFCONFIG 8 "4 August 1997" "net-tools" "Linux Programmer's Manual" -+.TH IFCONFIG 8 "2007-12-02" "net-tools" "Linux Programmer's Manual" - .SH NOM - ifconfig \- configure une interface réseau - .SH SYNOPSIS -@@ -60,14 +60,14 @@ - .TP - .B "[\-]promisc" - Valide ou invalide le mode --.B promiscuous --. S'il est validé, tous les paquets circulant sur le réseau -+.BR promiscuous . -+S'il est validé, tous les paquets circulant sur le réseau - seront reçus sur cette interface. - .TP - .B "[\-]allmulti" - Valide ou invalide le fonctionnement de l'interface en mode --.B all-multicast --. S'il est validé, tous les paquets multicast circulant sur le réseau -+.BR all-multicast . -+S'il est validé, tous les paquets multicast circulant sur le réseau - seront reçus sur cette interface. - .TP - .B "metric N" -@@ -196,7 +196,7 @@ - Męme si les adresses appletalk DDP et IPX peuvent ętre affichées, - elles ne peuvent ętre modifiées avec cette commande. - .SH VOIR AUSSI --route(8), netstat(8), arp(8), rarp(8), ipchains(8) -+route(8), netstat(8), arp(8), rarp(8), ipchains(8), iptables(8), ifup(8), interfaces(5). - .SH AUTHORS - Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> - .br ---- net-tools-1.60.orig/man/fr_FR/netstat.8 -+++ net-tools-1.60/man/fr_FR/netstat.8 -@@ -8,7 +8,7 @@ - .\" Modified: Tuan Hoang tuan@optimus.mitre.org - .\" - .\" --.TH NETSTAT 8 "25 Fév 1999" "net-tools" "Linux Programmer's Manual" -+.TH NETSTAT 8 "2007-12-02" "net-tools" "Linux Programmer's Manual" - - .SH NAME - netstat \- Affiche les connexions réseau, les tables de routage, les -@@ -106,7 +106,7 @@ - .BR route (8) - pour plus de détails. - --.SS "\-i, \-\-interface \fIiface\fI" -+.SS "\-i, \-\-interfaces \fIiface\fI" - Si vous utilisez l'option - .BR -i ", " --interfaces - , une table de toutes (ou de l'interface -@@ -118,8 +118,8 @@ - .BR ifconfig (8). - .B "netstat -ei" - affiche une table ou une seule entrée d'interface comme la commande --.B ifconfig --. Avec le paramčtre -+.BR ifconfig . -+Avec le paramčtre - .B -a - , vous pouvez inclure les interfaces qui ne sont pas configurées (c.a.d qui - n'ont pas l'indicateur -@@ -249,7 +249,7 @@ - avant d'entreprendre la fermeture. - .TP - .I --CLOSED -+CLOSE - La socket n'est pas utilisée. - .TP - .I -@@ -409,8 +409,7 @@ - Depuis la version 2.2 du noyau, netstat -i n'affiche plus les statistiques - des interfaces alias. Pour obtenir les compteurs par interface alias, vous - devez définir des rčgles spécifiques ŕ l'aide de la commande --.BR ipchains(8) --. -+.BR ipchains (8). - - .SH FICHIERS - .ta ---- net-tools-1.60.orig/man/fr_FR/rarp.8 -+++ net-tools-1.60/man/fr_FR/rarp.8 -@@ -55,8 +55,8 @@ - Crée manuellement une correspondance d'adresses RARP pour l'hôte - .B nom_d_hôte - avec l'adresse matérielle --.B adr_materielle --. Le format de l'adresse matérielle est dépendant du matériel, -+.BR adr_materielle . -+Le format de l'adresse matérielle est dépendant du matériel, - mais pour la plupart on peut considérer que la présentation classique - peut ętre utilisée. Pour la classe Ethernet, c'est 6 octets en hexadécimal, - séparés par des double-points. ---- net-tools-1.60.orig/man/fr_FR/route.8 -+++ net-tools-1.60/man/fr_FR/route.8 -@@ -1,4 +1,4 @@ --.TH ROUTE 8 "8 Aoűt 1997" "net-tools" "Linux Programmer's Manual" -+.TH ROUTE 8 "2007-12-02" "net-tools" "Linux Programmer's Manual" - .SH NAME - route \- affiche / manipule la table de routage IP - .SH SYNOPSIS -@@ -330,6 +330,6 @@ - la gestion des fenętres et MSS pour Linux 1.1.22. Le support de irtt - et la fusion avec netstat ont été réalisés par Bernd Eckenfels. - .SH AUTEUR --Maintenu par Phil Blundell <Philip.Blundell@pobox.com>. -+Maintenu par Phil Blundell <Philip.Blundell@pobox.com> et Bernd Eckenfels <net-tools@lina.inka.de>. - .SH TRADUCTION --Jean-Michel VANSTEENE (vanstee@worldnet.fr) -+Jean-Michel VANSTEENE <vanstee@worldnet.fr> ---- net-tools-1.60.orig/man/pt_BR/ifconfig.8 -+++ net-tools-1.60/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 -@@ -169,7 +169,7 @@ - Os endereços appletalk DDP e IPX serăo mostrados, mas năo podem ser alterados - com este comando. - .SH VEJA TAMBÉM --route(8), netstat(8), arp(8), rarp(8), ipchains(8) -+route(8), netstat(8), arp(8), rarp(8), ipchains(8), iptables(8), ifup(8), interfaces(5). - .SH AUTORES - Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> - Alan Cox, <Alan.Cox@linux.org> ---- net-tools-1.60.orig/man/pt_BR/netstat.8 -+++ net-tools-1.60/man/pt_BR/netstat.8 -@@ -8,7 +8,7 @@ - .\" Traduzido para portuguęs por Arnaldo Carvalho de Melo <acme@conectiva.com.br> - .\" Revisado por Jorge Luiz Godoy Filho <jorge@bestway.com.br> - .\" --.TH NETSTAT 8 "19 de maio de 1997" "net-tools" "Manual do Programador Linux" -+.TH NETSTAT 8 "2007-12-02" "net-tools" "Manual do Programador Linux" - - .SH NOME - netstat \- Mostra conexőes de rede, tabelas de roteamento, estatísticas de interface e conexőes -@@ -97,7 +97,7 @@ - .BR route (8) - para maiores detalhes. - --.SS "\-i, \-\-interface \fIiface\fI" -+.SS "\-i, \-\-interfaces \fIiface\fI" - Se vocę usar a opçăo - .BR -i ", " --interfaces - , uma tabela de todas (ou da ---- net-tools-1.60.orig/man/pt_BR/rarp.8 -+++ net-tools-1.60/man/pt_BR/rarp.8 -@@ -50,8 +50,8 @@ - Cria um mapeamento de endereços RARP para a máquina - .B máquina - com endereço de hardware configurado para --.B endereço_hardware --. O formato do endereço de hardware depende da classe do hardware, mas -+.B endereço_hardware. -+O formato do endereço de hardware depende da classe do hardware, mas - para a maioria das classes vocę pode assumir que a apresentaçăo usual pode - ser usada. Para a classe Ethernet, săo 6 bytes em hexadecimal, separados - por dois pontos (:). ---- net-tools-1.60.orig/man/pt_BR/route.8 -+++ net-tools-1.60/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 -@@ -321,7 +321,7 @@ - Linus Torvalds para a versăo pl15. Alan Cox adicionou as opçőes para - mss e window no kernel 1.1.22. O suporte a irtt (compartilhado com o - netstat) foi feito por Bernd Eckenfels. -+.SH AUTHOR -+Currently maintained by Phil Blundell <Philip.Blundell@pobox.com> and Bernd Eckenfels <net-tools@lina.inka.de>. - .SH TRADUÇĂO - Arnaldo Carvalho de Melo <acme@conectiva.com.br> - 13/04/1998 --.SH BUGS --nenhum :) ---- net-tools-1.60.orig/man/de_DE/ifconfig.8 -+++ net-tools-1.60/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 -@@ -193,7 +193,7 @@ - W\(:ahrend AppleTalk DDP und IPX Adressen angezeigt werden, k\(:onnen sie mit - diesem Kommando nicht ge\(:andert werden. - .SH SIEHE AUCH --route(8), netstat(8), arp(8), rarp(8), ipchains(8) -+route(8), netstat(8), arp(8), rarp(8), ipchains(8), iptables(8), ifup(8), interfaces(5). - .SH AUTOREN - Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> - .br ---- net-tools-1.60.orig/man/de_DE/route.8 -+++ net-tools-1.60/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 -@@ -345,6 +345,6 @@ - irtt beigesteuert und den Code mit dem von Netstat vereinigt. - .SH AUTOREN - .B Route --wird zur Zeit von Phil Blundel (Philip.Blundell@pobox.com) gewartet. -+wird zur Zeit von Phil Blundel <Philip.Blundell@pobox.com> und Bernd Eckenfels <net-tools@lina.inka.de> gewartet. - .SH \(:Ubersetzung - Ralf B\(:achle <ralf@gnu.org> ---- net-tools-1.60.orig/man/de_DE/netstat.8 -+++ net-tools-1.60/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 @@ - .B netstat - .RB [ \-veenpac ] - .RB { \-\-interfaces | \-i } --.RI [ Schnittstelle ] - - .PP - -@@ -68,6 +67,8 @@ - .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 @@ - 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 @@ - und - .BR \-\-ddp. - --.SS "\-c, \-\-continous" -+.SS "\-c, \-\-continuous" - Mit dieser Option wiederholt - .B netstat - im Sekundenabstand die Ausgabe, bis es abgebrochen wird. ---- net-tools-1.60.orig/po/pt_BR.po -+++ net-tools-1.60/po/pt_BR.po -@@ -10,275 +10,287 @@ - msgid "" - msgstr "" - "Project-Id-Version: net-tools 1.54\n" --"POT-Creation-Date: 2000-02-14 02:31+0100\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2007-06-30 12:28+0900\n" - "PO-Revision-Date: 1999-03-01 02:38+0100\n" - "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=ISO8859-9\n" - "Content-Transfer-Encoding: 8bit\n" - --#: ../arp.c:110 ../arp.c:269 -+#: ../arp.c:112 ../arp.c:279 -+#, c-format - msgid "arp: need host name\n" - msgstr "arp: preciso do nome da máquina\n" - --#: ../arp.c:207 ../arp.c:221 -+#: ../arp.c:215 ../arp.c:230 - #, c-format - msgid "No ARP entry for %s\n" - msgstr "Nenhuma entrada ARP para %s\n" - --#: ../arp.c:239 -+#: ../arp.c:248 - #, c-format - msgid "arp: cant get HW-Address for `%s': %s.\n" - msgstr "arp: năo foi possível obter o endereço de hardware para `%s': %s.\n" - --#: ../arp.c:243 -+#: ../arp.c:252 -+#, c-format - msgid "arp: protocol type mismatch.\n" - msgstr "arp: erro no tipo do protocolo.\n" - --#: ../arp.c:252 -+#: ../arp.c:261 - #, c-format - msgid "arp: device `%s' has HW address %s `%s'.\n" - msgstr "arp: o dispositivo `%s' tem endereço de hardware %s `%s'.\n" - --#: ../arp.c:282 -+#: ../arp.c:293 -+#, c-format - msgid "arp: need hardware address\n" - msgstr "arp: preciso do endereço de hardware\n" - --#: ../arp.c:290 -+#: ../arp.c:301 -+#, c-format - msgid "arp: invalid hardware address\n" - msgstr "arp: endereço inválido de hardware\n" - --#: ../arp.c:387 -+#: ../arp.c:398 - #, c-format - msgid "arp: cannot open etherfile %s !\n" - msgstr "arp: năo foi possível abrir o arquivo etherfile %s!\n" - --#: ../arp.c:403 -+#: ../arp.c:414 - #, c-format - msgid "arp: format error on line %u of etherfile %s !\n" - msgstr "arp: erro de formato na linha %u do arquivo etherfile %s!\n" - --#: ../arp.c:416 -+#: ../arp.c:427 - #, c-format - msgid "arp: cannot set entry on line %u of etherfile %s !\n" - msgstr "arp: năo foi possível configurar a linha %u do arquivo etherfile %s!\n" - --#: ../arp.c:437 --msgid "Address\t\t\tHWtype\tHWaddress\t Flags Mask\t\t Iface\n" -+#: ../arp.c:448 -+#, fuzzy, c-format -+msgid "" -+"Address HWtype HWaddress Flags Mask " -+"Iface\n" - msgstr "Endereço\t\tTipoHW\tEndereçoHW\t Flags Mascara\t\t Iface\n" - --#: ../arp.c:467 -+#: ../arp.c:476 -+#, fuzzy -+msgid "<from_interface>" -+msgstr "%s: interface desconhecida.\n" -+ -+#: ../arp.c:478 - msgid "(incomplete)" - msgstr "(incompleto)" - --#: ../arp.c:484 -+#: ../arp.c:495 - #, c-format - msgid "%s (%s) at " - msgstr "%s (%s) em " - --#: ../arp.c:490 -+#: ../arp.c:501 -+#, c-format - msgid "<incomplete> " - msgstr "<incompleto> " - --#: ../arp.c:496 -+#: ../arp.c:507 - #, c-format - msgid "netmask %s " - msgstr "mascara %s " - --#: ../arp.c:513 -+#: ../arp.c:524 - #, c-format - msgid "on %s\n" - msgstr "em %s\n" - --#: ../arp.c:592 -+#: ../arp.c:605 - #, c-format - msgid "Entries: %d\tSkipped: %d\tFound: %d\n" - msgstr "Entradas: %d\tIgnorada: %d\tEncontrada: %d\n" - --#: ../arp.c:596 -+#: ../arp.c:609 - #, c-format - msgid "%s (%s) -- no entry\n" - msgstr "%s (%s) -- nenhuma entrada\n" - --#: ../arp.c:598 -+#: ../arp.c:611 - #, c-format - msgid "arp: in %d entries no match found.\n" - msgstr "arp: em %d entradas năo foi encontrado.\n" - --#: ../arp.c:613 -+#: ../arp.c:626 -+#, c-format - msgid "" - "Usage:\n" - " arp [-vn] [<HW>] [-i <if>] [-a] [<hostname>] <-Display ARP " - "cache\n" - msgstr "" - "Uso:\n" --" arp [-vn] [<HW>] [-i <if>] [-a] [<máquina>] <-Mostra cache " --"ARP\n" -+" arp [-vn] [<HW>] [-i <if>] [-a] [<máquina>] <-Mostra cache ARP\n" - --#: ../arp.c:614 -+#: ../arp.c:627 -+#, fuzzy, c-format - msgid "" --" arp [-v] [-i <if>] -d <hostname> [pub][nopub] <-Delete ARP " -+" arp [-v] [-i <if>] -d <host> [pub] <-Delete ARP " - "entry\n" --msgstr "" --" arp [-v] [-i <if>] -d <máquina> [pub][nopub] <-Remove entrada " --"ARP\n" -+msgstr " arp [-v] [-i <if>] -d <máquina> [pub][nopub] <-Remove entrada ARP\n" - --#: ../arp.c:615 -+#: ../arp.c:628 -+#, fuzzy, c-format - msgid "" --" arp [-vnD] [<HW>] [-i <if>] -f [<filename>] <-Add entry from " -+" arp [-vnD] [<HW>] [-i <if>] -f [<filename>] <-Add entry from " - "file\n" - msgstr "" - " arp [-vnD] [<HW>] [-i <if>] -f [<arquivo>] <-Inclui entrada de " - "arquivo\n" - --#: ../arp.c:616 -+#: ../arp.c:629 -+#, fuzzy, c-format - msgid "" --" arp [-v] [<HW>] [-i <if>] -s <hostname> <hwaddr> [temp][nopub] <-Add " -+" arp [-v] [<HW>] [-i <if>] -s <host> <hwaddr> [temp] <-Add " - "entry\n" --msgstr "" --" arp [-v] [<HW>] [-i <if>] -s <máquina> <end_hw> [temp][nopub] <-Inc. " --"Entrada\n" -- --#: ../arp.c:617 --msgid "" --" arp [-v] [<HW>] [-i <if>] -s <hostname> <hwaddr> [netmask <nm>] pub " --"<-''-\n" --msgstr "" --" arp [-v] [<HW>] [-i <if>] -s <máquina> <end_hw> [netmask <nm>] pub " --"<-''-\n" -+msgstr " arp [-v] [<HW>] [-i <if>] -s <máquina> <end_hw> [temp][nopub] <-Inc. Entrada\n" - --#: ../arp.c:618 -+#: ../arp.c:630 -+#, fuzzy, c-format - msgid "" --" arp [-v] [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub " -+" arp [-v] [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub " - "<-''-\n" - "\n" --msgstr "" --" arp [-v] [<HW>] [-i <if>] -Ds <máquina> <if> [netmask <nm>] pub " --"<-''-\n" -+msgstr " arp [-v] [<HW>] [-i <if>] -Ds <máquina> <if> [netmask <nm>] pub <-''-\n" - --#: ../arp.c:620 -+#: ../arp.c:632 -+#, c-format - msgid "" - " -a display (all) hosts in alternative (BSD) " - "style\n" --msgstr "" --" -a mostra (todas as) máquinas no estilo alternativo " --"(BSD)\n" -+msgstr " -a mostra (todas as) máquinas no estilo alternativo (BSD)\n" - --#: ../arp.c:621 -+#: ../arp.c:633 -+#, c-format - msgid " -s, --set set a new ARP entry\n" - msgstr " -s, --set define uma nova entrada ARP\n" - --#: ../arp.c:622 -+#: ../arp.c:634 -+#, c-format - msgid " -d, --delete delete a specified entry\n" - msgstr " -d, --delete remove a entrada especificada\n" - --#: ../arp.c:623 ../netstat.c:1436 ../route.c:85 -+#: ../arp.c:635 ../netstat.c:1503 ../route.c:86 -+#, c-format - msgid " -v, --verbose be verbose\n" - msgstr " -v, --verbose listagem detalhada\n" - --#: ../arp.c:624 ../netstat.c:1437 ../route.c:86 --msgid " -n, --numeric dont resolve names\n" -+#: ../arp.c:636 ../netstat.c:1504 ../route.c:87 -+#, fuzzy, c-format -+msgid " -n, --numeric don't resolve names\n" - msgstr " -n, --numeric năo resolve nomes\n" - --#: ../arp.c:625 -+#: ../arp.c:637 -+#, c-format - msgid "" - " -i, --device specify network interface (e.g. eth0)\n" - msgstr "" - " -i, --device especifica a interface de rede (ex: eth0)\n" - --#: ../arp.c:626 -+#: ../arp.c:638 -+#, c-format - msgid " -D, --use-device read <hwaddr> from given device\n" - msgstr " -D, --use-device leia <hwaddr> de um dispositivo\n" - --#: ../arp.c:627 -+#: ../arp.c:639 -+#, c-format - msgid " -A, -p, --protocol specify protocol family\n" - msgstr " -A, -p, --protocol especifica a família de protocolos\n" - --#: ../arp.c:628 -+#: ../arp.c:640 -+#, c-format - msgid "" --" -f, --file read new entries from file or from " --"/etc/ethers\n" -+" -f, --file read new entries from file or from /etc/" -+"ethers\n" - "\n" - msgstr "" --" -f, --file leia novas entradas de arquivo ou de " --"/etc/ethers\n" -+" -f, --file leia novas entradas de arquivo ou de /etc/" -+"ethers\n" - "\n" - --#: ../arp.c:630 ../rarp.c:181 -+#: ../arp.c:642 ../rarp.c:182 - #, c-format - msgid " <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n" --msgstr "" --" <HW>=Use '-H <hw>' para especificar o tipo de endereço de hw. Default: %s\n" -+msgstr " <HW>=Use '-H <hw>' para especificar o tipo de endereço de hw. Default: %s\n" - --#: ../arp.c:631 ../rarp.c:182 -+#: ../arp.c:643 ../rarp.c:183 -+#, c-format - msgid " List of possible hardware types (which support ARP):\n" - msgstr " Lista dos tipos de hardware possíveis (que suportam ARP):\n" - --#: ../arp.c:664 -+#: ../arp.c:677 ../arp.c:762 - #, c-format - msgid "%s: hardware type not supported!\n" - msgstr "%s: tipo de hardware năo suportado!\n" - --#: ../arp.c:668 -+#: ../arp.c:681 - #, c-format - msgid "%s: address family not supported!\n" - msgstr "%s: família de endereços năo suportada!\n" - --#: ../arp.c:703 -+#: ../arp.c:716 -+#, c-format - msgid "arp: -N not yet supported.\n" - msgstr "arp: -N ainda năo suportada.\n" - --#: ../arp.c:713 -+#: ../arp.c:726 - #, c-format - msgid "arp: %s: unknown address family.\n" - msgstr "arp: %s: família de endereços desconhecida.\n" - --#: ../arp.c:722 -+#: ../arp.c:735 - #, c-format - msgid "arp: %s: unknown hardware type.\n" - msgstr "arp: %s: tipo de hardware desconhecido.\n" - --#: ../arp.c:741 -+#: ../arp.c:754 - #, c-format - msgid "arp: %s: kernel only supports 'inet'.\n" - msgstr "arp: %s: kernel somente suporta ínet'.\n" - --#: ../arp.c:746 -+#: ../arp.c:767 - #, c-format - msgid "arp: %s: hardware type without ARP support.\n" - msgstr "arp: %s: tipo de hardware sem suporte a ARP.\n" - --#: ../hostname.c:69 -+#: ../hostname.c:71 - #, c-format - msgid "Setting nodename to `%s'\n" - msgstr "Configurando nome do nó como `%s'\n" - --#: ../hostname.c:74 -+#: ../hostname.c:76 - #, c-format - msgid "%s: you must be root to change the node name\n" - msgstr "%s: vocę deve ser root para mudar o nome do nó\n" - --#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116 -+#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117 - #, c-format - msgid "%s: name too long\n" - msgstr "%s: nome muito longo\n" - --#: ../hostname.c:89 -+#: ../hostname.c:91 - #, c-format - msgid "Setting hostname to `%s'\n" - msgstr "Configurando nome da máquina para `%s'\n" - --#: ../hostname.c:94 -+#: ../hostname.c:96 - #, c-format - msgid "%s: you must be root to change the host name\n" - msgstr "%s: vocę deve ser root para mudar o nome da máquina\n" - --#: ../hostname.c:108 -+#: ../hostname.c:109 - #, c-format - msgid "Setting domainname to `%s'\n" - msgstr "Configurando nome do domínio para `%s'\n" - --#: ../hostname.c:113 -+#: ../hostname.c:114 - #, c-format - msgid "%s: you must be root to change the domain name\n" - msgstr "%s: vocę deve ser root para mudar o nome do domínio\n" -@@ -303,37 +315,38 @@ - msgid "Result: h_addr_list=`%s'\n" - msgstr "Resultado: h_addr_list=`%s'\n" - --#: ../hostname.c:209 -+#: ../hostname.c:208 - #, c-format - msgid "%s: can't open `%s'\n" - msgstr "%s: năo foi possível abrir `%s'\n" - --#: ../hostname.c:223 -+#: ../hostname.c:222 -+#, c-format - msgid "Usage: hostname [-v] {hostname|-F file} set hostname (from file)\n" --msgstr "" --"Uso: hostname [-v] {máquina|-F arquivo} configura nome da máquina (de " --"arquivo)\n" -+msgstr "Uso: hostname [-v] {máquina|-F arquivo} configura nome da máquina (de arquivo)\n" - --#: ../hostname.c:224 -+#: ../hostname.c:223 -+#, c-format - msgid "" - " domainname [-v] {nisdomain|-F file} set NIS domainname (from file)\n" - msgstr "" - " domainname [-v] {domínio_nis|-F file} configura nome do domínio NIS\n" - " (a partir de arquivo)\n" - --#: ../hostname.c:226 -+#: ../hostname.c:225 -+#, c-format - msgid "" - " nodename [-v] {nodename|-F file} set DECnet node name (from " - "file)\n" --msgstr "" --"Uso: hostname [-v] {máquina|-F arquivo} configura o nome do nó DECnet (de " --"arquivo)\n" -+msgstr "Uso: hostname [-v] {máquina|-F arquivo} configura o nome do nó DECnet (de arquivo)\n" - --#: ../hostname.c:228 -+#: ../hostname.c:227 -+#, c-format - msgid " hostname [-v] [-d|-f|-s|-a|-i|-y|-n] display formatted name\n" - msgstr " hostname [-v] [-d|-f|-s|-a|-i|-y|-n] mostra nome formatado\n" - --#: ../hostname.c:229 -+#: ../hostname.c:228 -+#, c-format - msgid "" - " hostname [-v] display hostname\n" - "\n" -@@ -341,7 +354,8 @@ - " hostname [-v] mostra nome da máquina\n" - "\n" - --#: ../hostname.c:230 -+#: ../hostname.c:229 -+#, c-format - msgid "" - " hostname -V|--version|-h|--help print info and exit\n" - "\n" -@@ -349,7 +363,8 @@ - " hostname -V|--version|-h|--help mostra informaçőes e termina\n" - "\n" - --#: ../hostname.c:231 -+#: ../hostname.c:230 -+#, c-format - msgid "" - " dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" - "\n" -@@ -357,35 +372,43 @@ - " dnsdomainname=máquina -d, {yp,nis,}domainname=hostname -y\n" - "\n" - --#: ../hostname.c:232 -+#: ../hostname.c:231 -+#, c-format - msgid " -s, --short short host name\n" - msgstr " -s, --short nome curto da máquina\n" - --#: ../hostname.c:233 -+#: ../hostname.c:232 -+#, c-format - msgid " -a, --alias alias names\n" - msgstr " -a, --alias aliases para a máquina\n" - --#: ../hostname.c:234 -+#: ../hostname.c:233 -+#, c-format - msgid " -i, --ip-address addresses for the hostname\n" - msgstr " -i, --ip-address endereços da máquina\n" - --#: ../hostname.c:235 -+#: ../hostname.c:234 -+#, c-format - msgid " -f, --fqdn, --long long host name (FQDN)\n" - msgstr " -f, --fqdn, --long nome longo da máquina (FQDN)\n" - --#: ../hostname.c:236 -+#: ../hostname.c:235 -+#, c-format - msgid " -d, --domain DNS domain name\n" - msgstr " -d, --domain nome do domínio DNS\n" - --#: ../hostname.c:237 -+#: ../hostname.c:236 -+#, c-format - msgid " -y, --yp, --nis NIS/YP domainname\n" - msgstr " -y, --yp, --nis nome do domínio NIS/YP\n" - --#: ../hostname.c:239 -+#: ../hostname.c:238 -+#, c-format - msgid " -n, --node DECnet node name\n" - msgstr " -n, --node nome do nó DECnet\n" - --#: ../hostname.c:241 -+#: ../hostname.c:240 -+#, c-format - msgid "" - " -F, --file read hostname or NIS domainname from given file\n" - "\n" -@@ -393,7 +416,8 @@ - " -F, --file leia o nome da máquina ou domínio NIS do arquivo\n" - "\n" - --#: ../hostname.c:243 -+#: ../hostname.c:242 -+#, c-format - msgid "" - " This command can read or set the hostname or the NIS domainname. You can\n" - " also read the DNS domain or the FQDN (fully qualified domain name).\n" -@@ -413,15 +437,16 @@ - msgstr "%s: Vocę năo pode mudar o nome do domínio DNS com este comando\n" - - #: ../hostname.c:339 -+#, c-format - msgid "" - "\n" - "Unless you are using bind or NIS for host lookups you can change the DNS\n" - msgstr "" - "\n" --"A menos que esteja usando bind ou NIS para resoluçăo de nomes vocę pode " --"mudar\n" -+"A menos que esteja usando bind ou NIS para resoluçăo de nomes vocę pode mudar\n" - - #: ../hostname.c:340 -+#, c-format - msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n" - msgstr "o nome do domínio DNS (que é parte do FQDN) no arquivo /etc/hosts.\n" - -@@ -440,552 +465,453 @@ - msgid "getnodename()=`%s'\n" - msgstr "getnodename()=`%s'\n" - --#: ../ifconfig.c:159 --#, c-format --msgid "%-9.9s Link encap:%s " --msgstr "%-9.9s Encapsulamento do Link: %s " -+#: ../ifconfig.c:107 -+#, fuzzy, c-format -+msgid "" -+"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " -+"Flg\n" -+msgstr "Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OV Opçőes\n" - --#: ../ifconfig.c:164 --#, c-format --msgid "HWaddr %s " --msgstr "Endereço de HW %s " -+#: ../ifconfig.c:129 ../ifconfig.c:161 -+#, fuzzy, c-format -+msgid "%s: ERROR while getting interface flags: %s\n" -+msgstr "" -+"%s: erro obtendo informaçőes da interface: %s\n" -+"\n" - --#: ../ifconfig.c:167 -+#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862 -+#: ../ifconfig.c:973 - #, c-format --msgid "Media:%s" --msgstr "Mídia:%s" -+msgid "No support for INET on this system.\n" -+msgstr "Este sistema năo tem suporte a INET.\n" - --#: ../ifconfig.c:169 --msgid "(auto)" --msgstr "(auto)" -+#: ../ifconfig.c:193 -+#, fuzzy, c-format -+msgid "%s: ERROR while testing interface flags: %s\n" -+msgstr "" -+"%s: erro obtendo informaçőes da interface: %s\n" -+"\n" - --#: ../ifconfig.c:176 --#, c-format --msgid " %s addr:%s " --msgstr " %s end.: %s " -+#: ../ifconfig.c:202 -+#, fuzzy, c-format -+msgid "" -+"Usage:\n" -+" ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n" -+msgstr "" -+"Uso:\n" -+" ifconfig [-a] [-i] [-v] <interface> [[<AF>] <endereço>]\n" - --#: ../ifconfig.c:179 -+#: ../ifconfig.c:204 - #, c-format --msgid " P-t-P:%s " --msgstr " P-a-P:%s " -+msgid " [add <address>[/<prefixlen>]]\n" -+msgstr " [add <endereço>[/<tam_prefixo>]]\n" - --#: ../ifconfig.c:182 -+#: ../ifconfig.c:205 - #, c-format --msgid " Bcast:%s " --msgstr " Bcast:%s " -+msgid " [del <address>[/<prefixlen>]]\n" -+msgstr " [del <endereço>[/<tam_prefixo>]]\n" - --#: ../ifconfig.c:184 -+#: ../ifconfig.c:206 - #, c-format --msgid " Mask:%s\n" --msgstr " Masc:%s\n" -+msgid " [[-]broadcast [<address>]] [[-]pointopoint [<address>]]\n" -+msgstr " [[-]broadcast [<endereço>]] [[-]pointopoint [<endereço>]]\n" - --#: ../ifconfig.c:201 -+#: ../ifconfig.c:207 - #, c-format --msgid " inet6 addr: %s/%d" --msgstr " endereço inet6: %s/%d" -- --#: ../ifconfig.c:203 --msgid " Scope:" --msgstr " Escopo:" -- --#: ../ifconfig.c:206 --msgid "Global" --msgstr "Global" -+msgid " [netmask <address>] [dstaddr <address>] [tunnel <address>]\n" -+msgstr " [netmask <endereço>] [dstaddr <endereço>] [tunnel <endereço>]\n" - --#: ../ifconfig.c:209 --msgid "Link" --msgstr "Link" -+#: ../ifconfig.c:210 -+#, c-format -+msgid " [outfill <NN>] [keepalive <NN>]\n" -+msgstr " [outfill <NN>] [keepalive <NN>]\n" - - #: ../ifconfig.c:212 --msgid "Site" --msgstr "Site" -- --#: ../ifconfig.c:215 --msgid "Compat" --msgstr "Compat" -- --#: ../ifconfig.c:218 --msgid "Host" --msgstr "Máquina" -- --#: ../ifconfig.c:221 --msgid "Unknown" --msgstr "Desconhecido" -- --#: ../ifconfig.c:236 - #, c-format --msgid " IPX/Ethernet II addr:%s\n" --msgstr " Endereço IPX/Ethernet II:%s\n" -+msgid " [hw <HW> <address>] [metric <NN>] [mtu <NN>]\n" -+msgstr " [hw <HW> <endereço>] [metric <NN>] [mtu <NN>]\n" - --#: ../ifconfig.c:239 -+#: ../ifconfig.c:213 - #, c-format --msgid " IPX/Ethernet SNAP addr:%s\n" --msgstr " Endereço IPX/Ethernet SNAP:%s\n" -+msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" -+msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" - --#: ../ifconfig.c:242 -+#: ../ifconfig.c:214 - #, c-format --msgid " IPX/Ethernet 802.2 addr:%s\n" --msgstr " Endereço IPX/Ethernet 802.2:%s\n" -+msgid " [multicast] [[-]promisc]\n" -+msgstr " [multicast] [[-]promisc]\n" - --#: ../ifconfig.c:245 -+#: ../ifconfig.c:215 - #, c-format --msgid " IPX/Ethernet 802.3 addr:%s\n" --msgstr " Endereço IPX/Ethernet 802.3:%s\n" -+msgid " [mem_start <NN>] [io_addr <NN>] [irq <NN>] [media <type>]\n" -+msgstr " [mem_start <NN>] [io_addr <NN>] [irq <NN>] [media <tipo>]\n" - --#: ../ifconfig.c:255 -+#: ../ifconfig.c:217 - #, c-format --msgid " EtherTalk Phase 2 addr:%s\n" --msgstr " Endereço EtherTalk fase 2:%s\n" -+msgid " [txqueuelen <NN>]\n" -+msgstr " [txqueuelen <NN>]\n" - --#: ../ifconfig.c:264 -+#: ../ifconfig.c:220 - #, c-format --msgid " econet addr:%s\n" --msgstr " Endereço econet:%s\n" -- --#: ../ifconfig.c:270 --msgid "[NO FLAGS] " --msgstr "[NENHUMA FLAG] " -- --#: ../ifconfig.c:272 --msgid "UP " --msgstr "UP " -- --#: ../ifconfig.c:274 --msgid "BROADCAST " --msgstr "BROADCAST" -- --#: ../ifconfig.c:276 --msgid "DEBUG " --msgstr "DEBUG " -- --#: ../ifconfig.c:278 --msgid "LOOPBACK " --msgstr "LOOPBACK" -- --#: ../ifconfig.c:280 --msgid "POINTOPOINT " --msgstr "POINTOPOINT " -- --#: ../ifconfig.c:282 --msgid "NOTRAILERS " --msgstr "NOTRAILERS " -- --#: ../ifconfig.c:284 --msgid "RUNNING " --msgstr "RUNNING " -+msgid " [[-]dynamic]\n" -+msgstr " [[-]dynamic]\n" - --#: ../ifconfig.c:286 --msgid "NOARP " --msgstr "NOARP " -+#: ../ifconfig.c:222 -+#, c-format -+msgid "" -+" [up|down] ...\n" -+"\n" -+msgstr "" -+" [up|down] ...\n" -+"\n" - --#: ../ifconfig.c:288 --msgid "PROMISC " --msgstr "PROMISC " -+#: ../ifconfig.c:224 -+#, c-format -+msgid " <HW>=Hardware Type.\n" -+msgstr " <HW>=Tipo de Hardware.\n" - --#: ../ifconfig.c:290 --msgid "ALLMULTI " --msgstr "ALLMULTI " -+#: ../ifconfig.c:225 -+#, c-format -+msgid " List of possible hardware types:\n" -+msgstr " Lista dos tipos possíveis de hardware:\n" - --#: ../ifconfig.c:292 --msgid "SLAVE " --msgstr "SLAVE " -+#. 1 = ARPable -+#: ../ifconfig.c:227 -+#, c-format -+msgid " <AF>=Address family. Default: %s\n" -+msgstr " <AF>=Família de endereços. Default: %s\n" - --#: ../ifconfig.c:294 --msgid "MASTER " --msgstr "MASTER " -+#: ../ifconfig.c:228 -+#, c-format -+msgid " List of possible address families:\n" -+msgstr " Lista de famílias de endereços possíveis:\n" - --#: ../ifconfig.c:296 --msgid "MULTICAST " --msgstr "MULTICAST " -+#: ../ifconfig.c:303 -+#, c-format -+msgid "ifconfig: option `%s' not recognised.\n" -+msgstr "" - --#: ../ifconfig.c:299 --msgid "DYNAMIC " --msgstr "DYNAMIC " -+#: ../ifconfig.c:305 ../ifconfig.c:962 -+#, c-format -+msgid "ifconfig: `--help' gives usage information.\n" -+msgstr "" - --#: ../ifconfig.c:302 -+#: ../ifconfig.c:380 - #, c-format --msgid " MTU:%d Metric:%d" --msgstr " MTU:%d Métrica:%d" -+msgid "Unknown media type.\n" -+msgstr "Tipo desconhecido de mídia.\n" - --#: ../ifconfig.c:306 -+#: ../ifconfig.c:417 - #, c-format --msgid " Outfill:%d Keepalive:%d" --msgstr " Outfill:%d Keepalive:%d" -+msgid "" -+"Warning: Interface %s still in promisc mode... maybe other application is " -+"running?\n" -+msgstr "" - --#: ../ifconfig.c:320 -+#: ../ifconfig.c:429 - #, c-format --msgid "RX packets:%lu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" --msgstr "Pacotes RX:%lu erros:%lu descartados:%lu sobreposiçőes:%lu frame:%lu\n" -+msgid "Warning: Interface %s still in MULTICAST mode.\n" -+msgstr "" - --#: ../ifconfig.c:325 -+#: ../ifconfig.c:441 - #, c-format --msgid " compressed:%lu\n" --msgstr " compactados:%lu\n" -+msgid "Warning: Interface %s still in ALLMULTI mode.\n" -+msgstr "" - --#: ../ifconfig.c:329 -+#: ../ifconfig.c:465 - #, c-format --msgid "TX packets:%lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" -+msgid "Warning: Interface %s still in DYNAMIC mode.\n" - msgstr "" --"Pacotes TX:%lu erros:%lu descartados:%lu sobreposiçőes:%lu portadora:%lu\n" - --#: ../ifconfig.c:333 -+#: ../ifconfig.c:523 - #, c-format --msgid " collisions:%lu " --msgstr " colisőes:%lu " -+msgid "Warning: Interface %s still in BROADCAST mode.\n" -+msgstr "" - --#: ../ifconfig.c:335 -+#: ../ifconfig.c:652 - #, c-format --msgid "compressed:%lu " --msgstr "compactados:%lu " -+msgid "Warning: Interface %s still in POINTOPOINT mode.\n" -+msgstr "" - --#: ../ifconfig.c:337 -+#: ../ifconfig.c:684 - #, c-format --msgid "txqueuelen:%d " --msgstr "txqueuelen:%d " -- --#: ../ifconfig.c:345 --#, c-format --msgid "Interrupt:%d " --msgstr "IRQ:%d " -- --#. Only print devices using it for --#. I/O maps --#: ../ifconfig.c:348 --#, c-format --msgid "Base address:0x%x " --msgstr "Endereço de E/S:0x%x " -+msgid "hw address type `%s' has no handler to set address. failed.\n" -+msgstr "" - --#: ../ifconfig.c:350 -+#: ../ifconfig.c:693 - #, c-format --msgid "Memory:%lx-%lx " --msgstr "Memória:%lx-%lx " -+msgid "%s: invalid %s address.\n" -+msgstr "%s: endereço %s inválido.\n" - --#: ../ifconfig.c:353 -+#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913 - #, c-format --msgid "DMA chan:%x " --msgstr "Canal DMA:%x " -+msgid "No support for INET6 on this system.\n" -+msgstr "Este sistema năo tem suporte a INET6.\n" - --#: ../ifconfig.c:384 ../ifconfig.c:405 -+#: ../ifconfig.c:780 ../ifconfig.c:871 - #, c-format --msgid "%s: unknown interface: %s\n" --msgstr "%s: interface desconhecida: %s\n" -- --#: ../ifconfig.c:421 --msgid "" --"Usage:\n" --" ifconfig [-a] [-i] [-v] <interface> [[<AF>] <address>]\n" --msgstr "" --"Uso:\n" --" ifconfig [-a] [-i] [-v] <interface> [[<AF>] <endereço>]\n" -- --#: ../ifconfig.c:425 --msgid " [add <address>[/<prefixlen>]]\n" --msgstr " [add <endereço>[/<tam_prefixo>]]\n" -- --#: ../ifconfig.c:427 --msgid " [del <address>[/<prefixlen>]]\n" --msgstr " [del <endereço>[/<tam_prefixo>]]\n" -- --#: ../ifconfig.c:432 --msgid " [[-]broadcast [<address>]] [[-]pointopoint [<address>]]\n" --msgstr " [[-]broadcast [<endereço>]] [[-]pointopoint [<endereço>]]\n" -- --#: ../ifconfig.c:433 --msgid " [netmask <address>] [dstaddr <address>] [tunnel <address>]\n" --msgstr " [netmask <endereço>] [dstaddr <endereço>] [tunnel <endereço>]\n" -- --#: ../ifconfig.c:436 --msgid " [outfill <NN>] [keepalive <NN>]\n" --msgstr " [outfill <NN>] [keepalive <NN>]\n" -- --#: ../ifconfig.c:438 --msgid " [hw <HW> <address>] [metric <NN>] [mtu <NN>]\n" --msgstr " [hw <HW> <endereço>] [metric <NN>] [mtu <NN>]\n" -- --#: ../ifconfig.c:439 --msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" --msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" -- --#: ../ifconfig.c:440 --msgid " [multicast] [[-]promisc]\n" --msgstr " [multicast] [[-]promisc]\n" -- --#: ../ifconfig.c:441 --msgid " [mem_start <NN>] [io_addr <NN>] [irq <NN>] [media <type>]\n" --msgstr " [mem_start <NN>] [io_addr <NN>] [irq <NN>] [media <tipo>]\n" -- --#: ../ifconfig.c:443 --msgid " [txqueuelen <NN>]\n" --msgstr " [txqueuelen <NN>]\n" -- --#: ../ifconfig.c:446 --msgid " [[-]dynamic]\n" --msgstr " [[-]dynamic]\n" -- --#: ../ifconfig.c:448 --msgid "" --" [up|down] ...\n" --"\n" -+msgid "Interface %s not initialized\n" - msgstr "" --" [up|down] ...\n" --"\n" -- --#: ../ifconfig.c:450 --msgid " <HW>=Hardware Type.\n" --msgstr " <HW>=Tipo de Hardware.\n" -- --#: ../ifconfig.c:451 --msgid " List of possible hardware types:\n" --msgstr " Lista dos tipos possíveis de hardware:\n" -- --#. 1 = ARPable --#: ../ifconfig.c:453 --#, c-format --msgid " <AF>=Address family. Default: %s\n" --msgstr " <AF>=Família de endereços. Default: %s\n" -- --#: ../ifconfig.c:454 --msgid " List of possible address families:\n" --msgstr " Lista de famílias de endereços possíveis:\n" -- --#: ../ifconfig.c:593 --msgid "Unknown media type.\n" --msgstr "Tipo desconhecido de mídia.\n" - --#: ../ifconfig.c:881 --#, c-format --msgid "%s: invalid %s address.\n" -+#: ../ifconfig.c:792 ../ifconfig.c:882 -+#, fuzzy, c-format -+msgid "Bad address.\n" - msgstr "%s: endereço %s inválido.\n" - --#: ../ifconfig.c:920 ../ifconfig.c:963 ../ifconfig.c:1011 --msgid "No support for INET6 on this system.\n" --msgstr "Este sistema năo tem suporte a INET6.\n" -- --#: ../ifconfig.c:983 -+#: ../ifconfig.c:885 -+#, c-format - msgid "Address deletion not supported on this system.\n" - msgstr "Remoçăo de endereço năo suportada neste sistema.\n" - --#: ../ifconfig.c:1066 --msgid "No support for INET on this system.\n" --msgstr "Este sistema năo tem suporte a INET.\n" -+#: ../ifconfig.c:957 -+#, fuzzy, c-format -+msgid "ifconfig: Cannot set address for this protocol family.\n" -+msgstr "Năo sei como configurar endereços para a família %d.\n" - --#: ../ifconfig.c:1076 -+#: ../ifconfig.c:983 -+#, c-format - msgid "No support for ECONET on this system.\n" - msgstr "Este sistema năo tem suporte a ECONET.\n" - --#: ../ifconfig.c:1084 -+#: ../ifconfig.c:991 - #, c-format - msgid "Don't know how to set addresses for family %d.\n" - msgstr "Năo sei como configurar endereços para a família %d.\n" - --#: ../netstat.c:383 -+#: ../ifconfig.c:1021 -+#, c-format -+msgid "WARNING: at least one error occured. (%d)\n" -+msgstr "" -+ -+#: ../netstat.c:434 - #, c-format - msgid "" - "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n" --msgstr "" --"(Năo foi possível ler informaçőes para \"-p\": geteuid()=%d mas vocę deve " --"ser root.)\n" -+msgstr "(Năo foi possível ler informaçőes para \"-p\": geteuid()=%d mas vocę deve ser root.)\n" - --#: ../netstat.c:387 -+#: ../netstat.c:438 -+#, c-format - msgid "" - "(Not all processes could be identified, non-owned process info\n" - " will not be shown, you would have to be root to see it all.)\n" - msgstr "" --"(Nem todos os processos puderam ser identificados, informaçőes sobre " --"processos\n" -+"(Nem todos os processos puderam ser identificados, informaçőes sobre processos\n" - " de outrem năo serăo mostrados, vocę deve ser root para vę-los todos.)\n" - --#: ../netstat.c:394 ../netstat.c:1089 ../netstat.c:1166 -+#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266 - msgid "LISTENING" - msgstr "OUVINDO" - --#: ../netstat.c:395 -+#: ../netstat.c:446 - msgid "CONN SENT" - msgstr "CONN ENVIADO" - --#: ../netstat.c:396 ../netstat.c:1168 -+#: ../netstat.c:447 ../netstat.c:1268 - msgid "DISC SENT" - msgstr "DISC ENVIADO" - --#: ../netstat.c:397 ../netstat.c:464 ../netstat.c:809 ../netstat.c:1169 -+#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269 - msgid "ESTABLISHED" - msgstr "ESTABELECIDA" - --#: ../netstat.c:419 -+#: ../netstat.c:470 -+#, c-format - msgid "Active NET/ROM sockets\n" - msgstr "Ative sockets NET/ROM\n" - --#: ../netstat.c:420 -+#: ../netstat.c:471 -+#, c-format - msgid "" --"User Dest Source Device State Vr/Vs Send-Q " --"Recv-Q\n" --msgstr "" --"Usuário Destino Origem Dispositivo Estado Vr/Vs Send-Q Recv-Q\n" -+"User Dest Source Device State Vr/Vs Send-Q Recv-" -+"Q\n" -+msgstr "Usuário Destino Origem Dispositivo Estado Vr/Vs Send-Q Recv-Q\n" - --#: ../netstat.c:430 ../netstat.c:1208 -+#: ../netstat.c:481 ../netstat.c:1308 - #, c-format - msgid "Problem reading data from %s\n" - msgstr "Problemas lendo dados de %s\n" - --#: ../netstat.c:465 -+#: ../netstat.c:516 - msgid "SYN_SENT" - msgstr "SYN_ENVIADO" - --#: ../netstat.c:466 -+#: ../netstat.c:517 - msgid "SYN_RECV" - msgstr "SYN_RECEBIDO" - --#: ../netstat.c:467 -+#: ../netstat.c:518 - msgid "FIN_WAIT1" - msgstr "ESPERA_FIN1" - --#: ../netstat.c:468 -+#: ../netstat.c:519 - msgid "FIN_WAIT2" - msgstr "ESPERA_FIN2" - --#: ../netstat.c:469 -+#: ../netstat.c:520 - msgid "TIME_WAIT" - msgstr "TIME_WAIT" - --#: ../netstat.c:470 -+#: ../netstat.c:521 - msgid "CLOSE" - msgstr "FECHAR" - --#: ../netstat.c:471 -+#: ../netstat.c:522 - msgid "CLOSE_WAIT" - msgstr "ESPERANDO_FECHAR" - --#: ../netstat.c:472 -+#: ../netstat.c:523 - msgid "LAST_ACK" - msgstr "ÚLTIMO_ACK" - --#: ../netstat.c:473 -+#: ../netstat.c:524 - msgid "LISTEN" - msgstr "OUÇA" - --#: ../netstat.c:474 -+#: ../netstat.c:525 - msgid "CLOSING" - msgstr "FECHANDO" - --#: ../netstat.c:544 -+#: ../netstat.c:596 - #, c-format - msgid "warning, got bogus igmp6 line %d.\n" - msgstr "atençăo, recebi linha igmp6 inválida %d.\n" - --#: ../netstat.c:549 ../netstat.c:587 ../netstat.c:670 ../netstat.c:803 --#: ../netstat.c:935 ../netstat.c:940 -+#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898 -+#: ../netstat.c:1032 ../netstat.c:1037 - #, c-format - msgid "netstat: unsupported address family %d !\n" - msgstr "netstat: família de protocolos %d năo suportada!\n" - --#: ../netstat.c:562 ../netstat.c:567 ../netstat.c:575 ../netstat.c:582 -+#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634 - #, c-format - msgid "warning, got bogus igmp line %d.\n" - msgstr "atençăo, recebi linha igmp inválida %d.\n" - --#: ../netstat.c:666 -+#: ../netstat.c:677 -+#, fuzzy, c-format -+msgid "Active X.25 sockets\n" -+msgstr "Ativar sockets AX.25\n" -+ -+#. IMHO, Vr/Vs is not very usefull --SF -+#: ../netstat.c:679 -+#, fuzzy, c-format -+msgid "" -+"Dest Source Device LCI State Vr/Vs Send-Q Recv-" -+"Q\n" -+msgstr "Destino Origem Dispositivo Estado Vr/Vs Send-Q Recv-Q\n" -+ -+#: ../netstat.c:759 -+#, c-format - msgid "warning, got bogus tcp line.\n" - msgstr "atençăo, recebi linha tcp inválida.\n" - --#: ../netstat.c:704 ../netstat.c:855 ../netstat.c:975 -+#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075 - #, c-format - msgid "off (0.00/%ld/%d)" - msgstr "desligado (0.00/%ld/%ld)" - --#: ../netstat.c:708 -+#: ../netstat.c:804 - #, c-format - msgid "on (%2.2f/%ld/%d)" - msgstr "em (%2.2f/%ld/%d)" - --#: ../netstat.c:713 -+#: ../netstat.c:809 - #, c-format - msgid "keepalive (%2.2f/%ld/%d)" - msgstr "keepalive (%2.2f/%ld/%d)" - --#: ../netstat.c:718 -+#: ../netstat.c:814 - #, c-format - msgid "timewait (%2.2f/%ld/%d)" - msgstr "timewait (%2.2f/%ld/%d)" - --#: ../netstat.c:723 ../netstat.c:864 ../netstat.c:985 -+#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085 - #, c-format - msgid "unkn-%d (%2.2f/%ld/%d)" - msgstr "desconh.-%d (%2.2f/%ld)" - --#: ../netstat.c:799 -+#: ../netstat.c:894 -+#, c-format - msgid "warning, got bogus udp line.\n" - msgstr "atençăo, recebi linha udp inválida.\n" - --#: ../netstat.c:817 ../netstat.c:1075 ../netstat.c:1108 -+#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208 - msgid "UNKNOWN" - msgstr "DESCONHECIDA" - --#: ../netstat.c:860 ../netstat.c:980 -+#: ../netstat.c:958 ../netstat.c:1080 - #, c-format - msgid "on%d (%2.2f/%ld/%d)" - msgstr "ligado %d (%2.2f/%ld)" - --#: ../netstat.c:949 -+#: ../netstat.c:1046 -+#, c-format - msgid "warning, got bogus raw line.\n" - msgstr "atençăo, recebi linha raw inválida.\n" - --#: ../netstat.c:1028 -+#: ../netstat.c:1128 -+#, c-format - msgid "warning, got bogus unix line.\n" - msgstr "atençăo, recebi linha unix inválida.\n" - --#: ../netstat.c:1055 -+#: ../netstat.c:1155 - msgid "STREAM" - msgstr "STREAM" - --#: ../netstat.c:1059 -+#: ../netstat.c:1159 - msgid "DGRAM" - msgstr "DGRAM" - --#: ../netstat.c:1063 -+#: ../netstat.c:1163 - msgid "RAW" - msgstr "RAW" - --#: ../netstat.c:1067 -+#: ../netstat.c:1167 - msgid "RDM" - msgstr "RDM" - --#: ../netstat.c:1071 -+#: ../netstat.c:1171 - msgid "SEQPACKET" - msgstr "SEQPACKET" - --#: ../netstat.c:1080 -+#: ../netstat.c:1180 - msgid "FREE" - msgstr "LIVRE" - --#: ../netstat.c:1096 -+#: ../netstat.c:1196 - msgid "CONNECTING" - msgstr "CONECTANDO" - --#: ../netstat.c:1100 -+#: ../netstat.c:1200 - msgid "CONNECTED" - msgstr "CONECTADO" - --#: ../netstat.c:1104 -+#: ../netstat.c:1204 - msgid "DISCONNECTING" - msgstr "DESCONECTANDO" - --#: ../netstat.c:1135 -+#: ../netstat.c:1235 -+#, c-format - msgid "Active UNIX domain sockets " - msgstr "Domain sockets UNIX ativos " - --#: ../netstat.c:1137 ../netstat.c:1666 -+#: ../netstat.c:1237 ../netstat.c:1756 -+#, c-format - msgid "(servers and established)" - msgstr "(servidores e estabelecidas)" - --#: ../netstat.c:1140 ../netstat.c:1669 -+#: ../netstat.c:1240 ../netstat.c:1759 -+#, c-format - msgid "(only servers)" - msgstr "(sem os servidores)" - --#: ../netstat.c:1142 ../netstat.c:1671 -+#: ../netstat.c:1242 ../netstat.c:1761 -+#, c-format - msgid "(w/o servers)" - msgstr "(sem os servidores)" - --#: ../netstat.c:1145 -+#: ../netstat.c:1245 -+#, c-format - msgid "" - "\n" - "Proto RefCnt Flags Type State I-Node" -@@ -993,114 +919,118 @@ - "\n" - "Proto CntRef Flags Tipo Estado I-Node Rota" - --#: ../netstat.c:1147 -+#: ../netstat.c:1247 -+#, c-format - msgid " Path\n" - msgstr " Caminho\n" - --#: ../netstat.c:1167 -+#: ../netstat.c:1267 - msgid "SABM SENT" - msgstr "SABM ENVIADO" - --#: ../netstat.c:1170 -+#: ../netstat.c:1270 - msgid "RECOVERY" - msgstr "RECUPERAÇĂO" - --#: ../netstat.c:1184 -+#: ../netstat.c:1284 -+#, c-format - msgid "Active AX.25 sockets\n" - msgstr "Ativar sockets AX.25\n" - --#: ../netstat.c:1185 -+#: ../netstat.c:1285 -+#, c-format - msgid "Dest Source Device State Vr/Vs Send-Q Recv-Q\n" - msgstr "Destino Origem Dispositivo Estado Vr/Vs Send-Q Recv-Q\n" - --#: ../netstat.c:1228 -+#: ../netstat.c:1328 - #, c-format - msgid "problem reading data from %s\n" - msgstr "problemas lendo dados de %s\n" - --#: ../netstat.c:1279 -+#: ../netstat.c:1379 -+#, c-format - msgid "" - "Active IPX sockets\n" - "Proto Recv-Q Send-Q Local Address Foreign Address " - "State" - msgstr "" - "Sockets IPX ativos\n" --"Proto Recv-Q Send-Q Endereço Local Endereço Remoto " --"Estado" -+"Proto Recv-Q Send-Q Endereço Local Endereço Remoto Estado" - --#: ../netstat.c:1281 -+#: ../netstat.c:1381 -+#, c-format - msgid " User" - msgstr " Usuário" - --#: ../netstat.c:1315 -+#: ../netstat.c:1415 - msgid "ESTAB" - msgstr "ESTAB" - --#: ../netstat.c:1323 -+#: ../netstat.c:1423 - msgid "UNK." - msgstr "DESC." - --#: ../netstat.c:1367 --msgid " - no statistics available -" --msgstr " - estatísticas năo disponíveis -" -- --#: ../netstat.c:1370 --msgid "[NO FLAGS]" --msgstr "[SEM FLAGS]" -- --#: ../netstat.c:1400 -+#: ../netstat.c:1461 -+#, c-format - msgid "Kernel Interface table\n" - msgstr "Tabela de Interfaces do Kernel\n" - --#: ../netstat.c:1401 -+#: ../netstat.c:1465 -+#, fuzzy, c-format - msgid "" --"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " -+"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " - "Flg\n" --msgstr "" --"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OV " --"Opçőes\n" -+msgstr "Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OV Opçőes\n" - --#: ../netstat.c:1404 -+#: ../netstat.c:1469 - msgid "missing interface information" - msgstr "falta informaçăo da interface" - --#: ../netstat.c:1425 -+#: ../netstat.c:1492 -+#, c-format - msgid "" --"usage: netstat [-veenNcCF] [<Af>] -r netstat " --"{-V|--version|-h|--help}\n" -+"usage: netstat [-veenNcCF] [<Af>] -r netstat {-V|--version|-h|--" -+"help}\n" - msgstr "" - "uso: netstat [-veenNcCF] [<Af>] -r netstat {-V|--version|-h|--help}\n" - --#: ../netstat.c:1426 -+#: ../netstat.c:1493 -+#, c-format - msgid " netstat [-vnNcaeol] [<Socket> ...]\n" - msgstr " netstat [-vnNcaeo] [<Socket>]\n" - --#: ../netstat.c:1427 -+#: ../netstat.c:1494 -+#, c-format - msgid "" - " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" - "\n" - msgstr " netstat [-vnNcaeo] [<Socket>]\n" - --#: ../netstat.c:1429 -+#: ../netstat.c:1496 -+#, c-format - msgid " -r, --route display routing table\n" - msgstr " -r, --route mostra tabela de roteamento\n" - --#: ../netstat.c:1430 -+#: ../netstat.c:1497 -+#, c-format - msgid " -i, --interfaces display interface table\n" - msgstr " -i, --interfaces mostra tabela de interfaces\n" - --#: ../netstat.c:1431 -+#: ../netstat.c:1498 -+#, c-format - msgid " -g, --groups display multicast group memberships\n" - msgstr "" - " -o, --timers mostra temporizadores\n" - "\n" - --#: ../netstat.c:1432 -+#: ../netstat.c:1499 -+#, c-format - msgid "" - " -s, --statistics display networking statistics (like SNMP)\n" - msgstr " -i, --interfaces mostra tabela de interfaces\n" - --#: ../netstat.c:1434 -+#: ../netstat.c:1501 -+#, c-format - msgid "" - " -M, --masquerade display masqueraded connections\n" - "\n" -@@ -1108,19 +1038,38 @@ - " -M, --masquerade mostra conexőes mascaradas\n" - "\n" - --#: ../netstat.c:1438 ../route.c:87 -+#: ../netstat.c:1505 -+#, fuzzy, c-format -+msgid " --numeric-hosts don't resolve host names\n" -+msgstr " -n, --numeric năo resolve nomes\n" -+ -+#: ../netstat.c:1506 -+#, fuzzy, c-format -+msgid " --numeric-ports don't resolve port names\n" -+msgstr " -n, --numeric năo resolve nomes\n" -+ -+#: ../netstat.c:1507 -+#, fuzzy, c-format -+msgid " --numeric-users don't resolve user names\n" -+msgstr " -n, --numeric năo resolve nomes\n" -+ -+#: ../netstat.c:1508 -+#, c-format - msgid " -N, --symbolic resolve hardware names\n" - msgstr " -n, --numeric năo resolve nomes\n" - --#: ../netstat.c:1439 ../route.c:88 -+#: ../netstat.c:1509 ../route.c:88 -+#, c-format - msgid " -e, --extend display other/more information\n" - msgstr " -e, --extend mostra outras/mais informaçőes\n" - --#: ../netstat.c:1440 -+#: ../netstat.c:1510 -+#, c-format - msgid " -p, --programs display PID/Program name for sockets\n" - msgstr " -r, --route mostra tabela de roteamento\n" - --#: ../netstat.c:1441 -+#: ../netstat.c:1511 -+#, c-format - msgid "" - " -c, --continuous continuous listing\n" - "\n" -@@ -1128,30 +1077,33 @@ - " -c, --continuous listagem contínua\n" - "\n" - --#: ../netstat.c:1442 -+#: ../netstat.c:1512 -+#, c-format - msgid " -l, --listening display listening server sockets\n" - msgstr " -L, --netlink mostra mensagens netlink do kernel\n" - --#: ../netstat.c:1443 -+#: ../netstat.c:1513 -+#, c-format - msgid "" - " -a, --all, --listening display all sockets (default: connected)\n" - msgstr " -a, --all, --listening mostra tudo\n" - --#: ../netstat.c:1444 -+#: ../netstat.c:1514 -+#, c-format - msgid " -o, --timers display timers\n" - msgstr "" - " -o, --timers mostra temporizadores\n" - "\n" - --#: ../netstat.c:1445 ../route.c:89 -+#: ../netstat.c:1515 ../route.c:89 -+#, c-format - msgid "" - " -F, --fib display Forwarding Information Base " - "(default)\n" --msgstr "" --" -F, --fib mostra a Base de Informaçőes de Repasse " --"(default)\n" -+msgstr " -F, --fib mostra a Base de Informaçőes de Repasse (default)\n" - --#: ../netstat.c:1446 ../route.c:90 -+#: ../netstat.c:1516 ../route.c:90 -+#, c-format - msgid "" - " -C, --cache display routing cache instead of FIB\n" - "\n" -@@ -1159,136 +1111,145 @@ - " -C, --cache mostra cache de roteamento no lugar da FIB\n" - "\n" - --#: ../netstat.c:1448 -+#: ../netstat.c:1518 -+#, c-format - msgid "" --" <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx " --"--netrom\n" -+" <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" -+"netrom\n" - msgstr "" --" <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx " --"--netrom\n" -+" <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" -+"netrom\n" - --#: ../netstat.c:1449 ../route.c:92 --#, c-format --msgid " <AF>=Use '-A <af>' or '--<af>' Default: %s\n" -+#: ../netstat.c:1519 -+#, fuzzy, c-format -+msgid " <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n" - msgstr " <AF>=Use '-A <af>' ou [--<af>' Default: %s\n" - --#: ../netstat.c:1450 ../route.c:93 -+#: ../netstat.c:1520 ../route.c:93 -+#, c-format - msgid " List of possible address families (which support routing):\n" --msgstr "" --" Lista das famílias de endereços possíveis (que suportam roteamento):\n" -+msgstr " Lista das famílias de endereços possíveis (que suportam roteamento):\n" - --#: ../netstat.c:1663 -+#: ../netstat.c:1753 -+#, c-format - msgid "Active Internet connections " - msgstr "Conexőes Internet Ativas " - --#: ../netstat.c:1673 -+#: ../netstat.c:1763 -+#, c-format - msgid "" - "\n" --"Proto Recv-Q Send-Q Local Address Foreign Address State " --" " -+"Proto Recv-Q Send-Q Local Address Foreign Address " -+"State " - msgstr "" - "\n" --"Proto Recv-Q Send-Q Endereço Local Endereço Remoto Estado " --" " -+"Proto Recv-Q Send-Q Endereço Local Endereço Remoto Estado " - --#: ../netstat.c:1675 -+#: ../netstat.c:1765 -+#, c-format - msgid " User Inode " - msgstr " Usuário " - --#: ../netstat.c:1678 -+#: ../netstat.c:1768 -+#, c-format - msgid " Timer" - msgstr " Temporizador" - --#: ../netstat.c:1708 -+#: ../netstat.c:1798 -+#, c-format - msgid "IPv4 Group Memberships\n" - msgstr "IPv4 Group Memberships\n" - --#: ../netstat.c:1709 -+#: ../netstat.c:1799 -+#, c-format - msgid "Interface RefCnt Group\n" - msgstr "Interface CntRef Grupo\n" - --#: ../rarp.c:43 -+#: ../rarp.c:44 - msgid "This kernel does not support RARP.\n" - msgstr "Este kernel năo tem suporte a RARP.\n" - --#: ../rarp.c:82 -+#: ../rarp.c:83 - #, c-format - msgid "no RARP entry for %s.\n" - msgstr "Sem entrada RARP para %s.\n" - --#: ../rarp.c:95 -+#: ../rarp.c:96 - #, c-format - msgid "%s: bad hardware address\n" - msgstr "%s: endereço de hardware inválido\n" - --#: ../rarp.c:127 -+#: ../rarp.c:128 - #, c-format - msgid "rarp: cannot open file %s:%s.\n" - msgstr "rarp: năo foi possível abrir o arquivo %s:%s.\n" - --#: ../rarp.c:139 -+#: ../rarp.c:140 - #, c-format - msgid "rarp: format error at %s:%u\n" - msgstr "rarp: erro de formato em %s:%u\n" - --#: ../rarp.c:143 ../rarp.c:287 -+#: ../rarp.c:144 ../rarp.c:289 - #, c-format - msgid "rarp: %s: unknown host\n" - msgstr "rarp: %s: máquina desconhecida\n" - --#: ../rarp.c:146 -+#: ../rarp.c:147 - #, c-format - msgid "rarp: cannot set entry from %s:%u\n" - msgstr "rarp: năo é possível incluir uma entrada para %s:%u\n" - --#: ../rarp.c:175 -+#: ../rarp.c:176 -+#, c-format - msgid "Usage: rarp -a list entries in cache.\n" - msgstr "" - "Uso: rarp -a lista entradas no cache\n" - --#: ../rarp.c:176 -+#: ../rarp.c:177 -+#, c-format - msgid " rarp -d <hostname> delete entry from cache.\n" --msgstr "" --" rarp -d máquina remove entrada do cache\n" -+msgstr " rarp -d máquina remove entrada do cache\n" - --#: ../rarp.c:177 -+#: ../rarp.c:178 -+#, c-format - msgid " rarp [<HW>] -s <hostname> <hwaddr> add entry to cache.\n" --msgstr "" --" rarp [-t tipo-hw] -s máquina endereço-hw adiciona entrada ao cache\n" -+msgstr " rarp [-t tipo-hw] -s máquina endereço-hw adiciona entrada ao cache\n" - --#: ../rarp.c:178 -+#: ../rarp.c:179 -+#, c-format - msgid "" - " rarp -f add entries from /etc/ethers.\n" - msgstr "" - " rarp -f adiciona entradas a partir do\n" - " arquivo ethers.\n" - --#: ../rarp.c:179 -+#: ../rarp.c:180 -+#, c-format - msgid "" - " rarp -V display program version.\n" - "\n" --msgstr "" --" rarp -V mostra versăo do programa\n" -+msgstr " rarp -V mostra versăo do programa\n" - --#: ../rarp.c:236 -+#: ../rarp.c:238 - #, c-format - msgid "%s: illegal option mix.\n" - msgstr "%s: mistura ilegal de opçőes.\n" - --#: ../rarp.c:267 -+#: ../rarp.c:269 - #, c-format - msgid "rarp: %s: unknown hardware type.\n" - msgstr "rarp: %s: tipo desconhecido de hardware.\n" - --#: ../route.c:79 -+#: ../route.c:80 -+#, c-format - msgid "" - "Usage: route [-nNvee] [-FC] [<AF>] List kernel routing tables\n" - msgstr "" --"Uso: route [-nNvee] [-FC] [famílias_de_endereços] Lista as tabelas de " --"rotea-\n" -+"Uso: route [-nNvee] [-FC] [famílias_de_endereços] Lista as tabelas de rotea-\n" - " mento do kernel\n" - --#: ../route.c:80 -+#: ../route.c:81 -+#, c-format - msgid "" - " route [-v] [-FC] {add|del|flush} ... Modify routing table for AF.\n" - "\n" -@@ -1298,35 +1259,42 @@ - " mento da família.\n" - "\n" - --#: ../route.c:82 -+#: ../route.c:83 -+#, c-format - msgid "" - " route {-h|--help} [<AF>] Detailed usage syntax for " - "specified AF.\n" - msgstr "" --" route {-h|--help} [família_de_endereços] Sintaxe para a AF " --"(Família\n" --" de endereços) " --"espeficicada.\n" -+" route {-h|--help} [família_de_endereços] Sintaxe para a AF (Família\n" -+" de endereços) espeficicada.\n" - --#: ../route.c:83 -+#: ../route.c:84 -+#, c-format - msgid "" - " route {-V|--version} Display version/author and " - "exit.\n" - "\n" - msgstr "" --" route {-V|--version} Mostra a versăo do " --"comando\n" -+" route {-V|--version} Mostra a versăo do comando\n" - " e sai.\n" - -+#: ../route.c:92 -+#, fuzzy, c-format -+msgid " <AF>=Use '-A <af>' or '--<af>'; default: %s\n" -+msgstr " <AF>=Use '-A <af>' ou [--<af>' Default: %s\n" -+ - #: ../plipconfig.c:66 -+#, c-format - msgid "Usage: plipconfig [-a] [-i] [-v] interface\n" - msgstr "Uso: ifconfig [-a] [-i] [-v] interface\n" - - #: ../plipconfig.c:67 -+#, c-format - msgid " [nibble NN] [trigger NN]\n" - msgstr " [[família] endereço]\n" - - #: ../plipconfig.c:68 -+#, c-format - msgid " plipconfig -V | --version\n" - msgstr " plipconfig -V | --version\n" - -@@ -1335,25 +1303,29 @@ - msgid "%s\tnibble %lu trigger %lu\n" - msgstr "%s\tnibble %lu trigger %lu\n" - --#: ../iptunnel.c:79 -+#: ../iptunnel.c:85 -+#, c-format - msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n" - msgstr "Uso: iptunnel { add | change | del | show } [ NOME ]\n" - --#: ../iptunnel.c:80 -+#: ../iptunnel.c:86 -+#, c-format - msgid "" - " [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n" --msgstr "" --" [ mode { ipip | gre | sit } ] [ remote END ] [ local END ]\n" -+msgstr " [ mode { ipip | gre | sit } ] [ remote END ] [ local END ]\n" - --#: ../iptunnel.c:81 -+#: ../iptunnel.c:87 -+#, c-format - msgid " [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n" - msgstr " [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n" - --#: ../iptunnel.c:82 -+#: ../iptunnel.c:88 -+#, c-format - msgid " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n" - msgstr " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev DISP_FÍSICO ]\n" - --#: ../iptunnel.c:83 -+#: ../iptunnel.c:89 -+#, c-format - msgid "" - " iptunnel -V | --version\n" - "\n" -@@ -1361,451 +1333,734 @@ - " iptunnel -V | --version\n" - "\n" - --#: ../iptunnel.c:84 -+#: ../iptunnel.c:90 -+#, c-format - msgid "Where: NAME := STRING\n" - msgstr "Onde: NAME := STRING\n" - --#: ../iptunnel.c:85 -+#: ../iptunnel.c:91 -+#, c-format - msgid " ADDR := { IP_ADDRESS | any }\n" - msgstr " END := { ENDEREÇO_IP | any }\n" - --#: ../iptunnel.c:86 -+#: ../iptunnel.c:92 -+#, c-format - msgid " TOS := { NUMBER | inherit }\n" - msgstr " TOS := { NÚMERO | inherit }\n" - --#: ../iptunnel.c:87 -+#: ../iptunnel.c:93 -+#, c-format - msgid " TTL := { 1..255 | inherit }\n" - msgstr " TTL := { 1..255 | inherit }\n" - --#: ../iptunnel.c:88 -+#: ../iptunnel.c:94 -+#, c-format - msgid " KEY := { DOTTED_QUAD | NUMBER }\n" - msgstr " KEY := { QUATRO_NÚMEROS_SEPARADOS_POR_PONTOS | NÚMERO }\n" - --#: ../iptunnel.c:326 -+#: ../iptunnel.c:332 -+#, c-format - msgid "Keys are not allowed with ipip and sit.\n" - msgstr "Chaves năo săo permitidas com ipip e sit.\n" - --#: ../iptunnel.c:346 -+#: ../iptunnel.c:352 -+#, c-format - msgid "Broadcast tunnel requires a source address.\n" - msgstr "Um túnel de broadcast precisa de um endereço de origem.\n" - --#: ../iptunnel.c:361 -+#: ../iptunnel.c:367 -+#, c-format - msgid "ttl != 0 and noptmudisc are incompatible\n" - msgstr "ttl != 0 e noptmudisc săo incompatíveis\n" - --#: ../iptunnel.c:373 -+#: ../iptunnel.c:379 -+#, c-format - msgid "cannot determine tunnel mode (ipip, gre or sit)\n" - msgstr "năo foi possível determinar o modo do túnel (ip, gre ou sit)\n" - --#: ../iptunnel.c:411 -+#: ../iptunnel.c:417 - #, c-format - msgid "%s: %s/ip remote %s local %s " - msgstr "%s: %s/ip remoto %s local %s " - --#: ../iptunnel.c:415 -+#: ../iptunnel.c:421 - msgid "unknown" - msgstr "Desconhecido" - --#: ../iptunnel.c:447 -+#: ../iptunnel.c:453 -+#, c-format - msgid " Drop packets out of sequence.\n" - msgstr " Descarte pacotes fora de seqüęncia.\n" - --#: ../iptunnel.c:449 -+#: ../iptunnel.c:455 -+#, c-format - msgid " Checksum in received packet is required.\n" - msgstr " É necessário checksum nos pacotes recebidos.\n" - --#: ../iptunnel.c:451 -+#: ../iptunnel.c:457 -+#, c-format - msgid " Sequence packets on output.\n" - msgstr " Seqüencie pacotes na saída.\n" - --#: ../iptunnel.c:453 -+#: ../iptunnel.c:459 -+#, c-format - msgid " Checksum output packets.\n" - msgstr " Calcule o checksum para pacotes de saída.\n" - --#: ../iptunnel.c:481 -+#: ../iptunnel.c:487 -+#, c-format - msgid "Wrong format of /proc/net/dev. Sorry.\n" - msgstr "Formato errado de /proc/net/dev. Desculpe.\n" - --#: ../iptunnel.c:494 -+#: ../iptunnel.c:500 - #, c-format - msgid "Failed to get type of [%s]\n" - msgstr "Năo foi possível obter o tipo de [%s]\n" - --#: ../iptunnel.c:510 -+#: ../iptunnel.c:516 -+#, c-format - msgid "RX: Packets Bytes Errors CsumErrs OutOfSeq Mcasts\n" - msgstr "RX: Pacotes Bytes Erros CsunErrs ForaSeq Mcasts\n" - --#: ../iptunnel.c:513 -+#: ../iptunnel.c:519 -+#, c-format - msgid "TX: Packets Bytes Errors DeadLoop NoRoute NoBufs\n" - msgstr "TX: Pacotes Bytes Erros DeadLoop SemRota SemBufs\n" - --#: ../statistics.c:45 -+#: ../statistics.c:47 - msgid "ICMP input histogram:" - msgstr "Histograma de entrada ICMP:" - --#: ../statistics.c:46 -+#: ../statistics.c:48 - msgid "ICMP output histogram:" - msgstr "Histograma de saída ICMP" - --#: ../statistics.c:63 -+#: ../statistics.c:65 - #, c-format - msgid "Forwarding is %s" - msgstr "Repassagem está %s" - --#: ../statistics.c:64 --#, c-format --msgid "Default TTL is %d" -+#: ../statistics.c:66 -+#, fuzzy, c-format -+msgid "Default TTL is %u" - msgstr "Default TTL é %d" - --#: ../statistics.c:65 --#, c-format --msgid "%d total packets received" -+#: ../statistics.c:67 -+#, fuzzy, c-format -+msgid "%u total packets received" - msgstr "%d total de pacotes recebidos" - --#: ../statistics.c:66 --#, c-format --msgid "%d with invalid headers" -+#: ../statistics.c:68 -+#, fuzzy, c-format -+msgid "%u with invalid headers" - msgstr "%d com cabeçalhos inválidos" - --#: ../statistics.c:67 --#, c-format --msgid "%d with invalid addresses" -+#: ../statistics.c:69 -+#, fuzzy, c-format -+msgid "%u with invalid addresses" - msgstr "%d com endereços inválidos" - --#: ../statistics.c:68 --#, c-format --msgid "%d forwarded" -+#: ../statistics.c:70 -+#, fuzzy, c-format -+msgid "%u forwarded" - msgstr "%d repassados" - --#: ../statistics.c:69 --#, c-format --msgid "%d with unknown protocol" -+#: ../statistics.c:71 -+#, fuzzy, c-format -+msgid "%u with unknown protocol" - msgstr "%d com protocolo desconhecido" - --#: ../statistics.c:70 --#, c-format --msgid "%d incoming packets discarded" -+#: ../statistics.c:72 -+#, fuzzy, c-format -+msgid "%u incoming packets discarded" - msgstr "%d pacotes entrantes descartados" - --#: ../statistics.c:71 --#, c-format --msgid "%d incoming packets delivered" -+#: ../statistics.c:73 -+#, fuzzy, c-format -+msgid "%u incoming packets delivered" - msgstr "%d pacotes entrantes despachados" - --#: ../statistics.c:72 --#, c-format --msgid "%d requests sent out" -+#: ../statistics.c:74 -+#, fuzzy, c-format -+msgid "%u requests sent out" - msgstr "%d requisiçőes enviadas" - - #. ? --#: ../statistics.c:73 --#, c-format --msgid "%d outgoing packets dropped" -+#: ../statistics.c:75 -+#, fuzzy, c-format -+msgid "%u outgoing packets dropped" - msgstr "%d pacotes saintes descartados" - --#: ../statistics.c:74 --#, c-format --msgid "%d dropped because of missing route" -+#: ../statistics.c:76 -+#, fuzzy, c-format -+msgid "%u dropped because of missing route" - msgstr "%d descartados devido a falta de rota" - --#: ../statistics.c:75 --#, c-format --msgid "%d fragments dropped after timeout" -+#: ../statistics.c:77 -+#, fuzzy, c-format -+msgid "%u fragments dropped after timeout" - msgstr "%d fragmentos descartados após estouro de tempo" - --#: ../statistics.c:76 --#, c-format --msgid "%d reassemblies required" -+#: ../statistics.c:78 -+#, fuzzy, c-format -+msgid "%u reassemblies required" - msgstr "%d remontagens requeridas" - - #. ? --#: ../statistics.c:77 --#, c-format --msgid "%d packets reassembled ok" -+#: ../statistics.c:79 -+#, fuzzy, c-format -+msgid "%u packets reassembled ok" - msgstr "%d pacotes remontados sem problemas" - --#: ../statistics.c:78 --#, c-format --msgid "%d packet reassembles failed" -+#: ../statistics.c:80 -+#, fuzzy, c-format -+msgid "%u packet reassembles failed" - msgstr "%d remontagens de pacotes falharam" - --#: ../statistics.c:79 --#, c-format --msgid "%d fragments received ok" -+#: ../statistics.c:81 -+#, fuzzy, c-format -+msgid "%u fragments received ok" - msgstr "%d fragmentos recebidos sem problemas" - --#: ../statistics.c:80 --#, c-format --msgid "%d fragments failed" -+#: ../statistics.c:82 -+#, fuzzy, c-format -+msgid "%u fragments failed" - msgstr "%d fragmentos falharam" - --#: ../statistics.c:81 --#, c-format --msgid "%d fragments created" -+#: ../statistics.c:83 -+#, fuzzy, c-format -+msgid "%u fragments created" - msgstr "%d fragmentos criados" - --#: ../statistics.c:86 --#, c-format --msgid "%d ICMP messages received" -+#: ../statistics.c:88 -+#, fuzzy, c-format -+msgid "%u ICMP messages received" - msgstr "%d mensagens ICMP recebidas" - --#: ../statistics.c:87 --#, c-format --msgid "%d input ICMP message failed." -+#: ../statistics.c:89 -+#, fuzzy, c-format -+msgid "%u input ICMP message failed." - msgstr "%d mensagens ICMP entrantes falharam." - --#: ../statistics.c:88 ../statistics.c:101 --#, c-format --msgid "destination unreachable: %d" -+#: ../statistics.c:90 ../statistics.c:103 -+#, fuzzy, c-format -+msgid "destination unreachable: %u" - msgstr "destino năo alcançável: %d" - --#: ../statistics.c:89 --#, c-format --msgid "timeout in transit: %d" -+#: ../statistics.c:91 -+#, fuzzy, c-format -+msgid "timeout in transit: %u" - msgstr "estouro de tempo em trânsito: %d" - --#: ../statistics.c:90 ../statistics.c:103 --#, c-format --msgid "wrong parameters: %d" -+#: ../statistics.c:92 ../statistics.c:105 -+#, fuzzy, c-format -+msgid "wrong parameters: %u" - msgstr "parâmetros errados: %d" - - #. ? --#: ../statistics.c:91 --#, c-format --msgid "source quenchs: %d" -+#: ../statistics.c:93 -+#, fuzzy, c-format -+msgid "source quenches: %u" - msgstr "source quenchs: %d" - --#: ../statistics.c:92 --#, c-format --msgid "redirects: %d" -+#: ../statistics.c:94 -+#, fuzzy, c-format -+msgid "redirects: %u" - msgstr "redireçőes: %d" - --#: ../statistics.c:93 --#, c-format --msgid "echo requests: %d" -+#: ../statistics.c:95 -+#, fuzzy, c-format -+msgid "echo requests: %u" - msgstr "requisiçőes de eco: %d" - --#: ../statistics.c:94 ../statistics.c:107 --#, c-format --msgid "echo replies: %d" -+#: ../statistics.c:96 ../statistics.c:109 -+#, fuzzy, c-format -+msgid "echo replies: %u" - msgstr "respostas de eco: %d" - --#: ../statistics.c:95 --#, c-format --msgid "timestamp request: %d" -+#: ../statistics.c:97 -+#, fuzzy, c-format -+msgid "timestamp request: %u" - msgstr "requisiçőes de timestamp: %d" - --#: ../statistics.c:96 --#, c-format --msgid "timestamp reply: %d" -+#: ../statistics.c:98 -+#, fuzzy, c-format -+msgid "timestamp reply: %u" - msgstr "respostas a timestamps: %d" - --#: ../statistics.c:97 --#, c-format --msgid "address mask request: %d" -+#: ../statistics.c:99 -+#, fuzzy, c-format -+msgid "address mask request: %u" - msgstr "requisiçőes de mascara de endereço: %d" - - #. ? --#: ../statistics.c:98 --msgid "address mask replies" --msgstr "resposta a mascara de endereço" -+#: ../statistics.c:100 ../statistics.c:113 -+#, fuzzy, c-format -+msgid "address mask replies: %u" -+msgstr "respostas a máscara de endereço: %d" - - #. ? --#: ../statistics.c:99 --#, c-format --msgid "%d ICMP messages sent" -+#: ../statistics.c:101 -+#, fuzzy, c-format -+msgid "%u ICMP messages sent" - msgstr "%d mensagens ICMP enviadas" - --#: ../statistics.c:100 --#, c-format --msgid "%d ICMP messages failed" -+#: ../statistics.c:102 -+#, fuzzy, c-format -+msgid "%u ICMP messages failed" - msgstr "%d mensagens ICMP falharam" - --#: ../statistics.c:102 --#, c-format --msgid "time exceeded: %d" -+#: ../statistics.c:104 -+#, fuzzy, c-format -+msgid "time exceeded: %u" - msgstr "tempo excedido: %d" - - #. ? --#: ../statistics.c:104 --#, c-format --msgid "source quench: %d" -+#: ../statistics.c:106 -+#, fuzzy, c-format -+msgid "source quench: %u" - msgstr "source quench: %d" - --#: ../statistics.c:105 --#, c-format --msgid "redirect: %d" -+#: ../statistics.c:107 -+#, fuzzy, c-format -+msgid "redirect: %u" - msgstr "redireçőes: %d" - --#: ../statistics.c:106 --#, c-format --msgid "echo request: %d" -+#: ../statistics.c:108 -+#, fuzzy, c-format -+msgid "echo request: %u" - msgstr "requisiçőes de eco: %d" - --#: ../statistics.c:108 --#, c-format --msgid "timestamp requests: %d" -+#: ../statistics.c:110 -+#, fuzzy, c-format -+msgid "timestamp requests: %u" - msgstr "requisiçőes de timestamp: %d" - --#: ../statistics.c:109 --#, c-format --msgid "timestamp replies: %d" -+#: ../statistics.c:111 -+#, fuzzy, c-format -+msgid "timestamp replies: %u" - msgstr "respostas a timestamp: %d" - --#: ../statistics.c:110 --#, c-format --msgid "address mask requests: %d" -+#: ../statistics.c:112 -+#, fuzzy, c-format -+msgid "address mask requests: %u" - msgstr "requisiçőes de máscara de endereço: %d" - --#: ../statistics.c:111 --#, c-format --msgid "address mask replies: %d" --msgstr "respostas a máscara de endereço: %d" -- --#: ../statistics.c:116 -+#: ../statistics.c:118 - #, c-format - msgid "RTO algorithm is %s" - msgstr "Algorítmo RTO é %s" - --#: ../statistics.c:120 --#, c-format --msgid "%d active connections openings" -+#: ../statistics.c:122 -+#, fuzzy, c-format -+msgid "%u active connections openings" - msgstr "%d tentativas de conexăo falharam" - --#: ../statistics.c:121 --#, c-format --msgid "%d passive connection openings" -+#: ../statistics.c:123 -+#, fuzzy, c-format -+msgid "%u passive connection openings" - msgstr "%d opens passivos" - --#: ../statistics.c:122 --#, c-format --msgid "%d failed connection attempts" -+#: ../statistics.c:124 -+#, fuzzy, c-format -+msgid "%u failed connection attempts" - msgstr "%d tentativas de conexăo falharam" - --#: ../statistics.c:123 --#, c-format --msgid "%d connection resets received" -+#: ../statistics.c:125 -+#, fuzzy, c-format -+msgid "%u connection resets received" - msgstr "%d resets de conexăo recebidas" - --#: ../statistics.c:124 --#, c-format --msgid "%d connections established" -+#: ../statistics.c:126 -+#, fuzzy, c-format -+msgid "%u connections established" - msgstr "%d conexőes estabelecidas" - --#: ../statistics.c:125 --#, c-format --msgid "%d segments received" -+#: ../statistics.c:127 -+#, fuzzy, c-format -+msgid "%u segments received" - msgstr "%d segmentos recebidos" - --#: ../statistics.c:126 --#, c-format --msgid "%d segments send out" -+#: ../statistics.c:128 -+#, fuzzy, c-format -+msgid "%u segments send out" - msgstr "%d segmentos enviados" - --#: ../statistics.c:127 --#, c-format --msgid "%d segments retransmited" -+#: ../statistics.c:129 -+#, fuzzy, c-format -+msgid "%u segments retransmited" - msgstr "%d segmentos retransmitidos" - --#: ../statistics.c:128 --#, c-format --msgid "%d bad segments received." -+#: ../statistics.c:130 -+#, fuzzy, c-format -+msgid "%u bad segments received." - msgstr "%d segmentos ruins recebidos." - --#: ../statistics.c:129 --#, c-format --msgid "%d resets sent" -+#: ../statistics.c:131 -+#, fuzzy, c-format -+msgid "%u resets sent" - msgstr "%d resets enviados" - --#: ../statistics.c:134 --#, c-format --msgid "%d packets received" -+#: ../statistics.c:136 -+#, fuzzy, c-format -+msgid "%u packets received" - msgstr "%d pacotes recebidos" - --#: ../statistics.c:135 --#, c-format --msgid "%d packets to unknown port received." -+#: ../statistics.c:137 -+#, fuzzy, c-format -+msgid "%u packets to unknown port received." - msgstr "%d pacotes para portas desconhecidas recebidos." - --#: ../statistics.c:136 --#, c-format --msgid "%d packet receive errors" -+#: ../statistics.c:138 -+#, fuzzy, c-format -+msgid "%u packet receive errors" - msgstr "%d erros de recepçăo de pacotes" - --#: ../statistics.c:137 --#, c-format --msgid "%d packets sent" -+#: ../statistics.c:139 -+#, fuzzy, c-format -+msgid "%u packets sent" - msgstr "%d pacotes enviados" - --#: ../statistics.c:142 -+#: ../statistics.c:144 -+#, fuzzy, c-format -+msgid "%u SYN cookies sent" -+msgstr "%d pacotes enviados" -+ -+#: ../statistics.c:145 -+#, fuzzy, c-format -+msgid "%u SYN cookies received" -+msgstr "%d pacotes recebidos" -+ -+#: ../statistics.c:146 -+#, fuzzy, c-format -+msgid "%u invalid SYN cookies received" -+msgstr "%d pacotes recebidos" -+ -+#: ../statistics.c:148 -+#, fuzzy, c-format -+msgid "%u resets received for embryonic SYN_RECV sockets" -+msgstr "%d resets recebidos para sockets embriônicos SYN_RECV" -+ -+#: ../statistics.c:150 -+#, fuzzy, c-format -+msgid "%u packets pruned from receive queue because of socket buffer overrun" -+msgstr "%d pacotes retirados da fila de recepçăo devido a sobreposiçăo de buffers de sockets" -+ -+#. obsolete: 2.2.0 doesn't do that anymore -+#: ../statistics.c:153 -+#, fuzzy, c-format -+msgid "%u packets pruned from receive queue" -+msgstr "%d pacotes retirados da fila de fora de ordem (out-of-order)" -+ -+#: ../statistics.c:154 -+#, fuzzy, c-format -+msgid "" -+"%u packets dropped from out-of-order queue because of socket buffer overrun" -+msgstr "%d pacotes descartados da fila de fora de ordem devido a sobreposiçăo de buffers de sockets" -+ -+#: ../statistics.c:156 -+#, fuzzy, c-format -+msgid "%u ICMP packets dropped because they were out-of-window" -+msgstr "%d pacotes ICMP descartados porque estavam fora da janela" -+ -+#: ../statistics.c:158 -+#, fuzzy, c-format -+msgid "%u ICMP packets dropped because socket was locked" -+msgstr "%d pacotes ICMP descartadas porque o socket estava bloqueado" -+ -+#: ../statistics.c:160 -+#, c-format -+msgid "%u TCP sockets finished time wait in fast timer" -+msgstr "" -+ -+#: ../statistics.c:161 -+#, c-format -+msgid "%u time wait sockets recycled by time stamp" -+msgstr "" -+ -+#: ../statistics.c:162 -+#, c-format -+msgid "%u TCP sockets finished time wait in slow timer" -+msgstr "" -+ -+#: ../statistics.c:163 -+#, c-format -+msgid "%u passive connections rejected because of time stamp" -+msgstr "" -+ -+#: ../statistics.c:165 -+#, c-format -+msgid "%u active connections rejected because of time stamp" -+msgstr "" -+ -+#: ../statistics.c:167 - #, c-format --msgid "%d SYN cookies sent" -+msgid "%u packets rejects in established connections because of timestamp" -+msgstr "" -+ -+#: ../statistics.c:169 -+#, fuzzy, c-format -+msgid "%u delayed acks sent" - msgstr "%d pacotes enviados" - --#: ../statistics.c:143 -+#: ../statistics.c:170 - #, c-format --msgid "%d SYN cookies received" --msgstr "%d pacotes recebidos" -+msgid "%u delayed acks further delayed because of locked socket" -+msgstr "" - --#: ../statistics.c:144 -+#: ../statistics.c:172 - #, c-format --msgid "%d invalid SYN cookies received" --msgstr "%d pacotes recebidos" -+msgid "Quick ack mode was activated %u times" -+msgstr "" - --#: ../statistics.c:146 -+#: ../statistics.c:173 - #, c-format --msgid "%d resets received for embryonic SYN_RECV sockets" --msgstr "%d resets recebidos para sockets embriônicos SYN_RECV" -+msgid "%u times the listen queue of a socket overflowed" -+msgstr "" - --#: ../statistics.c:148 -+#: ../statistics.c:175 - #, c-format --msgid "%d packets pruned from receive queue because of socket buffer overrun" -+msgid "%u SYNs to LISTEN sockets ignored" - msgstr "" --"%d pacotes retirados da fila de recepçăo devido a sobreposiçăo de buffers de " --"sockets" - --#. obsolete: 2.2.0 doesn't do that anymore --#: ../statistics.c:151 -+#: ../statistics.c:176 -+#, c-format -+msgid "%u packets directly queued to recvmsg prequeue." -+msgstr "" -+ -+#: ../statistics.c:178 - #, c-format --msgid "%d packets pruned from out-of-order queue" -+msgid "%u of bytes directly received from backlog" -+msgstr "" -+ -+#: ../statistics.c:180 -+#, c-format -+msgid "%u of bytes directly received from prequeue" -+msgstr "" -+ -+#: ../statistics.c:182 -+#, fuzzy, c-format -+msgid "%u packets dropped from prequeue" - msgstr "%d pacotes retirados da fila de fora de ordem (out-of-order)" - --#: ../statistics.c:152 -+#: ../statistics.c:183 -+#, fuzzy, c-format -+msgid "%u packet headers predicted" -+msgstr "%d pacotes recebidos" -+ -+#: ../statistics.c:184 - #, c-format --msgid "" --"%d packets dropped from out-of-order queue because of socket buffer overrun" -+msgid "%u packets header predicted and directly queued to user" - msgstr "" --"%d pacotes descartados da fila de fora de ordem devido a sobreposiçăo de " --"buffers de sockets" - --#: ../statistics.c:154 -+#: ../statistics.c:186 - #, c-format --msgid "%d ICMP packets dropped because they were out-of-window" --msgstr "%d pacotes ICMP descartados porque estavam fora da janela" -+msgid "Ran %u times out of system memory during packet sending" -+msgstr "" - --#: ../statistics.c:156 -+#: ../statistics.c:188 -+#, fuzzy, c-format -+msgid "%u acknowledgments not containing data received" -+msgstr "%d pacotes para portas desconhecidas recebidos." -+ -+#: ../statistics.c:189 - #, c-format --msgid "%d ICMP packets dropped because socket was locked" --msgstr "%d pacotes ICMP descartadas porque o socket estava bloqueado" -+msgid "%u predicted acknowledgments" -+msgstr "" -+ -+#: ../statistics.c:190 -+#, c-format -+msgid "%u times recovered from packet loss due to fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:191 -+#, c-format -+msgid "%u times recovered from packet loss due to SACK data" -+msgstr "" -+ -+#: ../statistics.c:192 -+#, fuzzy, c-format -+msgid "%u bad SACKs received" -+msgstr "%d segmentos ruins recebidos." -+ -+#: ../statistics.c:193 -+#, c-format -+msgid "Detected reordering %u times using FACK" -+msgstr "" -+ -+#: ../statistics.c:194 -+#, c-format -+msgid "Detected reordering %u times using SACK" -+msgstr "" -+ -+#: ../statistics.c:195 -+#, c-format -+msgid "Detected reordering %u times using time stamp" -+msgstr "" -+ -+#: ../statistics.c:196 -+#, c-format -+msgid "Detected reordering %u times using reno fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:197 -+#, c-format -+msgid "%u congestion windows fully recovered" -+msgstr "" -+ -+#: ../statistics.c:198 -+#, c-format -+msgid "%u congestion windows partially recovered using Hoe heuristic" -+msgstr "" -+ -+#: ../statistics.c:199 -+#, c-format -+msgid "%u congestion window recovered using DSACK" -+msgstr "" -+ -+#: ../statistics.c:200 -+#, c-format -+msgid "%u congestion windows recovered after partial ack" -+msgstr "" -+ -+#: ../statistics.c:201 -+#, fuzzy, c-format -+msgid "%u retransmits lost" -+msgstr "%d resets enviados" -+ -+#: ../statistics.c:202 -+#, c-format -+msgid "%u timeouts after reno fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:203 -+#, c-format -+msgid "%u timeouts after SACK recovery" -+msgstr "" -+ -+#: ../statistics.c:204 -+#, c-format -+msgid "%u timeouts in loss state" -+msgstr "" -+ -+#: ../statistics.c:205 -+#, fuzzy, c-format -+msgid "%u fast retransmits" -+msgstr "%d segmentos retransmitidos" -+ -+#: ../statistics.c:206 -+#, c-format -+msgid "%u forward retransmits" -+msgstr "" -+ -+#: ../statistics.c:207 -+#, c-format -+msgid "%u retransmits in slow start" -+msgstr "" -+ -+#: ../statistics.c:208 -+#, c-format -+msgid "%u other TCP timeouts" -+msgstr "" -+ -+#: ../statistics.c:209 -+#, fuzzy, c-format -+msgid "%u reno fast retransmits failed" -+msgstr "%d segmentos retransmitidos" -+ -+#: ../statistics.c:210 -+#, fuzzy, c-format -+msgid "%u sack retransmits failed" -+msgstr "%d remontagens de pacotes falharam" -+ -+#: ../statistics.c:211 -+#, c-format -+msgid "%u times receiver scheduled too late for direct processing" -+msgstr "" -+ -+#: ../statistics.c:212 -+#, fuzzy, c-format -+msgid "%u packets collapsed in receive queue due to low socket buffer" -+msgstr "%d pacotes retirados da fila de recepçăo devido a sobreposiçăo de buffers de sockets" -+ -+#: ../statistics.c:213 -+#, c-format -+msgid "%u DSACKs sent for old packets" -+msgstr "" -+ -+#: ../statistics.c:214 -+#, c-format -+msgid "%u DSACKs sent for out of order packets" -+msgstr "" -+ -+#: ../statistics.c:215 -+#, fuzzy, c-format -+msgid "%u DSACKs received" -+msgstr "%d pacotes recebidos" -+ -+#: ../statistics.c:216 -+#, fuzzy, c-format -+msgid "%u DSACKs for out of order packets received" -+msgstr "%d total de pacotes recebidos" -+ -+#: ../statistics.c:217 -+#, fuzzy, c-format -+msgid "%u connections reset due to unexpected SYN" -+msgstr "%d resets de conexăo recebidas" -+ -+#: ../statistics.c:218 -+#, fuzzy, c-format -+msgid "%u connections reset due to unexpected data" -+msgstr "%d resets de conexăo recebidas" -+ -+#: ../statistics.c:219 -+#, fuzzy, c-format -+msgid "%u connections reset due to early user close" -+msgstr "%d resets de conexăo recebidas" -+ -+#: ../statistics.c:220 -+#, c-format -+msgid "%u connections aborted due to memory pressure" -+msgstr "" -+ -+#: ../statistics.c:221 -+#, fuzzy, c-format -+msgid "%u connections aborted due to timeout" -+msgstr "%d resets de conexăo recebidas" - - #: ../statistics.c:222 -+#, c-format -+msgid "%u connections aborted after user close in linger timeout" -+msgstr "" -+ -+#: ../statistics.c:223 -+#, c-format -+msgid "%u times unabled to send RST due to no memory" -+msgstr "" -+ -+#: ../statistics.c:224 -+#, c-format -+msgid "TCP ran low on memory %u times" -+msgstr "" -+ -+#: ../statistics.c:225 -+#, c-format -+msgid "%u TCP data loss events" -+msgstr "" -+ -+#: ../statistics.c:292 - msgid "enabled" - msgstr "habilitado" - --#: ../statistics.c:222 -+#: ../statistics.c:292 - msgid "disabled" - msgstr "desabilitado" - --#: ../statistics.c:272 --#, c-format --msgid "unknown title %s\n" --msgstr "título %s desconhecido\n" -- --#: ../statistics.c:298 -+#: ../statistics.c:375 - msgid "error parsing /proc/net/snmp" - msgstr "erro lendo /proc/net/snmp" - --#: ../statistics.c:311 -+#: ../statistics.c:388 - msgid "cannot open /proc/net/snmp" - msgstr "năo foi possível abrir /proc/net/snmp" - -@@ -1819,89 +2074,95 @@ - msgid "Cannot change line discipline to `%s'.\n" - msgstr "Năo foi possível mudar a disciplina da linha para `%s'.\n" - --#: ../lib/af.c:145 ../lib/hw.c:148 -+#: ../lib/af.c:153 ../lib/hw.c:161 - msgid "UNSPEC" - msgstr "Năo Especificado" - --#: ../lib/af.c:147 -+#: ../lib/af.c:155 - msgid "UNIX Domain" - msgstr "UNIX Domain" - --#: ../lib/af.c:150 -+#: ../lib/af.c:158 - msgid "DARPA Internet" - msgstr "DARPA Internet" - --#: ../lib/af.c:153 -+#: ../lib/af.c:161 - msgid "IPv6" - msgstr "IPv6" - --#: ../lib/af.c:156 ../lib/hw.c:169 -+#: ../lib/af.c:164 ../lib/hw.c:182 - msgid "AMPR AX.25" - msgstr "AX.25 AMPR" - --#: ../lib/af.c:159 ../lib/hw.c:175 -+#: ../lib/af.c:167 ../lib/hw.c:188 - msgid "AMPR NET/ROM" - msgstr "NET/ROM AMPR" - --#: ../lib/af.c:162 -+#: ../lib/af.c:170 - msgid "Novell IPX" - msgstr "Novell IPX" - --#: ../lib/af.c:165 -+#: ../lib/af.c:173 - msgid "Appletalk DDP" - msgstr "Appletalk DDP" - --#: ../lib/af.c:168 ../lib/hw.c:207 -+#: ../lib/af.c:176 ../lib/hw.c:223 - msgid "Econet" - msgstr "Econet" - --#: ../lib/af.c:171 ../lib/hw.c:172 -+#: ../lib/af.c:179 -+msgid "CCITT X.25" -+msgstr "" -+ -+#: ../lib/af.c:182 ../lib/hw.c:185 - msgid "AMPR ROSE" - msgstr "AMPR ROSE" - --#: ../lib/af.c:174 ../lib/hw.c:160 -+#: ../lib/af.c:185 ../lib/hw.c:173 - msgid "Ash" - msgstr "Ash" - --#: ../lib/af.c:232 -+#: ../lib/af.c:243 -+#, c-format - msgid "Please don't supply more than one address family.\n" - msgstr "Por favor năo especifique mais que uma família de endereços.\n" - --#: ../lib/af.c:293 -+#: ../lib/af.c:304 -+#, c-format - msgid "Too much address family arguments.\n" - msgstr "Excesso no número de famílias de endereços.\n" - --#: ../lib/af.c:304 -+#: ../lib/af.c:315 - #, c-format - msgid "Unknown address family `%s'.\n" - msgstr "Família de endereços `%s' desconhecida.\n" - --#: ../lib/arcnet.c:53 ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 --#: ../lib/fddi.c:67 ../lib/hippi.c:68 ../lib/inet.c:244 ../lib/inet.c:259 --#: ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 ../lib/rose.c:71 --#: ../lib/rose.c:126 ../lib/unix.c:56 ../lib/unix.c:76 --msgid "[NONE SET]" --msgstr "[Nenhum configurado]" -- --#: ../lib/arcnet.c:81 ../lib/arcnet.c:96 -+#: ../lib/arcnet.c:70 ../lib/arcnet.c:85 - #, c-format - msgid "in_arcnet(%s): invalid arcnet address!\n" - msgstr "in_arcnet(%s): endereço arcnet inválido!\n" - --#: ../lib/arcnet.c:108 -+#: ../lib/arcnet.c:97 - #, c-format - msgid "in_arcnet(%s): trailing : ignored!\n" - msgstr "in_arcnet(%s): trailing : ignorado!\n" - --#: ../lib/arcnet.c:120 -+#: ../lib/arcnet.c:109 - #, c-format - msgid "in_arcnet(%s): trailing junk!\n" - msgstr "in_arcnet(%s): lixo no trailing!\n" - - #: ../lib/ash.c:81 -+#, c-format - msgid "Malformed Ash address" - msgstr "Endereço Ash mal formado" - -+#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244 -+#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 -+#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76 -+msgid "[NONE SET]" -+msgstr "[Nenhum configurado]" -+ - #: ../lib/ax25.c:97 ../lib/netrom.c:100 - msgid "Invalid callsign" - msgstr "Callsign inválido" -@@ -1911,22 +2172,21 @@ - msgstr "Callsign muito longo" - - #: ../lib/ax25_gr.c:47 -+#, c-format - msgid "AX.25 not configured in this system.\n" - msgstr "O AX.25 năo foi configurado neste sistema.\n" - - #: ../lib/ax25_gr.c:50 -+#, c-format - msgid "Kernel AX.25 routing table\n" - msgstr "Tabela de roteamento AX.25 do kernel\n" - - #. xxx - #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55 -+#, c-format - msgid "Destination Iface Use\n" - msgstr "Destino Iface Uso\n" - --#: ../lib/ddp_gr.c:21 --msgid "Routing table for `ddp' not yet supported.\n" --msgstr "Tabela de roteamento para `ddp' ainda năo suportada.\n" -- - #: ../lib/ether.c:74 ../lib/ether.c:91 - #, c-format - msgid "in_ether(%s): invalid ether address!\n" -@@ -1942,253 +2202,268 @@ - msgid "in_ether(%s): trailing junk!\n" - msgstr "in_ether(%s): lixo no trailing!\n" - --#: ../lib/fddi.c:95 ../lib/fddi.c:110 -+#: ../lib/fddi.c:84 ../lib/fddi.c:99 - #, c-format - msgid "in_fddi(%s): invalid fddi address!\n" - msgstr "in_fddi(%S): endereço fddi inválido!\n" - --#: ../lib/fddi.c:122 -+#: ../lib/fddi.c:111 - #, c-format - msgid "in_fddi(%s): trailing : ignored!\n" - msgstr "in_fddi(%s): trailing : ignorado!\n" - --#: ../lib/fddi.c:134 -+#: ../lib/fddi.c:123 - #, c-format - msgid "in_fddi(%s): trailing junk!\n" - msgstr "in_fddi(%s): lixo no trailing!\n" - --#: ../lib/getroute.c:97 ../lib/setroute.c:76 -+#: ../lib/getroute.c:101 ../lib/setroute.c:80 - #, c-format - msgid "Address family `%s' not supported.\n" - msgstr "Família de endereços `%s' năo suportada.\n" - --#: ../lib/getroute.c:103 ../lib/setroute.c:80 -+#: ../lib/getroute.c:107 ../lib/setroute.c:84 - #, c-format - msgid "No routing for address family `%s'.\n" - msgstr "Nenhum roteamento para a família `%s'\n" - --#: ../lib/hippi.c:96 ../lib/hippi.c:111 -+#: ../lib/hippi.c:84 ../lib/hippi.c:99 - #, c-format - msgid "in_hippi(%s): invalid hippi address!\n" - msgstr "in_fddi(%S): endereço fddi inválido!\n" - --#: ../lib/hippi.c:123 -+#: ../lib/hippi.c:111 - #, c-format - msgid "in_hippi(%s): trailing : ignored!\n" - msgstr "in_fddi(%s): trailing : ignorado!\n" - --#: ../lib/hippi.c:134 -+#: ../lib/hippi.c:122 - #, c-format - msgid "in_hippi(%s): trailing junk!\n" - msgstr "in_fddi(%s): lixo no trailing!\n" - --#: ../lib/hw.c:147 -+#: ../lib/hw.c:160 - msgid "Local Loopback" - msgstr "Loopback Local" - --#: ../lib/hw.c:150 -+#: ../lib/hw.c:163 - msgid "Serial Line IP" - msgstr "SLIP" - --#: ../lib/hw.c:151 -+#: ../lib/hw.c:164 - msgid "VJ Serial Line IP" - msgstr "SLIP VJ" - --#: ../lib/hw.c:152 -+#: ../lib/hw.c:165 - msgid "6-bit Serial Line IP" - msgstr "SLIP 6 bits" - --#: ../lib/hw.c:153 -+#: ../lib/hw.c:166 - msgid "VJ 6-bit Serial Line IP" - msgstr "SLIP VJ 6 bits" - --#: ../lib/hw.c:154 -+#: ../lib/hw.c:167 - msgid "Adaptive Serial Line IP" - msgstr "SLIP Adaptativo" - --#: ../lib/hw.c:157 -+#: ../lib/hw.c:170 - msgid "Ethernet" - msgstr "Ethernet" - --#: ../lib/hw.c:163 -+#: ../lib/hw.c:176 - msgid "Fiber Distributed Data Interface" - msgstr "FDDI - Fibra Ótica" - --#: ../lib/hw.c:166 -+#: ../lib/hw.c:179 - msgid "HIPPI" - msgstr "HIPPI" - --#: ../lib/hw.c:178 -+#: ../lib/hw.c:191 -+msgid "generic X.25" -+msgstr "" -+ -+#: ../lib/hw.c:194 - msgid "IPIP Tunnel" - msgstr "Túnel IPIP" - --#: ../lib/hw.c:181 -+#: ../lib/hw.c:197 - msgid "Point-to-Point Protocol" - msgstr "Protocolo Ponto-a-Ponto" - --#: ../lib/hw.c:184 -+#: ../lib/hw.c:200 - msgid "(Cisco)-HDLC" - msgstr "(Cisco)-HDLC" - --#: ../lib/hw.c:185 -+#: ../lib/hw.c:201 - msgid "LAPB" - msgstr "LAPB" - --#: ../lib/hw.c:188 -+#: ../lib/hw.c:204 - msgid "ARCnet" - msgstr "ARCnet" - --#: ../lib/hw.c:191 -+#: ../lib/hw.c:207 - msgid "Frame Relay DLCI" - msgstr "Frame Relay DLCI" - --#: ../lib/hw.c:192 -+#: ../lib/hw.c:208 - msgid "Frame Relay Access Device" - msgstr "FRAD - Dispositivo de Acesso a Frame Relay" - --#: ../lib/hw.c:195 -+#: ../lib/hw.c:211 - msgid "IPv6-in-IPv4" - msgstr "IPv6 sobre IPv4" - --#: ../lib/hw.c:198 -+#: ../lib/hw.c:214 - msgid "IrLAP" - msgstr "IrLAP" - --#: ../lib/hw.c:201 -+#: ../lib/hw.c:217 - msgid "16/4 Mbps Token Ring" - msgstr "16/4 Mbps Token Ring" - --#: ../lib/hw.c:203 -+#: ../lib/hw.c:219 - msgid "16/4 Mbps Token Ring (New)" - msgstr "16/4 Mbps Token Ring (Novo)" - -+#: ../lib/hw.c:226 -+msgid "Generic EUI-64" -+msgstr "" -+ - #: ../lib/inet.c:153 ../lib/inet6.c:79 - #, c-format - msgid "rresolve: unsupport address family %d !\n" - msgstr "rresolve: família de endereços %d năo suportada!\n" - --#: ../lib/inet6_gr.c:79 -+#: ../lib/inet6.c:131 -+#, fuzzy -+msgid "[UNKNOWN]" -+msgstr "DESCONHECIDA" -+ -+#: ../lib/inet6_gr.c:71 -+#, c-format - msgid "INET6 (IPv6) not configured in this system.\n" - msgstr "NET/ROM năo configurado neste sistema.\n" - --#: ../lib/inet6_gr.c:82 -+#: ../lib/inet6_gr.c:74 -+#, c-format - msgid "Kernel IPv6 routing table\n" - msgstr "Tabela de Roteamento IPv6 do Kernel\n" - --#: ../lib/inet6_gr.c:84 -+#: ../lib/inet6_gr.c:76 -+#, c-format - msgid "" --"Destination Next Hop " --" Flags Metric Ref Use Iface\n" --msgstr "" --"Destino Próximo \"Hop\" " --" Opçőes Métrica Ref Uso Iface\n" -+"Destination Next " -+"Hop Flags Metric Ref Use Iface\n" -+msgstr "Destino Próximo \"Hop\" Opçőes Métrica Ref Uso Iface\n" - --#: ../lib/inet6_gr.c:158 -+#: ../lib/inet6_gr.c:150 -+#, c-format - msgid "Kernel IPv6 Neighbour Cache\n" - msgstr "Cache de Vizinhos IPv6 do Kernel\n" - --#: ../lib/inet6_gr.c:161 -+#: ../lib/inet6_gr.c:153 -+#, c-format - msgid "" - "Neighbour HW Address Iface Flags " - "Ref State\n" --msgstr "" --"Vizinho Endereço HW Iface Opçőes " --"Estado Ref\n" -+msgstr "Vizinho Endereço HW Iface Opçőes Estado Ref\n" - --#: ../lib/inet6_gr.c:165 -+#: ../lib/inet6_gr.c:157 -+#, c-format - msgid "" - "Neighbour HW Address Iface Flags " - "Ref State Stale(sec) Delete(sec)\n" - msgstr "" --"Vizinho Endereço HW Iface Opçőes " --"Estado Ref\n" -+"Vizinho Endereço HW Iface Opçőes Estado Ref\n" - " Parado(seg) Remover(seg)\n" - - #: ../lib/inet6_sr.c:46 -+#, c-format - msgid "Usage: inet6_route [-vF] del Target\n" - msgstr "Uso: inet6_route [-vF] del Destino\n" - - #: ../lib/inet6_sr.c:47 -+#, c-format - msgid " inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n" - msgstr " inet6_route [-vF] add Destino [gw Gw] [metric M] [[dev] If]\n" - - #: ../lib/inet6_sr.c:48 -+#, c-format - msgid " inet6_route [-FC] flush NOT supported\n" - msgstr " inet6_route [-FC] flush NĂO suportado\n" - --#: ../lib/inet6_sr.c:182 -+#: ../lib/inet6_sr.c:188 -+#, c-format - msgid "Flushing `inet6' routing table not supported\n" - msgstr "Limpeza da tabela de roteamento `inet6' năo é suportada\n" - - #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220 -+#, c-format - msgid "INET (IPv4) not configured in this system.\n" - msgstr "NET/ROM năo configurado neste sistema.\n" - - #: ../lib/inet_gr.c:53 -+#, c-format - msgid "Kernel IP routing table\n" - msgstr "Tabela de Roteamento IP do Kernel\n" - - #: ../lib/inet_gr.c:56 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags Metric Ref Use " - "Iface\n" --msgstr "" --"Destino Roteador MáscaraGen. Opçőes Métrica Ref Uso " --"Iface\n" -+msgstr "Destino Roteador MáscaraGen. Opçőes Métrica Ref Uso Iface\n" - - #: ../lib/inet_gr.c:59 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags MSS Window irtt " - "Iface\n" --msgstr "" --"Destino Roteador MáscaraGen. Opçőes MSS Janela irtt " --"Iface\n" -+msgstr "Destino Roteador MáscaraGen. Opçőes MSS Janela irtt Iface\n" - - #: ../lib/inet_gr.c:62 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags Metric Ref Use " - "Iface MSS Window irtt\n" --msgstr "" --"Destino Roteador MáscaraGen Opçőes Métrica Ref Uso " --"Iface MSS Janela irtt\n" -+msgstr "Destino Roteador MáscaraGen Opçőes Métrica Ref Uso Iface MSS Janela irtt\n" - - #: ../lib/inet_gr.c:237 -+#, c-format - msgid "Kernel IP routing cache\n" - msgstr "Tabela de Roteamento IP do Kernel\n" - - #: ../lib/inet_gr.c:258 -+#, c-format - msgid "" - "Source Destination Gateway Flags Metric Ref Use " - "Iface\n" --msgstr "" --"Destino Roteador MáscaraGen. Opçőes Métrica Ref Uso " --"Iface\n" -+msgstr "Destino Roteador MáscaraGen. Opçőes Métrica Ref Uso Iface\n" - - #: ../lib/inet_gr.c:261 -+#, c-format - msgid "" - "Source Destination Gateway Flags MSS Window irtt " - "Iface\n" --msgstr "" --"Destino Roteador MáscaraGen. Opçőes MSS Janela irtt " --"Iface\n" -+msgstr "Destino Roteador MáscaraGen. Opçőes MSS Janela irtt Iface\n" - - #: ../lib/inet_gr.c:266 -+#, c-format - msgid "" - "Source Destination Gateway Flags Metric Ref Use " - "Iface MSS Window irtt HH Arp\n" --msgstr "" --"Destino Roteador Origem Opçőes Métrica Ref Uso " --"Iface MSS Janela irtt HH Arp\n" -+msgstr "Destino Roteador Origem Opçőes Métrica Ref Uso Iface MSS Janela irtt HH Arp\n" - - #: ../lib/inet_gr.c:290 -+#, c-format - msgid "" - "Source Destination Gateway Flags Metric Ref Use " - "Iface MSS Window irtt TOS HHRef HHUptod SpecDst\n" --msgstr "" --"Destino Roteador Origem Opçőes Métrica Ref Uso " --"Iface MSS Janela irtt HH Arp\n" -+msgstr "Destino Roteador Origem Opçőes Métrica Ref Uso Iface MSS Janela irtt HH Arp\n" - --#: ../lib/inet_sr.c:50 -+#: ../lib/inet_sr.c:51 -+#, c-format - msgid "" - "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] " - "[[dev] If]\n" -@@ -2196,31 +2471,36 @@ - "Uso: inet_route [-vF] del {-host|-net} Destino[/prefixo] [gw Gw] [metric M] " - "[[dev] If]\n" - --#: ../lib/inet_sr.c:51 -+#: ../lib/inet_sr.c:52 -+#, c-format - msgid "" - " inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n" - msgstr "" - " inet_route [-vF] add {-host|-net} Destino[/prefixo] [gw Gw] [metric " - "M]\n" - --#: ../lib/inet_sr.c:52 -+#: ../lib/inet_sr.c:53 -+#, c-format - msgid "" - " [netmask N] [mss Mss] [window W] [irtt I]\n" - msgstr "" - " [netmask N] [mss Mss] [window W] [irtt I]\n" - --#: ../lib/inet_sr.c:53 -+#: ../lib/inet_sr.c:54 -+#, c-format - msgid " [mod] [dyn] [reinstate] [[dev] If]\n" - msgstr " [mod] [dyn] [reinstate] [[dev] If]\n" - --#: ../lib/inet_sr.c:54 -+#: ../lib/inet_sr.c:55 -+#, c-format - msgid "" - " inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n" - msgstr "" - " inet_route [-vF] add {-host|-net} Destino[/prefixo] [metric M] " - "reject\n" - --#: ../lib/inet_sr.c:55 -+#: ../lib/inet_sr.c:56 -+#, c-format - msgid " inet_route [-FC] flush NOT supported\n" - msgstr " inet_route [-FC] flush NĂO suportado\n" - -@@ -2230,14 +2510,17 @@ - msgstr "route: %s: năo é possível usar uma REDE como roteador!\n" - - #: ../lib/inet_sr.c:174 -+#, c-format - msgid "route: Invalid MSS/MTU.\n" - msgstr "route: MSS inválido.\n" - - #: ../lib/inet_sr.c:187 -+#, c-format - msgid "route: Invalid window.\n" - msgstr "route: janela inválida.\n" - - #: ../lib/inet_sr.c:203 -+#, c-format - msgid "route: Invalid initial rtt.\n" - msgstr "route: rtt inicial inválido.\n" - -@@ -2252,75 +2535,92 @@ - msgstr "route: netmask %s inválida\n" - - #: ../lib/inet_sr.c:270 -+#, c-format - msgid "route: netmask doesn't match route address\n" - msgstr "route: a netmask năo casa com o endereço de rede\n" - - #: ../lib/inet_sr.c:306 -+#, c-format - msgid "Flushing `inet' routing table not supported\n" - msgstr "Năo é suportado limpar a tabela de roteamento `inet'\n" - - #: ../lib/inet_sr.c:310 -+#, c-format - msgid "Modifying `inet' routing cache not supported\n" - msgstr "Năo é suportado modificar o cache de roteamento `inet'\n" - - #: ../lib/ipx_gr.c:52 -+#, c-format - msgid "IPX not configured in this system.\n" - msgstr "O AX.25 năo foi configurado neste sistema.\n" - - #: ../lib/ipx_gr.c:56 -+#, c-format - msgid "Kernel IPX routing table\n" - msgstr "Tabela de roteamento IPX do kernel\n" - - #. xxx - #: ../lib/ipx_gr.c:57 -+#, c-format - msgid "Destination Router Net Router Node\n" - msgstr "Destino Rede Roteadora Nó Roteador\n" - - #: ../lib/ipx_sr.c:33 -+#, c-format - msgid "IPX: this needs to be written\n" - msgstr "NET/ROM: isto precisa ser escrito\n" - --#: ../lib/masq_info.c:197 -+#: ../lib/masq_info.c:198 -+#, c-format - msgid "IP masquerading entries\n" - msgstr "Entradas de IP mascarado\n" - --#: ../lib/masq_info.c:200 -+#: ../lib/masq_info.c:201 -+#, c-format - msgid "prot expire source destination ports\n" - msgstr "prot expira origem destino portas\n" - --#: ../lib/masq_info.c:203 -+#: ../lib/masq_info.c:204 -+#, c-format - msgid "" --"prot expire initseq delta prevd source destination " --" ports\n" -+"prot expire initseq delta prevd source " -+"destination ports\n" - msgstr "" --"prot expira initseq delta prevd origem destino " --" portas\n" -+"prot expira initseq delta prevd origem " -+"destino portas\n" - - #: ../lib/netrom_gr.c:48 -+#, c-format - msgid "NET/ROM not configured in this system.\n" - msgstr "NET/ROM năo configurado neste sistema.\n" - - #: ../lib/netrom_gr.c:51 -+#, c-format - msgid "Kernel NET/ROM routing table\n" - msgstr "Tabela de roteamento NET/ROM do kernel\n" - - #: ../lib/netrom_gr.c:52 -+#, c-format - msgid "Destination Mnemonic Quality Neighbour Iface\n" - msgstr "Destino Mnemônico Qualidade Vizinho Iface\n" - - #: ../lib/netrom_sr.c:34 -+#, c-format - msgid "netrom usage\n" - msgstr "uso de netrom\n" - - #: ../lib/netrom_sr.c:44 -+#, c-format - msgid "NET/ROM: this needs to be written\n" - msgstr "NET/ROM: isto precisa ser escrito\n" - - #: ../lib/ppp.c:44 -+#, c-format - msgid "You cannot start PPP with this program.\n" - msgstr "Vocę năo pode iniciar o PPP com este programa.\n" - - #: ../lib/ppp_ac.c:38 -+#, c-format - msgid "Sorry, use pppd!\n" - msgstr "Desculpe, use o pppd!\n" - -@@ -2329,51 +2629,314 @@ - msgstr "Endereço do nó deve ter dez dígitos" - - #: ../lib/rose_gr.c:51 -+#, c-format - msgid "ROSE not configured in this system.\n" - msgstr "ROSE năo configurada neste sistema.\n" - - #: ../lib/rose_gr.c:54 -+#, c-format - msgid "Kernel ROSE routing table\n" - msgstr "Tabela de roteamento ROSE do kernel\n" - --#: ../lib/tr.c:70 ../lib/tr.c:85 -+#: ../lib/tr.c:86 ../lib/tr.c:101 - #, c-format - msgid "in_tr(%s): invalid token ring address!\n" - msgstr "in_tr(%s): endereço token ring inválido!\n" - --#: ../lib/tr.c:97 -+#: ../lib/tr.c:113 - #, c-format - msgid "in_tr(%s): trailing : ignored!\n" - msgstr "in_tr(%s): trailing : ignorado!\n" - --#: ../lib/tr.c:109 -+#: ../lib/tr.c:125 - #, c-format - msgid "in_tr(%s): trailing junk!\n" - msgstr "in_tr(%s): lixo no trailing!\n" - --#: ../lib/interface.c:124 -+#: ../lib/interface.c:176 - #, c-format - msgid "warning: no inet socket available: %s\n" - msgstr "atençăo: nenhum socket inet disponível: %s\n" - --#: ../lib/interface.c:270 -+#: ../lib/interface.c:325 - #, c-format - msgid "Warning: cannot open %s (%s). Limited output.\n" - msgstr "Atençăo: năo foi possível abrir %s (%s). Saída limitada.\n" - - #. Give better error message for this case. --#: ../lib/interface.c:504 -+#: ../lib/interface.c:571 - msgid "Device not found" - msgstr "%s: dispositivo năo encontrado" - --#: ../lib/interface.c:508 -+#: ../lib/interface.c:575 - #, c-format - msgid "%s: error fetching interface information: %s\n" -+msgstr "%s: erro obtendo informaçőes da interface: %s\n" -+ -+#: ../lib/interface.c:608 -+msgid " - no statistics available -" -+msgstr " - estatísticas năo disponíveis -" -+ -+#: ../lib/interface.c:612 -+#, c-format -+msgid "[NO FLAGS]" -+msgstr "[SEM FLAGS]" -+ -+#: ../lib/interface.c:688 -+#, c-format -+msgid "%-9.9s Link encap:%s " -+msgstr "%-9.9s Encapsulamento do Link: %s " -+ -+#: ../lib/interface.c:693 -+#, c-format -+msgid "HWaddr %s " -+msgstr "Endereço de HW %s " -+ -+#: ../lib/interface.c:696 -+#, c-format -+msgid "Media:%s" -+msgstr "Mídia:%s" -+ -+#: ../lib/interface.c:698 -+#, c-format -+msgid "(auto)" -+msgstr "(auto)" -+ -+#: ../lib/interface.c:705 -+#, c-format -+msgid " %s addr:%s " -+msgstr " %s end.: %s " -+ -+#: ../lib/interface.c:708 -+#, c-format -+msgid " P-t-P:%s " -+msgstr " P-a-P:%s " -+ -+#: ../lib/interface.c:711 -+#, c-format -+msgid " Bcast:%s " -+msgstr " Bcast:%s " -+ -+#: ../lib/interface.c:713 -+#, c-format -+msgid " Mask:%s\n" -+msgstr " Masc:%s\n" -+ -+#: ../lib/interface.c:730 -+#, c-format -+msgid " inet6 addr: %s/%d" -+msgstr " endereço inet6: %s/%d" -+ -+#: ../lib/interface.c:732 -+#, c-format -+msgid " Scope:" -+msgstr " Escopo:" -+ -+#: ../lib/interface.c:735 -+#, c-format -+msgid "Global" -+msgstr "Global" -+ -+#: ../lib/interface.c:738 -+#, c-format -+msgid "Link" -+msgstr "Link" -+ -+#: ../lib/interface.c:741 -+#, c-format -+msgid "Site" -+msgstr "Site" -+ -+#: ../lib/interface.c:744 -+#, c-format -+msgid "Compat" -+msgstr "Compat" -+ -+#: ../lib/interface.c:747 -+#, c-format -+msgid "Host" -+msgstr "Máquina" -+ -+#: ../lib/interface.c:750 -+#, c-format -+msgid "Unknown" -+msgstr "Desconhecido" -+ -+#: ../lib/interface.c:765 -+#, c-format -+msgid " IPX/Ethernet II addr:%s\n" -+msgstr " Endereço IPX/Ethernet II:%s\n" -+ -+#: ../lib/interface.c:768 -+#, c-format -+msgid " IPX/Ethernet SNAP addr:%s\n" -+msgstr " Endereço IPX/Ethernet SNAP:%s\n" -+ -+#: ../lib/interface.c:771 -+#, c-format -+msgid " IPX/Ethernet 802.2 addr:%s\n" -+msgstr " Endereço IPX/Ethernet 802.2:%s\n" -+ -+#: ../lib/interface.c:774 -+#, c-format -+msgid " IPX/Ethernet 802.3 addr:%s\n" -+msgstr " Endereço IPX/Ethernet 802.3:%s\n" -+ -+#: ../lib/interface.c:784 -+#, c-format -+msgid " EtherTalk Phase 2 addr:%s\n" -+msgstr " Endereço EtherTalk fase 2:%s\n" -+ -+#: ../lib/interface.c:793 -+#, c-format -+msgid " econet addr:%s\n" -+msgstr " Endereço econet:%s\n" -+ -+#: ../lib/interface.c:800 -+#, c-format -+msgid "[NO FLAGS] " -+msgstr "[NENHUMA FLAG] " -+ -+#: ../lib/interface.c:802 -+#, c-format -+msgid "UP " -+msgstr "UP " -+ -+#: ../lib/interface.c:804 -+#, c-format -+msgid "BROADCAST " -+msgstr "BROADCAST" -+ -+#: ../lib/interface.c:806 -+#, c-format -+msgid "DEBUG " -+msgstr "DEBUG " -+ -+#: ../lib/interface.c:808 -+#, c-format -+msgid "LOOPBACK " -+msgstr "LOOPBACK" -+ -+#: ../lib/interface.c:810 -+#, c-format -+msgid "POINTOPOINT " -+msgstr "POINTOPOINT " -+ -+#: ../lib/interface.c:812 -+#, c-format -+msgid "NOTRAILERS " -+msgstr "NOTRAILERS " -+ -+#: ../lib/interface.c:814 -+#, c-format -+msgid "RUNNING " -+msgstr "RUNNING " -+ -+#: ../lib/interface.c:816 -+#, c-format -+msgid "NOARP " -+msgstr "NOARP " -+ -+#: ../lib/interface.c:818 -+#, c-format -+msgid "PROMISC " -+msgstr "PROMISC " -+ -+#: ../lib/interface.c:820 -+#, c-format -+msgid "ALLMULTI " -+msgstr "ALLMULTI " -+ -+#: ../lib/interface.c:822 -+#, c-format -+msgid "SLAVE " -+msgstr "SLAVE " -+ -+#: ../lib/interface.c:824 -+#, c-format -+msgid "MASTER " -+msgstr "MASTER " -+ -+#: ../lib/interface.c:826 -+#, c-format -+msgid "MULTICAST " -+msgstr "MULTICAST " -+ -+#: ../lib/interface.c:829 -+#, c-format -+msgid "DYNAMIC " -+msgstr "DYNAMIC " -+ -+#. DONT FORGET TO ADD THE FLAGS IN ife_print_short -+#: ../lib/interface.c:832 -+#, c-format -+msgid " MTU:%d Metric:%d" -+msgstr " MTU:%d Métrica:%d" -+ -+#: ../lib/interface.c:836 -+#, c-format -+msgid " Outfill:%d Keepalive:%d" -+msgstr " Outfill:%d Keepalive:%d" -+ -+#: ../lib/interface.c:850 -+#, fuzzy, c-format -+msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" -+msgstr "Pacotes RX:%lu erros:%lu descartados:%lu sobreposiçőes:%lu frame:%lu\n" -+ -+#: ../lib/interface.c:855 -+#, c-format -+msgid " compressed:%lu\n" -+msgstr " compactados:%lu\n" -+ -+#: ../lib/interface.c:895 -+#, fuzzy, c-format -+msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" -+msgstr "Pacotes TX:%lu erros:%lu descartados:%lu sobreposiçőes:%lu portadora:%lu\n" -+ -+#: ../lib/interface.c:899 -+#, c-format -+msgid " collisions:%lu " -+msgstr " colisőes:%lu " -+ -+#: ../lib/interface.c:901 -+#, c-format -+msgid "compressed:%lu " -+msgstr "compactados:%lu " -+ -+#: ../lib/interface.c:903 -+#, c-format -+msgid "txqueuelen:%d " -+msgstr "txqueuelen:%d " -+ -+#: ../lib/interface.c:905 -+#, c-format -+msgid "RX bytes:%llu (%lu.%lu %s) TX bytes:%llu (%lu.%lu %s)\n" - msgstr "" --"%s: erro obtendo informaçőes da interface: %s\n" --"\n" - --#: ../lib/sockets.c:59 -+#: ../lib/interface.c:916 -+#, c-format -+msgid "Interrupt:%d " -+msgstr "IRQ:%d " -+ -+#. Only print devices using it for -+#. I/O maps -+#: ../lib/interface.c:919 -+#, c-format -+msgid "Base address:0x%x " -+msgstr "Endereço de E/S:0x%x " -+ -+#: ../lib/interface.c:921 -+#, c-format -+msgid "Memory:%lx-%lx " -+msgstr "Memória:%lx-%lx " -+ -+#: ../lib/interface.c:924 -+#, c-format -+msgid "DMA chan:%x " -+msgstr "Canal DMA:%x " -+ -+#: ../lib/sockets.c:63 -+#, c-format - msgid "No usable address families found.\n" - msgstr "Nenhuma família de endereços que possa ser usada foi encontrada.\n" - -@@ -2397,29 +2960,32 @@ - msgid "ip: argument is wrong: %s\n" - msgstr "ip: argumento errado: %s\n" - --#: ../ipmaddr.c:56 -+#: ../ipmaddr.c:61 -+#, c-format - msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n" - msgstr "Uso: ipmaddr [ add | del ] ENDMULTI dev STRING\n" - --#: ../ipmaddr.c:57 -+#: ../ipmaddr.c:62 -+#, c-format - msgid " ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n" - msgstr " ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n" - --#: ../ipmaddr.c:58 -+#: ../ipmaddr.c:63 -+#, c-format - msgid " ipmaddr -V | -version\n" - msgstr " ipmaddr -V | -version\n" - --#: ../ipmaddr.c:258 -+#: ../ipmaddr.c:263 - #, c-format - msgid "family %d " - msgstr "família %d " - --#: ../ipmaddr.c:267 -+#: ../ipmaddr.c:272 - #, c-format - msgid " users %d" - msgstr " usuários %d" - --#: ../ipmaddr.c:353 -+#: ../ipmaddr.c:358 - msgid "Cannot create socket" - msgstr "Năo foi possível criar o socket" - -@@ -2434,6 +3000,7 @@ - msgstr "slattach: tty_lock: (%s): %s\n" - - #: ../slattach.c:192 -+#, c-format - msgid "slattach: cannot write PID file\n" - msgstr "slattach: năo foi possível escrever o arquivo PID\n" - -@@ -2452,39 +3019,69 @@ - msgid "slattach: tty_hangup(RAISE): %s\n" - msgstr "slattach: tty_hangup(RAISE): %s\n" - --#: ../slattach.c:486 -+#: ../slattach.c:468 -+#, fuzzy, c-format -+msgid "slattach: tty name too long\n" -+msgstr "%s: nome muito longo\n" -+ -+#: ../slattach.c:498 -+#, c-format - msgid "slattach: tty_open: cannot get current state!\n" - msgstr "slattach: tty_open: năo foi possível obter o estado corrente!\n" - --#: ../slattach.c:493 -+#: ../slattach.c:505 -+#, c-format - msgid "slattach: tty_open: cannot get current line disc!\n" --msgstr "" --"slattach: tty_open: năo foi possível obter a disciplina de linha corrente!\n" -+msgstr "slattach: tty_open: năo foi possível obter a disciplina de linha corrente!\n" - --#: ../slattach.c:501 -+#: ../slattach.c:513 -+#, c-format - msgid "slattach: tty_open: cannot set RAW mode!\n" - msgstr "slattach: tty_open: năo foi possível configurar o modo RAW!\n" - --#: ../slattach.c:508 -+#: ../slattach.c:520 - #, c-format - msgid "slattach: tty_open: cannot set %s bps!\n" - msgstr "slattach: tty_open: năo foi possível configurar %s bps!\n" - --#: ../slattach.c:518 -+#: ../slattach.c:530 -+#, c-format - msgid "slattach: tty_open: cannot set 8N1 mode!\n" - msgstr "slattach: tty_open: năo foi possível configurar modo 8N1!\n" - --#: ../slattach.c:686 -+#: ../slattach.c:672 -+#, c-format -+msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n" -+msgstr "" -+ -+#: ../slattach.c:704 - #, c-format - msgid "%s started" - msgstr "%s inicializado" - --#: ../slattach.c:687 -+#: ../slattach.c:705 - #, c-format - msgid " on %s" - msgstr " em %s" - --#: ../slattach.c:688 -+#: ../slattach.c:706 - #, c-format - msgid " interface %s\n" - msgstr "%s: interface desconhecida.\n" -+ -+#~ msgid "" -+#~ " arp [-v] [<HW>] [-i <if>] -s <hostname> <hwaddr> [netmask <nm>] pub " -+#~ "<-''-\n" -+#~ msgstr " arp [-v] [<HW>] [-i <if>] -s <máquina> <end_hw> [netmask <nm>] pub <-''-\n" -+ -+#~ msgid "%s: unknown interface: %s\n" -+#~ msgstr "%s: interface desconhecida: %s\n" -+ -+#~ msgid "address mask replies" -+#~ msgstr "resposta a mascara de endereço" -+ -+#~ msgid "unknown title %s\n" -+#~ msgstr "título %s desconhecido\n" -+ -+#~ msgid "Routing table for `ddp' not yet supported.\n" -+#~ msgstr "Tabela de roteamento para `ddp' ainda năo suportada.\n" ---- net-tools-1.60.orig/po/Makefile -+++ net-tools-1.60/po/Makefile -@@ -3,13 +3,13 @@ - 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 @@ - 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!"; \ ---- net-tools-1.60.orig/po/et_EE.po -+++ net-tools-1.60/po/et_EE.po -@@ -6,7 +6,8 @@ - msgid "" - msgstr "" - "Project-Id-Version: net-tools 1.58\n" --"POT-Creation-Date: 2001-02-15 21:28+0200\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2007-06-30 12:28+0900\n" - "PO-Revision-Date: 2001-02-15 18:00+0300\n" - "Last-Translator: Meelis Roos <mroos@linux.ee>\n" - "Language-Team: Estonian <linux-ee@eenet.ee>\n" -@@ -14,53 +15,58 @@ - "Content-Type: text/plain; charset=iso-8859-15\n" - "Content-Transfer-Encoding: 8bit\n" - --#: ../arp.c:110 ../arp.c:269 -+#: ../arp.c:112 ../arp.c:279 -+#, c-format - msgid "arp: need host name\n" - msgstr "arp: puudub hosti nimi\n" - --#: ../arp.c:207 ../arp.c:221 -+#: ../arp.c:215 ../arp.c:230 - #, c-format - msgid "No ARP entry for %s\n" - msgstr "%s jaoks pole ARP kirjet\n" - --#: ../arp.c:239 -+#: ../arp.c:248 - #, c-format - msgid "arp: cant get HW-Address for `%s': %s.\n" - msgstr "arp: ei saa riistvaralist aadressi `%s' jaoks: %s\n" - --#: ../arp.c:243 -+#: ../arp.c:252 -+#, c-format - msgid "arp: protocol type mismatch.\n" - msgstr "arp: vale protokolli tüüp\n" - --#: ../arp.c:252 -+#: ../arp.c:261 - #, c-format - msgid "arp: device `%s' has HW address %s `%s'.\n" - msgstr "arp: seadmel `%s' on riistvaraline aadress %s `%s'\n" - --#: ../arp.c:282 -+#: ../arp.c:293 -+#, c-format - msgid "arp: need hardware address\n" - msgstr "arp: puudub riistvaraline aadress\n" - --#: ../arp.c:290 -+#: ../arp.c:301 -+#, c-format - msgid "arp: invalid hardware address\n" - msgstr "arp: vigane riistvaraline aadress\n" - --#: ../arp.c:387 -+#: ../arp.c:398 - #, c-format - msgid "arp: cannot open etherfile %s !\n" - msgstr "arp: ei saa avada faili %s\n" - --#: ../arp.c:403 -+#: ../arp.c:414 - #, c-format - msgid "arp: format error on line %u of etherfile %s !\n" - msgstr "arp: formaadiviga real %u failis %s\n" - --#: ../arp.c:416 -+#: ../arp.c:427 - #, c-format - msgid "arp: cannot set entry on line %u of etherfile %s !\n" - msgstr "arp: ei saa kehtestada ARP kirjet real %u failis %s\n" - --#: ../arp.c:437 -+#: ../arp.c:448 -+#, c-format - msgid "" - "Address HWtype HWaddress Flags Mask " - "Iface\n" -@@ -68,45 +74,52 @@ - "Aadress HWtüüp HWaadress Lipud Mask " - "Liides\n" - --#: ../arp.c:467 -+#: ../arp.c:476 -+#, fuzzy -+msgid "<from_interface>" -+msgstr " liides %s\n" -+ -+#: ../arp.c:478 - msgid "(incomplete)" - msgstr "(mittetäielik)" - --#: ../arp.c:484 -+#: ../arp.c:495 - #, c-format - msgid "%s (%s) at " - msgstr "%s (%s) aadressil " - --#: ../arp.c:490 -+#: ../arp.c:501 -+#, c-format - msgid "<incomplete> " - msgstr "<mittetäielik>" - --#: ../arp.c:496 -+#: ../arp.c:507 - #, c-format - msgid "netmask %s " - msgstr "vőrgumask %s " - --#: ../arp.c:513 -+#: ../arp.c:524 - #, c-format - msgid "on %s\n" - msgstr "liides %s\n" - --#: ../arp.c:592 -+#: ../arp.c:605 - #, c-format - msgid "Entries: %d\tSkipped: %d\tFound: %d\n" - msgstr "ARP kirjeid kokku: %s\tignoreerisin: %d\tleidsin: %d\n" - --#: ../arp.c:596 -+#: ../arp.c:609 - #, c-format - msgid "%s (%s) -- no entry\n" - msgstr "%s (%s) -- pole kirjet\n" - --#: ../arp.c:598 -+#: ../arp.c:611 - #, c-format - msgid "arp: in %d entries no match found.\n" - msgstr "arp: ei leidnud %d kirje hulgast sobivat\n" - --#: ../arp.c:613 -+#: ../arp.c:626 -+#, c-format - msgid "" - "Usage:\n" - " arp [-vn] [<HW>] [-i <if>] [-a] [<hostname>] <-Display ARP " -@@ -116,47 +129,45 @@ - "ARP cache vaatamine:\n" - " arp [-vn] [<HW>] [-i <if>] [-a] [<hosti nimi>]\n" - --#: ../arp.c:614 -+#: ../arp.c:627 -+#, fuzzy, c-format - msgid "" --" arp [-v] [-i <if>] -d <hostname> [pub][nopub] <-Delete ARP " -+" arp [-v] [-i <if>] -d <host> [pub] <-Delete ARP " - "entry\n" - msgstr "" - "ARP kirje kustutamine:\n" - " arp [-v] [-i <if>] -d <hosti nimi> [pub] [nopub]\n" - --#: ../arp.c:615 -+#: ../arp.c:628 -+#, fuzzy, c-format - msgid "" --" arp [-vnD] [<HW>] [-i <if>] -f [<filename>] <-Add entry from " -+" arp [-vnD] [<HW>] [-i <if>] -f [<filename>] <-Add entry from " - "file\n" - msgstr "" - "ARP kirjete lisamine failist:\n" - " arp [-vnD] [<HW>] [-i <if>] -f [<failinimi>]\n" - --#: ../arp.c:616 -+#: ../arp.c:629 -+#, fuzzy, c-format - msgid "" --" arp [-v] [<HW>] [-i <if>] -s <hostname> <hwaddr> [temp][nopub] <-Add " -+" arp [-v] [<HW>] [-i <if>] -s <host> <hwaddr> [temp] <-Add " - "entry\n" - msgstr "" - "ARP kirje lisamine:\n" - " arp [-v] [<HW>] [-i <if>] -s <hosti nimi> <hwaddr> [temp] [nopub]\n" - --#: ../arp.c:617 --msgid "" --" arp [-v] [<HW>] [-i <if>] -s <hostname> <hwaddr> [netmask <nm>] pub " --"<-''-\n" --msgstr "" --" arp [-v] [<HW>] [-i <if>] -s <hosti nimi> <hwaddr> [netmask <nm>] pub\n" -- --#: ../arp.c:618 -+#: ../arp.c:630 -+#, fuzzy, c-format - msgid "" --" arp [-v] [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub " -+" arp [-v] [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub " - "<-''-\n" - "\n" - msgstr "" - " arp [-v] [<HW>] [-i <if>] -Ds <hosti nimi> <if> [netmask <nm>] pub\n" - "\n" - --#: ../arp.c:620 -+#: ../arp.c:632 -+#, c-format - msgid "" - " -a display (all) hosts in alternative (BSD) " - "style\n" -@@ -164,122 +175,132 @@ - " -a näita kőiki hoste alternatiivsel (BSD) " - "kujul\n" - --#: ../arp.c:621 -+#: ../arp.c:633 -+#, c-format - msgid " -s, --set set a new ARP entry\n" - msgstr " -s, --set uue ARP kirje seadmine\n" - --#: ../arp.c:622 -+#: ../arp.c:634 -+#, c-format - msgid " -d, --delete delete a specified entry\n" - msgstr " -d, --delete määratud kirje kustutamine\n" - --#: ../arp.c:623 ../netstat.c:1485 ../route.c:85 -+#: ../arp.c:635 ../netstat.c:1503 ../route.c:86 -+#, c-format - msgid " -v, --verbose be verbose\n" - msgstr " -v, --verbose jutukas väljund\n" - --#: ../arp.c:624 -+#: ../arp.c:636 ../netstat.c:1504 ../route.c:87 -+#, c-format - msgid " -n, --numeric don't resolve names\n" - msgstr " -n, --numeric mitte lahendada nimesid\n" - --#: ../arp.c:625 -+#: ../arp.c:637 -+#, c-format - msgid "" - " -i, --device specify network interface (e.g. eth0)\n" - msgstr "" - " -i, --device vőrguliidese täpsustamine (näiteks eth0)\n" - --#: ../arp.c:626 -+#: ../arp.c:638 -+#, c-format - msgid " -D, --use-device read <hwaddr> from given device\n" - msgstr " -D, --use-device lugeda <hwaddr> vastavalt liideselt\n" - --#: ../arp.c:627 -+#: ../arp.c:639 -+#, c-format - msgid " -A, -p, --protocol specify protocol family\n" - msgstr " -A, -p, --protocol protokollipere määramine\n" - --#: ../arp.c:628 -+#: ../arp.c:640 -+#, c-format - msgid "" --" -f, --file read new entries from file or from " --"/etc/ethers\n" -+" -f, --file read new entries from file or from /etc/" -+"ethers\n" - "\n" - msgstr "" --" -f, --file lugeda kirjed antud failist vői " --"/etc/ethers'st\n" -+" -f, --file lugeda kirjed antud failist vői /etc/" -+"ethers'st\n" - "\n" - --#: ../arp.c:630 ../rarp.c:181 -+#: ../arp.c:642 ../rarp.c:182 - #, c-format - msgid " <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n" - msgstr "" - " <HW>=kasutage '-H <hw>' riistvaralise aadressi määramiseks.\n" - " Vaikimisi: %s\n" - --#: ../arp.c:631 ../rarp.c:182 -+#: ../arp.c:643 ../rarp.c:183 -+#, c-format - msgid " List of possible hardware types (which support ARP):\n" - msgstr " Vőimalike ARP-i toetavate riistvara tüüpide nimekiri:\n" - --#: ../arp.c:664 ../arp.c:749 -+#: ../arp.c:677 ../arp.c:762 - #, c-format - msgid "%s: hardware type not supported!\n" - msgstr "arp: riistvara tüüpi %s ei toetata\n" - --#: ../arp.c:668 -+#: ../arp.c:681 - #, c-format - msgid "%s: address family not supported!\n" - msgstr "arp: aadressiperekonda %s ei toetata\n" - --#: ../arp.c:703 -+#: ../arp.c:716 -+#, c-format - msgid "arp: -N not yet supported.\n" - msgstr "arp: -N toetust pole veel\n" - --#: ../arp.c:713 -+#: ../arp.c:726 - #, c-format - msgid "arp: %s: unknown address family.\n" - msgstr "arp: tundmatu aadressiperekond %s\n" - --#: ../arp.c:722 -+#: ../arp.c:735 - #, c-format - msgid "arp: %s: unknown hardware type.\n" - msgstr "arp: tundmatu riistvara tüüp %s\n" - --#: ../arp.c:741 -+#: ../arp.c:754 - #, c-format - msgid "arp: %s: kernel only supports 'inet'.\n" - msgstr "arp: tuumas on ainult 'inet' aadressiperekonna toetus\n" - --#: ../arp.c:754 -+#: ../arp.c:767 - #, c-format - msgid "arp: %s: hardware type without ARP support.\n" - msgstr "arp: riistvara tüübil %s pole ARP toetust\n" - --#: ../hostname.c:69 -+#: ../hostname.c:71 - #, c-format - msgid "Setting nodename to `%s'\n" - msgstr "Sean sőlme nimeks `%s'\n" - --#: ../hostname.c:74 -+#: ../hostname.c:76 - #, c-format - msgid "%s: you must be root to change the node name\n" - msgstr "%s: ainult root saab sőlme nime muuta\n" - --#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116 -+#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117 - #, c-format - msgid "%s: name too long\n" - msgstr "%s: nimi on liiga pikk\n" - --#: ../hostname.c:89 -+#: ../hostname.c:91 - #, c-format - msgid "Setting hostname to `%s'\n" - msgstr "Sean hosti nimeks `%s'\n" - --#: ../hostname.c:94 -+#: ../hostname.c:96 - #, c-format - msgid "%s: you must be root to change the host name\n" - msgstr "%s: ainult root saab hosti nime muuta\n" - --#: ../hostname.c:108 -+#: ../hostname.c:109 - #, c-format - msgid "Setting domainname to `%s'\n" - msgstr "Sean domeeni nimeks `%s'\n" - --#: ../hostname.c:113 -+#: ../hostname.c:114 - #, c-format - msgid "%s: you must be root to change the domain name\n" - msgstr "%s: ainult root saab domeeni nime muuta\n" -@@ -304,25 +325,28 @@ - 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 @@ - " nodename [-v] {nodename|-F fail} DECneti vőrgusőlme nime " - "seadmine\n" - --#: ../hostname.c:228 -+#: ../hostname.c:227 -+#, c-format - msgid " hostname [-v] [-d|-f|-s|-a|-i|-y|-n] display formatted name\n" - msgstr "" - " hostname [-v] [-d|-f|-s|-a|-i|-y|-n] nime näitamine antud formaadis\n" - --#: ../hostname.c:229 -+#: ../hostname.c:228 -+#, c-format - msgid "" - " hostname [-v] display hostname\n" - "\n" - msgstr " hostname [-v] hosti nime näitamine\n" - --#: ../hostname.c:230 -+#: ../hostname.c:229 -+#, c-format - msgid "" - " hostname -V|--version|-h|--help print info and exit\n" - "\n" -@@ -350,7 +377,8 @@ - " 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 @@ - " dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" - "\n" - --#: ../hostname.c:232 -+#: ../hostname.c:231 -+#, c-format - msgid " -s, --short short host name\n" - msgstr " -s, --short lühike hosti nimi\n" - --#: ../hostname.c:233 -+#: ../hostname.c:232 -+#, c-format - msgid " -a, --alias alias names\n" - msgstr " -a, --alias alias-nimed\n" - --#: ../hostname.c:234 -+#: ../hostname.c:233 -+#, c-format - msgid " -i, --ip-address addresses for the hostname\n" - msgstr " -i, --ip-address hosti IP aadressid\n" - --#: ../hostname.c:235 -+#: ../hostname.c:234 -+#, c-format - msgid " -f, --fqdn, --long long host name (FQDN)\n" - msgstr "" - " -f, --fqdn, --long pikk hosti nimi (FQDN - täielik süsteeminimi)\n" - --#: ../hostname.c:236 -+#: ../hostname.c:235 -+#, c-format - msgid " -d, --domain DNS domain name\n" - msgstr " -d, --domain DNS domeeni nimi\n" - --#: ../hostname.c:237 -+#: ../hostname.c:236 -+#, c-format - msgid " -y, --yp, --nis NIS/YP domainname\n" - msgstr " -y, --yp, --nis NIS/YP domeeni nimi\n" - --#: ../hostname.c:239 -+#: ../hostname.c:238 -+#, c-format - msgid " -n, --node DECnet node name\n" - msgstr " -n, --node DECneti vőrgusőlme nimi\n" - --#: ../hostname.c:241 -+#: ../hostname.c:240 -+#, c-format - msgid "" - " -F, --file read hostname or NIS domainname from given file\n" - "\n" -@@ -395,7 +431,8 @@ - " -F, --file lugeda hosti vői NIS domeeni nimi failist\n" - "\n" - --#: ../hostname.c:243 -+#: ../hostname.c:242 -+#, c-format - msgid "" - " This command can read or set the hostname or the NIS domainname. You can\n" - " also read the DNS domain or the FQDN (fully qualified domain name).\n" -@@ -415,6 +452,7 @@ - msgstr "%s: selle käsuga ei saa muuta DNS domeeni nime\n" - - #: ../hostname.c:339 -+#, c-format - msgid "" - "\n" - "Unless you are using bind or NIS for host lookups you can change the DNS\n" -@@ -423,6 +461,7 @@ - "Kui Te EI kasuta bind'i ega NIS'i nimede lahendamiseks, saate DNS domeeni\n" - - #: ../hostname.c:340 -+#, c-format - msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n" - msgstr "(mis on täieliku nime osa) nime muuta failist /etc/hosts.\n" - -@@ -441,76 +480,97 @@ - msgid "getnodename()=`%s'\n" - msgstr "getnodename()=`%s'\n" - --#: ../ifconfig.c:110 -+#: ../ifconfig.c:107 -+#, c-format - msgid "" --"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " -+"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " - "Flg\n" - msgstr "" --"Liides MTU Meetr. RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " -+"Liides MTU Meetr RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " - "Lip\n" - --#: ../ifconfig.c:132 ../ifconfig.c:164 --#, c-format --msgid "%s: unknown interface: %s\n" --msgstr "ifconfig: tundmatu liides %s: %s\n" -+#: ../ifconfig.c:129 ../ifconfig.c:161 -+#, fuzzy, c-format -+msgid "%s: ERROR while getting interface flags: %s\n" -+msgstr "%s: viga liidese info küsimisel: %s\n" - --#: ../ifconfig.c:156 ../ifconfig.c:740 ../ifconfig.c:831 ../ifconfig.c:937 -+#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862 -+#: ../ifconfig.c:973 -+#, c-format - msgid "No support for INET on this system.\n" - msgstr "Antud süsteem ei toeta INET aadressiperekonda\n" - --#: ../ifconfig.c:179 -+#: ../ifconfig.c:193 -+#, fuzzy, c-format -+msgid "%s: ERROR while testing interface flags: %s\n" -+msgstr "%s: viga liidese info küsimisel: %s\n" -+ -+#: ../ifconfig.c:202 -+#, fuzzy, c-format - msgid "" - "Usage:\n" --" ifconfig [-a] [-i] [-v] [-s] <interface> [[<AF>] <address>]\n" -+" ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n" - msgstr "" - "Kasutamine:\n" - " ifconfig [-a] [-i] [-v] [-s] <liides> [[<AF>] <aadress>]\n" - --#: ../ifconfig.c:181 -+#: ../ifconfig.c:204 -+#, c-format - msgid " [add <address>[/<prefixlen>]]\n" - msgstr " [add <aadress>[/<prefiksi pikkus>]]\n" - --#: ../ifconfig.c:182 -+#: ../ifconfig.c:205 -+#, c-format - msgid " [del <address>[/<prefixlen>]]\n" - msgstr " [del <aadress>[/<prefiksi pikkus>]]\n" - --#: ../ifconfig.c:183 -+#: ../ifconfig.c:206 -+#, c-format - msgid " [[-]broadcast [<address>]] [[-]pointopoint [<address>]]\n" - msgstr " [[-]broadcast [<aadress>]] [[-]pointopoint [<aadress>]]\n" - --#: ../ifconfig.c:184 -+#: ../ifconfig.c:207 -+#, c-format - msgid " [netmask <address>] [dstaddr <address>] [tunnel <address>]\n" - msgstr " [netmask <aadress>] [dstaddr <aadress>] [tunnel <aadress>]\n" - --#: ../ifconfig.c:187 -+#: ../ifconfig.c:210 -+#, c-format - msgid " [outfill <NN>] [keepalive <NN>]\n" - msgstr " [outfill <NN>] [keepalive <NN>]\n" - --#: ../ifconfig.c:189 -+#: ../ifconfig.c:212 -+#, c-format - msgid " [hw <HW> <address>] [metric <NN>] [mtu <NN>]\n" - msgstr " [hw <HW> <aadress>] [metric <NN>] [mtu <NN>]\n" - --#: ../ifconfig.c:190 -+#: ../ifconfig.c:213 -+#, c-format - msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" - msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" - --#: ../ifconfig.c:191 -+#: ../ifconfig.c:214 -+#, c-format - msgid " [multicast] [[-]promisc]\n" - msgstr " [multicast] [[-]promisc]\n" - --#: ../ifconfig.c:192 -+#: ../ifconfig.c:215 -+#, c-format - msgid " [mem_start <NN>] [io_addr <NN>] [irq <NN>] [media <type>]\n" - msgstr " [mem_start <NN>] [io_addr <NN>] [irq <NN>] [media <tüüp>]\n" - --#: ../ifconfig.c:194 -+#: ../ifconfig.c:217 -+#, c-format - msgid " [txqueuelen <NN>]\n" - msgstr " [txqueuelen <NN>]\n" - --#: ../ifconfig.c:197 -+#: ../ifconfig.c:220 -+#, c-format - msgid " [[-]dynamic]\n" - msgstr " [[-]dynamic]\n" - --#: ../ifconfig.c:199 -+#: ../ifconfig.c:222 -+#, c-format - msgid "" - " [up|down] ...\n" - "\n" -@@ -518,73 +578,134 @@ - " [up|down] ...\n" - "\n" - --#: ../ifconfig.c:201 -+#: ../ifconfig.c:224 -+#, c-format - msgid " <HW>=Hardware Type.\n" - msgstr " <HW>=riistvara tüüp\n" - --#: ../ifconfig.c:202 -+#: ../ifconfig.c:225 -+#, c-format - msgid " List of possible hardware types:\n" - msgstr " Vőimalike riistvara tüüpide nimekiri:\n" - - #. 1 = ARPable --#: ../ifconfig.c:204 -+#: ../ifconfig.c:227 - #, c-format - msgid " <AF>=Address family. Default: %s\n" - msgstr " <AF>=aadressiperekond, vaikimisi %s\n" - --#: ../ifconfig.c:205 -+#: ../ifconfig.c:228 -+#, c-format - msgid " List of possible address families:\n" - msgstr " Vőimalike aadressiperekondade nimekiri:\n" - --#: ../ifconfig.c:361 -+#: ../ifconfig.c:303 -+#, c-format -+msgid "ifconfig: option `%s' not recognised.\n" -+msgstr "" -+ -+#: ../ifconfig.c:305 ../ifconfig.c:962 -+#, c-format -+msgid "ifconfig: `--help' gives usage information.\n" -+msgstr "" -+ -+#: ../ifconfig.c:380 -+#, c-format - msgid "Unknown media type.\n" - msgstr "Tundmatu meedia tüüp\n" - --#: ../ifconfig.c:653 -+#: ../ifconfig.c:417 -+#, c-format -+msgid "" -+"Warning: Interface %s still in promisc mode... maybe other application is " -+"running?\n" -+msgstr "" -+ -+#: ../ifconfig.c:429 -+#, c-format -+msgid "Warning: Interface %s still in MULTICAST mode.\n" -+msgstr "" -+ -+#: ../ifconfig.c:441 -+#, c-format -+msgid "Warning: Interface %s still in ALLMULTI mode.\n" -+msgstr "" -+ -+#: ../ifconfig.c:465 -+#, c-format -+msgid "Warning: Interface %s still in DYNAMIC mode.\n" -+msgstr "" -+ -+#: ../ifconfig.c:523 -+#, c-format -+msgid "Warning: Interface %s still in BROADCAST mode.\n" -+msgstr "" -+ -+#: ../ifconfig.c:652 -+#, c-format -+msgid "Warning: Interface %s still in POINTOPOINT mode.\n" -+msgstr "" -+ -+#: ../ifconfig.c:684 - #, c-format - msgid "hw address type `%s' has no handler to set address. failed.\n" - msgstr "" - "riistvara aadressi tüübil `%s' pole käsitlejat aadressi seadmiseks - ebaőnn\n" - --#: ../ifconfig.c:662 -+#: ../ifconfig.c:693 - #, c-format - msgid "%s: invalid %s address.\n" - msgstr "%s: vigane %s aadress\n" - --#: ../ifconfig.c:706 ../ifconfig.c:796 ../ifconfig.c:882 -+#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913 -+#, c-format - msgid "No support for INET6 on this system.\n" - msgstr "Antud süsteem ei toeta INET6 aadressiperekonda\n" - --#: ../ifconfig.c:749 ../ifconfig.c:840 -+#: ../ifconfig.c:780 ../ifconfig.c:871 - #, c-format - msgid "Interface %s not initialized\n" - msgstr "Liides %s pole initsialiseeritud\n" - --#: ../ifconfig.c:761 ../ifconfig.c:851 -+#: ../ifconfig.c:792 ../ifconfig.c:882 -+#, c-format - msgid "Bad address.\n" - msgstr "Vigane aadress\n" - --#: ../ifconfig.c:854 -+#: ../ifconfig.c:885 -+#, c-format - msgid "Address deletion not supported on this system.\n" - msgstr "Antud süsteem ei toeta aadresside kustutamist\n" - --#: ../ifconfig.c:947 -+#: ../ifconfig.c:957 -+#, fuzzy, c-format -+msgid "ifconfig: Cannot set address for this protocol family.\n" -+msgstr "Ei oska seada aadresse aadressiperekonna %d jaoks\n" -+ -+#: ../ifconfig.c:983 -+#, c-format - msgid "No support for ECONET on this system.\n" - msgstr "Antud süsteem ei toeta ECONET aadressiperekonda\n" - --#: ../ifconfig.c:955 -+#: ../ifconfig.c:991 - #, c-format - msgid "Don't know how to set addresses for family %d.\n" - msgstr "Ei oska seada aadresse aadressiperekonna %d jaoks\n" - --#: ../netstat.c:429 -+#: ../ifconfig.c:1021 -+#, c-format -+msgid "WARNING: at least one error occured. (%d)\n" -+msgstr "" -+ -+#: ../netstat.c:434 - #, c-format - msgid "" - "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n" - msgstr "" - "(\"-p\" jaoks ei saanud infot lugeda: geteuid()=%d, aga vaja oleks root'u)\n" - --#: ../netstat.c:433 -+#: ../netstat.c:438 -+#, c-format - msgid "" - "(Not all processes could be identified, non-owned process info\n" - " will not be shown, you would have to be root to see it all.)\n" -@@ -592,210 +713,223 @@ - "(Mőnesid protsesse ei saanud identifitseerida, teiste kasutajate\n" - "info lugemiseks peab olema root)\n" - --#: ../netstat.c:440 ../netstat.c:1171 ../netstat.c:1248 -+#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266 - msgid "LISTENING" - msgstr "LISTENING" - --#: ../netstat.c:441 -+#: ../netstat.c:446 - msgid "CONN SENT" - msgstr "CONN SENT" - --#: ../netstat.c:442 ../netstat.c:1250 -+#: ../netstat.c:447 ../netstat.c:1268 - msgid "DISC SENT" - msgstr "DISC SENT" - --#: ../netstat.c:443 ../netstat.c:510 ../netstat.c:889 ../netstat.c:1251 -+#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269 - msgid "ESTABLISHED" - msgstr "ESTABLISHED" - --#: ../netstat.c:465 -+#: ../netstat.c:470 -+#, c-format - msgid "Active NET/ROM sockets\n" - msgstr "Aktiivsed NET/ROM soklid\n" - --#: ../netstat.c:466 -+#: ../netstat.c:471 -+#, c-format - msgid "" --"User Dest Source Device State Vr/Vs Send-Q " --"Recv-Q\n" -+"User Dest Source Device State Vr/Vs Send-Q Recv-" -+"Q\n" - msgstr "" - "Kasutaja Sihtpunkt Lähtepunkt Liides Olek Vr/Vs SaatJrk " - "VvJrk\n" - --#: ../netstat.c:476 ../netstat.c:1290 -+#: ../netstat.c:481 ../netstat.c:1308 - #, c-format - msgid "Problem reading data from %s\n" - msgstr "Probleem andmete lugemisel failist %s\n" - --#: ../netstat.c:511 -+#: ../netstat.c:516 - msgid "SYN_SENT" - msgstr "SYN_SENT" - --#: ../netstat.c:512 -+#: ../netstat.c:517 - msgid "SYN_RECV" - msgstr "SYN_RECV" - --#: ../netstat.c:513 -+#: ../netstat.c:518 - msgid "FIN_WAIT1" - msgstr "FIN_WAIT1" - --#: ../netstat.c:514 -+#: ../netstat.c:519 - msgid "FIN_WAIT2" - msgstr "FIN_WAIT2" - --#: ../netstat.c:515 -+#: ../netstat.c:520 - msgid "TIME_WAIT" - msgstr "TIME_WAIT" - --#: ../netstat.c:516 -+#: ../netstat.c:521 - msgid "CLOSE" - msgstr "CLOSE" - --#: ../netstat.c:517 -+#: ../netstat.c:522 - msgid "CLOSE_WAIT" - msgstr "CLOSE_WAIT" - --#: ../netstat.c:518 -+#: ../netstat.c:523 - msgid "LAST_ACK" - msgstr "LAST_ACK" - --#: ../netstat.c:519 -+#: ../netstat.c:524 - msgid "LISTEN" - msgstr "LISTEN" - --#: ../netstat.c:520 -+#: ../netstat.c:525 - msgid "CLOSING" - msgstr "CLOSING" - --#: ../netstat.c:587 -+#: ../netstat.c:596 - #, c-format - msgid "warning, got bogus igmp6 line %d.\n" - msgstr "Hoiatus - sain imeliku igmp6 rea (nr. %d)\n" - --#: ../netstat.c:592 ../netstat.c:630 ../netstat.c:751 ../netstat.c:883 --#: ../netstat.c:1014 ../netstat.c:1019 -+#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898 -+#: ../netstat.c:1032 ../netstat.c:1037 - #, c-format - msgid "netstat: unsupported address family %d !\n" - msgstr "netstat: aadressiperekonda %d ei toetata\n" - --#: ../netstat.c:605 ../netstat.c:610 ../netstat.c:618 ../netstat.c:625 -+#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634 - #, c-format - msgid "warning, got bogus igmp line %d.\n" - msgstr "Hoiatus - sain imeliku igmp rea (nr. %d)\n" - --#: ../netstat.c:668 -+#: ../netstat.c:677 -+#, c-format - msgid "Active X.25 sockets\n" - msgstr "Aktiivsed X.25 soklid\n" - - #. IMHO, Vr/Vs is not very usefull --SF --#: ../netstat.c:670 -+#: ../netstat.c:679 -+#, c-format - msgid "" --"Dest Source Device LCI State Vr/Vs Send-Q " --"Recv-Q\n" -+"Dest Source Device LCI State Vr/Vs Send-Q Recv-" -+"Q\n" - msgstr "" - "Sihtpunkt Lähtepunkt Liides LCI Olek Vr/Vs SaatJrk VvJrk\n" - --#: ../netstat.c:747 -+#: ../netstat.c:759 -+#, c-format - msgid "warning, got bogus tcp line.\n" - msgstr "Hoiatus - sain imeliku tcp rea\n" - --#: ../netstat.c:788 ../netstat.c:938 ../netstat.c:1057 -+#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075 - #, c-format - msgid "off (0.00/%ld/%d)" - msgstr "eikäi ((0.00/%ld/%d)" - --#: ../netstat.c:792 -+#: ../netstat.c:804 - #, c-format - msgid "on (%2.2f/%ld/%d)" - msgstr "käib (%2.2f/%ld/%d)" - --#: ../netstat.c:797 -+#: ../netstat.c:809 - #, c-format - msgid "keepalive (%2.2f/%ld/%d)" - msgstr "keepalive (%2.2f/%ld/%d)" - --#: ../netstat.c:802 -+#: ../netstat.c:814 - #, c-format - msgid "timewait (%2.2f/%ld/%d)" - msgstr "timewait (%2.2f/%ld/%d)" - --#: ../netstat.c:807 ../netstat.c:947 ../netstat.c:1067 -+#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085 - #, c-format - msgid "unkn-%d (%2.2f/%ld/%d)" - msgstr "eitea-%d (%2.2f/%ld/%d)" - --#: ../netstat.c:879 -+#: ../netstat.c:894 -+#, c-format - msgid "warning, got bogus udp line.\n" - msgstr "Hoiatus - sain imeliku udp rea\n" - --#: ../netstat.c:897 ../netstat.c:1157 ../netstat.c:1190 -+#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208 - msgid "UNKNOWN" - msgstr "TUNDMATU" - --#: ../netstat.c:943 ../netstat.c:1062 -+#: ../netstat.c:958 ../netstat.c:1080 - #, c-format - msgid "on%d (%2.2f/%ld/%d)" - msgstr "käib-%d (%2.2f/%ld/%d)" - --#: ../netstat.c:1028 -+#: ../netstat.c:1046 -+#, c-format - msgid "warning, got bogus raw line.\n" - msgstr "Hoiatus - sain imeliku raw rea\n" - --#: ../netstat.c:1110 -+#: ../netstat.c:1128 -+#, c-format - msgid "warning, got bogus unix line.\n" - msgstr "Hoiatus - sain imeliku unix rea\n" - --#: ../netstat.c:1137 -+#: ../netstat.c:1155 - msgid "STREAM" - msgstr "STREAM" - --#: ../netstat.c:1141 -+#: ../netstat.c:1159 - msgid "DGRAM" - msgstr "DGRAM" - --#: ../netstat.c:1145 -+#: ../netstat.c:1163 - msgid "RAW" - msgstr "RAW" - --#: ../netstat.c:1149 -+#: ../netstat.c:1167 - msgid "RDM" - msgstr "RDM" - --#: ../netstat.c:1153 -+#: ../netstat.c:1171 - msgid "SEQPACKET" - msgstr "SEQPACKET" - --#: ../netstat.c:1162 -+#: ../netstat.c:1180 - msgid "FREE" - msgstr "VABA" - --#: ../netstat.c:1178 -+#: ../netstat.c:1196 - msgid "CONNECTING" - msgstr "ÜHENDUMAS" - --#: ../netstat.c:1182 -+#: ../netstat.c:1200 - msgid "CONNECTED" - msgstr "ÜHENDATUD" - --#: ../netstat.c:1186 -+#: ../netstat.c:1204 - msgid "DISCONNECTING" - msgstr "LAHTIÜHENDUMAS" - --#: ../netstat.c:1217 -+#: ../netstat.c:1235 -+#, c-format - msgid "Active UNIX domain sockets " - msgstr "Aktiivsed UNIX domeeni soklid " - --#: ../netstat.c:1219 ../netstat.c:1729 -+#: ../netstat.c:1237 ../netstat.c:1756 -+#, c-format - msgid "(servers and established)" - msgstr "(serverid ja ühendatud)" - --#: ../netstat.c:1222 ../netstat.c:1732 -+#: ../netstat.c:1240 ../netstat.c:1759 -+#, c-format - msgid "(only servers)" - msgstr "(ainult serverid)" - --#: ../netstat.c:1224 ../netstat.c:1734 -+#: ../netstat.c:1242 ../netstat.c:1761 -+#, c-format - msgid "(w/o servers)" - msgstr "(ilma serveriteta)" - --#: ../netstat.c:1227 -+#: ../netstat.c:1245 -+#, c-format - msgid "" - "\n" - "Proto RefCnt Flags Type State I-Node" -@@ -803,32 +937,36 @@ - "\n" - "Proto Mitu Lipud Tüüp Olek I-kirje " - --#: ../netstat.c:1229 -+#: ../netstat.c:1247 -+#, c-format - msgid " Path\n" - msgstr "Tee\n" - --#: ../netstat.c:1249 -+#: ../netstat.c:1267 - msgid "SABM SENT" - msgstr "SABM SENT" - --#: ../netstat.c:1252 -+#: ../netstat.c:1270 - msgid "RECOVERY" - msgstr "RECOVERY" - --#: ../netstat.c:1266 -+#: ../netstat.c:1284 -+#, c-format - msgid "Active AX.25 sockets\n" - msgstr "Aktiivsed AX.25 soklid\n" - --#: ../netstat.c:1267 -+#: ../netstat.c:1285 -+#, c-format - msgid "Dest Source Device State Vr/Vs Send-Q Recv-Q\n" - msgstr "Sihtpunkt Lähtepunkt Liides Olek Vr/Vs SaatJrk VvJrk\n" - --#: ../netstat.c:1310 -+#: ../netstat.c:1328 - #, c-format - msgid "problem reading data from %s\n" - msgstr "Probleem andmete lugemisel failist %s\n" - --#: ../netstat.c:1361 -+#: ../netstat.c:1379 -+#, c-format - msgid "" - "Active IPX sockets\n" - "Proto Recv-Q Send-Q Local Address Foreign Address " -@@ -838,47 +976,53 @@ - "Proto VvJrk SaatJrk Kohalik aadress Väline aadress " - "Olek " - --#: ../netstat.c:1363 -+#: ../netstat.c:1381 -+#, c-format - msgid " User" - msgstr " Kasutaja" - --#: ../netstat.c:1397 -+#: ../netstat.c:1415 - msgid "ESTAB" - msgstr "ESTAB" - --#: ../netstat.c:1405 -+#: ../netstat.c:1423 - msgid "UNK." - msgstr "UNK." - --#: ../netstat.c:1443 -+#: ../netstat.c:1461 -+#, c-format - msgid "Kernel Interface table\n" - msgstr "Tuuma liideste tabel\n" - --#: ../netstat.c:1447 -+#: ../netstat.c:1465 -+#, fuzzy, c-format - msgid "" --"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " -+"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " - "Flg\n" - msgstr "" --"Liides MTU Meetr RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " -+"Liides MTU Meetr. RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " - "Lip\n" - --#: ../netstat.c:1451 -+#: ../netstat.c:1469 - msgid "missing interface information" - msgstr "Puudulik informatsioon liideste kohta" - --#: ../netstat.c:1474 -+#: ../netstat.c:1492 -+#, c-format - msgid "" --"usage: netstat [-veenNcCF] [<Af>] -r netstat " --"{-V|--version|-h|--help}\n" -+"usage: netstat [-veenNcCF] [<Af>] -r netstat {-V|--version|-h|--" -+"help}\n" - msgstr "" - "Kasutamine: netstat [-veenNcCF] [<Af>] -r\n" - " netstat {-V|--version|-h|--help}\n" - --#: ../netstat.c:1475 -+#: ../netstat.c:1493 -+#, c-format - msgid " netstat [-vnNcaeol] [<Socket> ...]\n" - msgstr " netstat [-vnNcaeol] [<Sokkel> ...]\n" - --#: ../netstat.c:1476 -+#: ../netstat.c:1494 -+#, c-format - msgid "" - " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" - "\n" -@@ -886,25 +1030,30 @@ - " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" - "\n" - --#: ../netstat.c:1478 -+#: ../netstat.c:1496 -+#, c-format - msgid " -r, --route display routing table\n" - msgstr " -r, --route ruutingutabeli näitamine\n" - --#: ../netstat.c:1479 -+#: ../netstat.c:1497 -+#, c-format - msgid " -i, --interfaces display interface table\n" - msgstr " -i, --interfaces liideste tabeli näitamine\n" - --#: ../netstat.c:1480 -+#: ../netstat.c:1498 -+#, c-format - msgid " -g, --groups display multicast group memberships\n" - msgstr " -g, --groups multiedastuse gruppide näitamine\n" - --#: ../netstat.c:1481 -+#: ../netstat.c:1499 -+#, c-format - msgid "" - " -s, --statistics display networking statistics (like SNMP)\n" - msgstr "" - " -s, --statistics vőrgu statistika näitamine (SNMP stiilis)\n" - --#: ../netstat.c:1483 -+#: ../netstat.c:1501 -+#, c-format - msgid "" - " -M, --masquerade display masqueraded connections\n" - "\n" -@@ -912,36 +1061,39 @@ - " -M, --masquerade maskeeritavate ühenduste näitamine\n" - "\n" - --#: ../netstat.c:1486 ../route.c:86 --msgid " -n, --numeric dont resolve names\n" --msgstr " -n, --numeric mitte lahendada numbreid nimedeks\n" -- --#: ../netstat.c:1487 --msgid " --numeric-hosts dont resolve host names\n" -+#: ../netstat.c:1505 -+#, fuzzy, c-format -+msgid " --numeric-hosts don't resolve host names\n" - msgstr " --numeric-hosts mitte lahendada hostinimesid\n" - --#: ../netstat.c:1488 --msgid " --numeric-ports dont resolve port names\n" -+#: ../netstat.c:1506 -+#, fuzzy, c-format -+msgid " --numeric-ports don't resolve port names\n" - msgstr " --numeric-ports mitte lahendada pordinimesid\n" - --#: ../netstat.c:1489 --msgid " --numeric-users dont resolve user names\n" -+#: ../netstat.c:1507 -+#, fuzzy, c-format -+msgid " --numeric-users don't resolve user names\n" - msgstr " --numeric-users mitte lahendada kasutajanimesid\n" - --#: ../netstat.c:1490 -+#: ../netstat.c:1508 -+#, c-format - msgid " -N, --symbolic resolve hardware names\n" - msgstr " -N, --symbolic lahendada riistvara aadressid\n" - --#: ../netstat.c:1491 ../route.c:87 -+#: ../netstat.c:1509 ../route.c:88 -+#, c-format - msgid " -e, --extend display other/more information\n" - msgstr " -e, --extend muu info/lisainfo näitamine\n" - --#: ../netstat.c:1492 -+#: ../netstat.c:1510 -+#, c-format - msgid " -p, --programs display PID/Program name for sockets\n" - msgstr "" - " -p, --programs soklite kohta PID/protsessi nime näitamine\n" - --#: ../netstat.c:1493 -+#: ../netstat.c:1511 -+#, c-format - msgid "" - " -c, --continuous continuous listing\n" - "\n" -@@ -949,22 +1101,26 @@ - " -c, --continuous pidevalt uuenev nimekiri\n" - "\n" - --#: ../netstat.c:1494 -+#: ../netstat.c:1512 -+#, c-format - msgid " -l, --listening display listening server sockets\n" - msgstr " -l, --listening kuulavate serversoklite näitamine\n" - --#: ../netstat.c:1495 -+#: ../netstat.c:1513 -+#, c-format - msgid "" - " -a, --all, --listening display all sockets (default: connected)\n" - msgstr "" - " -a, --all, --listening kőigi soklite näitamine (vaikimisi " - "ühendatud)\n" - --#: ../netstat.c:1496 -+#: ../netstat.c:1514 -+#, c-format - msgid " -o, --timers display timers\n" - msgstr " -o, --timers taimerite näitamine\n" - --#: ../netstat.c:1497 ../route.c:88 -+#: ../netstat.c:1515 ../route.c:89 -+#, c-format - msgid "" - " -F, --fib display Forwarding Information Base " - "(default)\n" -@@ -972,7 +1128,8 @@ - " -F, --fib üldiste ruutingutabelite näitamine " - "(vaikimisi)\n" - --#: ../netstat.c:1498 ../route.c:89 -+#: ../netstat.c:1516 ../route.c:90 -+#, c-format - msgid "" - " -C, --cache display routing cache instead of FIB\n" - "\n" -@@ -981,108 +1138,121 @@ - "näitamine\n" - "\n" - --#: ../netstat.c:1500 -+#: ../netstat.c:1518 -+#, c-format - msgid "" --" <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx " --"--netrom\n" -+" <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" -+"netrom\n" - msgstr "" --" <Sokkel>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx " --"--netrom\n" -+" <Sokkel>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" -+"netrom\n" - --#: ../netstat.c:1501 ../route.c:91 --#, c-format --msgid " <AF>=Use '-A <af>' or '--<af>' Default: %s\n" -+#: ../netstat.c:1519 -+#, fuzzy, c-format -+msgid " <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n" - msgstr " <AF>=kasutage '-A <af>' vői '--<af>' vaikimisi: %s\n" - --#: ../netstat.c:1502 ../route.c:92 -+#: ../netstat.c:1520 ../route.c:93 -+#, c-format - msgid " List of possible address families (which support routing):\n" - msgstr " Vőimalike ruutingu toetavate aadressiperekondade nimekiri:\n" - --#: ../netstat.c:1726 -+#: ../netstat.c:1753 -+#, c-format - msgid "Active Internet connections " - msgstr "Aktiivsed internetiühendused " - --#: ../netstat.c:1736 -+#: ../netstat.c:1763 -+#, c-format - msgid "" - "\n" --"Proto Recv-Q Send-Q Local Address Foreign Address State " --" " -+"Proto Recv-Q Send-Q Local Address Foreign Address " -+"State " - msgstr "" - "\n" --"Proto VvJrk SaatJrk Kohalik aadress Väline aadress Olek " --" " -+"Proto VvJrk SaatJrk Kohalik aadress Väline aadress " -+"Olek " - --#: ../netstat.c:1738 -+#: ../netstat.c:1765 -+#, c-format - msgid " User Inode " - msgstr " Kasutaja I-kirje " - --#: ../netstat.c:1741 -+#: ../netstat.c:1768 -+#, c-format - msgid " Timer" - msgstr " Taimer" - --#: ../netstat.c:1771 -+#: ../netstat.c:1798 -+#, c-format - msgid "IPv4 Group Memberships\n" - msgstr "IPv4 grupikuuluvused\n" - --#: ../netstat.c:1772 -+#: ../netstat.c:1799 -+#, c-format - msgid "Interface RefCnt Group\n" - msgstr "Liides Mitu Grupp\n" - --#: ../rarp.c:43 -+#: ../rarp.c:44 - msgid "This kernel does not support RARP.\n" - msgstr "rarp: tuum ei toeta RARP'i\n" - --#: ../rarp.c:82 -+#: ../rarp.c:83 - #, c-format - msgid "no RARP entry for %s.\n" - msgstr "rarp: %s jaoks pole RARP kirjet\n" - --#: ../rarp.c:95 -+#: ../rarp.c:96 - #, c-format - msgid "%s: bad hardware address\n" - msgstr "rarp: vigane riistvaraline aadress %s\n" - --#: ../rarp.c:127 -+#: ../rarp.c:128 - #, c-format - msgid "rarp: cannot open file %s:%s.\n" - msgstr "rarp: ei saa avada faili %s:%s\n" - --#: ../rarp.c:139 -+#: ../rarp.c:140 - #, c-format - msgid "rarp: format error at %s:%u\n" - msgstr "rarp: vorminguviga failis %s real %u\n" - --#: ../rarp.c:143 ../rarp.c:287 -+#: ../rarp.c:144 ../rarp.c:289 - #, c-format - msgid "rarp: %s: unknown host\n" - msgstr "rarp: tundmatu host %s\n" - --#: ../rarp.c:146 -+#: ../rarp.c:147 - #, c-format - msgid "rarp: cannot set entry from %s:%u\n" - msgstr "rarp: ei saa kehtestada kirjet failist %s realt %u\n" - --#: ../rarp.c:175 -+#: ../rarp.c:176 -+#, c-format - msgid "Usage: rarp -a list entries in cache.\n" - msgstr "" - "Kasutamine:\n" - " rarp -a puhvris olevate kirjete vaatamine\n" - --#: ../rarp.c:176 -+#: ../rarp.c:177 -+#, c-format - msgid " rarp -d <hostname> delete entry from cache.\n" - msgstr " rarp -d <hosti nimi> kirje kustutamine puhvrist\n" - --#: ../rarp.c:177 -+#: ../rarp.c:178 -+#, c-format - msgid " rarp [<HW>] -s <hostname> <hwaddr> add entry to cache.\n" - msgstr " rarp [<HW>] -s <hosti nimi> <hwaddr> kirje lisamine puhvrisse\n" - --#: ../rarp.c:178 -+#: ../rarp.c:179 -+#, c-format - msgid "" - " rarp -f add entries from /etc/ethers.\n" - msgstr "" - " rarp -f kirjete lisamine failist /etc/ethers\n" - --#: ../rarp.c:179 -+#: ../rarp.c:180 -+#, c-format - msgid "" - " rarp -V display program version.\n" - "\n" -@@ -1090,24 +1260,26 @@ - " rarp -V programmi versiooni näitamine\n" - "\n" - --#: ../rarp.c:236 -+#: ../rarp.c:238 - #, c-format - msgid "%s: illegal option mix.\n" - msgstr "%s: lubamatu vőtmete kombinatsioon\n" - --#: ../rarp.c:267 -+#: ../rarp.c:269 - #, c-format - msgid "rarp: %s: unknown hardware type.\n" - msgstr "rarp: tundmatu riistvara tüüp %s\n" - --#: ../route.c:79 -+#: ../route.c:80 -+#, c-format - msgid "" - "Usage: route [-nNvee] [-FC] [<AF>] List kernel routing tables\n" - msgstr "" - "Kasutamine:\n" - " route [-nNvee] [-FC] [<AF>] Tuuma ruutingutabeli näitamine\n" - --#: ../route.c:80 -+#: ../route.c:81 -+#, c-format - msgid "" - " route [-v] [-FC] {add|del|flush} ... Modify routing table for AF.\n" - "\n" -@@ -1115,7 +1287,8 @@ - " route [-v] [-FC] {add|del|flush} ... Tuuma ruutingutabeli muutmine\n" - "\n" - --#: ../route.c:82 -+#: ../route.c:83 -+#, c-format - msgid "" - " route {-h|--help} [<AF>] Detailed usage syntax for " - "specified AF.\n" -@@ -1123,7 +1296,8 @@ - " route {-h|--help} [<AF>] Detailne süntaks perekonna AF " - "jaoks\n" - --#: ../route.c:83 -+#: ../route.c:84 -+#, c-format - msgid "" - " route {-V|--version} Display version/author and " - "exit.\n" -@@ -1132,15 +1306,23 @@ - " route {-V|--version} Versiooni ja oskuste näitamine\n" - "\n" - -+#: ../route.c:92 -+#, fuzzy, c-format -+msgid " <AF>=Use '-A <af>' or '--<af>'; default: %s\n" -+msgstr " <AF>=kasutage '-A <af>' vői '--<af>' vaikimisi: %s\n" -+ - #: ../plipconfig.c:66 -+#, c-format - msgid "Usage: plipconfig [-a] [-i] [-v] interface\n" - msgstr "Kasutamine: plipconfig [-a] [-i] [-v] liides\n" - - #: ../plipconfig.c:67 -+#, c-format - msgid " [nibble NN] [trigger NN]\n" - msgstr " [nibble NN] [trigger NN]\n" - - #: ../plipconfig.c:68 -+#, c-format - msgid " plipconfig -V | --version\n" - msgstr " plipconfig -V | --version\n" - -@@ -1149,25 +1331,30 @@ - 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 @@ - " iptunnel -V | --version\n" - "\n" - --#: ../iptunnel.c:89 -+#: ../iptunnel.c:90 -+#, c-format - msgid "Where: NAME := STRING\n" - msgstr "Kus: NIMI := STRING\n" - --#: ../iptunnel.c:90 -+#: ../iptunnel.c:91 -+#, c-format - msgid " ADDR := { IP_ADDRESS | any }\n" - msgstr " AADR := { IP_AADRESS | any }\n" - --#: ../iptunnel.c:91 -+#: ../iptunnel.c:92 -+#, c-format - msgid " TOS := { NUMBER | inherit }\n" - msgstr " TOS := { ARV | inherit }\n" - --#: ../iptunnel.c:92 -+#: ../iptunnel.c:93 -+#, c-format - msgid " TTL := { 1..255 | inherit }\n" - msgstr " TTL := { 1..255 | inherit }\n" - --#: ../iptunnel.c:93 -+#: ../iptunnel.c:94 -+#, c-format - msgid " KEY := { DOTTED_QUAD | NUMBER }\n" - msgstr "" - " KEY := { PUNKTIDEGA_ARVUNELIK | ARV }\n" - " LIIDES := FÜÜSILISE_LIIDESE_NIMI\n" - --#: ../iptunnel.c:331 -+#: ../iptunnel.c:332 -+#, c-format - msgid "Keys are not allowed with ipip and sit.\n" - msgstr "ipip ja sit juures ei ole vőtmed lubatud\n" - --#: ../iptunnel.c:351 -+#: ../iptunnel.c:352 -+#, c-format - msgid "Broadcast tunnel requires a source address.\n" - msgstr "Leviedastusega tunnel vajab lähteaadressi\n" - --#: ../iptunnel.c:366 -+#: ../iptunnel.c:367 -+#, c-format - msgid "ttl != 0 and noptmudisc are incompatible\n" - msgstr "ttl != 0 ning noptmudisc ei sobi kokku\n" - --#: ../iptunnel.c:378 -+#: ../iptunnel.c:379 -+#, c-format - msgid "cannot determine tunnel mode (ipip, gre or sit)\n" - msgstr "Ei suuda määrata tunneli moodi (ipip, gre vői sit)\n" - --#: ../iptunnel.c:416 -+#: ../iptunnel.c:417 - #, c-format - msgid "%s: %s/ip remote %s local %s " - msgstr "%s: %s/ip teises otsas %s siin %s " - --#: ../iptunnel.c:420 -+#: ../iptunnel.c:421 - msgid "unknown" - msgstr "tundmatu" - --#: ../iptunnel.c:452 -+#: ../iptunnel.c:453 -+#, c-format - msgid " Drop packets out of sequence.\n" - msgstr " Järjekorravälised paketid visatakse minema\n" - --#: ../iptunnel.c:454 -+#: ../iptunnel.c:455 -+#, c-format - msgid " Checksum in received packet is required.\n" - msgstr " Vastuvőetavates pakettides on kontrollsumma kohustuslik\n" - --#: ../iptunnel.c:456 -+#: ../iptunnel.c:457 -+#, c-format - msgid " Sequence packets on output.\n" - msgstr " Väljuvad paketid varustatakse järjekorranumbritega\n" - --#: ../iptunnel.c:458 -+#: ../iptunnel.c:459 -+#, c-format - msgid " Checksum output packets.\n" - msgstr " Väljuvad paketid varustatakse kontrollsummaga\n" - --#: ../iptunnel.c:486 -+#: ../iptunnel.c:487 -+#, c-format - msgid "Wrong format of /proc/net/dev. Sorry.\n" - msgstr "/proc/net/dev on vales formaadis. Vale tuuma versioon?\n" - --#: ../iptunnel.c:499 -+#: ../iptunnel.c:500 - #, c-format - msgid "Failed to get type of [%s]\n" - msgstr "Ei suutnud kindlaks teha liidese %s tüüpi\n" - --#: ../iptunnel.c:515 -+#: ../iptunnel.c:516 -+#, c-format - msgid "RX: Packets Bytes Errors CsumErrs OutOfSeq Mcasts\n" - msgstr "RX: Pakette Baite Vigu KSumVigu JrkVigu Levipakette\n" - --#: ../iptunnel.c:518 -+#: ../iptunnel.c:519 -+#, c-format - msgid "TX: Packets Bytes Errors DeadLoop NoRoute NoBufs\n" - msgstr "TX: Pakette Baite Vigu DeadLoop EiRuudi MäluOtsas\n" - -@@ -1658,13 +1861,13 @@ - msgstr "%u paketti pandi otse recvmsg eeljärjekorda" - - #: ../statistics.c:178 --#, c-format --msgid "%u packets directly received from backlog" -+#, fuzzy, c-format -+msgid "%u of bytes directly received from backlog" - msgstr "%u paketti vőeti vastu otse backlog-ist" - - #: ../statistics.c:180 --#, c-format --msgid "%u packets directly received from prequeue" -+#, fuzzy, c-format -+msgid "%u of bytes directly received from prequeue" - msgstr "%u paketti vőeti vastu otse eeljärjekorrast" - - #: ../statistics.c:182 -@@ -1673,8 +1876,8 @@ - msgstr "%u paketti kustutati eeljärjekorrast" - - #: ../statistics.c:183 --#, c-format --msgid "%u packets header predicted" -+#, fuzzy, c-format -+msgid "%u packet headers predicted" - msgstr "%u paketti päise őige ennustusega" - - #: ../statistics.c:184 -@@ -1687,19 +1890,210 @@ - msgid "Ran %u times out of system memory during packet sending" - msgstr "Pakettide saatmisel sai %u korda süsteemne mälu otsa" - --#: ../statistics.c:253 -+#: ../statistics.c:188 -+#, fuzzy, c-format -+msgid "%u acknowledgments not containing data received" -+msgstr "%u sisenevat paketti tundmatule pordile" -+ -+#: ../statistics.c:189 -+#, c-format -+msgid "%u predicted acknowledgments" -+msgstr "" -+ -+#: ../statistics.c:190 -+#, c-format -+msgid "%u times recovered from packet loss due to fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:191 -+#, c-format -+msgid "%u times recovered from packet loss due to SACK data" -+msgstr "" -+ -+#: ../statistics.c:192 -+#, fuzzy, c-format -+msgid "%u bad SACKs received" -+msgstr "%u vigast segmenti vőeti vastu" -+ -+#: ../statistics.c:193 -+#, c-format -+msgid "Detected reordering %u times using FACK" -+msgstr "" -+ -+#: ../statistics.c:194 -+#, c-format -+msgid "Detected reordering %u times using SACK" -+msgstr "" -+ -+#: ../statistics.c:195 -+#, c-format -+msgid "Detected reordering %u times using time stamp" -+msgstr "" -+ -+#: ../statistics.c:196 -+#, c-format -+msgid "Detected reordering %u times using reno fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:197 -+#, fuzzy, c-format -+msgid "%u congestion windows fully recovered" -+msgstr "%u ühenduse katkestust saabus" -+ -+#: ../statistics.c:198 -+#, c-format -+msgid "%u congestion windows partially recovered using Hoe heuristic" -+msgstr "" -+ -+#: ../statistics.c:199 -+#, c-format -+msgid "%u congestion window recovered using DSACK" -+msgstr "" -+ -+#: ../statistics.c:200 -+#, c-format -+msgid "%u congestion windows recovered after partial ack" -+msgstr "" -+ -+#: ../statistics.c:201 -+#, fuzzy, c-format -+msgid "%u retransmits lost" -+msgstr "%u katkestust saadeti" -+ -+#: ../statistics.c:202 -+#, fuzzy, c-format -+msgid "%u timeouts after reno fast retransmit" -+msgstr "%u segmenti saadeti uuesti" -+ -+#: ../statistics.c:203 -+#, c-format -+msgid "%u timeouts after SACK recovery" -+msgstr "" -+ -+#: ../statistics.c:204 -+#, c-format -+msgid "%u timeouts in loss state" -+msgstr "" -+ -+#: ../statistics.c:205 -+#, fuzzy, c-format -+msgid "%u fast retransmits" -+msgstr "%u segmenti saadeti uuesti" -+ -+#: ../statistics.c:206 -+#, fuzzy, c-format -+msgid "%u forward retransmits" -+msgstr "%u edastati" -+ -+#: ../statistics.c:207 -+#, c-format -+msgid "%u retransmits in slow start" -+msgstr "" -+ -+#: ../statistics.c:208 -+#, c-format -+msgid "%u other TCP timeouts" -+msgstr "" -+ -+#: ../statistics.c:209 -+#, fuzzy, c-format -+msgid "%u reno fast retransmits failed" -+msgstr "%u segmenti saadeti uuesti" -+ -+#: ../statistics.c:210 -+#, fuzzy, c-format -+msgid "%u sack retransmits failed" -+msgstr "%u pakettide kokkupanekut ebaőnnestus" -+ -+#: ../statistics.c:211 -+#, c-format -+msgid "%u times receiver scheduled too late for direct processing" -+msgstr "" -+ -+#: ../statistics.c:212 -+#, fuzzy, c-format -+msgid "%u packets collapsed in receive queue due to low socket buffer" -+msgstr "" -+"%u paketti kustutati vastuvőtu järjekorrast sokli puhvri ületäitumise tőttu" -+ -+#: ../statistics.c:213 -+#, c-format -+msgid "%u DSACKs sent for old packets" -+msgstr "" -+ -+#: ../statistics.c:214 -+#, c-format -+msgid "%u DSACKs sent for out of order packets" -+msgstr "" -+ -+#: ../statistics.c:215 -+#, fuzzy, c-format -+msgid "%u DSACKs received" -+msgstr "%u paketti vőeti vastu" -+ -+#: ../statistics.c:216 -+#, fuzzy, c-format -+msgid "%u DSACKs for out of order packets received" -+msgstr "kokku vőeti vastu %u paketti" -+ -+#: ../statistics.c:217 -+#, fuzzy, c-format -+msgid "%u connections reset due to unexpected SYN" -+msgstr "%u ühenduse katkestust saabus" -+ -+#: ../statistics.c:218 -+#, fuzzy, c-format -+msgid "%u connections reset due to unexpected data" -+msgstr "%u ühenduse katkestust saabus" -+ -+#: ../statistics.c:219 -+#, fuzzy, c-format -+msgid "%u connections reset due to early user close" -+msgstr "%u ühenduse katkestust saabus" -+ -+#: ../statistics.c:220 -+#, c-format -+msgid "%u connections aborted due to memory pressure" -+msgstr "" -+ -+#: ../statistics.c:221 -+#, fuzzy, c-format -+msgid "%u connections aborted due to timeout" -+msgstr "%u aktiivsest ühendusest keelduti ajatempli tőttu" -+ -+#: ../statistics.c:222 -+#, c-format -+msgid "%u connections aborted after user close in linger timeout" -+msgstr "" -+ -+#: ../statistics.c:223 -+#, c-format -+msgid "%u times unabled to send RST due to no memory" -+msgstr "" -+ -+#: ../statistics.c:224 -+#, c-format -+msgid "TCP ran low on memory %u times" -+msgstr "" -+ -+#: ../statistics.c:225 -+#, c-format -+msgid "%u TCP data loss events" -+msgstr "" -+ -+#: ../statistics.c:292 - msgid "enabled" - msgstr "lubatud" - --#: ../statistics.c:253 -+#: ../statistics.c:292 - msgid "disabled" - msgstr "keelatud" - --#: ../statistics.c:336 -+#: ../statistics.c:375 - msgid "error parsing /proc/net/snmp" - msgstr "Viga /proc/net/snmp analüüsimisel" - --#: ../statistics.c:349 -+#: ../statistics.c:388 - msgid "cannot open /proc/net/snmp" - msgstr "Ei saa avada faili /proc/net/snmp" - -@@ -1713,7 +2107,7 @@ - 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 @@ - 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 @@ - 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 @@ - 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 @@ - msgstr "in_arcnet(%s): sodi lőpus\n" - - #: ../lib/ash.c:81 -+#, c-format - msgid "Malformed Ash address" - msgstr "Vigane Ash aadress" - -@@ -1808,22 +2205,21 @@ - msgstr "Liiga pikk kutsung" - - #: ../lib/ax25_gr.c:47 -+#, c-format - msgid "AX.25 not configured in this system.\n" - msgstr "AX.25 pole antud süsteemis konfigureeritud\n" - - #: ../lib/ax25_gr.c:50 -+#, c-format - msgid "Kernel AX.25 routing table\n" - msgstr "Tuuma AX.25 ruutingutabel\n" - - #. xxx - #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55 -+#, c-format - msgid "Destination Iface Use\n" - msgstr "Sihtpunkt Liides Kasutus\n" - --#: ../lib/ddp_gr.c:21 --msgid "Routing table for `ddp' not yet supported.\n" --msgstr "`ddp' jaoks ruutingutabelit veel ei oska\n" -- - #: ../lib/ether.c:74 ../lib/ether.c:91 - #, c-format - msgid "in_ether(%s): invalid ether address!\n" -@@ -1879,90 +2275,94 @@ - msgid "in_hippi(%s): trailing junk!\n" - msgstr "in_hippi(%s): sodi lőpus\n" - --#: ../lib/hw.c:155 -+#: ../lib/hw.c:160 - msgid "Local Loopback" - msgstr "Kohalik loopback" - --#: ../lib/hw.c:158 -+#: ../lib/hw.c:163 - msgid "Serial Line IP" - msgstr "Serial Line IP" - --#: ../lib/hw.c:159 -+#: ../lib/hw.c:164 - msgid "VJ Serial Line IP" - msgstr "VJ Serial Line IP" - --#: ../lib/hw.c:160 -+#: ../lib/hw.c:165 - msgid "6-bit Serial Line IP" - msgstr "6-bitine Serial Line IP" - --#: ../lib/hw.c:161 -+#: ../lib/hw.c:166 - msgid "VJ 6-bit Serial Line IP" - msgstr "VJ 6-bitine Serial Line IP" - --#: ../lib/hw.c:162 -+#: ../lib/hw.c:167 - msgid "Adaptive Serial Line IP" - msgstr "Adaptiivne Serial Line IP" - --#: ../lib/hw.c:165 -+#: ../lib/hw.c:170 - msgid "Ethernet" - msgstr "Ethernet" - --#: ../lib/hw.c:171 -+#: ../lib/hw.c:176 - msgid "Fiber Distributed Data Interface" - msgstr "Fiber Distributed Data Interface" - --#: ../lib/hw.c:174 -+#: ../lib/hw.c:179 - msgid "HIPPI" - msgstr "HIPPI" - --#: ../lib/hw.c:186 -+#: ../lib/hw.c:191 - msgid "generic X.25" - msgstr "üldine X.25" - --#: ../lib/hw.c:189 -+#: ../lib/hw.c:194 - msgid "IPIP Tunnel" - msgstr "IPIP tunnel" - --#: ../lib/hw.c:192 -+#: ../lib/hw.c:197 - msgid "Point-to-Point Protocol" - msgstr "Kakspunktprotokoll" - --#: ../lib/hw.c:195 -+#: ../lib/hw.c:200 - msgid "(Cisco)-HDLC" - msgstr "(Cisco-)HDLC" - --#: ../lib/hw.c:196 -+#: ../lib/hw.c:201 - msgid "LAPB" - msgstr "LAPB" - --#: ../lib/hw.c:199 -+#: ../lib/hw.c:204 - msgid "ARCnet" - msgstr "ARCnet" - --#: ../lib/hw.c:202 -+#: ../lib/hw.c:207 - msgid "Frame Relay DLCI" - msgstr "Frame Relay DLCI" - --#: ../lib/hw.c:203 -+#: ../lib/hw.c:208 - msgid "Frame Relay Access Device" - msgstr "Frame Relay Access Device" - --#: ../lib/hw.c:206 -+#: ../lib/hw.c:211 - msgid "IPv6-in-IPv4" - msgstr "IPv6-in-IPv4" - --#: ../lib/hw.c:209 -+#: ../lib/hw.c:214 - msgid "IrLAP" - msgstr "IrLAP" - --#: ../lib/hw.c:212 -+#: ../lib/hw.c:217 - msgid "16/4 Mbps Token Ring" - msgstr "16/4 Mbps Token Ring" - --#: ../lib/hw.c:214 -+#: ../lib/hw.c:219 - msgid "16/4 Mbps Token Ring (New)" - msgstr "16/4 Mbps Token Ring (New)" - -+#: ../lib/hw.c:226 -+msgid "Generic EUI-64" -+msgstr "" -+ - #: ../lib/inet.c:153 ../lib/inet6.c:79 - #, c-format - msgid "rresolve: unsupport address family %d !\n" -@@ -1972,27 +2372,32 @@ - msgid "[UNKNOWN]" - msgstr "[TUNDMATU]" - --#: ../lib/inet6_gr.c:79 -+#: ../lib/inet6_gr.c:71 -+#, c-format - msgid "INET6 (IPv6) not configured in this system.\n" - msgstr "INET6 (IPv6) pole antud süsteemis konfigureeritud\n" - --#: ../lib/inet6_gr.c:82 -+#: ../lib/inet6_gr.c:74 -+#, c-format - msgid "Kernel IPv6 routing table\n" - msgstr "Tuuma IPv6 ruutingutabel\n" - --#: ../lib/inet6_gr.c:84 -+#: ../lib/inet6_gr.c:76 -+#, c-format - msgid "" --"Destination Next Hop " --" Flags Metric Ref Use Iface\n" -+"Destination Next " -+"Hop Flags Metric Ref Use Iface\n" - msgstr "" --"Sihtpunkt Järgmine samm " --" Lipud Meetr Mitu Kasut Liides\n" -+"Sihtpunkt Järgmine " -+"samm Lipud Meetr Mitu Kasut Liides\n" - --#: ../lib/inet6_gr.c:158 -+#: ../lib/inet6_gr.c:150 -+#, c-format - msgid "Kernel IPv6 Neighbour Cache\n" - msgstr "Tuuma IPv6 naabrite puhver\n" - --#: ../lib/inet6_gr.c:161 -+#: ../lib/inet6_gr.c:153 -+#, c-format - msgid "" - "Neighbour HW Address Iface Flags " - "Ref State\n" -@@ -2000,7 +2405,8 @@ - "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 @@ - "Mitu Olek Stale(sec) Delete(sec)\n" - - #: ../lib/inet6_sr.c:46 -+#, c-format - msgid "Usage: inet6_route [-vF] del Target\n" - msgstr "Kasutamine: route [-vF] del AADRESS\n" - - #: ../lib/inet6_sr.c:47 -+#, c-format - msgid " inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n" - msgstr "" - " route [-vF] add AADRESS [gw GW] [metric M] [[dev] LIIDES]\n" - - #: ../lib/inet6_sr.c:48 -+#, c-format - msgid " inet6_route [-FC] flush NOT supported\n" - msgstr " route [-FC] flush Seda EI toetata\n" - - #: ../lib/inet6_sr.c:188 -+#, c-format - msgid "Flushing `inet6' routing table not supported\n" - msgstr "`inet6' ruutingutabeli tühjendamist ei toetata\n" - - #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220 -+#, c-format - msgid "INET (IPv4) not configured in this system.\n" - msgstr "INET (IPv4) pole antud süsteemis konfigureeritud\n" - - #: ../lib/inet_gr.c:53 -+#, c-format - msgid "Kernel IP routing table\n" - msgstr "Tuuma IP ruutingutabel\n" - - #: ../lib/inet_gr.c:56 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags Metric Ref Use " - "Iface\n" -@@ -2042,6 +2455,7 @@ - "Liides\n" - - #: ../lib/inet_gr.c:59 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags MSS Window irtt " - "Iface\n" -@@ -2050,6 +2464,7 @@ - "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 @@ - "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 @@ - "Liides\n" - - #: ../lib/inet_gr.c:261 -+#, c-format - msgid "" - "Source Destination Gateway Flags MSS Window irtt " - "Iface\n" -@@ -2078,6 +2496,7 @@ - "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 @@ - "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 @@ - "Lähtepunkt Sihtpunkt Ruuter Lipud Meetr Mitu Kasut " - "Liides MSS Aken irtt TOS HHRef HHUptod SpecDst\n" - --#: ../lib/inet_sr.c:50 -+#: ../lib/inet_sr.c:51 -+#, c-format - msgid "" - "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] " - "[[dev] If]\n" -@@ -2101,31 +2522,36 @@ - "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 @@ - msgstr "route: %s: vőrku ei saa kasutada ruuterina\n" - - #: ../lib/inet_sr.c:174 -+#, c-format - msgid "route: Invalid MSS/MTU.\n" - msgstr "route: vigane MSS/MTU\n" - - #: ../lib/inet_sr.c:187 -+#, c-format - msgid "route: Invalid window.\n" - msgstr "route: Vigane akna suurus\n" - - #: ../lib/inet_sr.c:203 -+#, c-format - msgid "route: Invalid initial rtt.\n" - msgstr "route: vigane algne rtt\n" - -@@ -2157,75 +2586,92 @@ - msgstr "route: vale vőrgumask %s\n" - - #: ../lib/inet_sr.c:270 -+#, c-format - msgid "route: netmask doesn't match route address\n" - msgstr "route: vőrgumask ei sobi ruutingu aadressiga\n" - - #: ../lib/inet_sr.c:306 -+#, c-format - msgid "Flushing `inet' routing table not supported\n" - msgstr "`inet' ruutingutabeli tühjendamist ei toetata\n" - - #: ../lib/inet_sr.c:310 -+#, c-format - msgid "Modifying `inet' routing cache not supported\n" - msgstr "`inet' ruutingu puhvri muutmist ei toetata\n" - - #: ../lib/ipx_gr.c:52 -+#, c-format - msgid "IPX not configured in this system.\n" - msgstr "IPX pole antud süsteemis konfigureeritud\n" - - #: ../lib/ipx_gr.c:56 -+#, c-format - msgid "Kernel IPX routing table\n" - msgstr "Tuuma IPX ruutingutabel\n" - - #. xxx - #: ../lib/ipx_gr.c:57 -+#, c-format - msgid "Destination Router Net Router Node\n" - msgstr "Sihtpunkt Ruuteri vőrk Ruuter ise\n" - - #: ../lib/ipx_sr.c:33 -+#, c-format - msgid "IPX: this needs to be written\n" - msgstr "IPX osa vajab ümbertegemist\n" - - #: ../lib/masq_info.c:198 -+#, c-format - msgid "IP masquerading entries\n" - msgstr "IP maskeerimise kirjed\n" - - #: ../lib/masq_info.c:201 -+#, c-format - msgid "prot expire source destination ports\n" - msgstr "Proto Aegub Lähtepunkt Sihtpunkt Pordid\n" - - #: ../lib/masq_info.c:204 -+#, c-format - msgid "" --"prot expire initseq delta prevd source destination " --" ports\n" -+"prot expire initseq delta prevd source " -+"destination ports\n" - msgstr "" --"Proto Aegub Initseq Delta Prevd Lähtepunkt Sihtpunkt " --" Pordid\n" -+"Proto Aegub Initseq Delta Prevd Lähtepunkt " -+"Sihtpunkt Pordid\n" - - #: ../lib/netrom_gr.c:48 -+#, c-format - msgid "NET/ROM not configured in this system.\n" - msgstr "NET/ROM pole antud süsteemis konfigureeritud\n" - - #: ../lib/netrom_gr.c:51 -+#, c-format - msgid "Kernel NET/ROM routing table\n" - msgstr "Tuuma NET/ROM ruutingutabel\n" - - #: ../lib/netrom_gr.c:52 -+#, c-format - msgid "Destination Mnemonic Quality Neighbour Iface\n" - msgstr "Sihtpunkt Mnemoonika Kvaliteet Naaber Liides\n" - - #: ../lib/netrom_sr.c:34 -+#, c-format - msgid "netrom usage\n" - msgstr "netrom kasutus\n" - - #: ../lib/netrom_sr.c:44 -+#, c-format - msgid "NET/ROM: this needs to be written\n" - msgstr "NET/ROM osa vajab ümbertegemist\n" - - #: ../lib/ppp.c:44 -+#, c-format - msgid "You cannot start PPP with this program.\n" - msgstr "Sellest programmist ei saa PPP-d käivitada\n" - - #: ../lib/ppp_ac.c:38 -+#, c-format - msgid "Sorry, use pppd!\n" - msgstr "Palun kasutage pppd'd\n" - -@@ -2234,287 +2680,314 @@ - msgstr "Sőlme aadress peab olema kümnekohaline" - - #: ../lib/rose_gr.c:51 -+#, c-format - msgid "ROSE not configured in this system.\n" - msgstr "ROSE pole antud süsteemis konfigureeritud\n" - - #: ../lib/rose_gr.c:54 -+#, c-format - msgid "Kernel ROSE routing table\n" - msgstr "Tuuma ROSE ruutingutabel\n" - --#: ../lib/tr.c:70 ../lib/tr.c:85 -+#: ../lib/tr.c:86 ../lib/tr.c:101 - #, c-format - msgid "in_tr(%s): invalid token ring address!\n" - msgstr "in_tr(%s): vigane token ring-aadress\n" - --#: ../lib/tr.c:97 -+#: ../lib/tr.c:113 - #, c-format - msgid "in_tr(%s): trailing : ignored!\n" - msgstr "in_tr(%s): ignoreerin lőpetavat koolonit\n" - --#: ../lib/tr.c:109 -+#: ../lib/tr.c:125 - #, c-format - msgid "in_tr(%s): trailing junk!\n" - msgstr "in_tr(%s): sodi lőpus\n" - --#: ../lib/interface.c:164 -+#: ../lib/interface.c:176 - #, c-format - msgid "warning: no inet socket available: %s\n" - msgstr "Hoiatus: `inet' sokleid ei ole: %s\n" - --#: ../lib/interface.c:316 -+#: ../lib/interface.c:325 - #, c-format - msgid "Warning: cannot open %s (%s). Limited output.\n" - msgstr "Hoiatus: ei saa avada faili %s (%s). Väljund on piiratud.\n" - - #. Give better error message for this case. --#: ../lib/interface.c:556 -+#: ../lib/interface.c:571 - msgid "Device not found" - msgstr "Liidest ei leitud" - --#: ../lib/interface.c:560 -+#: ../lib/interface.c:575 - #, c-format - msgid "%s: error fetching interface information: %s\n" - msgstr "%s: viga liidese info küsimisel: %s\n" - --#: ../lib/interface.c:593 -+#: ../lib/interface.c:608 - msgid " - no statistics available -" - msgstr " - statistikat ei ole -" - --#: ../lib/interface.c:597 -+#: ../lib/interface.c:612 -+#, c-format - msgid "[NO FLAGS]" - msgstr "[LIPPE POLE]" - --#: ../lib/interface.c:673 -+#: ../lib/interface.c:688 - #, c-format - msgid "%-9.9s Link encap:%s " - msgstr "%-9.9s kapseldus:%s " - --#: ../lib/interface.c:678 -+#: ../lib/interface.c:693 - #, c-format - msgid "HWaddr %s " - msgstr "HWaddr %s " - --#: ../lib/interface.c:681 -+#: ../lib/interface.c:696 - #, c-format - msgid "Media:%s" - msgstr "meedia:%s" - --#: ../lib/interface.c:683 -+#: ../lib/interface.c:698 -+#, c-format - msgid "(auto)" - msgstr "(auto)" - --#: ../lib/interface.c:690 -+#: ../lib/interface.c:705 - #, c-format - msgid " %s addr:%s " - msgstr " %s aadress:%s " - --#: ../lib/interface.c:693 -+#: ../lib/interface.c:708 - #, c-format - msgid " P-t-P:%s " - msgstr " P-t-P:%s " - --#: ../lib/interface.c:696 -+#: ../lib/interface.c:711 - #, c-format - msgid " Bcast:%s " - msgstr " bcast:%s " - --#: ../lib/interface.c:698 -+#: ../lib/interface.c:713 - #, c-format - msgid " Mask:%s\n" - msgstr " mask:%s\n" - --#: ../lib/interface.c:715 -+#: ../lib/interface.c:730 - #, c-format - msgid " inet6 addr: %s/%d" - msgstr " inet6 aadr: %s/%d" - --#: ../lib/interface.c:717 -+#: ../lib/interface.c:732 -+#, c-format - msgid " Scope:" - msgstr " skoop:" - --#: ../lib/interface.c:720 -+#: ../lib/interface.c:735 -+#, c-format - msgid "Global" - msgstr "globaalne" - --#: ../lib/interface.c:723 -+#: ../lib/interface.c:738 -+#, c-format - msgid "Link" - msgstr "ühendus" - --#: ../lib/interface.c:726 -+#: ../lib/interface.c:741 -+#, c-format - msgid "Site" - msgstr "site" - --#: ../lib/interface.c:729 -+#: ../lib/interface.c:744 -+#, c-format - msgid "Compat" - msgstr "ühilduvus" - --#: ../lib/interface.c:732 -+#: ../lib/interface.c:747 -+#, c-format - msgid "Host" - msgstr "host" - --#: ../lib/interface.c:735 -+#: ../lib/interface.c:750 -+#, c-format - msgid "Unknown" - msgstr "tundmatu" - --#: ../lib/interface.c:750 -+#: ../lib/interface.c:765 - #, c-format - msgid " IPX/Ethernet II addr:%s\n" - msgstr " IPX/Ethernet II aadr:%s\n" - --#: ../lib/interface.c:753 -+#: ../lib/interface.c:768 - #, c-format - msgid " IPX/Ethernet SNAP addr:%s\n" - msgstr " IPX/Ethernet SNAP aadr:%s\n" - --#: ../lib/interface.c:756 -+#: ../lib/interface.c:771 - #, c-format - msgid " IPX/Ethernet 802.2 addr:%s\n" - msgstr " IPX/Ethernet 802.2 aadr:%s\n" - --#: ../lib/interface.c:759 -+#: ../lib/interface.c:774 - #, c-format - msgid " IPX/Ethernet 802.3 addr:%s\n" - msgstr " IPX/Ethernet 802.3 aadr:%s\n" - --#: ../lib/interface.c:769 -+#: ../lib/interface.c:784 - #, c-format - msgid " EtherTalk Phase 2 addr:%s\n" - msgstr " EtherTalk Phase 2 aadr:%s\n" - --#: ../lib/interface.c:778 -+#: ../lib/interface.c:793 - #, c-format - msgid " econet addr:%s\n" - msgstr " econeti aadr:%s\n" - --#: ../lib/interface.c:785 -+#: ../lib/interface.c:800 -+#, c-format - msgid "[NO FLAGS] " - msgstr "[LIPPE POLE]" - --#: ../lib/interface.c:787 -+#: ../lib/interface.c:802 -+#, c-format - msgid "UP " - msgstr "UP " - --#: ../lib/interface.c:789 -+#: ../lib/interface.c:804 -+#, c-format - msgid "BROADCAST " - msgstr "BROADCAST " - --#: ../lib/interface.c:791 -+#: ../lib/interface.c:806 -+#, c-format - msgid "DEBUG " - msgstr "DEBUG " - --#: ../lib/interface.c:793 -+#: ../lib/interface.c:808 -+#, c-format - msgid "LOOPBACK " - msgstr "LOOPBACK " - --#: ../lib/interface.c:795 -+#: ../lib/interface.c:810 -+#, c-format - msgid "POINTOPOINT " - msgstr "POINTOPOINT " - --#: ../lib/interface.c:797 -+#: ../lib/interface.c:812 -+#, c-format - msgid "NOTRAILERS " - msgstr "NOTRAILERS " - --#: ../lib/interface.c:799 -+#: ../lib/interface.c:814 -+#, c-format - msgid "RUNNING " - msgstr "RUNNING " - --#: ../lib/interface.c:801 -+#: ../lib/interface.c:816 -+#, c-format - msgid "NOARP " - msgstr "NOARP " - --#: ../lib/interface.c:803 -+#: ../lib/interface.c:818 -+#, c-format - msgid "PROMISC " - msgstr "PROMISC " - --#: ../lib/interface.c:805 -+#: ../lib/interface.c:820 -+#, c-format - msgid "ALLMULTI " - msgstr "ALLMULTI " - --#: ../lib/interface.c:807 -+#: ../lib/interface.c:822 -+#, c-format - msgid "SLAVE " - msgstr "SLAVE " - --#: ../lib/interface.c:809 -+#: ../lib/interface.c:824 -+#, c-format - msgid "MASTER " - msgstr "MASTER " - --#: ../lib/interface.c:811 -+#: ../lib/interface.c:826 -+#, c-format - msgid "MULTICAST " - msgstr "MULTICAST " - --#: ../lib/interface.c:814 -+#: ../lib/interface.c:829 -+#, c-format - msgid "DYNAMIC " - msgstr "DYNAMIC " - - #. DONT FORGET TO ADD THE FLAGS IN ife_print_short --#: ../lib/interface.c:817 -+#: ../lib/interface.c:832 - #, c-format - msgid " MTU:%d Metric:%d" - msgstr " MTU:%d meetrika:%d" - --#: ../lib/interface.c:821 -+#: ../lib/interface.c:836 - #, c-format - msgid " Outfill:%d Keepalive:%d" - msgstr " ülalhoidepakettide intervall:%d ülalhoidetaimaut:%d" - --#: ../lib/interface.c:835 -+#: ../lib/interface.c:850 - #, c-format - msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" - msgstr "RX pakette:%llu vigu:%lu ära visatud:%lu ületäit:%lu kaadri vigu:%lu\n" - --#: ../lib/interface.c:840 -+#: ../lib/interface.c:855 - #, c-format - msgid " compressed:%lu\n" - msgstr " pakitud:%lu\n" - --#: ../lib/interface.c:852 -+#: ../lib/interface.c:895 - #, c-format - msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" - msgstr "TX pakette:%llu vigu:%lu ära visatud:%lu ületäit:%lu carrier:%lu\n" - --#: ../lib/interface.c:856 -+#: ../lib/interface.c:899 - #, c-format - msgid " collisions:%lu " - msgstr " kollisioone:%lu " - --#: ../lib/interface.c:858 -+#: ../lib/interface.c:901 - #, c-format - msgid "compressed:%lu " - msgstr "pakitud:%lu " - --#: ../lib/interface.c:860 -+#: ../lib/interface.c:903 - #, c-format - msgid "txqueuelen:%d " - msgstr "txqueuelen:%d " - --#: ../lib/interface.c:862 -+#: ../lib/interface.c:905 - #, c-format - msgid "RX bytes:%llu (%lu.%lu %s) TX bytes:%llu (%lu.%lu %s)\n" - msgstr "RX baite:%llu (%lu.%lu %s) TX baite:%llu (%lu.%lu %s)\n" - --#: ../lib/interface.c:873 -+#: ../lib/interface.c:916 - #, c-format - msgid "Interrupt:%d " - msgstr "katkestus:%d " - - #. Only print devices using it for - #. I/O maps --#: ../lib/interface.c:876 -+#: ../lib/interface.c:919 - #, c-format - msgid "Base address:0x%x " - msgstr "baasaadress:0x%x " - --#: ../lib/interface.c:878 -+#: ../lib/interface.c:921 - #, c-format - msgid "Memory:%lx-%lx " - msgstr "mälu:%lx-%lx " - --#: ../lib/interface.c:881 -+#: ../lib/interface.c:924 - #, c-format - msgid "DMA chan:%x " - msgstr "DMA kanal:%x " - - #: ../lib/sockets.c:63 -+#, c-format - msgid "No usable address families found.\n" - msgstr "Ei leidnud ühtegi kasutatavat aadressiperekonda\n" - -@@ -2538,29 +3011,32 @@ - 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 @@ - 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 @@ - msgstr "slattach: tty_hangup(RAISE): %s\n" - - #: ../slattach.c:468 -+#, c-format - msgid "slattach: tty name too long\n" - msgstr "slattach: terminali nimi on liiga pikk\n" - - #: ../slattach.c:498 -+#, c-format - msgid "slattach: tty_open: cannot get current state!\n" - msgstr "slattach: tty_open: ei saa lugeda jooksvat olekut\n" - - #: ../slattach.c:505 -+#, c-format - msgid "slattach: tty_open: cannot get current line disc!\n" - msgstr "slattach: tty_open: liiniprotokolli küsimine ebaőnnestus\n" - - #: ../slattach.c:513 -+#, c-format - msgid "slattach: tty_open: cannot set RAW mode!\n" - msgstr "slattach: tty_open: ei saa seada RAW moodi\n" - -@@ -2615,6 +3096,7 @@ - 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 @@ - #, c-format - msgid " interface %s\n" - msgstr " liides %s\n" -+ -+#~ msgid "" -+#~ " arp [-v] [<HW>] [-i <if>] -s <hostname> <hwaddr> [netmask <nm>] pub " -+#~ "<-''-\n" -+#~ msgstr "" -+#~ " arp [-v] [<HW>] [-i <if>] -s <hosti nimi> <hwaddr> [netmask <nm>] " -+#~ "pub\n" -+ -+#~ msgid "%s: unknown interface: %s\n" -+#~ msgstr "ifconfig: tundmatu liides %s: %s\n" -+ -+#~ msgid " -n, --numeric dont resolve names\n" -+#~ msgstr "" -+#~ " -n, --numeric mitte lahendada numbreid nimedeks\n" -+ -+#~ msgid "Routing table for `ddp' not yet supported.\n" -+#~ msgstr "`ddp' jaoks ruutingutabelit veel ei oska\n" ---- net-tools-1.60.orig/po/de.po -+++ net-tools-1.60/po/de.po -@@ -1,106 +1,121 @@ --# $Id: de.po,v 1.10 2000/08/01 03:19:48 ecki Exp $ -+# $Id: de.po,v 1.11 2003/10/25 21:15:09 ecki Exp $ - # German translation for net-tools 1.51 - # Copyright (C) 1999 Ralf Bächle <ralf@gnu.org> - msgid "" - msgstr "" - "Project-Id-Version: net-tools 1.51\n" --"POT-Creation-Date: 2000-02-14 02:31+0100\n" --"PO-Revision-Date: 1998-03-01 00:02+0100\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2007-06-30 12:28+0900\n" -+"PO-Revision-Date: 2005-06-13 00:02+0100\n" - "Last-Translator: Ralf Bächle <ralf@gnu.org>\n" - "Language-Team:\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=iso8859-1\n" - "Content-Transfer-Encoding: 8bit\n" - --#: ../arp.c:110 ../arp.c:269 -+#: ../arp.c:112 ../arp.c:279 -+#, c-format - msgid "arp: need host name\n" --msgstr "arp: Hostname muß angegeben werden\n" -+msgstr "arp: Hostname muss angegeben werden\n" - --#: ../arp.c:207 ../arp.c:221 -+#: ../arp.c:215 ../arp.c:230 - #, c-format - msgid "No ARP entry for %s\n" --msgstr "Kein ARP Eintrag für %s\n" -+msgstr "Kein ARP-Eintrag für %s\n" - --#: ../arp.c:239 -+#: ../arp.c:248 - #, c-format - msgid "arp: cant get HW-Address for `%s': %s.\n" - msgstr "rarp: Kann Eintrag aus %s : %u nicht setzen.\n" - --#: ../arp.c:243 -+#: ../arp.c:252 -+#, c-format - msgid "arp: protocol type mismatch.\n" - msgstr "arp: unpassende Protokolltypen.\n" - --#: ../arp.c:252 -+#: ../arp.c:261 - #, c-format - msgid "arp: device `%s' has HW address %s `%s'.\n" --msgstr "arp: Gerät ,,%s'' hat HW-Adresse %s ,,%s''.\n" -+msgstr "arp: Gerät »%s« hat HW-Adresse %s »%s«.\n" - --#: ../arp.c:282 -+#: ../arp.c:293 -+#, c-format - msgid "arp: need hardware address\n" --msgstr "arp: Hardwareadresse muß angegeben werden\n" -+msgstr "arp: Hardwareadresse muss angegeben werden\n" - --#: ../arp.c:290 -+#: ../arp.c:301 -+#, c-format - msgid "arp: invalid hardware address\n" - msgstr "arp: ungültige Hardwareadresse\n" - --#: ../arp.c:387 -+#: ../arp.c:398 - #, c-format - msgid "arp: cannot open etherfile %s !\n" - msgstr "arp: Kann %s nicht öffnen!\n" - --#: ../arp.c:403 -+#: ../arp.c:414 - #, c-format - msgid "arp: format error on line %u of etherfile %s !\n" - msgstr "arp: Formatfehler in Zeile %u von Etherfile %s.\n" - --#: ../arp.c:416 -+#: ../arp.c:427 - #, c-format - msgid "arp: cannot set entry on line %u of etherfile %s !\n" - msgstr "arp: Kann Eintrag auf Zeile %u von Etherdatei %s nicht setzen!\n" - --#: ../arp.c:437 --msgid "Address\t\t\tHWtype\tHWaddress\t Flags Mask\t\t Iface\n" -+#: ../arp.c:448 -+#, fuzzy, c-format -+msgid "" -+"Address HWtype HWaddress Flags Mask " -+"Iface\n" - msgstr "Adresse\t\t\tHWTyp\tHWAdresse\t Flags Maske\t\t Iface\n" - --#: ../arp.c:467 -+#: ../arp.c:476 -+#, fuzzy -+msgid "<from_interface>" -+msgstr " Schnittstelle: %s\n" -+ -+#: ../arp.c:478 - msgid "(incomplete)" --msgstr "(unvollsändig)" -+msgstr "(unvollständig)" - --#: ../arp.c:484 -+#: ../arp.c:495 - #, c-format - msgid "%s (%s) at " - msgstr "%s (%s) auf " - --#: ../arp.c:490 -+#: ../arp.c:501 -+#, c-format - msgid "<incomplete> " - msgstr "<unvollständig> " - --#: ../arp.c:496 -+#: ../arp.c:507 - #, c-format - msgid "netmask %s " - msgstr "netzmaske %s " - --#: ../arp.c:513 -+#: ../arp.c:524 - #, c-format - msgid "on %s\n" - msgstr "auf %s\n" - --#: ../arp.c:592 -+#: ../arp.c:605 - #, c-format - msgid "Entries: %d\tSkipped: %d\tFound: %d\n" - msgstr "Einträge: %d Ignoriert: %d Gefunden: %d\n" - --#: ../arp.c:596 -+#: ../arp.c:609 - #, c-format - msgid "%s (%s) -- no entry\n" - msgstr "%s (%s) -- kein Eintrag\n" - --#: ../arp.c:598 -+#: ../arp.c:611 - #, c-format - msgid "arp: in %d entries no match found.\n" --msgstr "arp: In %d Einträgen wurde kein Zutreffender gefunden.\n" -+msgstr "arp: In %d Einträgen wurde kein zutreffender gefunden.\n" - --#: ../arp.c:613 -+#: ../arp.c:626 -+#, c-format - msgid "" - "Usage:\n" - " arp [-vn] [<HW>] [-i <if>] [-a] [<hostname>] <-Display ARP " -@@ -109,157 +124,165 @@ - "Benutzung:\n" - " arp [-vn] [<HW>] [-i <if>] [-a] [<Hostname>]\n" - --#: ../arp.c:614 -+#: ../arp.c:627 -+#, fuzzy, c-format - msgid "" --" arp [-v] [-i <if>] -d <hostname> [pub][nopub] <-Delete ARP " -+" arp [-v] [-i <if>] -d <host> [pub] <-Delete ARP " - "entry\n" - msgstr " arp [-v] [-i <if>] -d <Hostname> [pub][nopub]\n" - --#: ../arp.c:615 -+#: ../arp.c:628 -+#, fuzzy, c-format - msgid "" --" arp [-vnD] [<HW>] [-i <if>] -f [<filename>] <-Add entry from " -+" arp [-vnD] [<HW>] [-i <if>] -f [<filename>] <-Add entry from " - "file\n" - msgstr " arp [-vnD] [<HW>] [-i <if>] -f <Dateiname> <- Eintrag aus Datei hinzufügen\n" - --#: ../arp.c:616 -+#: ../arp.c:629 -+#, fuzzy, c-format - msgid "" --" arp [-v] [<HW>] [-i <if>] -s <hostname> <hwaddr> [temp][nopub] <-Add " -+" arp [-v] [<HW>] [-i <if>] -s <host> <hwaddr> [temp] <-Add " - "entry\n" - msgstr "" - " arp [-v] [<HW>] [-i <if>] -s <Rechnername> <hwaddr> [temp][nopub]\n" - --#: ../arp.c:617 --msgid "" --" arp [-v] [<HW>] [-i <if>] -s <hostname> <hwaddr> [netmask <nm>] pub " --"<-''-\n" --msgstr "" --" arp [-v] [<HW>] [-i <if>] -s <Hostname> <hwaddr> [netmask <nm>] pub\n" -- --#: ../arp.c:618 -+#: ../arp.c:630 -+#, fuzzy, c-format - msgid "" --" arp [-v] [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub " -+" arp [-v] [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub " - "<-''-\n" - "\n" - msgstr " arp [-v] [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub\n" - --#: ../arp.c:620 -+#: ../arp.c:632 -+#, c-format - msgid "" - " -a display (all) hosts in alternative (BSD) " - "style\n" - msgstr " -a Alle Hosts im BSD-Format anzeigen\n" - --#: ../arp.c:621 -+#: ../arp.c:633 -+#, c-format - msgid " -s, --set set a new ARP entry\n" - msgstr " -s, --set Neuen ARP-Eintrag setzen\n" - --#: ../arp.c:622 -+#: ../arp.c:634 -+#, c-format - msgid " -d, --delete delete a specified entry\n" - msgstr " -d, --delete Einen bestimmten Eintrag löschen\n" - --#: ../arp.c:623 ../netstat.c:1436 ../route.c:85 -+#: ../arp.c:635 ../netstat.c:1503 ../route.c:86 -+#, c-format - msgid " -v, --verbose be verbose\n" - msgstr " -v, --verbose Ausführliche Ausgaben\n" - --#: ../arp.c:624 ../netstat.c:1437 ../route.c:86 --msgid " -n, --numeric dont resolve names\n" -+#: ../arp.c:636 ../netstat.c:1504 ../route.c:87 -+#, fuzzy, c-format -+msgid " -n, --numeric don't resolve names\n" - msgstr " -n, --numeric Adressen nicht nach Namen auflösen\n" - --#: ../arp.c:625 -+#: ../arp.c:637 -+#, c-format - msgid "" - " -i, --device specify network interface (e.g. eth0)\n" --msgstr " -i, --device Netzwerksgerät (z.B. eth0) angeben\n" -+msgstr " -i, --device Netzwerkgerät (z.B. eth0) angeben\n" - --#: ../arp.c:626 -+#: ../arp.c:638 -+#, c-format - msgid " -D, --use-device read <hwaddr> from given device\n" - msgstr " -D, --use-device <hwaddr> von gegebenem Gerät lesen\n" - --#: ../arp.c:627 -+#: ../arp.c:639 -+#, c-format - msgid " -A, -p, --protocol specify protocol family\n" - msgstr " -A, -p, --protocol Routentabelle anzeigen\n" - --#: ../arp.c:628 -+#: ../arp.c:640 -+#, c-format - msgid "" --" -f, --file read new entries from file or from " --"/etc/ethers\n" -+" -f, --file read new entries from file or from /etc/" -+"ethers\n" - "\n" - msgstr "" - " -f, --file Neue Einträge aus Datei lesen\n" - "\n" - --#: ../arp.c:630 ../rarp.c:181 -+#: ../arp.c:642 ../rarp.c:182 - #, c-format - msgid " <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n" - msgstr " <HW>='-H <hw>' um Hardwareadresstyp anzugeben. Standard: %s\n" - --#: ../arp.c:631 ../rarp.c:182 -+#: ../arp.c:643 ../rarp.c:183 -+#, c-format - msgid " List of possible hardware types (which support ARP):\n" - msgstr " Liste möglicher Hardwaretypen, die ARP unterstützen:\n" - --#: ../arp.c:664 -+#: ../arp.c:677 ../arp.c:762 - #, c-format - msgid "%s: hardware type not supported!\n" - msgstr "%s: Hardwaretyp nicht unterstützt!\n" - --#: ../arp.c:668 -+#: ../arp.c:681 - #, c-format - msgid "%s: address family not supported!\n" - msgstr "%s: Adressfamilie nicht unterstützt!\n" - --#: ../arp.c:703 -+#: ../arp.c:716 -+#, c-format - msgid "arp: -N not yet supported.\n" - msgstr "arp: -N noch nicht unterstützt.\n" - --#: ../arp.c:713 -+#: ../arp.c:726 - #, c-format - msgid "arp: %s: unknown address family.\n" - msgstr "arp: %s: unbekannte Adressfamilie.\n" - --#: ../arp.c:722 -+#: ../arp.c:735 - #, c-format - msgid "arp: %s: unknown hardware type.\n" - msgstr "arp: %s: unbekannter Hardwaretyp.\n" - --#: ../arp.c:741 -+#: ../arp.c:754 - #, c-format - msgid "arp: %s: kernel only supports 'inet'.\n" --msgstr "arp: %s: Kernel unterstützt nur ,,inet''.\n" -+msgstr "arp: %s: Kernel unterstützt nur »inet«.\n" - --#: ../arp.c:746 -+#: ../arp.c:767 - #, c-format - msgid "arp: %s: hardware type without ARP support.\n" - msgstr "arp: %s: Hardware unterstützt kein ARP.\n" - --#: ../hostname.c:69 -+#: ../hostname.c:71 - #, c-format - msgid "Setting nodename to `%s'\n" --msgstr "Rechnernamen auf ,,%s'' setzen\n" -+msgstr "Rechnernamen auf »%s« setzen\n" - --#: ../hostname.c:74 -+#: ../hostname.c:76 - #, c-format - msgid "%s: you must be root to change the node name\n" - msgstr "%s: Nur Root darf den Rechnernamen ändern\n" - --#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116 -+#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117 - #, c-format - msgid "%s: name too long\n" - msgstr "%s: name zu lang\n" - --#: ../hostname.c:89 -+#: ../hostname.c:91 - #, c-format - msgid "Setting hostname to `%s'\n" --msgstr "Setze Hostname auf ,,%s''\n" -+msgstr "Setze Hostname auf »%s«\n" - --#: ../hostname.c:94 -+#: ../hostname.c:96 - #, c-format - msgid "%s: you must be root to change the host name\n" --msgstr "%s: Nur Root darf then Rechnernamen ändern\n" -+msgstr "%s: Nur Root darf den Rechnernamen ändern\n" - --#: ../hostname.c:108 -+#: ../hostname.c:109 - #, c-format - msgid "Setting domainname to `%s'\n" --msgstr "Setze domainname auf ,,%s''\n" -+msgstr "Setze domainname auf »%s«\n" - --#: ../hostname.c:113 -+#: ../hostname.c:114 - #, c-format - msgid "%s: you must be root to change the domain name\n" - msgstr "%s: Nur Root darf den Domainnamen ändern\n" -@@ -267,51 +290,56 @@ - #: ../hostname.c:131 - #, c-format - msgid "Resolving `%s' ...\n" --msgstr "Löse ,,%s'' auf ...\n" -+msgstr "Löse »%s« auf ...\n" - - #: ../hostname.c:137 - #, c-format - msgid "Result: h_name=`%s'\n" --msgstr "Ergebnis: h_name=,,%s''\n" -+msgstr "Ergebnis: h_name=»%s«\n" - - #: ../hostname.c:142 - #, c-format - msgid "Result: h_aliases=`%s'\n" --msgstr "Ergebnis: h_aliases=,,%s''\n" -+msgstr "Ergebnis: h_aliases=»%s«\n" - - #: ../hostname.c:147 - #, c-format - msgid "Result: h_addr_list=`%s'\n" --msgstr "Ergebnis: h_addr_list=,,%s''\n" -+msgstr "Ergebnis: h_addr_list=»%s«\n" - --#: ../hostname.c:209 -+#: ../hostname.c:208 - #, c-format - msgid "%s: can't open `%s'\n" --msgstr "%s: Kann ,,%s'' nicht öffnen\n" -+msgstr "%s: Kann »%s« nicht öffnen\n" - --#: ../hostname.c:223 -+#: ../hostname.c:222 -+#, c-format - msgid "Usage: hostname [-v] {hostname|-F file} set hostname (from file)\n" - msgstr "" - "Benutzung: hostname [-v] {Hostname|-F Datei} Hostname (aus Datei) setzen\n" - --#: ../hostname.c:224 -+#: ../hostname.c:223 -+#, c-format - msgid "" - " domainname [-v] {nisdomain|-F file} set NIS domainname (from file)\n" - msgstr "" --" domainname [-v] {nisdomain|-F file} NIS Domainname (aus Datei) " -+" domainname [-v] {nisdomain|-F file} NIS-Domainname (aus Datei) " - "setzen.\n" - --#: ../hostname.c:226 -+#: ../hostname.c:225 -+#, c-format - msgid "" - " nodename [-v] {nodename|-F file} set DECnet node name (from " - "file)\n" - msgstr " nodename [-v] {Rechnername|-F Datei}\n" - --#: ../hostname.c:228 -+#: ../hostname.c:227 -+#, c-format - msgid " hostname [-v] [-d|-f|-s|-a|-i|-y|-n] display formatted name\n" - msgstr " hostname [-v] [-d|-f|-s|-a|-i|-y|-n]\n" - --#: ../hostname.c:229 -+#: ../hostname.c:228 -+#, c-format - msgid "" - " hostname [-v] display hostname\n" - "\n" -@@ -319,7 +347,8 @@ - " 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 @@ - "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 @@ - " dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" - "\n" - --#: ../hostname.c:232 -+#: ../hostname.c:231 -+#, c-format - msgid " -s, --short short host name\n" - msgstr " -s, --short Kurzer Hostname\n" - --#: ../hostname.c:233 -+#: ../hostname.c:232 -+#, c-format - msgid " -a, --alias alias names\n" - msgstr " -a, --alias Namensalias\n" - --#: ../hostname.c:234 -+#: ../hostname.c:233 -+#, c-format - msgid " -i, --ip-address addresses for the hostname\n" - msgstr " -i, --ip-address Adressen für den Hostnamen\n" - --#: ../hostname.c:235 -+#: ../hostname.c:234 -+#, c-format - msgid " -f, --fqdn, --long long host name (FQDN)\n" - msgstr " -f, --fqdn, --long Langer Hostname (FQDN)\n" - --#: ../hostname.c:236 -+#: ../hostname.c:235 -+#, c-format - msgid " -d, --domain DNS domain name\n" --msgstr " -d, --domain DNS Domainname\n" -+msgstr " -d, --domain DNS-Domainname\n" - --#: ../hostname.c:237 -+#: ../hostname.c:236 -+#, c-format - msgid " -y, --yp, --nis NIS/YP domainname\n" --msgstr " -y, --yp, --nis NIS/YP Domainname\n" -+msgstr " -y, --yp, --nis NIS/YP-Domainname\n" - --#: ../hostname.c:239 -+#: ../hostname.c:238 -+#, c-format - msgid " -n, --node DECnet node name\n" --msgstr " -n, --node DECnet Knotennamen\n" -+msgstr " -n, --node DECnet-Knotennamen\n" - --#: ../hostname.c:241 -+#: ../hostname.c:240 -+#, c-format - msgid "" - " -F, --file read hostname or NIS domainname from given file\n" - "\n" - msgstr "" --" -F, --file Hostnamen oder NIS Domainnamen aus Datei lesen\n" -+" -F, --file Hostnamen oder NIS-Domainnamen aus Datei lesen\n" - "\n" - --#: ../hostname.c:243 -+#: ../hostname.c:242 -+#, c-format - msgid "" - " This command can read or set the hostname or the NIS domainname. You can\n" - " also read the DNS domain or the FQDN (fully qualified domain name).\n" -@@ -380,395 +419,268 @@ - " FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n" - " part of the FQDN) in the /etc/hosts file.\n" - msgstr "" --" Dies Kommando setzt oder gibt den Hostnamen oder NIS Domainnamen aus.\n" --" Es ist ebenfalls möglich die DNS Domain oder den FQDN (langen Hostnamen)\n" -+" Dies Kommando setzt oder gibt den Hostnamen oder NIS-Domainnamen aus.\n" -+" Es ist ebenfalls möglich die DNS-Domain oder den FQDN (langen Hostnamen)\n" - " ausgeben zu lassen. Außer wenn DNS oder NIS als Namensdienst verwendet\n" --" wird, können FQDN (Fully Qualified Domain Name) und DNS Domainname (welcher\n" -+" wird, können FQDN (Fully Qualified Domain Name) und DNS-Domainname (welcher\n" - " Teil des FQDNs ist) in /etc/hosts geändert werden.\n" - - #: ../hostname.c:338 - #, c-format - msgid "%s: You can't change the DNS domain name with this command\n" --msgstr "%s: Mit diesem Program kann der DNS Domainname nicht geändert werden\n" -+msgstr "%s: Mit diesem Programm kann der DNS-Domainname nicht geändert werden\n" - - #: ../hostname.c:339 -+#, c-format - msgid "" - "\n" - "Unless you are using bind or NIS for host lookups you can change the DNS\n" - msgstr "" - "\n" --"Wenn Bind oder NIS nicht zur Hostnamensauflösung benutzt werden, kann der " --"DNS\n" -+"Wenn Bind oder NIS nicht zur Hostnamensauflösung benutzt werden, kann der DNS\n" - - #: ../hostname.c:340 -+#, c-format - msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n" --msgstr "" --"Domainname (welcher Teil des FQDN ist) in der Datei /etc/hosts geändert " --"werden.\n" -+msgstr "Domainname (welcher Teil des FQDN ist) in der Datei /etc/hosts geändert werden.\n" - - #: ../hostname.c:357 - #, c-format - msgid "gethostname()=`%s'\n" --msgstr "gethostname()=,,%s''\n" -+msgstr "gethostname()=»%s«\n" - - #: ../hostname.c:374 - #, c-format - msgid "getdomainname()=`%s'\n" --msgstr "getdomainname()=,,%s''\n" -+msgstr "getdomainname()=»%s«\n" - - #: ../hostname.c:389 - #, c-format - msgid "getnodename()=`%s'\n" --msgstr "getnodename()=,,%s''\n" -+msgstr "getnodename()=»%s«\n" - --#: ../ifconfig.c:159 --#, c-format --msgid "%-9.9s Link encap:%s " --msgstr "%-9.9s Protokoll:%s " -+#: ../ifconfig.c:107 -+#, fuzzy, c-format -+msgid "" -+"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " -+"Flg\n" -+msgstr "SStelle MTU Met RX-OK RX-Feh RX-DRP RX-Ülf TX-OK TX-Feh TX-DRP TX-Üb Flg\n" - --#: ../ifconfig.c:164 --#, c-format --msgid "HWaddr %s " --msgstr "Hardware Adresse %s " -+#: ../ifconfig.c:129 ../ifconfig.c:161 -+#, fuzzy, c-format -+msgid "%s: ERROR while getting interface flags: %s\n" -+msgstr "%s: Fehler beim Auslesen der Schnittstelleninformation: %s\n" - --#: ../ifconfig.c:167 -+#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862 -+#: ../ifconfig.c:973 - #, c-format --msgid "Media:%s" --msgstr "Medium:%s" -+msgid "No support for INET on this system.\n" -+msgstr "INET ist auf diesem System nicht verfügbar.\n" - --#: ../ifconfig.c:169 --msgid "(auto)" --msgstr "(auto)" -+#: ../ifconfig.c:193 -+#, fuzzy, c-format -+msgid "%s: ERROR while testing interface flags: %s\n" -+msgstr "%s: Fehler beim Auslesen der Schnittstelleninformation: %s\n" - --#: ../ifconfig.c:176 --#, c-format --msgid " %s addr:%s " --msgstr " %s Adresse:%s " -+#: ../ifconfig.c:202 -+#, fuzzy, c-format -+msgid "" -+"Usage:\n" -+" ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n" -+msgstr "" -+"Syntax:\n" -+" ifconfig [-a] [-i] [-v] <Schnittstelle> [[<AF>] <Adresse>]\n" - --#: ../ifconfig.c:179 -+#: ../ifconfig.c:204 - #, c-format --msgid " P-t-P:%s " --msgstr " P-z-P:%s " -+msgid " [add <address>[/<prefixlen>]]\n" -+msgstr " [add <Adresse>[/<Präfixlänge>]]\n" - --#: ../ifconfig.c:182 -+#: ../ifconfig.c:205 - #, c-format --msgid " Bcast:%s " --msgstr " Bcast:%s " -+msgid " [del <address>[/<prefixlen>]]\n" -+msgstr " [del <Adresse>[/<Präfixlänge>]]\n" - --#: ../ifconfig.c:184 -+#: ../ifconfig.c:206 - #, c-format --msgid " Mask:%s\n" --msgstr " Maske:%s\n" -+msgid " [[-]broadcast [<address>]] [[-]pointopoint [<address>]]\n" -+msgstr " [[-]broadcast [<Adresse>]] [[-]pointopoint [<Adresse>]]\n" - --#: ../ifconfig.c:201 -+#: ../ifconfig.c:207 - #, c-format --msgid " inet6 addr: %s/%d" --msgstr " inet6 Adresse: %s/%d" -- --#: ../ifconfig.c:203 --msgid " Scope:" --msgstr " Gültigkeitsbereich:" -- --#: ../ifconfig.c:206 --msgid "Global" --msgstr "Global" -+msgid " [netmask <address>] [dstaddr <address>] [tunnel <address>]\n" -+msgstr " [netmask <Adresse>] [dstaddr <Adresse>] [tunnel <Adresse>]\n" - --#: ../ifconfig.c:209 --msgid "Link" --msgstr "Verbindung" -+#: ../ifconfig.c:210 -+#, c-format -+msgid " [outfill <NN>] [keepalive <NN>]\n" -+msgstr " [outfill <NN>] [keepalive <NN>]\n" - - #: ../ifconfig.c:212 --msgid "Site" --msgstr "Standort" -- --#: ../ifconfig.c:215 --msgid "Compat" --msgstr "Kompatibilität" -- --#: ../ifconfig.c:218 --msgid "Host" --msgstr "Maschine" -- --#: ../ifconfig.c:221 --msgid "Unknown" --msgstr "Unbekannt" -- --#: ../ifconfig.c:236 - #, c-format --msgid " IPX/Ethernet II addr:%s\n" --msgstr " IPX/Ethernet II Adresse:%s\n" -+msgid " [hw <HW> <address>] [metric <NN>] [mtu <NN>]\n" -+msgstr " [hw <HW> <Adresse>] [metric <NN>] [mtu <NN>]\n" - --#: ../ifconfig.c:239 -+#: ../ifconfig.c:213 - #, c-format --msgid " IPX/Ethernet SNAP addr:%s\n" --msgstr " IPX/Ethernet SNAP Adresse:%s\n" -+msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" -+msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" - --#: ../ifconfig.c:242 -+#: ../ifconfig.c:214 - #, c-format --msgid " IPX/Ethernet 802.2 addr:%s\n" --msgstr " IPX/Ethernet 802.2 Adresse:%s\n" -+msgid " [multicast] [[-]promisc]\n" -+msgstr " [multicast] [[-]promisc]\n" - --#: ../ifconfig.c:245 -+#: ../ifconfig.c:215 - #, c-format --msgid " IPX/Ethernet 802.3 addr:%s\n" --msgstr " IPX/Ethernet 802.3 Adresse:%s\n" -+msgid " [mem_start <NN>] [io_addr <NN>] [irq <NN>] [media <type>]\n" -+msgstr " [mem_start <NN>] [io_addr <NN>] [irq <NN>] [media <Typ>]\n" - --#: ../ifconfig.c:255 -+#: ../ifconfig.c:217 - #, c-format --msgid " EtherTalk Phase 2 addr:%s\n" --msgstr " EtherTalk Phase 2 Adresse:%s\n" -+msgid " [txqueuelen <NN>]\n" -+msgstr " [txqueuelen <Länge>]\n" - --#: ../ifconfig.c:264 -+#: ../ifconfig.c:220 - #, c-format --msgid " econet addr:%s\n" --msgstr " econet Adresse:%s\n" -- --#: ../ifconfig.c:270 --msgid "[NO FLAGS] " --msgstr "[KEINE FLAGS] " -- --#: ../ifconfig.c:272 --msgid "UP " --msgstr "UP " -- --#: ../ifconfig.c:274 --msgid "BROADCAST " --msgstr "BROADCAST " -- --#: ../ifconfig.c:276 --msgid "DEBUG " --msgstr "DEBUG " -- --#: ../ifconfig.c:278 --msgid "LOOPBACK " --msgstr "LOOPBACK " -- --#: ../ifconfig.c:280 --msgid "POINTOPOINT " --msgstr "PUNKTZUPUNKT " -- --#: ../ifconfig.c:282 --msgid "NOTRAILERS " --msgstr "NOTRAILERS " -+msgid " [[-]dynamic]\n" -+msgstr " [[-]dynamic]\n" - --#: ../ifconfig.c:284 --msgid "RUNNING " --msgstr "RUNNING " -+#: ../ifconfig.c:222 -+#, c-format -+msgid "" -+" [up|down] ...\n" -+"\n" -+msgstr "" -+" [up|down] ...\n" -+"\n" - --#: ../ifconfig.c:286 --msgid "NOARP " --msgstr "NOARP " -+#: ../ifconfig.c:224 -+#, c-format -+msgid " <HW>=Hardware Type.\n" -+msgstr " <HW>=Hardwaretyp.\n" - --#: ../ifconfig.c:288 --msgid "PROMISC " --msgstr "PROMISC " -+#: ../ifconfig.c:225 -+#, c-format -+msgid " List of possible hardware types:\n" -+msgstr " Liste möglicher Hardwaretypen:\n" - --#: ../ifconfig.c:290 --msgid "ALLMULTI " --msgstr "ALLMULTI " -+#. 1 = ARPable -+#: ../ifconfig.c:227 -+#, c-format -+msgid " <AF>=Address family. Default: %s\n" -+msgstr " <AF>=Adressfamilie. Standardwert: %s\n" - --#: ../ifconfig.c:292 --msgid "SLAVE " --msgstr "SLAVE " -+#: ../ifconfig.c:228 -+#, c-format -+msgid " List of possible address families:\n" -+msgstr " List der möglichen Adressfamilien:\n" - --#: ../ifconfig.c:294 --msgid "MASTER " --msgstr "MASTER " -+#: ../ifconfig.c:303 -+#, c-format -+msgid "ifconfig: option `%s' not recognised.\n" -+msgstr "" - --#: ../ifconfig.c:296 --msgid "MULTICAST " --msgstr "MULTICAST " -+#: ../ifconfig.c:305 ../ifconfig.c:962 -+#, c-format -+msgid "ifconfig: `--help' gives usage information.\n" -+msgstr "" - --#: ../ifconfig.c:299 --msgid "DYNAMIC " --msgstr "DYNAMIC " -+#: ../ifconfig.c:380 -+#, c-format -+msgid "Unknown media type.\n" -+msgstr "Typ des Mediums unbekannt.\n" - --#: ../ifconfig.c:302 -+#: ../ifconfig.c:417 - #, c-format --msgid " MTU:%d Metric:%d" --msgstr " MTU:%d Metric:%d" -+msgid "" -+"Warning: Interface %s still in promisc mode... maybe other application is " -+"running?\n" -+msgstr "" - --#: ../ifconfig.c:306 -+#: ../ifconfig.c:429 - #, c-format --msgid " Outfill:%d Keepalive:%d" --msgstr " Outfill:%d Keepalive:%d" -+msgid "Warning: Interface %s still in MULTICAST mode.\n" -+msgstr "" - --#: ../ifconfig.c:320 -+#: ../ifconfig.c:441 - #, c-format --msgid "RX packets:%lu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" -+msgid "Warning: Interface %s still in ALLMULTI mode.\n" - msgstr "" --"Empfangene Pakete:%lu Fehler:%lu Weggeworfen:%lu Überlauf:%lu Rahmen:%lu\n" - --#: ../ifconfig.c:325 -+#: ../ifconfig.c:465 - #, c-format --msgid " compressed:%lu\n" --msgstr " komprimiert:%lu\n" -+msgid "Warning: Interface %s still in DYNAMIC mode.\n" -+msgstr "" - --#: ../ifconfig.c:329 -+#: ../ifconfig.c:523 - #, c-format --msgid "TX packets:%lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" -+msgid "Warning: Interface %s still in BROADCAST mode.\n" - msgstr "" --"Verschickte Pakete:%lu Fehler:%lu Weggeworfen:%lu Überlauf:%lu Träger:%lu\n" - --#: ../ifconfig.c:333 -+#: ../ifconfig.c:652 - #, c-format --msgid " collisions:%lu " --msgstr " Kollisionen:%lu " -+msgid "Warning: Interface %s still in POINTOPOINT mode.\n" -+msgstr "" - --#: ../ifconfig.c:335 -+#: ../ifconfig.c:684 - #, c-format --msgid "compressed:%lu " --msgstr "Komprimiert:%lu " -+msgid "hw address type `%s' has no handler to set address. failed.\n" -+msgstr "" - --#: ../ifconfig.c:337 -+#: ../ifconfig.c:693 - #, c-format --msgid "txqueuelen:%d " --msgstr "Sendewarteschlangenlänge:%d " -+msgid "%s: invalid %s address.\n" -+msgstr "%s: ungültige %s Adresse.\n" - --#: ../ifconfig.c:345 -+#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913 - #, c-format --msgid "Interrupt:%d " --msgstr "Interrupt:%d " -- --#. Only print devices using it for --#. I/O maps --#: ../ifconfig.c:348 --#, c-format --msgid "Base address:0x%x " --msgstr "Basisadresse:0x%x " -- --#: ../ifconfig.c:350 --#, c-format --msgid "Memory:%lx-%lx " --msgstr "Speicher:%lx-%lx " -- --#: ../ifconfig.c:353 --#, c-format --msgid "DMA chan:%x " --msgstr "DMA Kanal:%x " -+msgid "No support for INET6 on this system.\n" -+msgstr "INET6 ist auf diesem System nicht verfügbar.\n" - --#: ../ifconfig.c:384 ../ifconfig.c:405 -+#: ../ifconfig.c:780 ../ifconfig.c:871 - #, c-format --msgid "%s: unknown interface: %s\n" --msgstr "%s: unbekannte Schnittstelle: %s\n" -- --#: ../ifconfig.c:421 --msgid "" --"Usage:\n" --" ifconfig [-a] [-i] [-v] <interface> [[<AF>] <address>]\n" --msgstr "" --"Syntax:\n" --" ifconfig [-a] [-i] [-v] <Schnittstelle> [[<AF>] <Adresse>]\n" -- --#: ../ifconfig.c:425 --msgid " [add <address>[/<prefixlen>]]\n" --msgstr " [add <Adresse>[/<Prefixlänge>]]\n" -- --#: ../ifconfig.c:427 --msgid " [del <address>[/<prefixlen>]]\n" --msgstr " [del <Adresse>[/<Prefixlänge>]]\n" -- --#: ../ifconfig.c:432 --msgid " [[-]broadcast [<address>]] [[-]pointopoint [<address>]]\n" --msgstr " [[-]broadcast [<Adresse>]] [[-]pointopoint [<Adresse>]]\n" -- --#: ../ifconfig.c:433 --msgid " [netmask <address>] [dstaddr <address>] [tunnel <address>]\n" --msgstr " [netmask <Addresse>] [dstaddr <Adresse>] [tunnel <Adresse>]\n" -- --#: ../ifconfig.c:436 --msgid " [outfill <NN>] [keepalive <NN>]\n" --msgstr " [outfill <NN>] [keepalive <NN>]\n" -- --#: ../ifconfig.c:438 --msgid " [hw <HW> <address>] [metric <NN>] [mtu <NN>]\n" --msgstr " [hw <HW> <Adresse>] [metric <NN>] [mtu <NN>]\n" -- --#: ../ifconfig.c:439 --msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" --msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" -- --#: ../ifconfig.c:440 --msgid " [multicast] [[-]promisc]\n" --msgstr " [multicast] [[-]promisc]\n" -- --#: ../ifconfig.c:441 --msgid " [mem_start <NN>] [io_addr <NN>] [irq <NN>] [media <type>]\n" --msgstr " [mem_start <NN>] [io_addr <NN>] [irq <NN>] [media <Typ>]\n" -- --#: ../ifconfig.c:443 --msgid " [txqueuelen <NN>]\n" --msgstr " [txqueuelen <Länge>]\n" -- --#: ../ifconfig.c:446 --msgid " [[-]dynamic]\n" --msgstr " [[-]dynamic]\n" -- --#: ../ifconfig.c:448 --msgid "" --" [up|down] ...\n" --"\n" -+msgid "Interface %s not initialized\n" - msgstr "" --" [up|down] ...\n" --"\n" -- --#: ../ifconfig.c:450 --msgid " <HW>=Hardware Type.\n" --msgstr " <HW>=Hardwaretyp.\n" -- --#: ../ifconfig.c:451 --msgid " List of possible hardware types:\n" --msgstr " Liste möglicher Hardwaretypen:\n" -- --#. 1 = ARPable --#: ../ifconfig.c:453 --#, c-format --msgid " <AF>=Address family. Default: %s\n" --msgstr " <AF>=Adressfamilie. Standardwert: %s\n" -- --#: ../ifconfig.c:454 --msgid " List of possible address families:\n" --msgstr " List der möglichen Adressfamilien:\n" -- --#: ../ifconfig.c:593 --msgid "Unknown media type.\n" --msgstr "Typ des Mediums unbekannt.\n" - --#: ../ifconfig.c:881 --#, c-format --msgid "%s: invalid %s address.\n" -+#: ../ifconfig.c:792 ../ifconfig.c:882 -+#, fuzzy, c-format -+msgid "Bad address.\n" - msgstr "%s: ungültige %s Adresse.\n" - --#: ../ifconfig.c:920 ../ifconfig.c:963 ../ifconfig.c:1011 --msgid "No support for INET6 on this system.\n" --msgstr "INET6 ist auf diesem System nicht verfügbar.\n" -- --#: ../ifconfig.c:983 -+#: ../ifconfig.c:885 -+#, c-format - msgid "Address deletion not supported on this system.\n" --msgstr "Das Löschen von Adressen ist auf diesem System nicht unterstützt.\n" -+msgstr "Das Löschen von Adressen wird auf diesem System nicht unterstützt.\n" - --#: ../ifconfig.c:1066 --msgid "No support for INET on this system.\n" --msgstr "INET ist auf diesem System nicht verfügbar.\n" -+#: ../ifconfig.c:957 -+#, fuzzy, c-format -+msgid "ifconfig: Cannot set address for this protocol family.\n" -+msgstr "Kann die Adressen der Familie %d nicht setzen.\n" - --#: ../ifconfig.c:1076 -+#: ../ifconfig.c:983 -+#, c-format - msgid "No support for ECONET on this system.\n" - msgstr "ECONET wird auf diesem System nicht unterstützt.\n" - --#: ../ifconfig.c:1084 -+#: ../ifconfig.c:991 - #, c-format - msgid "Don't know how to set addresses for family %d.\n" - msgstr "Kann die Adressen der Familie %d nicht setzen.\n" - --#: ../netstat.c:383 -+#: ../ifconfig.c:1021 -+#, c-format -+msgid "WARNING: at least one error occured. (%d)\n" -+msgstr "" -+ -+#: ../netstat.c:434 - #, c-format - msgid "" - "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n" --msgstr "" --"(Für \"-p\": geteuid()=%d konnte keine Information gelesen werden; sie " --"sollten Root sein.)\n" -+msgstr "(Für \"-p\": geteuid()=%d konnte keine Information gelesen werden; sie sollten Root sein.)\n" - --#: ../netstat.c:387 -+#: ../netstat.c:438 -+#, c-format - msgid "" - "(Not all processes could be identified, non-owned process info\n" - " will not be shown, you would have to be root to see it all.)\n" -@@ -776,198 +688,220 @@ - "(Es konnten nicht alle Prozesse identifiziert werden; Informationen über\n" - "nicht-eigene Processe werden nicht angezeigt; Root kann sie anzeigen.)\n" - --#: ../netstat.c:394 ../netstat.c:1089 ../netstat.c:1166 -+#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266 - msgid "LISTENING" - msgstr "HÖRT" - --#: ../netstat.c:395 -+#: ../netstat.c:446 - msgid "CONN SENT" - msgstr "VERBINGSAUFBAU GESCHICKT" - --#: ../netstat.c:396 ../netstat.c:1168 -+#: ../netstat.c:447 ../netstat.c:1268 - msgid "DISC SENT" - msgstr "VERBINDUNGSABBAU GESCHICKT" - --#: ../netstat.c:397 ../netstat.c:464 ../netstat.c:809 ../netstat.c:1169 -+#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269 - msgid "ESTABLISHED" - msgstr "VERBUNDEN" - --#: ../netstat.c:419 -+#: ../netstat.c:470 -+#, c-format - msgid "Active NET/ROM sockets\n" - msgstr "Aktive NET/ROM Sockets\n" - --#: ../netstat.c:420 -+#: ../netstat.c:471 -+#, c-format - msgid "" --"User Dest Source Device State Vr/Vs Send-Q " --"Recv-Q\n" --msgstr "" --"Benutzer Ziel Quelle Gerät Zustand Vr/Vs Send-Q " --"Recv-Q\n" -+"User Dest Source Device State Vr/Vs Send-Q Recv-" -+"Q\n" -+msgstr "Benutzer Ziel Quelle Gerät Zustand Vr/Vs Send-Q Recv-Q\n" - --#: ../netstat.c:430 ../netstat.c:1208 -+#: ../netstat.c:481 ../netstat.c:1308 - #, c-format - msgid "Problem reading data from %s\n" - msgstr "Probleme beim Lesen von %s\n" - --#: ../netstat.c:465 -+#: ../netstat.c:516 - msgid "SYN_SENT" - msgstr "SYN_SENT" - --#: ../netstat.c:466 -+#: ../netstat.c:517 - msgid "SYN_RECV" - msgstr "SYN_RECV" - --#: ../netstat.c:467 -+#: ../netstat.c:518 - msgid "FIN_WAIT1" - msgstr "FIN_WAIT1" - --#: ../netstat.c:468 -+#: ../netstat.c:519 - msgid "FIN_WAIT2" - msgstr "FIN_WAIT2" - --#: ../netstat.c:469 -+#: ../netstat.c:520 - msgid "TIME_WAIT" - msgstr "TIME_WAIT" - --#: ../netstat.c:470 -+#: ../netstat.c:521 - msgid "CLOSE" - msgstr "CLOSE" - --#: ../netstat.c:471 -+#: ../netstat.c:522 - msgid "CLOSE_WAIT" - msgstr "CLOSE_WAIT" - --#: ../netstat.c:472 -+#: ../netstat.c:523 - msgid "LAST_ACK" - msgstr "LAST_ACK" - --#: ../netstat.c:473 -+#: ../netstat.c:524 - msgid "LISTEN" - msgstr "LISTEN" - --#: ../netstat.c:474 -+#: ../netstat.c:525 - msgid "CLOSING" - msgstr "CLOSING" - --#: ../netstat.c:544 -+#: ../netstat.c:596 - #, c-format - msgid "warning, got bogus igmp6 line %d.\n" - msgstr "Warnung, fehlerhafte igmp6 line %d.\n" - --#: ../netstat.c:549 ../netstat.c:587 ../netstat.c:670 ../netstat.c:803 --#: ../netstat.c:935 ../netstat.c:940 -+#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898 -+#: ../netstat.c:1032 ../netstat.c:1037 - #, c-format - msgid "netstat: unsupported address family %d !\n" - msgstr "netstat: Nicht unterstützte Adressfamilie %d!\n" - --#: ../netstat.c:562 ../netstat.c:567 ../netstat.c:575 ../netstat.c:582 -+#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634 - #, c-format - msgid "warning, got bogus igmp line %d.\n" - msgstr "Warnung, fehlerhafte igmp-Zeile %d.\n" - --#: ../netstat.c:666 -+#: ../netstat.c:677 -+#, fuzzy, c-format -+msgid "Active X.25 sockets\n" -+msgstr "Aktive AX.25 Sockets\n" -+ -+#. IMHO, Vr/Vs is not very usefull --SF -+#: ../netstat.c:679 -+#, fuzzy, c-format -+msgid "" -+"Dest Source Device LCI State Vr/Vs Send-Q Recv-" -+"Q\n" -+msgstr "Ziel Quelle Gerät Zustand Vr/Vs Send-Q Empf-Q\n" -+ -+#: ../netstat.c:759 -+#, c-format - msgid "warning, got bogus tcp line.\n" - msgstr "Warnung, fehlerhafte TCP Zeile.\n" - --#: ../netstat.c:704 ../netstat.c:855 ../netstat.c:975 -+#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075 - #, c-format - msgid "off (0.00/%ld/%d)" - msgstr "aus (0.00/%ld/%d)" - --#: ../netstat.c:708 -+#: ../netstat.c:804 - #, c-format - msgid "on (%2.2f/%ld/%d)" - msgstr "ein (%2.2f/%ld/%d)" - --#: ../netstat.c:713 -+#: ../netstat.c:809 - #, fuzzy, c-format - msgid "keepalive (%2.2f/%ld/%d)" - msgstr "ein%d (%2.2f/%ld/%d)" - --#: ../netstat.c:718 -+#: ../netstat.c:814 - #, fuzzy, c-format - msgid "timewait (%2.2f/%ld/%d)" - msgstr "ein%d (%2.2f/%ld/%d)" - --#: ../netstat.c:723 ../netstat.c:864 ../netstat.c:985 -+#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085 - #, c-format - msgid "unkn-%d (%2.2f/%ld/%d)" - msgstr "unkn-%d (%2.2f/%ld/%d)" - --#: ../netstat.c:799 -+#: ../netstat.c:894 -+#, c-format - msgid "warning, got bogus udp line.\n" - msgstr "Warnung, fehlerhafe UDP-Zeile.\n" - --#: ../netstat.c:817 ../netstat.c:1075 ../netstat.c:1108 -+#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208 - msgid "UNKNOWN" - msgstr "UNBEKANNT" - --#: ../netstat.c:860 ../netstat.c:980 -+#: ../netstat.c:958 ../netstat.c:1080 - #, c-format - msgid "on%d (%2.2f/%ld/%d)" - msgstr "ein%d (%2.2f/%ld/%d)" - --#: ../netstat.c:949 -+#: ../netstat.c:1046 -+#, c-format - msgid "warning, got bogus raw line.\n" - msgstr "Warnung, fehlerhafte raw-Zeile.\n" - --#: ../netstat.c:1028 -+#: ../netstat.c:1128 -+#, c-format - msgid "warning, got bogus unix line.\n" - msgstr "Warnung, fehlerhafte UNIX-Zeile.\n" - --#: ../netstat.c:1055 -+#: ../netstat.c:1155 - msgid "STREAM" - msgstr "STREAM" - --#: ../netstat.c:1059 -+#: ../netstat.c:1159 - msgid "DGRAM" - msgstr "DGRAM" - --#: ../netstat.c:1063 -+#: ../netstat.c:1163 - msgid "RAW" - msgstr "RAW" - --#: ../netstat.c:1067 -+#: ../netstat.c:1167 - msgid "RDM" - msgstr "RDM" - --#: ../netstat.c:1071 -+#: ../netstat.c:1171 - msgid "SEQPACKET" --msgstr "SEQPACKET" -+msgstr "SEQPAKET" - --#: ../netstat.c:1080 -+#: ../netstat.c:1180 - msgid "FREE" - msgstr "FREI" - --#: ../netstat.c:1096 -+#: ../netstat.c:1196 - msgid "CONNECTING" - msgstr "VERBINDUNGSAUFBAU" - --#: ../netstat.c:1100 -+#: ../netstat.c:1200 - msgid "CONNECTED" - msgstr "VERBUNDEN" - --#: ../netstat.c:1104 -+#: ../netstat.c:1204 - msgid "DISCONNECTING" - msgstr "VERBINDUNGSABBAU" - --#: ../netstat.c:1135 -+#: ../netstat.c:1235 -+#, c-format - msgid "Active UNIX domain sockets " --msgstr "Aktive Sockets in der UNIX Domäne " -+msgstr "Aktive Sockets in der UNIX-Domäne " - --#: ../netstat.c:1137 ../netstat.c:1666 -+#: ../netstat.c:1237 ../netstat.c:1756 -+#, c-format - msgid "(servers and established)" - msgstr "(Server und stehende Verbindungen)" - --#: ../netstat.c:1140 ../netstat.c:1669 -+#: ../netstat.c:1240 ../netstat.c:1759 -+#, c-format - msgid "(only servers)" - msgstr "(Nur Server)" - --#: ../netstat.c:1142 ../netstat.c:1671 -+#: ../netstat.c:1242 ../netstat.c:1761 -+#, c-format - msgid "(w/o servers)" - msgstr "(ohne Server)" - --#: ../netstat.c:1145 -+#: ../netstat.c:1245 -+#, c-format - msgid "" - "\n" - "Proto RefCnt Flags Type State I-Node" -@@ -975,90 +909,90 @@ - "\n" - "Proto RefZäh Flaggen Typ Zustand I-Node" - --#: ../netstat.c:1147 -+#: ../netstat.c:1247 -+#, c-format - msgid " Path\n" - msgstr " Pfad\n" - --#: ../netstat.c:1167 -+#: ../netstat.c:1267 - msgid "SABM SENT" - msgstr "SABM GESCHICKT" - --#: ../netstat.c:1170 -+#: ../netstat.c:1270 - msgid "RECOVERY" - msgstr "WIEDERHERSTELLUNG" - --#: ../netstat.c:1184 -+#: ../netstat.c:1284 -+#, c-format - msgid "Active AX.25 sockets\n" - msgstr "Aktive AX.25 Sockets\n" - --#: ../netstat.c:1185 -+#: ../netstat.c:1285 -+#, c-format - msgid "Dest Source Device State Vr/Vs Send-Q Recv-Q\n" - msgstr "Ziel Quelle Gerät Zustand Vr/Vs Send-Q Empf-Q\n" - --#: ../netstat.c:1228 -+#: ../netstat.c:1328 - #, c-format - msgid "problem reading data from %s\n" - msgstr "Problem beim Lesen von Daten von %s\n" - --#: ../netstat.c:1279 -+#: ../netstat.c:1379 -+#, c-format - msgid "" - "Active IPX sockets\n" - "Proto Recv-Q Send-Q Local Address Foreign Address " - "State" - msgstr "" - "Aktive IPX Sockets\n" --"Proto Recv-Q Send-Q Lokale Adresse Gegenaddress " -+"Proto Recv-Q Send-Q Lokale Adresse Gegenadresse " - "Zustand" - --#: ../netstat.c:1281 -+#: ../netstat.c:1381 -+#, c-format - msgid " User" - msgstr " Benutzer" - --#: ../netstat.c:1315 -+#: ../netstat.c:1415 - msgid "ESTAB" - msgstr "VERBUNDEN" - --#: ../netstat.c:1323 -+#: ../netstat.c:1423 - msgid "UNK." - msgstr "UNB." - --#: ../netstat.c:1367 --msgid " - no statistics available -" --msgstr " - keine Statistiken verfügbar -" -- --#: ../netstat.c:1370 --msgid "[NO FLAGS]" --msgstr "[KEINE FLAGS]" -- --#: ../netstat.c:1400 -+#: ../netstat.c:1461 -+#, c-format - msgid "Kernel Interface table\n" --msgstr "Kernel Schnittstellentabelle\n" -+msgstr "Kernel-Schnittstellentabelle\n" - --#: ../netstat.c:1401 -+#: ../netstat.c:1465 -+#, fuzzy, c-format - msgid "" --"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " --"Flg\n" --msgstr "" --"SStelle MTU Met RX-OK RX-Feh RX-DRP RX-Ülf TX-OK TX-Feh TX-DRP TX-Üb " -+"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " - "Flg\n" -+msgstr "SStelle MTU Met RX-OK RX-Feh RX-DRP RX-Ülf TX-OK TX-Feh TX-DRP TX-Üb Flg\n" - --#: ../netstat.c:1404 -+#: ../netstat.c:1469 - msgid "missing interface information" --msgstr "Fehlende Interfaceinformation" -+msgstr "Fehlende Interfaceinformationen" - --#: ../netstat.c:1425 -+#: ../netstat.c:1492 -+#, c-format - msgid "" --"usage: netstat [-veenNcCF] [<Af>] -r netstat " --"{-V|--version|-h|--help}\n" -+"usage: netstat [-veenNcCF] [<Af>] -r netstat {-V|--version|-h|--" -+"help}\n" - msgstr "" - "Benutzung: netstat [-veenNcCF] [<Af>] -r\n" - " netstat {-V|--version|-h|--help}\n" - --#: ../netstat.c:1426 -+#: ../netstat.c:1493 -+#, c-format - msgid " netstat [-vnNcaeol] [<Socket> ...]\n" - msgstr " netstat [-vnNcaeol] [<Socket> ...]\n" - --#: ../netstat.c:1427 -+#: ../netstat.c:1494 -+#, c-format - msgid "" - " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" - "\n" -@@ -1066,27 +1000,32 @@ - " 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 @@ - " -M, --masquerade Maskierte Verbindungen auflisten\n" - "\n" - --#: ../netstat.c:1438 ../route.c:87 -+#: ../netstat.c:1505 -+#, fuzzy, c-format -+msgid " --numeric-hosts don't resolve host names\n" -+msgstr " -n, --numeric Adressen nicht nach Namen auflösen\n" -+ -+#: ../netstat.c:1506 -+#, fuzzy, c-format -+msgid " --numeric-ports don't resolve port names\n" -+msgstr " -n, --numeric Adressen nicht nach Namen auflösen\n" -+ -+#: ../netstat.c:1507 -+#, fuzzy, c-format -+msgid " --numeric-users don't resolve user names\n" -+msgstr " -n, --numeric Adressen nicht nach Namen auflösen\n" -+ -+#: ../netstat.c:1508 -+#, c-format - msgid " -N, --symbolic resolve hardware names\n" - msgstr " -N, --symbolic Hardwarenamen auflösen\n" - --#: ../netstat.c:1439 ../route.c:88 --#, fuzzy -+#: ../netstat.c:1509 ../route.c:88 -+#, fuzzy, c-format - msgid " -e, --extend display other/more information\n" --msgstr "" --" -e, --extend Weitere / zusätzliche Informationen " --"anzeigen\n" -+msgstr " -e, --extend Weitere / zusätzliche Informationen anzeigen\n" - --#: ../netstat.c:1440 -+#: ../netstat.c:1510 -+#, c-format - msgid " -p, --programs display PID/Program name for sockets\n" --msgstr "" --" -p, --programs PID/Programmnamen für Sockets anzeigen\n" -+msgstr " -p, --programs PID/Programmnamen für Sockets anzeigen\n" - --#: ../netstat.c:1441 -+#: ../netstat.c:1511 -+#, c-format - msgid "" - " -c, --continuous continuous listing\n" - "\n" -@@ -1118,24 +1072,27 @@ - " -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 @@ - " -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 @@ - " -C, --cache Routencache statt FIB anzeigen\n" - "\n" - --#: ../netstat.c:1448 -+#: ../netstat.c:1518 -+#, c-format - msgid "" --" <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx " --"--netrom\n" -+" <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" -+"netrom\n" - msgstr "" --" <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx " --"--netrom\n" -+" <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" -+"netrom\n" - --#: ../netstat.c:1449 ../route.c:92 --#, c-format --msgid " <AF>=Use '-A <af>' or '--<af>' Default: %s\n" -+#: ../netstat.c:1519 -+#, fuzzy, c-format -+msgid " <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n" - msgstr " <AF>=,,-A <af>'' or ,,--<af>'' benutzen. Standard: %s\n" - --#: ../netstat.c:1450 ../route.c:93 -+#: ../netstat.c:1520 ../route.c:93 -+#, c-format - msgid " List of possible address families (which support routing):\n" - msgstr " Liste möglicher Adressfamilien, die Routen unterstützen:\n" - --#: ../netstat.c:1663 -+#: ../netstat.c:1753 -+#, c-format - msgid "Active Internet connections " - msgstr "Aktive Internetverbindungen " - --#: ../netstat.c:1673 -+#: ../netstat.c:1763 -+#, c-format - msgid "" - "\n" --"Proto Recv-Q Send-Q Local Address Foreign Address State " --" " -+"Proto Recv-Q Send-Q Local Address Foreign Address " -+"State " - msgstr "" - "\n" --"Proto Recv-Q Send-Q Local Address Foreign Address State " --" " -+"Proto Recv-Q Send-Q Local Address Foreign Address " -+"State " - --#: ../netstat.c:1675 -+#: ../netstat.c:1765 -+#, c-format - msgid " User Inode " - msgstr " Benutzer Inode " - --#: ../netstat.c:1678 -+#: ../netstat.c:1768 -+#, c-format - msgid " Timer" - msgstr " Timer" - --#: ../netstat.c:1708 -+#: ../netstat.c:1798 -+#, c-format - msgid "IPv4 Group Memberships\n" --msgstr "IPv4 Gruppenmitgliedschaften\n" -+msgstr "IPv4-Gruppenmitgliedschaften\n" - --#: ../netstat.c:1709 -+#: ../netstat.c:1799 -+#, c-format - msgid "Interface RefCnt Group\n" - msgstr "Schnittstelle RefZäh Grupp\n" - --#: ../rarp.c:43 -+#: ../rarp.c:44 - msgid "This kernel does not support RARP.\n" - msgstr "Dieser Kernel unterstützt kein RARP.\n" - --#: ../rarp.c:82 -+#: ../rarp.c:83 - #, c-format - msgid "no RARP entry for %s.\n" --msgstr "Kein RARP Eintrag für %s.\n" -+msgstr "Kein RARP-Eintrag für %s.\n" - --#: ../rarp.c:95 -+#: ../rarp.c:96 - #, c-format - msgid "%s: bad hardware address\n" - msgstr "%s: fehlerhafte Hardwareadresse\n" - --#: ../rarp.c:127 -+#: ../rarp.c:128 - #, c-format - msgid "rarp: cannot open file %s:%s.\n" - msgstr "rarp: kann Datei %s:%s nicht öffnen.\n" - --#: ../rarp.c:139 -+#: ../rarp.c:140 - #, c-format - msgid "rarp: format error at %s:%u\n" - msgstr "rarp: Formatfehler bei %s:%u\n" - --#: ../rarp.c:143 ../rarp.c:287 -+#: ../rarp.c:144 ../rarp.c:289 - #, c-format - msgid "rarp: %s: unknown host\n" - msgstr "rarp: %s: Unbekannter Host\n" - --#: ../rarp.c:146 -+#: ../rarp.c:147 - #, c-format - msgid "rarp: cannot set entry from %s:%u\n" - msgstr "rarp: Kann Eintrag aus %s:%u nicht setzen.\n" - --#: ../rarp.c:175 -+#: ../rarp.c:176 -+#, c-format - msgid "Usage: rarp -a list entries in cache.\n" --msgstr "" --"Benutzung: rarp -a Einträge im Cache listen.\n" -+msgstr "Benutzung: rarp -a Einträge im Cache listen.\n" - --#: ../rarp.c:176 -+#: ../rarp.c:177 -+#, c-format - msgid " rarp -d <hostname> delete entry from cache.\n" --msgstr "" --" rarp -d <hostname> Eintrag aus dem Cache löschen.\n" -+msgstr " rarp -d <hostname> Eintrag aus dem Cache löschen.\n" - --#: ../rarp.c:177 -+#: ../rarp.c:178 -+#, c-format - msgid " rarp [<HW>] -s <hostname> <hwaddr> add entry to cache.\n" --msgstr "" --" rarp [<HW>] -s <hostname> <hwaddr> Eintrag zum Cache zufügen.\n" -+msgstr " rarp [<HW>] -s <hostname> <hwaddr> Eintrag zum Cache zufügen.\n" - --#: ../rarp.c:178 -+#: ../rarp.c:179 -+#, c-format - msgid "" - " rarp -f add entries from /etc/ethers.\n" --msgstr "" --" rarp -f Einträge aus /etc/ethers " --"zufügen.\n" -+msgstr " rarp -f Einträge aus /etc/ethers zufügen.\n" - --#: ../rarp.c:179 -+#: ../rarp.c:180 -+#, c-format - msgid "" - " rarp -V display program version.\n" - "\n" -@@ -1262,24 +1228,26 @@ - " rarp -V Programmversion anzeigen.\n" - "\n" - --#: ../rarp.c:236 -+#: ../rarp.c:238 - #, c-format - msgid "%s: illegal option mix.\n" - msgstr "%s: Unerlaubte Mischung von Optionen.\n" - --#: ../rarp.c:267 -+#: ../rarp.c:269 - #, c-format - msgid "rarp: %s: unknown hardware type.\n" --msgstr "rarp: %s: unknown hardware type.\n" -+msgstr "rarp: %s: unbekannter Hardwaretyp.\n" - --#: ../route.c:79 -+#: ../route.c:80 -+#, c-format - msgid "" - "Usage: route [-nNvee] [-FC] [<AF>] List kernel routing tables\n" - msgstr "" - "Benutzung: route [-nNvee] [-FC] [<AF>] Kernelroutentabelle " - "anzeigen\n" - --#: ../route.c:80 -+#: ../route.c:81 -+#, c-format - msgid "" - " route [-v] [-FC] {add|del|flush} ... Modify routing table for AF.\n" - "\n" -@@ -1287,14 +1255,15 @@ - " route [-v] [-FC] {add|del|flush} ... Routentabelle für AF ändern.\n" - "\n" - --#: ../route.c:82 -+#: ../route.c:83 -+#, c-format - msgid "" - " route {-h|--help} [<AF>] Detailed usage syntax for " - "specified AF.\n" --msgstr "" --" route {-h|--help} [<AF>] Genaue Syntax für AF anzeigen.\n" -+msgstr " route {-h|--help} [<AF>] Genaue Syntax für AF anzeigen.\n" - --#: ../route.c:83 -+#: ../route.c:84 -+#, c-format - msgid "" - " route {-V|--version} Display version/author and " - "exit.\n" -@@ -1304,590 +1273,891 @@ - "Ende.\n" - "\n" - -+#: ../route.c:92 -+#, fuzzy, c-format -+msgid " <AF>=Use '-A <af>' or '--<af>'; default: %s\n" -+msgstr " <AF>=,,-A <af>'' or ,,--<af>'' benutzen. Standard: %s\n" -+ - #: ../plipconfig.c:66 -+#, c-format - msgid "Usage: plipconfig [-a] [-i] [-v] interface\n" - msgstr "Benutzung: plipconfig [-a] [-i] [-v] Interface\n" - - #: ../plipconfig.c:67 -+#, c-format - msgid " [nibble NN] [trigger NN]\n" - msgstr " [nibble NN] [trigger NN]\n" - - #: ../plipconfig.c:68 --#, fuzzy -+#, c-format - msgid " plipconfig -V | --version\n" --msgstr " plipconfig -V\n" -+msgstr " plipconfig -V | --version\n" - - #: ../plipconfig.c:74 - #, c-format - msgid "%s\tnibble %lu trigger %lu\n" - msgstr "%s\tnibble %lu trigger %lu\n" - --#: ../iptunnel.c:79 -+#: ../iptunnel.c:85 -+#, c-format - msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n" - msgstr "Benutzung: iptunnel { add | change | del | show } [ NAME ]\n" - --#: ../iptunnel.c:80 -+#: ../iptunnel.c:86 -+#, c-format - msgid "" - " [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n" - msgstr " [ mode { ipip | gre | sit } ] [ remote ADR ] [ local ADR ]\n" - --#: ../iptunnel.c:81 -+#: ../iptunnel.c:87 -+#, c-format - msgid " [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n" - msgstr " [ [i|o]seq ] [ [i|o]key SCHLÜSSEL ] [ [i|o]csum ]\n" - --#: ../iptunnel.c:82 --#, fuzzy -+#: ../iptunnel.c:88 -+#, c-format - msgid " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n" --msgstr "" --" [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_GERÄt ]\n" --"\n" -+msgstr " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_GERÄt ]\n" - --#: ../iptunnel.c:83 -+#: ../iptunnel.c:89 -+#, c-format - msgid "" - " iptunnel -V | --version\n" - "\n" - msgstr "" -+" iptunnel -V | --version\n" -+"\n" - --#: ../iptunnel.c:84 -+#: ../iptunnel.c:90 -+#, c-format - msgid "Where: NAME := STRING\n" - msgstr "Wobei: NAME := ZEICHENKETTE\n" - --#: ../iptunnel.c:85 -+#: ../iptunnel.c:91 -+#, c-format - msgid " ADDR := { IP_ADDRESS | any }\n" - msgstr " ADR := { IP_ADRESSE | any }\n" - --#: ../iptunnel.c:86 -+#: ../iptunnel.c:92 -+#, c-format - msgid " TOS := { NUMBER | inherit }\n" - msgstr " TOS := { NUMBER | inherit }\n" - --#: ../iptunnel.c:87 -+#: ../iptunnel.c:93 -+#, c-format - msgid " TTL := { 1..255 | inherit }\n" - msgstr " TTL := { 1..255 | inherit }\n" - --#: ../iptunnel.c:88 -+#: ../iptunnel.c:94 -+#, c-format - msgid " KEY := { DOTTED_QUAD | NUMBER }\n" - msgstr " KEY := { DOTTED_QUAD | ZAHL }\n" - --#: ../iptunnel.c:326 -+#: ../iptunnel.c:332 -+#, c-format - msgid "Keys are not allowed with ipip and sit.\n" - msgstr "Schlüssel sind mit ipip und sit nicht erlaubt.\n" - --#: ../iptunnel.c:346 -+#: ../iptunnel.c:352 -+#, c-format - msgid "Broadcast tunnel requires a source address.\n" - msgstr "Ein Broadcasttunnel ist nur mit einer Quelladresse möglich\n" - --#: ../iptunnel.c:361 -+#: ../iptunnel.c:367 -+#, c-format - msgid "ttl != 0 and noptmudisc are incompatible\n" - msgstr "ttl != 0 und noptmudisc sind inkompatibel\n" - --#: ../iptunnel.c:373 -+#: ../iptunnel.c:379 -+#, c-format - msgid "cannot determine tunnel mode (ipip, gre or sit)\n" - msgstr "" - "Die Tunnelbetriebsart (ipip, fre oder sit) kann nicht festgestellt werden\n" - --#: ../iptunnel.c:411 -+#: ../iptunnel.c:417 - #, c-format - msgid "%s: %s/ip remote %s local %s " - msgstr "%s: %s/ip Gegenseite %s lokal %s " - --#: ../iptunnel.c:415 -+#: ../iptunnel.c:421 - msgid "unknown" - msgstr "Unbekannt" - --#: ../iptunnel.c:447 -+#: ../iptunnel.c:453 -+#, c-format - msgid " Drop packets out of sequence.\n" - msgstr " Pakete außer der Reihenfolge fallenlassen.\n" - --#: ../iptunnel.c:449 -+#: ../iptunnel.c:455 -+#, c-format - msgid " Checksum in received packet is required.\n" - msgstr " Prüfsumme im empfangenen Paket wird benötigt.\n" - --#: ../iptunnel.c:451 -+#: ../iptunnel.c:457 -+#, c-format - msgid " Sequence packets on output.\n" - msgstr " Pakete in Reihenfolge ausgeben.\n" - --#: ../iptunnel.c:453 -+#: ../iptunnel.c:459 -+#, c-format - msgid " Checksum output packets.\n" - msgstr " Prüfsumme für ausgegebene Pakete berechnen.\n" - --#: ../iptunnel.c:481 -+#: ../iptunnel.c:487 -+#, c-format - msgid "Wrong format of /proc/net/dev. Sorry.\n" --msgstr "Falsches Format von /proc/net/dev. Tut mir leid\n" -+msgstr "Falsches Format von /proc/net/dev. Tut mir leid.\n" - --#: ../iptunnel.c:494 -+#: ../iptunnel.c:500 - #, c-format - msgid "Failed to get type of [%s]\n" - msgstr "Kann den Typ von [%s] nicht holen\n" - --#: ../iptunnel.c:510 -+#: ../iptunnel.c:516 -+#, c-format - msgid "RX: Packets Bytes Errors CsumErrs OutOfSeq Mcasts\n" - msgstr "RX: Pakete Bytes Fehler CsumErrs OutOfSeq Mcasts\n" - --#: ../iptunnel.c:513 -+#: ../iptunnel.c:519 -+#, c-format - msgid "TX: Packets Bytes Errors DeadLoop NoRoute NoBufs\n" - msgstr "TX: Pakete Bytes Fehler DeadLoop NoRoute NoBufs\n" - --#: ../statistics.c:45 -+#: ../statistics.c:47 - msgid "ICMP input histogram:" --msgstr "ICMP Eingabehistogramm:" -+msgstr "ICMP-Eingabehistogramm:" - --#: ../statistics.c:46 -+#: ../statistics.c:48 - msgid "ICMP output histogram:" --msgstr "ICMP Ausgabehistogramm:" -+msgstr "ICMP-Ausgabehistogramm:" - --#: ../statistics.c:63 -+#: ../statistics.c:65 - #, c-format - msgid "Forwarding is %s" - msgstr "Weiterleitung ist %s" - --#: ../statistics.c:64 --#, c-format --msgid "Default TTL is %d" -+#: ../statistics.c:66 -+#, fuzzy, c-format -+msgid "Default TTL is %u" - msgstr "Standard-TTL ist %d" - --#: ../statistics.c:65 --#, c-format --msgid "%d total packets received" --msgstr "%d Pakete insgesamt empfangen" -+#: ../statistics.c:67 -+#, fuzzy, c-format -+msgid "%u total packets received" -+msgstr "%d Pakete insgesamt empfangen" - --#: ../statistics.c:66 --#, c-format --msgid "%d with invalid headers" --msgstr "%d with ungültigen Headern" -+#: ../statistics.c:68 -+#, fuzzy, c-format -+msgid "%u with invalid headers" -+msgstr "%d mit ungültigen Headern" - --#: ../statistics.c:67 --#, c-format --msgid "%d with invalid addresses" -+#: ../statistics.c:69 -+#, fuzzy, c-format -+msgid "%u with invalid addresses" - msgstr "%d mit ungültigen Adressen" - --#: ../statistics.c:68 --#, c-format --msgid "%d forwarded" -+#: ../statistics.c:70 -+#, fuzzy, c-format -+msgid "%u forwarded" - msgstr "%d weitergeleitet" - --#: ../statistics.c:69 --#, c-format --msgid "%d with unknown protocol" -+#: ../statistics.c:71 -+#, fuzzy, c-format -+msgid "%u with unknown protocol" - msgstr "%d mit unbekanntem Protokoll" - --#: ../statistics.c:70 --#, c-format --msgid "%d incoming packets discarded" -+#: ../statistics.c:72 -+#, fuzzy, c-format -+msgid "%u incoming packets discarded" - msgstr "%d eingehende Pakete weggeworfen" - --#: ../statistics.c:71 --#, c-format --msgid "%d incoming packets delivered" -+#: ../statistics.c:73 -+#, fuzzy, c-format -+msgid "%u incoming packets delivered" - msgstr "%d eingehende Pakete zugestellt" - --#: ../statistics.c:72 --#, c-format --msgid "%d requests sent out" -+#: ../statistics.c:74 -+#, fuzzy, c-format -+msgid "%u requests sent out" - msgstr "%d Anfragen ausgesandt" - - #. ? --#: ../statistics.c:73 --#, c-format --msgid "%d outgoing packets dropped" -+#: ../statistics.c:75 -+#, fuzzy, c-format -+msgid "%u outgoing packets dropped" - msgstr "%d ausgehende Pakete weggeworfen" - --#: ../statistics.c:74 --#, c-format --msgid "%d dropped because of missing route" -+#: ../statistics.c:76 -+#, fuzzy, c-format -+msgid "%u dropped because of missing route" - msgstr "%d weggeworfen wegen fehlender Route" - --#: ../statistics.c:75 --#, c-format --msgid "%d fragments dropped after timeout" -+#: ../statistics.c:77 -+#, fuzzy, c-format -+msgid "%u fragments dropped after timeout" - msgstr "%d Fragmente nach Timeout weggeworfen" - --#: ../statistics.c:76 --#, c-format --msgid "%d reassemblies required" -+#: ../statistics.c:78 -+#, fuzzy, c-format -+msgid "%u reassemblies required" - msgstr "%d Wiederzusammenstellungen nötig" - - #. ? --#: ../statistics.c:77 --#, c-format --msgid "%d packets reassembled ok" -+#: ../statistics.c:79 -+#, fuzzy, c-format -+msgid "%u packets reassembled ok" - msgstr "%d Fragmente korrekt empfangen" - --#: ../statistics.c:78 --#, c-format --msgid "%d packet reassembles failed" -+#: ../statistics.c:80 -+#, fuzzy, c-format -+msgid "%u packet reassembles failed" - msgstr "%d fehlgeschlagene Paketdefragmentierungen" - --#: ../statistics.c:79 --#, c-format --msgid "%d fragments received ok" -+#: ../statistics.c:81 -+#, fuzzy, c-format -+msgid "%u fragments received ok" - msgstr "%d Fragmente korrekt empfangen" - --#: ../statistics.c:80 --#, c-format --msgid "%d fragments failed" --msgstr "%d Fragmente Fehlgeschlagen" -+#: ../statistics.c:82 -+#, fuzzy, c-format -+msgid "%u fragments failed" -+msgstr "%d Fragmente fehlgeschlagen" - --#: ../statistics.c:81 --#, c-format --msgid "%d fragments created" -+#: ../statistics.c:83 -+#, fuzzy, c-format -+msgid "%u fragments created" - msgstr "%d Fragmente erzeugt" - --#: ../statistics.c:86 --#, c-format --msgid "%d ICMP messages received" --msgstr "%d ICMP Nachrichten empfangen" -+#: ../statistics.c:88 -+#, fuzzy, c-format -+msgid "%u ICMP messages received" -+msgstr "%d ICMP-Nachrichten empfangen" - --#: ../statistics.c:87 --#, c-format --msgid "%d input ICMP message failed." --msgstr "%d eingegangene ICMP Nachrichten fehlgeschlagen" -+#: ../statistics.c:89 -+#, fuzzy, c-format -+msgid "%u input ICMP message failed." -+msgstr "%d eingegangene ICMP-Nachrichten fehlgeschlagen" - --#: ../statistics.c:88 ../statistics.c:101 --#, c-format --msgid "destination unreachable: %d" -+#: ../statistics.c:90 ../statistics.c:103 -+#, fuzzy, c-format -+msgid "destination unreachable: %u" - msgstr "Ziel unerreichbar: %d" - --#: ../statistics.c:89 --#, c-format --msgid "timeout in transit: %d" -+#: ../statistics.c:91 -+#, fuzzy, c-format -+msgid "timeout in transit: %u" - msgstr "Timeout beim Transit: %d" - --#: ../statistics.c:90 ../statistics.c:103 --#, c-format --msgid "wrong parameters: %d" -+#: ../statistics.c:92 ../statistics.c:105 -+#, fuzzy, c-format -+msgid "wrong parameters: %u" - msgstr "Fehlerhafte Parameter: %d" - - #. ? --#: ../statistics.c:91 --#, c-format --msgid "source quenchs: %d" -+#: ../statistics.c:93 -+#, fuzzy, c-format -+msgid "source quenches: %u" - msgstr "Source Quenchs: %d" - --#: ../statistics.c:92 --#, c-format --msgid "redirects: %d" -+#: ../statistics.c:94 -+#, fuzzy, c-format -+msgid "redirects: %u" - msgstr "Umleitungen: %d" - --#: ../statistics.c:93 --#, c-format --msgid "echo requests: %d" --msgstr "Echo Requests: %d" -+#: ../statistics.c:95 -+#, fuzzy, c-format -+msgid "echo requests: %u" -+msgstr "Echo Anfragen: %d" - --#: ../statistics.c:94 ../statistics.c:107 --#, c-format --msgid "echo replies: %d" -+#: ../statistics.c:96 ../statistics.c:109 -+#, fuzzy, c-format -+msgid "echo replies: %u" - msgstr "Echo Antworten: %d" - --#: ../statistics.c:95 --#, c-format --msgid "timestamp request: %d" -+#: ../statistics.c:97 -+#, fuzzy, c-format -+msgid "timestamp request: %u" - msgstr "Zeitstempelanfragen: %d" - --#: ../statistics.c:96 --#, c-format --msgid "timestamp reply: %d" -+#: ../statistics.c:98 -+#, fuzzy, c-format -+msgid "timestamp reply: %u" - msgstr "Zeitstempelantworten: %d" - --#: ../statistics.c:97 --#, c-format --msgid "address mask request: %d" -+#: ../statistics.c:99 -+#, fuzzy, c-format -+msgid "address mask request: %u" - msgstr "Adressmaskenanfragen: %d" - - #. ? --#: ../statistics.c:98 --msgid "address mask replies" --msgstr "Adressmaskenantworten" -+#: ../statistics.c:100 ../statistics.c:113 -+#, fuzzy, c-format -+msgid "address mask replies: %u" -+msgstr "Adressmaskenantworten: %d" - - #. ? --#: ../statistics.c:99 --#, c-format --msgid "%d ICMP messages sent" -+#: ../statistics.c:101 -+#, fuzzy, c-format -+msgid "%u ICMP messages sent" - msgstr "%d ICMP-Nachrichten geschickt" - --#: ../statistics.c:100 --#, c-format --msgid "%d ICMP messages failed" --msgstr "%d ICMP Nachrichten fehlgeschlagen" -- - #: ../statistics.c:102 --#, c-format --msgid "time exceeded: %d" -+#, fuzzy, c-format -+msgid "%u ICMP messages failed" -+msgstr "%d ICMP-Nachrichten fehlgeschlagen" -+ -+#: ../statistics.c:104 -+#, fuzzy, c-format -+msgid "time exceeded: %u" - msgstr "Zeitüberschreitung: %d" - - #. ? --#: ../statistics.c:104 --#, c-format --msgid "source quench: %d" -+#: ../statistics.c:106 -+#, fuzzy, c-format -+msgid "source quench: %u" - msgstr "Source Quench: %d" - --#: ../statistics.c:105 --#, c-format --msgid "redirect: %d" -+#: ../statistics.c:107 -+#, fuzzy, c-format -+msgid "redirect: %u" - msgstr "Umleitungen: %d" - --#: ../statistics.c:106 --#, c-format --msgid "echo request: %d" -+#: ../statistics.c:108 -+#, fuzzy, c-format -+msgid "echo request: %u" - msgstr "Echo Anfragen: %d" - --#: ../statistics.c:108 --#, c-format --msgid "timestamp requests: %d" -+#: ../statistics.c:110 -+#, fuzzy, c-format -+msgid "timestamp requests: %u" - msgstr "Zeitstempel Anfragen: %d" - --#: ../statistics.c:109 --#, c-format --msgid "timestamp replies: %d" -+#: ../statistics.c:111 -+#, fuzzy, c-format -+msgid "timestamp replies: %u" - msgstr "Zeitstempel Antworten: %d" - --#: ../statistics.c:110 --#, c-format --msgid "address mask requests: %d" -+#: ../statistics.c:112 -+#, fuzzy, c-format -+msgid "address mask requests: %u" - msgstr "Adressmaskenanfragen: %d" - --#: ../statistics.c:111 -+#: ../statistics.c:118 - #, c-format --msgid "address mask replies: %d" --msgstr "Adressmaskenantworten: %d" -+msgid "RTO algorithm is %s" -+msgstr "RTO-Algorithmus ist %s" -+ -+#: ../statistics.c:122 -+#, fuzzy, c-format -+msgid "%u active connections openings" -+msgstr "%d Verbindungen aktiv geöffnet" -+ -+#: ../statistics.c:123 -+#, fuzzy, c-format -+msgid "%u passive connection openings" -+msgstr "%d Verbindungen passiv geöffnet" -+ -+#: ../statistics.c:124 -+#, fuzzy, c-format -+msgid "%u failed connection attempts" -+msgstr "%d fehlerhafte Verbindungsversuche" -+ -+#: ../statistics.c:125 -+#, fuzzy, c-format -+msgid "%u connection resets received" -+msgstr "%d Verbindungsrücksetzungen empfangen" -+ -+#: ../statistics.c:126 -+#, fuzzy, c-format -+msgid "%u connections established" -+msgstr "%d Verbindungen aufgebaut" -+ -+#: ../statistics.c:127 -+#, fuzzy, c-format -+msgid "%u segments received" -+msgstr "%d Segmente empfangen" -+ -+#: ../statistics.c:128 -+#, fuzzy, c-format -+msgid "%u segments send out" -+msgstr "%d Segmente abgeschickt" -+ -+#: ../statistics.c:129 -+#, fuzzy, c-format -+msgid "%u segments retransmited" -+msgstr "%d Segmente erneut geschickt" -+ -+#: ../statistics.c:130 -+#, fuzzy, c-format -+msgid "%u bad segments received." -+msgstr "%d fehlerhafte Segmente empfangen." -+ -+#: ../statistics.c:131 -+#, fuzzy, c-format -+msgid "%u resets sent" -+msgstr "%d Rücksetzungen geschickt" -+ -+#: ../statistics.c:136 -+#, fuzzy, c-format -+msgid "%u packets received" -+msgstr "%d Pakete empfangen" -+ -+#: ../statistics.c:137 -+#, fuzzy, c-format -+msgid "%u packets to unknown port received." -+msgstr "%d Pakete für unbekannte Ports empfangen." -+ -+#: ../statistics.c:138 -+#, fuzzy, c-format -+msgid "%u packet receive errors" -+msgstr "%d Paketempfangsfehler" -+ -+#: ../statistics.c:139 -+#, fuzzy, c-format -+msgid "%u packets sent" -+msgstr "%d Pakete geschickt" -+ -+#: ../statistics.c:144 -+#, fuzzy, c-format -+msgid "%u SYN cookies sent" -+msgstr "%d SYN-Cookies verschickt" -+ -+#: ../statistics.c:145 -+#, fuzzy, c-format -+msgid "%u SYN cookies received" -+msgstr "%d SYN-Cookies empfangen" - --#: ../statistics.c:116 -+#: ../statistics.c:146 -+#, fuzzy, c-format -+msgid "%u invalid SYN cookies received" -+msgstr "%d ungültige SYN-Cookies empfangen" -+ -+#: ../statistics.c:148 -+#, fuzzy, c-format -+msgid "%u resets received for embryonic SYN_RECV sockets" -+msgstr "%d Rücksetzungen für embrionische SYN_RECV-Sockets" -+ -+#: ../statistics.c:150 -+#, fuzzy, c-format -+msgid "%u packets pruned from receive queue because of socket buffer overrun" -+msgstr "%d Pakete wegen Socketpufferüberlauf aus der Empfangswarteschlange weggeworfen" -+ -+#. obsolete: 2.2.0 doesn't do that anymore -+#: ../statistics.c:153 -+#, fuzzy, c-format -+msgid "%u packets pruned from receive queue" -+msgstr "%d Pakete aus der ungeordneten Warteschlange weggeworfen" -+ -+#: ../statistics.c:154 -+#, fuzzy, c-format -+msgid "" -+"%u packets dropped from out-of-order queue because of socket buffer overrun" -+msgstr "%d Pakete aus der ungeordneten Warteschlange wegen Pufferüberlauf weggeworfen" -+ -+#: ../statistics.c:156 -+#, fuzzy, c-format -+msgid "%u ICMP packets dropped because they were out-of-window" -+msgstr "%d ICMP-Pakete weggeworfen die außerhalb des Fensters waren" -+ -+#: ../statistics.c:158 -+#, fuzzy, c-format -+msgid "%u ICMP packets dropped because socket was locked" -+msgstr "%d ICMP-Pakete verworfen weil Socket gesperrt war" -+ -+#: ../statistics.c:160 - #, c-format --msgid "RTO algorithm is %s" --msgstr "RTO Algorithmus is %s" -+msgid "%u TCP sockets finished time wait in fast timer" -+msgstr "" - --#: ../statistics.c:120 -+#: ../statistics.c:161 - #, c-format --msgid "%d active connections openings" --msgstr "%d Verbindungen aktiv geöffnet" -+msgid "%u time wait sockets recycled by time stamp" -+msgstr "" - --#: ../statistics.c:121 -+#: ../statistics.c:162 - #, c-format --msgid "%d passive connection openings" --msgstr "%d Verbindungen passiv geöffnet" -+msgid "%u TCP sockets finished time wait in slow timer" -+msgstr "" - --#: ../statistics.c:122 -+#: ../statistics.c:163 - #, c-format --msgid "%d failed connection attempts" --msgstr "%d fehlerhafte Verbindungsversuche" -+msgid "%u passive connections rejected because of time stamp" -+msgstr "" - --#: ../statistics.c:123 -+#: ../statistics.c:165 - #, c-format --msgid "%d connection resets received" --msgstr "%d Verbindungsrücksetzungen empfangen" -+msgid "%u active connections rejected because of time stamp" -+msgstr "" - --#: ../statistics.c:124 -+#: ../statistics.c:167 - #, c-format --msgid "%d connections established" --msgstr "%d Verbindungen aufgebaut" -+msgid "%u packets rejects in established connections because of timestamp" -+msgstr "" - --#: ../statistics.c:125 -+#: ../statistics.c:169 -+#, fuzzy, c-format -+msgid "%u delayed acks sent" -+msgstr "%d Pakete geschickt" -+ -+#: ../statistics.c:170 - #, c-format --msgid "%d segments received" --msgstr "%d Segmente empfangen" -+msgid "%u delayed acks further delayed because of locked socket" -+msgstr "" - --#: ../statistics.c:126 -+#: ../statistics.c:172 - #, c-format --msgid "%d segments send out" --msgstr "%d Segmente abgeschickt" -+msgid "Quick ack mode was activated %u times" -+msgstr "" - --#: ../statistics.c:127 -+#: ../statistics.c:173 - #, c-format --msgid "%d segments retransmited" --msgstr "%d Segmente erneut geschickt" -+msgid "%u times the listen queue of a socket overflowed" -+msgstr "" - --#: ../statistics.c:128 -+#: ../statistics.c:175 - #, c-format --msgid "%d bad segments received." --msgstr "%d fehlerhafte Segmente empfangen." -+msgid "%u SYNs to LISTEN sockets ignored" -+msgstr "" - --#: ../statistics.c:129 -+#: ../statistics.c:176 - #, c-format --msgid "%d resets sent" --msgstr "%d Rücksetzungen geschickt" -+msgid "%u packets directly queued to recvmsg prequeue." -+msgstr "" - --#: ../statistics.c:134 -+#: ../statistics.c:178 - #, c-format --msgid "%d packets received" -+msgid "%u of bytes directly received from backlog" -+msgstr "" -+ -+#: ../statistics.c:180 -+#, c-format -+msgid "%u of bytes directly received from prequeue" -+msgstr "" -+ -+#: ../statistics.c:182 -+#, fuzzy, c-format -+msgid "%u packets dropped from prequeue" -+msgstr "%d Pakete aus der ungeordneten Warteschlange weggeworfen" -+ -+#: ../statistics.c:183 -+#, fuzzy, c-format -+msgid "%u packet headers predicted" - msgstr "%d Pakete empfangen" - --#: ../statistics.c:135 -+#: ../statistics.c:184 - #, c-format --msgid "%d packets to unknown port received." -+msgid "%u packets header predicted and directly queued to user" -+msgstr "" -+ -+#: ../statistics.c:186 -+#, c-format -+msgid "Ran %u times out of system memory during packet sending" -+msgstr "" -+ -+#: ../statistics.c:188 -+#, fuzzy, c-format -+msgid "%u acknowledgments not containing data received" - msgstr "%d Pakete für unbekannte Ports empfangen." - --#: ../statistics.c:136 -+#: ../statistics.c:189 - #, c-format --msgid "%d packet receive errors" --msgstr "%d Paketempfangsfehler" -+msgid "%u predicted acknowledgments" -+msgstr "" - --#: ../statistics.c:137 -+#: ../statistics.c:190 - #, c-format --msgid "%d packets sent" --msgstr "%d Pakete geschickt" -+msgid "%u times recovered from packet loss due to fast retransmit" -+msgstr "" - --#: ../statistics.c:142 -+#: ../statistics.c:191 - #, c-format --msgid "%d SYN cookies sent" --msgstr "%d SYN-Cookies verschickt" -+msgid "%u times recovered from packet loss due to SACK data" -+msgstr "" - --#: ../statistics.c:143 -+#: ../statistics.c:192 -+#, fuzzy, c-format -+msgid "%u bad SACKs received" -+msgstr "%d fehlerhafte Segmente empfangen." -+ -+#: ../statistics.c:193 - #, c-format --msgid "%d SYN cookies received" --msgstr "%d SYN-Cookies empfangen" -+msgid "Detected reordering %u times using FACK" -+msgstr "" - --#: ../statistics.c:144 -+#: ../statistics.c:194 - #, c-format --msgid "%d invalid SYN cookies received" --msgstr "%d ungültige SYN-Cookies empfangen" -+msgid "Detected reordering %u times using SACK" -+msgstr "" - --#: ../statistics.c:146 -+#: ../statistics.c:195 - #, c-format --msgid "%d resets received for embryonic SYN_RECV sockets" --msgstr "%d Rücksetzungen fuer embrionische SYN_RECV Sockets" -+msgid "Detected reordering %u times using time stamp" -+msgstr "" - --#: ../statistics.c:148 -+#: ../statistics.c:196 - #, c-format --msgid "%d packets pruned from receive queue because of socket buffer overrun" -+msgid "Detected reordering %u times using reno fast retransmit" - msgstr "" --"%d Pakete wegen Socketpufferüberlauf aus der Empfangswarteschlange " --"weggeworfen" - --#. obsolete: 2.2.0 doesn't do that anymore --#: ../statistics.c:151 -+#: ../statistics.c:197 - #, c-format --msgid "%d packets pruned from out-of-order queue" --msgstr "%d Pakete aus der ungeordneten Warteschlange weggeworfen" -+msgid "%u congestion windows fully recovered" -+msgstr "" - --#: ../statistics.c:152 -+#: ../statistics.c:198 - #, c-format --msgid "" --"%d packets dropped from out-of-order queue because of socket buffer overrun" -+msgid "%u congestion windows partially recovered using Hoe heuristic" - msgstr "" --"%d Pakete aus der ungeordneten Warteschlange wegen Pufferüberlauf weggeworfen" - --#: ../statistics.c:154 -+#: ../statistics.c:199 - #, c-format --msgid "%d ICMP packets dropped because they were out-of-window" --msgstr "%d ICMP Pakete weggeworfen die auserhalb des Fensters waren" -+msgid "%u congestion window recovered using DSACK" -+msgstr "" - --#: ../statistics.c:156 -+#: ../statistics.c:200 -+#, c-format -+msgid "%u congestion windows recovered after partial ack" -+msgstr "" -+ -+#: ../statistics.c:201 -+#, fuzzy, c-format -+msgid "%u retransmits lost" -+msgstr "%d Rücksetzungen geschickt" -+ -+#: ../statistics.c:202 -+#, c-format -+msgid "%u timeouts after reno fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:203 -+#, c-format -+msgid "%u timeouts after SACK recovery" -+msgstr "" -+ -+#: ../statistics.c:204 -+#, c-format -+msgid "%u timeouts in loss state" -+msgstr "" -+ -+#: ../statistics.c:205 -+#, fuzzy, c-format -+msgid "%u fast retransmits" -+msgstr "%d Segmente erneut geschickt" -+ -+#: ../statistics.c:206 -+#, c-format -+msgid "%u forward retransmits" -+msgstr "" -+ -+#: ../statistics.c:207 -+#, c-format -+msgid "%u retransmits in slow start" -+msgstr "" -+ -+#: ../statistics.c:208 -+#, c-format -+msgid "%u other TCP timeouts" -+msgstr "" -+ -+#: ../statistics.c:209 -+#, fuzzy, c-format -+msgid "%u reno fast retransmits failed" -+msgstr "%d Segmente erneut geschickt" -+ -+#: ../statistics.c:210 -+#, fuzzy, c-format -+msgid "%u sack retransmits failed" -+msgstr "%d fehlgeschlagene Paketdefragmentierungen" -+ -+#: ../statistics.c:211 -+#, c-format -+msgid "%u times receiver scheduled too late for direct processing" -+msgstr "" -+ -+#: ../statistics.c:212 -+#, fuzzy, c-format -+msgid "%u packets collapsed in receive queue due to low socket buffer" -+msgstr "%d Pakete wegen Socketpufferüberlauf aus der Empfangswarteschlange weggeworfen" -+ -+#: ../statistics.c:213 -+#, c-format -+msgid "%u DSACKs sent for old packets" -+msgstr "" -+ -+#: ../statistics.c:214 -+#, c-format -+msgid "%u DSACKs sent for out of order packets" -+msgstr "" -+ -+#: ../statistics.c:215 -+#, fuzzy, c-format -+msgid "%u DSACKs received" -+msgstr "%d Pakete empfangen" -+ -+#: ../statistics.c:216 -+#, fuzzy, c-format -+msgid "%u DSACKs for out of order packets received" -+msgstr "%d Pakete insgesamt empfangen" -+ -+#: ../statistics.c:217 -+#, fuzzy, c-format -+msgid "%u connections reset due to unexpected SYN" -+msgstr "%d Verbindungsrücksetzungen empfangen" -+ -+#: ../statistics.c:218 -+#, fuzzy, c-format -+msgid "%u connections reset due to unexpected data" -+msgstr "%d Verbindungsrücksetzungen empfangen" -+ -+#: ../statistics.c:219 -+#, fuzzy, c-format -+msgid "%u connections reset due to early user close" -+msgstr "%d Verbindungsrücksetzungen empfangen" -+ -+#: ../statistics.c:220 - #, c-format --msgid "%d ICMP packets dropped because socket was locked" --msgstr "%d ICMP Pakete verworfen weil Socket gesperrt war" -+msgid "%u connections aborted due to memory pressure" -+msgstr "" -+ -+#: ../statistics.c:221 -+#, fuzzy, c-format -+msgid "%u connections aborted due to timeout" -+msgstr "%d Verbindungsrücksetzungen empfangen" - - #: ../statistics.c:222 -+#, c-format -+msgid "%u connections aborted after user close in linger timeout" -+msgstr "" -+ -+#: ../statistics.c:223 -+#, c-format -+msgid "%u times unabled to send RST due to no memory" -+msgstr "" -+ -+#: ../statistics.c:224 -+#, c-format -+msgid "TCP ran low on memory %u times" -+msgstr "" -+ -+#: ../statistics.c:225 -+#, c-format -+msgid "%u TCP data loss events" -+msgstr "" -+ -+#: ../statistics.c:292 - msgid "enabled" - msgstr "aktiviert" - --#: ../statistics.c:222 -+#: ../statistics.c:292 - msgid "disabled" - msgstr "deaktiviert" - --#: ../statistics.c:272 --#, c-format --msgid "unknown title %s\n" --msgstr "Unbekannter Titel %s\n" -- --#: ../statistics.c:298 -+#: ../statistics.c:375 - msgid "error parsing /proc/net/snmp" - msgstr "Fehler beim Parsen von /proc/net/snmp" - --#: ../statistics.c:311 -+#: ../statistics.c:388 - msgid "cannot open /proc/net/snmp" - msgstr "Kann /proc/net/snmp nicht öffnen" - - #: ../lib/activate.c:69 - #, c-format - msgid "Hardware type `%s' not supported.\n" --msgstr "Hardwaretyp ,,%s'' nicht unterstützt.\n" -+msgstr "Hardwaretyp »%s« nicht unterstützt.\n" - - #: ../lib/activate.c:73 - #, c-format - msgid "Cannot change line discipline to `%s'.\n" --msgstr "Kann line discipline nicht auf ``%s'' setzen.\n" -+msgstr "Kann line discipline nicht auf »%s« setzen.\n" - --#: ../lib/af.c:145 ../lib/hw.c:148 -+#: ../lib/af.c:153 ../lib/hw.c:161 - msgid "UNSPEC" - msgstr "UNSPEC" - --#: ../lib/af.c:147 -+#: ../lib/af.c:155 - msgid "UNIX Domain" --msgstr "UNIX Domain" -+msgstr "UNIX-Domain" - --#: ../lib/af.c:150 -+#: ../lib/af.c:158 - msgid "DARPA Internet" --msgstr "DARPA Internet" -+msgstr "DARPA-Internet" - --#: ../lib/af.c:153 -+#: ../lib/af.c:161 - msgid "IPv6" - msgstr "IPv6" - --#: ../lib/af.c:156 ../lib/hw.c:169 -+#: ../lib/af.c:164 ../lib/hw.c:182 - msgid "AMPR AX.25" - msgstr "AMPR AX.25" - --#: ../lib/af.c:159 ../lib/hw.c:175 -+#: ../lib/af.c:167 ../lib/hw.c:188 - msgid "AMPR NET/ROM" - msgstr "AMPR NET/ROM" - --#: ../lib/af.c:162 -+#: ../lib/af.c:170 - msgid "Novell IPX" - msgstr "" - --#: ../lib/af.c:165 -+#: ../lib/af.c:173 - msgid "Appletalk DDP" - msgstr "Appletalk DDP" - --#: ../lib/af.c:168 ../lib/hw.c:207 -+#: ../lib/af.c:176 ../lib/hw.c:223 - msgid "Econet" - msgstr "Econet" - --#: ../lib/af.c:171 ../lib/hw.c:172 -+#: ../lib/af.c:179 -+msgid "CCITT X.25" -+msgstr "" -+ -+#: ../lib/af.c:182 ../lib/hw.c:185 - msgid "AMPR ROSE" - msgstr "AMPR ROSE" - --#: ../lib/af.c:174 ../lib/hw.c:160 -+#: ../lib/af.c:185 ../lib/hw.c:173 - msgid "Ash" - msgstr "Ash" - --#: ../lib/af.c:232 -+#: ../lib/af.c:243 -+#, c-format - msgid "Please don't supply more than one address family.\n" - msgstr "Bitte nur eine Adressfamilie angeben.\n" - --#: ../lib/af.c:293 -+#: ../lib/af.c:304 -+#, c-format - msgid "Too much address family arguments.\n" - msgstr "Zu viele Adressfamilien angegeben.\n" - --#: ../lib/af.c:304 -+#: ../lib/af.c:315 - #, c-format - msgid "Unknown address family `%s'.\n" --msgstr "Unbekannte Adressfamilie `%s'.\n" -- --#: ../lib/arcnet.c:53 ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 --#: ../lib/fddi.c:67 ../lib/hippi.c:68 ../lib/inet.c:244 ../lib/inet.c:259 --#: ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 ../lib/rose.c:71 --#: ../lib/rose.c:126 ../lib/unix.c:56 ../lib/unix.c:76 --msgid "[NONE SET]" --msgstr "[NICHT GESETZT]" -+msgstr "Unbekannte Adressfamilie »%s«.\n" - --#: ../lib/arcnet.c:81 ../lib/arcnet.c:96 -+#: ../lib/arcnet.c:70 ../lib/arcnet.c:85 - #, c-format - msgid "in_arcnet(%s): invalid arcnet address!\n" - msgstr "in_arcnet(%s): Ungültige ARCnet-Adresse!\n" - --#: ../lib/arcnet.c:108 -+#: ../lib/arcnet.c:97 - #, c-format - msgid "in_arcnet(%s): trailing : ignored!\n" - msgstr "in_arcnet(%s): angehängt : ignoriert!\n" - --#: ../lib/arcnet.c:120 -+#: ../lib/arcnet.c:109 - #, c-format - msgid "in_arcnet(%s): trailing junk!\n" - msgstr "in_arcnet(%s): Nachfolgender Müll!\n" - - #: ../lib/ash.c:81 -+#, c-format - msgid "Malformed Ash address" --msgstr "Fehlerhafte Ash Adresse" -+msgstr "Fehlerhafte Ash-Adresse" -+ -+#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244 -+#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 -+#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76 -+msgid "[NONE SET]" -+msgstr "[NICHT GESETZT]" - - #: ../lib/ax25.c:97 ../lib/netrom.c:100 - msgid "Invalid callsign" -@@ -1898,22 +2168,21 @@ - msgstr "Rufzeichen zu lang" - - #: ../lib/ax25_gr.c:47 -+#, c-format - msgid "AX.25 not configured in this system.\n" - msgstr "AX.25 ist auf diesem System nicht konfiguriert.\n" - - #: ../lib/ax25_gr.c:50 -+#, c-format - msgid "Kernel AX.25 routing table\n" - msgstr "Kernel AX.25 Routentabelle\n" - - #. xxx - #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55 -+#, c-format - msgid "Destination Iface Use\n" - msgstr "Ziel SStelle Benutzer\n" - --#: ../lib/ddp_gr.c:21 --msgid "Routing table for `ddp' not yet supported.\n" --msgstr "DDP-Routentabelle wird noch nicht unterstützt.\n" -- - #: ../lib/ether.c:74 ../lib/ether.c:91 - #, c-format - msgid "in_ether(%s): invalid ether address!\n" -@@ -1929,153 +2198,168 @@ - msgid "in_ether(%s): trailing junk!\n" - msgstr "in_ether(%s): Nachfolgender Müll!\n" - --#: ../lib/fddi.c:95 ../lib/fddi.c:110 -+#: ../lib/fddi.c:84 ../lib/fddi.c:99 - #, c-format - msgid "in_fddi(%s): invalid fddi address!\n" - msgstr "in_fddi(%s): Ungültige FDDI-Adresse!\n" - --#: ../lib/fddi.c:122 -+#: ../lib/fddi.c:111 - #, c-format - msgid "in_fddi(%s): trailing : ignored!\n" - msgstr "in_fddi(%s): nachfolgend : ignoriert!\n" - --#: ../lib/fddi.c:134 -+#: ../lib/fddi.c:123 - #, c-format - msgid "in_fddi(%s): trailing junk!\n" - msgstr "in_fddi(%s): Nachfolgender Müll!\n" - --#: ../lib/getroute.c:97 ../lib/setroute.c:76 -+#: ../lib/getroute.c:101 ../lib/setroute.c:80 - #, c-format - msgid "Address family `%s' not supported.\n" - msgstr "Adressfamilie `%s' wird nicht unterstützt.\n" - --#: ../lib/getroute.c:103 ../lib/setroute.c:80 -+#: ../lib/getroute.c:107 ../lib/setroute.c:84 - #, c-format - msgid "No routing for address family `%s'.\n" - msgstr "Kein Routen für Adressfamilie `%s'.\n" - --#: ../lib/hippi.c:96 ../lib/hippi.c:111 -+#: ../lib/hippi.c:84 ../lib/hippi.c:99 - #, c-format - msgid "in_hippi(%s): invalid hippi address!\n" - msgstr "in_hippi(%s): Ungültige HIPPI-Adresse!\n" - --#: ../lib/hippi.c:123 -+#: ../lib/hippi.c:111 - #, c-format - msgid "in_hippi(%s): trailing : ignored!\n" - msgstr "in_hippi(%s): nachfolgend : ignoriert!\n" - --#: ../lib/hippi.c:134 -+#: ../lib/hippi.c:122 - #, c-format - msgid "in_hippi(%s): trailing junk!\n" - msgstr "in_hippi(%s): Nachfolgender Müll!\n" - --#: ../lib/hw.c:147 -+#: ../lib/hw.c:160 - msgid "Local Loopback" - msgstr "Lokale Schleife" - --#: ../lib/hw.c:150 -+#: ../lib/hw.c:163 - msgid "Serial Line IP" - msgstr "Serielle IP" - --#: ../lib/hw.c:151 -+#: ../lib/hw.c:164 - msgid "VJ Serial Line IP" - msgstr "Serielle VJ-IP" - --#: ../lib/hw.c:152 -+#: ../lib/hw.c:165 - msgid "6-bit Serial Line IP" - msgstr "6-bit Serielle IP" - --#: ../lib/hw.c:153 -+#: ../lib/hw.c:166 - msgid "VJ 6-bit Serial Line IP" - msgstr "VJ 6-bit Serielle IP" - --#: ../lib/hw.c:154 -+#: ../lib/hw.c:167 - msgid "Adaptive Serial Line IP" - msgstr "Adaptive Serielle IP" - --#: ../lib/hw.c:157 -+#: ../lib/hw.c:170 - msgid "Ethernet" - msgstr "Ethernet" - --#: ../lib/hw.c:163 -+#: ../lib/hw.c:176 - msgid "Fiber Distributed Data Interface" - msgstr "Fiber Distributed Data Interface" - --#: ../lib/hw.c:166 -+#: ../lib/hw.c:179 - msgid "HIPPI" - msgstr "HIPPI" - --#: ../lib/hw.c:178 -+#: ../lib/hw.c:191 -+msgid "generic X.25" -+msgstr "" -+ -+#: ../lib/hw.c:194 - msgid "IPIP Tunnel" - msgstr "IPIP Tunnel" - --#: ../lib/hw.c:181 -+#: ../lib/hw.c:197 - msgid "Point-to-Point Protocol" --msgstr "Punkt-zu-Punkt Verbindung" -+msgstr "Punkt-zu-Punkt-Verbindung" - --#: ../lib/hw.c:184 -+#: ../lib/hw.c:200 - msgid "(Cisco)-HDLC" - msgstr "(Cisco)-HDLC" - --#: ../lib/hw.c:185 -+#: ../lib/hw.c:201 - msgid "LAPB" - msgstr "LAPB" - --#: ../lib/hw.c:188 -+#: ../lib/hw.c:204 - msgid "ARCnet" - msgstr "ARCnet" - --#: ../lib/hw.c:191 -+#: ../lib/hw.c:207 - msgid "Frame Relay DLCI" - msgstr "Frame Relay DLCI" - --#: ../lib/hw.c:192 -+#: ../lib/hw.c:208 - msgid "Frame Relay Access Device" - msgstr "Frame Relay Access Device" - --#: ../lib/hw.c:195 -+#: ../lib/hw.c:211 - msgid "IPv6-in-IPv4" - msgstr "IPv6-nach-IPv4" - --#: ../lib/hw.c:198 --#, fuzzy -+#: ../lib/hw.c:214 - msgid "IrLAP" --msgstr "LAPB" -+msgstr "IrLAP" - --#: ../lib/hw.c:201 -+#: ../lib/hw.c:217 - msgid "16/4 Mbps Token Ring" - msgstr "" - --#: ../lib/hw.c:203 -+#: ../lib/hw.c:219 - msgid "16/4 Mbps Token Ring (New)" - msgstr "" - -+#: ../lib/hw.c:226 -+msgid "Generic EUI-64" -+msgstr "" -+ - #: ../lib/inet.c:153 ../lib/inet6.c:79 - #, c-format - msgid "rresolve: unsupport address family %d !\n" - msgstr "rresolve: nicht unterstützte Adressfamilie %d !\n" - --#: ../lib/inet6_gr.c:79 -+#: ../lib/inet6.c:131 -+#, fuzzy -+msgid "[UNKNOWN]" -+msgstr "UNBEKANNT" -+ -+#: ../lib/inet6_gr.c:71 -+#, c-format - msgid "INET6 (IPv6) not configured in this system.\n" - msgstr "INET6 (IPv6) ist auf diesem System nicht konfiguriert.\n" - --#: ../lib/inet6_gr.c:82 -+#: ../lib/inet6_gr.c:74 -+#, c-format - msgid "Kernel IPv6 routing table\n" --msgstr "Kernel IPv6 Routentabelle\n" -+msgstr "Kernel-IPv6-Routentabelle\n" - --#: ../lib/inet6_gr.c:84 -+#: ../lib/inet6_gr.c:76 -+#, c-format - msgid "" --"Destination Next Hop " --" Flags Metric Ref Use Iface\n" --msgstr "" --"Ziel Nächster Hop " --" Flags Metric Ref Benutzer Iface\n" -+"Destination Next " -+"Hop Flags Metric Ref Use Iface\n" -+msgstr "Ziel Nächster Hop Flags Metric Ref Benutzer Iface\n" - --#: ../lib/inet6_gr.c:158 -+#: ../lib/inet6_gr.c:150 -+#, c-format - msgid "Kernel IPv6 Neighbour Cache\n" - msgstr "Kernel IPv6 Nachbarcache\n" - --#: ../lib/inet6_gr.c:161 -+#: ../lib/inet6_gr.c:153 -+#, c-format - msgid "" - "Neighbour HW Address Iface Flags " - "Ref State\n" -@@ -2083,39 +2367,45 @@ - "Nachbar HW-Adresse Iface Flags " - "Ref Zustand\n" - --#: ../lib/inet6_gr.c:165 -+#: ../lib/inet6_gr.c:157 -+#, c-format - msgid "" - "Neighbour HW Address Iface Flags " - "Ref State Stale(sec) Delete(sec)\n" --msgstr "" --"Nachbar HW-Adresse Iface Flags " --"Ref Zustand Stale(sec) Löschen(sec)\n" -+msgstr "Nachbar HW-Adresse Iface Flags Ref Zustand Stale(sec) Löschen(sec)\n" - - #: ../lib/inet6_sr.c:46 -+#, c-format - msgid "Usage: inet6_route [-vF] del Target\n" - msgstr "Benutzung: inet6_route [-vF] del Ziel\n" - - #: ../lib/inet6_sr.c:47 -+#, c-format - msgid " inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n" - msgstr " inet6_route [-vF] add Ziel [gw Gateway] [metric M] [[dev] If]\n" - - #: ../lib/inet6_sr.c:48 -+#, c-format - msgid " inet6_route [-FC] flush NOT supported\n" - msgstr " inet6_route [-FC] flush NICHT unterstützt\n" - --#: ../lib/inet6_sr.c:182 -+#: ../lib/inet6_sr.c:188 -+#, c-format - msgid "Flushing `inet6' routing table not supported\n" --msgstr ",,Flush'' für IPv6 Routentabelle nicht unterstützt\n" -+msgstr "»Flush« für IPv6-Routentabelle nicht unterstützt\n" - - #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220 -+#, c-format - msgid "INET (IPv4) not configured in this system.\n" - msgstr "INET (IPv4) ist auf diesem System nicht konfiguriert.\n" - - #: ../lib/inet_gr.c:53 -+#, c-format - msgid "Kernel IP routing table\n" --msgstr "Kernel IP Routentabelle\n" -+msgstr "Kernel-IP-Routentabelle\n" - - #: ../lib/inet_gr.c:56 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags Metric Ref Use " - "Iface\n" -@@ -2124,6 +2414,7 @@ - "Iface\n" - - #: ../lib/inet_gr.c:59 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags MSS Window irtt " - "Iface\n" -@@ -2132,6 +2423,7 @@ - "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 @@ - "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 @@ - "Iface\n" - - #: ../lib/inet_gr.c:261 -+#, c-format - msgid "" - "Source Destination Gateway Flags MSS Window irtt " - "Iface\n" -@@ -2160,6 +2455,7 @@ - "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 @@ - "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 @@ - "Quelle Ziel Gateway Flags Metrik Ref Ben " - "Iface MSS Window irtt TOS HHRef HHUptod SpecDst\n" - --#: ../lib/inet_sr.c:50 -+#: ../lib/inet_sr.c:51 -+#, c-format - msgid "" - "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] " - "[[dev] If]\n" --msgstr "" --"Benutzung: inet_route [-vF] del {-host|-net} Ziel[/prefix] [gw Gw] [metric " --"M] [[dev] If]\n" -+msgstr "Benutzung: inet_route [-vF] del {-host|-net} Ziel[/Präfix] [gw Gw] [metric M] [[dev] If]\n" - --#: ../lib/inet_sr.c:51 -+#: ../lib/inet_sr.c:52 -+#, c-format - msgid "" - " inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n" --msgstr "" --" inet_route [-vF] add {-host|-net} Ziel[/Prefix] [gw Gw] [metric M]\n" -+msgstr " inet_route [-vF] add {-host|-net} Ziel[/Präfix] [gw Gw] [metric M]\n" - --#: ../lib/inet_sr.c:52 -+#: ../lib/inet_sr.c:53 -+#, c-format - msgid "" - " [netmask N] [mss Mss] [window W] [irtt I]\n" - msgstr "" - " [netmask N] [mss Mss] [window W] [irtt I]\n" - --#: ../lib/inet_sr.c:53 -+#: ../lib/inet_sr.c:54 -+#, c-format - msgid " [mod] [dyn] [reinstate] [[dev] If]\n" - msgstr " [mod] [dyn] [reinstate] [[dev] If]\n" - --#: ../lib/inet_sr.c:54 -+#: ../lib/inet_sr.c:55 -+#, c-format - msgid "" - " inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n" --msgstr "" --" inet_route [-vF] add {-host|-net} Ziel[/Präfix] [metric M] reject\n" -+msgstr " inet_route [-vF] add {-host|-net} Ziel[/Präfix] [metric M] reject\n" - --#: ../lib/inet_sr.c:55 -+#: ../lib/inet_sr.c:56 -+#, c-format - msgid " inet_route [-FC] flush NOT supported\n" - msgstr " inet_route [-FC] flush NICHT unterstützt\n" - -@@ -2215,15 +2514,17 @@ - msgstr "route: %s: Netzadresse als Gateway ungültig!\n" - - #: ../lib/inet_sr.c:174 --#, fuzzy -+#, fuzzy, c-format - msgid "route: Invalid MSS/MTU.\n" - msgstr "route: Ungültige MSS.\n" - - #: ../lib/inet_sr.c:187 -+#, c-format - msgid "route: Invalid window.\n" - msgstr "route: Ungültige Fenstergröße.\n" - - #: ../lib/inet_sr.c:203 -+#, c-format - msgid "route: Invalid initial rtt.\n" - msgstr "route: Ungültige Start-RTT.\n" - -@@ -2238,126 +2539,408 @@ - msgstr "Route: Fehlerhafte Netzmaske %s\n" - - #: ../lib/inet_sr.c:270 -+#, c-format - msgid "route: netmask doesn't match route address\n" - msgstr "route: Netzmaske passt nicht zur Routenadresse\n" - - #: ../lib/inet_sr.c:306 -+#, c-format - msgid "Flushing `inet' routing table not supported\n" --msgstr ",,Flush'' der Inet-Routentabelle nicht unterstützt\n" -+msgstr "»Flush« der Inet-Routentabelle nicht unterstützt\n" - - #: ../lib/inet_sr.c:310 -+#, c-format - msgid "Modifying `inet' routing cache not supported\n" --msgstr "Änderung des ,,Inet'' Routencaches nicht unterstützt\n" -+msgstr "Änderung des »Inet« Routencaches nicht unterstützt\n" - - #: ../lib/ipx_gr.c:52 -+#, c-format - msgid "IPX not configured in this system.\n" - msgstr "IPX ist auf diesem System nicht konfiguriert.\n" - - #: ../lib/ipx_gr.c:56 -+#, c-format - msgid "Kernel IPX routing table\n" --msgstr "Kernel IPX Routentabelle\n" -+msgstr "Kernel-IPX-Routentabelle\n" - - #. xxx - #: ../lib/ipx_gr.c:57 -+#, c-format - msgid "Destination Router Net Router Node\n" --msgstr "Ziel Router Netz Router Knoten\n" -+msgstr "Ziel Router-Netz Router-Knoten\n" - - #: ../lib/ipx_sr.c:33 -+#, c-format - msgid "IPX: this needs to be written\n" --msgstr "IPX: dies muß noch geschrieben werden\n" -+msgstr "IPX: dies muss noch geschrieben werden\n" - --#: ../lib/masq_info.c:197 -+#: ../lib/masq_info.c:198 -+#, c-format - msgid "IP masquerading entries\n" - msgstr "IP-Maskierungseinträge\n" - --#: ../lib/masq_info.c:200 -+#: ../lib/masq_info.c:201 -+#, c-format - msgid "prot expire source destination ports\n" - msgstr "Prot expire Quelle Ziel Ports\n" - --#: ../lib/masq_info.c:203 -+#: ../lib/masq_info.c:204 -+#, c-format - msgid "" --"prot expire initseq delta prevd source destination " --" ports\n" -+"prot expire initseq delta prevd source " -+"destination ports\n" - msgstr "" --"Prot Ablauf Anf-Seq Delta Prevd Quelle Ziel " --" Ports\n" -+"Prot Ablauf Anf-Seq Delta Prevd Quelle " -+"Ziel Ports\n" - - #: ../lib/netrom_gr.c:48 -+#, c-format - msgid "NET/ROM not configured in this system.\n" - msgstr "NET/ROM ist auf diesem System nicht verfügbar.\n" - - #: ../lib/netrom_gr.c:51 -+#, c-format - msgid "Kernel NET/ROM routing table\n" --msgstr "Kernel NET/ROM Routentabelle\n" -+msgstr "Kernel-NET/ROM-Routentabelle\n" - - #: ../lib/netrom_gr.c:52 -+#, c-format - msgid "Destination Mnemonic Quality Neighbour Iface\n" - msgstr "Ziel Mnemonic Qualität Nachbar Iface\n" - - #: ../lib/netrom_sr.c:34 -+#, c-format - msgid "netrom usage\n" --msgstr "NET/ROM Benutzung\n" -+msgstr "NET/ROM-Benutzung\n" - - #: ../lib/netrom_sr.c:44 -+#, c-format - msgid "NET/ROM: this needs to be written\n" --msgstr "NET/ROM: Dies muß noch geschrieben werden\n" -+msgstr "NET/ROM: Dies muss noch geschrieben werden\n" - - #: ../lib/ppp.c:44 -+#, c-format - msgid "You cannot start PPP with this program.\n" - msgstr "Mit diesem Programm kann PPP nicht gestartet werden.\n" - - #: ../lib/ppp_ac.c:38 -+#, c-format - msgid "Sorry, use pppd!\n" --msgstr "Bitte benutzen sie pppd.\n" -+msgstr "Bitte benutzen Sie pppd.\n" - - #: ../lib/rose.c:87 - msgid "Node address must be ten digits" --msgstr "Knotenadresse muß zehn Ziffern haben" -+msgstr "Knotenadresse muss zehn Ziffern haben" - - #: ../lib/rose_gr.c:51 -+#, c-format - msgid "ROSE not configured in this system.\n" - msgstr "ROSE ist auf diesem System nicht verfügbar.\n" - - #: ../lib/rose_gr.c:54 -+#, c-format - msgid "Kernel ROSE routing table\n" --msgstr "ROSE Kernel Routentabelle\n" -+msgstr "ROSE-Kernel-Routentabelle\n" - --#: ../lib/tr.c:70 ../lib/tr.c:85 -+#: ../lib/tr.c:86 ../lib/tr.c:101 - #, c-format - msgid "in_tr(%s): invalid token ring address!\n" - msgstr "in_tr(%s): ungültige Tokenringadresse!\n" - --#: ../lib/tr.c:97 -+#: ../lib/tr.c:113 - #, c-format - msgid "in_tr(%s): trailing : ignored!\n" - msgstr "in_tr(%s): nachfolgend : ignoriert!\n" - --#: ../lib/tr.c:109 -+#: ../lib/tr.c:125 - #, c-format - msgid "in_tr(%s): trailing junk!\n" - msgstr "in_tr(%s): nachfolgender Müll!\n" - --#: ../lib/interface.c:124 -+#: ../lib/interface.c:176 - #, c-format - msgid "warning: no inet socket available: %s\n" --msgstr "Warnung: Keine INET Sockets verfügbar: %s\n" -+msgstr "Warnung: Keine INET-Sockets verfügbar: %s\n" - --#: ../lib/interface.c:270 -+#: ../lib/interface.c:325 - #, c-format - msgid "Warning: cannot open %s (%s). Limited output.\n" - msgstr "" - - #. Give better error message for this case. --#: ../lib/interface.c:504 -+#: ../lib/interface.c:571 - msgid "Device not found" - msgstr "Gerät nicht gefunden" - --#: ../lib/interface.c:508 -+#: ../lib/interface.c:575 - #, c-format - msgid "%s: error fetching interface information: %s\n" - msgstr "%s: Fehler beim Auslesen der Schnittstelleninformation: %s\n" - --#: ../lib/sockets.c:59 -+#: ../lib/interface.c:608 -+msgid " - no statistics available -" -+msgstr " - keine Statistiken verfügbar -" -+ -+#: ../lib/interface.c:612 -+#, c-format -+msgid "[NO FLAGS]" -+msgstr "[KEINE FLAGS]" -+ -+#: ../lib/interface.c:688 -+#, c-format -+msgid "%-9.9s Link encap:%s " -+msgstr "%-9.9s Protokoll:%s " -+ -+#: ../lib/interface.c:693 -+#, c-format -+msgid "HWaddr %s " -+msgstr "Hardware Adresse %s " -+ -+#: ../lib/interface.c:696 -+#, c-format -+msgid "Media:%s" -+msgstr "Medium:%s" -+ -+#: ../lib/interface.c:698 -+#, c-format -+msgid "(auto)" -+msgstr "(auto)" -+ -+#: ../lib/interface.c:705 -+#, c-format -+msgid " %s addr:%s " -+msgstr " %s Adresse:%s " -+ -+#: ../lib/interface.c:708 -+#, c-format -+msgid " P-t-P:%s " -+msgstr " P-z-P:%s " -+ -+#: ../lib/interface.c:711 -+#, c-format -+msgid " Bcast:%s " -+msgstr " Bcast:%s " -+ -+#: ../lib/interface.c:713 -+#, c-format -+msgid " Mask:%s\n" -+msgstr " Maske:%s\n" -+ -+#: ../lib/interface.c:730 -+#, c-format -+msgid " inet6 addr: %s/%d" -+msgstr " inet6-Adresse: %s/%d" -+ -+#: ../lib/interface.c:732 -+#, c-format -+msgid " Scope:" -+msgstr " Gültigkeitsbereich:" -+ -+#: ../lib/interface.c:735 -+#, c-format -+msgid "Global" -+msgstr "Global" -+ -+#: ../lib/interface.c:738 -+#, c-format -+msgid "Link" -+msgstr "Verbindung" -+ -+#: ../lib/interface.c:741 -+#, c-format -+msgid "Site" -+msgstr "Standort" -+ -+#: ../lib/interface.c:744 -+#, c-format -+msgid "Compat" -+msgstr "Kompatibilität" -+ -+#: ../lib/interface.c:747 -+#, c-format -+msgid "Host" -+msgstr "Maschine" -+ -+#: ../lib/interface.c:750 -+#, c-format -+msgid "Unknown" -+msgstr "Unbekannt" -+ -+#: ../lib/interface.c:765 -+#, c-format -+msgid " IPX/Ethernet II addr:%s\n" -+msgstr " IPX/Ethernet II Adresse:%s\n" -+ -+#: ../lib/interface.c:768 -+#, c-format -+msgid " IPX/Ethernet SNAP addr:%s\n" -+msgstr " IPX/Ethernet SNAP Adresse:%s\n" -+ -+#: ../lib/interface.c:771 -+#, c-format -+msgid " IPX/Ethernet 802.2 addr:%s\n" -+msgstr " IPX/Ethernet 802.2 Adresse:%s\n" -+ -+#: ../lib/interface.c:774 -+#, c-format -+msgid " IPX/Ethernet 802.3 addr:%s\n" -+msgstr " IPX/Ethernet 802.3 Adresse:%s\n" -+ -+#: ../lib/interface.c:784 -+#, c-format -+msgid " EtherTalk Phase 2 addr:%s\n" -+msgstr " EtherTalk Phase 2 Adresse:%s\n" -+ -+#: ../lib/interface.c:793 -+#, c-format -+msgid " econet addr:%s\n" -+msgstr " econet Adresse:%s\n" -+ -+#: ../lib/interface.c:800 -+#, c-format -+msgid "[NO FLAGS] " -+msgstr "[KEINE FLAGS] " -+ -+#: ../lib/interface.c:802 -+#, c-format -+msgid "UP " -+msgstr "UP " -+ -+#: ../lib/interface.c:804 -+#, c-format -+msgid "BROADCAST " -+msgstr "BROADCAST " -+ -+#: ../lib/interface.c:806 -+#, c-format -+msgid "DEBUG " -+msgstr "DEBUG " -+ -+#: ../lib/interface.c:808 -+#, c-format -+msgid "LOOPBACK " -+msgstr "LOOPBACK " -+ -+#: ../lib/interface.c:810 -+#, c-format -+msgid "POINTOPOINT " -+msgstr "PUNKTZUPUNKT " -+ -+#: ../lib/interface.c:812 -+#, c-format -+msgid "NOTRAILERS " -+msgstr "NOTRAILERS " -+ -+#: ../lib/interface.c:814 -+#, c-format -+msgid "RUNNING " -+msgstr "RUNNING " -+ -+#: ../lib/interface.c:816 -+#, c-format -+msgid "NOARP " -+msgstr "NOARP " -+ -+#: ../lib/interface.c:818 -+#, c-format -+msgid "PROMISC " -+msgstr "PROMISC " -+ -+#: ../lib/interface.c:820 -+#, c-format -+msgid "ALLMULTI " -+msgstr "ALLMULTI " -+ -+#: ../lib/interface.c:822 -+#, c-format -+msgid "SLAVE " -+msgstr "SLAVE " -+ -+#: ../lib/interface.c:824 -+#, c-format -+msgid "MASTER " -+msgstr "MASTER " -+ -+#: ../lib/interface.c:826 -+#, c-format -+msgid "MULTICAST " -+msgstr "MULTICAST " -+ -+#: ../lib/interface.c:829 -+#, c-format -+msgid "DYNAMIC " -+msgstr "DYNAMIC " -+ -+#. DONT FORGET TO ADD THE FLAGS IN ife_print_short -+#: ../lib/interface.c:832 -+#, c-format -+msgid " MTU:%d Metric:%d" -+msgstr " MTU:%d Metrik:%d" -+ -+#: ../lib/interface.c:836 -+#, c-format -+msgid " Outfill:%d Keepalive:%d" -+msgstr " Outfill:%d Keepalive:%d" -+ -+#: ../lib/interface.c:850 -+#, fuzzy, c-format -+msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" -+msgstr "Empfangene Pakete:%lu Fehler:%lu Weggeworfen:%lu Überlauf:%lu Rahmen:%lu\n" -+ -+#: ../lib/interface.c:855 -+#, c-format -+msgid " compressed:%lu\n" -+msgstr " komprimiert:%lu\n" -+ -+#: ../lib/interface.c:895 -+#, fuzzy, c-format -+msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" -+msgstr "Verschickte Pakete:%lu Fehler:%lu Weggeworfen:%lu Überlauf:%lu Träger:%lu\n" -+ -+#: ../lib/interface.c:899 -+#, c-format -+msgid " collisions:%lu " -+msgstr " Kollisionen:%lu " -+ -+#: ../lib/interface.c:901 -+#, c-format -+msgid "compressed:%lu " -+msgstr "Komprimiert:%lu " -+ -+#: ../lib/interface.c:903 -+#, c-format -+msgid "txqueuelen:%d " -+msgstr "Sendewarteschlangenlänge:%d " -+ -+#: ../lib/interface.c:905 -+#, c-format -+msgid "RX bytes:%llu (%lu.%lu %s) TX bytes:%llu (%lu.%lu %s)\n" -+msgstr "" -+ -+#: ../lib/interface.c:916 -+#, c-format -+msgid "Interrupt:%d " -+msgstr "Interrupt:%d " -+ -+#. Only print devices using it for -+#. I/O maps -+#: ../lib/interface.c:919 -+#, c-format -+msgid "Base address:0x%x " -+msgstr "Basisadresse:0x%x " -+ -+#: ../lib/interface.c:921 -+#, c-format -+msgid "Memory:%lx-%lx " -+msgstr "Speicher:%lx-%lx " -+ -+#: ../lib/interface.c:924 -+#, c-format -+msgid "DMA chan:%x " -+msgstr "DMA Kanal:%x " -+ -+#: ../lib/sockets.c:63 -+#, c-format - msgid "No usable address families found.\n" - msgstr "Keine benutzbaren Adressfamilien gefunden.\n" - -@@ -2369,41 +2952,44 @@ - #: ../lib/util-ank.c:238 - #, c-format - msgid "ip: %s is invalid inet prefix\n" --msgstr "ip: %s ist ein ungültiges INET-Prefix\n" -+msgstr "ip: %s ist ein ungültiges INET-Präfix\n" - - #: ../lib/util-ank.c:248 - #, c-format - msgid "ip: %s is invalid IPv4 address\n" --msgstr "ip: %s ist eine ungültige IPv4 Adresse\n" -+msgstr "ip: %s ist eine ungültige IPv4-Adresse\n" - - #: ../lib/util-ank.c:256 - #, c-format - msgid "ip: argument is wrong: %s\n" - msgstr "ip: Fehlerhaftes Argument: %s\n" - --#: ../ipmaddr.c:56 -+#: ../ipmaddr.c:61 -+#, c-format - msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n" - msgstr "Benutzung: ipmaddr [ add | del ] MULTIADR dev NAME\n" - --#: ../ipmaddr.c:57 -+#: ../ipmaddr.c:62 -+#, c-format - msgid " ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n" - msgstr " ipmaddr show [ dev NAME ] [ ipv4 | ipv6 | link | all ]\n" - --#: ../ipmaddr.c:58 -+#: ../ipmaddr.c:63 -+#, c-format - msgid " ipmaddr -V | -version\n" - msgstr "" - --#: ../ipmaddr.c:258 -+#: ../ipmaddr.c:263 - #, c-format - msgid "family %d " - msgstr "familie %d " - --#: ../ipmaddr.c:267 -+#: ../ipmaddr.c:272 - #, c-format - msgid " users %d" - msgstr " Benutzer %d" - --#: ../ipmaddr.c:353 -+#: ../ipmaddr.c:358 - msgid "Cannot create socket" - msgstr "Kann Socket nicht öffnen" - -@@ -2418,13 +3004,14 @@ - 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 @@ - msgid "slattach: tty_hangup(RAISE): %s\n" - msgstr "slattach: tty_hangup(RAISE): %s\n" - --#: ../slattach.c:486 -+#: ../slattach.c:468 -+#, fuzzy, c-format -+msgid "slattach: tty name too long\n" -+msgstr "%s: name zu lang\n" -+ -+#: ../slattach.c:498 -+#, c-format - msgid "slattach: tty_open: cannot get current state!\n" - msgstr "slattach: tty_open: kann aktuellen Zustand nicht auslesen!\n" - --#: ../slattach.c:493 -+#: ../slattach.c:505 -+#, c-format - msgid "slattach: tty_open: cannot get current line disc!\n" - msgstr "" - "slattach: tty_open: Kann augenblicklichen Leitungszustand nicht auslesen!\n" - --#: ../slattach.c:501 -+#: ../slattach.c:513 -+#, c-format - msgid "slattach: tty_open: cannot set RAW mode!\n" - msgstr "slattach: tty_open: Kann RAW-Modus nicht setzen!\n" - --#: ../slattach.c:508 -+#: ../slattach.c:520 - #, c-format - msgid "slattach: tty_open: cannot set %s bps!\n" - msgstr "slattach: tty_open: Kann %s bps nicht setzen!\n" - --#: ../slattach.c:518 -+#: ../slattach.c:530 -+#, c-format - msgid "slattach: tty_open: cannot set 8N1 mode!\n" - msgstr "slattach: tty_open: Kann 8N1-Modus nicht setzen!\n" - --#: ../slattach.c:686 -+#: ../slattach.c:672 -+#, c-format -+msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n" -+msgstr "" -+ -+#: ../slattach.c:704 - #, c-format - msgid "%s started" - msgstr "%s gestartet" - --#: ../slattach.c:687 -+#: ../slattach.c:705 - #, c-format - msgid " on %s" - msgstr " auf %s" - --#: ../slattach.c:688 -+#: ../slattach.c:706 - #, c-format - msgid " interface %s\n" - msgstr " Schnittstelle: %s\n" -+ -+msgid "" -+" arp [-v] [<HW>] [-i <if>] -s <hostname> <hwaddr> [netmask <nm>] pub " -+"<-''-\n" -+msgstr "" -+" arp [-v] [<HW>] [-i <if>] -s <Hostname> <hwaddr> [netmask <nm>] pub\n" -+ -+msgid "%s: unknown interface: %s\n" -+msgstr "%s: unbekannte Schnittstelle: %s\n" -+ -+msgid "address mask replies" -+msgstr "Adressmaskenantworten" -+ -+msgid "unknown title %s\n" -+msgstr "Unbekannter Titel %s\n" -+ -+msgid "Routing table for `ddp' not yet supported.\n" -+msgstr "DDP-Routentabelle wird noch nicht unterstützt.\n" ---- net-tools-1.60.orig/po/fr.po -+++ net-tools-1.60/po/fr.po -@@ -4,7 +4,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: 1998-03-01 00:02+0100\n" - "Last-Translator: J.M.Vansteene <vanstee@worldnet.fr>\n" - "Language-Team:\n" -@@ -12,273 +13,277 @@ - "Content-Type: text/plain; charset=iso8859-1\n" - "Content-Transfer-Encoding: 8bit\n" - --#: ../arp.c:110 ../arp.c:269 -+#: ../arp.c:112 ../arp.c:279 -+#, c-format - msgid "arp: need host name\n" - msgstr "arp: nécessite un nom d'hôte\n" - --#: ../arp.c:207 ../arp.c:221 -+#: ../arp.c:215 ../arp.c:230 - #, c-format - msgid "No ARP entry for %s\n" - msgstr "Pas d'entrée ARP pour %s\n" - --#: ../arp.c:239 -+#: ../arp.c:248 - #, fuzzy, c-format - msgid "arp: cant get HW-Address for `%s': %s.\n" - msgstr "rarp: ne peut définir l'entrée depuis %s:%u\n" - --#: ../arp.c:243 -+#: ../arp.c:252 -+#, c-format - msgid "arp: protocol type mismatch.\n" - msgstr "" - --#: ../arp.c:252 -+#: ../arp.c:261 - #, c-format - msgid "arp: device `%s' has HW address %s `%s'.\n" - msgstr "" - --#: ../arp.c:282 -+#: ../arp.c:293 -+#, c-format - msgid "arp: need hardware address\n" - msgstr "arp: nécessite une adresse matériel\n" - --#: ../arp.c:290 -+#: ../arp.c:301 -+#, c-format - msgid "arp: invalid hardware address\n" - msgstr "arp: adresse matériel invalide\n" - --#: ../arp.c:387 -+#: ../arp.c:398 - #, c-format - msgid "arp: cannot open etherfile %s !\n" - msgstr "arp: ne peut ouvrir le fichier ether %s !\n" - --#: ../arp.c:403 -+#: ../arp.c:414 - #, c-format - msgid "arp: format error on line %u of etherfile %s !\n" - msgstr "arp: erreur de format ligne %u du fichier ether %s !\n" - --#: ../arp.c:416 -+#: ../arp.c:427 - #, c-format - msgid "arp: cannot set entry on line %u of etherfile %s !\n" - msgstr "arp: ne peut définir l'entrée en ligne %u du fichier ether %s !\n" - --#: ../arp.c:437 --msgid "Address\t\t\tHWtype\tHWaddress\t Flags Mask\t\t Iface\n" -+#: ../arp.c:448 -+#, fuzzy, c-format -+msgid "" -+"Address HWtype HWaddress Flags Mask " -+"Iface\n" - msgstr "Adresse\t\t\tTypeMap\tAdresseMat\t Indicateurs\t\t Iface\n" - --#: ../arp.c:467 -+#: ../arp.c:476 -+#, fuzzy -+msgid "<from_interface>" -+msgstr "%s: interface inconnue: %s\n" -+ -+#: ../arp.c:478 - msgid "(incomplete)" - msgstr "" - --#: ../arp.c:484 -+#: ../arp.c:495 - #, c-format - msgid "%s (%s) at " - msgstr "" - --#: ../arp.c:490 -+#: ../arp.c:501 -+#, c-format - msgid "<incomplete> " - msgstr "" - --#: ../arp.c:496 -+#: ../arp.c:507 - #, c-format - msgid "netmask %s " - msgstr "" - --#: ../arp.c:513 -+#: ../arp.c:524 - #, c-format - msgid "on %s\n" - msgstr "" - --#: ../arp.c:592 -+#: ../arp.c:605 - #, c-format - msgid "Entries: %d\tSkipped: %d\tFound: %d\n" - msgstr "Entrées: %d\tIgnorées: %d\tTrouvées: %d\n" - --#: ../arp.c:596 -+#: ../arp.c:609 - #, c-format - msgid "%s (%s) -- no entry\n" - msgstr "" - --#: ../arp.c:598 -+#: ../arp.c:611 - #, c-format - msgid "arp: in %d entries no match found.\n" - msgstr "arp: aucune correspondance trouvée dans %d entrées\n" - --#: ../arp.c:613 -+#: ../arp.c:626 -+#, c-format - msgid "" - "Usage:\n" - " arp [-vn] [<HW>] [-i <if>] [-a] [<hostname>] <-Display ARP " - "cache\n" - msgstr "" - "Syntaxe:\n" --" arp [-vn] [<MAT>] [-i <if>] [-a] [<hôte>] <-Affiche cache " --"ARP\n" -+" arp [-vn] [<MAT>] [-i <if>] [-a] [<hôte>] <-Affiche cache ARP\n" - --#: ../arp.c:614 -+#: ../arp.c:627 -+#, fuzzy, c-format - msgid "" --" arp [-v] [-i <if>] -d <hostname> [pub][nopub] <-Delete ARP " -+" arp [-v] [-i <if>] -d <host> [pub] <-Delete ARP " - "entry\n" --msgstr "" --" arp [-v] [-i <if>] -d <hôte> [pub][nopub] <-Supprime entrée " --"ARP\n" -+msgstr " arp [-v] [-i <if>] -d <hôte> [pub][nopub] <-Supprime entrée ARP\n" - --#: ../arp.c:615 --#, fuzzy -+#: ../arp.c:628 -+#, fuzzy, c-format - msgid "" --" arp [-vnD] [<HW>] [-i <if>] -f [<filename>] <-Add entry from " -+" arp [-vnD] [<HW>] [-i <if>] -f [<filename>] <-Add entry from " - "file\n" --msgstr "" --" arp [-vnD] [<MAT>] [-i <if>] -f <fichier> <-Ajout entrée " --"depuis fichier\n" -+msgstr " arp [-vnD] [<MAT>] [-i <if>] -f <fichier> <-Ajout entrée depuis fichier\n" - --#: ../arp.c:616 -+#: ../arp.c:629 -+#, fuzzy, c-format - msgid "" --" arp [-v] [<HW>] [-i <if>] -s <hostname> <hwaddr> [temp][nopub] <-Add " -+" arp [-v] [<HW>] [-i <if>] -s <host> <hwaddr> [temp] <-Add " - "entry\n" --msgstr "" --" arp [-v] [<MAT>] [-i <if>] -s <hôte> <adrmat> [temp][nopub] <-Ajout " --"entrée\n" -+msgstr " arp [-v] [<MAT>] [-i <if>] -s <hôte> <adrmat> [temp][nopub] <-Ajout entrée\n" - --#: ../arp.c:617 --msgid "" --" arp [-v] [<HW>] [-i <if>] -s <hostname> <hwaddr> [netmask <nm>] pub " --"<-''-\n" --msgstr "" --" arp [-v] [<MAT>] [-i <if>] -s <hôte> <adrmat> [netmask <nm>] pub " --"<-''-\n" -- --#: ../arp.c:618 -+#: ../arp.c:630 -+#, fuzzy, c-format - msgid "" --" arp [-v] [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub " -+" arp [-v] [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub " - "<-''-\n" - "\n" - msgstr "" --" arp [-v] [<MAT>] [-i <if>] -Ds <hôte> <if> [netmask <nm>] pub " --"<-''-\n" -+" arp [-v] [<MAT>] [-i <if>] -Ds <hôte> <if> [netmask <nm>] pub <-''-\n" - "\n" - --#: ../arp.c:620 -+#: ../arp.c:632 -+#, c-format - msgid "" - " -a display (all) hosts in alternative (BSD) " - "style\n" --msgstr "" --" -a affiche (tous) les hôtes en style BSD\n" -+msgstr " -a affiche (tous) les hôtes en style BSD\n" - --#: ../arp.c:621 -+#: ../arp.c:633 -+#, c-format - msgid " -s, --set set a new ARP entry\n" - msgstr " -s, --set définit une nouvelle entrée ARP\n" - --#: ../arp.c:622 -+#: ../arp.c:634 -+#, c-format - msgid " -d, --delete delete a specified entry\n" - msgstr " -d, --delete supprime une entrée\n" - --#: ../arp.c:623 ../netstat.c:1436 ../route.c:85 -+#: ../arp.c:635 ../netstat.c:1503 ../route.c:86 -+#, c-format - msgid " -v, --verbose be verbose\n" - msgstr " -v, --verbose mode verbeux\n" - --#: ../arp.c:624 ../netstat.c:1437 ../route.c:86 --msgid " -n, --numeric dont resolve names\n" -+#: ../arp.c:636 ../netstat.c:1504 ../route.c:87 -+#, fuzzy, c-format -+msgid " -n, --numeric don't resolve names\n" - msgstr " -n, --numeric ne résout pas les noms\n" - --#: ../arp.c:625 -+#: ../arp.c:637 -+#, c-format - msgid "" - " -i, --device specify network interface (e.g. eth0)\n" --msgstr "" --" -i, --device spécifie l'interface réseau (p.ex. eth0)\n" -+msgstr " -i, --device spécifie l'interface réseau (p.ex. eth0)\n" - --#: ../arp.c:626 -+#: ../arp.c:638 -+#, c-format - msgid " -D, --use-device read <hwaddr> from given device\n" --msgstr "" --" -D, --use-device lit l'<adrmat> depuis le périphérique\n" -+msgstr " -D, --use-device lit l'<adrmat> depuis le périphérique\n" - --#: ../arp.c:627 --#, fuzzy -+#: ../arp.c:639 -+#, fuzzy, c-format - msgid " -A, -p, --protocol specify protocol family\n" - msgstr " -r, --route affiche la table de routage\n" - --#: ../arp.c:628 --#, fuzzy -+#: ../arp.c:640 -+#, fuzzy, c-format - msgid "" --" -f, --file read new entries from file or from " --"/etc/ethers\n" -+" -f, --file read new entries from file or from /etc/" -+"ethers\n" - "\n" - msgstr "" - " -f, --file lit les nouvelles entrées dans le fichier\n" - "\n" - --#: ../arp.c:630 ../rarp.c:181 -+#: ../arp.c:642 ../rarp.c:182 - #, c-format - msgid " <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n" --msgstr "" --" <HW>=Utilisez '-H <hw>' pour spécifier le type d'adresse matériel. Défaut: " --"%s\n" -+msgstr " <HW>=Utilisez '-H <hw>' pour spécifier le type d'adresse matériel. Défaut: %s\n" - --#: ../arp.c:631 ../rarp.c:182 -+#: ../arp.c:643 ../rarp.c:183 -+#, c-format - msgid " List of possible hardware types (which support ARP):\n" - msgstr " Liste les types de matériels supportant ARP:\n" - --#: ../arp.c:664 -+#: ../arp.c:677 ../arp.c:762 - #, c-format - msgid "%s: hardware type not supported!\n" - msgstr "%s: type de matétiel non supporté !\n" - --#: ../arp.c:668 -+#: ../arp.c:681 - #, c-format - msgid "%s: address family not supported!\n" - msgstr "%s: famille d'adresses non supportée !\n" - --#: ../arp.c:703 --#, fuzzy -+#: ../arp.c:716 -+#, fuzzy, c-format - msgid "arp: -N not yet supported.\n" - msgstr "Table de routage pour `ddp' pas encore supporté.\n" - --#: ../arp.c:713 -+#: ../arp.c:726 - #, c-format - msgid "arp: %s: unknown address family.\n" - msgstr "arp: %s: famille d'adresses inconnue.\n" - --#: ../arp.c:722 -+#: ../arp.c:735 - #, c-format - msgid "arp: %s: unknown hardware type.\n" - msgstr "arp: %s: type de matériel inconnu.\n" - --#: ../arp.c:741 -+#: ../arp.c:754 - #, c-format - msgid "arp: %s: kernel only supports 'inet'.\n" - msgstr "arp: %s: le noyau ne supporte que 'inet'.\n" - --#: ../arp.c:746 -+#: ../arp.c:767 - #, c-format - msgid "arp: %s: hardware type without ARP support.\n" - msgstr "arp: %s: type de matériel sans support ARP.\n" - --#: ../hostname.c:69 -+#: ../hostname.c:71 - #, c-format - msgid "Setting nodename to `%s'\n" - msgstr "Définit le nom de noeud ŕ `%s'\n" - --#: ../hostname.c:74 -+#: ../hostname.c:76 - #, c-format - msgid "%s: you must be root to change the node name\n" - msgstr "%s: vous devez ętre root pour changer le nom de noeud\n" - --#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116 -+#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117 - #, c-format - msgid "%s: name too long\n" - msgstr "%s: nom trop long\n" - --#: ../hostname.c:89 -+#: ../hostname.c:91 - #, c-format - msgid "Setting hostname to `%s'\n" - msgstr "Définit le nom d'hôte ŕ `%s'\n" - --#: ../hostname.c:94 -+#: ../hostname.c:96 - #, c-format - msgid "%s: you must be root to change the host name\n" - msgstr "%s: vous devez ętre root pour changer le nom d'hôte\n" - --#: ../hostname.c:108 -+#: ../hostname.c:109 - #, c-format - msgid "Setting domainname to `%s'\n" - msgstr "Définit le nom de domaine ŕ `%s'\n" - --#: ../hostname.c:113 -+#: ../hostname.c:114 - #, c-format - msgid "%s: you must be root to change the domain name\n" - msgstr "%s: vous devez ętre root pour changer le nom de domaine\n" -@@ -303,38 +308,36 @@ - msgid "Result: h_addr_list=`%s'\n" - msgstr "Résultat : h_addr_list=`%s'\n" - --#: ../hostname.c:209 -+#: ../hostname.c:208 - #, c-format - msgid "%s: can't open `%s'\n" - msgstr "%s: ne peut ouvrir `%s'\n" - --#: ../hostname.c:223 -+#: ../hostname.c:222 -+#, c-format - msgid "Usage: hostname [-v] {hostname|-F file} set hostname (from file)\n" --msgstr "" --"Syntaxe : hostname [-v] {hôte|-F fichier} définit le nom d'hôte (depuis " --"le fichier)\n" -+msgstr "Syntaxe : hostname [-v] {hôte|-F fichier} définit le nom d'hôte (depuis le fichier)\n" - --#: ../hostname.c:224 -+#: ../hostname.c:223 -+#, c-format - msgid "" - " domainname [-v] {nisdomain|-F file} set NIS domainname (from file)\n" --msgstr "" --" domainname [-v] {domaine_nis|-F fichier} définit le domaine NIS " --"(depuis le fichier)\n" -+msgstr " domainname [-v] {domaine_nis|-F fichier} définit le domaine NIS (depuis le fichier)\n" - --#: ../hostname.c:226 --#, fuzzy -+#: ../hostname.c:225 -+#, fuzzy, c-format - msgid "" - " nodename [-v] {nodename|-F file} set DECnet node name (from " - "file)\n" --msgstr "" --" nodename [-v] {nom_noeud|-F fichier} Définit le nom de noeud " --"DECnet (depuis le fichier)\n" -+msgstr " nodename [-v] {nom_noeud|-F fichier} Définit le nom de noeud DECnet (depuis le fichier)\n" - --#: ../hostname.c:228 -+#: ../hostname.c:227 -+#, c-format - msgid " hostname [-v] [-d|-f|-s|-a|-i|-y|-n] display formatted name\n" - msgstr " hostname [-v] [-d|-f|-s|-a|-i|-y|-n] affiche le nom formatté\n" - --#: ../hostname.c:229 -+#: ../hostname.c:228 -+#, c-format - msgid "" - " hostname [-v] display hostname\n" - "\n" -@@ -342,7 +345,8 @@ - " hostname [-v] affiche le nom d'hôte\n" - "\n" - --#: ../hostname.c:230 -+#: ../hostname.c:229 -+#, c-format - msgid "" - " hostname -V|--version|-h|--help print info and exit\n" - "\n" -@@ -350,7 +354,8 @@ - " 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 @@ - " dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" - "\n" - --#: ../hostname.c:232 -+#: ../hostname.c:231 -+#, c-format - msgid " -s, --short short host name\n" - msgstr " -s, --short nom d'hôte court\n" - --#: ../hostname.c:233 -+#: ../hostname.c:232 -+#, c-format - msgid " -a, --alias alias names\n" - msgstr " -a, --alias noms d'alias\n" - --#: ../hostname.c:234 -+#: ../hostname.c:233 -+#, c-format - msgid " -i, --ip-address addresses for the hostname\n" - msgstr " -i, --ip-address adresses de l'hôte\n" - --#: ../hostname.c:235 -+#: ../hostname.c:234 -+#, c-format - msgid " -f, --fqdn, --long long host name (FQDN)\n" - msgstr " -f, --fqdn, --long nom d'hôte long (FQDN)\n" - --#: ../hostname.c:236 -+#: ../hostname.c:235 -+#, c-format - msgid " -d, --domain DNS domain name\n" - msgstr " -d, --domain nom de domaine DNS\n" - --#: ../hostname.c:237 -+#: ../hostname.c:236 -+#, c-format - msgid " -y, --yp, --nis NIS/YP domainname\n" - msgstr " -y, --yp, --nis nom de domaine NIS/YP\n" - --#: ../hostname.c:239 -+#: ../hostname.c:238 -+#, c-format - msgid " -n, --node DECnet node name\n" - msgstr " -n, --node nom de noeud DECnet\n" - --#: ../hostname.c:241 --#, fuzzy -+#: ../hostname.c:240 -+#, fuzzy, c-format - msgid "" - " -F, --file read hostname or NIS domainname from given file\n" - "\n" - msgstr "" --" -F, --file lit le nom d'hôte ou le nom de domaine NIS depuis " --"le fichier\n" -+" -F, --file lit le nom d'hôte ou le nom de domaine NIS depuis le fichier\n" - "\n" - --#: ../hostname.c:243 -+#: ../hostname.c:242 -+#, c-format - msgid "" - " This command can read or set the hostname or the NIS domainname. You can\n" - " also read the DNS domain or the FQDN (fully qualified domain name).\n" -@@ -411,15 +423,16 @@ - msgstr "%s: Vous ne pouvez changer le nom de domaine DNS avec cette commande\n" - - #: ../hostname.c:339 -+#, c-format - msgid "" - "\n" - "Unless you are using bind or NIS for host lookups you can change the DNS\n" - msgstr "" - "\n" --"Sauf si vous utilisez bind ou NIS pour les recherches d'hôtes, vous pouvez " --"changer le\n" -+"Sauf si vous utilisez bind ou NIS pour les recherches d'hôtes, vous pouvez changer le\n" - - #: ../hostname.c:340 -+#, c-format - msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n" - msgstr "" - "nom de domaine DNS (qui fait partie du FQDN) dans le fichier /etc/hosts.\n" -@@ -439,554 +452,453 @@ - msgid "getnodename()=`%s'\n" - msgstr "getnodename()=`%s'\n" - --#: ../ifconfig.c:159 --#, c-format --msgid "%-9.9s Link encap:%s " --msgstr "%-9.9s Lien encap:%s " -+#: ../ifconfig.c:107 -+#, fuzzy, c-format -+msgid "" -+"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " -+"Flg\n" -+msgstr "" -+"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " -+"Indic\n" - --#: ../ifconfig.c:164 --#, c-format --msgid "HWaddr %s " --msgstr "HWaddr %s " -+#: ../ifconfig.c:129 ../ifconfig.c:161 -+#, fuzzy, c-format -+msgid "%s: ERROR while getting interface flags: %s\n" -+msgstr "%s: erreur lors de la recherche d'infos sur l'interface: %s\n" - --#: ../ifconfig.c:167 -+#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862 -+#: ../ifconfig.c:973 - #, c-format --msgid "Media:%s" --msgstr "Media:%s" -+msgid "No support for INET on this system.\n" -+msgstr "Pas de support de INET sur ce systčme.\n" - --#: ../ifconfig.c:169 --msgid "(auto)" --msgstr "(auto)" -+#: ../ifconfig.c:193 -+#, fuzzy, c-format -+msgid "%s: ERROR while testing interface flags: %s\n" -+msgstr "%s: erreur lors de la recherche d'infos sur l'interface: %s\n" - --#: ../ifconfig.c:176 --#, c-format --msgid " %s addr:%s " --msgstr " %s adr:%s " -+#: ../ifconfig.c:202 -+#, fuzzy, c-format -+msgid "" -+"Usage:\n" -+" ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n" -+msgstr "" -+"Syntaxe:\n" -+" ifconfig [-a] [-i] [-v] <interface> [[<AF>] <adresse>]\n" - --#: ../ifconfig.c:179 -+#: ../ifconfig.c:204 - #, c-format --msgid " P-t-P:%s " --msgstr " P-t-P:%s " -+msgid " [add <address>[/<prefixlen>]]\n" -+msgstr " [add <adresse>[/<lg_prefixe>]]\n" - --#: ../ifconfig.c:182 -+#: ../ifconfig.c:205 - #, c-format --msgid " Bcast:%s " --msgstr " Bcast:%s " -+msgid " [del <address>[/<prefixlen>]]\n" -+msgstr " [del <adresse>[/<lg_prefixe>]]\n" - --#: ../ifconfig.c:184 -+#: ../ifconfig.c:206 - #, c-format --msgid " Mask:%s\n" --msgstr " Masque:%s\n" -+msgid " [[-]broadcast [<address>]] [[-]pointopoint [<address>]]\n" -+msgstr " [[-]broadcast [<adresse>]] [[-]pointopoint [<adresse>]]\n" - --#: ../ifconfig.c:201 --#, c-format --msgid " inet6 addr: %s/%d" --msgstr " adr inet6: %s/%d" -+#: ../ifconfig.c:207 -+#, fuzzy, c-format -+msgid " [netmask <address>] [dstaddr <address>] [tunnel <address>]\n" -+msgstr " [netmask <adresse>] [dstaddr <adresse>] [tunnel <adresse>]\n" - --#: ../ifconfig.c:203 --msgid " Scope:" --msgstr " Scope:" -+#: ../ifconfig.c:210 -+#, c-format -+msgid " [outfill <NN>] [keepalive <NN>]\n" -+msgstr " [outfill <NN>] [keepalive <NN>]\n" - --#: ../ifconfig.c:206 --msgid "Global" --msgstr "Global" -+#: ../ifconfig.c:212 -+#, c-format -+msgid " [hw <HW> <address>] [metric <NN>] [mtu <NN>]\n" -+msgstr " [hw <HW> <adresse>] [metric <NN>] [mtu <NN>]\n" - --#: ../ifconfig.c:209 --msgid "Link" --msgstr "Lien" -+#: ../ifconfig.c:213 -+#, c-format -+msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" -+msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" - --#: ../ifconfig.c:212 --msgid "Site" --msgstr "Site" -+#: ../ifconfig.c:214 -+#, c-format -+msgid " [multicast] [[-]promisc]\n" -+msgstr " [multicast] [[-]promisc]\n" - - #: ../ifconfig.c:215 --msgid "Compat" --msgstr "Compat" -+#, c-format -+msgid " [mem_start <NN>] [io_addr <NN>] [irq <NN>] [media <type>]\n" -+msgstr " [mem_start <NN>] [io_addr <NN>] [irq <NN>] [media <type>]\n" - --#: ../ifconfig.c:218 --msgid "Host" --msgstr "Hôte" -+#: ../ifconfig.c:217 -+#, fuzzy, c-format -+msgid " [txqueuelen <NN>]\n" -+msgstr " [txqueuelen longueur]\n" - --#: ../ifconfig.c:221 --msgid "Unknown" --msgstr "Inconnu" -+#: ../ifconfig.c:220 -+#, c-format -+msgid " [[-]dynamic]\n" -+msgstr " [[-]dynamic]\n" - --#: ../ifconfig.c:236 -+#: ../ifconfig.c:222 - #, c-format --msgid " IPX/Ethernet II addr:%s\n" --msgstr " adr IPX/Ethernet II:%s\n" -+msgid "" -+" [up|down] ...\n" -+"\n" -+msgstr "" -+" [up|down] ...\n" -+"\n" - --#: ../ifconfig.c:239 -+#: ../ifconfig.c:224 - #, c-format --msgid " IPX/Ethernet SNAP addr:%s\n" --msgstr " adr IPX/Ethernet SNAP:%s\n" -+msgid " <HW>=Hardware Type.\n" -+msgstr " <HW>=Type de matériel.\n" - --#: ../ifconfig.c:242 -+#: ../ifconfig.c:225 - #, c-format --msgid " IPX/Ethernet 802.2 addr:%s\n" --msgstr " adr IPX/Ethernet 802.2:%s\n" -+msgid " List of possible hardware types:\n" -+msgstr " Liste des types de matériels possibles:\n" - --#: ../ifconfig.c:245 -+#. 1 = ARPable -+#: ../ifconfig.c:227 - #, c-format --msgid " IPX/Ethernet 802.3 addr:%s\n" --msgstr " adr IPX/Ethernet 802.3:%s\n" -+msgid " <AF>=Address family. Default: %s\n" -+msgstr " <AF>=famille d'Adresses. Défaut: %s\n" - --#: ../ifconfig.c:255 -+#: ../ifconfig.c:228 - #, c-format --msgid " EtherTalk Phase 2 addr:%s\n" --msgstr " adr EtherTalk Phase 2:%s\n" -+msgid " List of possible address families:\n" -+msgstr " Liste des familles d'adresses possibles:\n" - --#: ../ifconfig.c:264 -+#: ../ifconfig.c:303 - #, c-format --msgid " econet addr:%s\n" --msgstr " adr econet:%s\n" -+msgid "ifconfig: option `%s' not recognised.\n" -+msgstr "" - --#: ../ifconfig.c:270 --msgid "[NO FLAGS] " --msgstr "[PAS INDICATEURS] " -+#: ../ifconfig.c:305 ../ifconfig.c:962 -+#, c-format -+msgid "ifconfig: `--help' gives usage information.\n" -+msgstr "" - --#: ../ifconfig.c:272 --msgid "UP " --msgstr "UP " -+#: ../ifconfig.c:380 -+#, c-format -+msgid "Unknown media type.\n" -+msgstr "Type de média inconnu.\n" - --#: ../ifconfig.c:274 --msgid "BROADCAST " --msgstr "BROADCAST " -+#: ../ifconfig.c:417 -+#, c-format -+msgid "" -+"Warning: Interface %s still in promisc mode... maybe other application is " -+"running?\n" -+msgstr "" - --#: ../ifconfig.c:276 --msgid "DEBUG " --msgstr "DEBUG " -+#: ../ifconfig.c:429 -+#, c-format -+msgid "Warning: Interface %s still in MULTICAST mode.\n" -+msgstr "" - --#: ../ifconfig.c:278 --msgid "LOOPBACK " --msgstr "LOOPBACK " -+#: ../ifconfig.c:441 -+#, c-format -+msgid "Warning: Interface %s still in ALLMULTI mode.\n" -+msgstr "" - --#: ../ifconfig.c:280 --msgid "POINTOPOINT " --msgstr "POINTOPOINT " -+#: ../ifconfig.c:465 -+#, c-format -+msgid "Warning: Interface %s still in DYNAMIC mode.\n" -+msgstr "" - --#: ../ifconfig.c:282 --msgid "NOTRAILERS " --msgstr "NOTRAILERS " -+#: ../ifconfig.c:523 -+#, c-format -+msgid "Warning: Interface %s still in BROADCAST mode.\n" -+msgstr "" - --#: ../ifconfig.c:284 --msgid "RUNNING " --msgstr "RUNNING " -+#: ../ifconfig.c:652 -+#, c-format -+msgid "Warning: Interface %s still in POINTOPOINT mode.\n" -+msgstr "" - --#: ../ifconfig.c:286 --msgid "NOARP " --msgstr "NOARP " -+#: ../ifconfig.c:684 -+#, c-format -+msgid "hw address type `%s' has no handler to set address. failed.\n" -+msgstr "" - --#: ../ifconfig.c:288 --msgid "PROMISC " --msgstr "PROMISC " -+#: ../ifconfig.c:693 -+#, c-format -+msgid "%s: invalid %s address.\n" -+msgstr "%s: adresse %s invalide.\n" - --#: ../ifconfig.c:290 --msgid "ALLMULTI " --msgstr "ALLMULTI " -- --#: ../ifconfig.c:292 --msgid "SLAVE " --msgstr "SLAVE " -- --#: ../ifconfig.c:294 --msgid "MASTER " --msgstr "MASTER " -- --#: ../ifconfig.c:296 --msgid "MULTICAST " --msgstr "MULTICAST " -- --#: ../ifconfig.c:299 --msgid "DYNAMIC " --msgstr "DYNAMIC " -- --#: ../ifconfig.c:302 --#, c-format --msgid " MTU:%d Metric:%d" --msgstr " MTU:%d Metric:%d" -- --#: ../ifconfig.c:306 --#, c-format --msgid " Outfill:%d Keepalive:%d" --msgstr " Outfill:%d Keepalive:%d" -- --#: ../ifconfig.c:320 --#, c-format --msgid "RX packets:%lu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" --msgstr "Paquets Reçus:%lu erreurs:%lu jetés:%lu débordements:%lu trames:%lu\n" -- --#: ../ifconfig.c:325 --#, c-format --msgid " compressed:%lu\n" --msgstr " compressés:%lu\n" -- --#: ../ifconfig.c:329 --#, c-format --msgid "TX packets:%lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" --msgstr "" --"Paquets transmis:%lu erreurs:%lu jetés:%lu débordements:%lu carrier:%lu\n" -- --#: ../ifconfig.c:333 -+#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913 - #, c-format --msgid " collisions:%lu " --msgstr " collisions:%lu " -- --#: ../ifconfig.c:335 --#, c-format --msgid "compressed:%lu " --msgstr "compressés:%lu " -- --#: ../ifconfig.c:337 --#, c-format --msgid "txqueuelen:%d " --msgstr "lg file transmission:%d " -- --#: ../ifconfig.c:345 --#, c-format --msgid "Interrupt:%d " --msgstr "Interruption:%d " -- --#. Only print devices using it for --#. I/O maps --#: ../ifconfig.c:348 --#, c-format --msgid "Base address:0x%x " --msgstr "Adresse de base:0x%x " -- --#: ../ifconfig.c:350 --#, c-format --msgid "Memory:%lx-%lx " --msgstr "Mémoire:%lx-%lx " -- --#: ../ifconfig.c:353 --#, c-format --msgid "DMA chan:%x " --msgstr "Canal DMA:%x " -+msgid "No support for INET6 on this system.\n" -+msgstr "Pas de support de INET6 sur ce systčme.\n" - --#: ../ifconfig.c:384 ../ifconfig.c:405 -+#: ../ifconfig.c:780 ../ifconfig.c:871 - #, c-format --msgid "%s: unknown interface: %s\n" --msgstr "%s: interface inconnue: %s\n" -- --#: ../ifconfig.c:421 --msgid "" --"Usage:\n" --" ifconfig [-a] [-i] [-v] <interface> [[<AF>] <address>]\n" --msgstr "" --"Syntaxe:\n" --" ifconfig [-a] [-i] [-v] <interface> [[<AF>] <adresse>]\n" -- --#: ../ifconfig.c:425 --msgid " [add <address>[/<prefixlen>]]\n" --msgstr " [add <adresse>[/<lg_prefixe>]]\n" -- --#: ../ifconfig.c:427 --msgid " [del <address>[/<prefixlen>]]\n" --msgstr " [del <adresse>[/<lg_prefixe>]]\n" -- --#: ../ifconfig.c:432 --msgid " [[-]broadcast [<address>]] [[-]pointopoint [<address>]]\n" --msgstr " [[-]broadcast [<adresse>]] [[-]pointopoint [<adresse>]]\n" -- --#: ../ifconfig.c:433 --#, fuzzy --msgid " [netmask <address>] [dstaddr <address>] [tunnel <address>]\n" --msgstr " [netmask <adresse>] [dstaddr <adresse>] [tunnel <adresse>]\n" -- --#: ../ifconfig.c:436 --msgid " [outfill <NN>] [keepalive <NN>]\n" --msgstr " [outfill <NN>] [keepalive <NN>]\n" -- --#: ../ifconfig.c:438 --msgid " [hw <HW> <address>] [metric <NN>] [mtu <NN>]\n" --msgstr " [hw <HW> <adresse>] [metric <NN>] [mtu <NN>]\n" -- --#: ../ifconfig.c:439 --msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" --msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" -- --#: ../ifconfig.c:440 --msgid " [multicast] [[-]promisc]\n" --msgstr " [multicast] [[-]promisc]\n" -- --#: ../ifconfig.c:441 --msgid " [mem_start <NN>] [io_addr <NN>] [irq <NN>] [media <type>]\n" --msgstr " [mem_start <NN>] [io_addr <NN>] [irq <NN>] [media <type>]\n" -- --#: ../ifconfig.c:443 --#, fuzzy --msgid " [txqueuelen <NN>]\n" --msgstr " [txqueuelen longueur]\n" -- --#: ../ifconfig.c:446 --msgid " [[-]dynamic]\n" --msgstr " [[-]dynamic]\n" -- --#: ../ifconfig.c:448 --msgid "" --" [up|down] ...\n" --"\n" -+msgid "Interface %s not initialized\n" - msgstr "" --" [up|down] ...\n" --"\n" -- --#: ../ifconfig.c:450 --msgid " <HW>=Hardware Type.\n" --msgstr " <HW>=Type de matériel.\n" -- --#: ../ifconfig.c:451 --msgid " List of possible hardware types:\n" --msgstr " Liste des types de matériels possibles:\n" -- --#. 1 = ARPable --#: ../ifconfig.c:453 --#, c-format --msgid " <AF>=Address family. Default: %s\n" --msgstr " <AF>=famille d'Adresses. Défaut: %s\n" -- --#: ../ifconfig.c:454 --msgid " List of possible address families:\n" --msgstr " Liste des familles d'adresses possibles:\n" -- --#: ../ifconfig.c:593 --msgid "Unknown media type.\n" --msgstr "Type de média inconnu.\n" - --#: ../ifconfig.c:881 --#, c-format --msgid "%s: invalid %s address.\n" -+#: ../ifconfig.c:792 ../ifconfig.c:882 -+#, fuzzy, c-format -+msgid "Bad address.\n" - msgstr "%s: adresse %s invalide.\n" - --#: ../ifconfig.c:920 ../ifconfig.c:963 ../ifconfig.c:1011 --msgid "No support for INET6 on this system.\n" --msgstr "Pas de support de INET6 sur ce systčme.\n" -- --#: ../ifconfig.c:983 -+#: ../ifconfig.c:885 -+#, c-format - msgid "Address deletion not supported on this system.\n" - msgstr "Suppression d'adresses pas supporté par ce systčme.\n" - --#: ../ifconfig.c:1066 --msgid "No support for INET on this system.\n" --msgstr "Pas de support de INET sur ce systčme.\n" -+#: ../ifconfig.c:957 -+#, fuzzy, c-format -+msgid "ifconfig: Cannot set address for this protocol family.\n" -+msgstr "Ne sait pas comment définir les adresses pour la famille %d.\n" - --#: ../ifconfig.c:1076 -+#: ../ifconfig.c:983 -+#, c-format - msgid "No support for ECONET on this system.\n" - msgstr "Pas de support de ECONET sur ce systčme.\n" - --#: ../ifconfig.c:1084 -+#: ../ifconfig.c:991 - #, c-format - msgid "Don't know how to set addresses for family %d.\n" - msgstr "Ne sait pas comment définir les adresses pour la famille %d.\n" - --#: ../netstat.c:383 -+#: ../ifconfig.c:1021 -+#, c-format -+msgid "WARNING: at least one error occured. (%d)\n" -+msgstr "" -+ -+#: ../netstat.c:434 - #, c-format - msgid "" - "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n" --msgstr "" --"(Pas d'infos lues pour \"-p\": geteuid()=%d mais vous devez ętre root.)\n" -+msgstr "(Pas d'infos lues pour \"-p\": geteuid()=%d mais vous devez ętre root.)\n" - --#: ../netstat.c:387 -+#: ../netstat.c:438 -+#, c-format - msgid "" - "(Not all processes could be identified, non-owned process info\n" - " will not be shown, you would have to be root to see it all.)\n" - msgstr "" - "(Tous les processus ne peuvent ętre identifiés, les infos sur les processus\n" --"non possédés ne seront pas affichées, vous devez ętre root pour les voir " --"toutes.)\n" -+"non possédés ne seront pas affichées, vous devez ętre root pour les voir toutes.)\n" - --#: ../netstat.c:394 ../netstat.c:1089 ../netstat.c:1166 -+#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266 - msgid "LISTENING" - msgstr "LISTENING" - --#: ../netstat.c:395 -+#: ../netstat.c:446 - msgid "CONN SENT" - msgstr "CONN SENT" - --#: ../netstat.c:396 ../netstat.c:1168 -+#: ../netstat.c:447 ../netstat.c:1268 - msgid "DISC SENT" - msgstr "DISC SENT" - --#: ../netstat.c:397 ../netstat.c:464 ../netstat.c:809 ../netstat.c:1169 -+#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269 - msgid "ESTABLISHED" - msgstr "ESTABLISHED" - --#: ../netstat.c:419 -+#: ../netstat.c:470 -+#, c-format - msgid "Active NET/ROM sockets\n" - msgstr "sockets NET/ROM actives\n" - --#: ../netstat.c:420 -+#: ../netstat.c:471 -+#, c-format - msgid "" --"User Dest Source Device State Vr/Vs Send-Q " --"Recv-Q\n" -+"User Dest Source Device State Vr/Vs Send-Q Recv-" -+"Q\n" - msgstr "" --"Utilisatr Dest Source Periph Etat Vr/Vs Send-Q " --"Recv-Q\n" -+"Utilisatr Dest Source Periph Etat Vr/Vs Send-Q Recv-" -+"Q\n" - --#: ../netstat.c:430 ../netstat.c:1208 -+#: ../netstat.c:481 ../netstat.c:1308 - #, c-format - msgid "Problem reading data from %s\n" - msgstr "" - --#: ../netstat.c:465 -+#: ../netstat.c:516 - msgid "SYN_SENT" - msgstr "SYN_SENT" - --#: ../netstat.c:466 -+#: ../netstat.c:517 - msgid "SYN_RECV" - msgstr "SYN_RECV" - --#: ../netstat.c:467 -+#: ../netstat.c:518 - msgid "FIN_WAIT1" - msgstr "FIN_WAIT1" - --#: ../netstat.c:468 -+#: ../netstat.c:519 - msgid "FIN_WAIT2" - msgstr "FIN_WAIT2" - --#: ../netstat.c:469 -+#: ../netstat.c:520 - msgid "TIME_WAIT" - msgstr "TIME_WAIT" - --#: ../netstat.c:470 -+#: ../netstat.c:521 - msgid "CLOSE" - msgstr "CLOSE" - --#: ../netstat.c:471 -+#: ../netstat.c:522 - msgid "CLOSE_WAIT" - msgstr "CLOSE_WAIT" - --#: ../netstat.c:472 -+#: ../netstat.c:523 - msgid "LAST_ACK" - msgstr "LAST_ACK" - --#: ../netstat.c:473 -+#: ../netstat.c:524 - msgid "LISTEN" - msgstr "LISTEN" - --#: ../netstat.c:474 -+#: ../netstat.c:525 - msgid "CLOSING" - msgstr "CLOSING" - --#: ../netstat.c:544 -+#: ../netstat.c:596 - #, c-format - msgid "warning, got bogus igmp6 line %d.\n" - msgstr "attention, ligne igmp6 en erreur %d.\n" - --#: ../netstat.c:549 ../netstat.c:587 ../netstat.c:670 ../netstat.c:803 --#: ../netstat.c:935 ../netstat.c:940 -+#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898 -+#: ../netstat.c:1032 ../netstat.c:1037 - #, c-format - msgid "netstat: unsupported address family %d !\n" - msgstr "netstat: famille d'adresses pas supportée %d !\n" - --#: ../netstat.c:562 ../netstat.c:567 ../netstat.c:575 ../netstat.c:582 -+#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634 - #, c-format - msgid "warning, got bogus igmp line %d.\n" - msgstr "attention, ligne igmp6 en erreur %d.\n" - --#: ../netstat.c:666 -+#: ../netstat.c:677 -+#, fuzzy, c-format -+msgid "Active X.25 sockets\n" -+msgstr "Sockets AX.25 actives\n" -+ -+#. IMHO, Vr/Vs is not very usefull --SF -+#: ../netstat.c:679 -+#, fuzzy, c-format -+msgid "" -+"Dest Source Device LCI State Vr/Vs Send-Q Recv-" -+"Q\n" -+msgstr "Dest Source Periph Etat Vr/Vs Send-Q Recv-Q\n" -+ -+#: ../netstat.c:759 -+#, c-format - msgid "warning, got bogus tcp line.\n" - msgstr "attention, ligne tcp en erreur.\n" - --#: ../netstat.c:704 ../netstat.c:855 ../netstat.c:975 -+#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075 - #, c-format - msgid "off (0.00/%ld/%d)" - msgstr "off (0.00/%ld/%d)" - --#: ../netstat.c:708 -+#: ../netstat.c:804 - #, fuzzy, c-format - msgid "on (%2.2f/%ld/%d)" - msgstr "on%d (%2.2f/%ld/%d)" - --#: ../netstat.c:713 -+#: ../netstat.c:809 - #, fuzzy, c-format - msgid "keepalive (%2.2f/%ld/%d)" - msgstr "on%d (%2.2f/%ld/%d)" - --#: ../netstat.c:718 -+#: ../netstat.c:814 - #, fuzzy, c-format - msgid "timewait (%2.2f/%ld/%d)" - msgstr "on%d (%2.2f/%ld/%d)" - --#: ../netstat.c:723 ../netstat.c:864 ../netstat.c:985 -+#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085 - #, c-format - msgid "unkn-%d (%2.2f/%ld/%d)" - msgstr "unkn-%d (%2.2f/%ld/%d)" - --#: ../netstat.c:799 -+#: ../netstat.c:894 -+#, c-format - msgid "warning, got bogus udp line.\n" - msgstr "attention, ligne udp en erreur.\n" - --#: ../netstat.c:817 ../netstat.c:1075 ../netstat.c:1108 -+#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208 - msgid "UNKNOWN" - msgstr "INCONNU" - --#: ../netstat.c:860 ../netstat.c:980 -+#: ../netstat.c:958 ../netstat.c:1080 - #, c-format - msgid "on%d (%2.2f/%ld/%d)" - msgstr "on%d (%2.2f/%ld/%d)" - --#: ../netstat.c:949 -+#: ../netstat.c:1046 -+#, c-format - msgid "warning, got bogus raw line.\n" - msgstr "attention, ligne raw en erreur.\n" - --#: ../netstat.c:1028 -+#: ../netstat.c:1128 -+#, c-format - msgid "warning, got bogus unix line.\n" - msgstr "attention, ligne unix en erreur.\n" - --#: ../netstat.c:1055 -+#: ../netstat.c:1155 - msgid "STREAM" - msgstr "STREAM" - --#: ../netstat.c:1059 -+#: ../netstat.c:1159 - msgid "DGRAM" - msgstr "DGRAM" - --#: ../netstat.c:1063 -+#: ../netstat.c:1163 - msgid "RAW" - msgstr "RAW" - --#: ../netstat.c:1067 -+#: ../netstat.c:1167 - msgid "RDM" - msgstr "RDM" - --#: ../netstat.c:1071 -+#: ../netstat.c:1171 - msgid "SEQPACKET" - msgstr "SEQPACKET" - --#: ../netstat.c:1080 -+#: ../netstat.c:1180 - msgid "FREE" - msgstr "LIBRE" - --#: ../netstat.c:1096 -+#: ../netstat.c:1196 - msgid "CONNECTING" - msgstr "ENCONNEXION" - --#: ../netstat.c:1100 -+#: ../netstat.c:1200 - msgid "CONNECTED" - msgstr "CONNECTE" - --#: ../netstat.c:1104 -+#: ../netstat.c:1204 - msgid "DISCONNECTING" - msgstr "ENDECONNEXION" - --#: ../netstat.c:1135 -+#: ../netstat.c:1235 -+#, c-format - msgid "Active UNIX domain sockets " - msgstr "Sockets du domaine UNIX actives" - --#: ../netstat.c:1137 ../netstat.c:1666 -+#: ../netstat.c:1237 ../netstat.c:1756 -+#, c-format - msgid "(servers and established)" - msgstr "(serveurs et établies)" - --#: ../netstat.c:1140 ../netstat.c:1669 -+#: ../netstat.c:1240 ../netstat.c:1759 -+#, c-format - msgid "(only servers)" - msgstr "(seulement serveurs)" - --#: ../netstat.c:1142 ../netstat.c:1671 -+#: ../netstat.c:1242 ../netstat.c:1761 -+#, c-format - msgid "(w/o servers)" - msgstr "(sans serveurs)" - --#: ../netstat.c:1145 -+#: ../netstat.c:1245 -+#, c-format - msgid "" - "\n" - "Proto RefCnt Flags Type State I-Node" -@@ -994,32 +906,36 @@ - "\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 @@ - "Proto Recv-Q Send-Q Adresse locale Adresse distante " - "Etat" - --#: ../netstat.c:1281 -+#: ../netstat.c:1381 -+#, c-format - msgid " User" - msgstr "Utilisatr" - --#: ../netstat.c:1315 -+#: ../netstat.c:1415 - msgid "ESTAB" - msgstr "ESTAB" - --#: ../netstat.c:1323 -+#: ../netstat.c:1423 - msgid "UNK." - msgstr "UNK." - --#: ../netstat.c:1367 --msgid " - no statistics available -" --msgstr "" -- --#: ../netstat.c:1370 --msgid "[NO FLAGS]" --msgstr "[PAS INDICATEURS]" -- --#: ../netstat.c:1400 -+#: ../netstat.c:1461 -+#, c-format - msgid "Kernel Interface table\n" - msgstr "Table d'interfaces noyau\n" - --#: ../netstat.c:1401 -+#: ../netstat.c:1465 -+#, fuzzy, c-format - msgid "" --"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " -+"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " - "Flg\n" - msgstr "" - "Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " - "Indic\n" - --#: ../netstat.c:1404 -+#: ../netstat.c:1469 - msgid "missing interface information" - msgstr "informations d'interface manquantes" - --#: ../netstat.c:1425 -+#: ../netstat.c:1492 -+#, c-format - msgid "" --"usage: netstat [-veenNcCF] [<Af>] -r netstat " --"{-V|--version|-h|--help}\n" -+"usage: netstat [-veenNcCF] [<Af>] -r netstat {-V|--version|-h|--" -+"help}\n" - msgstr "" --"syntaxe: netstat [-veenNcCF] [<Af>] -r netstat " --"{-V|--version|-h|--help}\n" -+"syntaxe: netstat [-veenNcCF] [<Af>] -r netstat {-V|--version|-h|--" -+"help}\n" - --#: ../netstat.c:1426 -+#: ../netstat.c:1493 -+#, c-format - msgid " netstat [-vnNcaeol] [<Socket> ...]\n" - msgstr " netstat [-vnNcaeol] [<Socket> ...]\n" - --#: ../netstat.c:1427 -+#: ../netstat.c:1494 -+#, c-format - msgid "" - " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" - "\n" -@@ -1085,27 +999,30 @@ - " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" - "\n" - --#: ../netstat.c:1429 -+#: ../netstat.c:1496 -+#, c-format - msgid " -r, --route display routing table\n" - msgstr " -r, --route affiche la table de routage\n" - --#: ../netstat.c:1430 -+#: ../netstat.c:1497 -+#, c-format - msgid " -i, --interfaces display interface table\n" - msgstr " -i, --interfaces affiche la table d'interfaces\n" - --#: ../netstat.c:1431 -+#: ../netstat.c:1498 -+#, c-format - msgid " -g, --groups display multicast group memberships\n" - msgstr "" - " -g, --groups affiche les membres d'un groupe multicast\n" - --#: ../netstat.c:1432 -+#: ../netstat.c:1499 -+#, c-format - msgid "" - " -s, --statistics display networking statistics (like SNMP)\n" --msgstr "" --" -s, --statistics affiche les statistiques réseau (comme " --"SNMP)\n" -+msgstr " -s, --statistics affiche les statistiques réseau (comme SNMP)\n" - --#: ../netstat.c:1434 -+#: ../netstat.c:1501 -+#, c-format - msgid "" - " -M, --masquerade display masqueraded connections\n" - "\n" -@@ -1113,23 +1030,41 @@ - " -M, --masquerade affiche les connexions masquées\n" - "\n" - --#: ../netstat.c:1438 ../route.c:87 -+#: ../netstat.c:1505 -+#, fuzzy, c-format -+msgid " --numeric-hosts don't resolve host names\n" -+msgstr " -n, --numeric ne résout pas les noms\n" -+ -+#: ../netstat.c:1506 -+#, fuzzy, c-format -+msgid " --numeric-ports don't resolve port names\n" -+msgstr " -n, --numeric ne résout pas les noms\n" -+ -+#: ../netstat.c:1507 -+#, fuzzy, c-format -+msgid " --numeric-users don't resolve user names\n" -+msgstr " -n, --numeric ne résout pas les noms\n" -+ -+#: ../netstat.c:1508 -+#, c-format - msgid " -N, --symbolic resolve hardware names\n" - msgstr " -N, --symbolic résoud les noms matériels\n" - --#: ../netstat.c:1439 ../route.c:88 --#, fuzzy -+#: ../netstat.c:1509 ../route.c:88 -+#, fuzzy, c-format - msgid " -e, --extend display other/more information\n" - msgstr "" - " -e, --extend affiche d'autres/plus d'informations\n" - --#: ../netstat.c:1440 -+#: ../netstat.c:1510 -+#, c-format - msgid " -p, --programs display PID/Program name for sockets\n" - msgstr "" - " -p, --programs affiche le nom du programme/PID des " - "sockets\n" - --#: ../netstat.c:1441 -+#: ../netstat.c:1511 -+#, c-format - msgid "" - " -c, --continuous continuous listing\n" - "\n" -@@ -1137,32 +1072,31 @@ - " -c, --continuous listing continu\n" - "\n" - --#: ../netstat.c:1442 -+#: ../netstat.c:1512 -+#, c-format - msgid " -l, --listening display listening server sockets\n" --msgstr "" --" -l, --listening affiche les sockets du serveur ŕ l'écoute\n" -+msgstr " -l, --listening affiche les sockets du serveur ŕ l'écoute\n" - --#: ../netstat.c:1443 -+#: ../netstat.c:1513 -+#, c-format - msgid "" - " -a, --all, --listening display all sockets (default: connected)\n" --msgstr "" --" -a, --all, --listening affiche toutes les prises (défaut: " --"connectés)\n" -+msgstr " -a, --all, --listening affiche toutes les prises (défaut: connectés)\n" - --#: ../netstat.c:1444 -+#: ../netstat.c:1514 -+#, c-format - msgid " -o, --timers display timers\n" - msgstr " -o, --timers affiche les timers\n" - --#: ../netstat.c:1445 ../route.c:89 --#, fuzzy -+#: ../netstat.c:1515 ../route.c:89 -+#, fuzzy, c-format - msgid "" - " -F, --fib display Forwarding Information Base " - "(default)\n" --msgstr "" --" -F, --fib affiche la Forwarding Infomation Base " --"(défaut)\n" -+msgstr " -F, --fib affiche la Forwarding Infomation Base (défaut)\n" - --#: ../netstat.c:1446 ../route.c:90 -+#: ../netstat.c:1516 ../route.c:90 -+#, c-format - msgid "" - " -C, --cache display routing cache instead of FIB\n" - "\n" -@@ -1170,110 +1104,118 @@ - " -C, --cache affiche le cache de routage au lieu de FIB\n" - "\n" - --#: ../netstat.c:1448 -+#: ../netstat.c:1518 -+#, c-format - msgid "" --" <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx " --"--netrom\n" -+" <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" -+"netrom\n" - msgstr "" --" <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx " --"--netrom\n" -+" <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" -+"netrom\n" - --#: ../netstat.c:1449 ../route.c:92 --#, c-format --msgid " <AF>=Use '-A <af>' or '--<af>' Default: %s\n" -+#: ../netstat.c:1519 -+#, fuzzy, c-format -+msgid " <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n" - msgstr " <AF>=Utiliser '-A <af>' ou '--<af>' Défaut: %s\n" - --#: ../netstat.c:1450 ../route.c:93 -+#: ../netstat.c:1520 ../route.c:93 -+#, c-format - msgid " List of possible address families (which support routing):\n" - msgstr " Liste les familles d'adresses possibles (supportant le routage):\n" - --#: ../netstat.c:1663 -+#: ../netstat.c:1753 -+#, c-format - msgid "Active Internet connections " - msgstr "Connexions Internet actives " - --#: ../netstat.c:1673 -+#: ../netstat.c:1763 -+#, c-format - msgid "" - "\n" --"Proto Recv-Q Send-Q Local Address Foreign Address State " --" " -+"Proto Recv-Q Send-Q Local Address Foreign Address " -+"State " - msgstr "" - "\n" --"Proto Recv-Q Send-Q Adresse locale Adresse distante Etat " --" " -+"Proto Recv-Q Send-Q Adresse locale Adresse distante " -+"Etat " - --#: ../netstat.c:1675 -+#: ../netstat.c:1765 -+#, c-format - msgid " User Inode " - msgstr " Utilisatr Inode " - --#: ../netstat.c:1678 -+#: ../netstat.c:1768 -+#, c-format - msgid " Timer" - msgstr " Timer" - --#: ../netstat.c:1708 -+#: ../netstat.c:1798 -+#, c-format - msgid "IPv4 Group Memberships\n" - msgstr "" - --#: ../netstat.c:1709 -+#: ../netstat.c:1799 -+#, c-format - msgid "Interface RefCnt Group\n" - msgstr "" - --#: ../rarp.c:43 -+#: ../rarp.c:44 - msgid "This kernel does not support RARP.\n" - msgstr "Ce noyau ne supporte pas RARP.\n" - --#: ../rarp.c:82 -+#: ../rarp.c:83 - #, c-format - msgid "no RARP entry for %s.\n" - msgstr "pas d'entrée RARP pour %s.\n" - --#: ../rarp.c:95 -+#: ../rarp.c:96 - #, c-format - msgid "%s: bad hardware address\n" - msgstr "%s: mauvaise adresse matériel\n" - --#: ../rarp.c:127 -+#: ../rarp.c:128 - #, c-format - msgid "rarp: cannot open file %s:%s.\n" - msgstr "rarp: ne peut ouvrir le fichier %s:%s.\n" - --#: ../rarp.c:139 -+#: ../rarp.c:140 - #, c-format - msgid "rarp: format error at %s:%u\n" - msgstr "rarp: erreur de format ŕ %s:%u\n" - --#: ../rarp.c:143 ../rarp.c:287 -+#: ../rarp.c:144 ../rarp.c:289 - #, c-format - msgid "rarp: %s: unknown host\n" - msgstr "rarp: %s: hôte inconnu\n" - --#: ../rarp.c:146 -+#: ../rarp.c:147 - #, c-format - msgid "rarp: cannot set entry from %s:%u\n" - msgstr "rarp: ne peut définir l'entrée depuis %s:%u\n" - --#: ../rarp.c:175 -+#: ../rarp.c:176 -+#, c-format - msgid "Usage: rarp -a list entries in cache.\n" --msgstr "" --"Usage: rarp -a liste les entrées en cache.\n" -+msgstr "Usage: rarp -a liste les entrées en cache.\n" - --#: ../rarp.c:176 -+#: ../rarp.c:177 -+#, c-format - msgid " rarp -d <hostname> delete entry from cache.\n" --msgstr "" --" rarp -d <hostname> supprime l'entrée du cache.\n" -+msgstr " rarp -d <hostname> supprime l'entrée du cache.\n" - --#: ../rarp.c:177 -+#: ../rarp.c:178 -+#, c-format - msgid " rarp [<HW>] -s <hostname> <hwaddr> add entry to cache.\n" --msgstr "" --" rarp [<HW>] -s <hostname> <adrmat> ajoute l'entrée au cache.\n" -+msgstr " rarp [<HW>] -s <hostname> <adrmat> ajoute l'entrée au cache.\n" - --#: ../rarp.c:178 -+#: ../rarp.c:179 -+#, c-format - msgid "" - " rarp -f add entries from /etc/ethers.\n" --msgstr "" --" rarp -f ajoute les entrées depuis " --"/etc/ethers.\n" -+msgstr " rarp -f ajoute les entrées depuis /etc/ethers.\n" - --#: ../rarp.c:179 -+#: ../rarp.c:180 -+#, c-format - msgid "" - " rarp -V display program version.\n" - "\n" -@@ -1281,24 +1223,26 @@ - " rarp -V affiche la version.\n" - "\n" - --#: ../rarp.c:236 -+#: ../rarp.c:238 - #, c-format - msgid "%s: illegal option mix.\n" - msgstr "%s: combinaison d'options illégales.\n" - --#: ../rarp.c:267 -+#: ../rarp.c:269 - #, c-format - msgid "rarp: %s: unknown hardware type.\n" - msgstr "rarp: %s: type de matériel inconnu.\n" - --#: ../route.c:79 -+#: ../route.c:80 -+#, c-format - msgid "" - "Usage: route [-nNvee] [-FC] [<AF>] List kernel routing tables\n" - msgstr "" - "Syntaxe: route [-nNvee] [-FC] [<AF>] Liste les tables de routage " - "noyau\n" - --#: ../route.c:80 -+#: ../route.c:81 -+#, c-format - msgid "" - " route [-v] [-FC] {add|del|flush} ... Modify routing table for AF.\n" - "\n" -@@ -1307,15 +1251,15 @@ - "pour AF.\n" - "\n" - --#: ../route.c:82 -+#: ../route.c:83 -+#, c-format - msgid "" - " route {-h|--help} [<AF>] Detailed usage syntax for " - "specified AF.\n" --msgstr "" --" route {-h|--help} [<AF>] Utilisation détaillée pour l'AF " --"spécifié.\n" -+msgstr " route {-h|--help} [<AF>] Utilisation détaillée pour l'AF spécifié.\n" - --#: ../route.c:83 -+#: ../route.c:84 -+#, c-format - msgid "" - " route {-V|--version} Display version/author and " - "exit.\n" -@@ -1325,16 +1269,23 @@ - "termine.\n" - "\n" - -+#: ../route.c:92 -+#, fuzzy, c-format -+msgid " <AF>=Use '-A <af>' or '--<af>'; default: %s\n" -+msgstr " <AF>=Utiliser '-A <af>' ou '--<af>' Défaut: %s\n" -+ - #: ../plipconfig.c:66 -+#, c-format - msgid "Usage: plipconfig [-a] [-i] [-v] interface\n" - msgstr "Syntaxe: plipconfig [-a] [-i] [-v] interface\n" - - #: ../plipconfig.c:67 -+#, c-format - msgid " [nibble NN] [trigger NN]\n" - msgstr " [nibble NN] [trigger NN]\n" - - #: ../plipconfig.c:68 --#, fuzzy -+#, fuzzy, c-format - msgid " plipconfig -V | --version\n" - msgstr " plipconfig -V\n" - -@@ -1343,474 +1294,763 @@ - msgid "%s\tnibble %lu trigger %lu\n" - msgstr "%s\tnibble %lu trigger %lu\n" - --#: ../iptunnel.c:79 -+#: ../iptunnel.c:85 -+#, c-format - msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n" - msgstr "" - --#: ../iptunnel.c:80 -+#: ../iptunnel.c:86 -+#, c-format - msgid "" - " [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n" - msgstr "" - --#: ../iptunnel.c:81 -+#: ../iptunnel.c:87 -+#, c-format - msgid " [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n" - msgstr "" - --#: ../iptunnel.c:82 -+#: ../iptunnel.c:88 -+#, c-format - msgid " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n" - msgstr "" - --#: ../iptunnel.c:83 -+#: ../iptunnel.c:89 -+#, c-format - msgid "" - " iptunnel -V | --version\n" - "\n" - msgstr "" - --#: ../iptunnel.c:84 -+#: ../iptunnel.c:90 -+#, c-format - msgid "Where: NAME := STRING\n" - msgstr "" - --#: ../iptunnel.c:85 -+#: ../iptunnel.c:91 -+#, c-format - msgid " ADDR := { IP_ADDRESS | any }\n" - msgstr "" - --#: ../iptunnel.c:86 -+#: ../iptunnel.c:92 -+#, c-format - msgid " TOS := { NUMBER | inherit }\n" - msgstr "" - --#: ../iptunnel.c:87 -+#: ../iptunnel.c:93 -+#, c-format - msgid " TTL := { 1..255 | inherit }\n" - msgstr "" - --#: ../iptunnel.c:88 -+#: ../iptunnel.c:94 -+#, c-format - msgid " KEY := { DOTTED_QUAD | NUMBER }\n" - msgstr "" - --#: ../iptunnel.c:326 -+#: ../iptunnel.c:332 -+#, c-format - msgid "Keys are not allowed with ipip and sit.\n" - msgstr "" - --#: ../iptunnel.c:346 -+#: ../iptunnel.c:352 -+#, c-format - msgid "Broadcast tunnel requires a source address.\n" - msgstr "" - --#: ../iptunnel.c:361 -+#: ../iptunnel.c:367 -+#, c-format - msgid "ttl != 0 and noptmudisc are incompatible\n" - msgstr "" - --#: ../iptunnel.c:373 -+#: ../iptunnel.c:379 -+#, c-format - msgid "cannot determine tunnel mode (ipip, gre or sit)\n" - msgstr "" - --#: ../iptunnel.c:411 -+#: ../iptunnel.c:417 - #, c-format - msgid "%s: %s/ip remote %s local %s " - msgstr "" - --#: ../iptunnel.c:415 -+#: ../iptunnel.c:421 - #, fuzzy - msgid "unknown" - msgstr "Inconnu" - --#: ../iptunnel.c:447 -+#: ../iptunnel.c:453 -+#, c-format - msgid " Drop packets out of sequence.\n" - msgstr "" - --#: ../iptunnel.c:449 -+#: ../iptunnel.c:455 -+#, c-format - msgid " Checksum in received packet is required.\n" - msgstr "" - --#: ../iptunnel.c:451 -+#: ../iptunnel.c:457 -+#, c-format - msgid " Sequence packets on output.\n" - msgstr "" - --#: ../iptunnel.c:453 -+#: ../iptunnel.c:459 -+#, c-format - msgid " Checksum output packets.\n" - msgstr "" - --#: ../iptunnel.c:481 -+#: ../iptunnel.c:487 -+#, c-format - msgid "Wrong format of /proc/net/dev. Sorry.\n" - msgstr "" - --#: ../iptunnel.c:494 -+#: ../iptunnel.c:500 - #, c-format - msgid "Failed to get type of [%s]\n" - msgstr "" - --#: ../iptunnel.c:510 -+#: ../iptunnel.c:516 -+#, c-format - msgid "RX: Packets Bytes Errors CsumErrs OutOfSeq Mcasts\n" - msgstr "" - --#: ../iptunnel.c:513 -+#: ../iptunnel.c:519 -+#, c-format - msgid "TX: Packets Bytes Errors DeadLoop NoRoute NoBufs\n" - msgstr "" - --#: ../statistics.c:45 -+#: ../statistics.c:47 - msgid "ICMP input histogram:" - msgstr "Histogramme d'entrée ICMP" - --#: ../statistics.c:46 -+#: ../statistics.c:48 - msgid "ICMP output histogram:" - msgstr "Histogramme de sortie ICMP" - --#: ../statistics.c:63 -+#: ../statistics.c:65 - #, c-format - msgid "Forwarding is %s" - msgstr "Réacheminement est %s" - --#: ../statistics.c:64 --#, c-format --msgid "Default TTL is %d" -+#: ../statistics.c:66 -+#, fuzzy, c-format -+msgid "Default TTL is %u" - msgstr "TTL par défaut est %d" - --#: ../statistics.c:65 --#, c-format --msgid "%d total packets received" -+#: ../statistics.c:67 -+#, fuzzy, c-format -+msgid "%u total packets received" - msgstr "%d paquets totaux reçus" - --#: ../statistics.c:66 --#, c-format --msgid "%d with invalid headers" -+#: ../statistics.c:68 -+#, fuzzy, c-format -+msgid "%u with invalid headers" - msgstr "%d avec en-tęte invalides" - --#: ../statistics.c:67 --#, c-format --msgid "%d with invalid addresses" -+#: ../statistics.c:69 -+#, fuzzy, c-format -+msgid "%u with invalid addresses" - msgstr "%d avec adresses invalides" - --#: ../statistics.c:68 --#, c-format --msgid "%d forwarded" -+#: ../statistics.c:70 -+#, fuzzy, c-format -+msgid "%u forwarded" - msgstr "%d réacheminées" - --#: ../statistics.c:69 --#, c-format --msgid "%d with unknown protocol" -+#: ../statistics.c:71 -+#, fuzzy, c-format -+msgid "%u with unknown protocol" - msgstr "%d avec protocole inconnu" - --#: ../statistics.c:70 --#, c-format --msgid "%d incoming packets discarded" -+#: ../statistics.c:72 -+#, fuzzy, c-format -+msgid "%u incoming packets discarded" - msgstr "%d paquets entrant jetés" - --#: ../statistics.c:71 --#, c-format --msgid "%d incoming packets delivered" -+#: ../statistics.c:73 -+#, fuzzy, c-format -+msgid "%u incoming packets delivered" - msgstr "%d paquets entrant délivrés" - --#: ../statistics.c:72 --#, c-format --msgid "%d requests sent out" -+#: ../statistics.c:74 -+#, fuzzy, c-format -+msgid "%u requests sent out" - msgstr "%d requętes envoyées" - - #. ? --#: ../statistics.c:73 --#, c-format --msgid "%d outgoing packets dropped" -+#: ../statistics.c:75 -+#, fuzzy, c-format -+msgid "%u outgoing packets dropped" - msgstr "%d paquets sortant jetés" - --#: ../statistics.c:74 --#, c-format --msgid "%d dropped because of missing route" -+#: ../statistics.c:76 -+#, fuzzy, c-format -+msgid "%u dropped because of missing route" - msgstr "%d jetés pour cause de route manquante" - --#: ../statistics.c:75 --#, c-format --msgid "%d fragments dropped after timeout" -+#: ../statistics.c:77 -+#, fuzzy, c-format -+msgid "%u fragments dropped after timeout" - msgstr "%d fragments jetés aprčs timeout" - --#: ../statistics.c:76 --#, c-format --msgid "%d reassemblies required" -+#: ../statistics.c:78 -+#, fuzzy, c-format -+msgid "%u reassemblies required" - msgstr "%d nécessitant un réassemblage" - - #. ? --#: ../statistics.c:77 --#, c-format --msgid "%d packets reassembled ok" -+#: ../statistics.c:79 -+#, fuzzy, c-format -+msgid "%u packets reassembled ok" - msgstr "%d paquets réassemblés correctement" - --#: ../statistics.c:78 --#, c-format --msgid "%d packet reassembles failed" -+#: ../statistics.c:80 -+#, fuzzy, c-format -+msgid "%u packet reassembles failed" - msgstr "%d paquets mal réassemblés" - --#: ../statistics.c:79 --#, c-format --msgid "%d fragments received ok" -+#: ../statistics.c:81 -+#, fuzzy, c-format -+msgid "%u fragments received ok" - msgstr "%d fragments reçus correctement" - --#: ../statistics.c:80 --#, c-format --msgid "%d fragments failed" -+#: ../statistics.c:82 -+#, fuzzy, c-format -+msgid "%u fragments failed" - msgstr "%d fragments en échec" - --#: ../statistics.c:81 --#, c-format --msgid "%d fragments created" -+#: ../statistics.c:83 -+#, fuzzy, c-format -+msgid "%u fragments created" - msgstr "%d fragments créés" - --#: ../statistics.c:86 --#, c-format --msgid "%d ICMP messages received" -+#: ../statistics.c:88 -+#, fuzzy, c-format -+msgid "%u ICMP messages received" - msgstr "%d messages ICMP reçus" - --#: ../statistics.c:87 --#, c-format --msgid "%d input ICMP message failed." -+#: ../statistics.c:89 -+#, fuzzy, c-format -+msgid "%u input ICMP message failed." - msgstr "%d messages d'entrée ICMP en échec" - --#: ../statistics.c:88 ../statistics.c:101 --#, c-format --msgid "destination unreachable: %d" -+#: ../statistics.c:90 ../statistics.c:103 -+#, fuzzy, c-format -+msgid "destination unreachable: %u" - msgstr "destination injoignable: %d" - --#: ../statistics.c:89 --#, c-format --msgid "timeout in transit: %d" -+#: ../statistics.c:91 -+#, fuzzy, c-format -+msgid "timeout in transit: %u" - msgstr "timeout en transmission: %d" - --#: ../statistics.c:90 ../statistics.c:103 --#, c-format --msgid "wrong parameters: %d" -+#: ../statistics.c:92 ../statistics.c:105 -+#, fuzzy, c-format -+msgid "wrong parameters: %u" - msgstr "mauvais paramčtre: %d" - - #. ? --#: ../statistics.c:91 --#, c-format --msgid "source quenchs: %d" -+#: ../statistics.c:93 -+#, fuzzy, c-format -+msgid "source quenches: %u" - msgstr "Source Quenchs: %d" - --#: ../statistics.c:92 --#, c-format --msgid "redirects: %d" -+#: ../statistics.c:94 -+#, fuzzy, c-format -+msgid "redirects: %u" - msgstr "Redirections: %d" - --#: ../statistics.c:93 --#, c-format --msgid "echo requests: %d" -+#: ../statistics.c:95 -+#, fuzzy, c-format -+msgid "echo requests: %u" - msgstr "requętes echo: %d" - --#: ../statistics.c:94 ../statistics.c:107 --#, c-format --msgid "echo replies: %d" -+#: ../statistics.c:96 ../statistics.c:109 -+#, fuzzy, c-format -+msgid "echo replies: %u" - msgstr "réponses echo: %d" - --#: ../statistics.c:95 --#, c-format --msgid "timestamp request: %d" -+#: ../statistics.c:97 -+#, fuzzy, c-format -+msgid "timestamp request: %u" - msgstr "requętes datées: %d" - --#: ../statistics.c:96 --#, c-format --msgid "timestamp reply: %d" -+#: ../statistics.c:98 -+#, fuzzy, c-format -+msgid "timestamp reply: %u" - msgstr "réponses datées: %d" - --#: ../statistics.c:97 --#, c-format --msgid "address mask request: %d" -+#: ../statistics.c:99 -+#, fuzzy, c-format -+msgid "address mask request: %u" - msgstr "requętes de masque d'adresse: %d" - - #. ? --#: ../statistics.c:98 --msgid "address mask replies" --msgstr "réponses de masque d'adresses" -+#: ../statistics.c:100 ../statistics.c:113 -+#, fuzzy, c-format -+msgid "address mask replies: %u" -+msgstr "réponses de masque d'adresse: %d" - - #. ? --#: ../statistics.c:99 --#, c-format --msgid "%d ICMP messages sent" -+#: ../statistics.c:101 -+#, fuzzy, c-format -+msgid "%u ICMP messages sent" - msgstr "%d messages ICMP envoyés" - --#: ../statistics.c:100 --#, c-format --msgid "%d ICMP messages failed" -+#: ../statistics.c:102 -+#, fuzzy, c-format -+msgid "%u ICMP messages failed" - msgstr "%d messages ICMP en échec" - --#: ../statistics.c:102 --#, c-format --msgid "time exceeded: %d" -+#: ../statistics.c:104 -+#, fuzzy, c-format -+msgid "time exceeded: %u" - msgstr "temps dépassé: %d" - - #. ? --#: ../statistics.c:104 --#, c-format --msgid "source quench: %d" -+#: ../statistics.c:106 -+#, fuzzy, c-format -+msgid "source quench: %u" - msgstr "Source Quench: %d" - --#: ../statistics.c:105 --#, c-format --msgid "redirect: %d" -+#: ../statistics.c:107 -+#, fuzzy, c-format -+msgid "redirect: %u" - msgstr "redirection: %d" - --#: ../statistics.c:106 --#, c-format --msgid "echo request: %d" -+#: ../statistics.c:108 -+#, fuzzy, c-format -+msgid "echo request: %u" - msgstr "requęte echo: %d" - --#: ../statistics.c:108 --#, c-format --msgid "timestamp requests: %d" -+#: ../statistics.c:110 -+#, fuzzy, c-format -+msgid "timestamp requests: %u" - msgstr "requętes datées: %d" - --#: ../statistics.c:109 --#, c-format --msgid "timestamp replies: %d" -+#: ../statistics.c:111 -+#, fuzzy, c-format -+msgid "timestamp replies: %u" - msgstr "réponses datées: %d" - --#: ../statistics.c:110 --#, c-format --msgid "address mask requests: %d" -+#: ../statistics.c:112 -+#, fuzzy, c-format -+msgid "address mask requests: %u" - msgstr "requętes de masque d'adresse: %d" - --#: ../statistics.c:111 --#, c-format --msgid "address mask replies: %d" --msgstr "réponses de masque d'adresse: %d" -- --#: ../statistics.c:116 -+#: ../statistics.c:118 - #, c-format - msgid "RTO algorithm is %s" - msgstr "algorithme RTO est %s" - --#: ../statistics.c:120 --#, c-format --msgid "%d active connections openings" -+#: ../statistics.c:122 -+#, fuzzy, c-format -+msgid "%u active connections openings" - msgstr "%d ouvertures de connexions actives" - --#: ../statistics.c:121 --#, c-format --msgid "%d passive connection openings" -+#: ../statistics.c:123 -+#, fuzzy, c-format -+msgid "%u passive connection openings" - msgstr "%d ouvertures de connexions passives" - --#: ../statistics.c:122 --#, c-format --msgid "%d failed connection attempts" -+#: ../statistics.c:124 -+#, fuzzy, c-format -+msgid "%u failed connection attempts" - msgstr "%d tentatives de connexion échouées" - --#: ../statistics.c:123 --#, c-format --msgid "%d connection resets received" -+#: ../statistics.c:125 -+#, fuzzy, c-format -+msgid "%u connection resets received" - msgstr "%d réinitialisations de connexions reçues" - --#: ../statistics.c:124 --#, c-format --msgid "%d connections established" -+#: ../statistics.c:126 -+#, fuzzy, c-format -+msgid "%u connections established" - msgstr "%d connexions établies" - --#: ../statistics.c:125 --#, c-format --msgid "%d segments received" -+#: ../statistics.c:127 -+#, fuzzy, c-format -+msgid "%u segments received" - msgstr "%d segments reçus" - --#: ../statistics.c:126 --#, c-format --msgid "%d segments send out" -+#: ../statistics.c:128 -+#, fuzzy, c-format -+msgid "%u segments send out" - msgstr "%d segments envoyés" - --#: ../statistics.c:127 --#, c-format --msgid "%d segments retransmited" -+#: ../statistics.c:129 -+#, fuzzy, c-format -+msgid "%u segments retransmited" - msgstr "%d segments retransmis" - --#: ../statistics.c:128 --#, c-format --msgid "%d bad segments received." -+#: ../statistics.c:130 -+#, fuzzy, c-format -+msgid "%u bad segments received." - msgstr "%d mauvais segments reçus." - --#: ../statistics.c:129 --#, c-format --msgid "%d resets sent" -+#: ../statistics.c:131 -+#, fuzzy, c-format -+msgid "%u resets sent" - msgstr "%d réinitialisations envoyées" - --#: ../statistics.c:134 --#, c-format --msgid "%d packets received" -+#: ../statistics.c:136 -+#, fuzzy, c-format -+msgid "%u packets received" - msgstr "%d paquets reçus" - --#: ../statistics.c:135 --#, c-format --msgid "%d packets to unknown port received." -+#: ../statistics.c:137 -+#, fuzzy, c-format -+msgid "%u packets to unknown port received." - msgstr "%d paquets reçus pour un port inconnu" - --#: ../statistics.c:136 --#, c-format --msgid "%d packet receive errors" -+#: ../statistics.c:138 -+#, fuzzy, c-format -+msgid "%u packet receive errors" - msgstr "%d erreurs en réception de paquets" - --#: ../statistics.c:137 -+#: ../statistics.c:139 -+#, fuzzy, c-format -+msgid "%u packets sent" -+msgstr "%d paquets envoyés" -+ -+#: ../statistics.c:144 -+#, fuzzy, c-format -+msgid "%u SYN cookies sent" -+msgstr "%d SYN-Cookies reçus" -+ -+#: ../statistics.c:145 -+#, fuzzy, c-format -+msgid "%u SYN cookies received" -+msgstr "%d SYN-Cookies reçus" -+ -+#: ../statistics.c:146 -+#, fuzzy, c-format -+msgid "%u invalid SYN cookies received" -+msgstr "%d SYN-Cookies reçus incorrects" -+ -+#: ../statistics.c:148 -+#, fuzzy, c-format -+msgid "%u resets received for embryonic SYN_RECV sockets" -+msgstr "%d réinitialisations reçues pour sockets SYN_RECV embryonnaires" -+ -+#: ../statistics.c:150 -+#, fuzzy, c-format -+msgid "%u packets pruned from receive queue because of socket buffer overrun" -+msgstr "%d paquets supprimés de la file de réception en raison de tampon de sockets plein" -+ -+#. obsolete: 2.2.0 doesn't do that anymore -+#: ../statistics.c:153 -+#, fuzzy, c-format -+msgid "%u packets pruned from receive queue" -+msgstr "%d paquets supprimés de la file hors service" -+ -+#: ../statistics.c:154 -+#, fuzzy, c-format -+msgid "" -+"%u packets dropped from out-of-order queue because of socket buffer overrun" -+msgstr "%d paquets jetés de la file hors service en raison de tampon de sockets plein" -+ -+#: ../statistics.c:156 -+#, fuzzy, c-format -+msgid "%u ICMP packets dropped because they were out-of-window" -+msgstr "%d ICMP paquets jetés car hors de la fenętre" -+ -+#: ../statistics.c:158 -+#, fuzzy, c-format -+msgid "%u ICMP packets dropped because socket was locked" -+msgstr "%d paquets ICMP jetés car la socket a été vérouillée" -+ -+#: ../statistics.c:160 - #, c-format --msgid "%d packets sent" -+msgid "%u TCP sockets finished time wait in fast timer" -+msgstr "" -+ -+#: ../statistics.c:161 -+#, c-format -+msgid "%u time wait sockets recycled by time stamp" -+msgstr "" -+ -+#: ../statistics.c:162 -+#, c-format -+msgid "%u TCP sockets finished time wait in slow timer" -+msgstr "" -+ -+#: ../statistics.c:163 -+#, c-format -+msgid "%u passive connections rejected because of time stamp" -+msgstr "" -+ -+#: ../statistics.c:165 -+#, c-format -+msgid "%u active connections rejected because of time stamp" -+msgstr "" -+ -+#: ../statistics.c:167 -+#, c-format -+msgid "%u packets rejects in established connections because of timestamp" -+msgstr "" -+ -+#: ../statistics.c:169 -+#, fuzzy, c-format -+msgid "%u delayed acks sent" - msgstr "%d paquets envoyés" - --#: ../statistics.c:142 -+#: ../statistics.c:170 - #, c-format --msgid "%d SYN cookies sent" -+msgid "%u delayed acks further delayed because of locked socket" - msgstr "" - --#: ../statistics.c:143 -+#: ../statistics.c:172 - #, c-format --msgid "%d SYN cookies received" --msgstr "%d SYN-Cookies reçus" -+msgid "Quick ack mode was activated %u times" -+msgstr "" - --#: ../statistics.c:144 -+#: ../statistics.c:173 - #, c-format --msgid "%d invalid SYN cookies received" --msgstr "%d SYN-Cookies reçus incorrects" -+msgid "%u times the listen queue of a socket overflowed" -+msgstr "" - --#: ../statistics.c:146 -+#: ../statistics.c:175 - #, c-format --msgid "%d resets received for embryonic SYN_RECV sockets" --msgstr "%d réinitialisations reçues pour sockets SYN_RECV embryonnaires" -+msgid "%u SYNs to LISTEN sockets ignored" -+msgstr "" - --#: ../statistics.c:148 -+#: ../statistics.c:176 - #, c-format --msgid "%d packets pruned from receive queue because of socket buffer overrun" -+msgid "%u packets directly queued to recvmsg prequeue." - msgstr "" --"%d paquets supprimés de la file de réception en raison de tampon de sockets " --"plein" - --#. obsolete: 2.2.0 doesn't do that anymore --#: ../statistics.c:151 -+#: ../statistics.c:178 -+#, c-format -+msgid "%u of bytes directly received from backlog" -+msgstr "" -+ -+#: ../statistics.c:180 - #, c-format --msgid "%d packets pruned from out-of-order queue" -+msgid "%u of bytes directly received from prequeue" -+msgstr "" -+ -+#: ../statistics.c:182 -+#, fuzzy, c-format -+msgid "%u packets dropped from prequeue" - msgstr "%d paquets supprimés de la file hors service" - --#: ../statistics.c:152 -+#: ../statistics.c:183 -+#, fuzzy, c-format -+msgid "%u packet headers predicted" -+msgstr "%d paquets reçus" -+ -+#: ../statistics.c:184 - #, c-format --msgid "" --"%d packets dropped from out-of-order queue because of socket buffer overrun" -+msgid "%u packets header predicted and directly queued to user" - msgstr "" --"%d paquets jetés de la file hors service en raison de tampon de sockets plein" - --#: ../statistics.c:154 -+#: ../statistics.c:186 - #, c-format --msgid "%d ICMP packets dropped because they were out-of-window" --msgstr "%d ICMP paquets jetés car hors de la fenętre" -+msgid "Ran %u times out of system memory during packet sending" -+msgstr "" - --#: ../statistics.c:156 -+#: ../statistics.c:188 -+#, fuzzy, c-format -+msgid "%u acknowledgments not containing data received" -+msgstr "%d paquets reçus pour un port inconnu" -+ -+#: ../statistics.c:189 - #, c-format --msgid "%d ICMP packets dropped because socket was locked" --msgstr "%d paquets ICMP jetés car la socket a été vérouillée" -+msgid "%u predicted acknowledgments" -+msgstr "" -+ -+#: ../statistics.c:190 -+#, c-format -+msgid "%u times recovered from packet loss due to fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:191 -+#, c-format -+msgid "%u times recovered from packet loss due to SACK data" -+msgstr "" -+ -+#: ../statistics.c:192 -+#, fuzzy, c-format -+msgid "%u bad SACKs received" -+msgstr "%d mauvais segments reçus." -+ -+#: ../statistics.c:193 -+#, c-format -+msgid "Detected reordering %u times using FACK" -+msgstr "" -+ -+#: ../statistics.c:194 -+#, c-format -+msgid "Detected reordering %u times using SACK" -+msgstr "" -+ -+#: ../statistics.c:195 -+#, c-format -+msgid "Detected reordering %u times using time stamp" -+msgstr "" -+ -+#: ../statistics.c:196 -+#, c-format -+msgid "Detected reordering %u times using reno fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:197 -+#, c-format -+msgid "%u congestion windows fully recovered" -+msgstr "" -+ -+#: ../statistics.c:198 -+#, c-format -+msgid "%u congestion windows partially recovered using Hoe heuristic" -+msgstr "" -+ -+#: ../statistics.c:199 -+#, c-format -+msgid "%u congestion window recovered using DSACK" -+msgstr "" -+ -+#: ../statistics.c:200 -+#, c-format -+msgid "%u congestion windows recovered after partial ack" -+msgstr "" -+ -+#: ../statistics.c:201 -+#, fuzzy, c-format -+msgid "%u retransmits lost" -+msgstr "%d réinitialisations envoyées" -+ -+#: ../statistics.c:202 -+#, c-format -+msgid "%u timeouts after reno fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:203 -+#, c-format -+msgid "%u timeouts after SACK recovery" -+msgstr "" -+ -+#: ../statistics.c:204 -+#, c-format -+msgid "%u timeouts in loss state" -+msgstr "" -+ -+#: ../statistics.c:205 -+#, fuzzy, c-format -+msgid "%u fast retransmits" -+msgstr "%d segments retransmis" -+ -+#: ../statistics.c:206 -+#, c-format -+msgid "%u forward retransmits" -+msgstr "" -+ -+#: ../statistics.c:207 -+#, c-format -+msgid "%u retransmits in slow start" -+msgstr "" -+ -+#: ../statistics.c:208 -+#, c-format -+msgid "%u other TCP timeouts" -+msgstr "" -+ -+#: ../statistics.c:209 -+#, fuzzy, c-format -+msgid "%u reno fast retransmits failed" -+msgstr "%d segments retransmis" -+ -+#: ../statistics.c:210 -+#, fuzzy, c-format -+msgid "%u sack retransmits failed" -+msgstr "%d paquets mal réassemblés" -+ -+#: ../statistics.c:211 -+#, c-format -+msgid "%u times receiver scheduled too late for direct processing" -+msgstr "" -+ -+#: ../statistics.c:212 -+#, fuzzy, c-format -+msgid "%u packets collapsed in receive queue due to low socket buffer" -+msgstr "%d paquets supprimés de la file de réception en raison de tampon de sockets plein" -+ -+#: ../statistics.c:213 -+#, c-format -+msgid "%u DSACKs sent for old packets" -+msgstr "" -+ -+#: ../statistics.c:214 -+#, c-format -+msgid "%u DSACKs sent for out of order packets" -+msgstr "" -+ -+#: ../statistics.c:215 -+#, fuzzy, c-format -+msgid "%u DSACKs received" -+msgstr "%d paquets reçus" -+ -+#: ../statistics.c:216 -+#, fuzzy, c-format -+msgid "%u DSACKs for out of order packets received" -+msgstr "%d paquets totaux reçus" -+ -+#: ../statistics.c:217 -+#, fuzzy, c-format -+msgid "%u connections reset due to unexpected SYN" -+msgstr "%d réinitialisations de connexions reçues" -+ -+#: ../statistics.c:218 -+#, fuzzy, c-format -+msgid "%u connections reset due to unexpected data" -+msgstr "%d réinitialisations de connexions reçues" -+ -+#: ../statistics.c:219 -+#, fuzzy, c-format -+msgid "%u connections reset due to early user close" -+msgstr "%d réinitialisations de connexions reçues" -+ -+#: ../statistics.c:220 -+#, c-format -+msgid "%u connections aborted due to memory pressure" -+msgstr "" -+ -+#: ../statistics.c:221 -+#, fuzzy, c-format -+msgid "%u connections aborted due to timeout" -+msgstr "%d réinitialisations de connexions reçues" - - #: ../statistics.c:222 -+#, c-format -+msgid "%u connections aborted after user close in linger timeout" -+msgstr "" -+ -+#: ../statistics.c:223 -+#, c-format -+msgid "%u times unabled to send RST due to no memory" -+msgstr "" -+ -+#: ../statistics.c:224 -+#, c-format -+msgid "TCP ran low on memory %u times" -+msgstr "" -+ -+#: ../statistics.c:225 -+#, c-format -+msgid "%u TCP data loss events" -+msgstr "" -+ -+#: ../statistics.c:292 - msgid "enabled" - msgstr "activée" - --#: ../statistics.c:222 -+#: ../statistics.c:292 - msgid "disabled" - msgstr "désactivée" - --#: ../statistics.c:272 --#, c-format --msgid "unknown title %s\n" --msgstr "titre inconnu %s\n" -- --#: ../statistics.c:298 -+#: ../statistics.c:375 - msgid "error parsing /proc/net/snmp" - msgstr "erreur d'analyse de /proc/net/snmp" - --#: ../statistics.c:311 -+#: ../statistics.c:388 - msgid "cannot open /proc/net/snmp" - msgstr "ne peut ouvrir /proc/net/snmp" - -@@ -1824,89 +2064,95 @@ - msgid "Cannot change line discipline to `%s'.\n" - msgstr "Ne peut changer la discipline de ligne ŕ `%s'.\n" - --#: ../lib/af.c:145 ../lib/hw.c:148 -+#: ../lib/af.c:153 ../lib/hw.c:161 - msgid "UNSPEC" - msgstr "UNSPEC" - --#: ../lib/af.c:147 -+#: ../lib/af.c:155 - msgid "UNIX Domain" - msgstr "Domaine UNIX" - --#: ../lib/af.c:150 -+#: ../lib/af.c:158 - msgid "DARPA Internet" - msgstr "DARPA Internet" - --#: ../lib/af.c:153 -+#: ../lib/af.c:161 - msgid "IPv6" - msgstr "IPv6" - --#: ../lib/af.c:156 ../lib/hw.c:169 -+#: ../lib/af.c:164 ../lib/hw.c:182 - msgid "AMPR AX.25" - msgstr "AMPR AX.25" - --#: ../lib/af.c:159 ../lib/hw.c:175 -+#: ../lib/af.c:167 ../lib/hw.c:188 - msgid "AMPR NET/ROM" - msgstr "AMPR NET/ROM" - --#: ../lib/af.c:162 -+#: ../lib/af.c:170 - msgid "Novell IPX" - msgstr "" - --#: ../lib/af.c:165 -+#: ../lib/af.c:173 - msgid "Appletalk DDP" - msgstr "Appletalk DDP" - --#: ../lib/af.c:168 ../lib/hw.c:207 -+#: ../lib/af.c:176 ../lib/hw.c:223 - msgid "Econet" - msgstr "Econet" - --#: ../lib/af.c:171 ../lib/hw.c:172 -+#: ../lib/af.c:179 -+msgid "CCITT X.25" -+msgstr "" -+ -+#: ../lib/af.c:182 ../lib/hw.c:185 - msgid "AMPR ROSE" - msgstr "AMPR ROSE" - --#: ../lib/af.c:174 ../lib/hw.c:160 -+#: ../lib/af.c:185 ../lib/hw.c:173 - msgid "Ash" - msgstr "Ash" - --#: ../lib/af.c:232 -+#: ../lib/af.c:243 -+#, c-format - msgid "Please don't supply more than one address family.\n" - msgstr "Ne fournissez pas plus d'une famille d'adresses SVP.\n" - --#: ../lib/af.c:293 -+#: ../lib/af.c:304 -+#, c-format - msgid "Too much address family arguments.\n" - msgstr "Trop d'arguments de familles d'adresses.\n" - --#: ../lib/af.c:304 -+#: ../lib/af.c:315 - #, c-format - msgid "Unknown address family `%s'.\n" - msgstr "Famille d'adresses inconnue `%s'.\n" - --#: ../lib/arcnet.c:53 ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 --#: ../lib/fddi.c:67 ../lib/hippi.c:68 ../lib/inet.c:244 ../lib/inet.c:259 --#: ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 ../lib/rose.c:71 --#: ../lib/rose.c:126 ../lib/unix.c:56 ../lib/unix.c:76 --msgid "[NONE SET]" --msgstr "[INDEFINI]" -- --#: ../lib/arcnet.c:81 ../lib/arcnet.c:96 -+#: ../lib/arcnet.c:70 ../lib/arcnet.c:85 - #, c-format - msgid "in_arcnet(%s): invalid arcnet address!\n" - msgstr "in_arcnet(%s): adresse arcnet invalide !\n" - --#: ../lib/arcnet.c:108 -+#: ../lib/arcnet.c:97 - #, c-format - msgid "in_arcnet(%s): trailing : ignored!\n" - msgstr "in_arcnet(%s): restant : ignoré !\n" - --#: ../lib/arcnet.c:120 -+#: ../lib/arcnet.c:109 - #, c-format - msgid "in_arcnet(%s): trailing junk!\n" - msgstr "in_arcnet(%s): le restant ŕ la poubelle !\n" - - #: ../lib/ash.c:81 -+#, c-format - msgid "Malformed Ash address" - msgstr "Adresse Ash malformée" - -+#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244 -+#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 -+#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76 -+msgid "[NONE SET]" -+msgstr "[INDEFINI]" -+ - #: ../lib/ax25.c:97 ../lib/netrom.c:100 - msgid "Invalid callsign" - msgstr "Signal d'appel invalide" -@@ -1916,22 +2162,21 @@ - msgstr "Signal d'appel trop long" - - #: ../lib/ax25_gr.c:47 -+#, c-format - msgid "AX.25 not configured in this system.\n" - msgstr "AX.25 pas configuré sur ce systčme.\n" - - #: ../lib/ax25_gr.c:50 -+#, c-format - msgid "Kernel AX.25 routing table\n" - msgstr "Table de routage AX.25 du noyau\n" - - #. xxx - #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55 -+#, c-format - msgid "Destination Iface Use\n" - msgstr "Destination Iface Utilisation\n" - --#: ../lib/ddp_gr.c:21 --msgid "Routing table for `ddp' not yet supported.\n" --msgstr "Table de routage pour `ddp' pas encore supporté.\n" -- - #: ../lib/ether.c:74 ../lib/ether.c:91 - #, c-format - msgid "in_ether(%s): invalid ether address!\n" -@@ -1947,153 +2192,171 @@ - msgid "in_ether(%s): trailing junk!\n" - msgstr "in_ether(%s): le restant ŕ la poubelle !\n" - --#: ../lib/fddi.c:95 ../lib/fddi.c:110 -+#: ../lib/fddi.c:84 ../lib/fddi.c:99 - #, c-format - msgid "in_fddi(%s): invalid fddi address!\n" - msgstr "in_fddi(%s): adresse fddi invalide!\n" - --#: ../lib/fddi.c:122 -+#: ../lib/fddi.c:111 - #, c-format - msgid "in_fddi(%s): trailing : ignored!\n" - msgstr "in_fddi(%s): restant ignoré !\n" - --#: ../lib/fddi.c:134 -+#: ../lib/fddi.c:123 - #, c-format - msgid "in_fddi(%s): trailing junk!\n" - msgstr "in_fddi(%s): le restant ŕ la poubelle !\n" - --#: ../lib/getroute.c:97 ../lib/setroute.c:76 -+#: ../lib/getroute.c:101 ../lib/setroute.c:80 - #, c-format - msgid "Address family `%s' not supported.\n" - msgstr "Famille d'adresses `%s' non supportée.\n" - --#: ../lib/getroute.c:103 ../lib/setroute.c:80 -+#: ../lib/getroute.c:107 ../lib/setroute.c:84 - #, c-format - msgid "No routing for address family `%s'.\n" - msgstr "Pas de routage pour la famille d'adresses `%s'.\n" - --#: ../lib/hippi.c:96 ../lib/hippi.c:111 -+#: ../lib/hippi.c:84 ../lib/hippi.c:99 - #, c-format - msgid "in_hippi(%s): invalid hippi address!\n" - msgstr "in_hippi(%s): adresse hippi invalide!\n" - --#: ../lib/hippi.c:123 -+#: ../lib/hippi.c:111 - #, c-format - msgid "in_hippi(%s): trailing : ignored!\n" - msgstr "in_hippi(%s): restant ignoré !\n" - --#: ../lib/hippi.c:134 -+#: ../lib/hippi.c:122 - #, c-format - msgid "in_hippi(%s): trailing junk!\n" - msgstr "in_hippi(%s): le restant ŕ la poubelle !\n" - --#: ../lib/hw.c:147 -+#: ../lib/hw.c:160 - msgid "Local Loopback" - msgstr "Boucle locale" - --#: ../lib/hw.c:150 -+#: ../lib/hw.c:163 - msgid "Serial Line IP" - msgstr "IP ligne série" - --#: ../lib/hw.c:151 -+#: ../lib/hw.c:164 - msgid "VJ Serial Line IP" - msgstr "IP ligne série - VJ " - --#: ../lib/hw.c:152 -+#: ../lib/hw.c:165 - msgid "6-bit Serial Line IP" - msgstr "IP ligne série - 6 bits" - --#: ../lib/hw.c:153 -+#: ../lib/hw.c:166 - msgid "VJ 6-bit Serial Line IP" - msgstr "IP ligne série - 6 bits VJ" - --#: ../lib/hw.c:154 -+#: ../lib/hw.c:167 - msgid "Adaptive Serial Line IP" - msgstr "IP ligne série adaptative" - --#: ../lib/hw.c:157 -+#: ../lib/hw.c:170 - msgid "Ethernet" - msgstr "Ethernet" - --#: ../lib/hw.c:163 -+#: ../lib/hw.c:176 - msgid "Fiber Distributed Data Interface" - msgstr "Fiber Distributed Data Interface" - --#: ../lib/hw.c:166 -+#: ../lib/hw.c:179 - msgid "HIPPI" - msgstr "HIPPI" - --#: ../lib/hw.c:178 -+#: ../lib/hw.c:191 -+msgid "generic X.25" -+msgstr "" -+ -+#: ../lib/hw.c:194 - msgid "IPIP Tunnel" - msgstr "IPIP Tunnel" - --#: ../lib/hw.c:181 -+#: ../lib/hw.c:197 - msgid "Point-to-Point Protocol" - msgstr "Protocole Point-ŕ-Point" - --#: ../lib/hw.c:184 -+#: ../lib/hw.c:200 - msgid "(Cisco)-HDLC" - msgstr "(Cisco)-HDLC" - --#: ../lib/hw.c:185 -+#: ../lib/hw.c:201 - msgid "LAPB" - msgstr "LAPB" - --#: ../lib/hw.c:188 -+#: ../lib/hw.c:204 - msgid "ARCnet" - msgstr "ARCnet" - --#: ../lib/hw.c:191 -+#: ../lib/hw.c:207 - msgid "Frame Relay DLCI" - msgstr "Frame Relay DLCI" - --#: ../lib/hw.c:192 -+#: ../lib/hw.c:208 - msgid "Frame Relay Access Device" - msgstr "Périphériue d'accčs Frame Relay" - --#: ../lib/hw.c:195 -+#: ../lib/hw.c:211 - msgid "IPv6-in-IPv4" - msgstr "IPv6-dans-IPv4" - --#: ../lib/hw.c:198 -+#: ../lib/hw.c:214 - #, fuzzy - msgid "IrLAP" - msgstr "LAPB" - --#: ../lib/hw.c:201 -+#: ../lib/hw.c:217 - msgid "16/4 Mbps Token Ring" - msgstr "" - --#: ../lib/hw.c:203 -+#: ../lib/hw.c:219 - msgid "16/4 Mbps Token Ring (New)" - msgstr "" - -+#: ../lib/hw.c:226 -+msgid "Generic EUI-64" -+msgstr "" -+ - #: ../lib/inet.c:153 ../lib/inet6.c:79 - #, c-format - msgid "rresolve: unsupport address family %d !\n" - msgstr "rresolve: famille d'adresses non suportée %d !\n" - --#: ../lib/inet6_gr.c:79 -+#: ../lib/inet6.c:131 -+#, fuzzy -+msgid "[UNKNOWN]" -+msgstr "INCONNU" -+ -+#: ../lib/inet6_gr.c:71 -+#, c-format - msgid "INET6 (IPv6) not configured in this system.\n" - msgstr "INET6 (IPv6) pas configuré sur ce systčme.\n" - --#: ../lib/inet6_gr.c:82 -+#: ../lib/inet6_gr.c:74 -+#, c-format - msgid "Kernel IPv6 routing table\n" - msgstr "Table de routage IPv6 du noyau\n" - --#: ../lib/inet6_gr.c:84 -+#: ../lib/inet6_gr.c:76 -+#, c-format - msgid "" --"Destination Next Hop " --" Flags Metric Ref Use Iface\n" -+"Destination Next " -+"Hop Flags Metric Ref Use Iface\n" - msgstr "" --"Destination Prochain Hop " --" Indic Metric Ref Utilis. Iface\n" -+"Destination Prochain " -+"Hop Indic Metric Ref Utilis. Iface\n" - --#: ../lib/inet6_gr.c:158 -+#: ../lib/inet6_gr.c:150 -+#, c-format - msgid "Kernel IPv6 Neighbour Cache\n" - msgstr "Cache voisin IPv6 du noyau\n" - --#: ../lib/inet6_gr.c:161 -+#: ../lib/inet6_gr.c:153 -+#, c-format - msgid "" - "Neighbour HW Address Iface Flags " - "Ref State\n" -@@ -2101,39 +2364,45 @@ - "Voisin Adresse MAT Iface Indic " - "Ref Etat\n" - --#: ../lib/inet6_gr.c:165 -+#: ../lib/inet6_gr.c:157 -+#, c-format - msgid "" - "Neighbour HW Address Iface Flags " - "Ref State Stale(sec) Delete(sec)\n" --msgstr "" --"Voisin Adresse MAT Iface Indic " --"Ref Etat Bloqué(sec) Détuit(sec)\n" -+msgstr "Voisin Adresse MAT Iface Indic Ref Etat Bloqué(sec) Détuit(sec)\n" - - #: ../lib/inet6_sr.c:46 -+#, c-format - msgid "Usage: inet6_route [-vF] del Target\n" - msgstr "Syntaxe: inet6_route [-vF] del Cible\n" - - #: ../lib/inet6_sr.c:47 -+#, c-format - msgid " inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n" - msgstr " inet6_route [-vF] add Cible [gw Gw] [metric M] [[dev] If]\n" - - #: ../lib/inet6_sr.c:48 -+#, c-format - msgid " inet6_route [-FC] flush NOT supported\n" - msgstr " inet6_route [-FC] flush PAS supporté\n" - --#: ../lib/inet6_sr.c:182 -+#: ../lib/inet6_sr.c:188 -+#, c-format - msgid "Flushing `inet6' routing table not supported\n" - msgstr "Flush de table de routage `inet6' pas supporté\n" - - #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220 -+#, c-format - msgid "INET (IPv4) not configured in this system.\n" - msgstr "INET (IPv4) pas configuré sur ce systčme.\n" - - #: ../lib/inet_gr.c:53 -+#, c-format - msgid "Kernel IP routing table\n" - msgstr "Table de routage IP du noyau\n" - - #: ../lib/inet_gr.c:56 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags Metric Ref Use " - "Iface\n" -@@ -2142,26 +2411,26 @@ - "Iface\n" - - #: ../lib/inet_gr.c:59 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags MSS Window irtt " - "Iface\n" --msgstr "" --"Destination Passerelle Genmask Indic MSS Fenętre irtt " --"Iface\n" -+msgstr "Destination Passerelle Genmask Indic MSS Fenętre irtt Iface\n" - - #: ../lib/inet_gr.c:62 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags Metric Ref Use " - "Iface MSS Window irtt\n" --msgstr "" --"Destination Passerelle Genmask Indic Metric Ref Use " --"Iface MSS Fenętre irtt\n" -+msgstr "Destination Passerelle Genmask Indic Metric Ref Use Iface MSS Fenętre irtt\n" - - #: ../lib/inet_gr.c:237 -+#, c-format - msgid "Kernel IP routing cache\n" - msgstr "cache de routage IP du noyau\n" - - #: ../lib/inet_gr.c:258 -+#, c-format - msgid "" - "Source Destination Gateway Flags Metric Ref Use " - "Iface\n" -@@ -2170,30 +2439,28 @@ - "Iface\n" - - #: ../lib/inet_gr.c:261 -+#, c-format - msgid "" - "Source Destination Gateway Flags MSS Window irtt " - "Iface\n" --msgstr "" --"Source Destination Passerelle Indic MSS Fenętre irtt " --"Iface\n" -+msgstr "Source Destination Passerelle Indic MSS Fenętre irtt Iface\n" - - #: ../lib/inet_gr.c:266 -+#, c-format - msgid "" - "Source Destination Gateway Flags Metric Ref Use " - "Iface MSS Window irtt HH Arp\n" --msgstr "" --"Source Destination Passerelle Indic Metric Ref Use " --"Iface MSS Fenętre irtt HH Arp\n" -+msgstr "Source Destination Passerelle Indic Metric Ref Use Iface MSS Fenętre irtt HH Arp\n" - - #: ../lib/inet_gr.c:290 -+#, c-format - msgid "" - "Source Destination Gateway Flags Metric Ref Use " - "Iface MSS Window irtt TOS HHRef HHUptod SpecDst\n" --msgstr "" --"Source Destination Passerelle Flags Metric Ref Use " --"Iface MSS Fenętre irtt TOS HHRef HHUptod SpecDst\n" -+msgstr "Source Destination Passerelle Flags Metric Ref Use Iface MSS Fenętre irtt TOS HHRef HHUptod SpecDst\n" - --#: ../lib/inet_sr.c:50 -+#: ../lib/inet_sr.c:51 -+#, c-format - msgid "" - "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] " - "[[dev] If]\n" -@@ -2201,29 +2468,34 @@ - "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 @@ - msgstr "route: %s: ne peut utiliser un RESEAU comme passerelle!\n" - - #: ../lib/inet_sr.c:174 --#, fuzzy -+#, fuzzy, c-format - msgid "route: Invalid MSS/MTU.\n" - msgstr "route: MSS invalide.\n" - - #: ../lib/inet_sr.c:187 -+#, c-format - msgid "route: Invalid window.\n" - msgstr "route: fenętre invalide.\n" - - #: ../lib/inet_sr.c:203 -+#, c-format - msgid "route: Invalid initial rtt.\n" - msgstr "route: rtt initial invalide.\n" - -@@ -2256,75 +2530,92 @@ - msgstr "route: netmask bogué %s\n" - - #: ../lib/inet_sr.c:270 -+#, c-format - msgid "route: netmask doesn't match route address\n" - msgstr "route: netmask ne correspond pas ŕ l'adresse de route\n" - - #: ../lib/inet_sr.c:306 -+#, c-format - msgid "Flushing `inet' routing table not supported\n" - msgstr "Flush de table de routage `inet' pas supporté\n" - - #: ../lib/inet_sr.c:310 -+#, c-format - msgid "Modifying `inet' routing cache not supported\n" - msgstr "Modification de cache de routage `inet' pas supporté\n" - - #: ../lib/ipx_gr.c:52 -+#, c-format - msgid "IPX not configured in this system.\n" - msgstr "IPX pas configuré sur ce systčme.\n" - - #: ../lib/ipx_gr.c:56 -+#, c-format - msgid "Kernel IPX routing table\n" - msgstr "Table de routage IPX du noyau\n" - - #. xxx - #: ../lib/ipx_gr.c:57 -+#, c-format - msgid "Destination Router Net Router Node\n" - msgstr "Destination Réseau Routeur Noeud Routeur\n" - - #: ../lib/ipx_sr.c:33 -+#, c-format - msgid "IPX: this needs to be written\n" - msgstr "IPX: ceci doit ętre écrit\n" - --#: ../lib/masq_info.c:197 -+#: ../lib/masq_info.c:198 -+#, c-format - msgid "IP masquerading entries\n" - msgstr "Entrées IP Masquerade\n" - --#: ../lib/masq_info.c:200 -+#: ../lib/masq_info.c:201 -+#, c-format - msgid "prot expire source destination ports\n" - msgstr "prot expire source destination ports\n" - --#: ../lib/masq_info.c:203 -+#: ../lib/masq_info.c:204 -+#, c-format - msgid "" --"prot expire initseq delta prevd source destination " --" ports\n" -+"prot expire initseq delta prevd source " -+"destination ports\n" - msgstr "" --"prot expire initseq delta precd source destination " --" ports\n" -+"prot expire initseq delta precd source " -+"destination ports\n" - - #: ../lib/netrom_gr.c:48 -+#, c-format - msgid "NET/ROM not configured in this system.\n" - msgstr "NET/ROM pas configuré sur ce systčme.\n" - - #: ../lib/netrom_gr.c:51 -+#, c-format - msgid "Kernel NET/ROM routing table\n" - msgstr "Table de routage NET/ROM du noyau\n" - - #: ../lib/netrom_gr.c:52 -+#, c-format - msgid "Destination Mnemonic Quality Neighbour Iface\n" - msgstr "Destination Mnemoniq Qualité Voisin Iface\n" - - #: ../lib/netrom_sr.c:34 -+#, c-format - msgid "netrom usage\n" - msgstr "utilisation netrom\n" - - #: ../lib/netrom_sr.c:44 -+#, c-format - msgid "NET/ROM: this needs to be written\n" - msgstr "NET/ROM: ceci doit ętre écrit\n" - - #: ../lib/ppp.c:44 -+#, c-format - msgid "You cannot start PPP with this program.\n" - msgstr "Vous ne pouvez démarrer PPP avec ce programme.\n" - - #: ../lib/ppp_ac.c:38 -+#, c-format - msgid "Sorry, use pppd!\n" - msgstr "Désolé, utilisez pppd !\n" - -@@ -2333,49 +2624,314 @@ - msgstr "L'adresse de noeud doit avoir 10 chiffres" - - #: ../lib/rose_gr.c:51 -+#, c-format - msgid "ROSE not configured in this system.\n" - msgstr "ROSE pas configuré sur ce systčme.\n" - - #: ../lib/rose_gr.c:54 -+#, c-format - msgid "Kernel ROSE routing table\n" - msgstr "Table de routage ROSE du noyau\n" - --#: ../lib/tr.c:70 ../lib/tr.c:85 -+#: ../lib/tr.c:86 ../lib/tr.c:101 - #, c-format - msgid "in_tr(%s): invalid token ring address!\n" - msgstr "in_tr(%s): adresse token-ring invalide !\n" - --#: ../lib/tr.c:97 -+#: ../lib/tr.c:113 - #, c-format - msgid "in_tr(%s): trailing : ignored!\n" - msgstr "in_tr(%s): restant : ignoré !\n" - --#: ../lib/tr.c:109 -+#: ../lib/tr.c:125 - #, c-format - msgid "in_tr(%s): trailing junk!\n" - msgstr "in_tr(%s): restant ŕ la poubelle !\n" - --#: ../lib/interface.c:124 -+#: ../lib/interface.c:176 - #, c-format - msgid "warning: no inet socket available: %s\n" - msgstr "attention: pas de socket inet disponible: %s\n" - --#: ../lib/interface.c:270 -+#: ../lib/interface.c:325 - #, c-format - msgid "Warning: cannot open %s (%s). Limited output.\n" - msgstr "" - - #. Give better error message for this case. --#: ../lib/interface.c:504 -+#: ../lib/interface.c:571 - msgid "Device not found" - msgstr "Périphérique non trouvé" - --#: ../lib/interface.c:508 -+#: ../lib/interface.c:575 - #, c-format - msgid "%s: error fetching interface information: %s\n" - msgstr "%s: erreur lors de la recherche d'infos sur l'interface: %s\n" - --#: ../lib/sockets.c:59 -+#: ../lib/interface.c:608 -+msgid " - no statistics available -" -+msgstr "" -+ -+#: ../lib/interface.c:612 -+#, c-format -+msgid "[NO FLAGS]" -+msgstr "[PAS INDICATEURS]" -+ -+#: ../lib/interface.c:688 -+#, c-format -+msgid "%-9.9s Link encap:%s " -+msgstr "%-9.9s Lien encap:%s " -+ -+#: ../lib/interface.c:693 -+#, c-format -+msgid "HWaddr %s " -+msgstr "HWaddr %s " -+ -+#: ../lib/interface.c:696 -+#, c-format -+msgid "Media:%s" -+msgstr "Media:%s" -+ -+#: ../lib/interface.c:698 -+#, c-format -+msgid "(auto)" -+msgstr "(auto)" -+ -+#: ../lib/interface.c:705 -+#, c-format -+msgid " %s addr:%s " -+msgstr " %s adr:%s " -+ -+#: ../lib/interface.c:708 -+#, c-format -+msgid " P-t-P:%s " -+msgstr " P-t-P:%s " -+ -+#: ../lib/interface.c:711 -+#, c-format -+msgid " Bcast:%s " -+msgstr " Bcast:%s " -+ -+#: ../lib/interface.c:713 -+#, c-format -+msgid " Mask:%s\n" -+msgstr " Masque:%s\n" -+ -+#: ../lib/interface.c:730 -+#, c-format -+msgid " inet6 addr: %s/%d" -+msgstr " adr inet6: %s/%d" -+ -+#: ../lib/interface.c:732 -+#, c-format -+msgid " Scope:" -+msgstr " Scope:" -+ -+#: ../lib/interface.c:735 -+#, c-format -+msgid "Global" -+msgstr "Global" -+ -+#: ../lib/interface.c:738 -+#, c-format -+msgid "Link" -+msgstr "Lien" -+ -+#: ../lib/interface.c:741 -+#, c-format -+msgid "Site" -+msgstr "Site" -+ -+#: ../lib/interface.c:744 -+#, c-format -+msgid "Compat" -+msgstr "Compat" -+ -+#: ../lib/interface.c:747 -+#, c-format -+msgid "Host" -+msgstr "Hôte" -+ -+#: ../lib/interface.c:750 -+#, c-format -+msgid "Unknown" -+msgstr "Inconnu" -+ -+#: ../lib/interface.c:765 -+#, c-format -+msgid " IPX/Ethernet II addr:%s\n" -+msgstr " adr IPX/Ethernet II:%s\n" -+ -+#: ../lib/interface.c:768 -+#, c-format -+msgid " IPX/Ethernet SNAP addr:%s\n" -+msgstr " adr IPX/Ethernet SNAP:%s\n" -+ -+#: ../lib/interface.c:771 -+#, c-format -+msgid " IPX/Ethernet 802.2 addr:%s\n" -+msgstr " adr IPX/Ethernet 802.2:%s\n" -+ -+#: ../lib/interface.c:774 -+#, c-format -+msgid " IPX/Ethernet 802.3 addr:%s\n" -+msgstr " adr IPX/Ethernet 802.3:%s\n" -+ -+#: ../lib/interface.c:784 -+#, c-format -+msgid " EtherTalk Phase 2 addr:%s\n" -+msgstr " adr EtherTalk Phase 2:%s\n" -+ -+#: ../lib/interface.c:793 -+#, c-format -+msgid " econet addr:%s\n" -+msgstr " adr econet:%s\n" -+ -+#: ../lib/interface.c:800 -+#, c-format -+msgid "[NO FLAGS] " -+msgstr "[PAS INDICATEURS] " -+ -+#: ../lib/interface.c:802 -+#, c-format -+msgid "UP " -+msgstr "UP " -+ -+#: ../lib/interface.c:804 -+#, c-format -+msgid "BROADCAST " -+msgstr "BROADCAST " -+ -+#: ../lib/interface.c:806 -+#, c-format -+msgid "DEBUG " -+msgstr "DEBUG " -+ -+#: ../lib/interface.c:808 -+#, c-format -+msgid "LOOPBACK " -+msgstr "LOOPBACK " -+ -+#: ../lib/interface.c:810 -+#, c-format -+msgid "POINTOPOINT " -+msgstr "POINTOPOINT " -+ -+#: ../lib/interface.c:812 -+#, c-format -+msgid "NOTRAILERS " -+msgstr "NOTRAILERS " -+ -+#: ../lib/interface.c:814 -+#, c-format -+msgid "RUNNING " -+msgstr "RUNNING " -+ -+#: ../lib/interface.c:816 -+#, c-format -+msgid "NOARP " -+msgstr "NOARP " -+ -+#: ../lib/interface.c:818 -+#, c-format -+msgid "PROMISC " -+msgstr "PROMISC " -+ -+#: ../lib/interface.c:820 -+#, c-format -+msgid "ALLMULTI " -+msgstr "ALLMULTI " -+ -+#: ../lib/interface.c:822 -+#, c-format -+msgid "SLAVE " -+msgstr "SLAVE " -+ -+#: ../lib/interface.c:824 -+#, c-format -+msgid "MASTER " -+msgstr "MASTER " -+ -+#: ../lib/interface.c:826 -+#, c-format -+msgid "MULTICAST " -+msgstr "MULTICAST " -+ -+#: ../lib/interface.c:829 -+#, c-format -+msgid "DYNAMIC " -+msgstr "DYNAMIC " -+ -+#. DONT FORGET TO ADD THE FLAGS IN ife_print_short -+#: ../lib/interface.c:832 -+#, c-format -+msgid " MTU:%d Metric:%d" -+msgstr " MTU:%d Metric:%d" -+ -+#: ../lib/interface.c:836 -+#, c-format -+msgid " Outfill:%d Keepalive:%d" -+msgstr " Outfill:%d Keepalive:%d" -+ -+#: ../lib/interface.c:850 -+#, fuzzy, c-format -+msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" -+msgstr "Paquets Reçus:%lu erreurs:%lu jetés:%lu débordements:%lu trames:%lu\n" -+ -+#: ../lib/interface.c:855 -+#, c-format -+msgid " compressed:%lu\n" -+msgstr " compressés:%lu\n" -+ -+#: ../lib/interface.c:895 -+#, fuzzy, c-format -+msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" -+msgstr "Paquets transmis:%lu erreurs:%lu jetés:%lu débordements:%lu carrier:%lu\n" -+ -+#: ../lib/interface.c:899 -+#, c-format -+msgid " collisions:%lu " -+msgstr " collisions:%lu " -+ -+#: ../lib/interface.c:901 -+#, c-format -+msgid "compressed:%lu " -+msgstr "compressés:%lu " -+ -+#: ../lib/interface.c:903 -+#, c-format -+msgid "txqueuelen:%d " -+msgstr "lg file transmission:%d " -+ -+#: ../lib/interface.c:905 -+#, c-format -+msgid "RX bytes:%llu (%lu.%lu %s) TX bytes:%llu (%lu.%lu %s)\n" -+msgstr "" -+ -+#: ../lib/interface.c:916 -+#, c-format -+msgid "Interrupt:%d " -+msgstr "Interruption:%d " -+ -+#. Only print devices using it for -+#. I/O maps -+#: ../lib/interface.c:919 -+#, c-format -+msgid "Base address:0x%x " -+msgstr "Adresse de base:0x%x " -+ -+#: ../lib/interface.c:921 -+#, c-format -+msgid "Memory:%lx-%lx " -+msgstr "Mémoire:%lx-%lx " -+ -+#: ../lib/interface.c:924 -+#, c-format -+msgid "DMA chan:%x " -+msgstr "Canal DMA:%x " -+ -+#: ../lib/sockets.c:63 -+#, c-format - msgid "No usable address families found.\n" - msgstr "Pas de famille d'adresses utilisable trouvée.\n" - -@@ -2399,29 +2955,32 @@ - msgid "ip: argument is wrong: %s\n" - msgstr "ip: argument incorrect: %s\n" - --#: ../ipmaddr.c:56 -+#: ../ipmaddr.c:61 -+#, c-format - msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n" - msgstr "Syntaxe: ipmaddr [ add | del ] MULTIADR dev CHAINE\n" - --#: ../ipmaddr.c:57 -+#: ../ipmaddr.c:62 -+#, c-format - msgid " ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n" - msgstr " ipmaddr show [ dev CHAINE ] [ ipv4 | ipv6 | link | all ]\n" - --#: ../ipmaddr.c:58 -+#: ../ipmaddr.c:63 -+#, c-format - msgid " ipmaddr -V | -version\n" - msgstr "" - --#: ../ipmaddr.c:258 -+#: ../ipmaddr.c:263 - #, c-format - msgid "family %d " - msgstr "" - --#: ../ipmaddr.c:267 -+#: ../ipmaddr.c:272 - #, c-format - msgid " users %d" - msgstr "" - --#: ../ipmaddr.c:353 -+#: ../ipmaddr.c:358 - msgid "Cannot create socket" - msgstr "Ne peut créer une socket" - -@@ -2436,6 +2995,7 @@ - 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 @@ - msgid "slattach: tty_hangup(RAISE): %s\n" - msgstr "slattach: tty_hangup(RAISE): %s\n" - --#: ../slattach.c:486 -+#: ../slattach.c:468 -+#, fuzzy, c-format -+msgid "slattach: tty name too long\n" -+msgstr "%s: nom trop long\n" -+ -+#: ../slattach.c:498 -+#, c-format - msgid "slattach: tty_open: cannot get current state!\n" - msgstr "slattach: tty_open: ne peut obtenir l'état courant !\n" - --#: ../slattach.c:493 -+#: ../slattach.c:505 -+#, c-format - msgid "slattach: tty_open: cannot get current line disc!\n" - msgstr "" - "slattach: tty_open: ne peut obtenir la discipline de ligne actuelle !\n" - --#: ../slattach.c:501 -+#: ../slattach.c:513 -+#, c-format - msgid "slattach: tty_open: cannot set RAW mode!\n" - msgstr "slattach: tty_open: ne peut activer le mode RAW !\n" - --#: ../slattach.c:508 -+#: ../slattach.c:520 - #, c-format - msgid "slattach: tty_open: cannot set %s bps!\n" - msgstr "slattach: tty_open: ne peut passer ŕ %s bps!\n" - --#: ../slattach.c:518 -+#: ../slattach.c:530 -+#, c-format - msgid "slattach: tty_open: cannot set 8N1 mode!\n" - msgstr "slattach: tty_open: ne peut activer le mode 8N1 !\n" - --#: ../slattach.c:686 -+#: ../slattach.c:672 -+#, c-format -+msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n" -+msgstr "" -+ -+#: ../slattach.c:704 - #, c-format - msgid "%s started" - msgstr "" - --#: ../slattach.c:687 -+#: ../slattach.c:705 - #, c-format - msgid " on %s" - msgstr "" - --#: ../slattach.c:688 -+#: ../slattach.c:706 - #, fuzzy, c-format - msgid " interface %s\n" - msgstr "%s: interface inconnue: %s\n" - - #~ msgid "" --#~ " This comand can get or set the hostname or the NIS domainname. You can\n" --#~ msgstr "" --#~ " Cette commande ne peut obtenir ou définir le nom d'hôte ou le domaine " --#~ "NIS. Vous pouvez\n" -+#~ " arp [-v] [<HW>] [-i <if>] -s <hostname> <hwaddr> [netmask <nm>] pub " -+#~ "<-''-\n" -+#~ msgstr " arp [-v] [<MAT>] [-i <if>] -s <hôte> <adrmat> [netmask <nm>] pub <-''-\n" -+ -+#~ msgid "%s: unknown interface: %s\n" -+#~ msgstr "%s: interface inconnue: %s\n" -+ -+#~ msgid "address mask replies" -+#~ msgstr "réponses de masque d'adresses" -+ -+#~ msgid "unknown title %s\n" -+#~ msgstr "titre inconnu %s\n" -+ -+#~ msgid "Routing table for `ddp' not yet supported.\n" -+#~ msgstr "Table de routage pour `ddp' pas encore supporté.\n" -+ -+#~ msgid "" -+#~ " This comand can get or set the hostname or the NIS domainname. You " -+#~ "can\n" -+#~ msgstr " Cette commande ne peut obtenir ou définir le nom d'hôte ou le domaine NIS. Vous pouvez\n" - - #~ msgid "" - #~ " also get the DNS domain or the FQDN (fully qualified domain name).\n" - #~ msgstr "" --#~ " aussi obtenir le domaine DNS ou le FQDN (fully qualified domain name).\n" -+#~ " aussi obtenir le domaine DNS ou le FQDN (fully qualified domain " -+#~ "name).\n" - - #~ msgid "" - #~ " Unless you are using bind or NIS for host lookups you can change the\n" --#~ msgstr "" --#~ " Sauf si vous utilisez bind ou NIS pour les recherches d'hôtes, vous " --#~ "pouvez changer le\n" -+#~ msgstr " Sauf si vous utilisez bind ou NIS pour les recherches d'hôtes, vous pouvez changer le\n" - - #~ msgid "" - #~ " FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n" ---- net-tools-1.60.orig/po/net-tools.pot -+++ net-tools-1.60/po/net-tools.pot -@@ -1,253 +1,275 @@ - # SOME DESCRIPTIVE TITLE. --# Copyright (C) YEAR Free Software Foundation, Inc. -+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -+# This file is distributed under the same license as the PACKAGE package. - # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. - # - #, fuzzy - msgid "" - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" --"POT-Creation-Date: 2001-04-15 15:40+0100\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2007-06-30 12:28+0900\n" - "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" - "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" - "Language-Team: LANGUAGE <LL@li.org>\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=CHARSET\n" --"Content-Transfer-Encoding: ENCODING\n" -+"Content-Transfer-Encoding: 8bit\n" - --#: ../arp.c:111 ../arp.c:270 -+#: ../arp.c:112 ../arp.c:279 -+#, c-format - msgid "arp: need host name\n" - msgstr "" - --#: ../arp.c:208 ../arp.c:222 -+#: ../arp.c:215 ../arp.c:230 - #, c-format - msgid "No ARP entry for %s\n" - msgstr "" - --#: ../arp.c:240 -+#: ../arp.c:248 - #, c-format - msgid "arp: cant get HW-Address for `%s': %s.\n" - msgstr "" - --#: ../arp.c:244 -+#: ../arp.c:252 -+#, c-format - msgid "arp: protocol type mismatch.\n" - msgstr "" - --#: ../arp.c:253 -+#: ../arp.c:261 - #, c-format - msgid "arp: device `%s' has HW address %s `%s'.\n" - msgstr "" - --#: ../arp.c:283 -+#: ../arp.c:293 -+#, c-format - msgid "arp: need hardware address\n" - msgstr "" - --#: ../arp.c:291 -+#: ../arp.c:301 -+#, c-format - msgid "arp: invalid hardware address\n" - msgstr "" - --#: ../arp.c:388 -+#: ../arp.c:398 - #, c-format - msgid "arp: cannot open etherfile %s !\n" - msgstr "" - --#: ../arp.c:404 -+#: ../arp.c:414 - #, c-format - msgid "arp: format error on line %u of etherfile %s !\n" - msgstr "" - --#: ../arp.c:417 -+#: ../arp.c:427 - #, c-format - msgid "arp: cannot set entry on line %u of etherfile %s !\n" - msgstr "" - --#: ../arp.c:438 -+#: ../arp.c:448 -+#, c-format - msgid "" - "Address HWtype HWaddress Flags Mask " - "Iface\n" - msgstr "" - --#: ../arp.c:468 -+#: ../arp.c:476 -+msgid "<from_interface>" -+msgstr "" -+ -+#: ../arp.c:478 - msgid "(incomplete)" - msgstr "" - --#: ../arp.c:485 -+#: ../arp.c:495 - #, c-format - msgid "%s (%s) at " - msgstr "" - --#: ../arp.c:491 -+#: ../arp.c:501 -+#, c-format - msgid "<incomplete> " - msgstr "" - --#: ../arp.c:497 -+#: ../arp.c:507 - #, c-format - msgid "netmask %s " - msgstr "" - --#: ../arp.c:514 -+#: ../arp.c:524 - #, c-format - msgid "on %s\n" - msgstr "" - --#: ../arp.c:593 -+#: ../arp.c:605 - #, c-format - msgid "Entries: %d\tSkipped: %d\tFound: %d\n" - msgstr "" - --#: ../arp.c:597 -+#: ../arp.c:609 - #, c-format - msgid "%s (%s) -- no entry\n" - msgstr "" - --#: ../arp.c:599 -+#: ../arp.c:611 - #, c-format - msgid "arp: in %d entries no match found.\n" - msgstr "" - --#: ../arp.c:614 -+#: ../arp.c:626 -+#, c-format - msgid "" - "Usage:\n" - " arp [-vn] [<HW>] [-i <if>] [-a] [<hostname>] <-Display ARP " - "cache\n" - msgstr "" - --#: ../arp.c:615 -+#: ../arp.c:627 -+#, c-format - msgid "" --" arp [-v] [-i <if>] -d <hostname> [pub][nopub] <-Delete ARP " -+" arp [-v] [-i <if>] -d <host> [pub] <-Delete ARP " - "entry\n" - msgstr "" - --#: ../arp.c:616 -+#: ../arp.c:628 -+#, c-format - msgid "" --" arp [-vnD] [<HW>] [-i <if>] -f [<filename>] <-Add entry from " -+" arp [-vnD] [<HW>] [-i <if>] -f [<filename>] <-Add entry from " - "file\n" - msgstr "" - --#: ../arp.c:617 -+#: ../arp.c:629 -+#, c-format - msgid "" --" arp [-v] [<HW>] [-i <if>] -s <hostname> <hwaddr> [temp][nopub] <-Add " -+" arp [-v] [<HW>] [-i <if>] -s <host> <hwaddr> [temp] <-Add " - "entry\n" - msgstr "" - --#: ../arp.c:618 --msgid "" --" arp [-v] [<HW>] [-i <if>] -s <hostname> <hwaddr> [netmask <nm>] pub " --"<-''-\n" --msgstr "" -- --#: ../arp.c:619 -+#: ../arp.c:630 -+#, c-format - msgid "" --" arp [-v] [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub " -+" arp [-v] [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub " - "<-''-\n" - "\n" - msgstr "" - --#: ../arp.c:621 -+#: ../arp.c:632 -+#, c-format - msgid "" - " -a display (all) hosts in alternative (BSD) " - "style\n" - msgstr "" - --#: ../arp.c:622 -+#: ../arp.c:633 -+#, c-format - msgid " -s, --set set a new ARP entry\n" - msgstr "" - --#: ../arp.c:623 -+#: ../arp.c:634 -+#, c-format - msgid " -d, --delete delete a specified entry\n" - msgstr "" - --#: ../arp.c:624 ../netstat.c:1490 ../route.c:86 -+#: ../arp.c:635 ../netstat.c:1503 ../route.c:86 -+#, c-format - msgid " -v, --verbose be verbose\n" - msgstr "" - --#: ../arp.c:625 ../netstat.c:1491 ../route.c:87 -+#: ../arp.c:636 ../netstat.c:1504 ../route.c:87 -+#, c-format - msgid " -n, --numeric don't resolve names\n" - msgstr "" - --#: ../arp.c:626 -+#: ../arp.c:637 -+#, c-format - msgid "" - " -i, --device specify network interface (e.g. eth0)\n" - msgstr "" - --#: ../arp.c:627 -+#: ../arp.c:638 -+#, c-format - msgid " -D, --use-device read <hwaddr> from given device\n" - msgstr "" - --#: ../arp.c:628 -+#: ../arp.c:639 -+#, c-format - msgid " -A, -p, --protocol specify protocol family\n" - msgstr "" - --#: ../arp.c:629 -+#: ../arp.c:640 -+#, c-format - msgid "" --" -f, --file read new entries from file or from " --"/etc/ethers\n" -+" -f, --file read new entries from file or from /etc/" -+"ethers\n" - "\n" - msgstr "" - --#: ../arp.c:631 ../rarp.c:182 -+#: ../arp.c:642 ../rarp.c:182 - #, c-format - msgid " <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n" - msgstr "" - --#: ../arp.c:632 ../rarp.c:183 -+#: ../arp.c:643 ../rarp.c:183 -+#, c-format - msgid " List of possible hardware types (which support ARP):\n" - msgstr "" - --#: ../arp.c:666 ../arp.c:751 -+#: ../arp.c:677 ../arp.c:762 - #, c-format - msgid "%s: hardware type not supported!\n" - msgstr "" - --#: ../arp.c:670 -+#: ../arp.c:681 - #, c-format - msgid "%s: address family not supported!\n" - msgstr "" - --#: ../arp.c:705 -+#: ../arp.c:716 -+#, c-format - msgid "arp: -N not yet supported.\n" - msgstr "" - --#: ../arp.c:715 -+#: ../arp.c:726 - #, c-format - msgid "arp: %s: unknown address family.\n" - msgstr "" - --#: ../arp.c:724 -+#: ../arp.c:735 - #, c-format - msgid "arp: %s: unknown hardware type.\n" - msgstr "" - --#: ../arp.c:743 -+#: ../arp.c:754 - #, c-format - msgid "arp: %s: kernel only supports 'inet'.\n" - msgstr "" - --#: ../arp.c:756 -+#: ../arp.c:767 - #, c-format - msgid "arp: %s: hardware type without ARP support.\n" - msgstr "" - --#: ../hostname.c:70 -+#: ../hostname.c:71 - #, c-format - msgid "Setting nodename to `%s'\n" - msgstr "" - --#: ../hostname.c:75 -+#: ../hostname.c:76 - #, c-format - msgid "%s: you must be root to change the node name\n" - msgstr "" - --#: ../hostname.c:78 ../hostname.c:98 ../hostname.c:117 -+#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117 - #, c-format - msgid "%s: name too long\n" - msgstr "" - --#: ../hostname.c:90 -+#: ../hostname.c:91 - #, c-format - msgid "Setting hostname to `%s'\n" - msgstr "" - --#: ../hostname.c:95 -+#: ../hostname.c:96 - #, c-format - msgid "%s: you must be root to change the host name\n" - msgstr "" -@@ -262,103 +284,119 @@ - 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 @@ - " part of the FQDN) in the /etc/hosts file.\n" - msgstr "" - --#: ../hostname.c:340 -+#: ../hostname.c:338 - #, c-format - msgid "%s: You can't change the DNS domain name with this command\n" - msgstr "" - --#: ../hostname.c:341 -+#: ../hostname.c:339 -+#, c-format - msgid "" - "\n" - "Unless you are using bind or NIS for host lookups you can change the DNS\n" - msgstr "" - --#: ../hostname.c:342 -+#: ../hostname.c:340 -+#, c-format - msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n" - msgstr "" - --#: ../hostname.c:359 -+#: ../hostname.c:357 - #, c-format - msgid "gethostname()=`%s'\n" - msgstr "" - --#: ../hostname.c:376 -+#: ../hostname.c:374 - #, c-format - msgid "getdomainname()=`%s'\n" - msgstr "" - --#: ../hostname.c:391 -+#: ../hostname.c:389 - #, c-format - msgid "getnodename()=`%s'\n" - msgstr "" - --#: ../ifconfig.c:108 -+#: ../ifconfig.c:107 -+#, c-format - msgid "" --"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " -+"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " - "Flg\n" - msgstr "" - --#: ../ifconfig.c:130 ../ifconfig.c:162 -+#: ../ifconfig.c:129 ../ifconfig.c:161 - #, c-format --msgid "%s: unknown interface: %s\n" -+msgid "%s: ERROR while getting interface flags: %s\n" - msgstr "" - --#: ../ifconfig.c:154 ../ifconfig.c:734 ../ifconfig.c:825 ../ifconfig.c:936 -+#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862 -+#: ../ifconfig.c:973 -+#, c-format - msgid "No support for INET on this system.\n" - msgstr "" - --#: ../ifconfig.c:177 -+#: ../ifconfig.c:193 -+#, c-format -+msgid "%s: ERROR while testing interface flags: %s\n" -+msgstr "" -+ -+#: ../ifconfig.c:202 -+#, c-format - msgid "" - "Usage:\n" --" ifconfig [-a] [-i] [-v] [-s] <interface> [[<AF>] <address>]\n" -+" ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n" - msgstr "" - --#: ../ifconfig.c:179 -+#: ../ifconfig.c:204 -+#, c-format - msgid " [add <address>[/<prefixlen>]]\n" - msgstr "" - --#: ../ifconfig.c:180 -+#: ../ifconfig.c:205 -+#, c-format - msgid " [del <address>[/<prefixlen>]]\n" - msgstr "" - --#: ../ifconfig.c:181 -+#: ../ifconfig.c:206 -+#, c-format - msgid " [[-]broadcast [<address>]] [[-]pointopoint [<address>]]\n" - msgstr "" - --#: ../ifconfig.c:182 -+#: ../ifconfig.c:207 -+#, c-format - msgid " [netmask <address>] [dstaddr <address>] [tunnel <address>]\n" - msgstr "" - --#: ../ifconfig.c:185 -+#: ../ifconfig.c:210 -+#, c-format - msgid " [outfill <NN>] [keepalive <NN>]\n" - msgstr "" - --#: ../ifconfig.c:187 -+#: ../ifconfig.c:212 -+#, c-format - msgid " [hw <HW> <address>] [metric <NN>] [mtu <NN>]\n" - msgstr "" - --#: ../ifconfig.c:188 -+#: ../ifconfig.c:213 -+#, c-format - msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" - msgstr "" - --#: ../ifconfig.c:189 -+#: ../ifconfig.c:214 -+#, c-format - msgid " [multicast] [[-]promisc]\n" - msgstr "" - --#: ../ifconfig.c:190 -+#: ../ifconfig.c:215 -+#, c-format - msgid " [mem_start <NN>] [io_addr <NN>] [irq <NN>] [media <type>]\n" - msgstr "" - --#: ../ifconfig.c:192 -+#: ../ifconfig.c:217 -+#, c-format - msgid " [txqueuelen <NN>]\n" - msgstr "" - --#: ../ifconfig.c:195 -+#: ../ifconfig.c:220 -+#, c-format - msgid " [[-]dynamic]\n" - msgstr "" - --#: ../ifconfig.c:197 -+#: ../ifconfig.c:222 -+#, c-format - msgid "" - " [up|down] ...\n" - "\n" - msgstr "" - --#: ../ifconfig.c:199 -+#: ../ifconfig.c:224 -+#, c-format - msgid " <HW>=Hardware Type.\n" - msgstr "" - --#: ../ifconfig.c:200 -+#: ../ifconfig.c:225 -+#, c-format - msgid " List of possible hardware types:\n" - msgstr "" - - #. 1 = ARPable --#: ../ifconfig.c:202 -+#: ../ifconfig.c:227 - #, c-format - msgid " <AF>=Address family. Default: %s\n" - msgstr "" - --#: ../ifconfig.c:203 -+#: ../ifconfig.c:228 -+#, c-format - msgid " List of possible address families:\n" - msgstr "" - --#: ../ifconfig.c:278 -+#: ../ifconfig.c:303 - #, c-format - msgid "ifconfig: option `%s' not recognised.\n" - msgstr "" - --#: ../ifconfig.c:280 ../ifconfig.c:925 -+#: ../ifconfig.c:305 ../ifconfig.c:962 -+#, c-format - msgid "ifconfig: `--help' gives usage information.\n" - msgstr "" - --#: ../ifconfig.c:355 -+#: ../ifconfig.c:380 -+#, c-format - msgid "Unknown media type.\n" - msgstr "" - --#: ../ifconfig.c:647 -+#: ../ifconfig.c:417 -+#, c-format -+msgid "" -+"Warning: Interface %s still in promisc mode... maybe other application is " -+"running?\n" -+msgstr "" -+ -+#: ../ifconfig.c:429 -+#, c-format -+msgid "Warning: Interface %s still in MULTICAST mode.\n" -+msgstr "" -+ -+#: ../ifconfig.c:441 -+#, c-format -+msgid "Warning: Interface %s still in ALLMULTI mode.\n" -+msgstr "" -+ -+#: ../ifconfig.c:465 -+#, c-format -+msgid "Warning: Interface %s still in DYNAMIC mode.\n" -+msgstr "" -+ -+#: ../ifconfig.c:523 -+#, c-format -+msgid "Warning: Interface %s still in BROADCAST mode.\n" -+msgstr "" -+ -+#: ../ifconfig.c:652 -+#, c-format -+msgid "Warning: Interface %s still in POINTOPOINT mode.\n" -+msgstr "" -+ -+#: ../ifconfig.c:684 - #, c-format - msgid "hw address type `%s' has no handler to set address. failed.\n" - msgstr "" - --#: ../ifconfig.c:656 -+#: ../ifconfig.c:693 - #, c-format - msgid "%s: invalid %s address.\n" - msgstr "" - --#: ../ifconfig.c:700 ../ifconfig.c:790 ../ifconfig.c:876 -+#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913 -+#, c-format - msgid "No support for INET6 on this system.\n" - msgstr "" - --#: ../ifconfig.c:743 ../ifconfig.c:834 -+#: ../ifconfig.c:780 ../ifconfig.c:871 - #, c-format - msgid "Interface %s not initialized\n" - msgstr "" - --#: ../ifconfig.c:755 ../ifconfig.c:845 -+#: ../ifconfig.c:792 ../ifconfig.c:882 -+#, c-format - msgid "Bad address.\n" - msgstr "" - --#: ../ifconfig.c:848 -+#: ../ifconfig.c:885 -+#, c-format - msgid "Address deletion not supported on this system.\n" - msgstr "" - --#: ../ifconfig.c:920 -+#: ../ifconfig.c:957 -+#, c-format - msgid "ifconfig: Cannot set address for this protocol family.\n" - msgstr "" - --#: ../ifconfig.c:946 -+#: ../ifconfig.c:983 -+#, c-format - msgid "No support for ECONET on this system.\n" - msgstr "" - --#: ../ifconfig.c:954 -+#: ../ifconfig.c:991 - #, c-format - msgid "Don't know how to set addresses for family %d.\n" - msgstr "" - --#: ../netstat.c:430 -+#: ../ifconfig.c:1021 -+#, c-format -+msgid "WARNING: at least one error occured. (%d)\n" -+msgstr "" -+ -+#: ../netstat.c:434 - #, c-format - msgid "" - "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n" - msgstr "" - --#: ../netstat.c:434 -+#: ../netstat.c:438 -+#, c-format - msgid "" - "(Not all processes could be identified, non-owned process info\n" - " will not be shown, you would have to be root to see it all.)\n" - msgstr "" - --#: ../netstat.c:441 ../netstat.c:1176 ../netstat.c:1253 -+#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266 - msgid "LISTENING" - msgstr "" - --#: ../netstat.c:442 -+#: ../netstat.c:446 - msgid "CONN SENT" - msgstr "" - --#: ../netstat.c:443 ../netstat.c:1255 -+#: ../netstat.c:447 ../netstat.c:1268 - msgid "DISC SENT" - msgstr "" - --#: ../netstat.c:444 ../netstat.c:511 ../netstat.c:894 ../netstat.c:1256 -+#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269 - msgid "ESTABLISHED" - msgstr "" - --#: ../netstat.c:466 -+#: ../netstat.c:470 -+#, c-format - msgid "Active NET/ROM sockets\n" - msgstr "" - --#: ../netstat.c:467 -+#: ../netstat.c:471 -+#, c-format - msgid "" --"User Dest Source Device State Vr/Vs Send-Q " --"Recv-Q\n" -+"User Dest Source Device State Vr/Vs Send-Q Recv-" -+"Q\n" - msgstr "" - --#: ../netstat.c:477 ../netstat.c:1295 -+#: ../netstat.c:481 ../netstat.c:1308 - #, c-format - msgid "Problem reading data from %s\n" - msgstr "" - --#: ../netstat.c:512 -+#: ../netstat.c:516 - msgid "SYN_SENT" - msgstr "" - --#: ../netstat.c:513 -+#: ../netstat.c:517 - msgid "SYN_RECV" - msgstr "" - --#: ../netstat.c:514 -+#: ../netstat.c:518 - msgid "FIN_WAIT1" - msgstr "" - --#: ../netstat.c:515 -+#: ../netstat.c:519 - msgid "FIN_WAIT2" - msgstr "" - --#: ../netstat.c:516 -+#: ../netstat.c:520 - msgid "TIME_WAIT" - msgstr "" - --#: ../netstat.c:517 -+#: ../netstat.c:521 - msgid "CLOSE" - msgstr "" - --#: ../netstat.c:518 -+#: ../netstat.c:522 - msgid "CLOSE_WAIT" - msgstr "" - --#: ../netstat.c:519 -+#: ../netstat.c:523 - msgid "LAST_ACK" - msgstr "" - --#: ../netstat.c:520 -+#: ../netstat.c:524 - msgid "LISTEN" - msgstr "" - --#: ../netstat.c:521 -+#: ../netstat.c:525 - msgid "CLOSING" - msgstr "" - --#: ../netstat.c:592 -+#: ../netstat.c:596 - #, c-format - msgid "warning, got bogus igmp6 line %d.\n" - msgstr "" - --#: ../netstat.c:597 ../netstat.c:635 ../netstat.c:756 ../netstat.c:888 --#: ../netstat.c:1019 ../netstat.c:1024 -+#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898 -+#: ../netstat.c:1032 ../netstat.c:1037 - #, c-format - msgid "netstat: unsupported address family %d !\n" - msgstr "" - --#: ../netstat.c:610 ../netstat.c:615 ../netstat.c:623 ../netstat.c:630 -+#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634 - #, c-format - msgid "warning, got bogus igmp line %d.\n" - msgstr "" - --#: ../netstat.c:673 -+#: ../netstat.c:677 -+#, c-format - msgid "Active X.25 sockets\n" - msgstr "" - - #. IMHO, Vr/Vs is not very usefull --SF --#: ../netstat.c:675 -+#: ../netstat.c:679 -+#, c-format - msgid "" --"Dest Source Device LCI State Vr/Vs Send-Q " --"Recv-Q\n" -+"Dest Source Device LCI State Vr/Vs Send-Q Recv-" -+"Q\n" - msgstr "" - --#: ../netstat.c:752 -+#: ../netstat.c:759 -+#, c-format - msgid "warning, got bogus tcp line.\n" - msgstr "" - --#: ../netstat.c:793 ../netstat.c:943 ../netstat.c:1062 -+#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075 - #, c-format - msgid "off (0.00/%ld/%d)" - msgstr "" - --#: ../netstat.c:797 -+#: ../netstat.c:804 - #, c-format - msgid "on (%2.2f/%ld/%d)" - msgstr "" - --#: ../netstat.c:802 -+#: ../netstat.c:809 - #, c-format - msgid "keepalive (%2.2f/%ld/%d)" - msgstr "" - --#: ../netstat.c:807 -+#: ../netstat.c:814 - #, c-format - msgid "timewait (%2.2f/%ld/%d)" - msgstr "" - --#: ../netstat.c:812 ../netstat.c:952 ../netstat.c:1072 -+#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085 - #, c-format - msgid "unkn-%d (%2.2f/%ld/%d)" - msgstr "" - --#: ../netstat.c:884 -+#: ../netstat.c:894 -+#, c-format - msgid "warning, got bogus udp line.\n" - msgstr "" - --#: ../netstat.c:902 ../netstat.c:1162 ../netstat.c:1195 -+#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208 - msgid "UNKNOWN" - msgstr "" - --#: ../netstat.c:948 ../netstat.c:1067 -+#: ../netstat.c:958 ../netstat.c:1080 - #, c-format - msgid "on%d (%2.2f/%ld/%d)" - msgstr "" - --#: ../netstat.c:1033 -+#: ../netstat.c:1046 -+#, c-format - msgid "warning, got bogus raw line.\n" - msgstr "" - --#: ../netstat.c:1115 -+#: ../netstat.c:1128 -+#, c-format - msgid "warning, got bogus unix line.\n" - msgstr "" - --#: ../netstat.c:1142 -+#: ../netstat.c:1155 - msgid "STREAM" - msgstr "" - --#: ../netstat.c:1146 -+#: ../netstat.c:1159 - msgid "DGRAM" - msgstr "" - --#: ../netstat.c:1150 -+#: ../netstat.c:1163 - msgid "RAW" - msgstr "" - --#: ../netstat.c:1154 -+#: ../netstat.c:1167 - msgid "RDM" - msgstr "" - --#: ../netstat.c:1158 -+#: ../netstat.c:1171 - msgid "SEQPACKET" - msgstr "" - --#: ../netstat.c:1167 -+#: ../netstat.c:1180 - msgid "FREE" - msgstr "" - --#: ../netstat.c:1183 -+#: ../netstat.c:1196 - msgid "CONNECTING" - msgstr "" - --#: ../netstat.c:1187 -+#: ../netstat.c:1200 - msgid "CONNECTED" - msgstr "" - --#: ../netstat.c:1191 -+#: ../netstat.c:1204 - msgid "DISCONNECTING" - msgstr "" - --#: ../netstat.c:1222 -+#: ../netstat.c:1235 -+#, c-format - msgid "Active UNIX domain sockets " - msgstr "" - --#: ../netstat.c:1224 ../netstat.c:1735 -+#: ../netstat.c:1237 ../netstat.c:1756 -+#, c-format - msgid "(servers and established)" - msgstr "" - --#: ../netstat.c:1227 ../netstat.c:1738 -+#: ../netstat.c:1240 ../netstat.c:1759 -+#, c-format - msgid "(only servers)" - msgstr "" - --#: ../netstat.c:1229 ../netstat.c:1740 -+#: ../netstat.c:1242 ../netstat.c:1761 -+#, c-format - msgid "(w/o servers)" - msgstr "" - --#: ../netstat.c:1232 -+#: ../netstat.c:1245 -+#, c-format - msgid "" - "\n" - "Proto RefCnt Flags Type State I-Node" - msgstr "" - --#: ../netstat.c:1234 -+#: ../netstat.c:1247 -+#, c-format - msgid " Path\n" - msgstr "" - --#: ../netstat.c:1254 -+#: ../netstat.c:1267 - msgid "SABM SENT" - msgstr "" - --#: ../netstat.c:1257 -+#: ../netstat.c:1270 - msgid "RECOVERY" - msgstr "" - --#: ../netstat.c:1271 -+#: ../netstat.c:1284 -+#, c-format - msgid "Active AX.25 sockets\n" - msgstr "" - --#: ../netstat.c:1272 -+#: ../netstat.c:1285 -+#, c-format - msgid "Dest Source Device State Vr/Vs Send-Q Recv-Q\n" - msgstr "" - --#: ../netstat.c:1315 -+#: ../netstat.c:1328 - #, c-format - msgid "problem reading data from %s\n" - msgstr "" - --#: ../netstat.c:1366 -+#: ../netstat.c:1379 -+#, c-format - msgid "" - "Active IPX sockets\n" - "Proto Recv-Q Send-Q Local Address Foreign Address " - "State" - msgstr "" - --#: ../netstat.c:1368 -+#: ../netstat.c:1381 -+#, c-format - msgid " User" - msgstr "" - --#: ../netstat.c:1402 -+#: ../netstat.c:1415 - msgid "ESTAB" - msgstr "" - --#: ../netstat.c:1410 -+#: ../netstat.c:1423 - msgid "UNK." - msgstr "" - --#: ../netstat.c:1448 -+#: ../netstat.c:1461 -+#, c-format - msgid "Kernel Interface table\n" - msgstr "" - --#: ../netstat.c:1452 -+#: ../netstat.c:1465 -+#, c-format - msgid "" --"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " -+"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " - "Flg\n" - msgstr "" - --#: ../netstat.c:1456 -+#: ../netstat.c:1469 - msgid "missing interface information" - msgstr "" - --#: ../netstat.c:1479 -+#: ../netstat.c:1492 -+#, c-format - msgid "" --"usage: netstat [-veenNcCF] [<Af>] -r netstat " --"{-V|--version|-h|--help}\n" -+"usage: netstat [-veenNcCF] [<Af>] -r netstat {-V|--version|-h|--" -+"help}\n" - msgstr "" - --#: ../netstat.c:1480 -+#: ../netstat.c:1493 -+#, c-format - msgid " netstat [-vnNcaeol] [<Socket> ...]\n" - msgstr "" - --#: ../netstat.c:1481 -+#: ../netstat.c:1494 -+#, c-format - msgid "" - " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" - "\n" - msgstr "" - --#: ../netstat.c:1483 -+#: ../netstat.c:1496 -+#, c-format - msgid " -r, --route display routing table\n" - msgstr "" - --#: ../netstat.c:1484 -+#: ../netstat.c:1497 -+#, c-format - msgid " -i, --interfaces display interface table\n" - msgstr "" - --#: ../netstat.c:1485 -+#: ../netstat.c:1498 -+#, c-format - msgid " -g, --groups display multicast group memberships\n" - msgstr "" - --#: ../netstat.c:1486 -+#: ../netstat.c:1499 -+#, c-format - msgid "" - " -s, --statistics display networking statistics (like SNMP)\n" - msgstr "" - --#: ../netstat.c:1488 -+#: ../netstat.c:1501 -+#, c-format - msgid "" - " -M, --masquerade display masqueraded connections\n" - "\n" - msgstr "" - --#: ../netstat.c:1492 -+#: ../netstat.c:1505 -+#, c-format - msgid " --numeric-hosts don't resolve host names\n" - msgstr "" - --#: ../netstat.c:1493 -+#: ../netstat.c:1506 -+#, c-format - msgid " --numeric-ports don't resolve port names\n" - msgstr "" - --#: ../netstat.c:1494 -+#: ../netstat.c:1507 -+#, c-format - msgid " --numeric-users don't resolve user names\n" - msgstr "" - --#: ../netstat.c:1495 -+#: ../netstat.c:1508 -+#, c-format - msgid " -N, --symbolic resolve hardware names\n" - msgstr "" - --#: ../netstat.c:1496 ../route.c:88 -+#: ../netstat.c:1509 ../route.c:88 -+#, c-format - msgid " -e, --extend display other/more information\n" - msgstr "" - --#: ../netstat.c:1497 -+#: ../netstat.c:1510 -+#, c-format - msgid " -p, --programs display PID/Program name for sockets\n" - msgstr "" - --#: ../netstat.c:1498 -+#: ../netstat.c:1511 -+#, c-format - msgid "" - " -c, --continuous continuous listing\n" - "\n" - msgstr "" - --#: ../netstat.c:1499 -+#: ../netstat.c:1512 -+#, c-format - msgid " -l, --listening display listening server sockets\n" - msgstr "" - --#: ../netstat.c:1500 -+#: ../netstat.c:1513 -+#, c-format - msgid "" - " -a, --all, --listening display all sockets (default: connected)\n" - msgstr "" - --#: ../netstat.c:1501 -+#: ../netstat.c:1514 -+#, c-format - msgid " -o, --timers display timers\n" - msgstr "" - --#: ../netstat.c:1502 ../route.c:89 -+#: ../netstat.c:1515 ../route.c:89 -+#, c-format - msgid "" - " -F, --fib display Forwarding Information Base " - "(default)\n" - msgstr "" - --#: ../netstat.c:1503 ../route.c:90 -+#: ../netstat.c:1516 ../route.c:90 -+#, c-format - msgid "" - " -C, --cache display routing cache instead of FIB\n" - "\n" - msgstr "" - --#: ../netstat.c:1505 -+#: ../netstat.c:1518 -+#, c-format - msgid "" --" <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx " --"--netrom\n" -+" <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" -+"netrom\n" - msgstr "" - --#: ../netstat.c:1506 ../route.c:92 -+#: ../netstat.c:1519 - #, c-format --msgid " <AF>=Use '-A <af>' or '--<af>'; default: %s\n" -+msgid " <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n" - msgstr "" - --#: ../netstat.c:1507 ../route.c:93 -+#: ../netstat.c:1520 ../route.c:93 -+#, c-format - msgid " List of possible address families (which support routing):\n" - msgstr "" - --#: ../netstat.c:1732 -+#: ../netstat.c:1753 -+#, c-format - msgid "Active Internet connections " - msgstr "" - --#: ../netstat.c:1742 -+#: ../netstat.c:1763 -+#, c-format - msgid "" - "\n" --"Proto Recv-Q Send-Q Local Address Foreign Address State " --" " -+"Proto Recv-Q Send-Q Local Address Foreign Address " -+"State " - msgstr "" - --#: ../netstat.c:1744 -+#: ../netstat.c:1765 -+#, c-format - msgid " User Inode " - msgstr "" - --#: ../netstat.c:1747 -+#: ../netstat.c:1768 -+#, c-format - msgid " Timer" - msgstr "" - --#: ../netstat.c:1777 -+#: ../netstat.c:1798 -+#, c-format - msgid "IPv4 Group Memberships\n" - msgstr "" - --#: ../netstat.c:1778 -+#: ../netstat.c:1799 -+#, c-format - msgid "Interface RefCnt Group\n" - msgstr "" - -@@ -986,23 +1143,28 @@ - msgstr "" - - #: ../rarp.c:176 -+#, c-format - msgid "Usage: rarp -a list entries in cache.\n" - msgstr "" - - #: ../rarp.c:177 -+#, c-format - msgid " rarp -d <hostname> delete entry from cache.\n" - msgstr "" - - #: ../rarp.c:178 -+#, c-format - msgid " rarp [<HW>] -s <hostname> <hwaddr> add entry to cache.\n" - msgstr "" - - #: ../rarp.c:179 -+#, c-format - msgid "" - " rarp -f add entries from /etc/ethers.\n" - msgstr "" - - #: ../rarp.c:180 -+#, c-format - msgid "" - " rarp -V display program version.\n" - "\n" -@@ -1019,38 +1181,50 @@ - msgstr "" - - #: ../route.c:80 -+#, c-format - msgid "" - "Usage: route [-nNvee] [-FC] [<AF>] List kernel routing tables\n" - msgstr "" - - #: ../route.c:81 -+#, c-format - msgid "" - " route [-v] [-FC] {add|del|flush} ... Modify routing table for AF.\n" - "\n" - msgstr "" - - #: ../route.c:83 -+#, c-format - msgid "" - " route {-h|--help} [<AF>] Detailed usage syntax for " - "specified AF.\n" - msgstr "" - - #: ../route.c:84 -+#, c-format - msgid "" - " route {-V|--version} Display version/author and " - "exit.\n" - "\n" - msgstr "" - -+#: ../route.c:92 -+#, c-format -+msgid " <AF>=Use '-A <af>' or '--<af>'; default: %s\n" -+msgstr "" -+ - #: ../plipconfig.c:66 -+#, c-format - msgid "Usage: plipconfig [-a] [-i] [-v] interface\n" - msgstr "" - - #: ../plipconfig.c:67 -+#, c-format - msgid " [nibble NN] [trigger NN]\n" - msgstr "" - - #: ../plipconfig.c:68 -+#, c-format - msgid " plipconfig -V | --version\n" - msgstr "" - -@@ -1060,61 +1234,75 @@ - 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 @@ - 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 @@ - 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 @@ - - #: ../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 @@ - - #: ../statistics.c:183 - #, c-format --msgid "%u packets header predicted" -+msgid "%u packet headers predicted" - msgstr "" - - #: ../statistics.c:184 -@@ -1591,19 +1786,209 @@ - 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 @@ - 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 @@ - 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 @@ - 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 @@ - 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 @@ - msgstr "" - - #: ../lib/ash.c:81 -+#, c-format - msgid "Malformed Ash address" - msgstr "" - -@@ -1712,22 +2100,21 @@ - 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 @@ - 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 @@ - 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 @@ - 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 @@ - 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 @@ - 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 @@ - 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 @@ - msgstr "" - - #: ../slattach.c:192 -+#, c-format - msgid "slattach: cannot write PID file\n" - msgstr "" - -@@ -2468,18 +2936,22 @@ - 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 @@ - msgstr "" - - #: ../slattach.c:530 -+#, c-format - msgid "slattach: tty_open: cannot set 8N1 mode!\n" - msgstr "" - ---- net-tools-1.60.orig/po/cs.po -+++ net-tools-1.60/po/cs.po -@@ -5,7 +5,8 @@ - msgid "" - msgstr "" - "Project-Id-Version: net-tools-1.51\n" --"POT-Creation-Date: 2000-02-14 02:31+0100\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2007-06-30 12:28+0900\n" - "PO-Revision-Date: 1999-08-29 23:20+0200\n" - "Last-Translator: Jiří Pavlovský <pavlovsk@ff.cuni.cz>\n" - "Language-Team: Czech <cs@li.org>\n" -@@ -13,96 +14,110 @@ - "Content-Type: text/plain; charset=iso-8859-2\n" - "Content-Transfer-Encoding: 8bit\n" - --#: ../arp.c:110 ../arp.c:269 -+#: ../arp.c:112 ../arp.c:279 -+#, c-format - msgid "arp: need host name\n" - msgstr "arp: je třeba jméno počítače\n" - --#: ../arp.c:207 ../arp.c:221 -+#: ../arp.c:215 ../arp.c:230 - #, c-format - msgid "No ARP entry for %s\n" - msgstr "Pro %s neexistuje ARP poloľka\n" - --#: ../arp.c:239 -+#: ../arp.c:248 - #, c-format - msgid "arp: cant get HW-Address for `%s': %s.\n" - msgstr "arp: HW adresu `%s' nelze zjistit: %s\n" - --#: ../arp.c:243 -+#: ../arp.c:252 -+#, c-format - msgid "arp: protocol type mismatch.\n" - msgstr "arp: chybně zadaný typ protokolu\n" - --#: ../arp.c:252 -+#: ../arp.c:261 - #, c-format - msgid "arp: device `%s' has HW address %s `%s'.\n" - msgstr "arp: zařízení `%s' má Hw adresu %s `%s'.\n" - --#: ../arp.c:282 -+#: ../arp.c:293 -+#, c-format - msgid "arp: need hardware address\n" - msgstr "arp: je třeba hardwarová adresa\n" - --#: ../arp.c:290 -+#: ../arp.c:301 -+#, c-format - msgid "arp: invalid hardware address\n" - msgstr "arp: nesprávná hardwarová adresa\n" - --#: ../arp.c:387 -+#: ../arp.c:398 - #, c-format - msgid "arp: cannot open etherfile %s !\n" - msgstr "arp: databázi ethernetových adres %s nelze otevřít!\n" - --#: ../arp.c:403 -+#: ../arp.c:414 - #, c-format - msgid "arp: format error on line %u of etherfile %s !\n" - msgstr "arp: syntaktická chyba na řádku %u databáze ethernetových adres %s!\n" - --#: ../arp.c:416 -+#: ../arp.c:427 - #, c-format - msgid "arp: cannot set entry on line %u of etherfile %s !\n" - msgstr "" - "arp: poloľku na řádku %u databáze ethernetových adres %s nelze nastavit!\n" - --#: ../arp.c:437 --msgid "Address\t\t\tHWtype\tHWaddress\t Flags Mask\t\t Iface\n" -+#: ../arp.c:448 -+#, fuzzy, c-format -+msgid "" -+"Address HWtype HWaddress Flags Mask " -+"Iface\n" - msgstr "Adresa\t\t\t HWtyp\t HWadresa\t Příz Maska\t\t Rozhraní\n" - --#: ../arp.c:467 -+#: ../arp.c:476 -+#, fuzzy -+msgid "<from_interface>" -+msgstr " rozhraní %s\n" -+ -+#: ../arp.c:478 - msgid "(incomplete)" - msgstr "(nekompletní)" - --#: ../arp.c:484 -+#: ../arp.c:495 - #, c-format - msgid "%s (%s) at " - msgstr "%s (%s) na " - --#: ../arp.c:490 -+#: ../arp.c:501 -+#, c-format - msgid "<incomplete> " - msgstr "<nekompletní>" - --#: ../arp.c:496 -+#: ../arp.c:507 - #, c-format - msgid "netmask %s " - msgstr "sí»ová maska %s " - --#: ../arp.c:513 -+#: ../arp.c:524 - #, c-format - msgid "on %s\n" - msgstr "na %s\n" - --#: ../arp.c:592 -+#: ../arp.c:605 - #, c-format - msgid "Entries: %d\tSkipped: %d\tFound: %d\n" - msgstr "Poloľky: %d\tVynecháno: %d\tNalezeno: %d\n" - --#: ../arp.c:596 -+#: ../arp.c:609 - #, c-format - msgid "%s (%s) -- no entry\n" - msgstr "%s (%s) -- ľádná poloľka\n" - --#: ../arp.c:598 -+#: ../arp.c:611 - #, c-format - msgid "arp: in %d entries no match found.\n" - msgstr "arp: ľádná z poloľek (%d) nevyhovuje.\n" - --#: ../arp.c:613 -+#: ../arp.c:626 -+#, c-format - msgid "" - "Usage:\n" - " arp [-vn] [<HW>] [-i <if>] [-a] [<hostname>] <-Display ARP " -@@ -112,49 +127,46 @@ - " arp [-vn] [<HW>] [-i <if> [-a] [<počítač>] <-Zobrazí ARP " - "cache\n" - --#: ../arp.c:614 -+#: ../arp.c:627 -+#, fuzzy, c-format - msgid "" --" arp [-v] [-i <if>] -d <hostname> [pub][nopub] <-Delete ARP " -+" arp [-v] [-i <if>] -d <host> [pub] <-Delete ARP " - "entry\n" - msgstr "" - " arp [-v] [-i <if>] -d <počítač> [pub][nopub] <-Smaľe poloľku " - "ARP\n" - --#: ../arp.c:615 --#, fuzzy -+#: ../arp.c:628 -+#, fuzzy, c-format - msgid "" --" arp [-vnD] [<HW>] [-i <if>] -f [<filename>] <-Add entry from " -+" arp [-vnD] [<HW>] [-i <if>] -f [<filename>] <-Add entry from " - "file\n" - msgstr "" - " arp [-vnD] [<HW>] [-i <if>] -f <soubor> <-Přidá poloľku " - "ze\n" - " souboru\n" - --#: ../arp.c:616 -+#: ../arp.c:629 -+#, fuzzy, c-format - msgid "" --" arp [-v] [<HW>] [-i <if>] -s <hostname> <hwaddr> [temp][nopub] <-Add " -+" arp [-v] [<HW>] [-i <if>] -s <host> <hwaddr> [temp] <-Add " - "entry\n" - msgstr "" - " arp [-v] [<HW> [-i <if> -s <počítač> <hwadr> [temp][nopub] <-Přidá " - "poloľku\n" - --#: ../arp.c:617 --msgid "" --" arp [-v] [<HW>] [-i <if>] -s <hostname> <hwaddr> [netmask <nm>] pub " --"<-''-\n" --msgstr "" --" arp [-v] [<HW>] [-i <if>] -s <soubor> <hwadr> [sí»mask <čís>] <-''-\n" -- --#: ../arp.c:618 -+#: ../arp.c:630 -+#, fuzzy, c-format - msgid "" --" arp [-v] [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub " -+" arp [-v] [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub " - "<-''-\n" - "\n" - msgstr "" - " arp [-v] [<HW> [-i <if> -Ds <počítač> <if> [sí»mask <čís>] pub " - "<-''-\n" - --#: ../arp.c:620 -+#: ../arp.c:632 -+#, c-format - msgid "" - " -a display (all) hosts in alternative (BSD) " - "style\n" -@@ -162,126 +174,134 @@ - " -a zobrazí jmna vąech počítačů alternativním\n" - " (BSD) způsobem\n" - --#: ../arp.c:621 -+#: ../arp.c:633 -+#, c-format - msgid " -s, --set set a new ARP entry\n" - msgstr " -s, --set nastaví novou ARP poloľku\n" - --#: ../arp.c:622 -+#: ../arp.c:634 -+#, c-format - msgid " -d, --delete delete a specified entry\n" - msgstr " -d, --delete smaľe zadanou ARP poloľku\n" - --#: ../arp.c:623 ../netstat.c:1436 ../route.c:85 -+#: ../arp.c:635 ../netstat.c:1503 ../route.c:86 -+#, c-format - msgid " -v, --verbose be verbose\n" - msgstr "" - " -v, --verbose bude vypisovat podrobné zprávy\n" - " o činnosti\n" - --#: ../arp.c:624 ../netstat.c:1437 ../route.c:86 --msgid " -n, --numeric dont resolve names\n" -+#: ../arp.c:636 ../netstat.c:1504 ../route.c:87 -+#, fuzzy, c-format -+msgid " -n, --numeric don't resolve names\n" - msgstr "" - " -n, --numeric nebude převádět číselné adresy\n" - " na kanonická jména\n" - --#: ../arp.c:625 -+#: ../arp.c:637 -+#, c-format - msgid "" - " -i, --device specify network interface (e.g. eth0)\n" - msgstr " -i, --device zadává sí»ové rozhraní (např. eth0)\n" - --#: ../arp.c:626 -+#: ../arp.c:638 -+#, c-format - msgid " -D, --use-device read <hwaddr> from given device\n" - msgstr " -D, --use-device čte <hwadr> ze zadaného zařízení\n" - --#: ../arp.c:627 --#, fuzzy -+#: ../arp.c:639 -+#, fuzzy, c-format - msgid " -A, -p, --protocol specify protocol family\n" - msgstr " -r, --route vypíąe směrovací tabulku\n" - --#: ../arp.c:628 --#, fuzzy -+#: ../arp.c:640 -+#, fuzzy, c-format - msgid "" --" -f, --file read new entries from file or from " --"/etc/ethers\n" -+" -f, --file read new entries from file or from /etc/" -+"ethers\n" - "\n" - msgstr "" - " -f, --file čte nové poloľky ze souboru\n" - "\n" - --#: ../arp.c:630 ../rarp.c:181 -+#: ../arp.c:642 ../rarp.c:182 - #, c-format - msgid " <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n" - msgstr "" - " <HW>=Pouľijte '-H <hw> pro zadání hardwarového typu adresy.\n" - " Implicitně: %s\n" - --#: ../arp.c:631 ../rarp.c:182 -+#: ../arp.c:643 ../rarp.c:183 -+#, c-format - msgid " List of possible hardware types (which support ARP):\n" - msgstr " Seznam moľných hardwarových typů (podporujících ARP):\n" - --#: ../arp.c:664 -+#: ../arp.c:677 ../arp.c:762 - #, c-format - msgid "%s: hardware type not supported!\n" - msgstr "hardwarový typ %s není podporován!\n" - --#: ../arp.c:668 -+#: ../arp.c:681 - #, c-format - msgid "%s: address family not supported!\n" - msgstr "třída adres %s není podporována!\n" - --#: ../arp.c:703 -+#: ../arp.c:716 -+#, c-format - msgid "arp: -N not yet supported.\n" - msgstr "arp: přepínač -N není zatím podporován\n" - --#: ../arp.c:713 -+#: ../arp.c:726 - #, c-format - msgid "arp: %s: unknown address family.\n" - msgstr "arp: neznámá třída adres %s.\n" - --#: ../arp.c:722 -+#: ../arp.c:735 - #, c-format - msgid "arp: %s: unknown hardware type.\n" - msgstr "arp: neznámý hardwarový typ %s.\n" - --#: ../arp.c:741 -+#: ../arp.c:754 - #, c-format - msgid "arp: %s: kernel only supports 'inet'.\n" - msgstr "arp: %s: jádro podporuje pouze 'inet'.\n" - --#: ../arp.c:746 -+#: ../arp.c:767 - #, c-format - msgid "arp: %s: hardware type without ARP support.\n" - msgstr "arp: hardwarový typ %s nepodporuje ARP.\n" - --#: ../hostname.c:69 -+#: ../hostname.c:71 - #, c-format - msgid "Setting nodename to `%s'\n" - msgstr "Nastavuji jméno uzlu na `%s'\n" - --#: ../hostname.c:74 -+#: ../hostname.c:76 - #, c-format - msgid "%s: you must be root to change the node name\n" - msgstr "%s: jméno uzlu můľe změnit pouze superuľivatel\n" - --#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116 -+#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117 - #, c-format - msgid "%s: name too long\n" - msgstr "jméno %s je přílią dlouhé\n" - --#: ../hostname.c:89 -+#: ../hostname.c:91 - #, c-format - msgid "Setting hostname to `%s'\n" - msgstr "Nastavuji jméno počítače na `%s'\n" - --#: ../hostname.c:94 -+#: ../hostname.c:96 - #, c-format - msgid "%s: you must be root to change the host name\n" - msgstr "%s: jméno počítače můľe změnit pouze superuľivatel\n" - --#: ../hostname.c:108 -+#: ../hostname.c:109 - #, c-format - msgid "Setting domainname to `%s'\n" - msgstr "Nastavuji jméno domény na `%s'\n" - --#: ../hostname.c:113 -+#: ../hostname.c:114 - #, c-format - msgid "%s: you must be root to change the domain name\n" - msgstr "%s: jméno domény můľe změnit pouze superuľivatel\n" -@@ -306,26 +326,29 @@ - msgid "Result: h_addr_list=`%s'\n" - msgstr "Výsledek: h_addr_list=`%s'\n" - --#: ../hostname.c:209 -+#: ../hostname.c:208 - #, c-format - msgid "%s: can't open `%s'\n" - msgstr "%s: `%s' nelze otevřít\n" - --#: ../hostname.c:223 -+#: ../hostname.c:222 -+#, c-format - msgid "Usage: hostname [-v] {hostname|-F file} set hostname (from file)\n" - msgstr "" - "Pouľití:\n" - " hostname [-v] {jméno|-F soubor} nastaví jméno počítače (ze " - "souboru)\n" - --#: ../hostname.c:224 -+#: ../hostname.c:223 -+#, c-format - msgid "" - " domainname [-v] {nisdomain|-F file} set NIS domainname (from file)\n" - msgstr "" - " domainname [-v] {jméno|-F soubor} nastaví jméno NIS domény (ze\n" - " souboru)\n" - --#: ../hostname.c:226 -+#: ../hostname.c:225 -+#, c-format - msgid "" - " nodename [-v] {nodename|-F file} set DECnet node name (from " - "file)\n" -@@ -333,11 +356,13 @@ - " nodename [-v] {jméno|-F soubor} nastaví jméno DECnet uzlu (ze\n" - " souboru)\n" - --#: ../hostname.c:228 -+#: ../hostname.c:227 -+#, c-format - msgid " hostname [-v] [-d|-f|-s|-a|-i|-y|-n] display formatted name\n" - msgstr " hostname [-v] [-d|-f|-s|-a|-i|-y|-n] vypíąe formátované jméno\n" - --#: ../hostname.c:229 -+#: ../hostname.c:228 -+#, c-format - msgid "" - " hostname [-v] display hostname\n" - "\n" -@@ -345,7 +370,8 @@ - " hostname [-v] vypíąe jméno počítače\n" - "\n" - --#: ../hostname.c:230 -+#: ../hostname.c:229 -+#, c-format - msgid "" - " hostname -V|--version|-h|--help print info and exit\n" - "\n" -@@ -353,7 +379,8 @@ - " hostname -V|--version|-h|--help vypíąe informace a skončí\n" - "\n" - --#: ../hostname.c:231 -+#: ../hostname.c:230 -+#, c-format - msgid "" - " dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" - "\n" -@@ -361,35 +388,43 @@ - " dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" - "\n" - --#: ../hostname.c:232 -+#: ../hostname.c:231 -+#, c-format - msgid " -s, --short short host name\n" - msgstr " -s, --short krátké jméno počítače\n" - --#: ../hostname.c:233 -+#: ../hostname.c:232 -+#, c-format - msgid " -a, --alias alias names\n" - msgstr " -a, --alias přezdívky\n" - --#: ../hostname.c:234 -+#: ../hostname.c:233 -+#, c-format - msgid " -i, --ip-address addresses for the hostname\n" - msgstr " -i, --ip-address adresy odpovídající jménu počítače\n" - --#: ../hostname.c:235 -+#: ../hostname.c:234 -+#, c-format - msgid " -f, --fqdn, --long long host name (FQDN)\n" - msgstr " -f, --fqdn, --long dlouhé jméno počítače (kanonické)\n" - --#: ../hostname.c:236 -+#: ../hostname.c:235 -+#, c-format - msgid " -d, --domain DNS domain name\n" - msgstr " -d, --domain jméno DNS domény\n" - --#: ../hostname.c:237 -+#: ../hostname.c:236 -+#, c-format - msgid " -y, --yp, --nis NIS/YP domainname\n" - msgstr " -y, --yp, --nis jméno NIS/YP domény\n" - --#: ../hostname.c:239 -+#: ../hostname.c:238 -+#, c-format - msgid " -n, --node DECnet node name\n" - msgstr " -n, --node jméno DECnet uzlu\n" - --#: ../hostname.c:241 -+#: ../hostname.c:240 -+#, c-format - msgid "" - " -F, --file read hostname or NIS domainname from given file\n" - "\n" -@@ -397,7 +432,8 @@ - " -F, --file čte jméno počítače či nis domény ze souboru\n" - "\n" - --#: ../hostname.c:243 -+#: ../hostname.c:242 -+#, c-format - msgid "" - " This command can read or set the hostname or the NIS domainname. You can\n" - " also read the DNS domain or the FQDN (fully qualified domain name).\n" -@@ -412,6 +448,7 @@ - msgstr "%s: Tímto příkazem nelze DNS jméno domény změnit\n" - - #: ../hostname.c:339 -+#, c-format - msgid "" - "\n" - "Unless you are using bind or NIS for host lookups you can change the DNS\n" -@@ -421,6 +458,7 @@ - "změnit\n" - - #: ../hostname.c:340 -+#, c-format - msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n" - msgstr "" - "DNS jméno domény (je součástí kanonického jména počítače) v souboru\n" -@@ -441,349 +479,223 @@ - msgid "getnodename()=`%s'\n" - msgstr "getnodename()=`%s'\n" - --#: ../ifconfig.c:159 --#, c-format --msgid "%-9.9s Link encap:%s " --msgstr "%-9.9s Zapouzdření:%s " -+#: ../ifconfig.c:107 -+#, fuzzy, c-format -+msgid "" -+"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " -+"Flg\n" -+msgstr "" -+"Rozhr MTU Met PŘ-OK PŘ-CHYB PŘ-ZAH PŘ-PŘT OD-OK OD-CHYB OD-ZAH OD-PŘT " -+"PŘZ\n" - --#: ../ifconfig.c:164 --#, c-format --msgid "HWaddr %s " --msgstr "HWadr %s " -+#: ../ifconfig.c:129 ../ifconfig.c:161 -+#, fuzzy, c-format -+msgid "%s: ERROR while getting interface flags: %s\n" -+msgstr "%s: chyba při získávání informací o rozhraní %s\n" - --#: ../ifconfig.c:167 -+#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862 -+#: ../ifconfig.c:973 - #, c-format --msgid "Media:%s" --msgstr "Médium:%s" -+msgid "No support for INET on this system.\n" -+msgstr "Tento systém nepodporuje INET.\n" - --#: ../ifconfig.c:169 --msgid "(auto)" --msgstr "(auto)" -+#: ../ifconfig.c:193 -+#, fuzzy, c-format -+msgid "%s: ERROR while testing interface flags: %s\n" -+msgstr "%s: chyba při získávání informací o rozhraní %s\n" - --#: ../ifconfig.c:176 --#, c-format --msgid " %s addr:%s " --msgstr " %s adr:%s " -+#: ../ifconfig.c:202 -+#, fuzzy, c-format -+msgid "" -+"Usage:\n" -+" ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n" -+msgstr "" -+"Pouľití:\n" -+" ifconfig [-a] [-i] [-v] <rozhraní> [[<AF>] <adresa>]\n" - --#: ../ifconfig.c:179 -+#: ../ifconfig.c:204 - #, c-format --msgid " P-t-P:%s " --msgstr " P-t-P:%s " -+msgid " [add <address>[/<prefixlen>]]\n" -+msgstr " [add <adresa>[/<délka prefixu>]]\n" - --# V ostatních katalozích se překládá Broadcast -> vąesměrové vysílání. --# Tudiľ bcast -> Vąesměr :) --#: ../ifconfig.c:182 -+#: ../ifconfig.c:205 - #, c-format --msgid " Bcast:%s " --msgstr " Vąesměr:%s " -+msgid " [del <address>[/<prefixlen>]]\n" -+msgstr " [del <adresa>[/<délka prefixu>]]\n" - --#: ../ifconfig.c:184 -+#: ../ifconfig.c:206 - #, c-format --msgid " Mask:%s\n" --msgstr "Maska:%s\n" -+msgid " [[-]broadcast [<address>]] [[-]pointopoint [<address>]]\n" -+msgstr " [[-]broadcast [<adresa>]] [[-]pointopoint [<adresa>]]\n" - --#: ../ifconfig.c:201 -+#: ../ifconfig.c:207 - #, c-format --msgid " inet6 addr: %s/%d" --msgstr " inet6-adr: %s/%d" -+msgid " [netmask <address>] [dstaddr <address>] [tunnel <address>]\n" -+msgstr " [netmask <adresa>] [dstaddr <adresa>] [tunnel <adresa>]\n" - --#: ../ifconfig.c:203 --msgid " Scope:" --msgstr " Rozsah:" -+#: ../ifconfig.c:210 -+#, c-format -+msgid " [outfill <NN>] [keepalive <NN>]\n" -+msgstr " [outfill <NN>] [keepalive <NN>]\n" - --#: ../ifconfig.c:206 --msgid "Global" --msgstr "Globál" -+#: ../ifconfig.c:212 -+#, c-format -+msgid " [hw <HW> <address>] [metric <NN>] [mtu <NN>]\n" -+msgstr " [hw <HW> <adresa>] [metric <NN>] [mtu <NN>]\n" - --#: ../ifconfig.c:209 --msgid "Link" --msgstr "Linka" -+#: ../ifconfig.c:213 -+#, c-format -+msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" -+msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" - --#: ../ifconfig.c:212 --msgid "Site" --msgstr "Stanoviątě" -+#: ../ifconfig.c:214 -+#, c-format -+msgid " [multicast] [[-]promisc]\n" -+msgstr " [multicast] [[-]promisc]\n" - - #: ../ifconfig.c:215 --msgid "Compat" --msgstr "Kompatibilita" -+#, c-format -+msgid " [mem_start <NN>] [io_addr <NN>] [irq <NN>] [media <type>]\n" -+msgstr " [mem_start <NN>] [io_addr <NN>] [irq <NN>] [media <typ>]\n" - --#: ../ifconfig.c:218 --msgid "Host" --msgstr "Počítač" -+#: ../ifconfig.c:217 -+#, c-format -+msgid " [txqueuelen <NN>]\n" -+msgstr " [txqueuelen délka]\n" - --#: ../ifconfig.c:221 --msgid "Unknown" --msgstr "Neznám." -+#: ../ifconfig.c:220 -+#, c-format -+msgid " [[-]dynamic]\n" -+msgstr " [[-]dynamic]\n" - --#: ../ifconfig.c:236 -+#: ../ifconfig.c:222 - #, c-format --msgid " IPX/Ethernet II addr:%s\n" --msgstr " IPX/Ethernet II adr: %s\n" -+msgid "" -+" [up|down] ...\n" -+"\n" -+msgstr "" -+" [up|down] ...\n" -+"\n" - --#: ../ifconfig.c:239 -+#: ../ifconfig.c:224 - #, c-format --msgid " IPX/Ethernet SNAP addr:%s\n" --msgstr " IPX/Ethernet SNAP adr:%s\n" -+msgid " <HW>=Hardware Type.\n" -+msgstr " <HW>=Hardwarový Typ.\n" - --#: ../ifconfig.c:242 -+#: ../ifconfig.c:225 - #, c-format --msgid " IPX/Ethernet 802.2 addr:%s\n" --msgstr " IPX/Ethernet 802.2 adr:%s\n" -+msgid " List of possible hardware types:\n" -+msgstr " Seznam moľných hardwarových typů:\n" - --#: ../ifconfig.c:245 -+#. 1 = ARPable -+#: ../ifconfig.c:227 - #, c-format --msgid " IPX/Ethernet 802.3 addr:%s\n" --msgstr " IPX/Ethernet 802.3 adr:%s\n" -+msgid " <AF>=Address family. Default: %s\n" -+msgstr " <AF>=třída adres. Implicitní: %s\n" - --#: ../ifconfig.c:255 -+#: ../ifconfig.c:228 - #, c-format --msgid " EtherTalk Phase 2 addr:%s\n" --msgstr " EtherTalk Phase 2 adr:%s\n" -+msgid " List of possible address families:\n" -+msgstr " Seznam moľných tříd adres:\n" - --#: ../ifconfig.c:264 -+#: ../ifconfig.c:303 - #, c-format --msgid " econet addr:%s\n" --msgstr " econet adr:%s\n" -+msgid "ifconfig: option `%s' not recognised.\n" -+msgstr "" - --# Hic sunt leones ... --#: ../ifconfig.c:270 --msgid "[NO FLAGS] " --msgstr "[®ÁDNÉ PŘÍZNAKY]" -+#: ../ifconfig.c:305 ../ifconfig.c:962 -+#, c-format -+msgid "ifconfig: `--help' gives usage information.\n" -+msgstr "" - --#: ../ifconfig.c:272 --msgid "UP " --msgstr "AKTIVOVÁNO " -+#: ../ifconfig.c:380 -+#, c-format -+msgid "Unknown media type.\n" -+msgstr "Neznámý typ média.\n" - --#: ../ifconfig.c:274 --msgid "BROADCAST " --msgstr "V©ESMĚROVÉ_VYSÍLÁNÍ " -+#: ../ifconfig.c:417 -+#, c-format -+msgid "" -+"Warning: Interface %s still in promisc mode... maybe other application is " -+"running?\n" -+msgstr "" - --#: ../ifconfig.c:276 --msgid "DEBUG " --msgstr "DEBUG " -+#: ../ifconfig.c:429 -+#, c-format -+msgid "Warning: Interface %s still in MULTICAST mode.\n" -+msgstr "" - --#: ../ifconfig.c:278 --msgid "LOOPBACK " --msgstr "SMYČKA " -+#: ../ifconfig.c:441 -+#, c-format -+msgid "Warning: Interface %s still in ALLMULTI mode.\n" -+msgstr "" - --#: ../ifconfig.c:280 --msgid "POINTOPOINT " --msgstr "POINTOPOINT " -+#: ../ifconfig.c:465 -+#, c-format -+msgid "Warning: Interface %s still in DYNAMIC mode.\n" -+msgstr "" - --# ?? --#: ../ifconfig.c:282 --msgid "NOTRAILERS " --msgstr "NOTRAILERS " -+#: ../ifconfig.c:523 -+#, c-format -+msgid "Warning: Interface %s still in BROADCAST mode.\n" -+msgstr "" - --#: ../ifconfig.c:284 --msgid "RUNNING " --msgstr "BĚ®Í " -+#: ../ifconfig.c:652 -+#, c-format -+msgid "Warning: Interface %s still in POINTOPOINT mode.\n" -+msgstr "" - --#: ../ifconfig.c:286 --msgid "NOARP " --msgstr "NEARP " -+#: ../ifconfig.c:684 -+#, c-format -+msgid "hw address type `%s' has no handler to set address. failed.\n" -+msgstr "" - --#: ../ifconfig.c:288 --msgid "PROMISC " --msgstr "PROMISK " -+#: ../ifconfig.c:693 -+#, c-format -+msgid "%s: invalid %s address.\n" -+msgstr "%s: adresa %s je nesprávná.\n" - --#: ../ifconfig.c:290 --msgid "ALLMULTI " --msgstr "ALLMULTI " -+#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913 -+#, c-format -+msgid "No support for INET6 on this system.\n" -+msgstr "Tento systém nepodporuje INET6.\n" - --#: ../ifconfig.c:292 --msgid "SLAVE " --msgstr "SLAVE " -+#: ../ifconfig.c:780 ../ifconfig.c:871 -+#, c-format -+msgid "Interface %s not initialized\n" -+msgstr "" - --#: ../ifconfig.c:294 --msgid "MASTER " --msgstr "MASTER " -+#: ../ifconfig.c:792 ../ifconfig.c:882 -+#, fuzzy, c-format -+msgid "Bad address.\n" -+msgstr "%s: adresa %s je nesprávná.\n" - --#: ../ifconfig.c:296 --msgid "MULTICAST " --msgstr "MULTICAST " -- --#: ../ifconfig.c:299 --msgid "DYNAMIC " --msgstr "DYNAMIC " -- --#: ../ifconfig.c:302 --#, c-format --msgid " MTU:%d Metric:%d" --msgstr " MTU:%d Metrika:%d" -- --#: ../ifconfig.c:306 --#, c-format --msgid " Outfill:%d Keepalive:%d" --msgstr " Outfill:%d Keepalive:%d" -- --#: ../ifconfig.c:320 --#, c-format --msgid "RX packets:%lu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" --msgstr "přijmutých paketů:%lu chyb:%lu zahozeno:%lu přetečení:%lu rámců:%lu\n" -- --#: ../ifconfig.c:325 --#, c-format --msgid " compressed:%lu\n" --msgstr " komprimováno:%lu\n" -- --# carrier? --#: ../ifconfig.c:329 --#, c-format --msgid "TX packets:%lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" --msgstr "odeslaných paketů:%lu chyb:%lu zahozeno:%lu přetečení:%lu přenos:%lu\n" -- --#: ../ifconfig.c:333 --#, c-format --msgid " collisions:%lu " --msgstr " kolizí:%lu " -- --#: ../ifconfig.c:335 --#, c-format --msgid "compressed:%lu " --msgstr "komprimováno:%lu " -- --#: ../ifconfig.c:337 --#, c-format --msgid "txqueuelen:%d " --msgstr "délka odchozí fronty:%d " -- --#: ../ifconfig.c:345 --#, c-format --msgid "Interrupt:%d " --msgstr "Přeruąení:%d " -- --#. Only print devices using it for --#. I/O maps --#: ../ifconfig.c:348 --#, c-format --msgid "Base address:0x%x " --msgstr "Vstupně/Výstupní port:0x%x " -- --#: ../ifconfig.c:350 --#, c-format --msgid "Memory:%lx-%lx " --msgstr "Pamě»:%lx-%lx " -- --#: ../ifconfig.c:353 --#, c-format --msgid "DMA chan:%x " --msgstr "Kanál DMA:%x " -- --#: ../ifconfig.c:384 ../ifconfig.c:405 --#, c-format --msgid "%s: unknown interface: %s\n" --msgstr "%s: rozhraní %s není známo\n" -- --#: ../ifconfig.c:421 --msgid "" --"Usage:\n" --" ifconfig [-a] [-i] [-v] <interface> [[<AF>] <address>]\n" --msgstr "" --"Pouľití:\n" --" ifconfig [-a] [-i] [-v] <rozhraní> [[<AF>] <adresa>]\n" -- --#: ../ifconfig.c:425 --msgid " [add <address>[/<prefixlen>]]\n" --msgstr " [add <adresa>[/<délka prefixu>]]\n" -- --#: ../ifconfig.c:427 --msgid " [del <address>[/<prefixlen>]]\n" --msgstr " [del <adresa>[/<délka prefixu>]]\n" -- --#: ../ifconfig.c:432 --msgid " [[-]broadcast [<address>]] [[-]pointopoint [<address>]]\n" --msgstr " [[-]broadcast [<adresa>]] [[-]pointopoint [<adresa>]]\n" -- --#: ../ifconfig.c:433 --msgid " [netmask <address>] [dstaddr <address>] [tunnel <address>]\n" --msgstr " [netmask <adresa>] [dstaddr <adresa>] [tunnel <adresa>]\n" -- --#: ../ifconfig.c:436 --msgid " [outfill <NN>] [keepalive <NN>]\n" --msgstr " [outfill <NN>] [keepalive <NN>]\n" -- --#: ../ifconfig.c:438 --msgid " [hw <HW> <address>] [metric <NN>] [mtu <NN>]\n" --msgstr " [hw <HW> <adresa>] [metric <NN>] [mtu <NN>]\n" -- --#: ../ifconfig.c:439 --msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" --msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" -- --#: ../ifconfig.c:440 --msgid " [multicast] [[-]promisc]\n" --msgstr " [multicast] [[-]promisc]\n" -- --#: ../ifconfig.c:441 --msgid " [mem_start <NN>] [io_addr <NN>] [irq <NN>] [media <type>]\n" --msgstr " [mem_start <NN>] [io_addr <NN>] [irq <NN>] [media <typ>]\n" -- --#: ../ifconfig.c:443 --msgid " [txqueuelen <NN>]\n" --msgstr " [txqueuelen délka]\n" -- --#: ../ifconfig.c:446 --msgid " [[-]dynamic]\n" --msgstr " [[-]dynamic]\n" -- --#: ../ifconfig.c:448 --msgid "" --" [up|down] ...\n" --"\n" --msgstr "" --" [up|down] ...\n" --"\n" -- --#: ../ifconfig.c:450 --msgid " <HW>=Hardware Type.\n" --msgstr " <HW>=Hardwarový Typ.\n" -- --#: ../ifconfig.c:451 --msgid " List of possible hardware types:\n" --msgstr " Seznam moľných hardwarových typů:\n" -- --#. 1 = ARPable --#: ../ifconfig.c:453 --#, c-format --msgid " <AF>=Address family. Default: %s\n" --msgstr " <AF>=třída adres. Implicitní: %s\n" -- --#: ../ifconfig.c:454 --msgid " List of possible address families:\n" --msgstr " Seznam moľných tříd adres:\n" -- --#: ../ifconfig.c:593 --msgid "Unknown media type.\n" --msgstr "Neznámý typ média.\n" -- --#: ../ifconfig.c:881 -+#: ../ifconfig.c:885 - #, c-format --msgid "%s: invalid %s address.\n" --msgstr "%s: adresa %s je nesprávná.\n" -- --#: ../ifconfig.c:920 ../ifconfig.c:963 ../ifconfig.c:1011 --msgid "No support for INET6 on this system.\n" --msgstr "Tento systém nepodporuje INET6.\n" -- --#: ../ifconfig.c:983 - msgid "Address deletion not supported on this system.\n" - msgstr "Tento systém nepodporuje mazání adres.\n" - --#: ../ifconfig.c:1066 --msgid "No support for INET on this system.\n" --msgstr "Tento systém nepodporuje INET.\n" -+#: ../ifconfig.c:957 -+#, fuzzy, c-format -+msgid "ifconfig: Cannot set address for this protocol family.\n" -+msgstr "Nevím, jak nastavit adresu třídy %d.\n" - --#: ../ifconfig.c:1076 -+#: ../ifconfig.c:983 -+#, c-format - msgid "No support for ECONET on this system.\n" - msgstr "Tento systém nepodporuje ECONET.\n" - --#: ../ifconfig.c:1084 -+#: ../ifconfig.c:991 - #, c-format - msgid "Don't know how to set addresses for family %d.\n" - msgstr "Nevím, jak nastavit adresu třídy %d.\n" - --#: ../netstat.c:383 -+#: ../ifconfig.c:1021 -+#, c-format -+msgid "WARNING: at least one error occured. (%d)\n" -+msgstr "" -+ -+#: ../netstat.c:434 - #, c-format - msgid "" - "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n" -@@ -792,7 +704,8 @@ - "jste\n" - "byl superuľivatelem)\n" - --#: ../netstat.c:387 -+#: ../netstat.c:438 -+#, c-format - msgid "" - "(Not all processes could be identified, non-owned process info\n" - " will not be shown, you would have to be root to see it all.)\n" -@@ -801,199 +714,223 @@ - "pouze o procesech, jichľ jste vlastníkem. Aby jste mohl vidět vąe, musel\n" - "byste být superuľivatelem.)\n" - --#: ../netstat.c:394 ../netstat.c:1089 ../netstat.c:1166 -+#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266 - msgid "LISTENING" - msgstr "NASLOUCHÁ" - --#: ../netstat.c:395 -+#: ../netstat.c:446 - msgid "CONN SENT" - msgstr "CONN ODESLÁN" - --#: ../netstat.c:396 ../netstat.c:1168 -+#: ../netstat.c:447 ../netstat.c:1268 - msgid "DISC SENT" - msgstr "DISC ODESLÁN" - --#: ../netstat.c:397 ../netstat.c:464 ../netstat.c:809 ../netstat.c:1169 -+#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269 - msgid "ESTABLISHED" - msgstr "SPOJENO" - --#: ../netstat.c:419 -+#: ../netstat.c:470 -+#, c-format - msgid "Active NET/ROM sockets\n" - msgstr "Aktivní NET/ROM sokety\n" - --#: ../netstat.c:420 -+#: ../netstat.c:471 -+#, c-format - msgid "" --"User Dest Source Device State Vr/Vs Send-Q " --"Recv-Q\n" -+"User Dest Source Device State Vr/Vs Send-Q Recv-" -+"Q\n" - msgstr "" --"Uľivatel Cíl Zdroj Zařízení Stav Vr/Vs Odch-F " --"Přích-F\n" -+"Uľivatel Cíl Zdroj Zařízení Stav Vr/Vs Odch-F Přích-" -+"F\n" - --#: ../netstat.c:430 ../netstat.c:1208 -+#: ../netstat.c:481 ../netstat.c:1308 - #, c-format - msgid "Problem reading data from %s\n" - msgstr "Chyba při čtení dat z %s\n" - - # následující raději ponechat v originále ?! --#: ../netstat.c:465 -+#: ../netstat.c:516 - msgid "SYN_SENT" - msgstr "SYN_SENT" - --#: ../netstat.c:466 -+#: ../netstat.c:517 - msgid "SYN_RECV" - msgstr "SYN_RECV" - --#: ../netstat.c:467 -+#: ../netstat.c:518 - msgid "FIN_WAIT1" - msgstr "FIN_WAIT1" - --#: ../netstat.c:468 -+#: ../netstat.c:519 - msgid "FIN_WAIT2" - msgstr "FIN_WAIT2" - --#: ../netstat.c:469 -+#: ../netstat.c:520 - msgid "TIME_WAIT" - msgstr "TIME_WAIT" - --#: ../netstat.c:470 -+#: ../netstat.c:521 - msgid "CLOSE" - msgstr "ZAVŘEN" - --#: ../netstat.c:471 -+#: ../netstat.c:522 - msgid "CLOSE_WAIT" - msgstr "CLOSE_WAIT" - --#: ../netstat.c:472 -+#: ../netstat.c:523 - msgid "LAST_ACK" - msgstr "POSLEDNÍ ACK" - --#: ../netstat.c:473 -+#: ../netstat.c:524 - msgid "LISTEN" - msgstr "LISTEN" - --#: ../netstat.c:474 -+#: ../netstat.c:525 - msgid "CLOSING" - msgstr "ZAVíRÁ" - --#: ../netstat.c:544 -+#: ../netstat.c:596 - #, c-format - msgid "warning, got bogus igmp6 line %d.\n" - msgstr "varování, nesmyslný igmp6 řádek %d.\n" - --#: ../netstat.c:549 ../netstat.c:587 ../netstat.c:670 ../netstat.c:803 --#: ../netstat.c:935 ../netstat.c:940 -+#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898 -+#: ../netstat.c:1032 ../netstat.c:1037 - #, c-format - msgid "netstat: unsupported address family %d !\n" - msgstr "netstat: třída adres %d není podporována !\n" - --#: ../netstat.c:562 ../netstat.c:567 ../netstat.c:575 ../netstat.c:582 -+#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634 - #, c-format - msgid "warning, got bogus igmp line %d.\n" - msgstr "varování, nesmyslný igmp řádek %d.\n" - --#: ../netstat.c:666 -+#: ../netstat.c:677 -+#, fuzzy, c-format -+msgid "Active X.25 sockets\n" -+msgstr "Aktivní AX.25 sokety\n" -+ -+#. IMHO, Vr/Vs is not very usefull --SF -+#: ../netstat.c:679 -+#, fuzzy, c-format -+msgid "" -+"Dest Source Device LCI State Vr/Vs Send-Q Recv-" -+"Q\n" -+msgstr "Cíl Zdroj Zaříz Stav Vr/Vs Odhod-F Přích-F\n" -+ -+#: ../netstat.c:759 -+#, c-format - msgid "warning, got bogus tcp line.\n" - msgstr "varování, nesmyslný tcp řádek.\n" - --#: ../netstat.c:704 ../netstat.c:855 ../netstat.c:975 -+#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075 - #, c-format - msgid "off (0.00/%ld/%d)" - msgstr "vyp (0.00/%ld/%d)" - --#: ../netstat.c:708 -+#: ../netstat.c:804 - #, fuzzy, c-format - msgid "on (%2.2f/%ld/%d)" - msgstr "zap%d (%2.2f/%ld/%d)" - --#: ../netstat.c:713 -+#: ../netstat.c:809 - #, fuzzy, c-format - msgid "keepalive (%2.2f/%ld/%d)" - msgstr "zap%d (%2.2f/%ld/%d)" - --#: ../netstat.c:718 -+#: ../netstat.c:814 - #, fuzzy, c-format - msgid "timewait (%2.2f/%ld/%d)" - msgstr "zap%d (%2.2f/%ld/%d)" - --#: ../netstat.c:723 ../netstat.c:864 ../netstat.c:985 -+#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085 - #, c-format - msgid "unkn-%d (%2.2f/%ld/%d)" - msgstr "nezn-%d (%2.2f/%ld/%d)" - --#: ../netstat.c:799 -+#: ../netstat.c:894 -+#, c-format - msgid "warning, got bogus udp line.\n" - msgstr "varování, nesmyslný udp řádek.\n" - --#: ../netstat.c:817 ../netstat.c:1075 ../netstat.c:1108 -+#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208 - msgid "UNKNOWN" - msgstr "NEZNÁM" - --#: ../netstat.c:860 ../netstat.c:980 -+#: ../netstat.c:958 ../netstat.c:1080 - #, c-format - msgid "on%d (%2.2f/%ld/%d)" - msgstr "zap%d (%2.2f/%ld/%d)" - --#: ../netstat.c:949 -+#: ../netstat.c:1046 -+#, c-format - msgid "warning, got bogus raw line.\n" - msgstr "varování, nesmyslný 'raw' řádek.\n" - --#: ../netstat.c:1028 -+#: ../netstat.c:1128 -+#, c-format - msgid "warning, got bogus unix line.\n" - msgstr "varování, netstat 'unix' řádek.\n" - --#: ../netstat.c:1055 -+#: ../netstat.c:1155 - msgid "STREAM" - msgstr "STREAM" - --#: ../netstat.c:1059 -+#: ../netstat.c:1159 - msgid "DGRAM" - msgstr "DGRAM" - --#: ../netstat.c:1063 -+#: ../netstat.c:1163 - msgid "RAW" - msgstr "RAW" - --#: ../netstat.c:1067 -+#: ../netstat.c:1167 - msgid "RDM" - msgstr "RDM" - --#: ../netstat.c:1071 -+#: ../netstat.c:1171 - msgid "SEQPACKET" - msgstr "SEQPACKET" - --#: ../netstat.c:1080 -+#: ../netstat.c:1180 - msgid "FREE" - msgstr "NEALOKOVÁN" - --#: ../netstat.c:1096 -+#: ../netstat.c:1196 - msgid "CONNECTING" - msgstr "SPOJUJE" - --#: ../netstat.c:1100 -+#: ../netstat.c:1200 - msgid "CONNECTED" - msgstr "SPOJEN" - --#: ../netstat.c:1104 -+#: ../netstat.c:1204 - msgid "DISCONNECTING" - msgstr "ODPOJUJE" - --#: ../netstat.c:1135 -+#: ../netstat.c:1235 -+#, c-format - msgid "Active UNIX domain sockets " - msgstr "Aktivní sokety domény UNIX " - --#: ../netstat.c:1137 ../netstat.c:1666 -+#: ../netstat.c:1237 ../netstat.c:1756 -+#, c-format - msgid "(servers and established)" - msgstr "(servery a navázaná spojení)" - --#: ../netstat.c:1140 ../netstat.c:1669 -+#: ../netstat.c:1240 ../netstat.c:1759 -+#, c-format - msgid "(only servers)" - msgstr "(pouze servery)" - --#: ../netstat.c:1142 ../netstat.c:1671 -+#: ../netstat.c:1242 ../netstat.c:1761 -+#, c-format - msgid "(w/o servers)" - msgstr "(w/o servery)" - --#: ../netstat.c:1145 -+#: ../netstat.c:1245 -+#, c-format - msgid "" - "\n" - "Proto RefCnt Flags Type State I-Node" -@@ -1001,90 +938,92 @@ - "\n" - "Proto Čítač Příznaky Typ Stav I-Uzel" - --#: ../netstat.c:1147 -+#: ../netstat.c:1247 -+#, c-format - msgid " Path\n" - msgstr " Cesta\n" - --#: ../netstat.c:1167 -+#: ../netstat.c:1267 - msgid "SABM SENT" - msgstr "SABM ODESLÁN" - --#: ../netstat.c:1170 -+#: ../netstat.c:1270 - msgid "RECOVERY" - msgstr "OBNOVA" - --#: ../netstat.c:1184 -+#: ../netstat.c:1284 -+#, c-format - msgid "Active AX.25 sockets\n" - msgstr "Aktivní AX.25 sokety\n" - --#: ../netstat.c:1185 -+#: ../netstat.c:1285 -+#, c-format - msgid "Dest Source Device State Vr/Vs Send-Q Recv-Q\n" - msgstr "Cíl Zdroj Zaříz Stav Vr/Vs Odhod-F Přích-F\n" - --#: ../netstat.c:1228 -+#: ../netstat.c:1328 - #, c-format - msgid "problem reading data from %s\n" - msgstr "chyba při čtení dat z %s\n" - --#: ../netstat.c:1279 -+#: ../netstat.c:1379 -+#, c-format - msgid "" - "Active IPX sockets\n" - "Proto Recv-Q Send-Q Local Address Foreign Address " - "State" - msgstr "" - "Aktivní IPX sokety\n" --"Proto Přích-F Odch-F Lokál adresa Vzdálená adresa " --" Stav" -+"Proto Přích-F Odch-F Lokál adresa Vzdálená " -+"adresa Stav" - --#: ../netstat.c:1281 -+#: ../netstat.c:1381 -+#, c-format - msgid " User" - msgstr " Uľivatel" - --#: ../netstat.c:1315 -+#: ../netstat.c:1415 - msgid "ESTAB" - msgstr "SPOJEN" - --#: ../netstat.c:1323 -+#: ../netstat.c:1423 - msgid "UNK." - msgstr "NEZ." - --#: ../netstat.c:1367 --msgid " - no statistics available -" --msgstr " - statistická data nejsou dostupná -" -- --#: ../netstat.c:1370 --msgid "[NO FLAGS]" --msgstr "[®ÁDNÉ PŘÍZNAKY]" -- --#: ../netstat.c:1400 -+#: ../netstat.c:1461 -+#, c-format - msgid "Kernel Interface table\n" - msgstr "Tabulka rozhraní v jádru\n" - --#: ../netstat.c:1401 -+#: ../netstat.c:1465 -+#, fuzzy, c-format - msgid "" --"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " -+"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " - "Flg\n" - msgstr "" - "Rozhr MTU Met PŘ-OK PŘ-CHYB PŘ-ZAH PŘ-PŘT OD-OK OD-CHYB OD-ZAH OD-PŘT " - "PŘZ\n" - --#: ../netstat.c:1404 -+#: ../netstat.c:1469 - msgid "missing interface information" - msgstr "chybí informace o rozhraní" - --#: ../netstat.c:1425 -+#: ../netstat.c:1492 -+#, c-format - msgid "" --"usage: netstat [-veenNcCF] [<Af>] -r netstat " --"{-V|--version|-h|--help}\n" -+"usage: netstat [-veenNcCF] [<Af>] -r netstat {-V|--version|-h|--" -+"help}\n" - msgstr "" --"Pouľití: netstat [--veenNcCF] [<TA>] -r netstat " --"{-V|--version|-h|--help}\n" -+"Pouľití: netstat [--veenNcCF] [<TA>] -r netstat {-V|--version|-h|--" -+"help}\n" - --#: ../netstat.c:1426 -+#: ../netstat.c:1493 -+#, c-format - msgid " netstat [-vnNcaeol] [<Socket> ...]\n" - msgstr " netstat [-vnNcaeol] [<Soket> ...]\n" - --#: ../netstat.c:1427 -+#: ../netstat.c:1494 -+#, c-format - msgid "" - " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" - "\n" -@@ -1092,27 +1031,32 @@ - " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" - "\n" - --#: ../netstat.c:1429 -+#: ../netstat.c:1496 -+#, c-format - msgid " -r, --route display routing table\n" - msgstr " -r, --route vypíąe směrovací tabulku\n" - --#: ../netstat.c:1430 -+#: ../netstat.c:1497 -+#, c-format - msgid " -i, --interfaces display interface table\n" - msgstr " -i, --interfaces vypíąe tabulku rozhraní\n" - --#: ../netstat.c:1431 -+#: ../netstat.c:1498 -+#, c-format - msgid " -g, --groups display multicast group memberships\n" - msgstr "" - " -g, --groups vypíąe členství v multicast skupinách\n" - --#: ../netstat.c:1432 -+#: ../netstat.c:1499 -+#, c-format - msgid "" - " -s, --statistics display networking statistics (like SNMP)\n" - msgstr "" - " -s, --statistics vypíąe statistiku sí»ové aktivity (jako " - "SNMP)\n" - --#: ../netstat.c:1434 -+#: ../netstat.c:1501 -+#, c-format - msgid "" - " -M, --masquerade display masqueraded connections\n" - "\n" -@@ -1120,20 +1064,45 @@ - " -M, --masquerade vypíąe maskovaná spojení\n" - "\n" - --#: ../netstat.c:1438 ../route.c:87 -+#: ../netstat.c:1505 -+#, fuzzy, c-format -+msgid " --numeric-hosts don't resolve host names\n" -+msgstr "" -+" -n, --numeric nebude převádět číselné adresy\n" -+" na kanonická jména\n" -+ -+#: ../netstat.c:1506 -+#, fuzzy, c-format -+msgid " --numeric-ports don't resolve port names\n" -+msgstr "" -+" -n, --numeric nebude převádět číselné adresy\n" -+" na kanonická jména\n" -+ -+#: ../netstat.c:1507 -+#, fuzzy, c-format -+msgid " --numeric-users don't resolve user names\n" -+msgstr "" -+" -n, --numeric nebude převádět číselné adresy\n" -+" na kanonická jména\n" -+ -+#: ../netstat.c:1508 -+#, c-format - msgid " -N, --symbolic resolve hardware names\n" - msgstr " -N, --symbolic převede hw jména\n" - --#: ../netstat.c:1439 ../route.c:88 -+#: ../netstat.c:1509 ../route.c:88 -+#, c-format - msgid " -e, --extend display other/more information\n" - msgstr " -e, --extend vypíąe podrobnějąí informace\n" - --#: ../netstat.c:1440 -+#: ../netstat.c:1510 -+#, c-format - msgid " -p, --programs display PID/Program name for sockets\n" - msgstr "" - " -p, --programs vypíąe PID/jméno programu pro sokety\n" - --#: ../netstat.c:1441 -+#: ../netstat.c:1511 -+#, c-format - msgid "" - " -c, --continuous continuous listing\n" - "\n" -@@ -1141,23 +1110,27 @@ - " -c, --continuous nepřeruąovaný výpis\n" - "\n" - --#: ../netstat.c:1442 -+#: ../netstat.c:1512 -+#, c-format - msgid " -l, --listening display listening server sockets\n" - msgstr "" - " -l, --listening vypíąe sokety, na nichľ je nasloucháno\n" - --#: ../netstat.c:1443 -+#: ../netstat.c:1513 -+#, c-format - msgid "" - " -a, --all, --listening display all sockets (default: connected)\n" - msgstr "" - " -a, --all, --listening vypíąe vąechny sokety (implicitně: " - "spojené)\n" - --#: ../netstat.c:1444 -+#: ../netstat.c:1514 -+#, c-format - msgid " -o, --timers display timers\n" - msgstr " -o, --timers zobrazí časovače\n" - --#: ../netstat.c:1445 ../route.c:89 -+#: ../netstat.c:1515 ../route.c:89 -+#, c-format - msgid "" - " -F, --fib display Forwarding Information Base " - "(default)\n" -@@ -1165,112 +1138,126 @@ - " -F, --fib zobrazí Forwarding Infomation Base\n" - " (implicitní)\n" - --#: ../netstat.c:1446 ../route.c:90 -+#: ../netstat.c:1516 ../route.c:90 -+#, c-format - msgid "" - " -C, --cache display routing cache instead of FIB\n" - "\n" - msgstr " -C, --cache místo FIB zobrazí směrovací cache\n" - --#: ../netstat.c:1448 -+#: ../netstat.c:1518 -+#, c-format - msgid "" --" <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx " --"--netrom\n" -+" <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" -+"netrom\n" - msgstr "" --" <Soket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx " --"--netrom\n" -+" <Soket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" -+"netrom\n" - --#: ../netstat.c:1449 ../route.c:92 --#, c-format --msgid " <AF>=Use '-A <af>' or '--<af>' Default: %s\n" -+#: ../netstat.c:1519 -+#, fuzzy, c-format -+msgid " <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n" - msgstr " <AF>=Pouľijte '-A <af>' or '--<af>' Implicitní: %s\n" - --#: ../netstat.c:1450 ../route.c:93 -+#: ../netstat.c:1520 ../route.c:93 -+#, c-format - msgid " List of possible address families (which support routing):\n" - msgstr " Seznam moľných tříd adres (podporujících směrování):\n" - --#: ../netstat.c:1663 -+#: ../netstat.c:1753 -+#, c-format - msgid "Active Internet connections " - msgstr "Aktivní Internetová spojení " - --#: ../netstat.c:1673 -+#: ../netstat.c:1763 -+#, c-format - msgid "" - "\n" --"Proto Recv-Q Send-Q Local Address Foreign Address State " --" " -+"Proto Recv-Q Send-Q Local Address Foreign Address " -+"State " - msgstr "" - "\n" - "Proto Přích-F Odch-F Místní Adresa Vzdálená Adresa Stav " - --#: ../netstat.c:1675 -+#: ../netstat.c:1765 -+#, c-format - msgid " User Inode " - msgstr " Uľivatel I-uzel " - --#: ../netstat.c:1678 -+#: ../netstat.c:1768 -+#, c-format - msgid " Timer" - msgstr " Časovač" - --#: ../netstat.c:1708 -+#: ../netstat.c:1798 -+#, c-format - msgid "IPv4 Group Memberships\n" - msgstr "Členství v IPv4 skupinách\n" - --#: ../netstat.c:1709 -+#: ../netstat.c:1799 -+#, c-format - msgid "Interface RefCnt Group\n" - msgstr "Rozhraní Čítač Skupina\n" - --#: ../rarp.c:43 -+#: ../rarp.c:44 - msgid "This kernel does not support RARP.\n" - msgstr "Toto jádro nepodporuje RARP.\n" - --#: ../rarp.c:82 -+#: ../rarp.c:83 - #, c-format - msgid "no RARP entry for %s.\n" - msgstr "pro %s neexistuje RARP poloľka.\n" - --#: ../rarp.c:95 -+#: ../rarp.c:96 - #, c-format - msgid "%s: bad hardware address\n" - msgstr "hardwarová adresa %s je nesprávná\n" - --#: ../rarp.c:127 -+#: ../rarp.c:128 - #, c-format - msgid "rarp: cannot open file %s:%s.\n" - msgstr "rarp: soubor %s:%s nelze otevřít.\n" - --#: ../rarp.c:139 -+#: ../rarp.c:140 - #, c-format - msgid "rarp: format error at %s:%u\n" - msgstr "rarp: syntaktická chyba na řádku %2$u souboru %1$s\n" - --#: ../rarp.c:143 ../rarp.c:287 -+#: ../rarp.c:144 ../rarp.c:289 - #, c-format - msgid "rarp: %s: unknown host\n" - msgstr "rarp: počítač %s není znám\n" - --#: ../rarp.c:146 -+#: ../rarp.c:147 - #, c-format - msgid "rarp: cannot set entry from %s:%u\n" - msgstr "rarp: nelze nastavit poloľku z řádku %2$u souboru %1$s\n" - --#: ../rarp.c:175 -+#: ../rarp.c:176 -+#, c-format - msgid "Usage: rarp -a list entries in cache.\n" - msgstr "Pouľití: rarp -a vypíąe poloľky z cache.\n" - --#: ../rarp.c:176 -+#: ../rarp.c:177 -+#, c-format - msgid " rarp -d <hostname> delete entry from cache.\n" - msgstr " rarp -d <jméno> smaľe poloľku z cache.\n" - --#: ../rarp.c:177 -+#: ../rarp.c:178 -+#, c-format - msgid " rarp [<HW>] -s <hostname> <hwaddr> add entry to cache.\n" - msgstr "" - " rarp [<HW>] -s <jméno> <hwadr> přidá poloľku do cache.\n" - --#: ../rarp.c:178 -+#: ../rarp.c:179 -+#, c-format - msgid "" - " rarp -f add entries from /etc/ethers.\n" - msgstr "" - " rarp -f přidá poloľky z /etc/ethers.\n" - --#: ../rarp.c:179 -+#: ../rarp.c:180 -+#, c-format - msgid "" - " rarp -V display program version.\n" - "\n" -@@ -1279,24 +1266,26 @@ - "programu.\n" - "\n" - --#: ../rarp.c:236 -+#: ../rarp.c:238 - #, c-format - msgid "%s: illegal option mix.\n" - msgstr "Kombinace přepínačů %s je nesprávná.\n" - --#: ../rarp.c:267 -+#: ../rarp.c:269 - #, c-format - msgid "rarp: %s: unknown hardware type.\n" - msgstr "rarp: hardwarový typ %s není znám.\n" - --#: ../route.c:79 -+#: ../route.c:80 -+#, c-format - msgid "" - "Usage: route [-nNvee] [-FC] [<AF>] List kernel routing tables\n" - msgstr "" - "Pouľití: route [-nNvee] [-FC] [<AF>] Zobrazí směrovací tabulky v " - "jádru\n" - --#: ../route.c:80 -+#: ../route.c:81 -+#, c-format - msgid "" - " route [-v] [-FC] {add|del|flush} ... Modify routing table for AF.\n" - "\n" -@@ -1305,14 +1294,16 @@ - "AF.\n" - "\n" - --#: ../route.c:82 -+#: ../route.c:83 -+#, c-format - msgid "" - " route {-h|--help} [<AF>] Detailed usage syntax for " - "specified AF.\n" - msgstr "" - " route {-h|--help [<AF>] Nápověda pro pouľití s AF.\n" - --#: ../route.c:83 -+#: ../route.c:84 -+#, c-format - msgid "" - " route {-V|--version} Display version/author and " - "exit.\n" -@@ -1321,15 +1312,23 @@ - " route {-V|--version} Vypíąe označení verze a autora\n" - " programu.\n" - -+#: ../route.c:92 -+#, fuzzy, c-format -+msgid " <AF>=Use '-A <af>' or '--<af>'; default: %s\n" -+msgstr " <AF>=Pouľijte '-A <af>' or '--<af>' Implicitní: %s\n" -+ - #: ../plipconfig.c:66 -+#, c-format - msgid "Usage: plipconfig [-a] [-i] [-v] interface\n" - msgstr "Pouľití: plipconfig [-a] [-i] [-v] rozhraní\n" - - #: ../plipconfig.c:67 -+#, c-format - msgid " [nibble NN] [trigger NN]\n" - msgstr " [nibble NN] [trigger NN]\n" - - #: ../plipconfig.c:68 -+#, c-format - msgid " plipconfig -V | --version\n" - msgstr " plipconfig -V | --version\n" - -@@ -1338,25 +1337,30 @@ - msgid "%s\tnibble %lu trigger %lu\n" - msgstr "%s\tnibble %lu trigger %lu\n" - --#: ../iptunnel.c:79 -+#: ../iptunnel.c:85 -+#, c-format - msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n" - msgstr "Pouľití: iptunnel { add | change | del | show } [ JMÉNO ]\n" - --#: ../iptunnel.c:80 -+#: ../iptunnel.c:86 -+#, c-format - msgid "" - " [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n" - msgstr "" - " [ mode { ipip | gre | sit } ] [ vzdálená ADR ] [ místní ADR ]\n" - --#: ../iptunnel.c:81 -+#: ../iptunnel.c:87 -+#, c-format - msgid " [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n" - msgstr " [ [i|o]seq ] [ [i|o]key KLÍČ ] [ [i|o]csum ]\n" - --#: ../iptunnel.c:82 -+#: ../iptunnel.c:88 -+#, c-format - msgid " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n" - msgstr " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev ZAŘÍZENÍ ]\n" - --#: ../iptunnel.c:83 -+#: ../iptunnel.c:89 -+#, c-format - msgid "" - " iptunnel -V | --version\n" - "\n" -@@ -1364,450 +1368,737 @@ - " iptunnel -V | --version\n" - "\n" - --#: ../iptunnel.c:84 -+#: ../iptunnel.c:90 -+#, c-format - msgid "Where: NAME := STRING\n" - msgstr "Kde: JMÉNO := ŘETĚZEC\n" - --#: ../iptunnel.c:85 -+#: ../iptunnel.c:91 -+#, c-format - msgid " ADDR := { IP_ADDRESS | any }\n" - msgstr " ADR := { IP-ADRESA | any }\n" - --#: ../iptunnel.c:86 -+#: ../iptunnel.c:92 -+#, c-format - msgid " TOS := { NUMBER | inherit }\n" - msgstr " TOS := { ČÍSLO | inherit }\n" - --#: ../iptunnel.c:87 -+#: ../iptunnel.c:93 -+#, c-format - msgid " TTL := { 1..255 | inherit }\n" - msgstr " TTL := { 1..255 | inherit }\n" - --#: ../iptunnel.c:88 -+#: ../iptunnel.c:94 -+#, c-format - msgid " KEY := { DOTTED_QUAD | NUMBER }\n" - msgstr " KLÍČ := { DOTTED_QUAD | ČÍSLO }\n" - --#: ../iptunnel.c:326 -+#: ../iptunnel.c:332 -+#, c-format - msgid "Keys are not allowed with ipip and sit.\n" - msgstr "S ipip a sit nejsou klíče povoleny.\n" - --#: ../iptunnel.c:346 -+#: ../iptunnel.c:352 -+#, c-format - msgid "Broadcast tunnel requires a source address.\n" - msgstr "Tunel se vąesměrovým vysíláním vyľaduje zdrojovou adresu.\n" - --#: ../iptunnel.c:361 -+#: ../iptunnel.c:367 -+#, c-format - msgid "ttl != 0 and noptmudisc are incompatible\n" - msgstr "ttl != 0 a noptmudisc se navzájem vylučují\n" - --#: ../iptunnel.c:373 -+#: ../iptunnel.c:379 -+#, c-format - msgid "cannot determine tunnel mode (ipip, gre or sit)\n" - msgstr "reľim tunelu (ipip, gre či sit) nelze zjistit\n" - --#: ../iptunnel.c:411 -+#: ../iptunnel.c:417 - #, c-format - msgid "%s: %s/ip remote %s local %s " - msgstr "%s: %s/ip vzdálený %s místní %s " - --#: ../iptunnel.c:415 -+#: ../iptunnel.c:421 - msgid "unknown" - msgstr "Neznám." - --#: ../iptunnel.c:447 -+#: ../iptunnel.c:453 -+#, c-format - msgid " Drop packets out of sequence.\n" - msgstr " Zahazuje pakety mimo pořadí.\n" - --#: ../iptunnel.c:449 -+#: ../iptunnel.c:455 -+#, c-format - msgid " Checksum in received packet is required.\n" - msgstr " Přijímané pakety musí mít kontrolní součet.\n" - - # ??? --#: ../iptunnel.c:451 -+#: ../iptunnel.c:457 -+#, c-format - msgid " Sequence packets on output.\n" - msgstr " Řadí odchozí pakety.\n" - --#: ../iptunnel.c:453 -+#: ../iptunnel.c:459 -+#, c-format - msgid " Checksum output packets.\n" - msgstr " Odchozí pakety budou mít kontrolní součet.\n" - --#: ../iptunnel.c:481 -+#: ../iptunnel.c:487 -+#, c-format - msgid "Wrong format of /proc/net/dev. Sorry.\n" - msgstr "Lituji, formát /proc/net/dev je chybný.\n" - --#: ../iptunnel.c:494 -+#: ../iptunnel.c:500 - #, c-format - msgid "Failed to get type of [%s]\n" - msgstr "Typ [%s] se nepodařilo zjistit.\n" - --#: ../iptunnel.c:510 -+#: ../iptunnel.c:516 -+#, c-format - msgid "RX: Packets Bytes Errors CsumErrs OutOfSeq Mcasts\n" - msgstr "RX: Pakety Bajty Chyby CsumChyb MimoPoř Mcasts\n" - --#: ../iptunnel.c:513 -+#: ../iptunnel.c:519 -+#, c-format - msgid "TX: Packets Bytes Errors DeadLoop NoRoute NoBufs\n" - msgstr "TX: Pakety Bajty Chyby DeadLoop NoRoute NoBufs\n" - --#: ../statistics.c:45 -+#: ../statistics.c:47 - msgid "ICMP input histogram:" - msgstr "histogram ICMP vstupu:" - --#: ../statistics.c:46 -+#: ../statistics.c:48 - msgid "ICMP output histogram:" - msgstr "histogram ICMP výstupu:" - --#: ../statistics.c:63 -+#: ../statistics.c:65 - #, c-format - msgid "Forwarding is %s" - msgstr "Předávání je %s" - --#: ../statistics.c:64 --#, c-format --msgid "Default TTL is %d" -+#: ../statistics.c:66 -+#, fuzzy, c-format -+msgid "Default TTL is %u" - msgstr "Implicitní TTL je %d" - --#: ../statistics.c:65 --#, c-format --msgid "%d total packets received" -+#: ../statistics.c:67 -+#, fuzzy, c-format -+msgid "%u total packets received" - msgstr "celkem přijmutých paketů: %d" - --#: ../statistics.c:66 --#, c-format --msgid "%d with invalid headers" -+#: ../statistics.c:68 -+#, fuzzy, c-format -+msgid "%u with invalid headers" - msgstr "s nesprávnými hlavičkami: %d" - --#: ../statistics.c:67 --#, c-format --msgid "%d with invalid addresses" -+#: ../statistics.c:69 -+#, fuzzy, c-format -+msgid "%u with invalid addresses" - msgstr "s nesprávnými adresami: %d" - --#: ../statistics.c:68 --#, c-format --msgid "%d forwarded" -+#: ../statistics.c:70 -+#, fuzzy, c-format -+msgid "%u forwarded" - msgstr "předáno: %d" - --#: ../statistics.c:69 --#, c-format --msgid "%d with unknown protocol" -+#: ../statistics.c:71 -+#, fuzzy, c-format -+msgid "%u with unknown protocol" - msgstr "s neznámým protokolem: %d" - --#: ../statistics.c:70 --#, c-format --msgid "%d incoming packets discarded" -+#: ../statistics.c:72 -+#, fuzzy, c-format -+msgid "%u incoming packets discarded" - msgstr "počet zahozených příchozích paketů: %d" - --#: ../statistics.c:71 --#, c-format --msgid "%d incoming packets delivered" -+#: ../statistics.c:73 -+#, fuzzy, c-format -+msgid "%u incoming packets delivered" - msgstr "počet doručených příchozích paketů: %d" - --#: ../statistics.c:72 --#, c-format --msgid "%d requests sent out" -+#: ../statistics.c:74 -+#, fuzzy, c-format -+msgid "%u requests sent out" - msgstr "počet odeslaných poľadavků: %d" - - #. ? --#: ../statistics.c:73 --#, c-format --msgid "%d outgoing packets dropped" -+#: ../statistics.c:75 -+#, fuzzy, c-format -+msgid "%u outgoing packets dropped" - msgstr "počet zahozených odchozích paketů: %d" - --#: ../statistics.c:74 --#, c-format --msgid "%d dropped because of missing route" -+#: ../statistics.c:76 -+#, fuzzy, c-format -+msgid "%u dropped because of missing route" - msgstr "zahozeno kvůli chybějící cestě: %d" - --#: ../statistics.c:75 --#, c-format --msgid "%d fragments dropped after timeout" -+#: ../statistics.c:77 -+#, fuzzy, c-format -+msgid "%u fragments dropped after timeout" - msgstr "počet fragmentů zahozených po vyprąení času: %d" - --#: ../statistics.c:76 --#, c-format --msgid "%d reassemblies required" -+#: ../statistics.c:78 -+#, fuzzy, c-format -+msgid "%u reassemblies required" - msgstr "počet nutných znovusestavení: %d" - - #. ? --#: ../statistics.c:77 --#, c-format --msgid "%d packets reassembled ok" -+#: ../statistics.c:79 -+#, fuzzy, c-format -+msgid "%u packets reassembled ok" - msgstr "počet v pořádku znovu sestavených paketů: %d" - --#: ../statistics.c:78 --#, c-format --msgid "%d packet reassembles failed" -+#: ../statistics.c:80 -+#, fuzzy, c-format -+msgid "%u packet reassembles failed" - msgstr "počet paketů, jeľ se nepodařilo znovu sestavit: %d" - --#: ../statistics.c:79 --#, c-format --msgid "%d fragments received ok" -+#: ../statistics.c:81 -+#, fuzzy, c-format -+msgid "%u fragments received ok" - msgstr "počet v pořádku přijmutých fragmentů: %d" - --#: ../statistics.c:80 --#, c-format --msgid "%d fragments failed" -+#: ../statistics.c:82 -+#, fuzzy, c-format -+msgid "%u fragments failed" - msgstr "počet chybných fragmentů: %d" - --#: ../statistics.c:81 --#, c-format --msgid "%d fragments created" -+#: ../statistics.c:83 -+#, fuzzy, c-format -+msgid "%u fragments created" - msgstr "počet vytvořených fragmentů: %d" - --#: ../statistics.c:86 --#, c-format --msgid "%d ICMP messages received" -+#: ../statistics.c:88 -+#, fuzzy, c-format -+msgid "%u ICMP messages received" - msgstr "počet přijmutých ICMP zpráv: %d" - --#: ../statistics.c:87 --#, c-format --msgid "%d input ICMP message failed." -+#: ../statistics.c:89 -+#, fuzzy, c-format -+msgid "%u input ICMP message failed." - msgstr "počet chybných příchozích ICMP zpráv: %d" - --#: ../statistics.c:88 ../statistics.c:101 --#, c-format --msgid "destination unreachable: %d" -+#: ../statistics.c:90 ../statistics.c:103 -+#, fuzzy, c-format -+msgid "destination unreachable: %u" - msgstr "adresát nedostupný: %d" - --#: ../statistics.c:89 --#, c-format --msgid "timeout in transit: %d" -+#: ../statistics.c:91 -+#, fuzzy, c-format -+msgid "timeout in transit: %u" - msgstr "vyprąel čas při přenosu: %d" - --#: ../statistics.c:90 ../statistics.c:103 --#, c-format --msgid "wrong parameters: %d" -+#: ../statistics.c:92 ../statistics.c:105 -+#, fuzzy, c-format -+msgid "wrong parameters: %u" - msgstr "chybné parametry: %d" - - #. ? --#: ../statistics.c:91 --#, c-format --msgid "source quenchs: %d" -+#: ../statistics.c:93 -+#, fuzzy, c-format -+msgid "source quenches: %u" - msgstr "řízení toku dat: %d" - --#: ../statistics.c:92 --#, c-format --msgid "redirects: %d" -+#: ../statistics.c:94 -+#, fuzzy, c-format -+msgid "redirects: %u" - msgstr "změna cesty: %d" - --#: ../statistics.c:93 --#, c-format --msgid "echo requests: %d" -+#: ../statistics.c:95 -+#, fuzzy, c-format -+msgid "echo requests: %u" - msgstr "ľádost o echo: %d" - --#: ../statistics.c:94 ../statistics.c:107 --#, c-format --msgid "echo replies: %d" -+#: ../statistics.c:96 ../statistics.c:109 -+#, fuzzy, c-format -+msgid "echo replies: %u" - msgstr "odpověď na ľádost o echo: %d" - --#: ../statistics.c:95 --#, c-format --msgid "timestamp request: %d" -+#: ../statistics.c:97 -+#, fuzzy, c-format -+msgid "timestamp request: %u" - msgstr "ľádost o čas: %d" - --#: ../statistics.c:96 --#, c-format --msgid "timestamp reply: %d" -+#: ../statistics.c:98 -+#, fuzzy, c-format -+msgid "timestamp reply: %u" - msgstr "odpověď na ľádost o čas: %d" - --#: ../statistics.c:97 --#, c-format --msgid "address mask request: %d" -+#: ../statistics.c:99 -+#, fuzzy, c-format -+msgid "address mask request: %u" - msgstr "ľádost o masku podsítě: %d" - - #. ? --#: ../statistics.c:98 --msgid "address mask replies" --msgstr "odpovědi na ľádost o masku podsítě" -+#: ../statistics.c:100 ../statistics.c:113 -+#, fuzzy, c-format -+msgid "address mask replies: %u" -+msgstr "odpověď na ľádost o masku podsítě: %d" - - #. ? --#: ../statistics.c:99 --#, c-format --msgid "%d ICMP messages sent" -+#: ../statistics.c:101 -+#, fuzzy, c-format -+msgid "%u ICMP messages sent" - msgstr "počet odeslaných ICMP zpráv: %d" - --#: ../statistics.c:100 --#, c-format --msgid "%d ICMP messages failed" -+#: ../statistics.c:102 -+#, fuzzy, c-format -+msgid "%u ICMP messages failed" - msgstr "počet chybných ICMP zpráv: %d" - --#: ../statistics.c:102 --#, c-format --msgid "time exceeded: %d" -+#: ../statistics.c:104 -+#, fuzzy, c-format -+msgid "time exceeded: %u" - msgstr "vyprąení ľivotnosti: %d" - - #. ? --#: ../statistics.c:104 --#, c-format --msgid "source quench: %d" -+#: ../statistics.c:106 -+#, fuzzy, c-format -+msgid "source quench: %u" - msgstr "řízení toku dat: %d" - --#: ../statistics.c:105 --#, c-format --msgid "redirect: %d" -+#: ../statistics.c:107 -+#, fuzzy, c-format -+msgid "redirect: %u" - msgstr "změna cesty: %d" - --#: ../statistics.c:106 --#, c-format --msgid "echo request: %d" -+#: ../statistics.c:108 -+#, fuzzy, c-format -+msgid "echo request: %u" - msgstr "ľádost o echo: %d" - --#: ../statistics.c:108 --#, c-format --msgid "timestamp requests: %d" -+#: ../statistics.c:110 -+#, fuzzy, c-format -+msgid "timestamp requests: %u" - msgstr "ľádost o čas: %d" - --#: ../statistics.c:109 --#, c-format --msgid "timestamp replies: %d" -+#: ../statistics.c:111 -+#, fuzzy, c-format -+msgid "timestamp replies: %u" - msgstr "odpověď na ľádost o čas: %d" - --#: ../statistics.c:110 --#, c-format --msgid "address mask requests: %d" -+#: ../statistics.c:112 -+#, fuzzy, c-format -+msgid "address mask requests: %u" - msgstr "ľádost o masku podsítě: %d" - --#: ../statistics.c:111 --#, c-format --msgid "address mask replies: %d" --msgstr "odpověď na ľádost o masku podsítě: %d" -- --#: ../statistics.c:116 -+#: ../statistics.c:118 - #, c-format - msgid "RTO algorithm is %s" - msgstr "RTO algoritmus je %s" - --#: ../statistics.c:120 --#, c-format --msgid "%d active connections openings" -+#: ../statistics.c:122 -+#, fuzzy, c-format -+msgid "%u active connections openings" - msgstr "počet aktivně navázaných spojení: %d" - --#: ../statistics.c:121 --#, c-format --msgid "%d passive connection openings" -+#: ../statistics.c:123 -+#, fuzzy, c-format -+msgid "%u passive connection openings" - msgstr "počet pasivně navázaných spojení: %d" - --#: ../statistics.c:122 --#, c-format --msgid "%d failed connection attempts" -+#: ../statistics.c:124 -+#, fuzzy, c-format -+msgid "%u failed connection attempts" - msgstr "počet neúspěąných pokusů o spojení: %d" - --#: ../statistics.c:123 --#, c-format --msgid "%d connection resets received" -+#: ../statistics.c:125 -+#, fuzzy, c-format -+msgid "%u connection resets received" - msgstr "počet přijmutých resetů: %d" - --#: ../statistics.c:124 --#, c-format --msgid "%d connections established" -+#: ../statistics.c:126 -+#, fuzzy, c-format -+msgid "%u connections established" - msgstr "počet navázaných spojení: %d" - --#: ../statistics.c:125 --#, c-format --msgid "%d segments received" -+#: ../statistics.c:127 -+#, fuzzy, c-format -+msgid "%u segments received" - msgstr "počet přijmutých segmentů: %d" - --#: ../statistics.c:126 --#, c-format --msgid "%d segments send out" -+#: ../statistics.c:128 -+#, fuzzy, c-format -+msgid "%u segments send out" - msgstr "počet odeslaných segmentů: %d" - --#: ../statistics.c:127 --#, c-format --msgid "%d segments retransmited" -+#: ../statistics.c:129 -+#, fuzzy, c-format -+msgid "%u segments retransmited" - msgstr "počet přenesených segmentů: %d" - --#: ../statistics.c:128 --#, c-format --msgid "%d bad segments received." -+#: ../statistics.c:130 -+#, fuzzy, c-format -+msgid "%u bad segments received." - msgstr "počet chybných příchozích segmentů: %d." - --#: ../statistics.c:129 --#, c-format --msgid "%d resets sent" -+#: ../statistics.c:131 -+#, fuzzy, c-format -+msgid "%u resets sent" - msgstr "počet odeslaných resetů: %d" - --#: ../statistics.c:134 --#, c-format --msgid "%d packets received" -+#: ../statistics.c:136 -+#, fuzzy, c-format -+msgid "%u packets received" - msgstr "počet přijmutých paketů: %d" - --#: ../statistics.c:135 --#, c-format --msgid "%d packets to unknown port received." -+#: ../statistics.c:137 -+#, fuzzy, c-format -+msgid "%u packets to unknown port received." - msgstr "počet paketů přijmutých pro neznámý port: %d." - --#: ../statistics.c:136 --#, c-format --msgid "%d packet receive errors" -+#: ../statistics.c:138 -+#, fuzzy, c-format -+msgid "%u packet receive errors" - msgstr "počet chyb při příjmu paketů: %d" - --#: ../statistics.c:137 --#, c-format --msgid "%d packets sent" -+#: ../statistics.c:139 -+#, fuzzy, c-format -+msgid "%u packets sent" - msgstr "počet odeslaných paketů: %d" - --#: ../statistics.c:142 --#, c-format --msgid "%d SYN cookies sent" -+#: ../statistics.c:144 -+#, fuzzy, c-format -+msgid "%u SYN cookies sent" - msgstr "počet odeslaných SYN cookies: %d" - --#: ../statistics.c:143 --#, c-format --msgid "%d SYN cookies received" -+#: ../statistics.c:145 -+#, fuzzy, c-format -+msgid "%u SYN cookies received" - msgstr "počet přijmutých SYN cookies: %d" - --#: ../statistics.c:144 --#, c-format --msgid "%d invalid SYN cookies received" -+#: ../statistics.c:146 -+#, fuzzy, c-format -+msgid "%u invalid SYN cookies received" - msgstr "počet chybných příchozích SYN cookies: %d" - --#: ../statistics.c:146 --#, c-format --msgid "%d resets received for embryonic SYN_RECV sockets" -+#: ../statistics.c:148 -+#, fuzzy, c-format -+msgid "%u resets received for embryonic SYN_RECV sockets" - msgstr "počet resetů přijmutých pro sokety ve stavu SYN_PŘÍCH: %d" - --#: ../statistics.c:148 --#, c-format --msgid "%d packets pruned from receive queue because of socket buffer overrun" -+#: ../statistics.c:150 -+#, fuzzy, c-format -+msgid "%u packets pruned from receive queue because of socket buffer overrun" - msgstr "počet paketů odstraněných z fronty kvůli přetečení bufferu soketu: %d" - - #. obsolete: 2.2.0 doesn't do that anymore --#: ../statistics.c:151 --#, c-format --msgid "%d packets pruned from out-of-order queue" -+#: ../statistics.c:153 -+#, fuzzy, c-format -+msgid "%u packets pruned from receive queue" - msgstr "počet paketů odstraněných z fronty mimo-pořadí: %d" - --#: ../statistics.c:152 --#, c-format -+#: ../statistics.c:154 -+#, fuzzy, c-format - msgid "" --"%d packets dropped from out-of-order queue because of socket buffer overrun" -+"%u packets dropped from out-of-order queue because of socket buffer overrun" - msgstr "" - "počet paketů zahozených z fronty mimo-pořadí kvůli přetečení bufferu soketu: " - "%d" - --#: ../statistics.c:154 --#, c-format --msgid "%d ICMP packets dropped because they were out-of-window" -+#: ../statistics.c:156 -+#, fuzzy, c-format -+msgid "%u ICMP packets dropped because they were out-of-window" - msgstr "počet ICMP paketů zahozených, protoľe byly mimo-okno: %d" - --#: ../statistics.c:156 --#, c-format --msgid "%d ICMP packets dropped because socket was locked" -+#: ../statistics.c:158 -+#, fuzzy, c-format -+msgid "%u ICMP packets dropped because socket was locked" - msgstr "počet ICMP paketů zahozených kvůli zamčenému soketu: %d" - -+#: ../statistics.c:160 -+#, c-format -+msgid "%u TCP sockets finished time wait in fast timer" -+msgstr "" -+ -+#: ../statistics.c:161 -+#, c-format -+msgid "%u time wait sockets recycled by time stamp" -+msgstr "" -+ -+#: ../statistics.c:162 -+#, c-format -+msgid "%u TCP sockets finished time wait in slow timer" -+msgstr "" -+ -+#: ../statistics.c:163 -+#, c-format -+msgid "%u passive connections rejected because of time stamp" -+msgstr "" -+ -+#: ../statistics.c:165 -+#, c-format -+msgid "%u active connections rejected because of time stamp" -+msgstr "" -+ -+#: ../statistics.c:167 -+#, c-format -+msgid "%u packets rejects in established connections because of timestamp" -+msgstr "" -+ -+#: ../statistics.c:169 -+#, fuzzy, c-format -+msgid "%u delayed acks sent" -+msgstr "počet odeslaných paketů: %d" -+ -+#: ../statistics.c:170 -+#, c-format -+msgid "%u delayed acks further delayed because of locked socket" -+msgstr "" -+ -+#: ../statistics.c:172 -+#, c-format -+msgid "Quick ack mode was activated %u times" -+msgstr "" -+ -+#: ../statistics.c:173 -+#, c-format -+msgid "%u times the listen queue of a socket overflowed" -+msgstr "" -+ -+#: ../statistics.c:175 -+#, c-format -+msgid "%u SYNs to LISTEN sockets ignored" -+msgstr "" -+ -+#: ../statistics.c:176 -+#, c-format -+msgid "%u packets directly queued to recvmsg prequeue." -+msgstr "" -+ -+#: ../statistics.c:178 -+#, c-format -+msgid "%u of bytes directly received from backlog" -+msgstr "" -+ -+#: ../statistics.c:180 -+#, c-format -+msgid "%u of bytes directly received from prequeue" -+msgstr "" -+ -+#: ../statistics.c:182 -+#, fuzzy, c-format -+msgid "%u packets dropped from prequeue" -+msgstr "počet paketů odstraněných z fronty mimo-pořadí: %d" -+ -+#: ../statistics.c:183 -+#, fuzzy, c-format -+msgid "%u packet headers predicted" -+msgstr "počet přijmutých paketů: %d" -+ -+#: ../statistics.c:184 -+#, c-format -+msgid "%u packets header predicted and directly queued to user" -+msgstr "" -+ -+#: ../statistics.c:186 -+#, c-format -+msgid "Ran %u times out of system memory during packet sending" -+msgstr "" -+ -+#: ../statistics.c:188 -+#, fuzzy, c-format -+msgid "%u acknowledgments not containing data received" -+msgstr "počet paketů přijmutých pro neznámý port: %d." -+ -+#: ../statistics.c:189 -+#, c-format -+msgid "%u predicted acknowledgments" -+msgstr "" -+ -+#: ../statistics.c:190 -+#, c-format -+msgid "%u times recovered from packet loss due to fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:191 -+#, c-format -+msgid "%u times recovered from packet loss due to SACK data" -+msgstr "" -+ -+#: ../statistics.c:192 -+#, fuzzy, c-format -+msgid "%u bad SACKs received" -+msgstr "počet chybných příchozích segmentů: %d." -+ -+#: ../statistics.c:193 -+#, c-format -+msgid "Detected reordering %u times using FACK" -+msgstr "" -+ -+#: ../statistics.c:194 -+#, c-format -+msgid "Detected reordering %u times using SACK" -+msgstr "" -+ -+#: ../statistics.c:195 -+#, c-format -+msgid "Detected reordering %u times using time stamp" -+msgstr "" -+ -+#: ../statistics.c:196 -+#, c-format -+msgid "Detected reordering %u times using reno fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:197 -+#, c-format -+msgid "%u congestion windows fully recovered" -+msgstr "" -+ -+#: ../statistics.c:198 -+#, c-format -+msgid "%u congestion windows partially recovered using Hoe heuristic" -+msgstr "" -+ -+#: ../statistics.c:199 -+#, c-format -+msgid "%u congestion window recovered using DSACK" -+msgstr "" -+ -+#: ../statistics.c:200 -+#, c-format -+msgid "%u congestion windows recovered after partial ack" -+msgstr "" -+ -+#: ../statistics.c:201 -+#, fuzzy, c-format -+msgid "%u retransmits lost" -+msgstr "počet odeslaných resetů: %d" -+ -+#: ../statistics.c:202 -+#, c-format -+msgid "%u timeouts after reno fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:203 -+#, c-format -+msgid "%u timeouts after SACK recovery" -+msgstr "" -+ -+#: ../statistics.c:204 -+#, c-format -+msgid "%u timeouts in loss state" -+msgstr "" -+ -+#: ../statistics.c:205 -+#, fuzzy, c-format -+msgid "%u fast retransmits" -+msgstr "počet přenesených segmentů: %d" -+ -+#: ../statistics.c:206 -+#, c-format -+msgid "%u forward retransmits" -+msgstr "" -+ -+#: ../statistics.c:207 -+#, c-format -+msgid "%u retransmits in slow start" -+msgstr "" -+ -+#: ../statistics.c:208 -+#, c-format -+msgid "%u other TCP timeouts" -+msgstr "" -+ -+#: ../statistics.c:209 -+#, fuzzy, c-format -+msgid "%u reno fast retransmits failed" -+msgstr "počet přenesených segmentů: %d" -+ -+#: ../statistics.c:210 -+#, fuzzy, c-format -+msgid "%u sack retransmits failed" -+msgstr "počet paketů, jeľ se nepodařilo znovu sestavit: %d" -+ -+#: ../statistics.c:211 -+#, c-format -+msgid "%u times receiver scheduled too late for direct processing" -+msgstr "" -+ -+#: ../statistics.c:212 -+#, fuzzy, c-format -+msgid "%u packets collapsed in receive queue due to low socket buffer" -+msgstr "počet paketů odstraněných z fronty kvůli přetečení bufferu soketu: %d" -+ -+#: ../statistics.c:213 -+#, c-format -+msgid "%u DSACKs sent for old packets" -+msgstr "" -+ -+#: ../statistics.c:214 -+#, c-format -+msgid "%u DSACKs sent for out of order packets" -+msgstr "" -+ -+#: ../statistics.c:215 -+#, fuzzy, c-format -+msgid "%u DSACKs received" -+msgstr "počet přijmutých paketů: %d" -+ -+#: ../statistics.c:216 -+#, fuzzy, c-format -+msgid "%u DSACKs for out of order packets received" -+msgstr "celkem přijmutých paketů: %d" -+ -+#: ../statistics.c:217 -+#, fuzzy, c-format -+msgid "%u connections reset due to unexpected SYN" -+msgstr "počet přijmutých resetů: %d" -+ -+#: ../statistics.c:218 -+#, fuzzy, c-format -+msgid "%u connections reset due to unexpected data" -+msgstr "počet přijmutých resetů: %d" -+ -+#: ../statistics.c:219 -+#, fuzzy, c-format -+msgid "%u connections reset due to early user close" -+msgstr "počet přijmutých resetů: %d" -+ -+#: ../statistics.c:220 -+#, c-format -+msgid "%u connections aborted due to memory pressure" -+msgstr "" -+ -+#: ../statistics.c:221 -+#, fuzzy, c-format -+msgid "%u connections aborted due to timeout" -+msgstr "počet přijmutých resetů: %d" -+ - #: ../statistics.c:222 -+#, c-format -+msgid "%u connections aborted after user close in linger timeout" -+msgstr "" -+ -+#: ../statistics.c:223 -+#, c-format -+msgid "%u times unabled to send RST due to no memory" -+msgstr "" -+ -+#: ../statistics.c:224 -+#, c-format -+msgid "TCP ran low on memory %u times" -+msgstr "" -+ -+#: ../statistics.c:225 -+#, c-format -+msgid "%u TCP data loss events" -+msgstr "" -+ -+#: ../statistics.c:292 - msgid "enabled" - msgstr "zapnuto" - --#: ../statistics.c:222 -+#: ../statistics.c:292 - msgid "disabled" - msgstr "vypnuto" - --#: ../statistics.c:272 --#, c-format --msgid "unknown title %s\n" --msgstr "titulek %s je neznámý\n" -- --#: ../statistics.c:298 -+#: ../statistics.c:375 - msgid "error parsing /proc/net/snmp" - msgstr "chyba při zpracování /proc/net/snmp" - --#: ../statistics.c:311 -+#: ../statistics.c:388 - msgid "cannot open /proc/net/snmp" - msgstr "/proc/net/snmp nelze otevřít" - -@@ -1821,89 +2112,95 @@ - msgid "Cannot change line discipline to `%s'.\n" - msgstr "Linkovou disciplínu nelze na `%s' změnit.\n" - --#: ../lib/af.c:145 ../lib/hw.c:148 -+#: ../lib/af.c:153 ../lib/hw.c:161 - msgid "UNSPEC" - msgstr "NEZNÁM" - --#: ../lib/af.c:147 -+#: ../lib/af.c:155 - msgid "UNIX Domain" - msgstr "Doména UNIX" - --#: ../lib/af.c:150 -+#: ../lib/af.c:158 - msgid "DARPA Internet" - msgstr "DARPA Internet" - --#: ../lib/af.c:153 -+#: ../lib/af.c:161 - msgid "IPv6" - msgstr "IPv6" - --#: ../lib/af.c:156 ../lib/hw.c:169 -+#: ../lib/af.c:164 ../lib/hw.c:182 - msgid "AMPR AX.25" - msgstr "AMPR AX.25" - --#: ../lib/af.c:159 ../lib/hw.c:175 -+#: ../lib/af.c:167 ../lib/hw.c:188 - msgid "AMPR NET/ROM" - msgstr "AMPR NET/ROM" - --#: ../lib/af.c:162 -+#: ../lib/af.c:170 - msgid "Novell IPX" - msgstr "Novell IPX" - --#: ../lib/af.c:165 -+#: ../lib/af.c:173 - msgid "Appletalk DDP" - msgstr "Appletalk DDP" - --#: ../lib/af.c:168 ../lib/hw.c:207 -+#: ../lib/af.c:176 ../lib/hw.c:223 - msgid "Econet" - msgstr "Econet" - --#: ../lib/af.c:171 ../lib/hw.c:172 -+#: ../lib/af.c:179 -+msgid "CCITT X.25" -+msgstr "" -+ -+#: ../lib/af.c:182 ../lib/hw.c:185 - msgid "AMPR ROSE" - msgstr "AMPR ROSE" - --#: ../lib/af.c:174 ../lib/hw.c:160 -+#: ../lib/af.c:185 ../lib/hw.c:173 - msgid "Ash" - msgstr "Ash" - --#: ../lib/af.c:232 -+#: ../lib/af.c:243 -+#, c-format - msgid "Please don't supply more than one address family.\n" - msgstr "Nezadávejte více neľ jednu třídu adres.\n" - --#: ../lib/af.c:293 -+#: ../lib/af.c:304 -+#, c-format - msgid "Too much address family arguments.\n" - msgstr "Bylo zadáno přílią mnoho tříd adres.\n" - --#: ../lib/af.c:304 -+#: ../lib/af.c:315 - #, c-format - msgid "Unknown address family `%s'.\n" - msgstr "Třída adres `%s' není známa.\n" - --#: ../lib/arcnet.c:53 ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 --#: ../lib/fddi.c:67 ../lib/hippi.c:68 ../lib/inet.c:244 ../lib/inet.c:259 --#: ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 ../lib/rose.c:71 --#: ../lib/rose.c:126 ../lib/unix.c:56 ../lib/unix.c:76 --msgid "[NONE SET]" --msgstr "[NENASTAVENO]" -- --#: ../lib/arcnet.c:81 ../lib/arcnet.c:96 -+#: ../lib/arcnet.c:70 ../lib/arcnet.c:85 - #, c-format - msgid "in_arcnet(%s): invalid arcnet address!\n" - msgstr "in_arcnet(%s): chybná arcnet adresa!\n" - --#: ../lib/arcnet.c:108 -+#: ../lib/arcnet.c:97 - #, c-format - msgid "in_arcnet(%s): trailing : ignored!\n" - msgstr "in_arcnet(%s): nadbytečné : ignorováno!\n" - --#: ../lib/arcnet.c:120 -+#: ../lib/arcnet.c:109 - #, c-format - msgid "in_arcnet(%s): trailing junk!\n" - msgstr "in_arcnet(%s): nadbytečné znaky!\n" - - #: ../lib/ash.c:81 -+#, c-format - msgid "Malformed Ash address" - msgstr "Chybná Ash adresa" - -+#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244 -+#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 -+#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76 -+msgid "[NONE SET]" -+msgstr "[NENASTAVENO]" -+ - #: ../lib/ax25.c:97 ../lib/netrom.c:100 - msgid "Invalid callsign" - msgstr "Nesprávný volací znak" -@@ -1913,22 +2210,21 @@ - msgstr "Volací znak je přílią dlouhý." - - #: ../lib/ax25_gr.c:47 -+#, c-format - msgid "AX.25 not configured in this system.\n" - msgstr "AX.25 není na tomto systému nakonfigurováno.\n" - - #: ../lib/ax25_gr.c:50 -+#, c-format - msgid "Kernel AX.25 routing table\n" - msgstr "Směrovací tabulka v jádru pro AX.25\n" - - #. xxx - #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55 -+#, c-format - msgid "Destination Iface Use\n" - msgstr "Adresát Rozhraní Uľití\n" - --#: ../lib/ddp_gr.c:21 --msgid "Routing table for `ddp' not yet supported.\n" --msgstr "Směrovací tabulka pro `ddp' není zatím podporována.\n" -- - #: ../lib/ether.c:74 ../lib/ether.c:91 - #, c-format - msgid "in_ether(%s): invalid ether address!\n" -@@ -1944,153 +2240,171 @@ - msgid "in_ether(%s): trailing junk!\n" - msgstr "in_ether(%s): nadbytečné znaky!\n" - --#: ../lib/fddi.c:95 ../lib/fddi.c:110 -+#: ../lib/fddi.c:84 ../lib/fddi.c:99 - #, c-format - msgid "in_fddi(%s): invalid fddi address!\n" - msgstr "in_fddi(%s): chybná fddi adresa!\n" - --#: ../lib/fddi.c:122 -+#: ../lib/fddi.c:111 - #, c-format - msgid "in_fddi(%s): trailing : ignored!\n" - msgstr "in_fddi(%s): nadbytečné : ignorováno!\n" - --#: ../lib/fddi.c:134 -+#: ../lib/fddi.c:123 - #, c-format - msgid "in_fddi(%s): trailing junk!\n" - msgstr "in_fddi(%s): nadbytečné znaky!\n" - --#: ../lib/getroute.c:97 ../lib/setroute.c:76 -+#: ../lib/getroute.c:101 ../lib/setroute.c:80 - #, c-format - msgid "Address family `%s' not supported.\n" - msgstr "Třída adres `%s' není podporována.\n" - --#: ../lib/getroute.c:103 ../lib/setroute.c:80 -+#: ../lib/getroute.c:107 ../lib/setroute.c:84 - #, c-format - msgid "No routing for address family `%s'.\n" - msgstr "Pro třídu adres `%s' není ľádné směrování.\n" - --#: ../lib/hippi.c:96 ../lib/hippi.c:111 -+#: ../lib/hippi.c:84 ../lib/hippi.c:99 - #, c-format - msgid "in_hippi(%s): invalid hippi address!\n" - msgstr "in_hippi(%s): chybná hippi adresa!\n" - --#: ../lib/hippi.c:123 -+#: ../lib/hippi.c:111 - #, c-format - msgid "in_hippi(%s): trailing : ignored!\n" - msgstr "in_hippi(%s): nadbytečné : ignorováno!\n" - --#: ../lib/hippi.c:134 -+#: ../lib/hippi.c:122 - #, c-format - msgid "in_hippi(%s): trailing junk!\n" - msgstr "in_hippi(%s): nadbytečné znaky!\n" - --#: ../lib/hw.c:147 -+#: ../lib/hw.c:160 - msgid "Local Loopback" - msgstr "Místní smyčka" - --#: ../lib/hw.c:150 -+#: ../lib/hw.c:163 - msgid "Serial Line IP" - msgstr "IP po sériové lince" - --#: ../lib/hw.c:151 -+#: ../lib/hw.c:164 - msgid "VJ Serial Line IP" - msgstr "Vj IP po sériové lince" - --#: ../lib/hw.c:152 -+#: ../lib/hw.c:165 - msgid "6-bit Serial Line IP" - msgstr "6bitový IP po sériové lince" - --#: ../lib/hw.c:153 -+#: ../lib/hw.c:166 - msgid "VJ 6-bit Serial Line IP" - msgstr "6bitový VJ IP po sériové lince" - --#: ../lib/hw.c:154 -+#: ../lib/hw.c:167 - msgid "Adaptive Serial Line IP" - msgstr "Adaptivní IP po sériové lince" - --#: ../lib/hw.c:157 -+#: ../lib/hw.c:170 - msgid "Ethernet" - msgstr "Ethernet" - --#: ../lib/hw.c:163 -+#: ../lib/hw.c:176 - msgid "Fiber Distributed Data Interface" - msgstr "Fiber Distributed Data Interface" - --#: ../lib/hw.c:166 -+#: ../lib/hw.c:179 - msgid "HIPPI" - msgstr "HIPPI" - --#: ../lib/hw.c:178 -+#: ../lib/hw.c:191 -+msgid "generic X.25" -+msgstr "" -+ -+#: ../lib/hw.c:194 - msgid "IPIP Tunnel" - msgstr "IPIP Tunnel" - --#: ../lib/hw.c:181 -+#: ../lib/hw.c:197 - msgid "Point-to-Point Protocol" - msgstr "Point-to-Point Protokol" - --#: ../lib/hw.c:184 -+#: ../lib/hw.c:200 - msgid "(Cisco)-HDLC" - msgstr "(Cisco)-HDLC" - --#: ../lib/hw.c:185 -+#: ../lib/hw.c:201 - msgid "LAPB" - msgstr "LAPB" - --#: ../lib/hw.c:188 -+#: ../lib/hw.c:204 - msgid "ARCnet" - msgstr "ARCnet" - --#: ../lib/hw.c:191 -+#: ../lib/hw.c:207 - msgid "Frame Relay DLCI" - msgstr "Frame Relay DLCI" - --#: ../lib/hw.c:192 -+#: ../lib/hw.c:208 - msgid "Frame Relay Access Device" - msgstr "Přístupové zařízení Frame Relay" - --#: ../lib/hw.c:195 -+#: ../lib/hw.c:211 - msgid "IPv6-in-IPv4" - msgstr "IPv6-in-IPv4" - --#: ../lib/hw.c:198 -+#: ../lib/hw.c:214 - msgid "IrLAP" - msgstr "IrLAP" - --#: ../lib/hw.c:201 -+#: ../lib/hw.c:217 - msgid "16/4 Mbps Token Ring" - msgstr "Token Ring 16/4 Mb/s" - --#: ../lib/hw.c:203 -+#: ../lib/hw.c:219 - #, fuzzy - msgid "16/4 Mbps Token Ring (New)" - msgstr "Token Ring 16/4 Mb/s" - -+#: ../lib/hw.c:226 -+msgid "Generic EUI-64" -+msgstr "" -+ - #: ../lib/inet.c:153 ../lib/inet6.c:79 - #, c-format - msgid "rresolve: unsupport address family %d !\n" - msgstr "rresolve: třída adres %d není podporována!\n" - --#: ../lib/inet6_gr.c:79 -+#: ../lib/inet6.c:131 -+#, fuzzy -+msgid "[UNKNOWN]" -+msgstr "NEZNÁM" -+ -+#: ../lib/inet6_gr.c:71 -+#, c-format - msgid "INET6 (IPv6) not configured in this system.\n" - msgstr "INET6 (IPv6) není na tomto systému nakonfigurováno.\n" - --#: ../lib/inet6_gr.c:82 -+#: ../lib/inet6_gr.c:74 -+#, c-format - msgid "Kernel IPv6 routing table\n" - msgstr "Směrovací tabulka v jádru pro IPv6\n" - --#: ../lib/inet6_gr.c:84 -+#: ../lib/inet6_gr.c:76 -+#, c-format - msgid "" --"Destination Next Hop " --" Flags Metric Ref Use Iface\n" -+"Destination Next " -+"Hop Flags Metric Ref Use Iface\n" - msgstr "" --"Adresát Daląí Směrovač " --" Přízn Metrika Odkaz Uľit Rozhraní\n" -+"Adresát Daląí " -+"Směrovač Přízn Metrika Odkaz Uľit Rozhraní\n" - --#: ../lib/inet6_gr.c:158 -+#: ../lib/inet6_gr.c:150 -+#, c-format - msgid "Kernel IPv6 Neighbour Cache\n" - msgstr "Cache sousedů v jádru pro IPv6\n" - --#: ../lib/inet6_gr.c:161 -+#: ../lib/inet6_gr.c:153 -+#, c-format - msgid "" - "Neighbour HW Address Iface Flags " - "Ref State\n" -@@ -2098,7 +2412,8 @@ - "Soused HW Adresa Rozhraní Přízn " - "Odkazy Stav\n" - --#: ../lib/inet6_gr.c:165 -+#: ../lib/inet6_gr.c:157 -+#, c-format - msgid "" - "Neighbour HW Address Iface Flags " - "Ref State Stale(sec) Delete(sec)\n" -@@ -2107,30 +2422,37 @@ - "Příznaky Odkazy Stav Proąlý(sec) Smazat(sec)\n" - - #: ../lib/inet6_sr.c:46 -+#, c-format - msgid "Usage: inet6_route [-vF] del Target\n" - msgstr "Pouľití: inet6_route [-vF] del Cíl\n" - - #: ../lib/inet6_sr.c:47 -+#, c-format - msgid " inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n" - msgstr " inet6_route [-vF] add Cíl [gw Gw] [metrika M] [[dev] If]\n" - - #: ../lib/inet6_sr.c:48 -+#, c-format - msgid " inet6_route [-FC] flush NOT supported\n" - msgstr " inet6_route [-FC] flush NENÍ podporováno\n" - --#: ../lib/inet6_sr.c:182 -+#: ../lib/inet6_sr.c:188 -+#, c-format - msgid "Flushing `inet6' routing table not supported\n" - msgstr "Směrovací tabulku `inet6' nelze vyprazdňovat\n" - - #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220 -+#, c-format - msgid "INET (IPv4) not configured in this system.\n" - msgstr "INET (IPv4) není na tomto systému nakonfigurováno.\n" - - #: ../lib/inet_gr.c:53 -+#, c-format - msgid "Kernel IP routing table\n" - msgstr "Směrovací tabulka v jádru pro IP\n" - - #: ../lib/inet_gr.c:56 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags Metric Ref Use " - "Iface\n" -@@ -2139,6 +2461,7 @@ - "Rozhraní\n" - - #: ../lib/inet_gr.c:59 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags MSS Window irtt " - "Iface\n" -@@ -2147,6 +2470,7 @@ - "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 @@ - "Rozhraní MSS Okno irtt\n" - - #: ../lib/inet_gr.c:237 -+#, c-format - msgid "Kernel IP routing cache\n" - msgstr "Směrovací cache v jádru pro IP\n" - - #: ../lib/inet_gr.c:258 -+#, c-format - msgid "" - "Source Destination Gateway Flags Metric Ref Use " - "Iface\n" -@@ -2167,6 +2493,7 @@ - "Rozhraní\n" - - #: ../lib/inet_gr.c:261 -+#, c-format - msgid "" - "Source Destination Gateway Flags MSS Window irtt " - "Iface\n" -@@ -2175,6 +2502,7 @@ - "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 @@ - "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 @@ - "Odesílatel Adresát Maska Přízn Metrik Odkazy Uľt " - "Rozhraní MSS Okno irtt TOS HHOdk HHAktuál ZvláątCíl\n" - --#: ../lib/inet_sr.c:50 -+#: ../lib/inet_sr.c:51 -+#, c-format - msgid "" - "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] " - "[[dev] If]\n" -@@ -2198,29 +2528,34 @@ - "Pouľití: inet_route [-vF] del {-host|-net} Cíl[/prefix] [gw Gw] [metrika M] " - "[[dev] If]\n" - --#: ../lib/inet_sr.c:51 -+#: ../lib/inet_sr.c:52 -+#, c-format - msgid "" - " inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n" - msgstr "" - " inet_route [-vF] add {-host|-net} Cíl[/prefix] [gw Gw] [metrika M]\n" - --#: ../lib/inet_sr.c:52 -+#: ../lib/inet_sr.c:53 -+#, c-format - msgid "" - " [netmask N] [mss Mss] [window W] [irtt I]\n" - msgstr "" - " [netmask N] [mss Mss] [window W] [irtt I]\n" - --#: ../lib/inet_sr.c:53 -+#: ../lib/inet_sr.c:54 -+#, c-format - msgid " [mod] [dyn] [reinstate] [[dev] If]\n" - msgstr " [mod] [dyn] [reinstate] [[dev] If]\n" - --#: ../lib/inet_sr.c:54 -+#: ../lib/inet_sr.c:55 -+#, c-format - msgid "" - " inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n" - msgstr "" - " inet_route [-vF] add {-host|-net} Cíl/[prefix] [metrika M] reject\n" - --#: ../lib/inet_sr.c:55 -+#: ../lib/inet_sr.c:56 -+#, c-format - msgid " inet_route [-FC] flush NOT supported\n" - msgstr " inet_route [-FC] flush NENÍ podporováno\n" - -@@ -2230,15 +2565,17 @@ - msgstr "route: %s: sí» nelze pouľít jako bránu!\n" - - #: ../lib/inet_sr.c:174 --#, fuzzy -+#, fuzzy, c-format - msgid "route: Invalid MSS/MTU.\n" - msgstr "route: Nesprávné NSS.\n" - - #: ../lib/inet_sr.c:187 -+#, c-format - msgid "route: Invalid window.\n" - msgstr "route: Nesprávné okno.\n" - - #: ../lib/inet_sr.c:203 -+#, c-format - msgid "route: Invalid initial rtt.\n" - msgstr "route: Nesprávné zahajovací rtt.\n" - -@@ -2253,75 +2590,92 @@ - msgstr "route: sí»ová maska %s je nesprávná\n" - - #: ../lib/inet_sr.c:270 -+#, c-format - msgid "route: netmask doesn't match route address\n" - msgstr "route: sí»ová maska nevyhovuje adrese cesty\n" - - #: ../lib/inet_sr.c:306 -+#, c-format - msgid "Flushing `inet' routing table not supported\n" - msgstr "Směrovací cache `inet' nelze vyprazdňovat\n" - - #: ../lib/inet_sr.c:310 -+#, c-format - msgid "Modifying `inet' routing cache not supported\n" - msgstr "Směrovací cache `inet' nelze měnit\n" - - #: ../lib/ipx_gr.c:52 -+#, c-format - msgid "IPX not configured in this system.\n" - msgstr "IPX není na tomto systému nakonfigurováno.\n" - - #: ../lib/ipx_gr.c:56 -+#, c-format - msgid "Kernel IPX routing table\n" - msgstr "Směrovací tabulka v jádru pro IPX\n" - - #. xxx - #: ../lib/ipx_gr.c:57 -+#, c-format - msgid "Destination Router Net Router Node\n" - msgstr "Cíl Směrovač Sí» Směrovač Uzel\n" - - #: ../lib/ipx_sr.c:33 -+#, c-format - msgid "IPX: this needs to be written\n" - msgstr "IPX: toto je třeba uloľit\n" - --#: ../lib/masq_info.c:197 -+#: ../lib/masq_info.c:198 -+#, c-format - msgid "IP masquerading entries\n" - msgstr "IP maskovací poloľky\n" - --#: ../lib/masq_info.c:200 -+#: ../lib/masq_info.c:201 -+#, c-format - msgid "prot expire source destination ports\n" - msgstr "prot ľivot zdroj cíl porty\n" - --#: ../lib/masq_info.c:203 -+#: ../lib/masq_info.c:204 -+#, c-format - msgid "" --"prot expire initseq delta prevd source destination " --" ports\n" -+"prot expire initseq delta prevd source " -+"destination ports\n" - msgstr "" --"prot ľivot zahajsek delta předchd zdroj cíl " --" porty\n" -+"prot ľivot zahajsek delta předchd zdroj " -+"cíl porty\n" - - #: ../lib/netrom_gr.c:48 -+#, c-format - msgid "NET/ROM not configured in this system.\n" - msgstr "NET/ROM není na tomto systému nakonfigurováno.\n" - - #: ../lib/netrom_gr.c:51 -+#, c-format - msgid "Kernel NET/ROM routing table\n" - msgstr "Směrovací tabulka v jádru pro NET/ROM\n" - - #: ../lib/netrom_gr.c:52 -+#, c-format - msgid "Destination Mnemonic Quality Neighbour Iface\n" - msgstr "Cíl Mnemonika Kvalita Soused Rozhraní\n" - - #: ../lib/netrom_sr.c:34 -+#, c-format - msgid "netrom usage\n" - msgstr "pouľití netrom\n" - - #: ../lib/netrom_sr.c:44 -+#, c-format - msgid "NET/ROM: this needs to be written\n" - msgstr "NET/ROM: toto je potřeba uloľit\n" - - #: ../lib/ppp.c:44 -+#, c-format - msgid "You cannot start PPP with this program.\n" - msgstr "Tímto programem nelze PPP spustit.\n" - - #: ../lib/ppp_ac.c:38 -+#, c-format - msgid "Sorry, use pppd!\n" - msgstr "Lituji, pouľijte pppd!\n" - -@@ -2330,49 +2684,319 @@ - msgstr "Adresa uzlu musí mít 10 číslic" - - #: ../lib/rose_gr.c:51 -+#, c-format - msgid "ROSE not configured in this system.\n" - msgstr "ROSE není na tomto systému nakonfigurováno.\n" - - #: ../lib/rose_gr.c:54 -+#, c-format - msgid "Kernel ROSE routing table\n" - msgstr "Směrovací tabulka v jádru pro ROSE\n" - --#: ../lib/tr.c:70 ../lib/tr.c:85 -+#: ../lib/tr.c:86 ../lib/tr.c:101 - #, c-format - msgid "in_tr(%s): invalid token ring address!\n" - msgstr "in_tr(%s): nesprávná token ring adresa!\n" - --#: ../lib/tr.c:97 -+#: ../lib/tr.c:113 - #, c-format - msgid "in_tr(%s): trailing : ignored!\n" - msgstr "in_tr(%s): nadbytečné: ignorováno!\n" - --#: ../lib/tr.c:109 -+#: ../lib/tr.c:125 - #, c-format - msgid "in_tr(%s): trailing junk!\n" - msgstr "in_tr(%s): nadbytečné znaky!\n" - --#: ../lib/interface.c:124 -+#: ../lib/interface.c:176 - #, c-format - msgid "warning: no inet socket available: %s\n" - msgstr "varování: není dostupný ľádný inet soket: %s\n" - --#: ../lib/interface.c:270 -+#: ../lib/interface.c:325 - #, c-format - msgid "Warning: cannot open %s (%s). Limited output.\n" - msgstr "" - - #. Give better error message for this case. --#: ../lib/interface.c:504 -+#: ../lib/interface.c:571 - msgid "Device not found" - msgstr "Zařízení nebylo nalezeno" - --#: ../lib/interface.c:508 -+#: ../lib/interface.c:575 - #, c-format - msgid "%s: error fetching interface information: %s\n" - msgstr "%s: chyba při získávání informací o rozhraní %s\n" - --#: ../lib/sockets.c:59 -+#: ../lib/interface.c:608 -+msgid " - no statistics available -" -+msgstr " - statistická data nejsou dostupná -" -+ -+#: ../lib/interface.c:612 -+#, c-format -+msgid "[NO FLAGS]" -+msgstr "[®ÁDNÉ PŘÍZNAKY]" -+ -+#: ../lib/interface.c:688 -+#, c-format -+msgid "%-9.9s Link encap:%s " -+msgstr "%-9.9s Zapouzdření:%s " -+ -+#: ../lib/interface.c:693 -+#, c-format -+msgid "HWaddr %s " -+msgstr "HWadr %s " -+ -+#: ../lib/interface.c:696 -+#, c-format -+msgid "Media:%s" -+msgstr "Médium:%s" -+ -+#: ../lib/interface.c:698 -+#, c-format -+msgid "(auto)" -+msgstr "(auto)" -+ -+#: ../lib/interface.c:705 -+#, c-format -+msgid " %s addr:%s " -+msgstr " %s adr:%s " -+ -+#: ../lib/interface.c:708 -+#, c-format -+msgid " P-t-P:%s " -+msgstr " P-t-P:%s " -+ -+# V ostatních katalozích se překládá Broadcast -> vąesměrové vysílání. -+# Tudiľ bcast -> Vąesměr :) -+#: ../lib/interface.c:711 -+#, c-format -+msgid " Bcast:%s " -+msgstr " Vąesměr:%s " -+ -+#: ../lib/interface.c:713 -+#, c-format -+msgid " Mask:%s\n" -+msgstr "Maska:%s\n" -+ -+#: ../lib/interface.c:730 -+#, c-format -+msgid " inet6 addr: %s/%d" -+msgstr " inet6-adr: %s/%d" -+ -+#: ../lib/interface.c:732 -+#, c-format -+msgid " Scope:" -+msgstr " Rozsah:" -+ -+#: ../lib/interface.c:735 -+#, c-format -+msgid "Global" -+msgstr "Globál" -+ -+#: ../lib/interface.c:738 -+#, c-format -+msgid "Link" -+msgstr "Linka" -+ -+#: ../lib/interface.c:741 -+#, c-format -+msgid "Site" -+msgstr "Stanoviątě" -+ -+#: ../lib/interface.c:744 -+#, c-format -+msgid "Compat" -+msgstr "Kompatibilita" -+ -+#: ../lib/interface.c:747 -+#, c-format -+msgid "Host" -+msgstr "Počítač" -+ -+#: ../lib/interface.c:750 -+#, c-format -+msgid "Unknown" -+msgstr "Neznám." -+ -+#: ../lib/interface.c:765 -+#, c-format -+msgid " IPX/Ethernet II addr:%s\n" -+msgstr " IPX/Ethernet II adr: %s\n" -+ -+#: ../lib/interface.c:768 -+#, c-format -+msgid " IPX/Ethernet SNAP addr:%s\n" -+msgstr " IPX/Ethernet SNAP adr:%s\n" -+ -+#: ../lib/interface.c:771 -+#, c-format -+msgid " IPX/Ethernet 802.2 addr:%s\n" -+msgstr " IPX/Ethernet 802.2 adr:%s\n" -+ -+#: ../lib/interface.c:774 -+#, c-format -+msgid " IPX/Ethernet 802.3 addr:%s\n" -+msgstr " IPX/Ethernet 802.3 adr:%s\n" -+ -+#: ../lib/interface.c:784 -+#, c-format -+msgid " EtherTalk Phase 2 addr:%s\n" -+msgstr " EtherTalk Phase 2 adr:%s\n" -+ -+#: ../lib/interface.c:793 -+#, c-format -+msgid " econet addr:%s\n" -+msgstr " econet adr:%s\n" -+ -+# Hic sunt leones ... -+#: ../lib/interface.c:800 -+#, c-format -+msgid "[NO FLAGS] " -+msgstr "[®ÁDNÉ PŘÍZNAKY]" -+ -+#: ../lib/interface.c:802 -+#, c-format -+msgid "UP " -+msgstr "AKTIVOVÁNO " -+ -+#: ../lib/interface.c:804 -+#, c-format -+msgid "BROADCAST " -+msgstr "V©ESMĚROVÉ_VYSÍLÁNÍ " -+ -+#: ../lib/interface.c:806 -+#, c-format -+msgid "DEBUG " -+msgstr "DEBUG " -+ -+#: ../lib/interface.c:808 -+#, c-format -+msgid "LOOPBACK " -+msgstr "SMYČKA " -+ -+#: ../lib/interface.c:810 -+#, c-format -+msgid "POINTOPOINT " -+msgstr "POINTOPOINT " -+ -+# ?? -+#: ../lib/interface.c:812 -+#, c-format -+msgid "NOTRAILERS " -+msgstr "NOTRAILERS " -+ -+#: ../lib/interface.c:814 -+#, c-format -+msgid "RUNNING " -+msgstr "BĚ®Í " -+ -+#: ../lib/interface.c:816 -+#, c-format -+msgid "NOARP " -+msgstr "NEARP " -+ -+#: ../lib/interface.c:818 -+#, c-format -+msgid "PROMISC " -+msgstr "PROMISK " -+ -+#: ../lib/interface.c:820 -+#, c-format -+msgid "ALLMULTI " -+msgstr "ALLMULTI " -+ -+#: ../lib/interface.c:822 -+#, c-format -+msgid "SLAVE " -+msgstr "SLAVE " -+ -+#: ../lib/interface.c:824 -+#, c-format -+msgid "MASTER " -+msgstr "MASTER " -+ -+#: ../lib/interface.c:826 -+#, c-format -+msgid "MULTICAST " -+msgstr "MULTICAST " -+ -+#: ../lib/interface.c:829 -+#, c-format -+msgid "DYNAMIC " -+msgstr "DYNAMIC " -+ -+#. DONT FORGET TO ADD THE FLAGS IN ife_print_short -+#: ../lib/interface.c:832 -+#, c-format -+msgid " MTU:%d Metric:%d" -+msgstr " MTU:%d Metrika:%d" -+ -+#: ../lib/interface.c:836 -+#, c-format -+msgid " Outfill:%d Keepalive:%d" -+msgstr " Outfill:%d Keepalive:%d" -+ -+#: ../lib/interface.c:850 -+#, fuzzy, c-format -+msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" -+msgstr "přijmutých paketů:%lu chyb:%lu zahozeno:%lu přetečení:%lu rámců:%lu\n" -+ -+#: ../lib/interface.c:855 -+#, c-format -+msgid " compressed:%lu\n" -+msgstr " komprimováno:%lu\n" -+ -+# carrier? -+#: ../lib/interface.c:895 -+#, fuzzy, c-format -+msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" -+msgstr "odeslaných paketů:%lu chyb:%lu zahozeno:%lu přetečení:%lu přenos:%lu\n" -+ -+#: ../lib/interface.c:899 -+#, c-format -+msgid " collisions:%lu " -+msgstr " kolizí:%lu " -+ -+#: ../lib/interface.c:901 -+#, c-format -+msgid "compressed:%lu " -+msgstr "komprimováno:%lu " -+ -+#: ../lib/interface.c:903 -+#, c-format -+msgid "txqueuelen:%d " -+msgstr "délka odchozí fronty:%d " -+ -+#: ../lib/interface.c:905 -+#, c-format -+msgid "RX bytes:%llu (%lu.%lu %s) TX bytes:%llu (%lu.%lu %s)\n" -+msgstr "" -+ -+#: ../lib/interface.c:916 -+#, c-format -+msgid "Interrupt:%d " -+msgstr "Přeruąení:%d " -+ -+#. Only print devices using it for -+#. I/O maps -+#: ../lib/interface.c:919 -+#, c-format -+msgid "Base address:0x%x " -+msgstr "Vstupně/Výstupní port:0x%x " -+ -+#: ../lib/interface.c:921 -+#, c-format -+msgid "Memory:%lx-%lx " -+msgstr "Pamě»:%lx-%lx " -+ -+#: ../lib/interface.c:924 -+#, c-format -+msgid "DMA chan:%x " -+msgstr "Kanál DMA:%x " -+ -+#: ../lib/sockets.c:63 -+#, c-format - msgid "No usable address families found.\n" - msgstr "Nebyla nalezena ľádná pouľitelná třída adres.\n" - -@@ -2396,29 +3020,32 @@ - msgid "ip: argument is wrong: %s\n" - msgstr "ip: argument %s je nesprávný\n" - --#: ../ipmaddr.c:56 -+#: ../ipmaddr.c:61 -+#, c-format - msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n" - msgstr " Usage: ipmaddr [ add | del ] MULTIADR dev ŘETĚZEC\n" - --#: ../ipmaddr.c:57 -+#: ../ipmaddr.c:62 -+#, c-format - msgid " ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n" - msgstr " ipmaddr show [ dev ŘETĚZEC ] [ ipv4 | ipv6 | link | all ]\n" - --#: ../ipmaddr.c:58 -+#: ../ipmaddr.c:63 -+#, c-format - msgid " ipmaddr -V | -version\n" - msgstr " ipmaddr -V | -version\n" - --#: ../ipmaddr.c:258 -+#: ../ipmaddr.c:263 - #, c-format - msgid "family %d " - msgstr "třída %d " - --#: ../ipmaddr.c:267 -+#: ../ipmaddr.c:272 - #, c-format - msgid " users %d" - msgstr " uľivatelé %d" - --#: ../ipmaddr.c:353 -+#: ../ipmaddr.c:358 - msgid "Cannot create socket" - msgstr "Soket nelze vytvořit" - -@@ -2433,6 +3060,7 @@ - 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 @@ - msgid "slattach: tty_hangup(RAISE): %s\n" - msgstr "slattach: tty_hangup(RAISE): %s\n" - --#: ../slattach.c:486 -+#: ../slattach.c:468 -+#, fuzzy, c-format -+msgid "slattach: tty name too long\n" -+msgstr "jméno %s je přílią dlouhé\n" -+ -+#: ../slattach.c:498 -+#, c-format - msgid "slattach: tty_open: cannot get current state!\n" - msgstr "slattach: tty_open: aktuální stav nelze zjistit!\n" - --#: ../slattach.c:493 -+#: ../slattach.c:505 -+#, c-format - msgid "slattach: tty_open: cannot get current line disc!\n" - msgstr "slattach: tty_open: aktuální linkovou disciplínu nelze zjistit!\n" - --#: ../slattach.c:501 -+#: ../slattach.c:513 -+#, c-format - msgid "slattach: tty_open: cannot set RAW mode!\n" - msgstr "slattach: tty_open: reľim RAW nelze nastavit!\n" - --#: ../slattach.c:508 -+#: ../slattach.c:520 - #, c-format - msgid "slattach: tty_open: cannot set %s bps!\n" - msgstr "slattach: tty_open: %s bps nelze nastavit!\n" - --#: ../slattach.c:518 -+#: ../slattach.c:530 -+#, c-format - msgid "slattach: tty_open: cannot set 8N1 mode!\n" - msgstr "slattach: tty_open: reľim 8N1 nelze nastavit!\n" - --#: ../slattach.c:686 -+#: ../slattach.c:672 -+#, c-format -+msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n" -+msgstr "" -+ -+#: ../slattach.c:704 - #, c-format - msgid "%s started" - msgstr "protokol %s spuątěn" - --#: ../slattach.c:687 -+#: ../slattach.c:705 - #, c-format - msgid " on %s" - msgstr " na %s" - --#: ../slattach.c:688 -+#: ../slattach.c:706 - #, c-format - msgid " interface %s\n" - msgstr " rozhraní %s\n" - - #~ msgid "" --#~ " This comand can read or set the hostname or the NIS domainname. You can\n" -+#~ " arp [-v] [<HW>] [-i <if>] -s <hostname> <hwaddr> [netmask <nm>] pub " -+#~ "<-''-\n" -+#~ msgstr "" -+#~ " arp [-v] [<HW>] [-i <if>] -s <soubor> <hwadr> [sí»mask <čís>] <-''-\n" -+ -+#~ msgid "%s: unknown interface: %s\n" -+#~ msgstr "%s: rozhraní %s není známo\n" -+ -+#~ msgid "address mask replies" -+#~ msgstr "odpovědi na ľádost o masku podsítě" -+ -+#~ msgid "unknown title %s\n" -+#~ msgstr "titulek %s je neznámý\n" -+ -+#~ msgid "Routing table for `ddp' not yet supported.\n" -+#~ msgstr "Směrovací tabulka pro `ddp' není zatím podporována.\n" -+ -+#~ msgid "" -+#~ " This comand can read or set the hostname or the NIS domainname. You " -+#~ "can\n" - #~ msgstr "" - #~ " Tento program zjią»uje a nastavuje jméno počítače či NIS domény. Můľe " - #~ "také\n" -@@ -2500,7 +3161,8 @@ - #~ msgid "" - #~ " Unless you are using bind or NIS for host lookups you can change the\n" - #~ msgstr "" --#~ " Pokud nepouľíváte bind či NIS pro vyhledávání jmen počítačů, pak můľete\n" -+#~ " Pokud nepouľíváte bind či NIS pro vyhledávání jmen počítačů, pak " -+#~ "můľete\n" - - #~ msgid "" - #~ " FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n" ---- net-tools-1.60.orig/po/ja.po -+++ net-tools-1.60/po/ja.po -@@ -0,0 +1,3133 @@ -+# Net-tool Japanese locale data -+# Kenshi Muto <kmuto@debian.org>, 2007. -+# Yasuyuki Furukawa <yasu@on.cs.keio.ac.jp>, 1999. -+# -+msgid "" -+msgstr "" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2007-06-30 12:28+0900\n" -+"PO-Revision-Date: 2007-07-04 20:47+0900\n" -+"Last-Translator: Kenshi Muto <kmuto@debian.org>\n" -+"Language-Team: Japanese\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8-bit\n" -+ -+#: ../arp.c:112 ../arp.c:279 -+#, c-format -+msgid "arp: need host name\n" -+msgstr "arp: ă›ă‚ąăĺŤăŚĺż…č¦ă§ă™\n" -+ -+#: ../arp.c:215 ../arp.c:230 -+#, c-format -+msgid "No ARP entry for %s\n" -+msgstr "%să®ARPエăłăăŞăŚă‚ă‚Šăľă›ă‚“\n" -+ -+#: ../arp.c:248 -+#, c-format -+msgid "arp: cant get HW-Address for `%s': %s.\n" -+msgstr "arp: '%s'ă®ăŹăĽă‰ă‚¦ă‚§ă‚˘ă‚˘ă‰ă¬ă‚ąă‚’取得ă§ăŤăľă›ă‚“: %s.\n" -+ -+#: ../arp.c:252 -+#, c-format -+msgid "arp: protocol type mismatch.\n" -+msgstr "arp: ă—ăăă‚łă«ă‚żă‚¤ă—ăŚé©ĺă—ăľă›ă‚“.\n" -+ -+#: ../arp.c:261 -+#, c-format -+msgid "arp: device `%s' has HW address %s `%s'.\n" -+msgstr "arp: ă‡ăイス`%s'ăŻăŹăĽă‰ă‚¦ă‚§ă‚˘ă‚˘ă‰ă¬ă‚ą%s `%s'ă§ă™.\n" -+ -+#: ../arp.c:293 -+#, c-format -+msgid "arp: need hardware address\n" -+msgstr "arp: ăŹăĽă‰ă‚¦ă‚§ă‚˘ă‚˘ă‰ă¬ă‚ąăŚĺż…č¦ă§ă™\n" -+ -+#: ../arp.c:301 -+#, c-format -+msgid "arp: invalid hardware address\n" -+msgstr "arp: ăŹăĽă‰ă‚¦ă‚§ă‚˘ă‚˘ă‰ă¬ă‚ąăŚä¸Ťé©ĺ˝“ă§ă™\n" -+ -+#: ../arp.c:398 -+#, c-format -+msgid "arp: cannot open etherfile %s !\n" -+msgstr "arp: etheră•ă‚ˇă‚¤ă«%săŚé–‹ă‘ăľă›ă‚“!\n" -+ -+#: ../arp.c:414 -+#, c-format -+msgid "arp: format error on line %u of etherfile %s !\n" -+msgstr "arp: %u行(ă•ă‚ˇă‚¤ă«%s)ă«ă•ă‚©ăĽăžăăエă©ăĽăŚă‚ă‚Šăľă™!\n" -+ -+#: ../arp.c:427 -+#, c-format -+msgid "arp: cannot set entry on line %u of etherfile %s !\n" -+msgstr "arp: etheră•ă‚ˇă‚¤ă«%u行(%s)ă®ă‚¨ăłăăŞă‚’č¨ĺ®šă§ăŤăľă›ă‚“!\n" -+ -+#: ../arp.c:448 -+#, c-format -+msgid "" -+"Address HWtype HWaddress Flags Mask " -+"Iface\n" -+msgstr "アă‰ă¬ă‚ą HWタイ㗠HWアă‰ă¬ă‚ą ă•ă©ă‚° ăžă‚ąă‚Ż イăłă‚żă•ă‚§ăĽă‚ą\n" -+ -+#: ../arp.c:476 -+msgid "<from_interface>" -+msgstr "<起点イăłă‚żă•ă‚§ăĽă‚ą>" -+ -+#: ../arp.c:478 -+msgid "(incomplete)" -+msgstr "(不完全)" -+ -+# translatable? -+#: ../arp.c:495 -+#, c-format -+msgid "%s (%s) at " -+msgstr "%s (%s) at " -+ -+#: ../arp.c:501 -+#, c-format -+msgid "<incomplete> " -+msgstr "<不完全> " -+ -+#: ../arp.c:507 -+#, c-format -+msgid "netmask %s " -+msgstr "ăŤăăăžă‚ąă‚Ż %s " -+ -+# translatable? -+#: ../arp.c:524 -+#, c-format -+msgid "on %s\n" -+msgstr "on %s\n" -+ -+#: ../arp.c:605 -+#, c-format -+msgid "Entries: %d\tSkipped: %d\tFound: %d\n" -+msgstr "エăłăăŞ: %d\tă‚ąă‚ăă—: %d\t発見: %d\n" -+ -+#: ../arp.c:609 -+#, c-format -+msgid "%s (%s) -- no entry\n" -+msgstr "%s (%s) -- エăłăăŞăŞă—\n" -+ -+#: ../arp.c:611 -+#, c-format -+msgid "arp: in %d entries no match found.\n" -+msgstr "arp: %dă®ă‚¨ăłăăŞä¸, 一致ă™ă‚‹ă‚‚ă®ăŚč¦‹ă¤ă‹ă‚Šăľă›ă‚“.\n" -+ -+#: ../arp.c:626 -+#, c-format -+msgid "" -+"Usage:\n" -+" arp [-vn] [<HW>] [-i <if>] [-a] [<hostname>] <-Display ARP " -+"cache\n" -+msgstr "" -+"使用法:\n" -+" arp [-vn] [<HW>] [-i <イăłă‚żă•ă‚§ăĽă‚ą>]\n" -+" [-a] [<ă›ă‚ąăĺŤ>] ‥‥ ARPă‚ăŁăă‚·ăĄă®čˇ¨" -+"示\n" -+ -+#: ../arp.c:627 -+#, c-format -+msgid "" -+" arp [-v] [-i <if>] -d <host> [pub] <-Delete ARP " -+"entry\n" -+msgstr " arp [-v] [-i <イăłă‚żă•ă‚§ăĽă‚ą>] -d <ă›ă‚ąăĺŤ> [pub] ‥‥ARPエăłăăŞă‚’削除\n" -+ -+#: ../arp.c:628 -+#, c-format -+msgid "" -+" arp [-vnD] [<HW>] [-i <if>] -f [<filename>] <-Add entry from " -+"file\n" -+msgstr "" -+" arp [-vnD] [<HW>] [-i <イăłă‚żă•ă‚§ăĽă‚ą>] \n" -+" -f <ă•ă‚ˇă‚¤ă«ĺŤ> ‥‥ă•ă‚ˇă‚¤ă«ă‹ă‚‰ă‚¨ăłăăŞă‚’čż˝ĺŠ \n" -+ -+#: ../arp.c:629 -+#, c-format -+msgid "" -+" arp [-v] [<HW>] [-i <if>] -s <host> <hwaddr> [temp] <-Add " -+"entry\n" -+msgstr "" -+" arp [-v] [<HW>] [-i <イăłă‚żă•ă‚§ăĽă‚ą>]\n" -+" -s <ă›ă‚ąăĺŤ> <ăŹăĽă‰ă‚¦ă‚§ă‚˘ă‚˘ă‰ă¬ă‚ą> [temp] ‥‥エăłăăŞă‚’čż˝ĺŠ \n" -+ -+# FIXME:What does '' mean? -+#: ../arp.c:630 -+#, c-format -+msgid "" -+" arp [-v] [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub " -+"<-''-\n" -+"\n" -+msgstr "" -+" arp [-v] [<HW>] [-i <イăłă‚żă•ă‚§ăĽă‚ą>] -Ds <ă›ă‚ąăĺŤ>\n" -+" <イăłă‚żă•ă‚§ăĽă‚ą> [netmask <ăŤăăăžă‚ąă‚Ż>] pub ‥‥ ă€\n" -+ -+#: ../arp.c:632 -+#, c-format -+msgid "" -+" -a display (all) hosts in alternative (BSD) " -+"style\n" -+msgstr "" -+" -a ć–°ă—ă„(BSD)スタイă«ă§ă‚¨ăłăăŞă•ă‚Śăźĺ…¨ă›ă‚ąăを表示" -+"ă™ă‚‹\n" -+ -+#: ../arp.c:633 -+#, c-format -+msgid " -s, --set set a new ARP entry\n" -+msgstr " -s, --set 新規ARPエăłăăŞă‚’č¨ĺ®šă™ă‚‹\n" -+ -+#: ../arp.c:634 -+#, c-format -+msgid " -d, --delete delete a specified entry\n" -+msgstr " -d, --delete 指定エăłăăŞă‚’削除ă™ă‚‹\n" -+ -+#: ../arp.c:635 ../netstat.c:1503 ../route.c:86 -+#, c-format -+msgid " -v, --verbose be verbose\n" -+msgstr " -v, --verbose 詳細表示を行ăŞă†\n" -+ -+#: ../arp.c:636 ../netstat.c:1504 ../route.c:87 -+#, c-format -+msgid " -n, --numeric don't resolve names\n" -+msgstr " -n, --numeric ĺŤĺ‰Ťă®ă¬ă‚ľă«ă–ă‚’ă—ăŞă„\n" -+ -+#: ../arp.c:637 -+#, c-format -+msgid "" -+" -i, --device specify network interface (e.g. eth0)\n" -+msgstr " -i, --device ăŤăăăŻăĽă‚Żă‚¤ăłă‚żă•ă‚§ăĽă‚ąă®ćŚ‡ĺ®š(äľ‹ eth0)\n" -+ -+#: ../arp.c:638 -+#, c-format -+msgid " -D, --use-device read <hwaddr> from given device\n" -+msgstr "" -+" -D, --use-device 与ăられăźă‡ăイスă‹ă‚‰\n" -+" <HWアă‰ă¬ă‚ą>ă‚’čŞăżčľĽă‚€\n" -+ -+#: ../arp.c:639 -+#, c-format -+msgid " -A, -p, --protocol specify protocol family\n" -+msgstr " -A, -p, --protocol ă—ăăă‚łă«ă•ă‚ˇăźăŞă‚’指定ă™ă‚‹\n" -+ -+#: ../arp.c:640 -+#, c-format -+msgid "" -+" -f, --file read new entries from file or from /etc/" -+"ethers\n" -+"\n" -+msgstr " -f, --file /etc/ethersă•ă‚ˇă‚¤ă«ă‹ă‚‰ć–°č¦Źă‚¨ăłăăŞă‚’čŞăżčľĽă‚€\n\n" -+ -+#: ../arp.c:642 ../rarp.c:182 -+#, c-format -+msgid " <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n" -+msgstr " <HW>=ăŹăĽă‰ă‚¦ă‚§ă‚˘ă‚˘ă‰ă¬ă‚ąă‚żă‚¤ă—を指定ă™ă‚‹ă«ăŻ'-H <hw>'を使ăŁă¦ä¸‹ă•ă„。標準: %s\n" -+ -+#: ../arp.c:643 ../rarp.c:183 -+#, c-format -+msgid " List of possible hardware types (which support ARP):\n" -+msgstr " (ARPをサăťăĽăă—ăź)指定可č˝ăŞăŹăĽă‰ă‚¦ă‚§ă‚˘ă‚żă‚¤ă—ă®ăŞă‚ąă:\n" -+ -+#: ../arp.c:677 ../arp.c:762 -+#, c-format -+msgid "%s: hardware type not supported!\n" -+msgstr "%s: ăŹăĽă‰ă‚¦ă‚§ă‚˘ă‚żă‚¤ă—ăŚă‚µăťăĽăă•ă‚Śă¦ă„ăľă›ă‚“!\n" -+ -+#: ../arp.c:681 -+#, c-format -+msgid "%s: address family not supported!\n" -+msgstr "%s: アă‰ă¬ă‚ąă•ă‚ˇăźăŞăŚă‚µăťăĽăă•ă‚Śă¦ă„ăľă›ă‚“!\n" -+ -+#: ../arp.c:716 -+#, c-format -+msgid "arp: -N not yet supported.\n" -+msgstr "arp: -NăŻăľă サăťăĽăă—ă¦ă„ăľă›ă‚“.\n" -+ -+#: ../arp.c:726 -+#, c-format -+msgid "arp: %s: unknown address family.\n" -+msgstr "arp: %s: 不ćŽăŞă‚˘ă‰ă¬ă‚ąă•ă‚ˇăźăŞă§ă™.\n" -+ -+#: ../arp.c:735 -+#, c-format -+msgid "arp: %s: unknown hardware type.\n" -+msgstr "arp: %s: 不ćŽăŞăŹăĽă‰ă‚¦ă‚§ă‚˘ă‚żă‚¤ă—ă§ă™.\n" -+ -+#: ../arp.c:754 -+#, c-format -+msgid "arp: %s: kernel only supports 'inet'.\n" -+msgstr "arp: %s: ă‚«ăĽăŤă«ăŻ'inet'以外ăŻă‚µăťăĽăă—ă¦ă„ăľă›ă‚“.\n" -+ -+#: ../arp.c:767 -+#, c-format -+msgid "arp: %s: hardware type without ARP support.\n" -+msgstr "arp: %s: ARPサăťăĽăă®ăŞă„ăŹăĽă‰ă‚¦ă‚§ă‚˘ă‚żă‚¤ă—ă§ă™.\n" -+ -+#: ../hostname.c:71 -+#, c-format -+msgid "Setting nodename to `%s'\n" -+msgstr "ăŽăĽă‰ĺŤă‚’`%s'ă¸č¨ĺ®šă—ăľă—ăź\n" -+ -+#: ../hostname.c:76 -+#, c-format -+msgid "%s: you must be root to change the node name\n" -+msgstr "%s: ăŽăĽă‰ĺŤă®ĺ¤‰ć›´ăŻă«ăĽăă§ăŞă‘ă‚Śă°ăŞă‚Šăľă›ă‚“\n" -+ -+#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117 -+#, c-format -+msgid "%s: name too long\n" -+msgstr "%s: ĺŤĺ‰ŤăŚé•·ă™ăŽăľă™\n" -+ -+#: ../hostname.c:91 -+#, c-format -+msgid "Setting hostname to `%s'\n" -+msgstr "ă›ă‚ąăĺŤă‚’`%s'ă¸č¨ĺ®šă—ăľă—ăź\n" -+ -+#: ../hostname.c:96 -+#, c-format -+msgid "%s: you must be root to change the host name\n" -+msgstr "%s: ă›ă‚ąăĺŤă®ĺ¤‰ć›´ăŻă«ăĽăă§ăŞă‘ă‚Śă°ăŞă‚Šăľă›ă‚“\n" -+ -+#: ../hostname.c:109 -+#, c-format -+msgid "Setting domainname to `%s'\n" -+msgstr "ă‰ăˇă‚¤ăłă‚’`%s'ă¸č¨ĺ®šă—ăľă—ăź\n" -+ -+#: ../hostname.c:114 -+#, c-format -+msgid "%s: you must be root to change the domain name\n" -+msgstr "%s: ă‰ăˇă‚¤ăłĺŤă®ĺ¤‰ć›´ăŻă«ăĽăă§ăŞă‘ă‚Śă°ăŞă‚Šăľă›ă‚“\n" -+ -+#: ../hostname.c:131 -+#, c-format -+msgid "Resolving `%s' ...\n" -+msgstr "`%s'ă‚’ă¬ă‚ľă«ă–ä¸ ...\n" -+ -+#: ../hostname.c:137 -+#, c-format -+msgid "Result: h_name=`%s'\n" -+msgstr "çµćžś: h_name=`%s'\n" -+ -+#: ../hostname.c:142 -+#, c-format -+msgid "Result: h_aliases=`%s'\n" -+msgstr "çµćžś: h_aliases=`%s'\n" -+ -+#: ../hostname.c:147 -+#, c-format -+msgid "Result: h_addr_list=`%s'\n" -+msgstr "çµćžś: h_addr_list=`%s'\n" -+ -+#: ../hostname.c:208 -+#, c-format -+msgid "%s: can't open `%s'\n" -+msgstr "%s: `%s'ă‚’é–‹ă‘ăľă›ă‚“\n" -+ -+#: ../hostname.c:222 -+#, c-format -+msgid "Usage: hostname [-v] {hostname|-F file} set hostname (from file)\n" -+msgstr "使用法: hostname [-v] {ă›ă‚ąăĺŤ|-F ă•ă‚ˇă‚¤ă«} (ă•ă‚ˇă‚¤ă«ă«ă‚ă‚‹)ă›ă‚ąăĺŤă®č¨ĺ®š\n" -+ -+#: ../hostname.c:223 -+#, c-format -+msgid "" -+" domainname [-v] {nisdomain|-F file} set NIS domainname (from file)\n" -+msgstr " domainname [-v] {NISă‰ăˇă‚¤ăł|-F ă•ă‚ˇă‚¤ă«} (ă•ă‚ˇă‚¤ă«ă«ă‚ă‚‹)NISă‰ăˇă‚¤ăłĺŤă®č¨ĺ®š\n" -+ -+#: ../hostname.c:225 -+#, c-format -+msgid "" -+" nodename [-v] {nodename|-F file} set DECnet node name (from " -+"file)\n" -+msgstr "" -+"nodename [-v] {ăŽăĽă‰ĺŤ|-F ă•ă‚ˇă‚¤ă«} (ă•ă‚ˇă‚¤ă«ă«ă‚ă‚‹)DECnetăŽăĽă‰ĺŤă®č¨ĺ®š\n" -+ -+#: ../hostname.c:227 -+#, c-format -+msgid " hostname [-v] [-d|-f|-s|-a|-i|-y|-n] display formatted name\n" -+msgstr " hostname [-v] [-d|-f|-s|-a|-i|-y] 形式を指定ă—ă¦čˇ¨ç¤ş\n" -+ -+#: ../hostname.c:228 -+#, c-format -+msgid "" -+" hostname [-v] display hostname\n" -+"\n" -+msgstr "" -+" hostname [-v] ă›ă‚ąăĺŤă®ĺ‡şĺŠ›\n" -+"\n" -+ -+#: ../hostname.c:229 -+#, c-format -+msgid "" -+" hostname -V|--version|-h|--help print info and exit\n" -+"\n" -+msgstr "" -+" hostname -V|--version|-h|--help 諸ć…ĺ ±ă‚’ĺ‡şĺŠ›ă—ă¦çµ‚了\n" -+"\n" -+"\n" -+ -+#: ../hostname.c:230 -+#, c-format -+msgid "" -+" dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" -+"\n" -+msgstr " dnsdomainname=ă›ă‚ąăĺŤ -d, {yp,nis,}domainname=ă›ă‚ąăĺŤ -y\n\n" -+ -+#: ../hostname.c:231 -+#, c-format -+msgid " -s, --short short host name\n" -+msgstr " -s, --short çźç¸®ă›ă‚ąăĺŤ\n" -+ -+#: ../hostname.c:232 -+#, c-format -+msgid " -a, --alias alias names\n" -+msgstr " -a, --alias エイăŞă‚˘ă‚ąĺŤ\n" -+ -+#: ../hostname.c:233 -+#, c-format -+msgid " -i, --ip-address addresses for the hostname\n" -+msgstr " -i, --ip-address ă›ă‚ąăĺŤă«ĺŻľă™ă‚‹ă‚˘ă‰ă¬ă‚ą\n" -+ -+#: ../hostname.c:234 -+#, c-format -+msgid " -f, --fqdn, --long long host name (FQDN)\n" -+msgstr " -f, --fqdn, --long ăăłă‚°ă›ă‚ąăĺŤ(FQDN)\n" -+ -+#: ../hostname.c:235 -+#, c-format -+msgid " -d, --domain DNS domain name\n" -+msgstr " -d, --domain DNSă‰ăˇă‚¤ăłĺŤ\n" -+ -+#: ../hostname.c:236 -+#, c-format -+msgid " -y, --yp, --nis NIS/YP domainname\n" -+msgstr " -y, --yp, --nis NIS/YPă‰ăˇă‚¤ăłĺŤ\n" -+ -+#: ../hostname.c:238 -+#, c-format -+msgid " -n, --node DECnet node name\n" -+msgstr " -n, --node DECnetăŽăĽă‰ĺŤ\n" -+ -+#: ../hostname.c:240 -+#, c-format -+msgid "" -+" -F, --file read hostname or NIS domainname from given file\n" -+"\n" -+msgstr " -F, --file 指定ă®ă•ă‚ˇă‚¤ă«ă‹ă‚‰ă›ă‚ąăĺŤă‹NISă‰ăˇă‚¤ăłĺŤă‚’čŞăżčľĽă‚€\n\n" -+ -+#: ../hostname.c:242 -+#, c-format -+msgid "" -+" This command can read or set the hostname or the NIS domainname. You can\n" -+" also read the DNS domain or the FQDN (fully qualified domain name).\n" -+" Unless you are using bind or NIS for host lookups you can change the\n" -+" FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n" -+" part of the FQDN) in the /etc/hosts file.\n" -+msgstr "" -+" ă“ă®ă‚łăžăłă‰ă§ăŻă€ă›ă‚ąăĺŤăľăźăŻNISă‰ăˇă‚¤ăłĺŤă‚’čŞăżčľĽăżăľăźăŻč¨ĺ®šă§ăŤăľă™ă€‚\n" -+" DNSă‰ăˇă‚¤ăłăľăźăŻFDN(完全修飾ă‰ăˇă‚¤ăłĺŤ)ă‚’čŞăżčľĽă‚€ă“ă¨ă‚‚ă§ăŤăľă™ă€‚\n" -+" ă›ă‚ąăĺŤă®ĺŹ‚ç…§ă«BindăŠă‚ăł, NISも使わăŞă„ĺ ´ĺ, /etc/hostsă•ă‚ˇă‚¤ă«ă«ă‚ă‚‹\n" -+" FQDNă‚„, (FQDNă®ä¸€é¨ĺ†ă®)ă‰ăˇă‚¤ăłĺŤă‚’変更ă§ăŤăľă™.\n" -+ -+#: ../hostname.c:338 -+#, c-format -+msgid "%s: You can't change the DNS domain name with this command\n" -+msgstr "%s: ă“ă®ă‚łăžăłă‰ă§ăŻDNSă‰ăˇă‚¤ăłĺŤăŻĺ¤‰ć›´ă§ăŤăľă›ă‚“.\n" -+ -+#: ../hostname.c:339 -+#, c-format -+msgid "" -+"\n" -+"Unless you are using bind or NIS for host lookups you can change the DNS\n" -+msgstr "" -+"\n" -+"ă›ă‚ąăĺŤă®ĺŹ‚ç…§ă«BindăŠă‚ăł, NISも使わăŞă„ĺ ´ĺă€/etc/hostsă•ă‚ˇă‚¤ă«\n" -+ -+#: ../hostname.c:340 -+#, c-format -+msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n" -+msgstr "ă«ă‚ă‚‹FQDNă‚„, (FQDNă®ä¸€é¨ĺ†ă®)ă‰ăˇă‚¤ăłĺŤă‚’変更ă§ăŤăľă™.\n" -+ -+#: ../hostname.c:357 -+#, c-format -+msgid "gethostname()=`%s'\n" -+msgstr "gethostname()=`%s'\n" -+ -+#: ../hostname.c:374 -+#, c-format -+msgid "getdomainname()=`%s'\n" -+msgstr "getdomainname()=`%s'\n" -+ -+#: ../hostname.c:389 -+#, c-format -+msgid "getnodename()=`%s'\n" -+msgstr "getnodename()=`%s'\n" -+ -+#: ../ifconfig.c:107 -+#, c-format -+msgid "" -+"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " -+"Flg\n" -+msgstr "Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR ă•ă©ă‚°\n" -+ -+#: ../ifconfig.c:129 ../ifconfig.c:161 -+#, c-format -+msgid "%s: ERROR while getting interface flags: %s\n" -+msgstr "%s: イăłă‚żă•ă‚§ăĽă‚ąă•ă©ă‚°ă®ĺŹ–ĺľ—ä¸ă«ă‚¨ă©ăĽăŚç™şç”źă—ăľă—ăź:%s\n" -+ -+#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862 -+#: ../ifconfig.c:973 -+#, c-format -+msgid "No support for INET on this system.\n" -+msgstr "INETăŻă“ă®ă‚·ă‚ąă†ă ă§ăŻă‚µăťăĽăă•ă‚Śă¦ă„ăľă›ă‚“.\n" -+ -+#: ../ifconfig.c:193 -+#, c-format -+msgid "%s: ERROR while testing interface flags: %s\n" -+msgstr "%s: イăłă‚żă•ă‚§ăĽă‚ąă•ă©ă‚°ă®ă†ă‚ąăä¸ă«ă‚¨ă©ăĽăŚç™şç”źă—ăľă—ăź: %s\n" -+ -+#: ../ifconfig.c:202 -+#, c-format -+msgid "" -+"Usage:\n" -+" ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n" -+msgstr "" -+"使用法:\n" -+" ifconfig [-a] [-v] [-s] <イăłă‚żă•ă‚§ăĽă‚ą> [[<AF>] <アă‰ă¬ă‚ą>]\n" -+ -+#: ../ifconfig.c:204 -+#, c-format -+msgid " [add <address>[/<prefixlen>]]\n" -+msgstr " [add <アă‰ă¬ă‚ą>[/<ă—ă¬ă•ă‚Łăă‚Żă‚ąé•·>]]\n" -+ -+#: ../ifconfig.c:205 -+#, c-format -+msgid " [del <address>[/<prefixlen>]]\n" -+msgstr " [del <アă‰ă¬ă‚ą>[/<ă—ă¬ă•ă‚Łăă‚Żă‚ąé•·>]]\n" -+ -+#: ../ifconfig.c:206 -+#, c-format -+msgid " [[-]broadcast [<address>]] [[-]pointopoint [<address>]]\n" -+msgstr " [[-]broadcast [<アă‰ă¬ă‚ą>]] [[-]pointopoint [<アă‰ă¬ă‚ą>]]\n" -+ -+#: ../ifconfig.c:207 -+#, c-format -+msgid " [netmask <address>] [dstaddr <address>] [tunnel <address>]\n" -+msgstr " [netmask <アă‰ă¬ă‚ą>] [dstaddr <アă‰ă¬ă‚ą>] [tunnel <アă‰ă¬ă‚ą>]\n" -+ -+#: ../ifconfig.c:210 -+#, c-format -+msgid " [outfill <NN>] [keepalive <NN>]\n" -+msgstr " [outfill <数値>] [keepalive <数値>]\n" -+ -+#: ../ifconfig.c:212 -+#, c-format -+msgid " [hw <HW> <address>] [metric <NN>] [mtu <NN>]\n" -+msgstr " [hw <HW> <アă‰ă¬ă‚ą>] [metric <数値>] [mtu <数値>]\n" -+ -+#: ../ifconfig.c:213 -+#, c-format -+msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" -+msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" -+ -+#: ../ifconfig.c:214 -+#, c-format -+msgid " [multicast] [[-]promisc]\n" -+msgstr " [multicast] [[-]promisc]\n" -+ -+#: ../ifconfig.c:215 -+#, c-format -+msgid " [mem_start <NN>] [io_addr <NN>] [irq <NN>] [media <type>]\n" -+msgstr " [mem_start <開始アă‰ă¬ă‚ą>] [io_addr <IOアă‰ă¬ă‚ą>] [irq <番号>] [media <タイă—>]\n" -+ -+#: ../ifconfig.c:217 -+#, c-format -+msgid " [txqueuelen <NN>]\n" -+msgstr " [txqueuelen <TXă‚ăĄăĽé•·>]\n" -+ -+#: ../ifconfig.c:220 -+#, c-format -+msgid " [[-]dynamic]\n" -+msgstr " [[-]dynamic]\n" -+ -+#: ../ifconfig.c:222 -+#, c-format -+msgid "" -+" [up|down] ...\n" -+"\n" -+msgstr " [up|down] ...\n\n" -+ -+#: ../ifconfig.c:224 -+#, c-format -+msgid " <HW>=Hardware Type.\n" -+msgstr " <HW>=ăŹăĽă‰ă‚¦ă‚§ă‚˘ă‚żă‚¤ă—.\n" -+ -+#: ../ifconfig.c:225 -+#, c-format -+msgid " List of possible hardware types:\n" -+msgstr " ĺ©ç”¨ĺŹŻč˝ăŞăŹăĽă‰ă‚¦ă‚§ă‚˘ă‚żă‚¤ă—ă®ăŞă‚ąă:\n" -+ -+#. 1 = ARPable -+#: ../ifconfig.c:227 -+#, c-format -+msgid " <AF>=Address family. Default: %s\n" -+msgstr " <AF>=アă‰ă¬ă‚ąă•ă‚ˇăźăŞ. 標準: %s\n" -+ -+#: ../ifconfig.c:228 -+#, c-format -+msgid " List of possible address families:\n" -+msgstr " ĺ©ç”¨ĺŹŻč˝ăŞă‚˘ă‰ă¬ă‚ąă•ă‚ˇăźăŞă®ăŞă‚ąă:\n" -+ -+#: ../ifconfig.c:303 -+#, c-format -+msgid "ifconfig: option `%s' not recognised.\n" -+msgstr "ifconfig: ă‚Şă—ă‚·ă§ăł`%s'を解é‡ă§ăŤăľă›ă‚“.\n" -+ -+#: ../ifconfig.c:305 ../ifconfig.c:962 -+#, c-format -+msgid "ifconfig: `--help' gives usage information.\n" -+msgstr "ifconfig: `--help'ă§ä˝żç”¨ćł•ă‚’見られăľă™.\n" -+ -+#: ../ifconfig.c:380 -+#, c-format -+msgid "Unknown media type.\n" -+msgstr "不ćŽăŞăˇă‡ă‚Łă‚˘ă‚żă‚¤ă—ă§ă™.\n" -+ -+#: ../ifconfig.c:417 -+#, c-format -+msgid "" -+"Warning: Interface %s still in promisc mode... maybe other application is " -+"running?\n" -+msgstr "č¦ĺ‘Š: イăłă‚żă•ă‚§ăĽă‚ą%săŻăľă promiscă˘ăĽă‰ă§ă™...ćらăŹä»–ă®ă‚˘ă—ăŞă‚±ăĽă‚·ă§ăłăŚĺ®źčˇŚä¸ă§ăŻă‚ă‚Šăľă›ă‚“ă‹?\n" -+ -+#: ../ifconfig.c:429 -+#, c-format -+msgid "Warning: Interface %s still in MULTICAST mode.\n" -+msgstr "č¦ĺ‘Š: イăłă‚żă•ă‚§ăĽă‚ą%săŻăľă MULTICASTă˘ăĽă‰ă§ă™.\n" -+ -+#: ../ifconfig.c:441 -+#, c-format -+msgid "Warning: Interface %s still in ALLMULTI mode.\n" -+msgstr "č¦ĺ‘Š: イăłă‚żă•ă‚§ăĽă‚ą%săŻăľă ALLMULTIă˘ăĽă‰ă§ă™.\n" -+ -+#: ../ifconfig.c:465 -+#, c-format -+msgid "Warning: Interface %s still in DYNAMIC mode.\n" -+msgstr "č¦ĺ‘Š: イăłă‚żă•ă‚§ăĽă‚ą%săŻăľă DYNAMICă˘ăĽă‰ă§ă™.\n" -+ -+#: ../ifconfig.c:523 -+#, c-format -+msgid "Warning: Interface %s still in BROADCAST mode.\n" -+msgstr "č¦ĺ‘Š: イăłă‚żă•ă‚§ăĽă‚ą%săŻăľă BROADCASTă˘ăĽă‰ă§ă™.\n" -+ -+#: ../ifconfig.c:652 -+#, c-format -+msgid "Warning: Interface %s still in POINTOPOINT mode.\n" -+msgstr "č¦ĺ‘Š: イăłă‚żă•ă‚§ăĽă‚ą%săŻăľă POINTOPOINTă˘ăĽă‰ă§ă™.\n" -+ -+#: ../ifconfig.c:684 -+#, c-format -+msgid "hw address type `%s' has no handler to set address. failed.\n" -+msgstr "ăŹăĽă‰ă‚¦ă‚§ă‚˘ă‚˘ă‰ă¬ă‚ąă‚żă‚¤ă—`%s'ăŻă‚˘ă‰ă¬ă‚ąă‚’č¨ĺ®šă™ă‚‹ăŹăłă‰ă©ă‚’ćŚăŁă¦ă„ăľă›ă‚“. 失敗ă—ăľă—ăź.\n" -+ -+#: ../ifconfig.c:693 -+#, c-format -+msgid "%s: invalid %s address.\n" -+msgstr "%s: 不é©ĺ‡ăŞă‚˘ă‰ă¬ă‚ąă§ă™(%s).\n" -+ -+#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913 -+#, c-format -+msgid "No support for INET6 on this system.\n" -+msgstr "INET6ăŻă“ă®ă‚·ă‚ąă†ă ă§ăŻă‚µăťăĽăă•ă‚Śă¦ă„ăľă›ă‚“.\n" -+ -+#: ../ifconfig.c:780 ../ifconfig.c:871 -+#, c-format -+msgid "Interface %s not initialized\n" -+msgstr "イăłă‚żă•ă‚§ăĽă‚ą%săŻĺťćśźĺŚ–ă•ă‚Śă¦ă„ăľă›ă‚“.\n" -+ -+#: ../ifconfig.c:792 ../ifconfig.c:882 -+#, c-format -+msgid "Bad address.\n" -+msgstr "不é©ĺ‡ăŞă‚˘ă‰ă¬ă‚ąă§ă™.\n" -+ -+#: ../ifconfig.c:885 -+#, c-format -+msgid "Address deletion not supported on this system.\n" -+msgstr "アă‰ă¬ă‚ąĺ‰Šé™¤ăŻă“ă®ă‚·ă‚ąă†ă ă§ăŻă‚µăťăĽăă•ă‚Śă¦ă„ăľă›ă‚“.\n" -+ -+#: ../ifconfig.c:957 -+#, c-format -+msgid "ifconfig: Cannot set address for this protocol family.\n" -+msgstr "ifconfig:ă“ă®ă—ăăă‚łă«ă•ă‚ˇăźăŞă«ă‚˘ă‰ă¬ă‚ąă‚’č¨ĺ®šă§ăŤăľă›ă‚“.\n" -+ -+#: ../ifconfig.c:983 -+#, c-format -+msgid "No support for ECONET on this system.\n" -+msgstr "ECONETăŻă“ă®ă‚·ă‚ąă†ă ă§ăŻă‚µăťăĽăă•ă‚Śă¦ă„ăľă›ă‚“.\n" -+ -+#: ../ifconfig.c:991 -+#, c-format -+msgid "Don't know how to set addresses for family %d.\n" -+msgstr "ă•ă‚ˇăźăŞ%dă®ă‚˘ă‰ă¬ă‚ąă®č¨ĺ®šć–ąćł•ăŚä¸ŤćŽă§ă™.\n" -+ -+#: ../ifconfig.c:1021 -+#, c-format -+msgid "WARNING: at least one error occured. (%d)\n" -+msgstr "č¦ĺ‘Š: ĺ°‘ăŞăŹă¨ă‚‚1ă¤ă®ă‚¨ă©ăĽăŚç™şç”źă—ăľă—ăź. (%d)\n" -+ -+#: ../netstat.c:434 -+#, c-format -+msgid "" -+"(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n" -+msgstr "(\"-p\"ă®ć…ĺ ±ă‚’čŞăżčľĽă‚ăľă›ă‚“ă§ă—ăź: geteuid()=%d ă—ă‹ă—ă«ăĽăă§ă‚ă‚‹ăąăŤă§ă™.)\n" -+ -+#: ../netstat.c:438 -+#, c-format -+msgid "" -+"(Not all processes could be identified, non-owned process info\n" -+" will not be shown, you would have to be root to see it all.)\n" -+msgstr "" -+"(一é¨ă®ă—ăセスăŚčĺĄă•ă‚Śăľă™ăŚ, 所有ă—ă¦ă„ăŞă„ă—ăセスă®ć…ĺ ±ăŻ\n" -+"表示ă•ă‚Śăľă›ă‚“。ăťă‚Śă‚‰ĺ…¨ă¦ă‚’見るă«ăŻă«ăĽăă«ăŞă‚‹ĺż…č¦ăŚă‚ă‚Šăľă™.)\n" -+ -+# translatable? -+#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266 -+msgid "LISTENING" -+msgstr "LISTENING" -+ -+# translatable? -+#: ../netstat.c:446 -+msgid "CONN SENT" -+msgstr "CONN SENT" -+ -+# translatable? -+#: ../netstat.c:447 ../netstat.c:1268 -+msgid "DISC SENT" -+msgstr "DISC SENT" -+ -+# translatable? -+#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269 -+msgid "ESTABLISHED" -+msgstr "ESTABLISHED" -+ -+#: ../netstat.c:470 -+#, c-format -+msgid "Active NET/ROM sockets\n" -+msgstr "稼ĺŤä¸ă®NET/ROMソケăă\n" -+ -+#: ../netstat.c:471 -+#, c-format -+msgid "" -+"User Dest Source Device State Vr/Vs Send-Q Recv-" -+"Q\n" -+msgstr "ă¦ăĽă‚¶ ĺŹ—äżˇĺ… ç™şäżˇĺ… ă‡ăイス 状態 Vr/Vs é€äżˇ-Q 受信-Q\n" -+ -+#: ../netstat.c:481 ../netstat.c:1308 -+#, c-format -+msgid "Problem reading data from %s\n" -+msgstr "%să‹ă‚‰ă®ă‡ăĽă‚żă®čŞăżčľĽăżă«ĺ•ŹéˇŚ\n" -+ -+# translatable? -+#: ../netstat.c:516 -+msgid "SYN_SENT" -+msgstr "SYN_SENT" -+ -+# translatable? -+#: ../netstat.c:517 -+msgid "SYN_RECV" -+msgstr "SYN_RECV" -+ -+# translatable? -+#: ../netstat.c:518 -+msgid "FIN_WAIT1" -+msgstr "FIN_WAIT1" -+ -+# translatable? -+#: ../netstat.c:519 -+msgid "FIN_WAIT2" -+msgstr "FIN_WAIT2" -+ -+# translatable? -+#: ../netstat.c:520 -+msgid "TIME_WAIT" -+msgstr "TIME_WAIT" -+ -+# translatable? -+#: ../netstat.c:521 -+msgid "CLOSE" -+msgstr "CLOSE" -+ -+# translatable? -+#: ../netstat.c:522 -+msgid "CLOSE_WAIT" -+msgstr "CLOSE_WAIT" -+ -+# translatable? -+#: ../netstat.c:523 -+msgid "LAST_ACK" -+msgstr "LAST_ACK" -+ -+# translatable? -+#: ../netstat.c:524 -+msgid "LISTEN" -+msgstr "LISTEN" -+ -+# translatable? -+#: ../netstat.c:525 -+msgid "CLOSING" -+msgstr "CLOSING" -+ -+#: ../netstat.c:596 -+#, c-format -+msgid "warning, got bogus igmp6 line %d.\n" -+msgstr "č¦ĺ‘Š, ĺ˝ă®igmp6ă©ă‚¤ăł%dă‚’ĺľ—ăľă—ăź.\n" -+ -+#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898 -+#: ../netstat.c:1032 ../netstat.c:1037 -+#, c-format -+msgid "netstat: unsupported address family %d !\n" -+msgstr "netstat: サăťăĽăă—ă¦ăŞă„アă‰ă¬ă‚ąă•ă‚ˇăźăŞ%dă§ă™!\n" -+ -+# c-format -+#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634 -+#, c-format -+msgid "warning, got bogus igmp line %d.\n" -+msgstr "č¦ĺ‘Š, ĺ˝ă®igmpă©ă‚¤ăł%dă‚’ĺľ—ăľă—ăź.\n" -+ -+#: ../netstat.c:677 -+#, c-format -+msgid "Active X.25 sockets\n" -+msgstr "稼ĺŤä¸ă®X.25ソケăă\n" -+ -+#. IMHO, Vr/Vs is not very usefull --SF -+#: ../netstat.c:679 -+#, c-format -+msgid "" -+"Dest Source Device LCI State Vr/Vs Send-Q Recv-" -+"Q\n" -+msgstr "ĺŹ—äżˇĺ… ç™şäżˇĺ… ă‡ăイス LCI 状態 Vr/Vs é€äżˇ-Q 受信-Q\n" -+ -+#: ../netstat.c:759 -+#, c-format -+msgid "warning, got bogus tcp line.\n" -+msgstr "č¦ĺ‘Š, ĺ˝ă®TCPă©ă‚¤ăłă‚’ĺľ—ăľă—ăź.\n" -+ -+#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075 -+#, c-format -+msgid "off (0.00/%ld/%d)" -+msgstr "ă‚Şă• (0.00/%ld/%d)" -+ -+#: ../netstat.c:804 -+#, c-format -+msgid "on (%2.2f/%ld/%d)" -+msgstr "ă‚Şăł (%2.2f/%ld/%d)" -+ -+#: ../netstat.c:809 -+#, c-format -+msgid "keepalive (%2.2f/%ld/%d)" -+msgstr "ă‚ăĽă—アă©ă‚¤ă– (%2.2f/%ld/%d)" -+ -+#: ../netstat.c:814 -+#, c-format -+msgid "timewait (%2.2f/%ld/%d)" -+msgstr "時間待㡠(%2.2f/%ld/%d)" -+ -+#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085 -+#, c-format -+msgid "unkn-%d (%2.2f/%ld/%d)" -+msgstr "不ćŽ-%d (%2.2f/%ld/%d)" -+ -+#: ../netstat.c:894 -+#, c-format -+msgid "warning, got bogus udp line.\n" -+msgstr "č¦ĺ‘Š, ĺ˝ă®UDPă©ă‚¤ăłă‚’ĺľ—ăľă—ăź.\n" -+ -+#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208 -+msgid "UNKNOWN" -+msgstr "不ćŽ" -+ -+#: ../netstat.c:958 ../netstat.c:1080 -+#, c-format -+msgid "on%d (%2.2f/%ld/%d)" -+msgstr "ă‚Şăł%d (%2.2f/%ld/%d)" -+ -+#: ../netstat.c:1046 -+#, c-format -+msgid "warning, got bogus raw line.\n" -+msgstr "č¦ĺ‘Š, ĺ˝ă®Rawă©ă‚¤ăłă‚’ĺľ—ăľă—ăź.\n" -+ -+#: ../netstat.c:1128 -+#, c-format -+msgid "warning, got bogus unix line.\n" -+msgstr "č¦ĺ‘Š, ĺ˝ă®unixă©ă‚¤ăłă‚’ĺľ—ăľă—ăź.\n" -+ -+# translatable? -+#: ../netstat.c:1155 -+msgid "STREAM" -+msgstr "STREAM" -+ -+# translatable? -+#: ../netstat.c:1159 -+msgid "DGRAM" -+msgstr "DGRAM" -+ -+# translatable? -+#: ../netstat.c:1163 -+msgid "RAW" -+msgstr "RAW" -+ -+# translatable? -+#: ../netstat.c:1167 -+msgid "RDM" -+msgstr "RDM" -+ -+# translatable? -+#: ../netstat.c:1171 -+msgid "SEQPACKET" -+msgstr "SEQPACKET" -+ -+# translatable? -+#: ../netstat.c:1180 -+msgid "FREE" -+msgstr "FREE" -+ -+# translatable? -+#: ../netstat.c:1196 -+msgid "CONNECTING" -+msgstr "CONNECTING" -+ -+# translatable? -+#: ../netstat.c:1200 -+msgid "CONNECTED" -+msgstr "CONNECTED" -+ -+# translatable? -+#: ../netstat.c:1204 -+msgid "DISCONNECTING" -+msgstr "DISCONNECTING" -+ -+#: ../netstat.c:1235 -+#, c-format -+msgid "Active UNIX domain sockets " -+msgstr "稼ĺŤä¸ă®UNIXă‰ăˇă‚¤ăłă‚˝ă‚±ăă " -+ -+#: ../netstat.c:1237 ../netstat.c:1756 -+#, c-format -+msgid "(servers and established)" -+msgstr "(サăĽăă¨ç˘şç«‹)" -+ -+#: ../netstat.c:1240 ../netstat.c:1759 -+#, c-format -+msgid "(only servers)" -+msgstr "(サăĽăă®ăż)" -+ -+#: ../netstat.c:1242 ../netstat.c:1761 -+#, c-format -+msgid "(w/o servers)" -+msgstr "(w/oサăĽă)" -+ -+#: ../netstat.c:1245 -+#, c-format -+msgid "" -+"\n" -+"Proto RefCnt Flags Type State I-Node" -+msgstr "" -+"\n" -+"Proto RefCnt ă•ă©ă‚° タイ㗠状態 IăŽăĽă‰" -+ -+#: ../netstat.c:1247 -+#, c-format -+msgid " Path\n" -+msgstr " ă‘ă‚ą\n" -+ -+# translatable? -+#: ../netstat.c:1267 -+msgid "SABM SENT" -+msgstr "SABM SENT" -+ -+# translatable? -+#: ../netstat.c:1270 -+msgid "RECOVERY" -+msgstr "RECOVERY" -+ -+#: ../netstat.c:1284 -+#, c-format -+msgid "Active AX.25 sockets\n" -+msgstr "稼ĺŤä¸ă®AX.25ソケăă\n" -+ -+#: ../netstat.c:1285 -+#, c-format -+msgid "Dest Source Device State Vr/Vs Send-Q Recv-Q\n" -+msgstr "ĺŹ—äżˇĺ… ç™şäżˇĺ… ă‡ăイス 状態 Vr/Vs é€äżˇ-Q 受信-Q\n" -+ -+#: ../netstat.c:1328 -+#, c-format -+msgid "problem reading data from %s\n" -+msgstr "%să‹ă‚‰ă®ă‡ăĽă‚żčŞăżčľĽăżä¸ă«ĺ•ŹéˇŚ\n" -+ -+#: ../netstat.c:1379 -+#, c-format -+msgid "" -+"Active IPX sockets\n" -+"Proto Recv-Q Send-Q Local Address Foreign Address " -+"State" -+msgstr "" -+"稼ĺŤä¸ă®IPXソケăă\n" -+"Proto 受信-Q é€äżˇ-Q 内é¨ă‚˘ă‰ă¬ă‚ą 外é¨ă‚˘ă‰ă¬ă‚ą 状" -+"ć…‹" -+ -+#: ../netstat.c:1381 -+#, c-format -+msgid " User" -+msgstr " ă¦ăĽă‚¶" -+ -+# translatable? -+#: ../netstat.c:1415 -+msgid "ESTAB" -+msgstr "ESTAB" -+ -+# translatable? -+#: ../netstat.c:1423 -+msgid "UNK." -+msgstr "UNK." -+ -+#: ../netstat.c:1461 -+#, c-format -+msgid "Kernel Interface table\n" -+msgstr "ă‚«ăĽăŤă«ă‚¤ăłă‚żă•ă‚§ăĽă‚ąă†ăĽă–ă«\n" -+ -+#: ../netstat.c:1465 -+#, c-format -+msgid "" -+"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " -+"Flg\n" -+msgstr "Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR ă•ă©ă‚°\n" -+ -+#: ../netstat.c:1469 -+msgid "missing interface information" -+msgstr "イăłă‚żă•ă‚§ăĽă‚ąć…ĺ ±ăŚč¶łă‚Šăľă›ă‚“" -+ -+#: ../netstat.c:1492 -+#, c-format -+msgid "" -+"usage: netstat [-veenNcCF] [<Af>] -r netstat {-V|--version|-h|--" -+"help}\n" -+msgstr "" -+"使用法: netstat [-veenNcCF] [<アă‰ă¬ă‚ąă•ă‚ˇăźăŞ>] -r\n" -+" netstat {-V|--version|-h|--help}\n" -+ -+#: ../netstat.c:1493 -+#, c-format -+msgid " netstat [-vnNcaeol] [<Socket> ...]\n" -+msgstr " netstat [-vnNcaeol] [<ソケăă> ...]\n" -+ -+#: ../netstat.c:1494 -+#, c-format -+msgid "" -+" netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" -+"\n" -+msgstr " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n\n" -+ -+#: ../netstat.c:1496 -+#, c-format -+msgid " -r, --route display routing table\n" -+msgstr " -r, --routing 経路ă†ăĽă–ă«ă®čˇ¨ç¤ş\n" -+ -+#: ../netstat.c:1497 -+#, c-format -+msgid " -i, --interfaces display interface table\n" -+msgstr " -i, --interfaces イăłă‚żă•ă‚§ăĽă‚ąă†ăĽă–ă«ă®čˇ¨ç¤ş\n" -+ -+#: ../netstat.c:1498 -+#, c-format -+msgid " -g, --groups display multicast group memberships\n" -+msgstr " -g, --groups ăžă«ăă‚ăŁă‚ąăă»ă‚°ă«ăĽă—ăˇăłăă‚·ăă—ă®čˇ¨ç¤ş\n" -+ -+#: ../netstat.c:1499 -+#, c-format -+msgid "" -+" -s, --statistics display networking statistics (like SNMP)\n" -+msgstr "" -+" -s, --statistics (SNMPă®ă‚ă†ă«)ăŤăăăŻăĽă‚Żçµ±č¨ă‚’表示\n" -+ -+#: ../netstat.c:1501 -+#, c-format -+msgid "" -+" -M, --masquerade display masqueraded connections\n" -+"\n" -+msgstr "" -+" -M, --masquerade ăžă‚ąă‚«ă¬ăĽă‰ćŽĄç¶šă®čˇ¨ç¤ş\n" -+"\n" -+ -+#: ../netstat.c:1505 -+#, c-format -+msgid " --numeric-hosts don't resolve host names\n" -+msgstr " --numeric-hosts ă›ă‚ąăĺŤă‚’ă¬ă‚ľă«ă–ă—ăŞă„\n" -+ -+#: ../netstat.c:1506 -+#, c-format -+msgid " --numeric-ports don't resolve port names\n" -+msgstr " --numeric-ports ăťăĽăĺŤă‚’ă¬ă‚ľă«ă–ă—ăŞă„\n" -+ -+#: ../netstat.c:1507 -+#, c-format -+msgid " --numeric-users don't resolve user names\n" -+msgstr " --numeric-users ă¦ăĽă‚¶ĺŤă‚’ă¬ă‚ľă«ă–ă—ăŞă„\n" -+ -+#: ../netstat.c:1508 -+#, c-format -+msgid " -N, --symbolic resolve hardware names\n" -+msgstr " -N, --symbolic ăŹăĽă‰ă‚¦ă‚§ă‚˘ĺŤă‚’ă¬ă‚ľă«ă–ă™ă‚‹\n" -+ -+#: ../netstat.c:1509 ../route.c:88 -+#, c-format -+msgid " -e, --extend display other/more information\n" -+msgstr " -e, --extend ä»–ă®ć…ĺ ±ă‚„ĺ¤šăŹă®ć…ĺ ±ă‚’čˇ¨ç¤şă™ă‚‹\n" -+ -+#: ../netstat.c:1510 -+#, c-format -+msgid " -p, --programs display PID/Program name for sockets\n" -+msgstr " -p, --programs ソケăăă®PID/ă—ăă‚°ă©ă ĺŤă‚’表示ă™ă‚‹\n" -+ -+#: ../netstat.c:1511 -+#, c-format -+msgid "" -+" -c, --continuous continuous listing\n" -+"\n" -+msgstr "" -+" -c, --continous 継続的ăŞčˇ¨ç¤ş\n" -+"\n" -+ -+#: ../netstat.c:1512 -+#, c-format -+msgid " -l, --listening display listening server sockets\n" -+msgstr " -l, --listening サăĽăă®listenソケăăă®čˇ¨ç¤ş\n" -+ -+#: ../netstat.c:1513 -+#, c-format -+msgid "" -+" -a, --all, --listening display all sockets (default: connected)\n" -+msgstr " -a, --all, --listening ĺ…¨ă¦ă®ć…ĺ ±ă‚’čˇ¨ç¤ş (標準: connected)\n" -+ -+#: ../netstat.c:1514 -+#, c-format -+msgid " -o, --timers display timers\n" -+msgstr " -o, --timers タイăžă®čˇ¨ç¤ş\n" -+ -+#: ../netstat.c:1515 ../route.c:89 -+#, c-format -+msgid "" -+" -F, --fib display Forwarding Information Base " -+"(default)\n" -+msgstr " -F, --fib ă•ă‚©ăŻăĽă‰ć…ĺ ±ă™ăĽă‚ąă‚’表示ă™ă‚‹(標準)\n" -+ -+#: ../netstat.c:1516 ../route.c:90 -+#, c-format -+msgid "" -+" -C, --cache display routing cache instead of FIB\n" -+"\n" -+msgstr " -C, --cache FIBă®ă‹ă‚Źă‚Šă«çµŚč·Żă‚ăŁăă‚·ăĄă‚’表示ă™ă‚‹\n\n" -+ -+#: ../netstat.c:1518 -+#, c-format -+msgid "" -+" <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" -+"netrom\n" -+msgstr "" -+" <ソケăă>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" -+"netrom\n" -+ -+#: ../netstat.c:1519 -+#, c-format -+msgid " <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n" -+msgstr " <AF>='-6|-4'ăľăźăŻ'-A <af>'ăľăźăŻ'--<af>'ă‚’ĺ©ç”¨; 標準: %s\n" -+ -+#: ../netstat.c:1520 ../route.c:93 -+#, c-format -+msgid " List of possible address families (which support routing):\n" -+msgstr " (ă«ăĽă†ă‚Łăłă‚°ă‚’サăťăĽăă—ăź)ĺ©ç”¨ĺŹŻč˝ăŞă‚˘ă‰ă¬ă‚ąă•ă‚ˇăźăŞă®ăŞă‚ąă:\n" -+ -+#: ../netstat.c:1753 -+#, c-format -+msgid "Active Internet connections " -+msgstr "稼ĺŤä¸ă®ă‚¤ăłă‚żăĽăŤăă接続 " -+ -+#: ../netstat.c:1763 -+#, c-format -+msgid "" -+"\n" -+"Proto Recv-Q Send-Q Local Address Foreign Address " -+"State " -+msgstr "" -+"\n" -+"Proto 受信-Q é€äżˇ-Q 内é¨ă‚˘ă‰ă¬ă‚ą 外é¨ă‚˘ă‰ă¬ă‚ą 状" -+"ć…‹ " -+ -+#: ../netstat.c:1765 -+#, c-format -+msgid " User Inode " -+msgstr " ă¦ăĽă‚¶ IăŽăĽă‰ " -+ -+#: ../netstat.c:1768 -+#, c-format -+msgid " Timer" -+msgstr "タイăž" -+ -+#: ../netstat.c:1798 -+#, c-format -+msgid "IPv4 Group Memberships\n" -+msgstr "IPv4ă‚°ă«ăĽă—ăˇăłăă‚·ăă—\n" -+ -+#: ../netstat.c:1799 -+#, c-format -+msgid "Interface RefCnt Group\n" -+msgstr "イăłă‚żă•ă‚§ăĽă‚ą 参照Cnt ă‚°ă«ăĽă—\n" -+ -+#: ../rarp.c:44 -+msgid "This kernel does not support RARP.\n" -+msgstr "ă“ă®ă‚«ăĽăŤă«ăŻRARPをサăťăĽăă—ă¦ă„ăľă›ă‚“.\n" -+ -+#: ../rarp.c:83 -+#, c-format -+msgid "no RARP entry for %s.\n" -+msgstr "%să®RARPエăłăăŞăŚă‚ă‚Šăľă›ă‚“.\n" -+ -+#: ../rarp.c:96 -+#, c-format -+msgid "%s: bad hardware address\n" -+msgstr "%s: 不ćŁăŞăŹăĽă‰ă‚¦ă‚§ă‚˘ă‚˘ă‰ă¬ă‚ąă§ă™\n" -+ -+#: ../rarp.c:128 -+#, c-format -+msgid "rarp: cannot open file %s:%s.\n" -+msgstr "rarp: ă•ă‚ˇă‚¤ă«%să‚’é–‹ă‘ăľă›ă‚“:%s.\n" -+ -+#: ../rarp.c:140 -+#, c-format -+msgid "rarp: format error at %s:%u\n" -+msgstr "rarp: %s:%u行ă«ă•ă‚©ăĽăžăăエă©ăĽăŚă‚ă‚Šăľă™\n" -+ -+#: ../rarp.c:144 ../rarp.c:289 -+#, c-format -+msgid "rarp: %s: unknown host\n" -+msgstr "rarp: %s: 不ćŽăŞă›ă‚ąăă§ă™\n" -+ -+#: ../rarp.c:147 -+#, c-format -+msgid "rarp: cannot set entry from %s:%u\n" -+msgstr "rarp: %s:%u行ă‹ă‚‰ă‚¨ăłăăŞă‚’č¨ĺ®šă§ăŤăľă›ă‚“\n" -+ -+#: ../rarp.c:176 -+#, c-format -+msgid "Usage: rarp -a list entries in cache.\n" -+msgstr "" -+"使用法: rarp -a ă‚ăŁăă‚·ăĄă‚¨ăłăăŞă®čˇ¨ç¤ş.\n" -+ -+#: ../rarp.c:177 -+#, c-format -+msgid " rarp -d <hostname> delete entry from cache.\n" -+msgstr "" -+" rarp -d <ă›ă‚ąăĺŤ> ă‚ăŁăă‚·ăĄă‹ă‚‰ă‚¨ăłăăŞă‚’削除ă™" -+"ă‚‹.\n" -+ -+#: ../rarp.c:178 -+#, c-format -+msgid " rarp [<HW>] -s <hostname> <hwaddr> add entry to cache.\n" -+msgstr "" -+" rarp [<HW>] -s <ă›ă‚ąăĺŤ> <ăŹăĽă‰ă‚¦ă‚§ă‚˘ă‚˘ă‰ă¬ă‚ą>\n" -+" ă‚ăŁăă‚·ăĄă¸ă‚¨ăłăăŞă‚’čż˝ĺŠ .\n" -+ -+#: ../rarp.c:179 -+#, c-format -+msgid "" -+" rarp -f add entries from /etc/ethers.\n" -+msgstr "" -+" rarp -f /etc/ethersă‹ă‚‰ă‚¨ăłăăŞčż˝ĺŠ .\n" -+ -+#: ../rarp.c:180 -+#, c-format -+msgid "" -+" rarp -V display program version.\n" -+"\n" -+msgstr " rarp -V ăăĽă‚¸ă§ăłć…ĺ ±ă®ĺ‡şĺŠ›.\n" -+ -+#: ../rarp.c:238 -+#, c-format -+msgid "%s: illegal option mix.\n" -+msgstr "%s: ă‚Şă—ă‚·ă§ăłă®çµ„ĺă›ăŚé–“é•ăŁă¦ă„ăľă™.\n" -+ -+#: ../rarp.c:269 -+#, c-format -+msgid "rarp: %s: unknown hardware type.\n" -+msgstr "rarp: %s: ăŹăĽă‰ă‚¦ă‚§ă‚˘ă‚żă‚¤ă—ăŚä¸ŤćŽă§ă™.\n" -+ -+#: ../route.c:80 -+#, c-format -+msgid "" -+"Usage: route [-nNvee] [-FC] [<AF>] List kernel routing tables\n" -+msgstr "使用法:route [-nNvee] [-FC] [アă‰ă¬ă‚ąă•ă‚ˇăźăŞ] ă‚«ăĽăŤă«çµŚč·Żă†ăĽă–ă«ă®čˇ¨ç¤ş.\n" -+ -+#: ../route.c:81 -+#, c-format -+msgid "" -+" route [-v] [-FC] {add|del|flush} ... Modify routing table for AF.\n" -+"\n" -+msgstr "" -+" route [-v] [-FC] {add|del|flush}‥‥\n" -+"\t\t\t\t アă‰ă¬ă‚ąă•ă‚ˇăźăŞă®çµŚč·Żă†ăĽă–ă«ă®č¨ĺ®š.\n" -+"\n" -+ -+#: ../route.c:83 -+#, c-format -+msgid "" -+" route {-h|--help} [<AF>] Detailed usage syntax for " -+"specified AF.\n" -+msgstr "" -+" route {-h|--help} [アă‰ă¬ă‚ąă•ă‚ˇăźăŞ]\n" -+" アă‰ă¬ă‚ąă•ă‚ˇăźăŞç‰ąĺ®šă®ć–‡ćł•ă®čެćŽ.\n" -+ -+#: ../route.c:84 -+#, c-format -+msgid "" -+" route {-V|--version} Display version/author and " -+"exit.\n" -+"\n" -+msgstr " route {-V|--version} ăăĽă‚¸ă§ăł/作者ć…ĺ ±ă®ĺ‡şĺŠ›ă¨çµ‚了.\n\n" -+ -+#: ../route.c:92 -+#, c-format -+msgid " <AF>=Use '-A <af>' or '--<af>'; default: %s\n" -+msgstr " <AF>='-A <af>'ăľăźăŻ'--<af>'ă‚’ĺ©ç”¨; 標準: %s\n" -+ -+#: ../plipconfig.c:66 -+#, c-format -+msgid "Usage: plipconfig [-a] [-i] [-v] interface\n" -+msgstr "使用法: plipconfig [-a] [-i] [-v] イăłă‚żă•ă‚§ăĽă‚ą\n" -+ -+#: ../plipconfig.c:67 -+#, c-format -+msgid " [nibble NN] [trigger NN]\n" -+msgstr " [nibble 数値] [trigger 数値]\n" -+ -+#: ../plipconfig.c:68 -+#, c-format -+msgid " plipconfig -V | --version\n" -+msgstr " plipconfig -V | --version\n" -+ -+# translatable? -+#: ../plipconfig.c:74 -+#, c-format -+msgid "%s\tnibble %lu trigger %lu\n" -+msgstr "%s\tnibble %lu trigger %lu\n" -+ -+#: ../iptunnel.c:85 -+#, c-format -+msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n" -+msgstr "Usage: iptunnel { add | change | del | show } [ NAME ]\n" -+ -+#: ../iptunnel.c:86 -+#, c-format -+msgid "" -+" [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n" -+msgstr " [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n" -+ -+#: ../iptunnel.c:87 -+#, c-format -+msgid " [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n" -+msgstr " [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n" -+ -+#: ../iptunnel.c:88 -+#, c-format -+msgid " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n" -+msgstr " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n" -+ -+#: ../iptunnel.c:89 -+#, c-format -+msgid "" -+" iptunnel -V | --version\n" -+"\n" -+msgstr " iptunnel -V | --version\n\n" -+ -+#: ../iptunnel.c:90 -+#, c-format -+msgid "Where: NAME := STRING\n" -+msgstr "ć„Źĺ‘ł: NAME := STRING\n" -+ -+#: ../iptunnel.c:91 -+#, c-format -+msgid " ADDR := { IP_ADDRESS | any }\n" -+msgstr " ADDR := { IP_ADDRESS | any }\n" -+ -+#: ../iptunnel.c:92 -+#, c-format -+msgid " TOS := { NUMBER | inherit }\n" -+msgstr " TOS := { NUMBER | inherit }\n" -+ -+#: ../iptunnel.c:93 -+#, c-format -+msgid " TTL := { 1..255 | inherit }\n" -+msgstr " TTL := { 1..255 | inherit }\n" -+ -+#: ../iptunnel.c:94 -+#, c-format -+msgid " KEY := { DOTTED_QUAD | NUMBER }\n" -+msgstr " KEY := { DOTTED_QUAD | NUMBER }\n" -+ -+#: ../iptunnel.c:332 -+#, c-format -+msgid "Keys are not allowed with ipip and sit.\n" -+msgstr "ă‚ăĽăŻipipăŠă‚ăłsită§ăŻč¨±ĺŹŻă•ă‚Śăľă›ă‚“.\n" -+ -+#: ../iptunnel.c:352 -+#, c-format -+msgid "Broadcast tunnel requires a source address.\n" -+msgstr "ă–ăăĽă‰ă‚ăŁă‚ąăăăłăŤă«ăŻç™şäżˇĺ…アă‰ă¬ă‚ąăŚĺż…č¦ă§ă™.\n" -+ -+#: ../iptunnel.c:367 -+#, c-format -+msgid "ttl != 0 and noptmudisc are incompatible\n" -+msgstr "ttl != 0ăŠă‚ăłnoptmudiscăŻçź›ç›ľă—ăľă™\n" -+ -+#: ../iptunnel.c:379 -+#, c-format -+msgid "cannot determine tunnel mode (ipip, gre or sit)\n" -+msgstr "ăăłăŤă«ă˘ăĽă‰ă‚’決定ă§ăŤăľă›ă‚“(ipip, greăľăźăŻsit)\n" -+ -+#: ../iptunnel.c:417 -+#, c-format -+msgid "%s: %s/ip remote %s local %s " -+msgstr "%s: %s/ip ăŞă˘ăĽă%s ăăĽă‚«ă«%s " -+ -+#: ../iptunnel.c:421 -+msgid "unknown" -+msgstr "不ćŽ" -+ -+# FIXME: what does it mean? -+#: ../iptunnel.c:453 -+#, c-format -+msgid " Drop packets out of sequence.\n" -+msgstr " ă‚·ăĽă‚±ăłă‚ąă‹ă‚‰ĺ¤–ă‚Śăźă‘ケăăă‚’ă‰ăăă—.\n" -+ -+#: ../iptunnel.c:455 -+#, c-format -+msgid " Checksum in received packet is required.\n" -+msgstr " 受信ă‘ケăăă®ăェăクサă ăŻĺż…é ă§ă™.\n" -+ -+# FIXME: what does it mean? -+#: ../iptunnel.c:457 -+#, c-format -+msgid " Sequence packets on output.\n" -+msgstr " é€äżˇă®ă‚·ăĽă‚±ăłă‚ąă‘ケăă.\n" -+ -+# FIXME: what does it mean? -+#: ../iptunnel.c:459 -+#, c-format -+msgid " Checksum output packets.\n" -+msgstr " é€äżˇă‘ケăăă®ăェăクサă .\n" -+ -+#: ../iptunnel.c:487 -+#, c-format -+msgid "Wrong format of /proc/net/dev. Sorry.\n" -+msgstr "/proc/net/devăŚä¸ŤćŁăŞă•ă‚©ăĽăžăăă§ă™. ă™ăżăľă›ă‚“.\n" -+ -+#: ../iptunnel.c:500 -+#, c-format -+msgid "Failed to get type of [%s]\n" -+msgstr "[%s]ă®ă‚żă‚¤ă—ă®ĺŹ–ĺľ—ă«ĺ¤±ć•—\n" -+ -+#: ../iptunnel.c:516 -+#, c-format -+msgid "RX: Packets Bytes Errors CsumErrs OutOfSeq Mcasts\n" -+msgstr "RX: ă‘ケăă ăイă エă©ăĽ CsumErrs outOfSeq ăžă«ăă‚ăŁă‚ąă\n" -+ -+#: ../iptunnel.c:519 -+#, c-format -+msgid "TX: Packets Bytes Errors DeadLoop NoRoute NoBufs\n" -+msgstr "TX: ă‘ケăă ăイă エă©ăĽ DeadLoop NoRoute ăăă•ă‚ˇăŞă—\n" -+ -+#: ../statistics.c:47 -+msgid "ICMP input histogram:" -+msgstr "ICMP入力ă’ă‚ąăă‚°ă©ă :" -+ -+#: ../statistics.c:48 -+msgid "ICMP output histogram:" -+msgstr "ICMP出力ă’ă‚ąăă‚°ă©ă :" -+ -+#: ../statistics.c:65 -+#, c-format -+msgid "Forwarding is %s" -+msgstr "ă•ă‚©ăŻăĽă‰ăŻ%să§ă™" -+ -+#: ../statistics.c:66 -+#, c-format -+msgid "Default TTL is %u" -+msgstr "標準TTLăŻ%uă§ă™" -+ -+#: ../statistics.c:67 -+#, c-format -+msgid "%u total packets received" -+msgstr "ĺč¨%uă‘ケăăを受信" -+ -+#: ../statistics.c:68 -+#, c-format -+msgid "%u with invalid headers" -+msgstr "不é©ĺ˝“ăŞăăă€ăŚ%u" -+ -+#: ../statistics.c:69 -+#, c-format -+msgid "%u with invalid addresses" -+msgstr "不é©ĺ˝“ăŞă‚˘ă‰ă¬ă‚ąăŚ%u" -+ -+#: ../statistics.c:70 -+#, c-format -+msgid "%u forwarded" -+msgstr "%uă®č»˘é€" -+ -+#: ../statistics.c:71 -+#, c-format -+msgid "%u with unknown protocol" -+msgstr "%uă®ä¸ŤćŽăŞă—ăăă‚łă«" -+ -+#: ../statistics.c:72 -+#, c-format -+msgid "%u incoming packets discarded" -+msgstr "%uă®ĺŹ—信ă‘ケăăă‚’ç ´ćŁ„" -+ -+#: ../statistics.c:73 -+#, c-format -+msgid "%u incoming packets delivered" -+msgstr "%uă®ĺŹ—信ă‘ケăăă‚’é…Ťé€" -+ -+#: ../statistics.c:74 -+#, c-format -+msgid "%u requests sent out" -+msgstr "%uă®č¦ć±‚ă‚’é€äżˇ" -+ -+#. ? -+#: ../statistics.c:75 -+#, c-format -+msgid "%u outgoing packets dropped" -+msgstr "%uă®é€äżˇă‘ケăăă‚’ă‰ăăă—" -+ -+#: ../statistics.c:76 -+#, c-format -+msgid "%u dropped because of missing route" -+msgstr "不ćŽăŞçµŚč·Żă§%uă‚’ă‰ăăă—" -+ -+#: ../statistics.c:77 -+#, c-format -+msgid "%u fragments dropped after timeout" -+msgstr "タイă アウă後ă«%uă®ă•ă©ă‚°ăˇăłăă‚’ă‰ăăă—" -+ -+#: ../statistics.c:78 -+#, c-format -+msgid "%u reassemblies required" -+msgstr "%uă®ĺ†Ťć§‹çŻ‰ăŚĺż…č¦" -+ -+#. ? -+#: ../statistics.c:79 -+#, c-format -+msgid "%u packets reassembled ok" -+msgstr "%uă‘ケăăă®ĺ†Ťć§‹çŻ‰ă«ć功" -+ -+#: ../statistics.c:80 -+#, c-format -+msgid "%u packet reassembles failed" -+msgstr "%uă‘ケăăă®ĺ†Ťć§‹çŻ‰ă«ĺ¤±ć•—" -+ -+#: ../statistics.c:81 -+#, c-format -+msgid "%u fragments received ok" -+msgstr "%uă•ă©ă‚°ăˇăłăă®ĺŹ—信ă«ć功" -+ -+#: ../statistics.c:82 -+#, c-format -+msgid "%u fragments failed" -+msgstr "%uă•ă©ă‚°ăˇăłăă§ĺ¤±ć•—" -+ -+#: ../statistics.c:83 -+#, c-format -+msgid "%u fragments created" -+msgstr "%uă•ă©ă‚°ăˇăłăを生ć" -+ -+#: ../statistics.c:88 -+#, c-format -+msgid "%u ICMP messages received" -+msgstr "%uă®ICMPăˇăă‚»ăĽă‚¸ĺŹ—信" -+ -+#: ../statistics.c:89 -+#, c-format -+msgid "%u input ICMP message failed." -+msgstr "%uă®ICMPăˇăă‚»ăĽă‚¸ĺ…ĄĺŠ›ĺ¤±ć•—." -+ -+#: ../statistics.c:90 ../statistics.c:103 -+#, c-format -+msgid "destination unreachable: %u" -+msgstr "é€äżˇĺ…ĺ°é”不可: %u" -+ -+#: ../statistics.c:91 -+#, c-format -+msgid "timeout in transit: %u" -+msgstr "é€äżˇć™‚é–“ă‚ŞăĽă: %u" -+ -+#: ../statistics.c:92 ../statistics.c:105 -+#, c-format -+msgid "wrong parameters: %u" -+msgstr "謝ăŁăźă‘ă©ăˇăĽă‚ż: %u" -+ -+#. ? -+#: ../statistics.c:93 -+#, c-format -+msgid "source quenches: %u" -+msgstr "発信ĺ…ć¶ć»…: %u" -+ -+#: ../statistics.c:94 -+#, c-format -+msgid "redirects: %u" -+msgstr "ăŞă€ă‚¤ă¬ă‚Żă: %u" -+ -+#: ../statistics.c:95 -+#, c-format -+msgid "echo requests: %u" -+msgstr "エコăĽč¦ć±‚: %u" -+ -+#: ../statistics.c:96 ../statistics.c:109 -+#, c-format -+msgid "echo replies: %u" -+msgstr "エコăĽĺżśç”: %u" -+ -+#: ../statistics.c:97 -+#, c-format -+msgid "timestamp request: %u" -+msgstr "タイă ă‚ąă‚żăłă—č¦ć±‚: %u" -+ -+#: ../statistics.c:98 -+#, c-format -+msgid "timestamp reply: %u" -+msgstr "タイă ă‚ąă‚żăłă—ĺżśç”: %u" -+ -+#: ../statistics.c:99 -+#, c-format -+msgid "address mask request: %u" -+msgstr "アă‰ă¬ă‚ąăžă‚ąă‚Żč¦ć±‚: %u" -+ -+#. ? -+#: ../statistics.c:100 ../statistics.c:113 -+#, c-format -+msgid "address mask replies: %u" -+msgstr "アă‰ă¬ă‚ąăžă‚ąă‚Żĺżśç”: %u" -+ -+#. ? -+#: ../statistics.c:101 -+#, c-format -+msgid "%u ICMP messages sent" -+msgstr "%uă®ICMPăˇăă‚»ăĽă‚¸é€äżˇ" -+ -+#: ../statistics.c:102 -+#, c-format -+msgid "%u ICMP messages failed" -+msgstr "%uă®ICMPăˇăă‚»ăĽă‚¸ĺ¤±ć•—" -+ -+#: ../statistics.c:104 -+#, c-format -+msgid "time exceeded: %u" -+msgstr "時間ĺ‡ă‚Ś: %u" -+ -+#. ? -+#: ../statistics.c:106 -+#, c-format -+msgid "source quench: %u" -+msgstr "発信ĺ…ć¶ć»…: %u" -+ -+#: ../statistics.c:107 -+#, c-format -+msgid "redirect: %u" -+msgstr "ăŞă€ă‚¤ă¬ă‚Żă: %u" -+ -+#: ../statistics.c:108 -+#, c-format -+msgid "echo request: %u" -+msgstr "エコăĽč¦ć±‚: %u" -+ -+#: ../statistics.c:110 -+#, c-format -+msgid "timestamp requests: %u" -+msgstr "タイă ă‚ąă‚żăłă—č¦ć±‚: %u" -+ -+#: ../statistics.c:111 -+#, c-format -+msgid "timestamp replies: %u" -+msgstr "タイă ă‚ąă‚żăłă—ĺżśç”: %u" -+ -+#: ../statistics.c:112 -+#, c-format -+msgid "address mask requests: %u" -+msgstr "アă‰ă¬ă‚ąăžă‚ąă‚Żč¦ć±‚: %u" -+ -+#: ../statistics.c:118 -+#, c-format -+msgid "RTO algorithm is %s" -+msgstr "RTOアă«ă‚´ăŞă‚şă ăŻ%să§ă™" -+ -+#: ../statistics.c:122 -+#, c-format -+msgid "%u active connections openings" -+msgstr "%uă®č˝ĺ‹•ćŽĄç¶šé–‹ĺ§‹" -+ -+#: ../statistics.c:123 -+#, c-format -+msgid "%u passive connection openings" -+msgstr "%uă®ĺŹ—動接続開始" -+ -+#: ../statistics.c:124 -+#, c-format -+msgid "%u failed connection attempts" -+msgstr "%uă®ćŽĄç¶šč©¦čˇŚĺ¤±ć•—" -+ -+#: ../statistics.c:125 -+#, c-format -+msgid "%u connection resets received" -+msgstr "%uă®ćŽĄç¶šăŞă‚»ăă受信" -+ -+#: ../statistics.c:126 -+#, c-format -+msgid "%u connections established" -+msgstr "%uă®ćŽĄç¶šç˘şç«‹" -+ -+#: ../statistics.c:127 -+#, c-format -+msgid "%u segments received" -+msgstr "%uセグăˇăłăă®ĺŹ—信" -+ -+#: ../statistics.c:128 -+#, c-format -+msgid "%u segments send out" -+msgstr "%uセグăˇăłăă®é€äżˇ" -+ -+#: ../statistics.c:129 -+#, c-format -+msgid "%u segments retransmited" -+msgstr "%uセグăˇăłăă®ĺ†Ťč»˘é€" -+ -+#: ../statistics.c:130 -+#, c-format -+msgid "%u bad segments received." -+msgstr "%uă®ä¸ŤćŁă‚»ă‚°ăˇăłă受信." -+ -+#: ../statistics.c:131 -+#, c-format -+msgid "%u resets sent" -+msgstr "%uă®ăŞă‚»ăăé€äżˇ" -+ -+#: ../statistics.c:136 -+#, c-format -+msgid "%u packets received" -+msgstr "%uă‘ケăă受信" -+ -+#: ../statistics.c:137 -+#, c-format -+msgid "%u packets to unknown port received." -+msgstr "不ćŽăŞăťăĽăă‹ă‚‰ă®%uă‘ケăăă®ĺŹ—信." -+ -+#: ../statistics.c:138 -+#, c-format -+msgid "%u packet receive errors" -+msgstr "%uă®ă‘ケăă受信エă©ăĽ" -+ -+#: ../statistics.c:139 -+#, c-format -+msgid "%u packets sent" -+msgstr "%uă®ă‘ケăăă‚’é€äżˇ" -+ -+#: ../statistics.c:144 -+#, c-format -+msgid "%u SYN cookies sent" -+msgstr "%uă®SYNă‚Żăă‚ăĽă‚’é€äżˇ" -+ -+#: ../statistics.c:145 -+#, c-format -+msgid "%u SYN cookies received" -+msgstr "%uă®SYNă‚Żăă‚ăĽă‚’受信" -+ -+#: ../statistics.c:146 -+#, c-format -+msgid "%u invalid SYN cookies received" -+msgstr "%uă®ä¸Ťé©ĺ˝“ăŞSYNă‚Żăă‚ăĽă‚’受信" -+ -+#: ../statistics.c:148 -+#, c-format -+msgid "%u resets received for embryonic SYN_RECV sockets" -+msgstr "%uă®ćśŞĺ®Śćă®SYN_RECVソケăăă«ĺŻľă™ă‚‹ăŞă‚»ăăを受信" -+ -+#: ../statistics.c:150 -+#, c-format -+msgid "%u packets pruned from receive queue because of socket buffer overrun" -+msgstr "%uă®ă‘ケăăをソケăăăăă•ă‚ˇă‚ŞăĽăă©ăłă®ăźă‚受信ă‚ăĄăĽă‹ă‚‰é™¤ĺ¤–" -+ -+#. obsolete: 2.2.0 doesn't do that anymore -+#: ../statistics.c:153 -+#, c-format -+msgid "%u packets pruned from receive queue" -+msgstr "%uă®ă‘ケăăを受信ă‚ăĄăĽă‹ă‚‰é™¤ĺ¤–" -+ -+#: ../statistics.c:154 -+#, c-format -+msgid "" -+"%u packets dropped from out-of-order queue because of socket buffer overrun" -+msgstr "%uă®ă‘ケăăăŚă‚˝ă‚±ăăăăă•ă‚ˇă‚ŞăĽăăĽă©ăłă®ăźă‚out-of-orderă‚ăĄăĽă‹ă‚‰ă‰ăăă—" -+ -+#: ../statistics.c:156 -+#, c-format -+msgid "%u ICMP packets dropped because they were out-of-window" -+msgstr "%uă®ICMPă‘ケăăăŚout-of-windowă®ăźă‚ă‰ăăă—" -+ -+#: ../statistics.c:158 -+#, c-format -+msgid "%u ICMP packets dropped because socket was locked" -+msgstr "%uă®ICMPă‘ケăăをソケăăă®ăăă‚Żă«ă‚ăŁă¦ă‰ăăă—" -+ -+# FIXME: what does it mean? -+#: ../statistics.c:160 -+#, c-format -+msgid "%u TCP sockets finished time wait in fast timer" -+msgstr "%uă®TCPソケăăăŚă•ă‚ˇăĽă‚ąăタイăžă§ă®ć™‚é–“ĺľ…ăˇă‚’完了" -+ -+# FIXME -+#: ../statistics.c:161 -+#, c-format -+msgid "%u time wait sockets recycled by time stamp" -+msgstr "%uă®ć™‚é–“ĺľ…ăˇă‚˝ă‚±ăăăŚă‚żă‚¤ă ă‚ąă‚żăłă—ă§ĺ†Ťĺ©ç”¨" -+ -+# FIXME -+#: ../statistics.c:162 -+#, c-format -+msgid "%u TCP sockets finished time wait in slow timer" -+msgstr "%uă®TCPソケăăăŚă‚ąăăĽă‚żă‚¤ăžă§ă®ć™‚é–“ĺľ…ăˇă‚’完了" -+ -+#: ../statistics.c:163 -+#, c-format -+msgid "%u passive connections rejected because of time stamp" -+msgstr "%uă®ĺŹ—動的接続ăŚă‚żă‚¤ă ă‚ąă‚żăłă—ă®ăźă‚ă«ć‹’ĺ¦" -+ -+#: ../statistics.c:165 -+#, c-format -+msgid "%u active connections rejected because of time stamp" -+msgstr "%uă®č˝ĺ‹•çš„接続ăŚă‚żă‚¤ă ă‚ąă‚żăłă—ă®ăźă‚ă«ć‹’ĺ¦" -+ -+#: ../statistics.c:167 -+#, c-format -+msgid "%u packets rejects in established connections because of timestamp" -+msgstr "%uă®ă‘ケăăăŚă‚żă‚¤ă ă‚ąă‚żăłă—ă®ăźă‚ă«ćŽĄç¶šç˘şç«‹ă‚’ć‹’ĺ¦" -+ -+#: ../statistics.c:169 -+#, c-format -+msgid "%u delayed acks sent" -+msgstr "%uă®é…延ackă‚’é€äżˇ" -+ -+# FIXME -+#: ../statistics.c:170 -+#, c-format -+msgid "%u delayed acks further delayed because of locked socket" -+msgstr "%uă®é…延ackăŚăăă‚Żă•ă‚Śăźă‚˝ă‚±ăăă®ăźă‚ă«ă•ă‚‰ă«é…延" -+ -+#: ../statistics.c:172 -+#, c-format -+msgid "Quick ack mode was activated %u times" -+msgstr "クイăă‚Żackă˘ăĽă‰ăŚ%u回稼ĺŤ" -+ -+# FIXME -+#: ../statistics.c:173 -+#, c-format -+msgid "%u times the listen queue of a socket overflowed" -+msgstr "ソケăăă®ăŞă‚ąăłă‚ăĄăĽăŚ%u回オăĽăă•ăăĽ" -+ -+# FIXME -+#: ../statistics.c:175 -+#, c-format -+msgid "%u SYNs to LISTEN sockets ignored" -+msgstr "%uă®ă‚˝ă‚±ăăăŞă‚ąăłSYNăŚç„ˇč¦–" -+ -+#: ../statistics.c:176 -+#, c-format -+msgid "%u packets directly queued to recvmsg prequeue." -+msgstr "%uă‘ケăăă‚’recvmsgă—ă¬ă‚ăĄăĽă«ç›´ćŽĄă‚ăĄăĽ." -+ -+#: ../statistics.c:178 -+#, c-format -+msgid "%u of bytes directly received from backlog" -+msgstr "%uăイăă‚’ăăă‚Żăă‚°ă‹ă‚‰ç›´ćŽĄĺŹ—信" -+ -+#: ../statistics.c:180 -+#, c-format -+msgid "%u of bytes directly received from prequeue" -+msgstr "%uăイăă‚’ă—ă¬ă‚ăĄăĽă‹ă‚‰ç›´ćŽĄĺŹ—信" -+ -+#: ../statistics.c:182 -+#, c-format -+msgid "%u packets dropped from prequeue" -+msgstr "%uă®ă‘ケăăă‚’ă—ă¬ă‚ăĄăĽă‹ă‚‰ă‰ăăă—" -+ -+#: ../statistics.c:183 -+#, c-format -+msgid "%u packet headers predicted" -+msgstr "%uă®ă‘ケăăăăă€ă‚’äşć¸¬" -+ -+#: ../statistics.c:184 -+#, c-format -+msgid "%u packets header predicted and directly queued to user" -+msgstr "%uă®ă‘ケăăăăă€ă‚’äşć¸¬ă—ă¦ă¦ăĽă‚¶ă«ç›´ćŽĄă‚ăĄăĽ" -+ -+#: ../statistics.c:186 -+#, c-format -+msgid "Ran %u times out of system memory during packet sending" -+msgstr "%u回ă®ă‘ケăăé€äżˇä¸ă®ă‚·ă‚ąă†ă ăˇă˘ăŞă‚ăµă‚Ś" -+ -+#: ../statistics.c:188 -+#, c-format -+msgid "%u acknowledgments not containing data received" -+msgstr "ă‡ăĽă‚żă‚’ĺ«ăľăŞă„%uă®ć‰żčŞŤă®ĺŹ—信" -+ -+#: ../statistics.c:189 -+#, c-format -+msgid "%u predicted acknowledgments" -+msgstr "%uă®äşć¸¬ć‰żčŞŤ" -+ -+#: ../statistics.c:190 -+#, c-format -+msgid "%u times recovered from packet loss due to fast retransmit" -+msgstr "é«é€źăŞĺ†Ťé€ă«ă‚ă‚‹ă‘ケăăăă‚ąă®%u回ă®ĺ›žĺľ©" -+ -+#: ../statistics.c:191 -+#, c-format -+msgid "%u times recovered from packet loss due to SACK data" -+msgstr "SACKă‡ăĽă‚żă«ă‚ă‚‹ă‘ケăăăă‚ąă®%u回ă®ĺ›žĺľ©" -+ -+#: ../statistics.c:192 -+#, c-format -+msgid "%u bad SACKs received" -+msgstr "%uă®ä¸ŤćŁăŞSACKを受信" -+ -+#: ../statistics.c:193 -+#, c-format -+msgid "Detected reordering %u times using FACK" -+msgstr "FACKを使ăŁăź%u回ă®ć¤śĺ‡şă•ă‚Śăźä¸¦ăąć›żă" -+ -+#: ../statistics.c:194 -+#, c-format -+msgid "Detected reordering %u times using SACK" -+msgstr "SACKを使ăŁăź%u回ă®ć¤śĺ‡şă•ă‚Śăźä¸¦ăąć›żă" -+ -+#: ../statistics.c:195 -+#, c-format -+msgid "Detected reordering %u times using time stamp" -+msgstr "タイă ă‚ąă‚żăłă—を使ăŁăź%u回ă®ć¤śĺ‡şă•ă‚Śăźä¸¦ăąć›żă" -+ -+# FIXME:what does it mean? -+#: ../statistics.c:196 -+#, c-format -+msgid "Detected reordering %u times using reno fast retransmit" -+msgstr "é«é€źĺ†Ťé€ă‚’使ăŁăź%u回ă®ć¤śĺ‡şă•ă‚Śăźä¸¦ăąć›żă" -+ -+#: ../statistics.c:197 -+#, c-format -+msgid "%u congestion windows fully recovered" -+msgstr "%uă®čĽ»čĽłă‚¦ă‚Łăłă‰ă‚¦ă‚’完全ă«ĺ›žĺľ©" -+ -+#: ../statistics.c:198 -+#, c-format -+msgid "%u congestion windows partially recovered using Hoe heuristic" -+msgstr "Hoeă’ăĄăĽăŞă‚ąă†ă‚Łăクを使ăŁă¦%uă®čĽ»čĽłă‚¦ă‚Łăłă‰ă‚¦ă‚’é¨ĺ†çš„ă«ĺ›žĺľ©" -+ -+#: ../statistics.c:199 -+#, c-format -+msgid "%u congestion window recovered using DSACK" -+msgstr "DSACKを使ăŁă¦%uă®čĽ»čĽłă‚¦ă‚Łăłă‰ă‚¦ă‚’回復" -+ -+#: ../statistics.c:200 -+#, c-format -+msgid "%u congestion windows recovered after partial ack" -+msgstr "é¨ĺ†ack後ă«%uă®čĽ»čĽłă‚¦ă‚Łăłă‰ă‚¦ă‚’回復" -+ -+#: ../statistics.c:201 -+#, c-format -+msgid "%u retransmits lost" -+msgstr "%uă®ĺ†Ťé€ăă‚ąă" -+ -+# FIXME -+#: ../statistics.c:202 -+#, c-format -+msgid "%u timeouts after reno fast retransmit" -+msgstr "é«é€źĺ†Ťé€ĺľŚă®%uă®ă‚żă‚¤ă アウă" -+ -+#: ../statistics.c:203 -+#, c-format -+msgid "%u timeouts after SACK recovery" -+msgstr "SACKĺľ©ĺ…後ă®%uă®ă‚żă‚¤ă アウă" -+ -+#: ../statistics.c:204 -+#, c-format -+msgid "%u timeouts in loss state" -+msgstr "状態ăă‚ąă§ă®%uă®ă‚żă‚¤ă アウă" -+ -+#: ../statistics.c:205 -+#, c-format -+msgid "%u fast retransmits" -+msgstr "%uă®é«é€źĺ†Ťé€" -+ -+#: ../statistics.c:206 -+#, c-format -+msgid "%u forward retransmits" -+msgstr "%uă®č»˘é€ĺ†Ťé€" -+ -+#: ../statistics.c:207 -+#, c-format -+msgid "%u retransmits in slow start" -+msgstr "ă‚ąăăĽă‚ąă‚żăĽăă§ă®%uă®ĺ†Ťé€" -+ -+#: ../statistics.c:208 -+#, c-format -+msgid "%u other TCP timeouts" -+msgstr "%uă®ăťă®ä»–ă®TCPタイă アウă" -+ -+# FIXME -+#: ../statistics.c:209 -+#, c-format -+msgid "%u reno fast retransmits failed" -+msgstr "%dă®é«é€źĺ†Ťé€ĺ¤±ć•—" -+ -+#: ../statistics.c:210 -+#, c-format -+msgid "%u sack retransmits failed" -+msgstr "%uă®sack再é€ĺ¤±ć•—" -+ -+# FIXME -+#: ../statistics.c:211 -+#, c-format -+msgid "%u times receiver scheduled too late for direct processing" -+msgstr "直接処ç†ă«ăŻé…ă™ăŽă‚‹ă¨ă‚ąă‚±ă‚¸ăĄăĽă«ă•ă‚Śăź%u回ă®ă¬ă‚·ăĽă" -+ -+# FIXME -+#: ../statistics.c:212 -+#, c-format -+msgid "%u packets collapsed in receive queue due to low socket buffer" -+msgstr "%uă®ă‘ケăăを低ソケăăăăă•ă‚ˇă®ăźă‚ă«ĺŹ—信ă‚ăĄăĽă‹ă‚‰é™¤ĺ¤–" -+ -+#: ../statistics.c:213 -+#, c-format -+msgid "%u DSACKs sent for old packets" -+msgstr "%uă®DSACKを古ă„ă‘ケăăă¨ă—ă¦é€äżˇ" -+ -+#: ../statistics.c:214 -+#, c-format -+msgid "%u DSACKs sent for out of order packets" -+msgstr "%uă®DSACKă‚’é †ĺşŹĺ¤–ă‘ケăăă¨ă—ă¦é€äżˇ" -+ -+#: ../statistics.c:215 -+#, c-format -+msgid "%u DSACKs received" -+msgstr "%uă®DSACKを受信" -+ -+#: ../statistics.c:216 -+#, c-format -+msgid "%u DSACKs for out of order packets received" -+msgstr "%uă®DSACKă‚’é †ĺşŹĺ¤–ă‘ケăăă¨ă—ă¦ĺŹ—信" -+ -+#: ../statistics.c:217 -+#, c-format -+msgid "%u connections reset due to unexpected SYN" -+msgstr "äşćśźă›ă¬SYNă®ăźă‚ă«%uă®ćŽĄç¶šă‚’ăŞă‚»ăă" -+ -+#: ../statistics.c:218 -+#, c-format -+msgid "%u connections reset due to unexpected data" -+msgstr "äşćśźă›ă¬ă‡ăĽă‚żă®ăźă‚ă«%uă®ćŽĄç¶šă‚’ăŞă‚»ăă" -+ -+#: ../statistics.c:219 -+#, c-format -+msgid "%u connections reset due to early user close" -+msgstr "ć—©ćśźă®ă¦ăĽă‚¶ă®ă‚ŻăăĽă‚şă®ăźă‚ă«%uă®ćŽĄç¶šă‚’ăŞă‚»ăă" -+ -+#: ../statistics.c:220 -+#, c-format -+msgid "%u connections aborted due to memory pressure" -+msgstr "ăˇă˘ăŞă®ĺ¶ç´„ă®ăźă‚ă«%uă®ćŽĄç¶šă‚’ä¸ć˘" -+ -+#: ../statistics.c:221 -+#, c-format -+msgid "%u connections aborted due to timeout" -+msgstr "タイă アウăă®ăźă‚ă«%uă®ćŽĄç¶šă‚’ä¸ć˘" -+ -+# FIXME -+#: ../statistics.c:222 -+#, c-format -+msgid "%u connections aborted after user close in linger timeout" -+msgstr "ă¦ăĽă‚¶ă®é•·ćśźă‚żă‚¤ă アウăă§ă®ă‚ŻăăĽă‚şĺľŚă«%uă®ćŽĄç¶šăŚä¸ć˘" -+ -+#: ../statistics.c:223 -+#, c-format -+msgid "%u times unabled to send RST due to no memory" -+msgstr "ăˇă˘ăŞä¸Ťč¶łă®ăźă‚ă«RSTă®é€äżˇăŚ%u回不č˝" -+ -+# FIXME -+#: ../statistics.c:224 -+#, c-format -+msgid "TCP ran low on memory %u times" -+msgstr "TCPăŚĺ°‘ăŞă„ăˇă˘ăŞă§%u回実行" -+ -+#: ../statistics.c:225 -+#, c-format -+msgid "%u TCP data loss events" -+msgstr "%uă®TCPă‡ăĽă‚żăŚă‚¤ă™ăłăă‚’ăă‚ą" -+ -+#: ../statistics.c:292 -+msgid "enabled" -+msgstr "有効" -+ -+#: ../statistics.c:292 -+msgid "disabled" -+msgstr "無効" -+ -+#: ../statistics.c:375 -+msgid "error parsing /proc/net/snmp" -+msgstr "/proc/net/snmpă®ĺ‡¦ç†ä¸ă«ă‚¨ă©ăĽăŚç™şç”źă—ăľă—ăź" -+ -+#: ../statistics.c:388 -+msgid "cannot open /proc/net/snmp" -+msgstr "/proc/net/snmpă‚’é–‹ă‘ăľă›ă‚“" -+ -+#: ../lib/activate.c:69 -+#, c-format -+msgid "Hardware type `%s' not supported.\n" -+msgstr "ăŹăĽă‰ă‚¦ă‚§ă‚˘ă‚żă‚¤ă—`%s'ăŻă‚µăťăĽăă•ă‚Śă¦ă„ăľă›ă‚“.\n" -+ -+#: ../lib/activate.c:73 -+#, c-format -+msgid "Cannot change line discipline to `%s'.\n" -+msgstr "`%s'ă®line disciplineを変更ă§ăŤăľă›ă‚“.\n" -+ -+#: ../lib/af.c:153 ../lib/hw.c:161 -+msgid "UNSPEC" -+msgstr "不ćŽăŞăŤăă" -+ -+#: ../lib/af.c:155 -+msgid "UNIX Domain" -+msgstr "UNIXă‰ăˇă‚¤ăł" -+ -+#: ../lib/af.c:158 -+msgid "DARPA Internet" -+msgstr "DARPAイăłă‚żăĽăŤăă" -+ -+#: ../lib/af.c:161 -+msgid "IPv6" -+msgstr "IPv6" -+ -+#: ../lib/af.c:164 ../lib/hw.c:182 -+msgid "AMPR AX.25" -+msgstr "AMPR AX.25" -+ -+#: ../lib/af.c:167 ../lib/hw.c:188 -+msgid "AMPR NET/ROM" -+msgstr "AMPR NET/ROM" -+ -+#: ../lib/af.c:170 -+msgid "Novell IPX" -+msgstr "Novell IPX" -+ -+#: ../lib/af.c:173 -+msgid "Appletalk DDP" -+msgstr "アăă—ă«ăăĽă‚ŻDDP" -+ -+#: ../lib/af.c:176 ../lib/hw.c:223 -+msgid "Econet" -+msgstr "エコăŤăă" -+ -+#: ../lib/af.c:179 -+msgid "CCITT X.25" -+msgstr "CCITT X.25" -+ -+#: ../lib/af.c:182 ../lib/hw.c:185 -+msgid "AMPR ROSE" -+msgstr "AMPR ROSE" -+ -+#: ../lib/af.c:185 ../lib/hw.c:173 -+msgid "Ash" -+msgstr "Ash" -+ -+#: ../lib/af.c:243 -+#, c-format -+msgid "Please don't supply more than one address family.\n" -+msgstr "複数ă®ă‚˘ă‰ă¬ă‚ąă•ă‚ˇăźăŞă‚’ă—ăŞă„ă§ä¸‹ă•ă„.\n" -+ -+#: ../lib/af.c:304 -+#, c-format -+msgid "Too much address family arguments.\n" -+msgstr "アă‰ă¬ă‚ąă•ă‚ˇăźăŞă®ĺĽ•ć•°ăŚĺ¤šă™ăŽăľă™.\n" -+ -+#: ../lib/af.c:315 -+#, c-format -+msgid "Unknown address family `%s'.\n" -+msgstr "不ćŽăŞă‚˘ă‰ă¬ă‚ąă•ă‚ˇăźăŞă§ă™ `%s'.\n" -+ -+#: ../lib/arcnet.c:70 ../lib/arcnet.c:85 -+#, c-format -+msgid "in_arcnet(%s): invalid arcnet address!\n" -+msgstr "in_arcnet(%s): 不é©ĺ˝“ăŞARCNETアă‰ă¬ă‚ąă§ă™!\n" -+ -+#: ../lib/arcnet.c:97 -+#, c-format -+msgid "in_arcnet(%s): trailing : ignored!\n" -+msgstr "in_arcnet(%s): trailing : 無効!\n" -+ -+# translatable? -+#: ../lib/arcnet.c:109 -+#, c-format -+msgid "in_arcnet(%s): trailing junk!\n" -+msgstr "in_arcnet(%s): trailing junk!\n" -+ -+#: ../lib/ash.c:81 -+#, c-format -+msgid "Malformed Ash address" -+msgstr "異常ăŞAshアă‰ă¬ă‚ąă§ă™" -+ -+#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244 -+#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 -+#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76 -+msgid "[NONE SET]" -+msgstr "[č¨ĺ®šăŞă—]" -+ -+#: ../lib/ax25.c:97 ../lib/netrom.c:100 -+msgid "Invalid callsign" -+msgstr "不é©ĺ˝“ăŞă‚łăĽă«ă‚µă‚¤ăłă§ă™" -+ -+#: ../lib/ax25.c:110 ../lib/netrom.c:113 -+msgid "Callsign too long" -+msgstr "ă‚łăĽă«ă‚µă‚¤ăłăŚé•·ă™ăŽăľă™" -+ -+#: ../lib/ax25_gr.c:47 -+#, c-format -+msgid "AX.25 not configured in this system.\n" -+msgstr "AX.25ăŻă“ă®ă‚·ă‚ąă†ă ă§ăŻč¨ĺ®šă•ă‚Śă¦ă„ăľă›ă‚“.\n" -+ -+#: ../lib/ax25_gr.c:50 -+#, c-format -+msgid "Kernel AX.25 routing table\n" -+msgstr "ă‚«ăĽăŤă« AX.25経路ă†ăĽă–ă«\n" -+ -+#. xxx -+#: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55 -+#, c-format -+msgid "Destination Iface Use\n" -+msgstr "é€äżˇĺ…サイă Iface 使用数\n" -+ -+#: ../lib/ether.c:74 ../lib/ether.c:91 -+#, c-format -+msgid "in_ether(%s): invalid ether address!\n" -+msgstr "in_ether(%s): 不é©ĺ˝“ăŞă‚¤ăĽă‚µă‚˘ă‰ă¬ă‚ą!\n" -+ -+#: ../lib/ether.c:105 -+#, c-format -+msgid "in_ether(%s): trailing : ignored!\n" -+msgstr "in_ether(%s): trailing : 無効!\n" -+ -+# translatable? -+#: ../lib/ether.c:117 -+#, c-format -+msgid "in_ether(%s): trailing junk!\n" -+msgstr "in_ether(%s): trailing junk!\n" -+ -+#: ../lib/fddi.c:84 ../lib/fddi.c:99 -+#, c-format -+msgid "in_fddi(%s): invalid fddi address!\n" -+msgstr "in_fddi(%s): 不é©ĺ˝“ăŞfddiアă‰ă¬ă‚ą!\n" -+ -+#: ../lib/fddi.c:111 -+#, c-format -+msgid "in_fddi(%s): trailing : ignored!\n" -+msgstr "in_fddi(%s): trailing : 無効!\n" -+ -+# translatable? -+#: ../lib/fddi.c:123 -+#, c-format -+msgid "in_fddi(%s): trailing junk!\n" -+msgstr "in_fddi(%s): trailing junk!\n" -+ -+#: ../lib/getroute.c:101 ../lib/setroute.c:80 -+#, c-format -+msgid "Address family `%s' not supported.\n" -+msgstr "アă‰ă¬ă‚ąă•ă‚ˇăźăŞ`%s'ăŻă‚µăťăĽăă•ă‚Śă¦ă„ăľă›ă‚“.\n" -+ -+#: ../lib/getroute.c:107 ../lib/setroute.c:84 -+#, c-format -+msgid "No routing for address family `%s'.\n" -+msgstr "アă‰ă¬ă‚ąă•ă‚ˇăźăŞ`%s'ă¸ă®çµŚč·ŻăŚč¦‹ă¤ă‹ă‚Šăľă›ă‚“.\n" -+ -+#: ../lib/hippi.c:84 ../lib/hippi.c:99 -+#, c-format -+msgid "in_hippi(%s): invalid hippi address!\n" -+msgstr "in_hippi(%s): 不é©ĺ˝“ăŞhippiアă‰ă¬ă‚ąă§ă™!\n" -+ -+#: ../lib/hippi.c:111 -+#, c-format -+msgid "in_hippi(%s): trailing : ignored!\n" -+msgstr "in_hippi(%s): trailing : 無効!\n" -+ -+# translatable? -+#: ../lib/hippi.c:122 -+#, c-format -+msgid "in_hippi(%s): trailing junk!\n" -+msgstr "in_hippi(%s): trailing junk!\n" -+ -+#: ../lib/hw.c:160 -+msgid "Local Loopback" -+msgstr "ăăĽă‚«ă«ă«ăĽă—ăăă‚Ż" -+ -+#: ../lib/hw.c:163 -+msgid "Serial Line IP" -+msgstr "ă‚·ăŞă‚˘ă«ă©ă‚¤ăłIP" -+ -+#: ../lib/hw.c:164 -+msgid "VJ Serial Line IP" -+msgstr "VJă‚·ăŞă‚˘ă«ă©ă‚¤ăłIP" -+ -+#: ../lib/hw.c:165 -+msgid "6-bit Serial Line IP" -+msgstr "6ă“ăăă‚·ăŞă‚˘ă«ă©ă‚¤ăłIP" -+ -+#: ../lib/hw.c:166 -+msgid "VJ 6-bit Serial Line IP" -+msgstr "VJ 6ă“ăăă‚·ăŞă‚˘ă«ă©ă‚¤ăłIP" -+ -+#: ../lib/hw.c:167 -+msgid "Adaptive Serial Line IP" -+msgstr "Adaptiveă‚·ăŞă‚˘ă«ă©ă‚¤ăłIP" -+ -+#: ../lib/hw.c:170 -+msgid "Ethernet" -+msgstr "イăĽă‚µăŤăă" -+ -+# translatable? -+#: ../lib/hw.c:176 -+msgid "Fiber Distributed Data Interface" -+msgstr "Fiber Distributed Data Interface" -+ -+#: ../lib/hw.c:179 -+msgid "HIPPI" -+msgstr "HIPPI" -+ -+#: ../lib/hw.c:191 -+msgid "generic X.25" -+msgstr "ジェăŤăŞăă‚ŻX.25" -+ -+#: ../lib/hw.c:194 -+msgid "IPIP Tunnel" -+msgstr "IPIPăăłăŤă«" -+ -+#: ../lib/hw.c:197 -+msgid "Point-to-Point Protocol" -+msgstr "Point-to-Pointă—ăăă‚łă«" -+ -+#: ../lib/hw.c:200 -+msgid "(Cisco)-HDLC" -+msgstr "(Cisco)-HDLC" -+ -+#: ../lib/hw.c:201 -+msgid "LAPB" -+msgstr "LAPB" -+ -+#: ../lib/hw.c:204 -+msgid "ARCnet" -+msgstr "ARCăŤăă" -+ -+#: ../lib/hw.c:207 -+msgid "Frame Relay DLCI" -+msgstr "ă•ă¬ăĽă ăŞă¬ăĽDLCI" -+ -+#: ../lib/hw.c:208 -+msgid "Frame Relay Access Device" -+msgstr "ă•ă¬ăĽă ăŞă¬ăĽă‚˘ă‚Żă‚»ă‚ąă‡ăイス" -+ -+#: ../lib/hw.c:211 -+msgid "IPv6-in-IPv4" -+msgstr "IPv6-in-IPv4" -+ -+#: ../lib/hw.c:214 -+msgid "IrLAP" -+msgstr "IrLAP" -+ -+#: ../lib/hw.c:217 -+msgid "16/4 Mbps Token Ring" -+msgstr "16/4 MbpsăăĽă‚ŻăłăŞăłă‚°" -+ -+#: ../lib/hw.c:219 -+msgid "16/4 Mbps Token Ring (New)" -+msgstr "16/4 MbpsăăĽă‚ŻăłăŞăłă‚°(ć–°)" -+ -+#: ../lib/hw.c:226 -+msgid "Generic EUI-64" -+msgstr "ジェăŤăŞăă‚ŻEUI-64" -+ -+#: ../lib/inet.c:153 ../lib/inet6.c:79 -+#, c-format -+msgid "rresolve: unsupport address family %d !\n" -+msgstr "rresolve: アă‰ă¬ă‚ąă•ă‚ˇăźăŞ%dをサăťăĽăă—ă¦ă„ăľă›ă‚“!\n" -+ -+#: ../lib/inet6.c:131 -+msgid "[UNKNOWN]" -+msgstr "[不ćŽ]" -+ -+#: ../lib/inet6_gr.c:71 -+#, c-format -+msgid "INET6 (IPv6) not configured in this system.\n" -+msgstr "INET6(IPv6)ăŻă“ă®ă‚·ă‚ąă†ă ă§ăŻĺ©ç”¨ă§ăŤă‚‹ă‚ă†č¨ĺ®šă•ă‚Śă¦ă„ăľă›ă‚“.\n" -+ -+#: ../lib/inet6_gr.c:74 -+#, c-format -+msgid "Kernel IPv6 routing table\n" -+msgstr "ă‚«ăĽăŤă«IPv6 経路ă†ăĽă–ă«\n" -+ -+#: ../lib/inet6_gr.c:76 -+#, c-format -+msgid "" -+"Destination Next " -+"Hop Flags Metric Ref Use Iface\n" -+msgstr "é€äżˇĺ…サイă 次回ă›ăă— ă•ă©ă‚° Metric Ref 使用数 イăłă‚żă•ă‚§ăĽă‚ą\n" -+ -+#: ../lib/inet6_gr.c:150 -+#, c-format -+msgid "Kernel IPv6 Neighbour Cache\n" -+msgstr "ă‚«ăĽăŤă«IPv6 近隣ăŤăăăŻăĽă‚Żă®ă‚ăŁăă‚·ăĄ\n" -+ -+#: ../lib/inet6_gr.c:153 -+#, c-format -+msgid "" -+"Neighbour HW Address Iface Flags " -+"Ref State\n" -+msgstr "" -+"近隣サイă ăŹăĽă‰ă‚¦ă‚§ă‚˘ă‚˘ă‰ă¬ă‚ą Iface ă•ă©ă‚° " -+"Ref 状態\n" -+ -+#: ../lib/inet6_gr.c:157 -+#, c-format -+msgid "" -+"Neighbour HW Address Iface Flags " -+"Ref State Stale(sec) Delete(sec)\n" -+msgstr "" -+"近隣サイă ăŹăĽă‰ă‚¦ă‚§ă‚˘ă‚˘ă‰ă¬ă‚ą Iface ă•ă©ă‚° " -+"Ref 状態 Stale[秒] Delete[秒]\n" -+ -+#: ../lib/inet6_sr.c:46 -+#, c-format -+msgid "Usage: inet6_route [-vF] del Target\n" -+msgstr "使用法: inet6_route [-vF] del ă‚żăĽă‚˛ăă\n" -+ -+#: ../lib/inet6_sr.c:47 -+#, c-format -+msgid " inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n" -+msgstr "" -+" inet6_route [-vF] add ă‚żăĽă‚˛ăă \n" -+" [gw ゲăĽăウェイ] [metric ăˇăăŞăă‚Ż]\n" -+" [[dev] イăłă‚żă•ă‚§ăĽă‚ą]\n" -+ -+#: ../lib/inet6_sr.c:48 -+#, c-format -+msgid " inet6_route [-FC] flush NOT supported\n" -+msgstr " inet6_route [-FC] flush サăťăĽăă—ă¦ă„ăľă›ă‚“\n" -+ -+#: ../lib/inet6_sr.c:188 -+#, c-format -+msgid "Flushing `inet6' routing table not supported\n" -+msgstr "`inet6'経路ă†ăĽă–ă«ă®ă•ă©ăă‚·ăĄăŻă‚µăťăĽăă—ă¦ă„ăľă›ă‚“\n" -+ -+#: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220 -+#, c-format -+msgid "INET (IPv4) not configured in this system.\n" -+msgstr "INET(IPv4)ăŻă“ă®ă‚·ă‚ąă†ă ă§ăŻĺ©ç”¨ă§ăŤă‚‹ă‚ă†ă«č¨ĺ®šă•ă‚Śă¦ă„ăľă›ă‚“.\n" -+ -+#: ../lib/inet_gr.c:53 -+#, c-format -+msgid "Kernel IP routing table\n" -+msgstr "ă‚«ăĽăŤă«IP経路ă†ăĽă–ă«\n" -+ -+#: ../lib/inet_gr.c:56 -+#, c-format -+msgid "" -+"Destination Gateway Genmask Flags Metric Ref Use " -+"Iface\n" -+msgstr "受信ĺ…サイă ゲăĽăウェイ ăŤăăăžă‚ąă‚Ż ă•ă©ă‚° Metric Ref 使用数 イăłă‚żă•ă‚§ăĽă‚ą\n" -+ -+#: ../lib/inet_gr.c:59 -+#, c-format -+msgid "" -+"Destination Gateway Genmask Flags MSS Window irtt " -+"Iface\n" -+msgstr "受信ĺ…サイă ゲăĽăウェイ ăŤăăăžă‚ąă‚Ż ă•ă©ă‚° MSS Window irtt イăłă‚żă•ă‚§ăĽă‚ą\n" -+ -+#: ../lib/inet_gr.c:62 -+#, c-format -+msgid "" -+"Destination Gateway Genmask Flags Metric Ref Use " -+"Iface MSS Window irtt\n" -+msgstr "" -+"受信ĺ…サイă ゲăĽăウェイ ăŤăăăžă‚ąă‚Ż ă•ă©ă‚° Metric Ref 使用数 " -+"Iface MSS Window irtt\n" -+ -+#: ../lib/inet_gr.c:237 -+#, c-format -+msgid "Kernel IP routing cache\n" -+msgstr "ă‚«ăĽăŤă«IP経路ă‚ăŁăă‚·ăĄ\n" -+ -+#: ../lib/inet_gr.c:258 -+#, c-format -+msgid "" -+"Source Destination Gateway Flags Metric Ref Use " -+"Iface\n" -+msgstr "発信ĺ…サイă 受信ĺ…サイă ゲăĽăウェイ ă•ă©ă‚° Metric Ref 使用数 イăłă‚żă•ă‚§ăĽă‚ą\n" -+ -+#: ../lib/inet_gr.c:261 -+#, c-format -+msgid "" -+"Source Destination Gateway Flags MSS Window irtt " -+"Iface\n" -+msgstr "発信ĺ…サイă 受信ĺ…サイă ゲăĽăウェイ ă•ă©ă‚° MSS Window irtt イăłă‚żă•ă‚§ăĽă‚ą\n" -+ -+#: ../lib/inet_gr.c:266 -+#, c-format -+msgid "" -+"Source Destination Gateway Flags Metric Ref Use " -+"Iface MSS Window irtt HH Arp\n" -+msgstr "" -+"発信ĺ…サイă 受信ĺ…サイă ゲăĽăウェイ ă•ă©ă‚° Metric Ref 使用数 " -+"Iface MSS Window irtt HH Arp\n" -+ -+#: ../lib/inet_gr.c:290 -+#, c-format -+msgid "" -+"Source Destination Gateway Flags Metric Ref Use " -+"Iface MSS Window irtt TOS HHRef HHUptod SpecDst\n" -+msgstr "" -+"発信ĺ…サイă 受信ĺ…サイă ゲăĽăウェイ ă•ă©ă‚° Metric Ref 使用数 " -+"Iface MSS Window irtt TOS HHRef HHUptod SpecDst\n" -+ -+#: ../lib/inet_sr.c:51 -+#, c-format -+msgid "" -+"Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] " -+"[[dev] If]\n" -+msgstr "" -+"使用法:inet_route [-vF] del {-host|-net} 受信ĺ…[/ă—ă¬ă•ă‚Łăă‚Żă‚ą]\n" -+" [gw ゲăĽăウェイ] [metric ăˇăăŞăă‚Ż]\n" -+" [[dev] イăłă‚żă•ă‚§ăĽă‚ą]\n" -+ -+#: ../lib/inet_sr.c:52 -+#, c-format -+msgid "" -+" inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n" -+msgstr "" -+" inet_route [-vF] add {-host|-net} 受信ĺ…[/ă—ă¬ă•ă‚Łăă‚Żă‚ą]\n" -+" [gw ゲăĽăウェイ] [metric ăˇăăŞăă‚Ż]\n" -+ -+#: ../lib/inet_sr.c:53 -+#, c-format -+msgid "" -+" [netmask N] [mss Mss] [window W] [irtt I]\n" -+msgstr " [netmask ăŤăăăžă‚ąă‚Ż] [mss Mss] [window W] [irtt I]\n" -+ -+#: ../lib/inet_sr.c:54 -+#, c-format -+msgid " [mod] [dyn] [reinstate] [[dev] If]\n" -+msgstr " [mod] [dyn] [reinstate] [[dev] イăłă‚żă•ă‚§ăĽă‚ą]\n" -+ -+#: ../lib/inet_sr.c:55 -+#, c-format -+msgid "" -+" inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n" -+msgstr "" -+" inet_route [-vF] add {-host|-net} 受信ĺ…[/ă—ă¬ă•ă‚Łăă‚Żă‚ą]\n" -+" [metric ăˇăăŞăă‚Ż] reject\n" -+ -+#: ../lib/inet_sr.c:56 -+#, c-format -+msgid " inet_route [-FC] flush NOT supported\n" -+msgstr " inet_route [-FC] flush サăťăĽăă—ă¦ă„ăľă›ă‚“\n" -+ -+#: ../lib/inet_sr.c:158 -+#, c-format -+msgid "route: %s: cannot use a NETWORK as gateway!\n" -+msgstr "route: %s: NETWORKをゲăĽăウェイă¨ă—ă¦ä˝żăăľă›ă‚“!\n" -+ -+#: ../lib/inet_sr.c:174 -+#, c-format -+msgid "route: Invalid MSS/MTU.\n" -+msgstr "route: MSS/MTUăŚä¸Ťé©ĺ˝“ă§ă™.\n" -+ -+#: ../lib/inet_sr.c:187 -+#, c-format -+msgid "route: Invalid window.\n" -+msgstr "route: windowăŚä¸Ťé©ĺ˝“ă§ă™.\n" -+ -+#: ../lib/inet_sr.c:203 -+#, c-format -+msgid "route: Invalid initial rtt.\n" -+msgstr "route: ĺťćśźrttăŚä¸Ťé©ĺ˝“ă§ă™.\n" -+ -+#: ../lib/inet_sr.c:261 -+#, c-format -+msgid "route: netmask %.8x doesn't make sense with host route\n" -+msgstr "route: ăŤăăăžă‚ąă‚Ż%.8xăŚă›ă‚ąă経路を検出ă—ăľă›ă‚“\n" -+ -+#: ../lib/inet_sr.c:265 -+#, c-format -+msgid "route: bogus netmask %s\n" -+msgstr "route: ĺ˝ă®ăŤăăăžă‚ąă‚Ż`%s'ă§ă™\n" -+ -+#: ../lib/inet_sr.c:270 -+#, c-format -+msgid "route: netmask doesn't match route address\n" -+msgstr "route: ăŤăăăžă‚ąă‚ŻăŚçµŚč·Żă‚˘ă‰ă¬ă‚ąă¨ä¸€č‡´ă—ăľă›ă‚“\n" -+ -+#: ../lib/inet_sr.c:306 -+#, c-format -+msgid "Flushing `inet' routing table not supported\n" -+msgstr "`inet'経路ă†ăĽă–ă«ă®ă•ă©ăă‚·ăĄăŻă‚µăťăĽăă—ă¦ă„ăľă›ă‚“\n" -+ -+#: ../lib/inet_sr.c:310 -+#, c-format -+msgid "Modifying `inet' routing cache not supported\n" -+msgstr "`inet'経路ă†ăĽă–ă«ă®ĺ¤‰ć›´ăŻă‚µăťăĽăă—ă¦ă„ăľă›ă‚“\n" -+ -+#: ../lib/ipx_gr.c:52 -+#, c-format -+msgid "IPX not configured in this system.\n" -+msgstr "IPXăŻă“ă®ă‚·ă‚ąă†ă ă§ăŻč¨ĺ®šă•ă‚Śă¦ă„ăľă›ă‚“.\n" -+ -+#: ../lib/ipx_gr.c:56 -+#, c-format -+msgid "Kernel IPX routing table\n" -+msgstr "ă‚«ăĽăŤă«IPX経路ă†ăĽă–ă«\n" -+ -+#. xxx -+#: ../lib/ipx_gr.c:57 -+#, c-format -+msgid "Destination Router Net Router Node\n" -+msgstr "é€äżˇĺ…サイă ă«ăĽă‚ż ăŤăă ă«ăĽă‚żăŽăĽă‰\n" -+ -+#: ../lib/ipx_sr.c:33 -+#, c-format -+msgid "IPX: this needs to be written\n" -+msgstr "IPX: ă“ă‚ŚăŻć›¸ăŤčľĽăżăŚĺż…č¦ă§ă™\n" -+ -+#: ../lib/masq_info.c:198 -+#, c-format -+msgid "IP masquerading entries\n" -+msgstr "IPăžă‚ąă‚«ă¬ăĽă‰ エăłăăŞ\n" -+ -+#: ../lib/masq_info.c:201 -+#, c-format -+msgid "prot expire source destination ports\n" -+msgstr "ă—ăă expire 発信ĺ…サイă é€äżˇĺ…サイă ăťăĽă\n" -+ -+#: ../lib/masq_info.c:204 -+#, c-format -+msgid "" -+"prot expire initseq delta prevd source " -+"destination ports\n" -+msgstr "" -+"ă—ăă expire ĺťćśźseq delta prevd 発信ĺ…サイă 受信ĺ…サイ" -+"ă ăťăĽă\n" -+ -+#: ../lib/netrom_gr.c:48 -+#, c-format -+msgid "NET/ROM not configured in this system.\n" -+msgstr "NET/ROMăŻă“ă®ă‚·ă‚ąă†ă ă§ăŻĺ©ç”¨ĺŹŻč˝ăŞă‚ă†ă«č¨ĺ®šă•ă‚Śă¦ă„ăľă›ă‚“.\n" -+ -+#: ../lib/netrom_gr.c:51 -+#, c-format -+msgid "Kernel NET/ROM routing table\n" -+msgstr "ă‚«ăĽăŤă«NET/ROM経路ă†ăĽă–ă«\n" -+ -+#: ../lib/netrom_gr.c:52 -+#, c-format -+msgid "Destination Mnemonic Quality Neighbour Iface\n" -+msgstr "受信ĺ…サイă ă‹ăĽă˘ă‹ăă‚Ż ĺ“質 近隣サイă イăłă‚żă•ă‚§ăĽă‚ą\n" -+ -+#: ../lib/netrom_sr.c:34 -+#, c-format -+msgid "netrom usage\n" -+msgstr "netrom使用法\n" -+ -+#: ../lib/netrom_sr.c:44 -+#, c-format -+msgid "NET/ROM: this needs to be written\n" -+msgstr "NET/ROM: ă“ă‚ŚăŻć›¸ăŤčľĽăżăŚĺż…č¦ă§ă™\n" -+ -+#: ../lib/ppp.c:44 -+#, c-format -+msgid "You cannot start PPP with this program.\n" -+msgstr "ă“ă®ă—ăă‚°ă©ă ă§ăŻPPPを開始ă§ăŤăľă›ă‚“. \n" -+ -+#: ../lib/ppp_ac.c:38 -+#, c-format -+msgid "Sorry, use pppd!\n" -+msgstr "申ă—訳ă‚ă‚Šăľă›ă‚“ăŚ, pppdを使ăŁă¦ä¸‹ă•ă„!\n" -+ -+#: ../lib/rose.c:87 -+msgid "Node address must be ten digits" -+msgstr "ăŽăĽă‰ă‚˘ă‰ă¬ă‚ąăŻ10進数ă§ăŞă‘ă‚Śă°ăŞă‚Šăľă›ă‚“" -+ -+#: ../lib/rose_gr.c:51 -+#, c-format -+msgid "ROSE not configured in this system.\n" -+msgstr "ROSEăŻă“ă®ă‚·ă‚ąă†ă ă§ăŻĺ©ç”¨ĺŹŻč˝ăŞă‚ă†ă«č¨ĺ®šă•ă‚Śă¦ă„ăľă›ă‚“\n" -+ -+#: ../lib/rose_gr.c:54 -+#, c-format -+msgid "Kernel ROSE routing table\n" -+msgstr "ă‚«ăĽăŤă«ROSE経路ă†ăĽă–ă«\n" -+ -+#: ../lib/tr.c:86 ../lib/tr.c:101 -+#, c-format -+msgid "in_tr(%s): invalid token ring address!\n" -+msgstr "in_tr(%s): 不é©ĺ˝“ăŞăăĽă‚ŻăłăŞăłă‚°ă‚˘ă‰ă¬ă‚ąă§ă™!\n" -+ -+#: ../lib/tr.c:113 -+#, c-format -+msgid "in_tr(%s): trailing : ignored!\n" -+msgstr "in_tr(%s): trailing : 無効!\n" -+ -+# translatable? -+#: ../lib/tr.c:125 -+#, c-format -+msgid "in_tr(%s): trailing junk!\n" -+msgstr "in_tr(%s): trailing junk!\n" -+ -+#: ../lib/interface.c:176 -+#, c-format -+msgid "warning: no inet socket available: %s\n" -+msgstr "č¦ĺ‘Š: InetソケăăăŻĺ©ç”¨ă§ăŤăľă›ă‚“: %s\n" -+ -+#: ../lib/interface.c:325 -+#, c-format -+msgid "Warning: cannot open %s (%s). Limited output.\n" -+msgstr "č¦ĺ‘Š: %să‚’é–‹ă‘ăľă›ă‚“(%s). é™ĺ®šă•ă‚Śăźĺ‡şĺŠ›ă§ă™.\n" -+ -+#. Give better error message for this case. -+#: ../lib/interface.c:571 -+msgid "Device not found" -+msgstr "ă‡ăイスăŚč¦‹ă¤ă‹ă‚Šăľă›ă‚“" -+ -+#: ../lib/interface.c:575 -+#, c-format -+msgid "%s: error fetching interface information: %s\n" -+msgstr "%s: イăłă‚żă•ă‚§ăĽă‚ąć…ĺ ±ă‚’ĺŹ–ĺľ—ä¸ă«ă‚¨ă©ăĽăŚç™şç”źă—ăľă—ăź: %s\n" -+ -+#: ../lib/interface.c:608 -+msgid " - no statistics available -" -+msgstr " - çµ±č¨ć…ĺ ±ă‚’ĺ©ç”¨ă§ăŤăľă›ă‚“ -" -+ -+#: ../lib/interface.c:612 -+#, c-format -+msgid "[NO FLAGS]" -+msgstr "[ă•ă©ă‚°ăŞă—]" -+ -+#: ../lib/interface.c:688 -+#, c-format -+msgid "%-9.9s Link encap:%s " -+msgstr "%-9.9s ăŞăłă‚Żć–ąćł•:%s " -+ -+#: ../lib/interface.c:693 -+#, c-format -+msgid "HWaddr %s " -+msgstr "ăŹăĽă‰ă‚¦ă‚§ă‚˘ă‚˘ă‰ă¬ă‚ą %s " -+ -+#: ../lib/interface.c:696 -+#, c-format -+msgid "Media:%s" -+msgstr "ăˇă‡ă‚Łă‚˘:%s" -+ -+#: ../lib/interface.c:698 -+#, c-format -+msgid "(auto)" -+msgstr "(自動)" -+ -+#: ../lib/interface.c:705 -+#, c-format -+msgid " %s addr:%s " -+msgstr " %sアă‰ă¬ă‚ą:%s" -+ -+#: ../lib/interface.c:708 -+#, c-format -+msgid " P-t-P:%s " -+msgstr " P-t-P:%s " -+ -+#: ../lib/interface.c:711 -+#, c-format -+msgid " Bcast:%s " -+msgstr " ă–ăăĽă‰ă‚ăŁă‚ąă:%s " -+ -+#: ../lib/interface.c:713 -+#, c-format -+msgid " Mask:%s\n" -+msgstr " ăžă‚ąă‚Ż:%s\n" -+ -+#: ../lib/interface.c:730 -+#, c-format -+msgid " inet6 addr: %s/%d" -+msgstr " inet6アă‰ă¬ă‚ą: %s/%d" -+ -+#: ../lib/interface.c:732 -+#, c-format -+msgid " Scope:" -+msgstr " 範囲:" -+ -+#: ../lib/interface.c:735 -+#, c-format -+msgid "Global" -+msgstr "ă‚°ăăĽăă«" -+ -+#: ../lib/interface.c:738 -+#, c-format -+msgid "Link" -+msgstr "ăŞăłă‚Ż" -+ -+#: ../lib/interface.c:741 -+#, c-format -+msgid "Site" -+msgstr "サイă" -+ -+# translatable? -+#: ../lib/interface.c:744 -+#, c-format -+msgid "Compat" -+msgstr "Compat" -+ -+#: ../lib/interface.c:747 -+#, c-format -+msgid "Host" -+msgstr "ă›ă‚ąă" -+ -+#: ../lib/interface.c:750 -+#, c-format -+msgid "Unknown" -+msgstr "不ćŽ" -+ -+#: ../lib/interface.c:765 -+#, c-format -+msgid " IPX/Ethernet II addr:%s\n" -+msgstr " IPX/イăĽă‚µăŤăăIIアă‰ă¬ă‚ą:%s\n" -+ -+#: ../lib/interface.c:768 -+#, c-format -+msgid " IPX/Ethernet SNAP addr:%s\n" -+msgstr " IPX/イăĽă‚µăŤăăSNAPアă‰ă¬ă‚ą:%s\n" -+ -+#: ../lib/interface.c:771 -+#, c-format -+msgid " IPX/Ethernet 802.2 addr:%s\n" -+msgstr " IPX/イăĽă‚µăŤăă802.2アă‰ă¬ă‚ą:%s\n" -+ -+#: ../lib/interface.c:774 -+#, c-format -+msgid " IPX/Ethernet 802.3 addr:%s\n" -+msgstr " IPX/イăĽă‚µăŤăă802.3アă‰ă¬ă‚ą:%s\n" -+ -+#: ../lib/interface.c:784 -+#, c-format -+msgid " EtherTalk Phase 2 addr:%s\n" -+msgstr " イăĽă‚µăăĽă‚Ż ă•ă‚§ăĽă‚ş2アă‰ă¬ă‚ą:%s\n" -+ -+#: ../lib/interface.c:793 -+#, c-format -+msgid " econet addr:%s\n" -+msgstr " エコăŤăăアă‰ă¬ă‚ą:%s\n" -+ -+#: ../lib/interface.c:800 -+#, c-format -+msgid "[NO FLAGS] " -+msgstr "[ă•ă©ă‚°ăŞă—]" -+ -+# translatable? -+#: ../lib/interface.c:802 -+#, c-format -+msgid "UP " -+msgstr "UP " -+ -+# translatable? -+#: ../lib/interface.c:804 -+#, c-format -+msgid "BROADCAST " -+msgstr "BROADCAST " -+ -+# translatable? -+#: ../lib/interface.c:806 -+#, c-format -+msgid "DEBUG " -+msgstr "DEBUG " -+ -+# translatable? -+#: ../lib/interface.c:808 -+#, c-format -+msgid "LOOPBACK " -+msgstr "LOOPBACK " -+ -+# translatable? -+#: ../lib/interface.c:810 -+#, c-format -+msgid "POINTOPOINT " -+msgstr "POINTOPOINT " -+ -+# translatable? -+#: ../lib/interface.c:812 -+#, c-format -+msgid "NOTRAILERS " -+msgstr "NOTRAILERS " -+ -+# translatable? -+#: ../lib/interface.c:814 -+#, c-format -+msgid "RUNNING " -+msgstr "RUNNING " -+ -+# translatable? -+#: ../lib/interface.c:816 -+#, c-format -+msgid "NOARP " -+msgstr "NOARP " -+ -+# translatable? -+#: ../lib/interface.c:818 -+#, c-format -+msgid "PROMISC " -+msgstr "PROMISC " -+ -+# translatable? -+#: ../lib/interface.c:820 -+#, c-format -+msgid "ALLMULTI " -+msgstr "ALLMULTI " -+ -+# translatable? -+#: ../lib/interface.c:822 -+#, c-format -+msgid "SLAVE " -+msgstr "SLAVE " -+ -+# translatable? -+#: ../lib/interface.c:824 -+#, c-format -+msgid "MASTER " -+msgstr "MASTER " -+ -+# translatable? -+#: ../lib/interface.c:826 -+#, c-format -+msgid "MULTICAST " -+msgstr "MULTICAST " -+ -+# translatable? -+#: ../lib/interface.c:829 -+#, c-format -+msgid "DYNAMIC " -+msgstr "DYNAMIC " -+ -+#. DONT FORGET TO ADD THE FLAGS IN ife_print_short -+#: ../lib/interface.c:832 -+#, c-format -+msgid " MTU:%d Metric:%d" -+msgstr " MTU:%d ăˇăăŞăă‚Ż:%d" -+ -+# translatable? -+#: ../lib/interface.c:836 -+#, c-format -+msgid " Outfill:%d Keepalive:%d" -+msgstr " Outfill:%d ă‚ăĽă—アă©ă‚¤ă–:%d" -+ -+#: ../lib/interface.c:850 -+#, c-format -+msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" -+msgstr "RXă‘ケăă:%llu エă©ăĽ:%lu ćŤĺ¤±:%lu ă‚ŞăĽăă©ăł:%lu ă•ă¬ăĽă :%lu\n" -+ -+#: ../lib/interface.c:855 -+#, c-format -+msgid " compressed:%lu\n" -+msgstr " 圧縮:%lu\n" -+ -+#: ../lib/interface.c:895 -+#, c-format -+msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" -+msgstr "TXă‘ケăă:%llu エă©ăĽ:%lu ćŤĺ¤±:%lu ă‚ŞăĽăă©ăł:%lu ă‚ăŁăŞă‚˘:%lu\n" -+ -+#: ../lib/interface.c:899 -+#, c-format -+msgid " collisions:%lu " -+msgstr " 衝çŞ(Collisions):%lu " -+ -+#: ../lib/interface.c:901 -+#, c-format -+msgid "compressed:%lu " -+msgstr "圧縮:%lu " -+ -+#: ../lib/interface.c:903 -+#, c-format -+msgid "txqueuelen:%d " -+msgstr "TXă‚ăĄăĽé•·:%d " -+ -+#: ../lib/interface.c:905 -+#, c-format -+msgid "RX bytes:%llu (%lu.%lu %s) TX bytes:%llu (%lu.%lu %s)\n" -+msgstr "RXăイă:%llu (%lu.%lu %s) TXăイă:%llu (%lu.%lu %s)\n" -+ -+#: ../lib/interface.c:916 -+#, c-format -+msgid "Interrupt:%d " -+msgstr "割り込ăż:%d " -+ -+#. Only print devices using it for -+#. I/O maps -+#: ../lib/interface.c:919 -+#, c-format -+msgid "Base address:0x%x " -+msgstr "ă™ăĽă‚ąă‚˘ă‰ă¬ă‚ą:0x%x " -+ -+#: ../lib/interface.c:921 -+#, c-format -+msgid "Memory:%lx-%lx " -+msgstr "ăˇă˘ăŞ:%lx-%lx " -+ -+#: ../lib/interface.c:924 -+#, c-format -+msgid "DMA chan:%x " -+msgstr "DMAăェイăł:%x " -+ -+#: ../lib/sockets.c:63 -+#, c-format -+msgid "No usable address families found.\n" -+msgstr "ĺ©ç”¨ĺŹŻč˝ăŞă‚˘ă‰ă¬ă‚ąă•ă‚ˇăźăŞăŚč¦‹ă¤ă‹ă‚Šăľă›ă‚“.\n" -+ -+#: ../lib/util-ank.c:229 -+#, c-format -+msgid "ip: %s is invalid inet address\n" -+msgstr "ip: %săŻä¸Ťé©ĺ‡ăŞInetアă‰ă¬ă‚ąă§ă™.\n" -+ -+#: ../lib/util-ank.c:238 -+#, c-format -+msgid "ip: %s is invalid inet prefix\n" -+msgstr "ip: %săŻä¸Ťé©ĺ‡ăŞInetă—ă¬ă•ă‚Łăă‚Żă‚ąă§ă™\n" -+ -+#: ../lib/util-ank.c:248 -+#, c-format -+msgid "ip: %s is invalid IPv4 address\n" -+msgstr "ip: %săŻä¸Ťé©ĺ‡ăŞIPv4アă‰ă¬ă‚ąă§ă™.\n" -+ -+#: ../lib/util-ank.c:256 -+#, c-format -+msgid "ip: argument is wrong: %s\n" -+msgstr "ip: 引数ăŚé–“é•ăŁă¦ă„ăľă™: %s\n" -+ -+#: ../ipmaddr.c:61 -+#, c-format -+msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n" -+msgstr "使用法: ipmaddr [ add | del ] ăžă«ăă‚ăŁă‚ąăアă‰ă¬ă‚ą dev ć–‡ĺ—ĺ—\n" -+ -+#: ../ipmaddr.c:62 -+#, c-format -+msgid " ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n" -+msgstr " ipmaddr show [ dev ć–‡ĺ—ĺ— ] [ ipv4 | ipv6 | link | all ]\n" -+ -+#: ../ipmaddr.c:63 -+#, c-format -+msgid " ipmaddr -V | -version\n" -+msgstr " ipmaddr -V | -version\n" -+ -+#: ../ipmaddr.c:263 -+#, c-format -+msgid "family %d " -+msgstr "ă•ă‚ˇăźăŞ %d " -+ -+#: ../ipmaddr.c:272 -+#, c-format -+msgid " users %d" -+msgstr " ă¦ăĽă‚¶ %d" -+ -+#: ../ipmaddr.c:358 -+msgid "Cannot create socket" -+msgstr "ソケăăを作ćă§ăŤăľă›ă‚“" -+ -+#: ../slattach.c:180 -+#, c-format -+msgid "slattach: /dev/%s already locked!\n" -+msgstr "slattach: /dev/%s ăŻă™ă§ă«ăăă‚Żă•ă‚Śă¦ă„ăľă™!\n" -+ -+#: ../slattach.c:186 -+#, c-format -+msgid "slattach: tty_lock: (%s): %s\n" -+msgstr "slattach: tty_lock: (%s): %s\n" -+ -+#: ../slattach.c:192 -+#, c-format -+msgid "slattach: cannot write PID file\n" -+msgstr "slattach: PIDă•ă‚ˇă‚¤ă«ă‚’書ăŤčľĽă‚ăľă›ă‚“\n" -+ -+#: ../slattach.c:202 -+#, c-format -+msgid "slattach: tty_lock: UUCP user %s unknown!\n" -+msgstr "slattach: tty_lock: UUCPă¦ăĽă‚¶%săŻä¸ŤćŽă§ă™!\n" -+ -+#: ../slattach.c:430 -+#, c-format -+msgid "slattach: tty_hangup(DROP): %s\n" -+msgstr "slattach: tty_hangup(DROP): %s\n" -+ -+#: ../slattach.c:437 -+#, c-format -+msgid "slattach: tty_hangup(RAISE): %s\n" -+msgstr "slattach: tty_hangup(RAISE): %s\n" -+ -+#: ../slattach.c:468 -+#, c-format -+msgid "slattach: tty name too long\n" -+msgstr "slattach: ttyĺŤăŚé•·ă™ăŽăľă™\n" -+ -+#: ../slattach.c:498 -+#, c-format -+msgid "slattach: tty_open: cannot get current state!\n" -+msgstr "slattach: tty_open: 現在ă®çŠ¶ć…‹ă‚’得られăľă›ă‚“!\n" -+ -+#: ../slattach.c:505 -+#, c-format -+msgid "slattach: tty_open: cannot get current line disc!\n" -+msgstr "slattach: tty_open: 現在ă®ă©ă‚¤ăłă»ă‡ă‚Łă‚ąă‚Żă‚’得られăľă›ă‚“!\n" -+ -+#: ../slattach.c:513 -+#, c-format -+msgid "slattach: tty_open: cannot set RAW mode!\n" -+msgstr "slattach: tty_open: RAWă˘ăĽă‰ă‚’č¨ĺ®šă§ăŤăľă›ă‚“!\n" -+ -+#: ../slattach.c:520 -+#, c-format -+msgid "slattach: tty_open: cannot set %s bps!\n" -+msgstr "slattach: tty_open: %s bpsă‚’č¨ĺ®šă§ăŤăľă›ă‚“!\n" -+ -+#: ../slattach.c:530 -+#, c-format -+msgid "slattach: tty_open: cannot set 8N1 mode!\n" -+msgstr "slattach: tty_open: 8N1ă˘ăĽă‰ă¸č¨ĺ®šă§ăŤăľă›ă‚“!\n" -+ -+#: ../slattach.c:672 -+#, c-format -+msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n" -+msgstr "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n" -+ -+#: ../slattach.c:704 -+#, c-format -+msgid "%s started" -+msgstr "%sを開始ă—ăľă—ăź" -+ -+#: ../slattach.c:705 -+#, c-format -+msgid " on %s" -+msgstr "(%s上)" -+ -+#: ../slattach.c:706 -+#, c-format -+msgid " interface %s\n" -+msgstr " イăłă‚żă•ă‚§ăĽă‚ą %s\n" ---- net-tools-1.60.orig/ipmaddr.c -+++ net-tools-1.60/ipmaddr.c -@@ -291,13 +291,15 @@ - 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 @@ - } 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/Makefile -+++ net-tools-1.60/Makefile -@@ -76,7 +76,7 @@ - NET_LIB_PATH = lib - NET_LIB_NAME = net-tools - --PROGS := ifconfig hostname arp netstat route rarp slattach plipconfig nameif -+PROGS := ifconfig arp netstat route rarp slattach plipconfig nameif # hostname - - -include config.make - ifeq ($(HAVE_IP_TOOLS),1) -@@ -88,7 +88,7 @@ - - # Compiler and Linker Options - # You may need to uncomment and edit these if you are using libc5 and IPv6. --COPTS = -D_GNU_SOURCE -O2 -Wall -g # -I/usr/inet6/include -+COPTS = -D_GNU_SOURCE -O2 -Wall # -g -I/usr/inet6/include - ifeq ($(origin LOPTS), undefined) - LOPTS = - endif -@@ -116,6 +116,18 @@ - CFLAGS = $(COPTS) -I. -idirafter ./include/ -I$(NET_LIB_PATH) - LDFLAGS = $(LOPTS) -L$(NET_LIB_PATH) - -+INSTALL = install -+INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755 -+ -+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) -+CFLAGS += -g -+endif -+ -+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) -+INSTALL_PROGRAM += -s -+endif -+ -+ - SUBDIRS = man/ $(NET_LIB_PATH)/ - - ifeq ($(origin CC), undefined) -@@ -223,29 +235,29 @@ - installbin: - install -m 0755 -d ${BASEDIR}/sbin - install -m 0755 -d ${BASEDIR}/bin -- install -m 0755 arp ${BASEDIR}/sbin -- install -m 0755 hostname ${BASEDIR}/bin -- install -m 0755 ifconfig ${BASEDIR}/sbin -- install -m 0755 nameif ${BASEDIR}/sbin -- install -m 0755 netstat ${BASEDIR}/bin -- install -m 0755 plipconfig $(BASEDIR)/sbin -- install -m 0755 rarp ${BASEDIR}/sbin -- install -m 0755 route ${BASEDIR}/sbin -- install -m 0755 slattach $(BASEDIR)/sbin -+ $(INSTALL_PROGRAM) arp ${BASEDIR}/sbin -+# $(INSTALL_PROGRAM) hostname ${BASEDIR}/bin -+ $(INSTALL_PROGRAM) ifconfig ${BASEDIR}/sbin -+ $(INSTALL_PROGRAM) nameif ${BASEDIR}/sbin -+ $(INSTALL_PROGRAM) netstat ${BASEDIR}/bin -+ $(INSTALL_PROGRAM) plipconfig $(BASEDIR)/sbin -+ $(INSTALL_PROGRAM) rarp ${BASEDIR}/sbin -+ $(INSTALL_PROGRAM) route ${BASEDIR}/sbin -+ $(INSTALL_PROGRAM) slattach $(BASEDIR)/sbin - ifeq ($(HAVE_IP_TOOLS),1) -- install -m 0755 ipmaddr $(BASEDIR)/sbin -- install -m 0755 iptunnel $(BASEDIR)/sbin -+ $(INSTALL_PROGRAM) ipmaddr $(BASEDIR)/sbin -+ $(INSTALL_PROGRAM) iptunnel $(BASEDIR)/sbin - endif - ifeq ($(HAVE_MII),1) -- install -m 0755 mii-tool $(BASEDIR)/sbin --endif -- ln -fs hostname $(BASEDIR)/bin/dnsdomainname -- ln -fs hostname $(BASEDIR)/bin/ypdomainname -- ln -fs hostname $(BASEDIR)/bin/nisdomainname -- ln -fs hostname $(BASEDIR)/bin/domainname --ifeq ($(HAVE_AFDECnet),1) -- ln -fs hostname $(BASEDIR)/bin/nodename -+ $(INSTALL_PROGRAM) mii-tool $(BASEDIR)/sbin - endif -+# ln -fs hostname $(BASEDIR)/bin/dnsdomainname -+# ln -fs hostname $(BASEDIR)/bin/ypdomainname -+# ln -fs hostname $(BASEDIR)/bin/nisdomainname -+# ln -fs hostname $(BASEDIR)/bin/domainname -+#ifeq ($(HAVE_AFDECnet),1) -+# ln -fs hostname $(BASEDIR)/bin/nodename -+#endif - - savebin: - @for i in ${BASEDIR}/sbin/arp ${BASEDIR}/sbin/ifconfig \ ---- net-tools-1.60.orig/README -+++ net-tools-1.60/README -@@ -10,7 +10,7 @@ - subsystem of the Linux kernel. This includes arp, hostname, ifconfig, - netstat, rarp and route. Additionally, this package contains - utilities relating to particular network hardware types (plipconfig, --slattach) and advanced aspects of IP configuration (iptunnel, -+slattach, mii-tool) and advanced aspects of IP configuration (iptunnel, - ipmaddr). - - Please include the output of "program --version" when reporting bugs. -@@ -24,10 +24,14 @@ - - INSTALLING Installation instructions. - -- COPYING Your free copy of the GNU Public License. -- - TODO Some things that need to be done. - -+The Homepage (including CVS repository, release downloads and a form to -+request enhancements) is hosted by BerliOS Developer. Please consider to -+join the project if you want to contribute: -+ -+ http://net-tools.berlios.de/ -+ - - Notes - ----- ---- net-tools-1.60.orig/arp.c -+++ net-tools-1.60/arp.c -@@ -8,7 +8,7 @@ - * NET-3 Networking Distribution for the LINUX operating - * system. - * -- * Version: $Id: arp.c,v 1.20 2001/04/08 17:05:05 pb Exp $ -+ * Version: $Id: arp.c,v 1.25 2005/12/04 02:57:15 ecki Exp $ - * - * Maintainer: Bernd 'eckes' Eckenfels, <net-tools@lina.inka.de> - * -@@ -100,9 +100,10 @@ - { - 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 @@ - 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 @@ - 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 @@ - 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 @@ - 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 @@ - } - 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 @@ - { - 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 @@ - 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 @@ - continue; - } - if (!strcmp(*args, "dontpub")) { --#ifdef HAVE_ATF_DONTPUB -+#ifdef ATF_DONTPUB - flags |= ATF_DONTPUB; - #else - ENOSUPP("arp", "ATF_DONTPUB"); -@@ -326,7 +336,7 @@ - continue; - } - if (!strcmp(*args, "auto")) { --#ifdef HAVE_ATF_MAGIC -+#ifdef ATF_MAGIC - flags |= ATF_MAGIC; - #else - ENOSUPP("arp", "ATF_MAGIC"); -@@ -346,11 +356,11 @@ - 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 @@ - 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 @@ - - if (!(arp_flags & ATF_COM)) { - if (arp_flags & ATF_PUBL) -- printf("%-8.8s%-20.20s", "*", "*"); -+ printf("%-8.8s%-20.20s", "*", _("<from_interface>")); - else - printf("%-8.8s%-20.20s", "", _("(incomplete)")); - } else { -@@ -486,7 +496,7 @@ - - if (!(arp_flags & ATF_COM)) { - if (arp_flags & ATF_PUBL) -- printf("* "); -+ printf("<from_interface> "); - else - printf(_("<incomplete> ")); - } else { -@@ -499,12 +509,12 @@ - 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 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 @@ - - 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 @@ - 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 usage(void) - { - fprintf(stderr, _("Usage:\n arp [-vn] [<HW>] [-i <if>] [-a] [<hostname>] <-Display ARP cache\n")); -- fprintf(stderr, _(" arp [-v] [-i <if>] -d <hostname> [pub][nopub] <-Delete ARP entry\n")); -- fprintf(stderr, _(" arp [-vnD] [<HW>] [-i <if>] -f [<filename>] <-Add entry from file\n")); -- fprintf(stderr, _(" arp [-v] [<HW>] [-i <if>] -s <hostname> <hwaddr> [temp][nopub] <-Add entry\n")); -- fprintf(stderr, _(" arp [-v] [<HW>] [-i <if>] -s <hostname> <hwaddr> [netmask <nm>] pub <-''-\n")); -- fprintf(stderr, _(" arp [-v] [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub <-''-\n\n")); -+ fprintf(stderr, _(" arp [-v] [-i <if>] -d <host> [pub] <-Delete ARP entry\n")); -+ fprintf(stderr, _(" arp [-vnD] [<HW>] [-i <if>] -f [<filename>] <-Add entry from file\n")); -+ fprintf(stderr, _(" arp [-v] [<HW>] [-i <if>] -s <host> <hwaddr> [temp] <-Add entry\n")); -+ fprintf(stderr, _(" arp [-v] [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub <-''-\n\n")); - - fprintf(stderr, _(" -a display (all) hosts in alternative (BSD) style\n")); - fprintf(stderr, _(" -s, --set set a new ARP entry\n")); ---- net-tools-1.60.orig/config.in -+++ net-tools-1.60/config.in -@@ -49,16 +49,16 @@ - * - 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 '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 -+ - * - * - * 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/hostname.c -+++ net-tools-1.60/hostname.c -@@ -9,20 +9,19 @@ - * dnsdmoainname - * nisdomainname {name|-F file} - * -- * Version: hostname 1.96 (1996-02-18) -+ * Version: hostname 1.101 (2003-10-11) - * - * Author: Peter Tobias <tobias@et-inf.fho-emden.de> - * - * Changes: -- * {1.90} Peter Tobias : Added -a and -i options. -- * {1.91} Bernd Eckenfels : -v,-V rewritten, long_opts -- * (major rewrite), usage. -- *960120 {1.95} Bernd Eckenfels : -y/nisdomainname - support for get/ -- * setdomainname added -- *960218 {1.96} Bernd Eckenfels : netinet/in.h added -- *980629 {1.97} Arnaldo Carvalho de Melo : gettext instead of catgets for i18n -- *20000213 {1.99} Arnaldo Carvalho de Melo : fixed some i18n strings -+ * {1.90} Peter Tobias : Added -a and -i options. -+ * {1.91} Bernd Eckenfels : -v,-V rewritten, long_opts (major rewrite), usage. -+ *19960120 {1.95} Bernd Eckenfels : -y/nisdomainname - support for get/setdomainname added -+ *19960218 {1.96} Bernd Eckenfels : netinet/in.h added -+ *19980629 {1.97} Arnaldo Carvalho de Melo : gettext instead of catgets for i18n -+ *20000213 {1.99} Arnaldo Carvalho de Melo : fixed some i18n strings - *20010404 {1.100} Arnaldo Carvalho de Melo: use setlocale -+ *20031011 {1.101} Maik Broemme: gcc 3.x fixes (default: break) - * - * This program is free software; you can redistribute it - * and/or modify it under the terms of the GNU General -@@ -31,7 +30,9 @@ - * your option) any later version. - */ - #include <stdio.h> -+#include <stdlib.h> - #include <unistd.h> -+#include <stdlib.h> - #include <getopt.h> - #include <string.h> - #include <netdb.h> -@@ -78,6 +79,7 @@ - fprintf(stderr, _("%s: name too long\n"), program_name); - break; - default: -+ break; - } - exit(1); - } -@@ -97,7 +99,6 @@ - case EINVAL: - fprintf(stderr, _("%s: name too long\n"), program_name); - break; -- default: - } - exit(1); - }; -@@ -116,7 +117,6 @@ - case EINVAL: - fprintf(stderr, _("%s: name too long\n"), program_name); - break; -- default: - } - exit(1); - }; -@@ -173,7 +173,6 @@ - *p = '\0'; - printf("%s\n", hp->h_name); - break; -- default: - } - } - -@@ -326,11 +325,12 @@ - break; - case 'V': - version(); -+ break; // not reached - case '?': - case 'h': - default: - usage(); -- -+ break; // not reached - }; - - ---- net-tools-1.60.orig/ifconfig.c -+++ net-tools-1.60/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.57 2002/12/10 00:56:41 ecki Exp $ - * - * Author: Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> - * and others. Copyright 1993 MicroWalt Corporation -@@ -88,7 +88,6 @@ - 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 @@ - 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); -@@ -127,7 +126,7 @@ - - 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 +158,7 @@ - - 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 +171,35 @@ - return (0); - } - -+/** test is a specified flag is set */ -+static int test_flag(char *ifname, short flags) -+{ -+ struct ifreq ifr; -+ int fd; -+ -+ if (strchr(ifname, ':')) { -+ /* This is a v4 alias interface. Downing it via a socket for -+ another AF may have bad consequences. */ -+ fd = get_socket_for_af(AF_INET); -+ if (fd < 0) { -+ fprintf(stderr, _("No support for INET on this system.\n")); -+ return -1; -+ } -+ } else -+ fd = skfd; -+ -+ safe_strncpy(ifr.ifr_name, ifname, IFNAMSIZ); -+ if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) { -+ fprintf(stderr, _("%s: ERROR while testing interface flags: %s\n"), -+ ifname, strerror(errno)); -+ return -1; -+ } -+ return (ifr.ifr_flags & flags); -+} -+ - static void usage(void) - { -- fprintf(stderr, _("Usage:\n ifconfig [-a] [-i] [-v] [-s] <interface> [[<AF>] <address>]\n")); -+ fprintf(stderr, _("Usage:\n ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n")); - #if HAVE_AFINET - fprintf(stderr, _(" [add <address>[/<prefixlen>]]\n")); - fprintf(stderr, _(" [del <address>[/<prefixlen>]]\n")); -@@ -208,7 +233,7 @@ - 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 +247,19 @@ - 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 +414,8 @@ - } - 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 +426,8 @@ - } - 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 +438,8 @@ - } - 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 +462,8 @@ - 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 +520,8 @@ - - 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 +529,10 @@ - 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 +554,10 @@ - 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 +577,16 @@ - 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 +658,8 @@ - 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 +667,10 @@ - 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 +711,12 @@ - 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 +735,15 @@ - 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 +828,7 @@ - usage(); - *cp = 0; - } else { -- prefix_len = 0; -+ prefix_len = 128; - } - safe_strncpy(host, *spp, (sizeof host)); - if (inet6_aftype.input(1, host, -@@ -800,6 +857,8 @@ - } - 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 +918,7 @@ - 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 +962,7 @@ - /* 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 +970,8 @@ - if (didnetmask) - usage(); - -- goterr = set_netmask(skfd, &ifr, &sa); -- didnetmask++; -+ // remeber to set the netmask from samask later -+ neednetmask = 1; - break; - } - } -@@ -921,9 +980,11 @@ - 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 +1041,14 @@ - 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/netstat.c -+++ net-tools-1.60/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.55 2007/12/01 19:00:40 ecki Exp $ - * - * Authors: Fred Baumgarten, <dc6iq@insu1.etec.uni-karlsruhe.de> - * Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> -@@ -94,6 +94,7 @@ - #include "sockets.h" - #include "interface.h" - #include "util.h" -+#include "proc.h" - - #define PROGNAME_WIDTH 20 - -@@ -153,7 +154,7 @@ - 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 +175,7 @@ - #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)) \ -@@ -216,7 +217,7 @@ - - static struct prg_node { - struct prg_node *next; -- int inode; -+ unsigned long inode; - char name[PROGNAME_WIDTH]; - } *prg_hash[PRG_HASH_SIZE]; - -@@ -249,7 +250,7 @@ - /* 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 +273,7 @@ - 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 +296,18 @@ - 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 +316,41 @@ - 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 +393,9 @@ - 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 >= -@@ -450,7 +455,7 @@ - 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); -@@ -527,15 +532,15 @@ - - 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)); -+ printf(" %-16s",prg_cache_get(inode)); - if (flag_opt) -- printf("%s", timers); -+ printf(" %s", timers); - putchar('\n'); - } - -@@ -646,7 +651,7 @@ - #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]= -@@ -657,7 +662,7 @@ - "ESTABLISHED", - "RECOVERY" - }; -- if(!(f=fopen(_PATH_PROCNET_X25, "r"))) -+ if(!(f=proc_fopen(_PATH_PROCNET_X25))) - { - if (errno != ENOENT) { - perror(_PATH_PROCNET_X25); -@@ -705,6 +710,7 @@ - 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 +725,13 @@ - 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 +747,7 @@ - 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 +821,8 @@ - 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 +839,7 @@ - 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 +856,14 @@ - - 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 +878,7 @@ - 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 +964,8 @@ - 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 +982,7 @@ - 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 +999,13 @@ - - 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 +1020,7 @@ - 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 +1088,8 @@ - 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 +1113,9 @@ - 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 +1123,14 @@ - 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 +1222,9 @@ - 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); -@@ -1229,7 +1243,7 @@ - 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 */ - -@@ -1256,7 +1270,7 @@ - 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); -@@ -1350,18 +1364,37 @@ - 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 = proc_fopen(_PATH_PROCNET_IPX_SOCKET1); -+ if (!f) { -+ if (errno != ENOENT) { -+ perror(_PATH_PROCNET_IPX_SOCKET1); -+ return (-1); -+ } -+ f = proc_fopen(_PATH_PROCNET_IPX_SOCKET2); -+ -+ /* 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 +1414,7 @@ - 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 +1424,7 @@ - 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 +1482,7 @@ - } - 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 +1490,7 @@ - exit(1); - } - if (flag_cnt) -- free_interface_list(); -+ if_cache_free(); - else { - close(skfd); - skfd = -1; -@@ -1503,7 +1536,7 @@ - fprintf(stderr, _(" -C, --cache display routing cache instead of FIB\n\n")); - - fprintf(stderr, _(" <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --netrom\n")); -- fprintf(stderr, _(" <AF>=Use '-A <af>' or '--<af>'; default: %s\n"), DFLT_AF); -+ fprintf(stderr, _(" <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"), DFLT_AF); - fprintf(stderr, _(" List of possible address families (which support routing):\n")); - print_aflist(1); /* 1 = routeable */ - exit(E_USAGE); -@@ -1514,7 +1547,7 @@ - (int argc, char *argv[]) { - int i; - int lop; -- struct option longopts[] = -+ static struct option longopts[] = - { - AFTRANS_OPTS, - {"version", 0, 0, 'V'}, -@@ -1556,7 +1589,7 @@ - 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 +1657,14 @@ - 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 */ -@@ -1741,10 +1782,11 @@ - } - 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) { -@@ -1845,6 +1887,7 @@ - } - #endif - } -+ - if (!flag_cnt || i) - break; - sleep(1); ---- net-tools-1.60.orig/route.c -+++ net-tools-1.60/route.c -@@ -2,7 +2,7 @@ - * route This file contains an implementation of the command - * that manages the IP routing table in the kernel. - * -- * Version: $Id: route.c,v 1.9 2001/04/15 14:41:17 pb Exp $ -+ * Version: $Id: route.c,v 1.10 2002/07/30 05:24:20 ecki Exp $ - * - * Maintainer: Bernd 'eckes' Eckenfels, <net-tools@lina.inka.de> - * -@@ -142,7 +142,7 @@ - } - - /* 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 @@ - 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/statistics.c -+++ net-tools-1.60/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.20 2007/12/01 18:44:56 ecki Exp $ - * 19980630 - i18n - Arnaldo Carvalho de Melo <acme@conectiva.com.br> - * 19981113 - i18n fixes - Arnaldo Carvalho de Melo <acme@conectiva.com.br> - * 19990101 - added net/netstat, -t, -u, -w supprt - Bernd Eckenfels -@@ -11,6 +11,7 @@ - #include <string.h> - #include "config.h" - #include "intl.h" -+#include "proc.h" - - /* #define WARN 1 */ - -@@ -172,19 +173,59 @@ - { "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 { -@@ -222,7 +263,8 @@ - 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 +331,17 @@ - return &dummytab; - } - --void process_fd(FILE *f) -+int process_fd(FILE *f) - { -- 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, ':'); -@@ -330,11 +375,10 @@ - sp = p + 1; - } - } -- return; -+ return 0; - - formaterr: -- perror(_("error parsing /proc/net/snmp")); -- return; -+ return -1; - } - - -@@ -344,22 +388,25 @@ - - 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) < 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) <0) -+ fprintf(stderr, _("Problem while parsing /proc/net/netstat\n")); - - if (ferror(f)) - perror("/proc/net/netstat"); ---- net-tools-1.60.orig/nameif.c -+++ net-tools-1.60/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 @@ - } - - struct change { -- struct change *next,**pprev; -+ struct change *next; -+ int found; - char ifname[IFNAMSIZ+1]; - unsigned char mac[6]; - }; -@@ -139,10 +140,7 @@ - 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 @@ - 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 @@ - - 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 @@ - 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/mii-tool.c -+++ net-tools-1.60/mii-tool.c -@@ -29,8 +29,7 @@ - http://www.national.com/pf/DP/DP83840.html - */ - --static char version[] = --"mii-tool.c 1.9 2000/04/28 00:56:08 (David Hinds)\n"; -+static char Version[] = "$Id: mii-tool.c,v 1.9 2006/09/27 20:59:18 ecki Exp $\n(Author: David Hinds based on Donald Becker's mii-diag)"; - - #include <unistd.h> - #include <stdlib.h> -@@ -46,16 +45,19 @@ - #include <sys/socket.h> - #include <sys/ioctl.h> - #include <net/if.h> -+#include <linux/sockios.h> -+ - #ifndef __GLIBC__ - #include <linux/if_arp.h> - #include <linux/if_ether.h> - #endif - #include "mii.h" -+#include "version.h" - - #define MAX_ETH 8 /* Maximum # of interfaces */ - - /* Table of known MII's */ --static struct { -+static const struct { - u_short id1, id2; - char *name; - } mii_id[] = { -@@ -74,6 +76,9 @@ - { 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 @@ - - 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 @@ - - /*--------------------------------------------------------------------*/ - --static char *media_list(int mask, int best) -+static const char *media_list(unsigned mask, unsigned mask2, int best) - { - static char buf[100]; - int i; - *buf = '\0'; -+ -+ if (mask & MII_BMCR_SPEED1000) { -+ if (mask2 & MII_BMCR2_1000HALF) { -+ strcat(buf, " "); -+ strcat(buf, "1000baseT-HD"); -+ if (best) goto out; -+ } -+ if (mask2 & MII_BMCR2_1000FULL) { -+ strcat(buf, " "); -+ strcat(buf, "1000baseT-FD"); -+ if (best) goto out; -+ } -+ } - mask >>= 5; - for (i = 4; i >= 0; i--) { - if (mask & (1<<i)) { -@@ -192,6 +218,7 @@ - if (best) break; - } - } -+ out: - if (mask & (1<<5)) - strcat(buf, " flow-control"); - return buf; -@@ -201,15 +228,15 @@ - { - char buf[100]; - int i, mii_val[32]; -- int bmcr, bmsr, advert, lkpar; -+ unsigned bmcr, bmsr, advert, lkpar, bmcr2, lpa2; - - /* Some bits in the BMSR are latched, but we can't rely on being - the only reader, so only the current values are meaningful */ - mdio_read(sock, MII_BMSR); -- for (i = 0; i < ((verbose > 1) ? 32 : 8); i++) -+ for (i = 0; i < ((verbose > 1) ? 32 : MII_BASIC_MAX); i++) - mii_val[i] = mdio_read(sock, i); - -- if (mii_val[MII_BMCR] == 0xffff) { -+ if (mii_val[MII_BMCR] == 0xffff || mii_val[MII_BMSR] == 0x0000) { - fprintf(stderr, " No MII transceiver present!.\n"); - return -1; - } -@@ -217,6 +244,7 @@ - /* 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 @@ - 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 @@ - } - } 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 @@ - 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 @@ - 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 @@ - /*--------------------------------------------------------------------*/ - - 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 @@ - } - /* 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 @@ - } - - if (opt_version) -- printf(version); -+ version(); - - /* Open a basic socket. */ - if ((skfd = socket(AF_INET, SOCK_DGRAM,0)) < 0) { -@@ -426,6 +472,9 @@ - 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/changelog -+++ net-tools-1.60/debian/changelog -@@ -0,0 +1,277 @@ -+net-tools (1.60-19) unstable; urgency=low -+ -+ * fixed netstat(8) (interfaceS) reported by Liu Xing. (Closes Bug #435690) -+ * fixed interface name truncation (Closes Bug #405521) -+ Thank you Csaba Szep. -+ * fixed pt error string (Closes: Bug#403033) -+ * fixed route samples (Closes: Bug#400844, #368697) Thanks Danny Rathjens. -+ * fixed ifconfig(8) see also section (Closes: Bug#365916) Dan Jacobs. -+ -+ -- Bernd Eckenfels <ecki@debian.org> Sun, 02 Dec 2007 06:27:41 +0100 -+ -+net-tools (1.60-18) unstable; urgency=low -+ -+ * Thanks for the l10n NMU to Kenshi Muto -+ * fixed hostname compile problems -+ * better error handling and speedup for proc file reading -+ * improved mii-tool (more media types) -+ * fixed string length contraint in ipmaddr -+ * fixed ipx /proc/net (alternate naming) -+ * smaller fixed to netstat(8) (de) 2002-02-20 - still incomplete -+ * expanded arp(8) (en) 2007-12-01 -+ * added -4 and -6 to netstat(8) 02 October 2003 -+ * formatting fixed rarp(8)+slattach(8) [en] -+ * formatting fixed arp(8), rarp(8), ifconfig(8), hostname(1) [fr] -+ * fixed slattach -L to not require HW handshake anymore -+ * netstat -n: show v4inv6 mapped addressses as v4 -+ -+ -- Bernd Eckenfels <ecki@debian.org> Sun, 02 Dec 2007 03:28:17 +0100 -+ -+net-tools (1.60-17.2) unstable; urgency=low -+ -+ * l10n NMU -+ * Set conflict against ja-trans which has obsolete Japanese -+ translations only for net-tools. (closes: #447327) -+ -+ -- Kenshi Muto <kmuto@debian.org> Sat, 20 Oct 2007 18:00:34 +0900 -+ -+net-tools (1.60-17.1) unstable; urgency=low -+ -+ * l10n NMU -+ * Updated net-tools.pot. -+ * Updated Japanese translation (closes: Bug#432338) -+ * Updated German translation (closes: #313808) -+ -+ -- Kenshi Muto <kmuto@debian.org> Thu, 11 Oct 2007 19:44:26 +0900 -+ -+net-tools (1.60-17) unstable; urgency=medium -+ -+ * arp.c: bus error on sparc64 with latest gcc fixed. (Closes: Bug#340384) -+ -+ -- Bernd Eckenfels <ecki@debian.org> Sun, 04 Dec 2005 05:47:05 +0100 -+ -+net-tools (1.60-16) unstable; urgency=low -+ -+ * spelling fix to slattach(8) (Closes: Bug#326124 (patch by A.Costa) -+ * inet.c: portability fix for 64bit. -+ * comment cleanups to aliagn with 1.65 cvs -+ * net-support.h, inet_sr.c, nstrcmp.c, arp.c, ether.h -+ -+ -- Bernd Eckenfels <ecki@debian.org> Mon, 24 Oct 2005 22:05:38 +0200 -+ -+net-tools (1.60-15) unstable; urgency=low -+ -+ * minor formating fix to ifconfig(8) -+ -+ -- Bernd Eckenfels <ecki@debian.org> Thu, 30 Jun 2005 21:49:52 +0200 -+ -+net-tools (1.60-14) unstable; urgency=low -+ -+ * added iptables(8) in ifconfig(8) (thanks Toralf Förster) -+ * more usage updates in ifconfig.8 (used upstream HEAD=1.11) -+ -+ -- Bernd Eckenfels <ecki@debian.org> Thu, 30 Jun 2005 20:51:18 +0200 -+ -+net-tools (1.60-13) unstable; urgency=low Thu, 30 Jun 2005 20:49:57 +0200 -+ -+ * X25 code compiles with 2.4 and 2.6 kernel headers (Closes: Bug#271678) -+ * IMPORTANT: make ifconfig show alias interfaces in 2.6 again. -+ * resort media type array to match kernel (Closes: Bug#199920) -+ -+ -- Bernd Eckenfels <ecki@debian.org> Tue, 17 May 2005 01:28:51 +0200 -+ -+net-tools (1.60-12) unstable; urgency=low -+ -+ * make TR hw address type work for new kernel (Closes: Bug #79462, #203400) -+ * update-po uses msgmerge, new net-tools.pot (Closes: Bug: 271426) -+ * de-support dontpub option in arp -? und arp.8 (Closes: Bug #203396) -+ -+ -- Bernd Eckenfels <ecki@debian.org> Mon, 16 May 2005 06:33:48 +0200 -+ -+net-tools (1.60-11) unstable; urgency=low -+ -+ * spelling fixes (Closes: Bug #305640, #305638, 305637) -+ * nameif.c avoid overflow by malicious kernel -+ * avoid overflow of the TX-OK Column (Closes: Bug #308922) -+ -+ -- Bernd Eckenfels <ecki@debian.org> Sat, 14 May 2005 01:48:45 +0200 -+ -+net-tools (1.60-10) unstable; urgency=low -+ -+ * typo fix in po/de.po for german arp command output (Closes: Bug #176151) -+ * added diagnostics messages to mii-tool.8 (Closes: Bug #239229) -+ * new version of nstrcmp (Closes: Bug #226503) -+ * enable EUI64 support -+ * stadanrds version 3.6.1 (no changes) -+ -+ -- Bernd Eckenfels <ecki@debian.org> Fri, 23 Apr 2004 00:57:20 +0200 -+ -+net-tools (1.60-9) unstable; urgency=medium -+ -+ * debian/changelog: fixed in last entry fixed bug from 197925 to 197924 -+ * include linux/sockios.h for SIOCGMIIPHY definition (new style) -+ which will fix MII reporting on 2.4 kernels. (Closes: Bug #133648) -+ NOTE: this will now require root to work, it will also not work on -+ older kernels. -+ * Rene Engelhard's patch to make AF X25 compile with 2.6 headers (Closes: Bug #223091) -+ -+ -- Bernd Eckenfels <ecki@debian.org> Mon, 29 Dec 2003 13:42:20 +0100 -+ -+net-tools (1.60-8) unstable; urgency=medium -+ -+ * lib/interface.c: backed off change which skipped reading ioctl -+ interfacelist, if _proc interfacelist was ok, which does not work, -+ because alias interfaces are only in ioctl list available. It is -+ also falling back to the original lib/nstrcml.c because the -+ comparision if : is present does not work. -+ (Closes: bug #197924, #197582, #197269) -+ * bumped standards version (no changes) -+ -+ -- Bernd Eckenfels <ecki@debian.org> Sat, 28 Jun 2003 02:56:38 +0200 -+ -+net-tools (1.60-7) unstable; urgency=low -+ -+ * interfaces.c: cvs version fixes Connectiva Bug #5711 (Closes: #149576) -+ from Eduardo Pereira Habkost -+ * netstat.c: cvs version adds support for tcp6,udp6,icmp6 protocols -+ * netstat.c: cvs version adds support for -4 or -6 cmd line shortcut -+ * netstat.c: cvs version adds fix for inode -+ signedness (Closes: #134600, #78932) -+ * ifconfig: removed -i from usage (Closes: #181528) -+ * make gcc 3.3 happy: added ull unsigned long long prefix to constant -+ * lib/ddp_gr.c+pathnames.h: first support for appletalk routing from cvs -+ * lib/eui64.c+hw.c+Makefile: forst support for new hw type from cvs -+ * lib/interface.c: cvs fix for column run-into (Closes: #161080) -+ * lib/irda.c,lib/ipx.c: cvs update -+ * lib/nstrcmp.c: new, faster version, fixes b-lookups for ifconfig -+ * hostanme.c: gcc 3.3 fix from cvs (not compiled in net-tools.deb) -+ * lib/interface: fixed memory globbering -+ (Closes: #135744, #149579, #185187) -+ -+ -- Bernd Eckenfels <ecki@debian.org> Thu, 12 Jun 2003 05:44:38 +0200 -+ -+net-tools (1.60-6) unstable; urgency=low -+ -+ * took route.c from upstream cvs: allow -6 and -4 option -+ * took statistics.c from upstream cvs: more complete netstat -S -+ * took README from upstream cvs: fix COPYING file title and removed -+ the line (Closes: #102139) -+ * took arp.c from upstream: fixed name "PUB", better not found handling, -+ implicite proxy arp mac changed from '*' to '<from_interface>', -+ usage line made shorter -+ * added mii-tool in control file (Closes: #172473) -+ * fixed description of binary multiple in man page (Closes: #182487) -+ * fixed interpunctation in netstat(8) (Closes: #191660) -+ * fixed compile warning in inet_sr.c by removing empty default: label in -+ switch -+ -+ -- Bernd Eckenfels <ecki@debian.org> Wed, 28 May 2003 22:35:12 +0200 -+ -+net-tools (1.60-5) unstable; urgency=low -+ -+ * thanks Andrew for the 4.1 NMU -+ * NMU: Apply nameif patch from Matt Domsch. (Closes: #178209) -+ * Fix FTB bug (string concatenation in gcc 3.3) (Closes: #194995) -+ * Fix segfault in mii-tool by using cvs version (Closes: #139027) -+ * fixed plural of authors to make lintian happy (I JOIN YOU :) -+ -+ -- Bernd Eckenfels <ecki@debian.org> Wed, 28 May 2003 22:04:14 +0200 -+ -+net-tools (1.60-4.1) unstable; urgency=low -+ -+ * NMU -+ * Apply nameif patch from Matt Domsch. (Closes: #178209) -+ -+ -- Andrew Suffield <asuffield@debian.org> Wed, 9 Apr 2003 21:44:09 +0100 -+ -+net-tools (1.60-4) unstable; urgency=medium -+ -+ * fixed (upstream) spurious newline in ifconfig -+ Thanks Jonathen, Closes: Bug #109379 -+ * fixed SI-Units printout in ifconfig (Closes: Bug #110629, #97029, #100167) -+ * this is done by including lib/interfaces.c from upstream cvs -+ * also added ifconfig man page from upstream cvs -+ * fixed (upstream) man page about netstat's --interface opt. (Closes: Bug#120475) -+ -+ -- Bernd Eckenfels <ecki@debian.org> Sat, 24 Nov 2001 06:26:37 +0100 -+ -+net-tools (1.60-3) unstable; urgency=medium -+ -+ * fixed upstream error where counters in ifconfig/netstat -i are 0 -+ -+ -- Bernd Eckenfels <ecki@debian.org> Sat, 10 Nov 2001 18:12:13 +0100 -+ -+net-tools (1.60-2) unstable; urgency=low -+ -+ * Fixed the following bug: (Closes: #117837) -+ * inserted ifconfig.c from upstream cvs to do this -+ * bumped debian Standard 3.1.1 -> 3.5.6 and removed -g from linking -+ -+ -- Bernd Eckenfels <ecki@debian.org> Thu, 1 Nov 2001 02:51:33 +0100 -+ -+net-tools (1.60-1) unstable; urgency=low -+ -+ * New upstream -+ * Phil fixed the following Bugs upstream: (Closes: #91919, #93048, #90282) -+ -+ -- Bernd Eckenfels <ecki@debian.org> Mon, 16 Apr 2001 02:28:12 +0200 -+ -+net-tools (1.59-1) unstable; urgency=low -+ -+ * added Build Dependencies (closes bug: #89083) -+ * new upstream version -+ * removed dh_suidregister and a few comments from rules file -+ -+ -- Bernd Eckenfels <ecki@debian.org> Sun, 18 Mar 2001 03:00:33 +0100 -+ -+net-tools (1.58-2) unstable; urgency=low -+ -+ * backported ifconfig change from 1.59 to avoid closing socket too early -+ on some systems (depending on the protocols installed). -+ Closes Bug: #85688, #85743 -+ -+ -- Bernd Eckenfels <ecki@debian.org> Tue, 13 Feb 2001 01:39:59 +0100 -+ -+net-tools (1.58-1) unstable; urgency=low -+ -+ * new upstream version -+ * removed local man pages for now (Closes: bug #83894) -+ * install nameif in /sbin -+ -+ -- Bernd Eckenfels <ecki@debian.org> Sat, 10 Feb 2001 21:50:30 +0100 -+ -+net-tools (1.57-2) unstable; urgency=high -+ -+ * rebuild, this is believed to closes: #75825 -+ -+ -- Bernd Eckenfels <ecki@debian.org> Sat, 30 Dec 2000 22:43:01 +0100 -+ -+net-tools (1.57-1) unstable; urgency=low -+ -+ * new debian maintainer (thanks Anthony for the Work!) -+ * new upstream version -+ -+ -- Bernd Eckenfels <ecki@debian.org> Mon, 14 Aug 2000 02:40:13 +0200 -+ -+net-tools (1.54-3) unstable; urgency=low -+ -+ * Argggh. Don't use that horrible dh_installmanpages hack. (Closes: -+ Bug#68925, Bug#68879) -+ -+ -- Anthony Towns <ajt@debian.org> Sun, 13 Aug 2000 00:12:05 +1000 -+ -+net-tools (1.54-2) unstable; urgency=low -+ -+ * Reapply slattach patch from netbase 3.16-3. -+ -+ -- Anthony Towns <ajt@debian.org> Thu, 10 Aug 2000 11:32:58 +1000 -+ -+net-tools (1.54-1) unstable; urgency=low -+ -+ * Split from netbase. -+ -+ -- Anthony Towns <ajt@debian.org> Mon, 17 Jul 2000 07:34:12 +1000 -+ -+Local variables: -+mode: debian-changelog -+End: ---- net-tools-1.60.orig/debian/copyright -+++ net-tools-1.60/debian/copyright -@@ -0,0 +1,18 @@ -+This debian package is maintained by Bernd Eckenfels <ecki@debian.org> since -+Mon, 14 Aug 2000 02:42:13 +0200. Debian Informations will be uploaded -+upstream, too. -+ -+This package was debianized by Anthony Towns <ajt@debian.org> on -+Mon, 17 Jul 2000 07:34:12 +1000. It was originally part of the netbase -+package. -+ -+It was downloaded from http://www.tazenda.demon.co.uk/phil/net-tools/ -+ -+Upstream Authors: Phil Blundell <philb@gnu.org>, -+ Bernd Eckenfels <net-tools@lina.inka.de> -+ -+Copyright: -+ -+Distributed under the terms of the GNU General Public License version 2, -+as published by the Free Software Foundation. On Debian systems you can -+find a copy of this license in /usr/share/common-licenses/GPL. ---- net-tools-1.60.orig/debian/dirs -+++ net-tools-1.60/debian/dirs -@@ -0,0 +1 @@ -+usr/sbin ---- 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/control -+++ net-tools-1.60/debian/control -@@ -0,0 +1,21 @@ -+Source: net-tools -+Section: net -+Priority: important -+Build-Depends: debhelper, gettext -+Maintainer: Bernd Eckenfels <ecki@debian.org> -+Standards-Version: 3.6.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/rules -+++ net-tools-1.60/debian/rules -@@ -0,0 +1,74 @@ -+#!/usr/bin/make -f -+# Sample debian/rules that uses debhelper. -+# GNU copyright 1997 to 1999 by Joey Hess. -+ -+# Uncomment this to turn on verbose mode. -+#export DH_VERBOSE=1 -+ -+# This is the debhelper compatability version to use. -+export DH_COMPAT=1 -+ -+configure: configure-stamp -+configure-stamp: -+ dh_testdir -+ touch configure-stamp -+ -+build: configure-stamp build-stamp -+build-stamp: -+ dh_testdir -+ cp debian/config.h config.h -+ cp debian/config.make config.make -+ $(MAKE) -+ touch build-stamp -+ -+clean: -+ dh_testdir -+ dh_testroot -+ rm -f build-stamp configure-stamp -+ -$(MAKE) clobber -+ dh_clean -+ -+install: build -+ dh_testdir -+ dh_testroot -+ dh_clean -k -+ dh_installdirs -+ $(MAKE) update BASEDIR=`pwd`/debian/tmp -+ mv debian/tmp/sbin/arp debian/tmp/usr/sbin/arp -+ # we don't want man pages for domainname and friends... (yet) -+ rm -rf debian/tmp/usr/share/man/*/man1/ debian/tmp/usr/share/man/man1/ -+ # we don't install local manpages until policy is clear -+ rm -rf debian/tmp/usr/share/man/*_*/ -+ -+ -+# Build architecture-independent files here. -+binary-indep: build install -+# We have nothing to do by default. -+ -+# Build architecture-dependent files here. -+binary-arch: build install -+# dh_testversion -+ dh_testdir -+ dh_testroot -+# dh_installdebconf -+ dh_installdocs -+ dh_installexamples -+ dh_installmenu -+ dh_installcron -+# dh_installmanpages -+ dh_installinfo -+# dh_undocumented -+ dh_installchangelogs -+ dh_link -+ dh_strip -+ dh_compress -+ dh_fixperms -+# dh_makeshlibs -+ dh_installdeb -+ dh_shlibdeps -+ dh_gencontrol -- -isp -+ dh_md5sums -+ dh_builddeb -+ -+binary: binary-indep binary-arch -+.PHONY: build clean binary-indep binary-arch binary install ---- 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/docs -+++ net-tools-1.60/debian/docs -@@ -0,0 +1,3 @@ -+README -+README.ipv6 -+TODO diff --git a/source/a/util-linux/util-linux.SlackBuild b/source/a/util-linux/util-linux.SlackBuild index 424199144..1fa74c832 100755 --- a/source/a/util-linux/util-linux.SlackBuild +++ b/source/a/util-linux/util-linux.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,9 +23,9 @@ # Slackware build script for util-linux VERSION=${VERSION:-$(echo util-linux*.tar.?z* | cut -d - -f 3 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-5} -ADJTIMEXVERS=1.23 +ADJTIMEXVERS=1.29 SETSERIALVERS=2.17 ZIPTOOLVERS=1.4.0 @@ -70,8 +70,7 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Disabled login and init stuff from being built, as this is provided by -# shadow and sysvinit +# Disabled login stuff from being built, as this is provided by shadow # # /sbin/elvtune is not built, as configure says it only works with 2.2 and # 2.4 kernels @@ -85,7 +84,19 @@ find . \ # Changing the fdisk -l output (this was done prior to util-linux-ng) broke # our installation scripts, so we have changed the name of partition type # 83 back to "Linux swap": -zcat $CWD/util-linux.fdisk-no-solaris.diff.gz | patch -p1 || exit 1 +zcat $CWD/util-linux.fdisk-no-solaris.diff.gz | patch -p1 --verbose || exit 1 + +# Fix loop encryption: +zcat $CWD/0001-mount-old-fix-encryption-usage.patch.gz | patch -p1 --verbose || exit 1 + +# Fix fdisk granularity on 512 byte sector size devices: +zcat $CWD/0002-fdisk-don-t-ignore-1MiB-granularity-on-512-byte-sect.patch.gz | patch -p1 --verbose || exit 1 + +# 20120814 bkw: fix "column --separator <anything>" segfault +zcat $CWD/column-fix_long_opts.diff.gz | patch -p1 --verbose || exit 1 + +# Regenerate, since patch 0001 hits mount/Makefile.am: +./autogen.sh CFLAGS="$SLKCFLAGS" \ ./configure \ @@ -99,9 +110,9 @@ CFLAGS="$SLKCFLAGS" \ --disable-static \ --enable-arch \ --enable-agetty \ - --disable-init \ --enable-kill \ --disable-last \ + --enable-line \ --enable-mesg \ --enable-partx \ --enable-raw \ @@ -114,8 +125,10 @@ CFLAGS="$SLKCFLAGS" \ --enable-use-tty-group \ --enable-libblkid \ --enable-libmount \ + --enable-libmount-mount \ --enable-libuuid \ --disable-uuidd \ + --enable-ddate \ --build=$ARCH-slackware-linux \ || exit 1 @@ -180,11 +193,10 @@ cat strings.1 | gzip -9c > $PKG/usr/man/man1/strings.1.gz # Add just the hostname utilities from net-tools, so that anyone # installing just the A series will not have a hostname (null): cd $TMP || exit 1 -rm -rf net-tools-1.60 -tar xvf $CWD/net-tools-1.60.tar.xz -cd net-tools-1.60 -zcat $CWD/net-tools_1.60-19.diff.gz | patch -p1 || exit -zcat $CWD/net-tools.diff.gz | patch -p1 || exit +rm -rf net-tools-1.60.20120726git +tar xvf $CWD/net-tools-1.60.20120726git.tar.xz +cd net-tools-1.60.20120726git +zcat $CWD/net-tools.config.h.gz > config.h make make hostname strip hostname @@ -209,7 +221,7 @@ rm -rf adjtimex-$ADJTIMEXVERS tar xvf $CWD/adjtimex_${ADJTIMEXVERS}.orig.tar.gz || exit 1 cd adjtimex-$ADJTIMEXVERS || exit 1 chown -R root:root . -zcat $CWD/adjtimex_1.23-1.diff.gz | patch -p1 || exit 1 +zcat $CWD/adjtimex_1.29-2.2.diff.gz | patch -p1 || exit 1 CFLAGS=-O2 ./configure --prefix=/usr || exit 1 make || exit 1 strip adjtimex |