From b2bfd4555a535ca0389ea3d89154ed1d27f1ac3b Mon Sep 17 00:00:00 2001 From: Benoit Mortier Date: Wed, 14 Jun 2006 21:27:38 +0000 Subject: [PATCH] updating the help and usage for localization git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1427 f882894a-f735-0410-b71e-b25c423dba1c --- plugins/check_dns.c | 12 ++++---- plugins/check_dummy.c | 6 ++-- plugins/check_fping.c | 71 ++++++++++--------------------------------- plugins/check_game.c | 35 +++++++++------------ 4 files changed, 38 insertions(+), 86 deletions(-) diff --git a/plugins/check_dns.c b/plugins/check_dns.c index 3b94a7a..081741a 100644 --- a/plugins/check_dns.c +++ b/plugins/check_dns.c @@ -398,15 +398,16 @@ print_help (void) printf ("Copyright (c) 1999 Ethan Galstad \n"); printf (COPYRIGHT, copyright, email); - printf (_("This plugin uses the nslookup program to obtain the IP address for the given host/domain query.")); - printf ("\n"); - printf (_("An optional DNS server to use may be specified.")); - printf ("\n"); - printf (_("If no DNS server is specified, the default server(s) specified in /etc/resolv.conf will be used.")); + printf ("%s\n", _("This plugin uses the nslookup program to obtain the IP address for the given host/domain query.")); + printf ("%s\n", _("An optional DNS server to use may be specified.")); + printf ("%s\n", _("If no DNS server is specified, the default server(s) specified in /etc/resolv.conf will be used.")); + printf ("\n\n"); print_usage (); + printf (_(UT_HELP_VRSN)); + printf (" -H, --hostname=HOST\n"); printf (" %s\n", _("The name or address you want to query")); printf (" -s, --server=HOST\n"); @@ -429,6 +430,5 @@ void print_usage (void) { printf (_("Usage:")); - printf ("%s -H host [-s server] [-a expected-address] [-A] [-t timeout] [-w warn] [-c crit]\n", progname); } diff --git a/plugins/check_dummy.c b/plugins/check_dummy.c index 0a7f472..af7f8a3 100644 --- a/plugins/check_dummy.c +++ b/plugins/check_dummy.c @@ -90,11 +90,9 @@ print_help (void) printf ("Copyright (c) 1999 Ethan Galstad \n"); printf (COPYRIGHT, copyright, email); - printf (_("This plugin will simply return the state corresponding to the numeric value")); + printf ("%s\n", _("This plugin will simply return the state corresponding to the numeric value")); - printf ("\n"); - - printf (_("of the argument with optional text")); + printf ("%s\n", _("of the argument with optional text")); printf ("\n\n"); diff --git a/plugins/check_fping.c b/plugins/check_fping.c index 49615d1..cdaff97 100644 --- a/plugins/check_fping.c +++ b/plugins/check_fping.c @@ -356,11 +356,9 @@ print_help (void) printf ("Copyright (c) 1999 Didi Rieder \n"); printf (COPYRIGHT, copyright, email); - printf (_("This plugin will use the fping command to ping the specified host for a fast check")); + printf ("%s\n", _("This plugin will use the fping command to ping the specified host for a fast check")); - printf ("\n"); - - printf (_("Note that it is necessary to set the suid flag on fping.")); + printf ("%s\n", _("Note that it is necessary to set the suid flag on fping.")); printf ("\n\n"); @@ -368,58 +366,21 @@ print_help (void) printf (_(UT_HELP_VRSN)); - printf (" -H, --hostname=HOST"); - - printf (_("name or IP Address of host to ping (IP Address bypasses name lookup, reducing system load)")); - - printf ("\n"); - - printf ("-w, --warning=THRESHOLD"); - - printf ("\n"); - - printf (_("warning threshold pair")); - - printf ("\n"); - - printf (" -c, --critical=THRESHOLD"); - - printf ("\n"); - - printf (_("critical threshold pair")); - - printf ("\n"); - - printf (" -b, --bytes=INTEGER"); - - printf (_("size of ICMP packet (default: %d)"),PACKET_SIZE); - - printf ("\n"); - - printf (" -n, --number=INTEGER"); - - printf ("\n"); - - printf (_("number of ICMP packets to send (default: %d)"),PACKET_COUNT); - - printf ("\n"); - + printf (" %s\n", "-H, --hostname=HOST"); + printf (" %s\n", _("name or IP Address of host to ping (IP Address bypasses name lookup, reducing system load)")); + printf (" %s\n", "-w, --warning=THRESHOLD"); + printf (" %s\n", _("warning threshold pair")); + printf (" %s\n", "-c, --critical=THRESHOLD"); + printf (" %s\n", _("critical threshold pair")); + printf (" %s\n", "-b, --bytes=INTEGER"); + printf (" %s\n", _("size of ICMP packet (default: %d)"),PACKET_SIZE); + printf (" %s\n", "-n, --number=INTEGER"); + printf (" %s\n", _("number of ICMP packets to send (default: %d)"),PACKET_COUNT); printf (_(UT_VERBOSE)); - printf ("\n"); - - printf (_("THRESHOLD is ,%% where is the round trip average travel time (ms)")); - - printf ("\n"); - - printf (_("which triggers a WARNING or CRITICAL state, and is the percentage of")); - - printf ("\n"); - - printf (_("packet loss to trigger an alarm state.")); - - printf ("\n"); - + printf (" %s\n", _("THRESHOLD is ,%% where is the round trip average travel time (ms)")); + printf (" %s\n", _("which triggers a WARNING or CRITICAL state, and is the percentage of")); + printf (" %s\n", _("packet loss to trigger an alarm state.")); printf (_(UT_SUPPORT)); } @@ -428,5 +389,5 @@ void print_usage (void) { printf (_("Usage:")); - printf (" %s \n", progname); + printf (" %s -w limit -c limit [-b size] [-n number]\n", progname); } diff --git a/plugins/check_game.c b/plugins/check_game.c index 9f9ff7d..32f2e6a 100644 --- a/plugins/check_game.c +++ b/plugins/check_game.c @@ -282,37 +282,30 @@ print_help (void) printf (_("This plugin tests game server connections with the specified host.")); - printf ("\n\n"); + printf ("\n\n"); print_usage (); printf (_(UT_HELP_VRSN)); - - printf (_("\ - = Game type that is recognised by qstat (without the leading dash)\n\ - = The IP address of the device you wish to query\n\ - [port] = Optional port of which to connect\n\ - [game_field] = Field number in raw qstat output that contains game name\n\ - [map_field] = Field number in raw qstat output that contains map name\n\ - [ping_field] = Field number in raw qstat output that contains ping time\n")); + + printf (" %s\n", "-p"); + printf (" %s\n", _("Optional port of which to connect")); + printf (" %s\n", "gf"); + printf (" %s\n", _("Field number in raw qstat output that contains game name")); + printf (" %s\n", "-mf"); + printf (" %s\n", _("Field number in raw qstat output that contains map name")); + printf (" %s\n", "-pf"); + printf (" %s\n", _("Field number in raw qstat output that contains ping time")); printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT); - printf (_("Notes:")); - - printf ("\n"); - - printf (_("This plugin uses the 'qstat' command, the popular game server status query tool .")); - - printf ("\n"); + printf ("%s\n", _("Notes:")); - printf (_("If you don't have the package installed, you will need to download it from")); - - printf ("\n"); + printf ("%s\n", _("This plugin uses the 'qstat' command, the popular game server status query tool .")); - printf (_("http://www.activesw.com/people/steve/qstat.html before you can use this plugin.")); + printf ("%s\n", _("If you don't have the package installed, you will need to download it from")); - printf ("\n"); + printf ("%s\n", _("http://www.activesw.com/people/steve/qstat.html before you can use this plugin.")); printf (_(UT_SUPPORT)); } -- 2.30.2