Merge with stable

diff --cc Src/Common/LanguageSelect.cpp
index 359da1c,c53fd15..c4ebb75
--- 1/Src/Common/LanguageSelect.cpp
--- 2/Src/Common/LanguageSelect.cpp
+++ b/Src/Common/LanguageSelect.cpp
@@@ -853,11 -846,11 +853,11 @@@ BOOL CLanguageSelect::SetLanguage(LANGI
   * @param [in] wLangId Language ID.
   * @return Language filename, or empty string if no file for language found.
   */
- String CLanguageSelect::GetFileName(LANGID wLangId)
+ String CLanguageSelect::GetFileName(LANGID wLangId) const
  {
        String filename;
 -      String path = env_GetProgPath().append(szRelativePath);
 -      String pattern = path + _T("*.po");
 +      String path = paths_ConcatPath(env_GetProgPath(), szRelativePath);
 +      String pattern = paths_ConcatPath(path, _T("*.po"));
        WIN32_FIND_DATA ff;
        HANDLE h = INVALID_HANDLE_VALUE;
        while ((h = FindFile(h, pattern.c_str(), &ff)) != INVALID_HANDLE_VALUE)

diff --cc Src/Common/LanguageSelect.h
Simple merge

diff --cc Src/Common/MDITabBar.cpp
Simple merge

diff --cc Src/Common/RegOptionsMgr.cpp
Simple merge

diff --cc Src/Common/RegOptionsMgr.h
Simple merge

diff --cc Src/CompareEngines/ByteCompare.cpp
Simple merge

diff --cc Src/CompareEngines/TimeSizeCompare.cpp
Simple merge

diff --cc Src/DiffWrapper.cpp
Simple merge

diff --cc Src/DirDoc.cpp
Simple merge

diff --cc Src/DirDoc.h
Simple merge

diff --cc Src/DirView.cpp
Simple merge

diff --cc Src/DirView.h
index d6beda6,052d786..1b93cfb
--- 1/Src/DirView.h
--- 2/Src/DirView.h
+++ b/Src/DirView.h
@@@ -380,7 -481,9 +380,7 @@@ private
        bool ListShellContextMenu(SIDE_TYPE side);
        CShellContextMenu* GetCorrespondingShellContextMenu(HMENU hMenu) const;
        void ReloadColumns();
-       bool IsLabelEdit();
 -      void ResetColumnWidths();
+       bool IsLabelEdit() const;
 -      bool IsItemSelectedSpecial() const;
        void CollapseSubdir(int sel);
        void ExpandSubdir(int sel, bool bRecursive = false);
        void GetColors(int nRow, int nCol, COLORREF& clrBk, COLORREF& clrText) const;

diff --cc Src/MainFrm.cpp
Simple merge

diff --cc Src/MainFrm.h
Simple merge

diff --cc Src/Merge.cpp
index a641713,f6c6846..8404d54
--- 1/Src/Merge.cpp
--- 2/Src/Merge.cpp
+++ b/Src/Merge.cpp
@@@ -1373,9 -1360,11 +1373,9 @@@ void CMergeApp::ReloadMenu(
   * @brief Get default editor path.
   * @return full path to the editor program executable.
   */
- String CMergeApp::GetDefaultEditor()
+ String CMergeApp::GetDefaultEditor() const
  {
 -      String path = env_GetWindowsDirectory();
 -      path += _T("\\NOTEPAD.EXE");
 -      return path;
 +      return paths_ConcatPath(env_GetWindowsDirectory(), _T("NOTEPAD.EXE"));
  }
  
  /**

diff --cc Src/Merge.h
Simple merge

diff --cc Src/MergeDoc.cpp
Simple merge

diff --cc Src/MergeEditView.cpp
Simple merge

diff --cc Src/MergeEditView.h
Simple merge

diff --cc Src/Plugins.cpp
Simple merge

diff --cc Src/VSSHelper.cpp
Simple merge