From: Phil Blundell Date: Sun, 18 Apr 1999 20:28:38 +0000 (+0000) Subject: Minor textual updates/corrections X-Git-Tag: v1.60~103 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d33bfdd2e761f3c61ee5d5056a4eae6c78e27fa2;p=platform%2Fupstream%2Fnet-tools.git Minor textual updates/corrections --- diff --git a/hostname.c b/hostname.c index 3c31110..2d3f116 100644 --- a/hostname.c +++ b/hostname.c @@ -237,9 +237,9 @@ static void usage(void) #if HAVE_AFDECnet fprintf(stderr, _(" -n, --node DECnet node name\n")); #endif /* HAVE_AFDECnet */ - fprintf(stderr, _(" -F, --file read hostname or nis domainname from given File\n\n")); - fprintf(stderr, _(" This comand can get or set the hostname or the NIS domainname. You can\n")); - fprintf(stderr, _(" also get the DNS domain or the FQDN (fully qualified domain name).\n")); + fprintf(stderr, _(" -F, --file read hostname or NIS domainname from given file\n\n")); + fprintf(stderr, _(" This comand can read or set the hostname or the NIS domainname. You can\n")); + fprintf(stderr, _(" also read the DNS domain or the FQDN (fully qualified domain name).\n")); fprintf(stderr, _(" Unless you are using bind or NIS for host lookups you can change the\n")); fprintf(stderr, _(" FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n")); fprintf(stderr, _(" part of the FQDN) in the /etc/hosts file.\n")); diff --git a/ifconfig.c b/ifconfig.c index d81228e..2a9d781 100644 --- a/ifconfig.c +++ b/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.30 1999/04/04 21:37:01 philip Exp $ + * Version: $Id: ifconfig.c,v 1.31 1999/04/18 20:28:39 philip Exp $ * * Author: Fred N. van Kempen, * and others. Copyright 1993 MicroWalt Corporation @@ -429,7 +429,7 @@ static void usage(void) #endif #if HAVE_AFINET fprintf(stderr, _(" [[-]broadcast [
]] [[-]pointopoint [
]]\n")); - fprintf(stderr, _(" [netmask
] [dstaddr
] [tunnel ]\n")); + fprintf(stderr, _(" [netmask
] [dstaddr
] [tunnel
]\n")); #endif #ifdef SIOCSKEEPALIVE fprintf(stderr, _(" [outfill ] [keepalive ]\n")); @@ -439,7 +439,7 @@ static void usage(void) fprintf(stderr, _(" [multicast] [[-]promisc]\n")); fprintf(stderr, _(" [mem_start ] [io_addr ] [irq ] [media ]\n")); #ifdef HAVE_TXQUEUELEN - fprintf(stderr, _(" [txqueuelen len]\n")); + fprintf(stderr, _(" [txqueuelen ]\n")); #endif #ifdef HAVE_DYNAMIC fprintf(stderr, _(" [[-]dynamic]\n")); diff --git a/lib/af.c b/lib/af.c index 84dcd21..0a23605 100644 --- a/lib/af.c +++ b/lib/af.c @@ -2,7 +2,7 @@ * lib/af.c This file contains the top-level part of the protocol * support functions module for the NET-2 base distribution. * - * Version: $Id: af.c,v 1.10 1999/01/05 20:53:18 philip Exp $ + * Version: $Id: af.c,v 1.11 1999/04/18 20:28:42 philip Exp $ * * Author: Fred N. van Kempen, * Copyright 1993 MicroWalt Corporation @@ -95,6 +95,7 @@ extern struct aftype netrom_aftype; extern struct aftype ipx_aftype; extern struct aftype ddp_aftype; extern struct aftype ec_aftype; +extern struct aftype rose_aftype; static short sVafinit = 0; @@ -115,6 +116,9 @@ struct aftype *aftypes[] = #if HAVE_AFNETROM &netrom_aftype, #endif +#if HAVE_AFROSE + &rose_aftype, +#endif #if HAVE_AFIPX &ipx_aftype, #endif @@ -147,7 +151,7 @@ void afinit() netrom_aftype.title = _("AMPR NET/ROM"); #endif #if HAVE_AFIPX - ipx_aftype.title = _("IPX"); + ipx_aftype.title = _("Novell IPX"); #endif #if HAVE_AFATALK ddp_aftype.title = _("Appletalk DDP"); @@ -155,6 +159,9 @@ void afinit() #if HAVE_AFECONET ec_aftype.title = _("Econet"); #endif +#if HAVE_AFROSE + rose_aftype.title = _("AMPR ROSE"); +#endif sVafinit = 1; } diff --git a/lib/hw.c b/lib/hw.c index 30710fe..e0fd331 100644 --- a/lib/hw.c +++ b/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.11 1999/03/03 19:40:38 philip Exp $ + * Version: $Id: hw.c,v 1.12 1999/04/18 20:28:43 philip Exp $ * * Maintainer: Bernd 'eckes' Eckenfels, * @@ -90,6 +90,9 @@ static struct hwtype *hwtypes[] = #if HAVE_HWNETROM &netrom_hwtype, #endif +#if HAVE_HWROSE + &rose_hwtype, +#endif #if HAVE_HWTUNNEL &tunnel_hwtype, #endif @@ -110,9 +113,6 @@ static struct hwtype *hwtypes[] = #if HAVE_HWSIT &sit_hwtype, #endif -#if HAVE_HWROSE - &rose_hwtype, -#endif #if HAVE_HWFDDI &fddi_hwtype, #endif diff --git a/lib/tr.c b/lib/tr.c index e7fc55b..ed8ae09 100644 --- a/lib/tr.c +++ b/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.3 1998/11/15 20:12:25 freitag Exp $ + * Version: $Id: tr.c,v 1.4 1999/04/18 20:28:43 philip Exp $ * * Author: Fred N. van Kempen, * Copyright 1993 MicroWalt Corporation @@ -129,7 +129,7 @@ static int in_tr(char *bufp, struct sockaddr *sap) struct hwtype tr_hwtype = { - "tr", "16/4 Mbps TR", ARPHRD_IEEE802, TR_ALEN, + "tr", "16/4 Mbps Token Ring", ARPHRD_IEEE802, TR_ALEN, pr_tr, pr_str, in_tr, NULL }; diff --git a/netstat.c b/netstat.c index 7770690..fddc5cb 100644 --- a/netstat.c +++ b/netstat.c @@ -6,7 +6,7 @@ * NET-3 Networking Distribution for the LINUX operating * system. * - * Version: $Id: netstat.c,v 1.25 1999/03/24 09:49:52 philip Exp $ + * Version: $Id: netstat.c,v 1.26 1999/04/18 20:28:40 philip Exp $ * * Authors: Fred Baumgarten, * Fred N. van Kempen, @@ -1418,13 +1418,13 @@ static void usage(void) fprintf(stderr, _(" -v, --verbose be verbose\n")); fprintf(stderr, _(" -n, --numeric dont resolve names\n")); fprintf(stderr, _(" -N, --symbolic resolve hardware names\n")); - fprintf(stderr, _(" -e, --extend display other/more informations\n")); + fprintf(stderr, _(" -e, --extend display other/more information\n")); fprintf(stderr, _(" -p, --programs display PID/Program name for sockets\n")); fprintf(stderr, _(" -c, --continuous continuous listing\n\n")); fprintf(stderr, _(" -l, --listening display listening server sockets\n")); fprintf(stderr, _(" -a, --all, --listening display all sockets (default: connected)\n")); fprintf(stderr, _(" -o, --timers display timers\n")); - fprintf(stderr, _(" -F, --fib display Forwarding Infomation Base (default)\n")); + fprintf(stderr, _(" -F, --fib display Forwarding Information Base (default)\n")); fprintf(stderr, _(" -C, --cache display routing cache instead of FIB\n\n")); fprintf(stderr, _(" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --netrom\n")); diff --git a/po/net-tools.pot b/po/net-tools.pot index e69d70b..1452469 100644 --- a/po/net-tools.pot +++ b/po/net-tools.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-04-18 20:58+0100\n" +"POT-Creation-Date: 1999-04-18 21:39+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -347,17 +347,18 @@ msgstr "" #: ../hostname.c:240 msgid "" -" -F, --file read hostname or nis domainname from given File\n" +" -F, --file read hostname or NIS domainname from given file\n" "\n" msgstr "" #: ../hostname.c:241 msgid "" -" This comand can get or set the hostname or the NIS domainname. You can\n" +" This comand can read or set the hostname or the NIS domainname. You can\n" msgstr "" #: ../hostname.c:242 -msgid " also get the DNS domain or the FQDN (fully qualified domain name).\n" +msgid "" +" also read the DNS domain or the FQDN (fully qualified domain name).\n" msgstr "" #: ../hostname.c:243 @@ -652,7 +653,7 @@ msgid " [[-]broadcast [
]] [[-]pointopoint [
]]\n" msgstr "" #: ../ifconfig.c:432 -msgid " [netmask
] [dstaddr
] [tunnel ]\n" +msgid " [netmask
] [dstaddr
] [tunnel
]\n" msgstr "" #: ../ifconfig.c:435 @@ -676,7 +677,7 @@ msgid " [mem_start ] [io_addr ] [irq ] [media ]\n" msgstr "" #: ../ifconfig.c:442 -msgid " [txqueuelen len]\n" +msgid " [txqueuelen ]\n" msgstr "" #: ../ifconfig.c:445 @@ -1039,7 +1040,7 @@ msgid " -N, --symbolic resolve hardware names\n" msgstr "" #: ../netstat.c:1421 ../route.c:88 -msgid " -e, --extend display other/more informations\n" +msgid " -e, --extend display other/more information\n" msgstr "" #: ../netstat.c:1422 @@ -1067,7 +1068,7 @@ msgstr "" #: ../netstat.c:1427 ../route.c:89 msgid "" -" -F, --fib display Forwarding Infomation Base " +" -F, --fib display Forwarding Information Base " "(default)\n" msgstr "" @@ -1704,51 +1705,55 @@ msgstr "" msgid "Cannot change line discipline to `%s'.\n" msgstr "" -#: ../lib/af.c:133 ../lib/hw.c:131 +#: ../lib/af.c:137 ../lib/hw.c:131 msgid "UNSPEC" msgstr "" -#: ../lib/af.c:135 +#: ../lib/af.c:139 msgid "UNIX Domain" msgstr "" -#: ../lib/af.c:138 +#: ../lib/af.c:142 msgid "DARPA Internet" msgstr "" -#: ../lib/af.c:141 +#: ../lib/af.c:145 msgid "IPv6" msgstr "" -#: ../lib/af.c:144 ../lib/hw.c:152 +#: ../lib/af.c:148 ../lib/hw.c:152 msgid "AMPR AX.25" msgstr "" -#: ../lib/af.c:147 ../lib/hw.c:158 +#: ../lib/af.c:151 ../lib/hw.c:158 msgid "AMPR NET/ROM" msgstr "" -#: ../lib/af.c:150 -msgid "IPX" +#: ../lib/af.c:154 +msgid "Novell IPX" msgstr "" -#: ../lib/af.c:153 +#: ../lib/af.c:157 msgid "Appletalk DDP" msgstr "" -#: ../lib/af.c:156 +#: ../lib/af.c:160 msgid "Econet" msgstr "" -#: ../lib/af.c:214 +#: ../lib/af.c:163 ../lib/hw.c:155 +msgid "AMPR ROSE" +msgstr "" + +#: ../lib/af.c:221 msgid "Please don't supply more than one address family.\n" msgstr "" -#: ../lib/af.c:275 +#: ../lib/af.c:282 msgid "Too much address family arguments.\n" msgstr "" -#: ../lib/af.c:286 +#: ../lib/af.c:293 #, c-format msgid "Unknown address family `%s'.\n" msgstr "" @@ -1900,10 +1905,6 @@ msgstr "" msgid "HIPPI" msgstr "" -#: ../lib/hw.c:155 -msgid "AMPR ROSE" -msgstr "" - #: ../lib/hw.c:161 msgid "IPIP Tunnel" msgstr "" diff --git a/route.c b/route.c index 2f98e78..e6115a7 100644 --- a/route.c +++ b/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.5 1999/01/09 15:37:35 philip Exp $ + * Version: $Id: route.c,v 1.6 1999/04/18 20:28:41 philip Exp $ * * Maintainer: Bernd 'eckes' Eckenfels, * @@ -85,8 +85,8 @@ static void usage(void) fprintf(stderr, _(" -v, --verbose be verbose\n")); fprintf(stderr, _(" -n, --numeric dont resolve names\n")); fprintf(stderr, _(" -N, --symbolic resolve hardware names\n")); - fprintf(stderr, _(" -e, --extend display other/more informations\n")); - fprintf(stderr, _(" -F, --fib display Forwarding Infomation Base (default)\n")); + fprintf(stderr, _(" -e, --extend display other/more information\n")); + fprintf(stderr, _(" -F, --fib display Forwarding Information Base (default)\n")); fprintf(stderr, _(" -C, --cache display routing cache instead of FIB\n\n")); fprintf(stderr, _(" =Use '-A ' or '--' Default: %s\n"), DFLT_AF);