Merge with stable

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

diff --cc Src/ConfirmFolderCopyDlg.h
Simple merge

diff --cc Src/DiffList.cpp
Simple merge

diff --cc Src/DirCmpReportDlg.h
Simple merge

diff --cc Src/DirColsDlg.h
Simple merge

diff --cc Src/DirView.cpp
Simple merge

diff --cc Src/FileActionScript.cpp
index 4ff466d,4f320f7..eeda557
--- 1/Src/FileActionScript.cpp
--- 2/Src/FileActionScript.cpp
+++ b/Src/FileActionScript.cpp
@@@ -27,10 -27,8 +27,9 @@@
  #include "Merge.h"
  #include "OptionsDef.h"
  #include "OptionsMgr.h"
- #include "MainFrm.h"
  #include "ShellFileOperations.h"
  #include "paths.h"
 +#include "SourceControl.h"
  
  using std::vector;
  

diff --cc Src/FileTransform.h
Simple merge

diff --cc Src/MainFrm.cpp
Simple merge

diff --cc Src/Merge.cpp
Simple merge

diff --cc Src/MergeDoc.cpp
Simple merge

diff --cc Src/PatchDlg.h
Simple merge

diff --cc Src/PluginsListDlg.h
Simple merge

diff --cc Src/PropArchive.h
Simple merge

diff --cc Src/PropBackups.h
Simple merge

diff --cc Src/PropCodepage.h
Simple merge

diff --cc Src/PropCompare.h
Simple merge

diff --cc Src/PropCompareFolder.h
Simple merge

diff --cc Src/PropEditor.h
Simple merge

diff --cc Src/PropGeneral.h
Simple merge

diff --cc Src/PropRegistry.h
Simple merge

diff --cc Src/PropShell.h
Simple merge

diff --cc Src/PropVss.h
Simple merge

diff --cc Src/SaveClosingDlg.h
index b69c3fb,687b72e..92c8ee2
--- 1/Src/SaveClosingDlg.h
--- 2/Src/SaveClosingDlg.h
+++ b/Src/SaveClosingDlg.h
@@@ -48,8 -47,8 +48,8 @@@ public
                SAVECLOSING_DISCARD,  /**< Discard changes */
        };
  
-       SaveClosingDlg(CWnd* pParent = NULL);   // standard constructor
+       explicit SaveClosingDlg(CWnd* pParent = NULL);   // standard constructor
 -      void DoAskFor(BOOL bLeft = FALSE, BOOL bMiddle = FALSE, BOOL bRight = FALSE);
 +      void DoAskFor(bool bLeft = false, bool bMiddle = false, bool bRight = false);
  
  // Dialog Data
        //{{AFX_DATA(SaveClosingDlg)

diff --cc Src/SourceControl.cpp
index 5306acc,f7347a2..4bba2cf
--- 1/Src/SourceControl.cpp
--- 2/Src/SourceControl.cpp
+++ b/Src/SourceControl.cpp
@@@ -386,11 -398,10 +385,11 @@@ void SourceControl::CheckinToClearCase(
        try
        {
                ProcessHandle hVss(Process::launch(vssPath, args));
-               code = Process::wait(hVss);
+               int code = Process::wait(hVss);
                if (code != 0)
                {
 -                      if (LangMessageBox(IDS_VSS_CHECKINERROR, MB_ICONWARNING | MB_YESNO) == IDYES)
 +                      if (AppMsgBox::warning(_("Versioning System returned an error while attempting to check in the file.\n Please, check config spec of used view.\n Undo checkout operation?"),
 +                                  AppMsgBox::YES | AppMsgBox::NO) == AppMsgBox::YES)
                        {
                                // undo checkout operation
                                args.push_back("uncheckout");

diff --cc Src/StdAfx.h
Simple merge

diff --cc Src/VSSHelper.cpp
Simple merge