Fix the problem that the "According to WinMerge User Interface" option in the Codepag...

diff --git a/Src/Merge.cpp b/Src/Merge.cpp
index 66144f7..2de9fb8 100644 (file)
--- a/Src/Merge.cpp
+++ b/Src/Merge.cpp
@@ -322,6 +322,9 @@ BOOL CMergeApp::InitInstance()
 
        LoadStdProfileSettings(GetOptionsMgr()->GetInt(OPT_MRU_MAX));  // Load standard INI file options (including MRU)
 
+       // Initialize i18n (multiple language) support
+       m_pLangDlg->InitializeLanguage((WORD)GetOptionsMgr()->GetInt(OPT_SELECTED_LANGUAGE));
+
        charsets_init();
        UpdateCodepageModule();
 
@@ -390,10 +393,6 @@ BOOL CMergeApp::InitInstance()
 
        m_bMergingMode = GetOptionsMgr()->GetBool(OPT_MERGE_MODE);
 
-       // Initialize i18n (multiple language) support
-
-       m_pLangDlg->InitializeLanguage((WORD)GetOptionsMgr()->GetInt(OPT_SELECTED_LANGUAGE));
-
        m_mainThreadScripts = new CAssureScriptsForThread;
 
        // Register the application's document templates.  Document templates