diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-03-23 00:05:29 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-03-23 00:05:29 +0000 |
| commit | 84315f460a5c9eb38f7fcc4204acf98ed2b29406 (patch) | |
| tree | 13135924a24fee3f340569f7cd39e00d087dced9 /berkeley | |
| parent | 82f972324ddde683be8a6d302f9937532ab0cf81 (diff) | |
| download | cups-84315f460a5c9eb38f7fcc4204acf98ed2b29406.tar.gz | |
Merge changes from CUPS 1.5svn-r9641
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3071 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'berkeley')
| -rw-r--r-- | berkeley/lpq.c | 6 | ||||
| -rw-r--r-- | berkeley/lpr.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/berkeley/lpq.c b/berkeley/lpq.c index 9a4a9ca64..9e3f73d11 100644 --- a/berkeley/lpq.c +++ b/berkeley/lpq.c @@ -3,7 +3,7 @@ * * "lpq" command for CUPS. * - * Copyright 2007-2010 by Apple Inc. + * Copyright 2007-2011 by Apple Inc. * Copyright 1997-2006 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -233,12 +233,12 @@ main(int argc, /* I - Number of command-line arguments */ if (dest && !cupsGetDest(dest, NULL, num_dests, dests)) _cupsLangPrintf(stderr, - _("%s: error - %s environment variable names " + _("%s: Error - %s environment variable names " "non-existent destination \"%s\"."), argv[0], val, dest); else _cupsLangPrintf(stderr, - _("%s: error - no default destination available."), + _("%s: Error - no default destination available."), argv[0]); httpClose(http); cupsFreeDests(num_dests, dests); diff --git a/berkeley/lpr.c b/berkeley/lpr.c index 1bfe11e4d..b71f54fed 100644 --- a/berkeley/lpr.c +++ b/berkeley/lpr.c @@ -3,7 +3,7 @@ * * "lpr" command for CUPS. * - * Copyright 2007-2010 by Apple Inc. + * Copyright 2007-2011 by Apple Inc. * Copyright 1997-2007 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -150,7 +150,7 @@ main(int argc, /* I - Number of command-line arguments */ if (i >= argc) { _cupsLangPrintf(stderr, - _("%s: error - expected option=value after " + _("%s: Error - expected option=value after " "\"-o\" option."), argv[0]); return (1); } @@ -237,7 +237,7 @@ main(int argc, /* I - Number of command-line arguments */ if (i >= argc) { _cupsLangPrintf(stderr, - _("%s: Error - expected copy count after " + _("%s: Error - expected copies after " "\"-#\" option."), argv[0]); return (1); } @@ -284,7 +284,7 @@ main(int argc, /* I - Number of command-line arguments */ if (access(argv[i], R_OK) != 0) { _cupsLangPrintf(stderr, - _("%s: Error - unable to access \"%s\" - %s."), + _("%s: Error - unable to access \"%s\" - %s"), argv[0], argv[i], strerror(errno)); return (1); } |