Merge with stable

diff --cc Src/ChildFrm.cpp
Simple merge

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

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

diff --cc Src/DirDoc.cpp
Simple merge

diff --cc Src/DirFrame.cpp
index 4a113be,d2fd7ac..0f686d3
--- 1/Src/DirFrame.cpp
--- 2/Src/DirFrame.cpp
+++ b/Src/DirFrame.cpp
@@@ -122,7 -130,8 +130,8 @@@ int CDirFrame::OnCreate(LPCREATESTRUCT 
                return -1;      // fail to create
        }       
        
 -      String sText = theApp.LoadString(IDS_STATUSBAR_READONLY);
 +      String sText = _("RO");
+       m_wndStatusBar.SetPaneInfo(PANE_COMPMETHOD, ID_STATUS_FILTER, 0, COMPMETHOD_PANEL_WIDTH);
        m_wndStatusBar.SetPaneInfo(PANE_FILTER, ID_STATUS_FILTER, 0, FILTER_PANEL_WIDTH);
        m_wndStatusBar.SetPaneInfo(PANE_LEFT_RO, ID_STATUS_LEFTDIR_RO, 0, RO_PANEL_WIDTH);
        m_wndStatusBar.SetPaneInfo(PANE_MIDDLE_RO, ID_STATUS_MIDDLEDIR_RO, 0, RO_PANEL_WIDTH);

diff --cc Src/DirScan.cpp
Simple merge

diff --cc Src/DirView.cpp
index efbebf0,c858f41..97f09b8
--- 1/Src/DirView.cpp
--- 2/Src/DirView.cpp
+++ b/Src/DirView.cpp
@@@ -507,9 -602,9 +507,10 @@@ void CDirView::Redisplay(
  
        int alldiffs = 0;
        UIntPtr diffpos = ctxt.GetFirstDiffPosition();
 -      RedisplayChildren(diffpos, 0, cnt, alldiffs);
 +      DirViewFilterSettings dirfilter(boost::bind(&COptionsMgr::GetBool, GetOptionsMgr(), _1));
 +      RedisplayChildren(diffpos, 0, cnt, alldiffs, dirfilter);
-       theApp.SetLastCompareResult(alldiffs);
+       if (pDoc->m_diffThread.GetThreadState() == CDiffThread::THREAD_COMPLETED)
 -              GetParentFrame()->SetLastCompareResult(alldiffs);
++              theApp.SetLastCompareResult(alldiffs);
        SortColumnsAppropriately();
        SetRedraw(TRUE);
  }

diff --cc Src/HexMergeFrm.cpp
Simple merge

diff --cc Src/MainFrm.cpp
Simple merge

diff --cc Src/MainFrm.h
Simple merge

diff --cc Src/OpenView.cpp
Simple merge

diff --cc Translations/WinMerge/English.pot
index 5a7ceaf,32d9592..7f1e730
--- 1/Translations/WinMerge/English.pot
--- 2/Translations/WinMerge/English.pot
+++ b/Translations/WinMerge/English.pot
@@@ -8,7 -8,7 +8,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: WinMerge\n"
  "Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
- "POT-Creation-Date: 2014-02-23 12:25+0000\n"
 -"POT-Creation-Date: 2014-03-29 09:19+0000\n"
++"POT-Creation-Date: 2014-03-29 17:58+0000\n"
  "PO-Revision-Date: \n"
  "Last-Translator: \n"
  "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"