diff -Naur cups-1.1.20/cups/language.c cups-1.1.20.new/cups/language.c --- cups-1.1.20/cups/language.c 2003-11-19 21:25:35 +0300 +++ cups-1.1.20.new/cups/language.c 2003-11-28 17:45:23 +0300 @@ -227,8 +227,9 @@ "CP1256", "CP1257", "CP1258", - "KOI8R", - "KOI8U" + "CP866", + "KOI8-R", + "KOI8-U" }; @@ -411,7 +411,10 @@ if ((lang = cups_cache_lookup(real, encoding)) != NULL) return (lang); - snprintf(filename, sizeof(filename), "%s/%s/cups_%s", localedir, real, real); + if (charset[0]) + snprintf(filename, sizeof(filename), "%s/%s.%s/cups_%s", localedir, real, charset, real); + else + snprintf(filename, sizeof(filename), "%s/%s/cups_%s", localedir, real, real); if (!country[0] || access(filename, 0)) {