Merge with stable

diff --cc Src/ChildFrm.cpp
Simple merge

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

diff --cc Src/EditorFilepathBar.cpp
Simple merge

diff --cc Src/FilepathEdit.cpp
index 3fc92ab,84ca70b..2e862c5
--- 1/Src/FilepathEdit.cpp
--- 2/Src/FilepathEdit.cpp
+++ b/Src/FilepathEdit.cpp
@@@ -255,7 -252,10 +255,10 @@@ void CFilepathEdit::OnContextMenu(CWnd*
                BCMenu* pPopup = static_cast<BCMenu *>(menu.GetSubMenu(0));
                ASSERT(pPopup != NULL);
  
 -              if (m_sOriginalText.Right(1) == '\\')
+               DWORD sel = GetSel();
+               if (HIWORD(sel) == LOWORD(sel))
+                       pPopup->EnableMenuItem(ID_EDITOR_COPY, MF_GRAYED);
 +              if (paths_EndsWithSlash(m_sOriginalText))
                        // no filename, we have to disable the unwanted menu entry
                        pPopup->EnableMenuItem(ID_EDITOR_COPY_FILENAME, MF_GRAYED);
  
@@@ -272,12 -270,15 +273,15 @@@
                int iBegin = 0;
                switch (command)
                {
+               case ID_EDITOR_COPY:
+                       Copy();
+                       return;
                case ID_EDITOR_COPY_FILENAME:
                        {
 -                      int lastSlash = m_sOriginalText.ReverseFind('\\');
 -                      if (lastSlash == -1)
 -                              lastSlash = m_sOriginalText.ReverseFind('/');
 -                      if (lastSlash != -1)
 +                      size_t lastSlash = m_sOriginalText.rfind('\\');
 +                      if (lastSlash == String::npos)
 +                              lastSlash = m_sOriginalText.rfind('/');
 +                      if (lastSlash != String::npos)
                                iBegin = lastSlash+1;
                        else
                                iBegin = 0;

diff --cc Src/LocationView.cpp
Simple merge

diff --cc Src/MainFrm.cpp
Simple merge

diff --cc Src/MainFrm.h
Simple merge

diff --cc Translations/WinMerge/English.pot
index 8fb6274,8ecb36c..cceaa18
--- 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-07-29 23:18+0000\n"
 -"POT-Creation-Date: 2014-08-15 00:06+0000\n"
++"POT-Creation-Date: 2014-09-02 18:43+0000\n"
  "PO-Revision-Date: \n"
  "Last-Translator: \n"
  "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"