Merge with default

--HG--
branch : jp

diff --cc DownloadDeps.cmd
Simple merge

diff --cc Src/Merge.rc
Simple merge

diff --cc Src/OptionsDef.h
Simple merge

diff --cc Src/OptionsInit.cpp
Simple merge

diff --cc Src/resource.h
index 668f203,92004f0..d8707cb
--- 1/Src/resource.h
--- 2/Src/resource.h
+++ b/Src/resource.h
@@@ -1191,48 -1191,50 +1191,51 @@@
  #define ID_IMG_THRESHOLD_16             33379\r
  #define ID_IMG_THRESHOLD_32             33380\r
  #define ID_IMG_THRESHOLD_64             33381\r
- #define ID_IMG_DRAGGINGMODE_NONE        33382\r
- #define ID_IMG_DRAGGINGMODE_MOVE        33383\r
- #define ID_IMG_DRAGGINGMODE_ADJUST_OFFSET 33384\r
- #define IDC_COMPAREIMAGE_PATTERNS       33385\r
- #define IDC_COMPAREIMAGE_DEFAULTS       33386\r
- #define IDC_PLUGIN_SETTINGS             33387\r
- #define IDC_COMPAREBINARY_PATTERNS      33388\r
- #define IDC_COMPAREBINARY_VIEWSETTINGS  33389\r
- #define IDC_COMPAREBINARY_BINARYMODE    33390\r
- #define IDC_COMPAREBINARY_CHARACTERSET  33391\r
- #define IDC_COMPAREBINARY_DEFAULTS      33392\r
+ #define ID_IMG_INSERTIONDELETIONDETECTION_NONE 33382\r
+ #define ID_IMG_INSERTIONDELETIONDETECTION_VERTICAL 33383\r
+ #define ID_IMG_INSERTIONDELETIONDETECTION_HORIZONTAL 33384\r
+ #define ID_IMG_DRAGGINGMODE_NONE        33385\r
+ #define ID_IMG_DRAGGINGMODE_MOVE        33386\r
+ #define ID_IMG_DRAGGINGMODE_ADJUST_OFFSET 33387\r
+ #define IDC_COMPAREIMAGE_PATTERNS       33388\r
+ #define IDC_COMPAREIMAGE_DEFAULTS       33389\r
+ #define IDC_PLUGIN_SETTINGS             33390\r
+ #define IDC_COMPAREBINARY_PATTERNS      33391\r
+ #define IDC_COMPAREBINARY_VIEWSETTINGS  33392\r
+ #define IDC_COMPAREBINARY_BINARYMODE    33394\r
+ #define IDC_COMPAREBINARY_CHARACTERSET  33395\r
+ #define IDC_COMPAREBINARY_DEFAULTS      33398\r
 +#define ID_HELP_CHECKFORUPDATES         33393\r
- #define ID_HELP_RELEASENOTES            33394\r
- #define ID_HELP_TRANSLATIONS            33395\r
- #define IDS_COMPMETHOD_FULL_CONTENTS    33398\r
- #define IDS_COMPMETHOD_QUICK_CONTENTS   33399\r
- #define IDS_COMPMETHOD_BINARY_CONTENTS  33400\r
- #define IDS_COMPMETHOD_MODDATE          33401\r
- #define IDS_COMPMETHOD_DATESIZE         33402\r
- #define IDS_COMPMETHOD_SIZE             33403\r
- #define IDS_UNPACK_AUTO                 33494\r
- #define IDS_NO_PREDIFFER                33495\r
- #define IDS_SUGGESTED_PLUGINS           33496\r
- #define IDS_NOT_SUGGESTED_PLUGINS       33497\r
- #define IDS_PRIVATEBUILD_FMT            33501\r
- #define IDS_CHECKFORUPDATES_UPTODATE    33502\r
- #define IDS_CHECKFORUPDATES_NEWVERSION  33503\r
- #define IDS_CHECKFORUPDATES_FAILED      33504\r
- #define IDS_TITLE_PLUGINS_SETTINGS      33521\r
- #define IDS_NO_EDIT_SCRIPTS             33522\r
- #define IDS_NO_SCT_SCRIPTS              33523\r
- #define IDS_USERCHOICE_NONE             33524\r
- #define IDS_USERCHOICE_AUTOMATIC        33525\r
- #define IDS_CLOSE_LEFT_TABS             33541\r
- #define IDS_CLOSE_RIGHT_TABS            33542\r
- #define IDS_CLOSE_OTHER_TABS            33543\r
- #define IDS_TABBAR_AUTO_MAXWIDTH        33544\r
- #define ID_FILE_PROJECT_MRU_FIRST       33545\r
- #define ID_FILE_PROJECT_MRU_LAST        33644\r
- #define IDS_CREATE_FOLDER               33645\r
- #define IDS_CREATE_FOLDER_ERROR         33646\r
- #define ID_FILE_SHELLMENU               33648\r
+ #define ID_HELP_RELEASENOTES            33399\r
+ #define ID_HELP_TRANSLATIONS            33400\r
+ #define IDS_COMPMETHOD_FULL_CONTENTS    33401\r
+ #define IDS_COMPMETHOD_QUICK_CONTENTS   33402\r
+ #define IDS_COMPMETHOD_BINARY_CONTENTS  33403\r
+ #define IDS_COMPMETHOD_MODDATE          33494\r
+ #define IDS_COMPMETHOD_DATESIZE         33495\r
+ #define IDS_COMPMETHOD_SIZE             33496\r
+ #define IDS_UNPACK_AUTO                 33497\r
+ #define IDS_NO_PREDIFFER                33501\r
+ #define IDS_SUGGESTED_PLUGINS           33502\r
+ #define IDS_NOT_SUGGESTED_PLUGINS       33503\r
+ #define IDS_PRIVATEBUILD_FMT            33504\r
+ #define IDS_CHECKFORUPDATES_UPTODATE    33521\r
+ #define IDS_CHECKFORUPDATES_NEWVERSION  33522\r
+ #define IDS_CHECKFORUPDATES_FAILED      33523\r
+ #define IDS_TITLE_PLUGINS_SETTINGS      33524\r
+ #define IDS_NO_EDIT_SCRIPTS             33525\r
+ #define IDS_NO_SCT_SCRIPTS              33541\r
+ #define IDS_USERCHOICE_NONE             33542\r
+ #define IDS_USERCHOICE_AUTOMATIC        33543\r
+ #define IDS_CLOSE_LEFT_TABS             33544\r
+ #define IDS_CLOSE_RIGHT_TABS            33545\r
+ #define IDS_CLOSE_OTHER_TABS            33644\r
+ #define IDS_TABBAR_AUTO_MAXWIDTH        33645\r
+ #define ID_FILE_PROJECT_MRU_FIRST       33646\r
+ #define ID_FILE_PROJECT_MRU_LAST        33656\r
+ #define IDS_CREATE_FOLDER               33657\r
+ #define IDS_CREATE_FOLDER_ERROR         33658\r
+ #define ID_FILE_SHELLMENU               33659\r
  \r
  // Next default values for new objects\r
  // \r

diff --cc Translations/WinMerge/Basque.po
Simple merge

diff --cc Translations/WinMerge/Brazilian.po
Simple merge

diff --cc Translations/WinMerge/Bulgarian.po
Simple merge

diff --cc Translations/WinMerge/Catalan.po
Simple merge

diff --cc Translations/WinMerge/ChineseSimplified.po
Simple merge

diff --cc Translations/WinMerge/ChineseTraditional.po
Simple merge

diff --cc Translations/WinMerge/Croatian.po
Simple merge

diff --cc Translations/WinMerge/Czech.po
Simple merge

diff --cc Translations/WinMerge/Danish.po
Simple merge

diff --cc Translations/WinMerge/Dutch.po
Simple merge

diff --cc Translations/WinMerge/English.pot
Simple merge

diff --cc Translations/WinMerge/Finnish.po
Simple merge

diff --cc Translations/WinMerge/French.po
Simple merge

diff --cc Translations/WinMerge/Galician.po
Simple merge

diff --cc Translations/WinMerge/German.po
Simple merge

diff --cc Translations/WinMerge/Greek.po
Simple merge

diff --cc Translations/WinMerge/Hungarian.po
Simple merge

diff --cc Translations/WinMerge/Italian.po
Simple merge

diff --cc Translations/WinMerge/Japanese.po
Simple merge

diff --cc Translations/WinMerge/Korean.po
Simple merge

diff --cc Translations/WinMerge/Lithuanian.po
Simple merge

diff --cc Translations/WinMerge/Norwegian.po
Simple merge

diff --cc Translations/WinMerge/Persian.po
Simple merge

diff --cc Translations/WinMerge/Polish.po
Simple merge

diff --cc Translations/WinMerge/Portuguese.po
Simple merge

diff --cc Translations/WinMerge/Romanian.po
Simple merge

diff --cc Translations/WinMerge/Russian.po
Simple merge

diff --cc Translations/WinMerge/Serbian.po
Simple merge

diff --cc Translations/WinMerge/Sinhala.po
Simple merge

diff --cc Translations/WinMerge/Slovak.po
Simple merge

diff --cc Translations/WinMerge/Slovenian.po
Simple merge

diff --cc Translations/WinMerge/Spanish.po
Simple merge

diff --cc Translations/WinMerge/Swedish.po
Simple merge

diff --cc Translations/WinMerge/Turkish.po
Simple merge

diff --cc Translations/WinMerge/Ukrainian.po
Simple merge