Index: CHANGELOG.txt
===================================================================
RCS file: /projects/pgadmin3/CHANGELOG.txt,v
retrieving revision 1.96
retrieving revision 1.97
diff -LCHANGELOG.txt -LCHANGELOG.txt -u -w -r1.96 -r1.97
--- CHANGELOG.txt
+++ CHANGELOG.txt
@@ -16,6 +16,7 @@
 </ul>
 <br>
 <ul>
+    <li>2004-03-30 AP   ***  no initial language selection (using system default)
     <li>2004-03-25 AP   ***  Allow initial selection of language "Default"
     <li>2004-03-24 AP        changed font handling to accept exotic weights
     <li>2004-03-17 AP        Updated sources for wx 2.5.1
Index: pgAdmin3.cpp
===================================================================
RCS file: /projects/pgadmin3/src/pgAdmin3.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -Lsrc/pgAdmin3.cpp -Lsrc/pgAdmin3.cpp -u -w -r1.93 -r1.94
--- src/pgAdmin3.cpp
+++ src/pgAdmin3.cpp
@@ -169,6 +169,20 @@
     locale = new wxLocale();
     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;
@@ -263,6 +277,8 @@
             settings->Write(wxT("LanguageId"), (long)langId);
         }
     }
+#endif
+
 
     // Show the splash screen
     frmSplash* winSplash = new frmSplash((wxFrame *)NULL);
Index: pgAdmin3.dsp
===================================================================
RCS file: /projects/pgadmin3/src/pgAdmin3.dsp,v
retrieving revision 1.96
retrieving revision 1.97
diff -Lsrc/pgAdmin3.dsp -Lsrc/pgAdmin3.dsp -u -w -r1.96 -r1.97
--- src/pgAdmin3.dsp
+++ src/pgAdmin3.dsp
@@ -1613,5 +1613,89 @@
 SOURCE=..\TODO.txt
 # End Source File
 # End Group
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\blank.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\bullseye.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\cdrom.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\computer.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\drive.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\file1.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\floppy.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\folder1.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\folder2.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\hand.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\magnif1.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\noentry.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\pbrush.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\pencil.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\pntleft.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\pntright.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\query.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\removble.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\rightarr.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\roller.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\watch1.cur
+# End Source File
 # End Target
 # End Project