Fix sf.net ticket #2221: Possible Bugs in 2.16.2 BUG 02

Add 'Binary compare limit' textbox to Options dialog

diff --git a/Src/DiffContext.h b/Src/DiffContext.h
index 69065cf..78c1175 100644 (file)
--- a/Src/DiffContext.h
+++ b/Src/DiffContext.h
@@ -172,6 +172,8 @@ public:
         */
        int m_nQuickCompareLimit;
 
+       int m_nBinaryCompareLimit;
+
        /**
         * Walk into unique folders and add contents.
         * This enables/disables walking into unique folders. If we don't walk into

diff --git a/Src/DirDoc.cpp b/Src/DirDoc.cpp
index d19b801..1fee51e 100644 (file)
--- a/Src/DirDoc.cpp
+++ b/Src/DirDoc.cpp
@@ -253,6 +253,7 @@ void CDirDoc::Rescan()
        m_pCtxt->m_bIgnoreSmallTimeDiff = GetOptionsMgr()->GetBool(OPT_IGNORE_SMALL_FILETIME);
        m_pCtxt->m_bStopAfterFirstDiff = GetOptionsMgr()->GetBool(OPT_CMP_STOP_AFTER_FIRST);
        m_pCtxt->m_nQuickCompareLimit = GetOptionsMgr()->GetInt(OPT_CMP_QUICK_LIMIT);
+       m_pCtxt->m_nBinaryCompareLimit = GetOptionsMgr()->GetInt(OPT_CMP_BINARY_LIMIT);
        m_pCtxt->m_bPluginsEnabled = GetOptionsMgr()->GetBool(OPT_PLUGINS_ENABLED);
        m_pCtxt->m_bWalkUniques = GetOptionsMgr()->GetBool(OPT_CMP_WALK_UNIQUE_DIRS);
        m_pCtxt->m_bIgnoreReparsePoints = GetOptionsMgr()->GetBool(OPT_CMP_IGNORE_REPARSE_POINTS);

diff --git a/Src/FolderCmp.cpp b/Src/FolderCmp.cpp
index 2e8ea0d..d28e7e9 100644 (file)
--- a/Src/FolderCmp.cpp
+++ b/Src/FolderCmp.cpp
@@ -64,13 +64,21 @@ int FolderCmp::prepAndCompareFiles(CDiffContext * pCtxt, DIFFITEM &di)
 {
        int nIndex;
        int nCompMethod = pCtxt->GetCompareMethod();
+       int nDirs = pCtxt->GetCompareDirs();
 
        unsigned code = DIFFCODE::FILE | DIFFCODE::CMPERR;
 
+       if ((nCompMethod == CMP_CONTENT || nCompMethod == CMP_QUICK_CONTENT) &&
+               ((di.diffFileInfo[0].size > pCtxt->m_nBinaryCompareLimit && di.diffFileInfo[0].size != DirItem::FILE_SIZE_NONE) ||
+                (di.diffFileInfo[1].size > pCtxt->m_nBinaryCompareLimit && di.diffFileInfo[1].size != DirItem::FILE_SIZE_NONE) ||
+                (nDirs > 2 && di.diffFileInfo[2].size > pCtxt->m_nBinaryCompareLimit && di.diffFileInfo[2].size != DirItem::FILE_SIZE_NONE)))
+       {
+               nCompMethod = CMP_BINARY_CONTENT;
+       }
+
        if (nCompMethod == CMP_CONTENT ||
                nCompMethod == CMP_QUICK_CONTENT)
        {
-               int nDirs = pCtxt->GetCompareDirs();
 
                // Reset text stats
                for (nIndex = 0; nIndex < nDirs; nIndex++)

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 3ae81de..2b39a48 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -1712,9 +1712,11 @@ BEGIN
     CONTROL         "Ignore &Reparse Points",IDC_IGNORE_REPARSEPOINTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,84,202,10\r
     LTEXT           "&Quick compare limit (MB):",IDC_STATIC,7,96,200,10\r
     EDITTEXT        IDC_COMPARE_QUICKC_LIMIT,7,108,30,14,ES_AUTOHSCROLL\r
+    LTEXT           "&Binary compare limit (MB):",IDC_STATIC,7,126,200,10\r
+    EDITTEXT        IDC_COMPARE_BINARYC_LIMIT,7,138,30,14,ES_AUTOHSCROLL\r
+    LTEXT           "&Number of compare threads (a negative value implies addition of the number of available CPU cores):",IDC_STATIC,7,154,230,30\r
+    EDITTEXT        IDC_COMPARE_THREAD_COUNT,7,176,30,14,ES_AUTOHSCROLL\r
     PUSHBUTTON      "Defaults",IDC_COMPAREFOLDER_DEFAULTS,7,198,70,14\r
-    LTEXT           "&Number of compare threads (a negative value implies addition of the number of available CPU cores):",IDC_STATIC,7,124,230,30\r
-    EDITTEXT        IDC_COMPARE_THREAD_COUNT,7,156,30,14,ES_AUTOHSCROLL\r
 END\r
 \r
 IDD_PROPPAGE_COMPARE_BINARY DIALOGEX 0, 0, 255, 205\r

diff --git a/Src/OptionsDef.h b/Src/OptionsDef.h
index 653fbdc..281960c 100644 (file)
--- a/Src/OptionsDef.h
+++ b/Src/OptionsDef.h
@@ -169,6 +169,7 @@ extern const String OPT_CMP_MOVED_BLOCKS OP("Settings/MovedBlocks");
 extern const String OPT_CMP_MATCH_SIMILAR_LINES OP("Settings/MatchSimilarLines");
 extern const String OPT_CMP_STOP_AFTER_FIRST OP("Settings/StopAfterFirst");
 extern const String OPT_CMP_QUICK_LIMIT OP("Settings/QuickMethodLimit");
+extern const String OPT_CMP_BINARY_LIMIT OP("Settings/BinaryMethodLimit");
 extern const String OPT_CMP_COMPARE_THREADS OP("Settings/CompareThreads");
 extern const String OPT_CMP_WALK_UNIQUE_DIRS OP("Settings/ScanUnpairedDir");
 extern const String OPT_CMP_IGNORE_REPARSE_POINTS OP("Settings/IgnoreReparsePoints");

diff --git a/Src/OptionsInit.cpp b/Src/OptionsInit.cpp
index 2b8d8ea..944a4be 100644 (file)
--- a/Src/OptionsInit.cpp
+++ b/Src/OptionsInit.cpp
@@ -119,6 +119,7 @@ void Init(COptionsMgr *pOptions)
        pOptions->InitOption(OPT_CMP_MATCH_SIMILAR_LINES, false);
        pOptions->InitOption(OPT_CMP_STOP_AFTER_FIRST, false);
        pOptions->InitOption(OPT_CMP_QUICK_LIMIT, 4 * 1024 * 1024); // 4 Megs
+       pOptions->InitOption(OPT_CMP_BINARY_LIMIT, 64 * 1024 * 1024); // 64 Megs
        pOptions->InitOption(OPT_CMP_COMPARE_THREADS, -1);
        pOptions->InitOption(OPT_CMP_WALK_UNIQUE_DIRS, false);
        pOptions->InitOption(OPT_CMP_IGNORE_REPARSE_POINTS, false);

diff --git a/Src/PropCompareFolder.cpp b/Src/PropCompareFolder.cpp
index faa69a7..86e2fc4 100644 (file)
--- a/Src/PropCompareFolder.cpp
+++ b/Src/PropCompareFolder.cpp
@@ -30,6 +30,7 @@ PropCompareFolder::PropCompareFolder(COptionsMgr *optionsMgr)
  , m_bExpandSubdirs(false)
  , m_bIgnoreReparsePoints(false)
  , m_nQuickCompareLimit(4 * Mega)
+ , m_nBinaryCompareLimit(64 * Mega)
  , m_nCompareThreads(-1)
 {
 }
@@ -46,6 +47,7 @@ void PropCompareFolder::DoDataExchange(CDataExchange* pDX)
        DDX_Check(pDX, IDC_EXPAND_SUBDIRS, m_bExpandSubdirs);
        DDX_Check(pDX, IDC_IGNORE_REPARSEPOINTS, m_bIgnoreReparsePoints);
        DDX_Text(pDX, IDC_COMPARE_QUICKC_LIMIT, m_nQuickCompareLimit);
+       DDX_Text(pDX, IDC_COMPARE_BINARYC_LIMIT, m_nBinaryCompareLimit);
        DDX_Text(pDX, IDC_COMPARE_THREAD_COUNT, m_nCompareThreads);
        //}}AFX_DATA_MAP
        UpdateControls();
@@ -75,6 +77,7 @@ void PropCompareFolder::ReadOptions()
        m_bExpandSubdirs = GetOptionsMgr()->GetBool(OPT_DIRVIEW_EXPAND_SUBDIRS);
        m_bIgnoreReparsePoints = GetOptionsMgr()->GetBool(OPT_CMP_IGNORE_REPARSE_POINTS);
        m_nQuickCompareLimit = GetOptionsMgr()->GetInt(OPT_CMP_QUICK_LIMIT) / Mega ;
+       m_nBinaryCompareLimit = GetOptionsMgr()->GetInt(OPT_CMP_BINARY_LIMIT) / Mega ;
        m_nCompareThreads = GetOptionsMgr()->GetInt(OPT_CMP_COMPARE_THREADS);
 }
 
@@ -96,6 +99,9 @@ void PropCompareFolder::WriteOptions()
        if (m_nQuickCompareLimit > 2000)
                m_nQuickCompareLimit = 2000;
        GetOptionsMgr()->SaveOption(OPT_CMP_QUICK_LIMIT, m_nQuickCompareLimit * Mega);
+       if (m_nBinaryCompareLimit > 2000)
+               m_nBinaryCompareLimit = 2000;
+       GetOptionsMgr()->SaveOption(OPT_CMP_BINARY_LIMIT, m_nBinaryCompareLimit * Mega);
        GetOptionsMgr()->SaveOption(OPT_CMP_COMPARE_THREADS, m_nCompareThreads);
 }
 
@@ -137,6 +143,7 @@ void PropCompareFolder::OnDefaults()
        m_bExpandSubdirs = GetOptionsMgr()->GetDefault<bool>(OPT_DIRVIEW_EXPAND_SUBDIRS);
        m_bIgnoreReparsePoints = GetOptionsMgr()->GetDefault<bool>(OPT_CMP_IGNORE_REPARSE_POINTS);
        m_nQuickCompareLimit = GetOptionsMgr()->GetDefault<unsigned>(OPT_CMP_QUICK_LIMIT) / Mega;
+       m_nBinaryCompareLimit = GetOptionsMgr()->GetDefault<unsigned>(OPT_CMP_BINARY_LIMIT) / Mega;
        m_nCompareThreads = GetOptionsMgr()->GetDefault<unsigned>(OPT_CMP_COMPARE_THREADS);
        UpdateData(FALSE);
 }

diff --git a/Src/PropCompareFolder.h b/Src/PropCompareFolder.h
index 57d5539..29ccdc3 100644 (file)
--- a/Src/PropCompareFolder.h
+++ b/Src/PropCompareFolder.h
@@ -43,6 +43,7 @@ public:
        bool    m_bExpandSubdirs;
        bool    m_bIgnoreReparsePoints;
        unsigned m_nQuickCompareLimit;
+       unsigned m_nBinaryCompareLimit;
        int     m_nCompareThreads;
        //}}AFX_DATA
 

diff --git a/Src/resource.h b/Src/resource.h
index f9ce08d..78eb57f 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -472,6 +472,7 @@
 #define IDC_UNREGISTER_SHELLEXTENSION   1350\r
 #define IDC_MARGIN_COLOR_LABEL          1351\r
 #define IDC_MARGIN_BKGD_COLOR           1352\r
+#define IDC_COMPARE_BINARYC_LIMIT       1353\r
 #define IDC_EDIT_WHOLE_WORD             8603\r
 #define IDC_EDIT_MATCH_CASE             8604\r
 #define IDC_EDIT_FINDTEXT               8605\r

diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po
index 6abb5f7..5de1d68 100644 (file)
--- a/Translations/WinMerge/Basque.po
+++ b/Translations/WinMerge/Basque.po
@@ -2758,6 +2758,10 @@ msgstr ""
 msgid "&Quick compare limit (MB):"
 msgstr "&Alderaketa azkar muga (MB):"
 
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
 #: Merge.rc:2188DD49
 #, c-format
 msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"

diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po
index 7e1ce09..7627699 100644 (file)
--- a/Translations/WinMerge/Brazilian.po
+++ b/Translations/WinMerge/Brazilian.po
@@ -2762,6 +2762,10 @@ msgstr "Ignorar &Pontos de Re-análise"
 msgid "&Quick compare limit (MB):"
 msgstr "&Limite de comparação rápida (MB):"
 
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
 #: Merge.rc:2188DD49
 #, c-format
 msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"

diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po
index 314b869..24cbbf1 100644 (file)
--- a/Translations/WinMerge/Bulgarian.po
+++ b/Translations/WinMerge/Bulgarian.po
@@ -2751,6 +2751,10 @@ msgstr "Игнориране &точки за възстановяване"
 msgid "&Quick compare limit (MB):"
 msgstr "Лимит за бързо сравнение (MB):"
 
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
 #: Merge.rc:2188DD49
 #, c-format
 msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"

diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po
index e4b78a9..9fbe980 100644 (file)
--- a/Translations/WinMerge/Catalan.po
+++ b/Translations/WinMerge/Catalan.po
@@ -2750,6 +2750,10 @@ msgstr ""
 msgid "&Quick compare limit (MB):"
 msgstr ""
 
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
 #: Merge.rc:2188DD49
 #, c-format
 msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"

diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po
index 21ba6c3..be03984 100644 (file)
--- a/Translations/WinMerge/ChineseSimplified.po
+++ b/Translations/WinMerge/ChineseSimplified.po
@@ -2753,6 +2753,10 @@ msgstr "忽略重新解析点(&R)"
 msgid "&Quick compare limit (MB):"
 msgstr "快速比较限制 (MB) (&Q):"
 
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
 #: Merge.rc:2188DD49
 #, c-format
 msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"

diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po
index 02701c4..5c36785 100644 (file)
--- a/Translations/WinMerge/ChineseTraditional.po
+++ b/Translations/WinMerge/ChineseTraditional.po
@@ -2766,6 +2766,10 @@ msgstr "忽略重新分析點(&R)"
 msgid "&Quick compare limit (MB):"
 msgstr "快速比較之檔案大小上限 (MB)(&Q)："
 
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
 #: Merge.rc:2188DD49
 #, c-format
 msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"

diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po
index 0bd60e2..de440b5 100644 (file)
--- a/Translations/WinMerge/Croatian.po
+++ b/Translations/WinMerge/Croatian.po
@@ -2755,6 +2755,10 @@ msgstr ""
 msgid "&Quick compare limit (MB):"
 msgstr ""
 
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
 #: Merge.rc:2188DD49
 #, c-format
 msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"

diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po
index 4735ee1..847ba9b 100644 (file)
--- a/Translations/WinMerge/Czech.po
+++ b/Translations/WinMerge/Czech.po
@@ -2753,6 +2753,10 @@ msgstr ""
 msgid "&Quick compare limit (MB):"
 msgstr "&Omezení pro rychlé porovnání (MB):"
 
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
 #: Merge.rc:2188DD49
 #, c-format
 msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"

diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po
index 0ef6072..255148b 100644 (file)
--- a/Translations/WinMerge/Danish.po
+++ b/Translations/WinMerge/Danish.po
@@ -2762,6 +2762,10 @@ msgstr ""
 msgid "&Quick compare limit (MB):"
 msgstr "&Grænse for hurtig sammenligning (MB):"
 
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
 #: Merge.rc:2188DD49
 #, c-format
 msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"

diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po
index 2c3d9eb..950effc 100644 (file)
--- a/Translations/WinMerge/Dutch.po
+++ b/Translations/WinMerge/Dutch.po
@@ -2768,6 +2768,10 @@ msgstr "Punten voor opnieuw verwerken negeren"
 msgid "&Quick compare limit (MB):"
 msgstr "Limiet snelvergelijking (MB):"
 
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
 #: Merge.rc:2188DD49
 #, c-format
 msgid ""

diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot
index 20e4fd7..99a1964 100644 (file)
--- a/Translations/WinMerge/English.pot
+++ b/Translations/WinMerge/English.pot
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2019-04-19 22:03+0000\n"
+"POT-Creation-Date: 2019-04-21 22:56+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
@@ -2220,6 +2220,10 @@ msgstr ""
 msgid "&Quick compare limit (MB):"
 msgstr ""
 
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
 #: Merge.rc:2188DD49
 msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
 msgstr ""

diff --git a/Translations/WinMerge/Finnish.po b/Translations/WinMerge/Finnish.po
index c5897d2..deff253 100644 (file)
--- a/Translations/WinMerge/Finnish.po
+++ b/Translations/WinMerge/Finnish.po
@@ -2748,6 +2748,10 @@ msgstr ""
 msgid "&Quick compare limit (MB):"
 msgstr "Pikavertailun raja (Mt):"
 
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
 #: Merge.rc:2188DD49
 #, c-format
 msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"

diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po
index a674662..31ac1a9 100644 (file)
--- a/Translations/WinMerge/French.po
+++ b/Translations/WinMerge/French.po
@@ -2759,6 +2759,10 @@ msgstr ""
 msgid "&Quick compare limit (MB):"
 msgstr "&Limite de comparaison rapide (MO):"
 
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
 #: Merge.rc:2188DD49
 #, c-format
 msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"

diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po
index 608201f..597698c 100644 (file)
--- a/Translations/WinMerge/Galician.po
+++ b/Translations/WinMerge/Galician.po
@@ -2756,6 +2756,10 @@ msgstr ""
 msgid "&Quick compare limit (MB):"
 msgstr ""
 
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
 #: Merge.rc:2188DD49
 #, c-format
 msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"

diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po
index 867b1fe..2e6010f 100644 (file)
--- a/Translations/WinMerge/German.po
+++ b/Translations/WinMerge/German.po
@@ -2761,6 +2761,10 @@ msgstr ""
 msgid "&Quick compare limit (MB):"
 msgstr "&Limit für Schneller Inhalt (MB):"
 
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
 #: Merge.rc:2188DD49
 #, c-format
 msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"

diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po
index f190c2c..177bb48 100644 (file)
--- a/Translations/WinMerge/Greek.po
+++ b/Translations/WinMerge/Greek.po
@@ -2750,6 +2750,10 @@ msgstr ""
 msgid "&Quick compare limit (MB):"
 msgstr ""
 
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
 #: Merge.rc:2188DD49
 #, c-format
 msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"

diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po
index e87f536..93a8780 100644 (file)
--- a/Translations/WinMerge/Hungarian.po
+++ b/Translations/WinMerge/Hungarian.po
@@ -2751,6 +2751,10 @@ msgstr ""
 msgid "&Quick compare limit (MB):"
 msgstr ""
 
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
 #: Merge.rc:2188DD49
 #, c-format
 msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"

diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po
index a69b7c5..1ecf911 100644 (file)
--- a/Translations/WinMerge/Italian.po
+++ b/Translations/WinMerge/Italian.po
@@ -2751,6 +2751,10 @@ msgstr ""
 msgid "&Quick compare limit (MB):"
 msgstr ""
 
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
 #: Merge.rc:2188DD49
 #, c-format
 msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"

diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po
index 9f59c25..3ec26a8 100644 (file)
--- a/Translations/WinMerge/Japanese.po
+++ b/Translations/WinMerge/Japanese.po
@@ -2242,7 +2242,11 @@ msgstr "再解析ポイントを無視する(&R)"
 
 #: Merge.rc:2E2C5208
 msgid "&Quick compare limit (MB):"
-msgstr "クイック コンテンツ制限 (MB)(&Q):"
+msgstr "クイック比較切替閾値 (MB)(&Q):"
+
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr "バイナリ比較切替閾値 (MB)(&B):"
 
 #: Merge.rc:2188DD49
 msgid ""

diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po
index 8781d43..05418f6 100644 (file)
--- a/Translations/WinMerge/Korean.po
+++ b/Translations/WinMerge/Korean.po
@@ -2763,6 +2763,10 @@ msgstr "재분석 지점 무시하기(&R)"
 msgid "&Quick compare limit (MB):"
 msgstr "빠른 비교 제한 (MB):"
 
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
 #: Merge.rc:2188DD49
 #, c-format
 msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"

diff --git a/Translations/WinMerge/Lithuanian.po b/Translations/WinMerge/Lithuanian.po
index aff243f..1762b5b 100644 (file)
--- a/Translations/WinMerge/Lithuanian.po
+++ b/Translations/WinMerge/Lithuanian.po
@@ -2237,6 +2237,10 @@ msgstr "Ignoruoti paka&rtotinio apdorojimo taškus"
 msgid "&Quick compare limit (MB):"
 msgstr "&Greitojo palyginimo limitas (MB):"
 
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
 #: Merge.rc:2188DD49
 msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
 msgstr "Lygi&nimo srautų skaičius (neigiama reikšmė reiškia turimų procesoriaus branduolių skaičiaus pridėjimą):"

diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po
index 9c4b9ea..109ee70 100644 (file)
--- a/Translations/WinMerge/Norwegian.po
+++ b/Translations/WinMerge/Norwegian.po
@@ -2755,6 +2755,10 @@ msgstr ""
 msgid "&Quick compare limit (MB):"
 msgstr ""
 
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
 #: Merge.rc:2188DD49
 #, c-format
 msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"

diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po
index fa2938e..c5438ba 100644 (file)
--- a/Translations/WinMerge/Persian.po
+++ b/Translations/WinMerge/Persian.po
@@ -2764,6 +2764,10 @@ msgstr ""
 msgid "&Quick compare limit (MB):"
 msgstr "&Q حد همسنجي سريع (مگابايت)"
 
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
 #: Merge.rc:2188DD49
 #, c-format
 msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"

diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po
index 5c10ef6..c57d53d 100644 (file)
--- a/Translations/WinMerge/Polish.po
+++ b/Translations/WinMerge/Polish.po
@@ -2756,6 +2756,10 @@ msgstr ""
 msgid "&Quick compare limit (MB):"
 msgstr "Limit sz&ybkiego porównania (MB):"
 
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
 #: Merge.rc:2188DD49
 #, c-format
 msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"

diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po
index d3fb297..36b1eb0 100644 (file)
--- a/Translations/WinMerge/Portuguese.po
+++ b/Translations/WinMerge/Portuguese.po
@@ -2751,6 +2751,10 @@ msgstr "Ignorar pontos de &análise"
 msgid "&Quick compare limit (MB):"
 msgstr "&Limite da comparação rápida (MB):"
 
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
 #: Merge.rc:2188DD49
 #, c-format
 msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"

diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po
index be4c78d..891b60d 100644 (file)
--- a/Translations/WinMerge/Romanian.po
+++ b/Translations/WinMerge/Romanian.po
@@ -2751,6 +2751,10 @@ msgstr ""
 msgid "&Quick compare limit (MB):"
 msgstr ""
 
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
 #: Merge.rc:2188DD49
 #, c-format
 msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"

diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po
index bb386de..ca7b09f 100644 (file)
--- a/Translations/WinMerge/Russian.po
+++ b/Translations/WinMerge/Russian.po
@@ -2758,6 +2758,10 @@ msgstr "Игнорировать точки повторной обработк
 msgid "&Quick compare limit (MB):"
 msgstr "Ограничение быстрого сравнения (МБ)"
 
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
 #: Merge.rc:2188DD49
 #, c-format
 msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"

diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po
index 3dffae5..bd176cc 100644 (file)
--- a/Translations/WinMerge/Serbian.po
+++ b/Translations/WinMerge/Serbian.po
@@ -2738,6 +2738,10 @@ msgstr ""
 msgid "&Quick compare limit (MB):"
 msgstr ""
 
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
 #: Merge.rc:2188DD49
 #, c-format
 msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"

diff --git a/Translations/WinMerge/Sinhala.po b/Translations/WinMerge/Sinhala.po
index edba93a..df3b7c4 100644 (file)
--- a/Translations/WinMerge/Sinhala.po
+++ b/Translations/WinMerge/Sinhala.po
@@ -2750,6 +2750,10 @@ msgstr ""
 msgid "&Quick compare limit (MB):"
 msgstr ""
 
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
 #: Merge.rc:2188DD49
 #, c-format
 msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"

diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po
index 856c92e..a8a20ba 100644 (file)
--- a/Translations/WinMerge/Slovak.po
+++ b/Translations/WinMerge/Slovak.po
@@ -2755,6 +2755,10 @@ msgstr ""
 msgid "&Quick compare limit (MB):"
 msgstr ""
 
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
 #: Merge.rc:2188DD49
 #, c-format
 msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"

diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po
index fb1eb19..3150c52 100644 (file)
--- a/Translations/WinMerge/Slovenian.po
+++ b/Translations/WinMerge/Slovenian.po
@@ -2758,6 +2758,10 @@ msgstr ""
 msgid "&Quick compare limit (MB):"
 msgstr "Omejitev za &hitro primerjavo (MB):"
 
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
 #: Merge.rc:2188DD49
 #, c-format
 msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"

diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po
index 82673ba..cd90165 100644 (file)
--- a/Translations/WinMerge/Spanish.po
+++ b/Translations/WinMerge/Spanish.po
@@ -2757,6 +2757,10 @@ msgstr ""
 msgid "&Quick compare limit (MB):"
 msgstr ""
 
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
 #: Merge.rc:2188DD49
 #, c-format
 msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"

diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po
index 52d2581..dfe5ba0 100644 (file)
--- a/Translations/WinMerge/Swedish.po
+++ b/Translations/WinMerge/Swedish.po
@@ -2763,6 +2763,10 @@ msgstr "Åsidosätt ÅtertolkningsMarkeringar"
 msgid "&Quick compare limit (MB):"
 msgstr "Högsta SnabbJämförelseStorlek (MB):"
 
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
 #: Merge.rc:2188DD49
 msgid ""
 "&Number of compare threads (a negative value implies addition of the number "

diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po
index 83573c9..937a674 100644 (file)
--- a/Translations/WinMerge/Turkish.po
+++ b/Translations/WinMerge/Turkish.po
@@ -2758,6 +2758,10 @@ msgstr "Yeniden İşleme Noktala&rı Yok Sayılsın"
 msgid "&Quick compare limit (MB):"
 msgstr "&Hızlı Karşılaştırma Sınırı (MB):"
 
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
 #: Merge.rc:2188DD49
 #, c-format
 msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"

diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po
index dc5b939..de3f4ad 100644 (file)
--- a/Translations/WinMerge/Ukrainian.po
+++ b/Translations/WinMerge/Ukrainian.po
@@ -2756,6 +2756,10 @@ msgstr ""
 msgid "&Quick compare limit (MB):"
 msgstr ""
 
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
 #: Merge.rc:2188DD49
 #, c-format
 msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"