git-notify: Be careful with "--no-merge"

[nagiosplug.git] / plugins / check_nagios.c

diff --git a/plugins/check_nagios.c b/plugins/check_nagios.c
index 954ff711707dfc4402283d1cd7a197fe51af66e1..6485aa9a351fa5d4ba170bf7b385d85c11b19a2a 100644 (file)
--- a/plugins/check_nagios.c
+++ b/plugins/check_nagios.c
@@ -287,8 +287,8 @@ print_help (void)
 
        print_usage ();
 
-       printf (_(UT_HELP_VRSN));
-       printf (_(UT_EXTRA_OPTS));
+       printf (UT_HELP_VRSN);
+       printf (UT_EXTRA_OPTS);
 
        printf (" %s\n", "-F, --filename=FILE");
   printf ("    %s\n", _("Name of the log file to check"));
@@ -296,19 +296,13 @@ print_help (void)
   printf ("    %s\n", _("Minutes aging after which logfile is considered stale"));
   printf (" %s\n", "-C, --command=STRING");
   printf ("    %s\n", _("Substring to search for in process arguments"));
-  printf (_(UT_VERBOSE));
-
-#ifdef NP_EXTRA_OPTS
-  printf ("\n");
-  printf ("%s\n", _("Notes:"));
-  printf (_(UT_EXTRA_OPTS_NOTES));
-#endif
+  printf (UT_VERBOSE);
 
   printf ("\n");
   printf ("%s\n", _("Examples:"));
   printf (" %s\n", "check_nagios -e 5 -F /usr/local/nagios/var/status.log -C /usr/local/nagios/bin/nagios");
 
-  printf (_(UT_SUPPORT));
+  printf (UT_SUPPORT);
 }
 
 
@@ -316,6 +310,6 @@ print_help (void)
 void
 print_usage (void)
 {
-  printf (_("Usage:"));
+  printf ("%s\n", _("Usage:"));
        printf ("%s -F <status log file> -e <expire_minutes> -C <process_string>\n", progname);
 }