first pass at standardization of messages for the localization

[nagiosplug.git] / plugins / check_hpjd.c

diff --git a/plugins/check_hpjd.c b/plugins/check_hpjd.c
index 8d3f4c80fd9afd278c8dbde68f6e40c3a55d7ee8..5699570c08e8a064bfb2dd259a0f8df54e3c2536 100644 (file)
--- a/plugins/check_hpjd.c
+++ b/plugins/check_hpjd.c
@@ -84,7 +84,7 @@ main (int argc, char **argv)
        textdomain (PACKAGE);
 
        if (process_arguments (argc, argv) != OK)
-               usage (_("Invalid command arguments supplied\n"));
+               usage (_("Incorrect arguments supplied\n"));
 
        /* removed ' 2>1' at end of command 10/27/1999 - EG */
        /* create the query string */
@@ -103,7 +103,7 @@ main (int argc, char **argv)
                 HPJD_GD_DOOR_OPEN, HPJD_GD_PAPER_OUTPUT, HPJD_GD_STATUS_DISPLAY);
 
        /* get the command to run */
-       sprintf (command_line, "%s -m : -v 1 -c %s %s %s", PATH_TO_SNMPGET, community, 
+       sprintf (command_line, "%s -OQa -m : -v 1 -c %s %s %s", PATH_TO_SNMPGET, community, 
                                                                        address, query_string);
 
        /* run the command */
@@ -321,7 +321,7 @@ process_arguments (int argc, char **argv)
                                address = strscpy(address, optarg) ;
                        }
                        else {
-                               usage (_("Invalid host name\n"));
+                               usage2 (_("Invalid host name"), optarg);
                        }
                        break;
                case 'C':                                                                       /* community */
@@ -344,7 +344,7 @@ process_arguments (int argc, char **argv)
                        address = argv[c++];
                }
                else {
-                       usage (_("Invalid host name"));
+                       usage2 (_("Invalid host name"), argv[c]);
                }
        }
        
@@ -378,8 +378,8 @@ print_help (void)
 {
        print_revision (progname, revision);
 
-       printf (_("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n"));
-       printf (_(COPYRIGHT), copyright, email);
+       printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
+       printf (COPYRIGHT, copyright, email);
 
        printf (_("\
 This plugin tests the STATUS of an HP printer with a JetDirect card.\n\