Merge branch 'master' of ssh://tonvoon@nagiosplug.git.sourceforge.net/gitroot/nagiosp...

[nagiosplug.git] / plugins / check_ntp_time.c

diff --git a/plugins/check_ntp_time.c b/plugins/check_ntp_time.c
index c7c7a754ca3b82409eb0c25fde9c22d0295597b1..f0f74b4e99298a5fb4dd3fadc983e4eafb09111b 100644 (file)
--- a/plugins/check_ntp_time.c
+++ b/plugins/check_ntp_time.c
@@ -600,17 +600,17 @@ void print_help(void){
        printf ("\n\n");
 
        print_usage();
-       printf (_(UT_HELP_VRSN));
-       printf (_(UT_EXTRA_OPTS));
-       printf (_(UT_HOST_PORT), 'p', "123");
+       printf (UT_HELP_VRSN);
+       printf (UT_EXTRA_OPTS);
+       printf (UT_HOST_PORT, 'p', "123");
        printf (" %s\n", "-q, --quiet");
        printf ("    %s\n", _("Returns UNKNOWN instead of CRITICAL if offset cannot be found"));
        printf (" %s\n", "-w, --warning=THRESHOLD");
        printf ("    %s\n", _("Offset to result in warning status (seconds)"));
        printf (" %s\n", "-c, --critical=THRESHOLD");
        printf ("    %s\n", _("Offset to result in critical status (seconds)"));
-       printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
-       printf (_(UT_VERBOSE));
+       printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+       printf (UT_VERBOSE);
 
        printf("\n");
        printf("%s\n", _("This plugin checks the clock offset between the local host and a"));
@@ -622,23 +622,19 @@ void print_help(void){
        printf(" %s\n", _("If you'd rather want to monitor an NTP server, please use"));
        printf(" %s\n", _("check_ntp_peer."));
        printf("\n");
-       printf(_(UT_THRESHOLDS_NOTES));
-#ifdef NP_EXTRA_OPTS
-       printf("\n");
-       printf(_(UT_EXTRA_OPTS_NOTES));
-#endif
+       printf(UT_THRESHOLDS_NOTES);
 
        printf("\n");
        printf("%s\n", _("Examples:"));
        printf("  %s\n", ("./check_ntp_time -H ntpserv -w 0.5 -c 1"));
 
-       printf (_(UT_SUPPORT));
+       printf (UT_SUPPORT);
 }
 
 void
 print_usage(void)
 {
-       printf (_("Usage:"));
+       printf ("%s\n", _("Usage:"));
        printf(" %s -H <host> [-w <warn>] [-c <crit>] [-v verbose]\n", progname);
 }