Merge with stable

diff --cc Src/HexMergeDoc.cpp
Simple merge

diff --cc Src/IListCtrlImpl.h
Simple merge

diff --cc Src/MainFrm.cpp
Simple merge

diff --cc Src/Merge.cpp
Simple merge

diff --cc Src/MergeEditView.cpp
Simple merge

diff --cc Src/OptionsDef.h
Simple merge

diff --cc Src/OptionsInit.cpp
Simple merge

diff --cc Src/PluginsListDlg.cpp
index 7825e66,c067836..c9059e3
--- 1/Src/PluginsListDlg.cpp
--- 2/Src/PluginsListDlg.cpp
+++ b/Src/PluginsListDlg.cpp
@@@ -71,13 -71,13 +71,13 @@@ void PluginsListDlg::InitList(
  {
        // Show selection across entire row.
        // Also enable infotips.
-       m_list.SetExtendedStyle(LVS_EX_FULLROWSELECT | LVS_EX_INFOTIP);
+       m_list.SetExtendedStyle(LVS_EX_CHECKBOXES | LVS_EX_FULLROWSELECT | LVS_EX_INFOTIP);
  
 -      String title = LoadResString(IDS_PLUGINSLIST_NAME);
 +      String title = _("Name");
-       m_list.InsertColumn(0, title.c_str(), LVCFMT_LEFT, 150);
+       m_list.InsertColumn(0, title.c_str(), LVCFMT_LEFT, 200);
 -      title = LoadResString(IDS_PLUGINSLIST_TYPE);
 +      title = _("Type");
        m_list.InsertColumn(1, title.c_str(), LVCFMT_LEFT, 100);
 -      title = LoadResString(IDS_PLUGINSLIST_DESC);
 +      title = _("Description");
        m_list.InsertColumn(2, title.c_str(), LVCFMT_LEFT, 300);
  }
  
@@@ -111,8 -111,9 +111,9 @@@ void PluginsListDlg::AddPluginsToList(c
        {
                const PluginInfoPtr& plugin = piPluginArray->at(iPlugin);
                int ind = m_list.InsertItem(m_list.GetItemCount(), plugin->m_name.c_str());
 -              m_list.SetItemText(ind, 1, pluginType);
 +              m_list.SetItemText(ind, 1, pluginType.c_str());
                m_list.SetItemText(ind, 2, plugin->m_description.c_str());
+               m_list.SetCheck(ind, !plugin->m_disabled);
        }
  }
  

diff --cc Src/PropShell.cpp
index 596212e,5cf23f4..d3524b2
--- 1/Src/PropShell.cpp
--- 2/Src/PropShell.cpp
+++ b/Src/PropShell.cpp
@@@ -26,8 -24,10 +26,7 @@@ static char THIS_FILE[] = __FILE__
  /// Flags for enabling and mode of extension
  #define CONTEXT_F_ENABLED 0x01
  #define CONTEXT_F_ADVANCED 0x02
- #define CONTEXT_F_SUBFOLDERS 0x04
  
 - // registry dir to WinMerge
 -static LPCTSTR f_RegDir = _T("Software\\Thingamahoochie\\WinMerge");
 -
  // registry values
  static LPCTSTR f_RegValueEnabled = _T("ContextMenuEnabled");
  static LPCTSTR f_RegValuePath = _T("Executable");
@@@ -78,9 -78,8 +77,8 @@@ static bool RegisterShellExtension(boo
  
  PropShell::PropShell(COptionsMgr *optionsMgr) 
  : OptionsPanel(optionsMgr, PropShell::IDD)
 -, m_bContextAdded(FALSE)
 -, m_bContextAdvanced(FALSE)
 +, m_bContextAdded(false)
 +, m_bContextAdvanced(false)
- , m_bContextSubfolders(false)
  {
  }
  
@@@ -161,13 -158,10 +157,10 @@@ void PropShell::GetContextRegValues(
        DWORD dwContextEnabled = reg.ReadDword(f_RegValueEnabled, 0);
  
        if (dwContextEnabled & CONTEXT_F_ENABLED)
 -              m_bContextAdded = TRUE;
 +              m_bContextAdded = true;
  
        if (dwContextEnabled & CONTEXT_F_ADVANCED)
 -              m_bContextAdvanced = TRUE;
 +              m_bContextAdvanced = true;
- 
-       if (dwContextEnabled & CONTEXT_F_SUBFOLDERS)
-               m_bContextSubfolders = true;
  }
  
  /// Set registry values for ShellExtension

diff --cc Src/PropShell.h
index 37dea4f,dd781d9..c88fc66
--- 1/Src/PropShell.h
--- 2/Src/PropShell.h
+++ b/Src/PropShell.h
@@@ -23,9 -22,8 +23,8 @@@ public
  
  // Dialog Data
        enum { IDD = IDD_PROPPAGE_SHELL };
 -      BOOL m_bContextAdded;
 -      BOOL m_bContextAdvanced;
 +      bool m_bContextAdded;
 +      bool m_bContextAdvanced;
-       bool m_bContextSubfolders;
  
  // Overrides
        protected:

diff --cc Src/SelectUnpackerDlg.cpp
Simple merge

diff --cc Src/paths.cpp
Simple merge

diff --cc Translations/WinMerge/English.pot
index 1fad596,93c0b55..c120fbb
--- 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: 2015-05-24 09:35+0000\n"
 -"POT-Creation-Date: 2015-06-06 18:22+0000\n"
++"POT-Creation-Date: 2015-06-22 00:14+0000\n"
  "PO-Revision-Date: \n"
  "Last-Translator: \n"
  "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"