Merge with stable

diff --cc Src/DiffList.cpp
Simple merge

diff --cc Src/DiffWrapper.cpp
Simple merge

diff --cc Src/FolderCmp.cpp
Simple merge

diff --cc Src/LocationView.cpp
Simple merge

diff --cc Src/MergeDocLineDiffs.cpp
Simple merge

diff --cc Src/MergeEditView.cpp
index d9e585e,b9bb06e..cdc17a3
--- 1/Src/MergeEditView.cpp
--- 2/Src/MergeEditView.cpp
+++ b/Src/MergeEditView.cpp
@@@ -1742,10 -1742,10 +1740,10 @@@ void CMergeEditView::OnUpdateL2r(CCmdUI
   * difference only.
   */
  void CMergeEditView::OnR2l()
-       {
+ {
        int dstPane = (m_nThisPane > 0) ? m_nThisPane - 1 : 0;
        int srcPane = dstPane + 1;
 -      OnX2Y(srcPane, dstPane, IDS_STATUS_COPYR2L);
 +      OnX2Y(srcPane, dstPane, _("Copying Right to Left"));
  }
  
  /**
@@@ -1843,8 -1781,8 +1779,8 @@@ void CMergeEditView::OnCopyFromRight(
        int srcPane = dstPane + 1;
        if (srcPane >= GetDocument()->m_nBuffers)
                return;
 -      OnX2Y(srcPane, dstPane, IDS_STATUS_COPY_FROM_RIGHT);
 +      OnX2Y(srcPane, dstPane, _("Copying From Right"));
-       }
+ }
  
  void CMergeEditView::OnUpdateCopyFromRight(CCmdUI* pCmdUI)
  {

diff --cc Src/MergeEditView.h
Simple merge