From: mike Date: Fri, 18 Apr 2003 13:37:39 +0000 (+0000) Subject: Mirror 1.1.x changes. X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ac098b067e8225c4c391cc1be009f49f4644fa47;p=thirdparty%2Fcups.git Mirror 1.1.x changes. git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@3642 7a7537e8-13f0-0310-91df-b6672ffda945 --- diff --git a/CHANGES-1.1.txt b/CHANGES-1.1.txt index 9a00e987ca..c4a42c2a72 100644 --- a/CHANGES-1.1.txt +++ b/CHANGES-1.1.txt @@ -3,6 +3,11 @@ CHANGES-1.1.txt CHANGES IN CUPS V1.1.19rc2 + - cupsLangGet() now sets the encoding field based on the + trailing charset in the locale name, and doesn't look + for a message catalog in a specific locale.charset + directory. This fixes STR #26 and is more in line + with the CUPS 1.2 implementation. - The configure script now aborts if the "ar" command or compilers cannot be found. - The static cupsimage library was not built by default. diff --git a/cups.list.in b/cups.list.in index ef762c049a..e6f9472154 100644 --- a/cups.list.in +++ b/cups.list.in @@ -1,5 +1,5 @@ # -# "$Id: cups.list.in,v 1.13.2.16 2003/04/18 02:30:19 mike Exp $" +# "$Id: cups.list.in,v 1.13.2.17 2003/04/18 13:37:35 mike Exp $" # # ESP Package Manager (EPM) file list for the Common UNIX Printing # System (CUPS). @@ -208,12 +208,18 @@ d 1700 $CUPS_USER sys $REQUESTS/tmp - # Data files f 0444 root sys $LOCALEDIR/C/cups_C locale/C/cups_C +f 0444 root sys $LOCALEDIR/be/cups_be locale/be/cups_be f 0444 root sys $LOCALEDIR/cs/cups_cs locale/cs/cups_cs f 0444 root sys $LOCALEDIR/de/cups_de locale/de/cups_de f 0444 root sys $LOCALEDIR/en/cups_en locale/en/cups_en +f 0444 root sys $LOCALEDIR/en_US/cups_en_US locale/en/cups_en_US f 0444 root sys $LOCALEDIR/es/cups_es locale/es/cups_es f 0444 root sys $LOCALEDIR/fr/cups_fr locale/fr/cups_fr f 0444 root sys $LOCALEDIR/it/cups_it locale/it/cups_it +f 0444 root sys $LOCALEDIR/ru_RU/cups_ru_RU locale/ru_RU/cups_ru_RU +f 0444 root sys $LOCALEDIR/sv/cups_sv locale/sv/cups_sv +f 0444 root sys $LOCALEDIR/uk/cups_uk locale/uk/cups_uk +f 0444 root sys $LOCALEDIR/uk_UA/cups_uk_UA locale/uk_UA/cups_uk_UA f 0444 root sys $LOCALEDIR/zh_CN/cups_zh_CN locale/zh_CN/cups_zh_CN d 0555 root sys $DATADIR - @@ -399,5 +405,5 @@ f 0444 root sys $AMANDIR/man$MAN8DIR/lpmove.$MAN8EXT man/lpmove.man i 0555 root sys cups cups.sh # -# End of "$Id: cups.list.in,v 1.13.2.16 2003/04/18 02:30:19 mike Exp $". +# End of "$Id: cups.list.in,v 1.13.2.17 2003/04/18 13:37:35 mike Exp $". # diff --git a/cups/language.c b/cups/language.c index 76cccf4dbb..39b541404c 100644 --- a/cups/language.c +++ b/cups/language.c @@ -1,5 +1,5 @@ /* - * "$Id: language.c,v 1.20.2.15 2003/02/04 20:33:44 mike Exp $" + * "$Id: language.c,v 1.20.2.16 2003/04/18 13:37:36 mike Exp $" * * I18N/language support for the Common UNIX Printing System (CUPS). * @@ -41,10 +41,15 @@ #include #include #include +#ifdef WIN32 +# include +#else +# include +#endif /* WIN32 */ #include "string.h" #include "language.h" -#if defined(__APPLE__) +#ifdef __APPLE__ # include static const char *appleLangDefault(void); #endif /* __APPLE__ */ @@ -206,21 +211,63 @@ cupsLangFree(cups_lang_t *lang) /* I - Language to free */ * 'cupsLangGet()' - Get a language. */ -cups_lang_t * /* O - Language data */ -cupsLangGet(const char *language) /* I - Language or locale */ +cups_lang_t * /* O - Language data */ +cupsLangGet(const char *language) /* I - Language or locale */ { - int i, count; /* Looping vars */ - char langname[32], /* Requested language name */ - *langptr, /* Pointer into language name */ - real[32], /* Real language name */ - *realptr, /* Pointer into real language name */ - filename[1024], /* Filename for language locale file */ - *localedir; /* Directory for locale files */ - FILE *fp; /* Language locale file pointer */ - char line[1024]; /* Line from file */ - cups_msg_t msg; /* Message number */ - char *text; /* Message text */ - cups_lang_t *lang; /* Current language... */ + int i, count; /* Looping vars */ + char langname[16], /* Requested language name */ + country[16], /* Country code */ + charset[16], /* Character set */ + *ptr, /* Pointer into language/ */ + real[48], /* Real language name */ + filename[1024], /* Filename for language locale file */ + *localedir; /* Directory for locale files */ + cups_encoding_t encoding; /* Encoding to use */ + FILE *fp; /* Language locale file pointer */ + char line[1024]; /* Line from file */ + cups_msg_t msg; /* Message number */ + char *text; /* Message text */ + cups_lang_t *lang; /* Current language... */ + static const char * const locale_encodings[] = + { /* Locale charset names */ + "ASCII", "ISO8859-1", "ISO8859-2", "ISO8859-3", + "ISO8859-4", "ISO8859-5", "ISO8859-6", "ISO8859-7", + "ISO8859-8", "ISO8859-9", "ISO8859-10", "UTF-8", + "ISO8859-13", "ISO8859-14", "ISO8859-15", "CP874", + "CP1250", "CP1251", "CP1252", "CP1253", + "CP1254", "CP1255", "CP1256", "CP1257", + "CP1258", "KOI8R", "KOI8U", "ISO8859-11", + "ISO8859-16", "", "", "", + + "", "", "", "", + "", "", "", "", + "", "", "", "", + "", "", "", "", + "", "", "", "", + "", "", "", "", + "", "", "", "", + "", "", "", "", + + "CP932", "CP936", "CP949", "CP950", + "CP1361", "", "", "", + "", "", "", "", + "", "", "", "", + "", "", "", "", + "", "", "", "", + "", "", "", "", + "", "", "", "", + + "", "", "", "", + "", "", "", "", + "", "", "", "", + "", "", "", "", + "", "", "", "", + "", "", "", "", + "", "", "", "", + "", "", "", "", + + "EUC-CN", "EUC-JP", "EUC-KR", "EUC-TW" + }; #ifdef __APPLE__ @@ -243,117 +290,116 @@ cupsLangGet(const char *language) /* I - Language or locale */ #endif /* __APPLE__ */ /* - * Convert the language string passed in to a locale string. "C" is the + * Parse the language string passed in to a locale string. "C" is the * standard POSIX locale and is copied unchanged. Otherwise the - * language string is converted from ll-cc (language-country) to ll_cc - * to match the file naming convention used by all POSIX-compliant - * operating systems. + * language string is converted from ll-cc[.charset] (language-country) + * to ll_CC[.CHARSET] to match the file naming convention used by all + * POSIX-compliant operating systems. Invalid language names are mapped + * to the POSIX locale. */ - if (language == NULL || language[0] == '\0' || + country[0] = '\0'; + charset[0] = '\0'; + + if (language == NULL || !language[0] || strcmp(language, "POSIX") == 0) strcpy(langname, "C"); else { /* - * Copy the locale string over safely... + * Copy the parts of the locale string over safely... */ - strlcpy(langname, language, sizeof(langname)); - } - - if (strlen(langname) < 2) - strcpy(real, "C"); - else - { - /* - * Convert the language name to a normalized form, e.g.: - * - * ll[_CC[.charset]] - */ + for (ptr = langname; *language; language ++) + if (*language == '_' || *language == '-') + { + language ++; + break; + } + else if (ptr < (langname + sizeof(langname) - 1)) + *ptr++ = tolower(*language); - real[0] = tolower(langname[0]); - real[1] = tolower(langname[1]); - realptr = real + 2; - langptr = langname + 2; + *ptr = '\0'; - if (*langptr == '_' || *langptr == '-') - { - /* - * Add country code... - */ + for (ptr = country; *language; language ++) + if (*language == '.') + { + language ++; + break; + } + else if (ptr < (country + sizeof(country) - 1)) + *ptr++ = toupper(*language); - *realptr++ = '_'; - langptr ++; + *ptr = '\0'; - *realptr++ = toupper(*langptr++); - *realptr++ = toupper(*langptr++); - } + for (ptr = charset; *language; language ++) + if (ptr < (charset + sizeof(charset) - 1)) + *ptr++ = toupper(*language); - if (*langptr == '.') - { - /* - * Add charset... - */ + *ptr = '\0'; - *langptr++ = '\0'; - *realptr++ = '.'; + /* + * Force a POSIX locale for an invalid language name... + */ - while (*langptr) - { - if ((realptr - real) < (sizeof(real) - 1) && - *langptr != '-' && *langptr != '_') - *realptr++ = tolower(*langptr++); - else - langptr ++; - } + if (strlen(langname) != 2) + { + strcpy(langname, "C"); + country[0] = '\0'; + charset[0] = '\0'; } - - *realptr = '\0'; } /* - * See if we already have this language loaded... + * Figure out the desired encoding... */ - for (lang = lang_cache; lang != NULL; lang = lang->next) - if (strcmp(lang->language, langname) == 0) - { - lang->used ++; + encoding = CUPS_US_ASCII; - return (lang); + for (i = 0; i < (int)(sizeof(locale_encodings) / sizeof(locale_encodings[0])); i ++) + if (!strcmp(charset, locale_encodings[i])) + { + encoding = (cups_encoding_t)i; + break; } - /* - * Next try to open a locale file; we will try the charset-localized - * file first, then the country-localized file, and finally look for - * a generic language file. If all else fails we will use the POSIX - * locale. + * Now find the message catalog for this locale... */ if ((localedir = getenv("LOCALEDIR")) == NULL) localedir = CUPS_LOCALEDIR; - do + snprintf(filename, sizeof(filename), "%s/%s_%s/cups_%s_%s", localedir, + langname, country, langname, country); + if (!access(filename, 0)) + snprintf(real, sizeof(real), "%s_%s", langname, country); + else { snprintf(filename, sizeof(filename), "%s/%s/cups_%s", localedir, - real, real); + langname, langname); + if (!access(filename, 0)) + strcpy(real, langname); + else + strcpy(real, "C"); + } - if ((fp = fopen(filename, "r")) == NULL) + /* + * See if we already have this language loaded... + */ + + for (lang = lang_cache; lang != NULL; lang = lang->next) + if (!strcmp(lang->language, real) == 0 && encoding == lang->encoding) { - if ((realptr = strchr(real, '.')) != NULL) - *realptr = '\0'; - else if ((realptr = strchr(real, '_')) != NULL) - *realptr = '\0'; + lang->used ++; + + return (lang); } - } - while (fp == NULL && strchr(real, '_') != NULL && strchr(real, '.') != NULL); /* - * OK, we have an open messages file; the first line will contain the - * language encoding (us-ascii, iso-8859-1, etc.), and the rest will - * be messages consisting of: + * Open the messages file; the first line contains the default + * language encoding (us-ascii, iso-8859-1, etc.), and the rest are + * messages consisting of: * * #### SP message text * @@ -368,6 +414,8 @@ cupsLangGet(const char *language) /* I - Language or locale */ * All leading whitespace is deleted. */ + fp = fopen(filename, "r"); + if (fp == NULL) strlcpy(line, lang_default[0], sizeof(line)); else if (fgets(line, sizeof(line), fp) == NULL) @@ -426,14 +474,19 @@ cupsLangGet(const char *language) /* I - Language or locale */ */ lang->used ++; - strlcpy(lang->language, langname, sizeof(lang->language)); + strlcpy(lang->language, real, sizeof(lang->language)); - for (i = 0; i < (sizeof(lang_encodings) / sizeof(lang_encodings[0])); i ++) - if (strcmp(lang_encodings[i], line) == 0) - { - lang->encoding = (cups_encoding_t)i; - break; - } + if (charset[0]) + lang->encoding = encoding; + else + { + for (i = 0; i < (sizeof(lang_encodings) / sizeof(lang_encodings[0])); i ++) + if (strcmp(lang_encodings[i], line) == 0) + { + lang->encoding = (cups_encoding_t)i; + break; + } + } /* * Read the strings from the file... @@ -520,36 +573,65 @@ typedef struct static const apple_name_locale_t apple_name_locale[] = { - { "English" , "en_US" },{ "French" , "fr" }, { "German" , "de" }, { "Italian" , "it" }, - { "Dutch" , "nl" }, { "Swedish" , "sv" }, { "Spanish" , "es" }, { "Danish" , "da" }, - { "Portuguese" , "pt" }, { "Norwegian" , "no" }, { "Hebrew" , "he" }, { "Japanese" , "ja" }, - { "Arabic" , "ar" }, { "Finnish" , "fi" }, { "Greek" , "el" }, { "Icelandic" , "is" }, - { "Maltese" , "mt" }, { "Turkish" , "tr" }, { "Croatian" , "hr" }, { "Chinese" , "zh" }, - { "Urdu" , "ur" }, { "Hindi" , "hi" }, { "Thai" , "th" }, { "Korean" , "ko" }, - { "Lithuanian" , "lt" }, { "Polish" , "pl" }, { "Hungarian" , "hu" }, { "Estonian" , "et" }, - { "Latvian" , "lv" }, { "Sami" , "se" }, { "Faroese" , "fo" }, { "Farsi" , "fa" }, - { "Russian" , "ru" }, { "Chinese" , "zh" }, { "Dutch" , "nl" }, { "Irish" , "ga" }, - { "Albanian" , "sq" }, { "Romanian" , "ro" }, { "Czech" , "cs" }, { "Slovak" , "sk" }, - { "Slovenian" , "sl" }, { "Yiddish" , "yi" }, { "Serbian" , "sr" }, { "Macedonian", "mk" }, - { "Bulgarian" , "bg" }, { "Ukrainian" , "uk" }, { "Byelorussian", "be" }, { "Uzbek" , "uz" }, - { "Kazakh" , "kk" }, { "Azerbaijani", "az" }, { "Azerbaijani" , "az" }, { "Armenian" , "hy" }, - { "Georgian" , "ka" }, { "Moldavian" , "mo" }, { "Kirghiz" , "ky" }, { "Tajiki" , "tg" }, - { "Turkmen" , "tk" }, { "Mongolian" , "mn" }, { "Mongolian" , "mn" }, { "Pashto" , "ps" }, - { "Kurdish" , "ku" }, { "Kashmiri" , "ks" }, { "Sindhi" , "sd" }, { "Tibetan" , "bo" }, - { "Nepali" , "ne" }, { "Sanskrit" , "sa" }, { "Marathi" , "mr" }, { "Bengali" , "bn" }, - { "Assamese" , "as" }, { "Gujarati" , "gu" }, { "Punjabi" , "pa" }, { "Oriya" , "or" }, - { "Malayalam" , "ml" }, { "Kannada" , "kn" }, { "Tamil" , "ta" }, { "Telugu" , "te" }, - { "Sinhalese" , "si" }, { "Burmese" , "my" }, { "Khmer" , "km" }, { "Lao" , "lo" }, - { "Vietnamese" , "vi" }, { "Indonesian" , "id" }, { "Tagalog" , "tl" }, { "Malay" , "ms" }, - { "Malay" , "ms" }, { "Amharic" , "am" }, { "Tigrinya" , "ti" }, { "Oromo" , "om" }, - { "Somali" , "so" }, { "Swahili" , "sw" }, { "Kinyarwanda" , "rw" }, { "Rundi" , "rn" }, - { "Nyanja" , "" }, { "Malagasy" , "mg" }, { "Esperanto" , "eo" }, { "Welsh" , "cy" }, - { "Basque" , "eu" }, { "Catalan" , "ca" }, { "Latin" , "la" }, { "Quechua" , "qu" }, - { "Guarani" , "gn" }, { "Aymara" , "ay" }, { "Tatar" , "tt" }, { "Uighur" , "ug" }, - { "Dzongkha" , "dz" }, { "Javanese" , "jv" }, { "Sundanese" , "su" }, { "Galician" , "gl" }, - { "Afrikaans" , "af" }, { "Breton" , "br" }, { "Inuktitut" , "iu" }, { "Scottish" , "gd" }, - { "Manx" , "gv" }, { "Irish" , "ga" }, { "Tongan" , "to" }, { "Greek" , "el" }, - { "Greenlandic", "kl" }, { "Azerbaijani", "az" } + { "English" , "en_US.UTF-8" }, { "French" , "fr.UTF-8" }, + { "German" , "de.UTF-8" }, { "Italian" , "it.UTF-8" }, + { "Dutch" , "nl.UTF-8" }, { "Swedish" , "sv.UTF-8" }, + { "Spanish" , "es.UTF-8" }, { "Danish" , "da.UTF-8" }, + { "Portuguese" , "pt.UTF-8" }, { "Norwegian" , "no.UTF-8" }, + { "Hebrew" , "he.UTF-8" }, { "Japanese" , "ja.UTF-8" }, + { "Arabic" , "ar.UTF-8" }, { "Finnish" , "fi.UTF-8" }, + { "Greek" , "el.UTF-8" }, { "Icelandic" , "is.UTF-8" }, + { "Maltese" , "mt.UTF-8" }, { "Turkish" , "tr.UTF-8" }, + { "Croatian" , "hr.UTF-8" }, { "Chinese" , "zh.UTF-8" }, + { "Urdu" , "ur.UTF-8" }, { "Hindi" , "hi.UTF-8" }, + { "Thai" , "th.UTF-8" }, { "Korean" , "ko.UTF-8" }, + { "Lithuanian" , "lt.UTF-8" }, { "Polish" , "pl.UTF-8" }, + { "Hungarian" , "hu.UTF-8" }, { "Estonian" , "et.UTF-8" }, + { "Latvian" , "lv.UTF-8" }, { "Sami" , "se.UTF-8" }, + { "Faroese" , "fo.UTF-8" }, { "Farsi" , "fa.UTF-8" }, + { "Russian" , "ru.UTF-8" }, { "Chinese" , "zh.UTF-8" }, + { "Dutch" , "nl.UTF-8" }, { "Irish" , "ga.UTF-8" }, + { "Albanian" , "sq.UTF-8" }, { "Romanian" , "ro.UTF-8" }, + { "Czech" , "cs.UTF-8" }, { "Slovak" , "sk.UTF-8" }, + { "Slovenian" , "sl.UTF-8" }, { "Yiddish" , "yi.UTF-8" }, + { "Serbian" , "sr.UTF-8" }, { "Macedonian" , "mk.UTF-8" }, + { "Bulgarian" , "bg.UTF-8" }, { "Ukrainian" , "uk.UTF-8" }, + { "Byelorussian", "be.UTF-8" }, { "Uzbek" , "uz.UTF-8" }, + { "Kazakh" , "kk.UTF-8" }, { "Azerbaijani", "az.UTF-8" }, + { "Azerbaijani" , "az.UTF-8" }, { "Armenian" , "hy.UTF-8" }, + { "Georgian" , "ka.UTF-8" }, { "Moldavian" , "mo.UTF-8" }, + { "Kirghiz" , "ky.UTF-8" }, { "Tajiki" , "tg.UTF-8" }, + { "Turkmen" , "tk.UTF-8" }, { "Mongolian" , "mn.UTF-8" }, + { "Mongolian" , "mn.UTF-8" }, { "Pashto" , "ps.UTF-8" }, + { "Kurdish" , "ku.UTF-8" }, { "Kashmiri" , "ks.UTF-8" }, + { "Sindhi" , "sd.UTF-8" }, { "Tibetan" , "bo.UTF-8" }, + { "Nepali" , "ne.UTF-8" }, { "Sanskrit" , "sa.UTF-8" }, + { "Marathi" , "mr.UTF-8" }, { "Bengali" , "bn.UTF-8" }, + { "Assamese" , "as.UTF-8" }, { "Gujarati" , "gu.UTF-8" }, + { "Punjabi" , "pa.UTF-8" }, { "Oriya" , "or.UTF-8" }, + { "Malayalam" , "ml.UTF-8" }, { "Kannada" , "kn.UTF-8" }, + { "Tamil" , "ta.UTF-8" }, { "Telugu" , "te.UTF-8" }, + { "Sinhalese" , "si.UTF-8" }, { "Burmese" , "my.UTF-8" }, + { "Khmer" , "km.UTF-8" }, { "Lao" , "lo.UTF-8" }, + { "Vietnamese" , "vi.UTF-8" }, { "Indonesian" , "id.UTF-8" }, + { "Tagalog" , "tl.UTF-8" }, { "Malay" , "ms.UTF-8" }, + { "Malay" , "ms.UTF-8" }, { "Amharic" , "am.UTF-8" }, + { "Tigrinya" , "ti.UTF-8" }, { "Oromo" , "om.UTF-8" }, + { "Somali" , "so.UTF-8" }, { "Swahili" , "sw.UTF-8" }, + { "Kinyarwanda" , "rw.UTF-8" }, { "Rundi" , "rn.UTF-8" }, + { "Nyanja" , "" }, { "Malagasy" , "mg.UTF-8" }, + { "Esperanto" , "eo.UTF-8" }, { "Welsh" , "cy.UTF-8" }, + { "Basque" , "eu.UTF-8" }, { "Catalan" , "ca.UTF-8" }, + { "Latin" , "la.UTF-8" }, { "Quechua" , "qu.UTF-8" }, + { "Guarani" , "gn.UTF-8" }, { "Aymara" , "ay.UTF-8" }, + { "Tatar" , "tt.UTF-8" }, { "Uighur" , "ug.UTF-8" }, + { "Dzongkha" , "dz.UTF-8" }, { "Javanese" , "jv.UTF-8" }, + { "Sundanese" , "su.UTF-8" }, { "Galician" , "gl.UTF-8" }, + { "Afrikaans" , "af.UTF-8" }, { "Breton" , "br.UTF-8" }, + { "Inuktitut" , "iu.UTF-8" }, { "Scottish" , "gd.UTF-8" }, + { "Manx" , "gv.UTF-8" }, { "Irish" , "ga.UTF-8" }, + { "Tongan" , "to.UTF-8" }, { "Greek" , "el.UTF-8" }, + { "Greenlandic" , "kl.UTF-8" }, { "Azerbaijani", "az.UTF-8" } }; @@ -625,5 +707,5 @@ appleLangDefault(void) /* - * End of "$Id: language.c,v 1.20.2.15 2003/02/04 20:33:44 mike Exp $". + * End of "$Id: language.c,v 1.20.2.16 2003/04/18 13:37:36 mike Exp $". */ diff --git a/locale/Makefile b/locale/Makefile index dda1d42831..1257e0ca85 100644 --- a/locale/Makefile +++ b/locale/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile,v 1.8.2.6 2003/01/07 18:27:04 mike Exp $" +# "$Id: Makefile,v 1.8.2.7 2003/04/18 13:37:37 mike Exp $" # # Locale file makefile for the Common UNIX Printing System (CUPS). # @@ -28,8 +28,7 @@ include ../Makedefs # Locales... # -LOCALES = C be cs de en es fr he it ru_RU.koi8r ru_RU.cp1251 \ - sv uk uk_UA.cp1251 zh_CN +LOCALES = C be cs de en en_US es fr he it ru_RU sv uk uk_UA zh_CN # @@ -73,5 +72,5 @@ translate.o: ../cups/http.h # -# End of "$Id: Makefile,v 1.8.2.6 2003/01/07 18:27:04 mike Exp $". +# End of "$Id: Makefile,v 1.8.2.7 2003/04/18 13:37:37 mike Exp $". # diff --git a/locale/ru_RU.cp1251/cups_ru_RU.cp1251 b/locale/ru_RU.cp1251/cups_ru_RU.cp1251 deleted file mode 100644 index 102b2786bf..0000000000 --- a/locale/ru_RU.cp1251/cups_ru_RU.cp1251 +++ /dev/null @@ -1,134 +0,0 @@ -windows-1251 -OK -Cancel -Help -Quit -Close -Yes -No -On -Off -Save -Discard -Default -Options -More Info -Black -Colour -Cyan -Magenta -Yellow -Copyright 1993-2002 by Easy Software Products, All Rights Reserved. -General -Printer -Image -HP-GL/2 -Extra -Document -Other -Print Pages: -Entire Document -Page Range: -Reverse Order: -Page Format: - 1-Up - 2-Up - 4-Up -Image Scaling: -Use Natural Image Size -Zoom by Percent -Zoom by PPI -Mirror Image: -Colour Saturation: -Colour Hue: -Fit to Page: -Shading: -Pen Width: -Gamma Correction: -Brightness: -Add -Delete -Modify -Printer URI -Printer Name -Printer Location -Printer Info -Printer Make and Model -Device URI -Formatting Page -Printing Page -Initializing Printer -Printer State -Accepting Jobs -Not Accepting Jobs -Print Jobs -Class -Local -Remote -Duplexing -Stapling -Fast Copies -Collated Copies -Hole Punching -Covering -Binding -Sorting -Small (up to 9.5x14in) -Medium (9.5x14in to 13x19in) -Large (13x19in and larger) -Custom Size -Idle -Processing -Stopped -All -Odd -Even -Darker Lighter -Media Size -Media Type -Media Source -Orientation: -Portrait -Landscape -Job State -Job Name -User Name -Priority -Copies -File Size -Pending -Output Mode -Resolution -Text -Pretty Print -Margins -Left -Right -Bottom -Top -Filename(s) -Print -Options Installed -Auto -400 Your browser sent a request that this server could not understand. -This server could not verify that you are authorized to access the resource. -You must pay to access this server. -You don't have permission to access the resource on this server. -The requested resource was not found on this server. -The requested method is not allowed with the resource. -An appropriate representation for the resource was not found on this server. -You don't have permission to use this server as a proxy host. -The request has taken too long to complete and has been aborted. -The requested resource has more than one value. -The requested resource is gone and has not been replaced. -The requested method requires a valid Content-Length. -The precondition on the request evaluated to false. -The request is too large for this server to process. -The request URI is too large for this server to process. -The request format is not understood by this server. -500 The server has detected an unrecoverable error and cannot process your request. -The requested method is not implemented by this server. -The proxy server received an invalid response from an upstream server. -The requested resource is currently unavailable on this server. -The proxy server has taken too long to respond to this server. -This server does not support the HTTP version required by your browser. diff --git a/locale/ru_RU.koi8r/cups_ru_RU.koi8r b/locale/ru_RU.koi8r/cups_ru_RU.koi8r deleted file mode 100644 index e1db3f4fc0..0000000000 --- a/locale/ru_RU.koi8r/cups_ru_RU.koi8r +++ /dev/null @@ -1,134 +0,0 @@ -koi8-r -OK -Cancel -Help -Quit -Close -Yes -No -On -Off -Save -Discard -Default -Options -More Info -Black -Colour -Cyan -Magenta -Yellow -Copyright 1993-2002 by Easy Software Products, All Rights Reserved. -General -Printer -Image -HP-GL/2 -Extra -Document -Other -Print Pages: -Entire Document -Page Range: -Reverse Order: -Page Format: - 1-Up - 2-Up - 4-Up -Image Scaling: -Use Natural Image Size -Zoom by Percent -Zoom by PPI -Mirror Image: -Colour Saturation: -Colour Hue: -Fit to Page: -Shading: -Pen Width: -Gamma Correction: -Brightness: -Add -Delete -Modify -Printer URI -Printer Name -Printer Location -Printer Info -Printer Make and Model -Device URI -Formatting Page -Printing Page -Initializing Printer -Printer State -Accepting Jobs -Not Accepting Jobs -Print Jobs -Class -Local -Remote -Duplexing -Stapling -Fast Copies -Collated Copies -Hole Punching -Covering -Binding -Sorting -Small (up to 9.5x14in) -Medium (9.5x14in to 13x19in) -Large (13x19in and larger) -Custom Size -Idle -Processing -Stopped -All -Odd -Even -Darker Lighter -Media Size -Media Type -Media Source -Orientation: -Portrait -Landscape -Job State -Job Name -User Name -Priority -Copies -File Size -Pending -Output Mode -Resolution -Text -Pretty Print -Margins -Left -Right -Bottom -Top -Filename(s) -Print -Installed Options -Auto -400 Your browser sent a request that this server could not understand. -This server could not verify that you are authorized to access the resource. -You must pay to access this server. -You don't have permission to access the resource on this server. -The requested resource was not found on this server. -The requested method is not allowed with the resource. -An appropriate representation for the resource was not found on this server. -You don't have permission to use this server as a proxy host. -The request has taken too long to complete and has been aborted. -The requested resource has more than one value. -The requested resource is gone and has not been replaced. -The requested method requires a valid Content-Length. -The precondition on the request evaluated to false. -The request is too large for this server to process. -The request URI is too large for this server to process. -The request format is not understood by this server. -500 The server has detected an unrecoverable error and cannot process your request. -The requested method is not implemented by this server. -The proxy server received an invalid response from an upstream server. -The requested resource is currently unavailable on this server. -The proxy server has taken too long to respond to this server. -This server does not support the HTTP version required by your browser. diff --git a/locale/uk_UA.cp1251/cups_uk_UA.cp1251 b/locale/uk_UA.cp1251/cups_uk_UA.cp1251 deleted file mode 100644 index 6d5d6c8d6c..0000000000 --- a/locale/uk_UA.cp1251/cups_uk_UA.cp1251 +++ /dev/null @@ -1,134 +0,0 @@ -windows-1251 -OK -Cancel -Help -Quit -Close -Yes -No -On -Off -Save -Discard -Default -Options -More Info -Black -Colour -Cyan -Magenta -Yellow -Copyright 1993-2002 by Easy Software Products, All Rights Reserved. -General -Printer -Image -HP-GL/2 -Extra -Document -Other -Print Pages: -Entire Document -Page Range: -Reverse Order: -Page Format: - 1-Up - 2-Up - 4-Up -Image Scaling: -Use Natural Image Size -Zoom by Percent -Zoom by PPI -Mirror Image: -Colour Saturation: -Colour Hue: -Fit to Page: -Shading: -Pen Width: -Gamma Correction: -Brightness: -Add -Delete -Modify -Printer URI -Printer Name -Printer Location -Printer Info -Printer Make and Model -Device URI -Formatting Page -Printing Page -Initializing Printer -Printer State -Accepting Jobs -Not Accepting Jobs -Print Jobs -Class -Local -Remote -Duplexing -Stapling -Fast Copies -Collated Copies -Hole Punching -Covering -Binding -Sorting -Small (up to 9.5x14in) -Medium (9.5x14in to 13x19in) -Large (13x19in and larger) -Custom Size -Idle -Processing -Stopped -All -Odd -Even -Darker Lighter -Media Size -Media Type -Media Source -Orientation: -Portrait -Landscape -Job State -Job Name -User Name -Priority -Copies -File Size -Pending -Output Mode -Resolution -Text -Pretty Print -Margins -Left -Right -Bottom -Top -Filename(s) -Print -Installed Options -Auto -400 Your browser sent a request that this server could not understand. -This server could not verify that you are authorized to access the resource. -You must pay to access this server. -You don't have permission to access the resource on this server. -The requested resource was not found on this server. -The requested method is not allowed with the resource. -An appropriate representation for the resource was not found on this server. -You don't have permission to use this server as a proxy host. -The request has taken too long to complete and has been aborted. -The requested resource has more than one value. -The requested resource is gone and has not been replaced. -The requested method requires a valid Content-Length. -The precondition on the request evaluated to false. -The request is too large for this server to process. -The request URI is too large for this server to process. -The request format is not understood by this server. -500 The server has detected an unrecoverable error and cannot process your request. -The requested method is not implemented by this server. -The proxy server received an invalid response from an upstream server. -The requested resource is currently unavailable on this server. -The proxy server has taken too long to respond to this server. -This server does not support the HTTP version required by your browser.