Merge changes from 1.4.0 (r8743)

[thirdparty/cups.git] / filter / gziptoany.c

diff --git a/filter/gziptoany.c b/filter/gziptoany.c
index 0fa4b9a1eb9c7164b901e0e963b6a6dbfa5ee0b4..0c9e7938d1f5d2655266a2dc04ac1a5b06af2448 100644 (file)
--- a/filter/gziptoany.c
+++ b/filter/gziptoany.c
@@ -1,25 +1,16 @@
 /*
- * "$Id: gziptoany.c 6400 2007-03-26 14:29:40Z mike $"
+ * "$Id: gziptoany.c 6649 2007-07-11 21:46:42Z mike $"
  *
  *   GZIP/raw pre-filter for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *
@@ -34,6 +25,7 @@
 
 #include <cups/file.h>
 #include <cups/string.h>
+#include <cups/i18n.h>
 #include <stdlib.h>
 #include <errno.h>
 
@@ -58,7 +50,8 @@ main(int  argc,                               /* I - Number of command-line arguments */
 
   if (argc != 7)
   {
-    fputs("ERROR: gziptoany job-id user title copies options file\n", stderr);
+    fprintf(stderr, _("Usage: %s job-id user title copies options file\n"),
+            argv[0]);
     return (1);
   }
 
@@ -78,7 +71,7 @@ main(int  argc,                               /* I - Number of command-line arguments */
 
   if ((fp = cupsFileOpen(argv[6], "r")) == NULL)
   {
-    fprintf(stderr, "ERROR: Unable to open file \"%s\": %s\n", argv[6],
+    fprintf(stderr, _("ERROR: Unable to open file \"%s\": %s\n"), argv[6],
             strerror(errno));
     return (1);
   }
@@ -100,7 +93,7 @@ main(int  argc,                              /* I - Number of command-line arguments */
       if (fwrite(buffer, 1, bytes, stdout) < bytes)
       {
        fprintf(stderr,
-               "ERROR: Unable to write uncompressed document data: %s\n",
+               _("ERROR: Unable to write uncompressed document data: %s\n"),
                strerror(ferror(stdout)));
        cupsFileClose(fp);
 
@@ -121,5 +114,5 @@ main(int  argc,                             /* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: gziptoany.c 6400 2007-03-26 14:29:40Z mike $".
+ * End of "$Id: gziptoany.c 6649 2007-07-11 21:46:42Z mike $".
  */