Merge changes from CUPS 1.5svn-r9000.

[thirdparty/cups.git] / cups / i18n.h

diff --git a/cups/i18n.h b/cups/i18n.h
index 58de0eae5ddf65af99581366ddba6d7b4d6166f1..bc6e779b0c17417f57ab9d4b443b97058cda0b95 100644 (file)
--- a/cups/i18n.h
+++ b/cups/i18n.h
@@ -1,25 +1,16 @@
 /*
- * "$Id: i18n.h 5366 2006-04-02 16:11:04Z mike $"
+ * "$Id: i18n.h 7363 2008-03-03 22:19:24Z mike $"
  *
  *   (Private) localization support for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007-2008 by Apple Inc.
  *   Copyright 1997-2006 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.
  */
@@ -91,20 +82,27 @@ typedef struct _cups_vmap_s         /**** VBCS Charmap Struct ****/
  * Prototypes...
  */
 
+#  ifdef __APPLE__
+extern const char      *_cupsAppleLanguage(const char *locale, char *language,
+                                           size_t langsize);
+#  endif /* __APPLE__ */
 extern void            _cupsCharmapFlush(void);
 extern void            _cupsCharmapFree(const cups_encoding_t encoding);
 extern void            *_cupsCharmapGet(const cups_encoding_t encoding);
 extern const char      *_cupsEncodingName(cups_encoding_t encoding);
+extern void            _cupsLangPrintError(const char *message);
 extern int             _cupsLangPrintf(FILE *fp, const char *message, ...)
-#    ifdef __GNUC__
+#  ifdef __GNUC__
 __attribute__ ((__format__ (__printf__, 2, 3)))
-#    endif /* __GNUC__ */
+#  endif /* __GNUC__ */
 ;
 extern int             _cupsLangPuts(FILE *fp, const char *message);
 extern const char      *_cupsLangString(cups_lang_t *lang, const char *message);
 extern void            _cupsMessageFree(cups_array_t *a);
-extern cups_array_t    *_cupsMessageLoad(const char *filename);
+extern cups_array_t    *_cupsMessageLoad(const char *filename, int unquote);
 extern const char      *_cupsMessageLookup(cups_array_t *a, const char *m);
+extern void            _cupsSetLocale(char *argv[]);
+
 
 #  ifdef __cplusplus
 }
@@ -113,5 +111,5 @@ extern const char   *_cupsMessageLookup(cups_array_t *a, const char *m);
 #endif /* !_CUPS_I18N_H_ */
 
 /*
- * End of "$Id: i18n.h 5366 2006-04-02 16:11:04Z mike $".
+ * End of "$Id: i18n.h 7363 2008-03-03 22:19:24Z mike $".
  */