Merge changes from CUPS 1.4svn-r8131.

[thirdparty/cups.git] / cups / language.c

diff --git a/cups/language.c b/cups/language.c
index 5f20831086968b7a4b3632235f002b561da8fc76..644fc635470e16e0cfc916789ee6e0459bc5b09f 100644 (file)
--- a/cups/language.c
+++ b/cups/language.c
@@ -134,7 +134,8 @@ static const char * const lang_encodings[] =
                          "unknown",            "unknown",
                          "unknown",            "unknown",
                          "euc-cn",             "euc-jp",
-                         "euc-kr",             "euc-tw"
+                         "euc-kr",             "euc-tw",
+                         "jis-x0213"
                        };
 
 #ifdef __APPLE__
@@ -423,7 +424,8 @@ cupsLangGet(const char *language)   /* I - Language or locale */
                  "",           "",             "",             "",
                  "",           "",             "",             "",
 
-                 "EUCCN",      "EUCJP",        "EUCKR",        "EUCTW"
+                 "EUCCN",      "EUCJP",        "EUCKR",        "EUCTW",
+                 "SHIFT_JISX0213"
                };