Index: pgAdmin3.cpp
===================================================================
RCS file: /projects/pgadmin3/src/pgAdmin3.cpp,v
retrieving revision 1.81.2.1
retrieving revision 1.81.2.2
diff -Lsrc/pgAdmin3.cpp -Lsrc/pgAdmin3.cpp -u -w -r1.81.2.1 -r1.81.2.2
--- src/pgAdmin3.cpp
+++ src/pgAdmin3.cpp
@@ -130,7 +130,19 @@
 #endif
 
     locale.AddCatalogLookupPathPrefix(uiPath);
+    wxLanguage langId = (wxLanguage)settings->Read(wxT("LanguageId"), wxLANGUAGE_DEFAULT);
+    if (locale.Init(langId))
+    {
+#ifdef __LINUX__
+        {
+            wxLogNull noLog;
+            locale.AddCatalog(wxT("fileutils"));
+        }
+#endif
+        locale.AddCatalog(wxT("pgadmin3"));
+    }
     
+#if 0 // old language selection on first app start
     long langCount=0;
     const wxLanguageInfo *langInfo;
     int langNo;
@@ -223,6 +235,8 @@
             settings->Write(wxT("LanguageId"), (long)langId);
         }
     }
+#endif
+    
 
     // Show the splash screen
     frmSplash* winSplash = new frmSplash((wxFrame *)NULL);