--- qt-x11-opensource-src-4.0.1/src/corelib/tools/qlocale.cpp~	2005-10-24 20:09:53 +0400
+++ qt-x11-opensource-src-4.0.1/src/corelib/tools/qlocale.cpp	2005-10-24 20:14:57 +0400
@@ -1842,7 +1842,13 @@ static QString winIso3116CtryName()
 QByteArray QLocalePrivate::systemLocaleName()
 {
     static QByteArray lang;
-    lang = qgetenv("LANG");
+    lang = qgetenv("LC_ALL");
+    if ( lang.isEmpty() ) {
+	lang = getenv( "LC_MESSAGES" );
+    }
+    if ( lang.isEmpty() ) {
+	lang = getenv( "LANG" );
+    }
 
 #if !defined(QWS) && defined(Q_OS_MAC)
     if (!lang.isEmpty())
--- qt-x11-opensource-src-4.0.1/src/corelib/codecs/qtextcodec.cpp~	2005-10-24 20:08:22 +0400
+++ qt-x11-opensource-src-4.0.1/src/corelib/codecs/qtextcodec.cpp	2005-10-24 20:08:35 +0400
@@ -345,11 +345,11 @@ static void setupLocaleMapper()
         // Get the first nonempty value from $LC_ALL, $LC_CTYPE, and $LANG
         // environment variables.
         char * lang = qstrdup(qgetenv("LC_ALL").constData());
-        if (!lang || lang[0] == 0 || strcmp(lang, "C") == 0) {
+        if (!lang || lang[0] == 0) {
             if (lang) delete [] lang;
             lang = qstrdup(qgetenv("LC_CTYPE").constData());
         }
-        if (!lang || lang[0] == 0 || strcmp(lang, "C") == 0) {
+        if (!lang || lang[0] == 0) {
             if (lang) delete [] lang;
             lang = qstrdup(qgetenv("LANG").constData());
         }