summaryrefslogtreecommitdiff
path: root/ppdc/ppdmerge.cxx
diff options
context:
space:
mode:
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2009-02-17 19:24:29 +0000
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2009-02-17 19:24:29 +0000
commitf0ab5bff8ab3f7b00619675b806b1f01294a3f6a (patch)
tree2c9d51f5a4af79a28e10dc990e323efaddb5c555 /ppdc/ppdmerge.cxx
parentbf3816c7edd01247b850a12e52856819190b66fd (diff)
downloadcups-f0ab5bff8ab3f7b00619675b806b1f01294a3f6a.tar.gz
Merge changes from CUPS 1.4svn-r8362.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1228 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'ppdc/ppdmerge.cxx')
-rw-r--r--ppdc/ppdmerge.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/ppdc/ppdmerge.cxx b/ppdc/ppdmerge.cxx
index 00bb181b6..34e212d85 100644
--- a/ppdc/ppdmerge.cxx
+++ b/ppdc/ppdmerge.cxx
@@ -96,7 +96,7 @@ main(int argc, // I - Number of command-line arguments
// Open and load the PPD file...
if ((infile = cupsFileOpen(argv[i], "r")) == NULL)
{
- _cupsLangPrintf(stderr, _("%s: Unable to open %s - %s\n"), "ppdmerge",
+ _cupsLangPrintf(stderr, _("%s: Unable to open %s: %s\n"), "ppdmerge",
argv[i], strerror(errno));
return (1);
}
@@ -110,8 +110,8 @@ main(int argc, // I - Number of command-line arguments
status = ppdLastError(&linenum);
- _cupsLangPrintf(stderr, _("%s: Unable to open %s - %s on line %d.\n"),
- "ppdmerge", argv[i], ppdErrorString(status), linenum);
+ _cupsLangPrintf(stderr, _("%s: Unable to open PPD file: %s on line %d.\n"),
+ "ppdmerge", ppdErrorString(status), linenum);
_cupsLangPrintf(stderr, "%d: ", linenum);
cupsFileRewind(infile);