@@ -683,27 +683,11 @@
 static wxWCharBuffer wxSetlocaleTryUTF(int c, const wxChar *lc)
 {
     wxMB2WXbuf l = wxSetlocale(c, lc);
+    if ( !l && lc && lc[0] != 0 )
-    if ( lc && lc[0] != 0 && !l )
     {
     	wxString buf(lc);
+        wxString buf2;
+    	buf2 = buf + wxT(".UTF-8");
+    	l = wxSetlocale(c, buf2.c_str());
+        if ( !l )
+        {
+            buf2 = buf + wxT(".utf-8");
+    	    l = wxSetlocale(c, buf2.c_str());
+        }
+        if ( !l )
+        {
+            buf2 = buf + wxT(".UTF8");
+    	    l = wxSetlocale(c, buf2.c_str());
+        }
+        if ( !l )
+        {
+            buf2 = buf + wxT(".utf8");
+    	    l = wxSetlocale(c, buf2.c_str());
+        }
-    	buf += wxT(".utf8");
-    	l = wxSetlocale(c, buf.c_str());
     }
     return l;
 }