Fix translations when extra-opts aren't enabled

[nagiosplug.git] / plugins / check_ntp.c

diff --git a/plugins/check_ntp.c b/plugins/check_ntp.c
index 20ecf64fecadd44789f52a9a63adec270f43f0c4..35fddec9038f00888805b78970ddea99c0190b54 100644 (file)
--- a/plugins/check_ntp.c
+++ b/plugins/check_ntp.c
@@ -6,8 +6,6 @@
 * Copyright (c) 2006 Sean Finney <seanius@seanius.net>
 * Copyright (c) 2006-2008 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_ntp plugin
@@ -29,12 +27,10 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * 
-* $Id$
 * 
 *****************************************************************************/
 
 const char *progname = "check_ntp";
-const char *revision = "$Revision$";
 const char *copyright = "2006-2008";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
@@ -682,7 +678,7 @@ int process_arguments(int argc, char **argv){
                        exit(STATE_OK);
                        break;
                case 'V':
-                       print_revision(progname, revision);
+                       print_revision(progname, NP_VERSION);
                        exit(STATE_OK);
                        break;
                case 'v':
@@ -836,7 +832,7 @@ int main(int argc, char *argv[]){
 
 
 void print_help(void){
-       print_revision(progname, revision);
+       print_revision(progname, NP_VERSION);
 
        printf ("Copyright (c) 2006 Sean Finney\n");
        printf (COPYRIGHT, copyright, email);
@@ -846,9 +842,9 @@ 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", "-w, --warning=THRESHOLD");
        printf ("    %s\n", _("Offset to result in warning status (seconds)"));
        printf (" %s\n", "-c, --critical=THRESHOLD");
@@ -857,15 +853,15 @@ void print_help(void){
        printf ("    %s\n", _("Warning threshold for jitter"));
        printf (" %s\n", "-k, --jcrit=THRESHOLD");
        printf ("    %s\n", _("Critical threshold for jitter"));
-       printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
-       printf (_(UT_VERBOSE));
+       printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+       printf (UT_VERBOSE);
 
        printf("\n");
        printf("%s\n", _("Notes:"));
-       printf(_(UT_THRESHOLDS_NOTES));
+       printf(UT_THRESHOLDS_NOTES);
 #ifdef NP_EXTRA_OPTS
        printf("\n");
-       printf(_(UT_EXTRA_OPTS_NOTES));
+       printf(UT_EXTRA_OPTS_NOTES);
 #endif
 
        printf("\n");
@@ -877,17 +873,17 @@ void print_help(void){
        printf(" %s\n", _("(See Notes above for more details on thresholds formats):"));
        printf("  %s\n", ("./check_ntp -H ntpserv -w 0.5 -c 1 -j -1:100 -k -1:200"));
 
-       printf (_(UT_SUPPORT));
+       printf (UT_SUPPORT);
 
        printf ("%s\n", _("WARNING: check_ntp is deprecated. Please use check_ntp_peer or"));
-       printf ("%s\n\n", _("check_ntp_time istead."));
+       printf ("%s\n\n", _("check_ntp_time instead."));
 }
 
 void
 print_usage(void)
 {
        printf ("%s\n", _("WARNING: check_ntp is deprecated. Please use check_ntp_peer or"));
-       printf ("%s\n\n", _("check_ntp_time istead."));
+       printf ("%s\n\n", _("check_ntp_time instead."));
        printf (_("Usage:"));
        printf(" %s -H <host> [-w <warn>] [-c <crit>] [-j <warn>] [-k <crit>] [-v verbose]\n", progname);
 }