Use libXDiff library(9): Add `Enable indent heuristic` checkbox to Options dialog

diff --git a/Src/CompareOptions.cpp b/Src/CompareOptions.cpp
index eec8ca9..e917953 100644 (file)
--- a/Src/CompareOptions.cpp
+++ b/Src/CompareOptions.cpp
@@ -19,6 +19,8 @@ CompareOptions::CompareOptions()
 , m_bIgnoreBlankLines(false)
 , m_bIgnoreCase(false)
 , m_bIgnoreEOLDifference(false)
+, m_diffAlgorithm(DIFF_ALGORITHM_DEFAULT)
+, m_bIndentHeuristic(true)
 {
 }
 
@@ -30,6 +32,8 @@ CompareOptions::CompareOptions(const CompareOptions & options)
 , m_bIgnoreBlankLines(options.m_bIgnoreBlankLines)
 , m_bIgnoreCase(options.m_bIgnoreCase)
 , m_bIgnoreEOLDifference(options.m_bIgnoreEOLDifference)
+, m_diffAlgorithm(options.m_diffAlgorithm)
+, m_bIndentHeuristic(options.m_bIndentHeuristic)
 {
 }
 
@@ -39,15 +43,10 @@ CompareOptions::CompareOptions(const CompareOptions & options)
  */
 DiffutilsOptions::DiffutilsOptions(const DiffutilsOptions& options)
 : CompareOptions(options)
+, m_contextLines(options.m_contextLines)
+, m_filterCommentsLines(options.m_filterCommentsLines)
+, m_outputStyle(options.m_outputStyle)
 {
-       m_bIgnoreBlankLines = options.m_bIgnoreBlankLines;
-       m_bIgnoreCase = options.m_bIgnoreCase;
-       m_bIgnoreEOLDifference = options.m_bIgnoreEOLDifference;
-       m_contextLines = options.m_contextLines;
-       m_filterCommentsLines = options.m_filterCommentsLines;
-       m_ignoreWhitespace = options.m_ignoreWhitespace;
-       m_outputStyle = options.m_outputStyle;
-       m_bIgnoreEOLDifference = options.m_bIgnoreEOLDifference;
 }
 
 /**
@@ -74,6 +73,7 @@ void CompareOptions::SetFromDiffOptions(const DIFFOPTIONS &options)
        m_bIgnoreBlankLines = options.bIgnoreBlankLines;
        m_bIgnoreCase = options.bIgnoreCase;
        m_bIgnoreEOLDifference = options.bIgnoreEol;
+       m_bIndentHeuristic = options.bIndentHeuristic;
        switch (options.nDiffAlgorithm)
        {
        case 0:

diff --git a/Src/CompareOptions.h b/Src/CompareOptions.h
index 549fb4a..119d890 100644 (file)
--- a/Src/CompareOptions.h
+++ b/Src/CompareOptions.h
@@ -83,6 +83,7 @@ struct DIFFOPTIONS
        bool bIgnoreEol; /**< Ignore EOL differences -option. */
        bool bFilterCommentsLines; /**< Ignore Multiline comments differences -option. */
        int nDiffAlgorithm; /**< Diff algorithm -option. */
+       bool bIndentHeuristic; /**< Ident heuristic -option */
 };
 
 /**
@@ -102,6 +103,7 @@ public:
        bool m_bIgnoreCase; /**< Ignore case differences? */
        bool m_bIgnoreEOLDifference; /**< Ignore EOL style differences? */
        enum DiffAlgorithm m_diffAlgorithm; /** Diff algorithm */
+       bool m_bIndentHeuristic; /**< Indent heuristic */
 };
 
 /**

diff --git a/Src/Merge.rc b/Src/Merge.rc
index ac99790..821e951 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -1283,11 +1283,12 @@ BEGIN
     CONTROL         "Ignore codepage &differences",IDC_CP_SENSITIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,96,241,10\r
     CONTROL         "E&nable moved block detection",IDC_MOVED_BLOCKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,108,241,10\r
     CONTROL         "&Match similar lines",IDC_MATCH_SIMILAR_LINES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,241,10\r
+    LTEXT           "Diff &algorithm (Experimental):",IDC_STATIC,7,132,140,20\r
+    COMBOBOX        IDC_DIFF_ALGORITHM,145,132,100,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
+    CONTROL         "Enable indent &heuristic",IDC_INDENT_HEURISTIC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,146,241,10\r
     GROUPBOX        "Comments",IDC_STATIC,7,164,241,32\r
     CONTROL         "Filter Comments",IDC_FILTERCOMMENTS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,177,205,10\r
     PUSHBUTTON      "Defaults",IDC_COMPARE_DEFAULTS,7,198,70,14\r
-    LTEXT           "Diff &algorithm (Experimental):",IDC_STATIC,7,138,140,20\r
-    COMBOBOX        IDC_DIFF_ALGORITHM,145,138,100,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
 END\r
 \r
 IDD_PROPPAGE_EDITOR DIALOGEX 0, 0, 255, 215\r

diff --git a/Src/OptionsDef.h b/Src/OptionsDef.h
index ea94410..dd3409c 100644 (file)
--- a/Src/OptionsDef.h
+++ b/Src/OptionsDef.h
@@ -175,6 +175,7 @@ extern const String OPT_CMP_WALK_UNIQUE_DIRS OP("Settings/ScanUnpairedDir");
 extern const String OPT_CMP_IGNORE_REPARSE_POINTS OP("Settings/IgnoreReparsePoints");
 extern const String OPT_CMP_INCLUDE_SUBDIRS OP("Settings/Recurse");
 extern const String OPT_CMP_DIFF_ALGORITHM OP("Settings/DiffAlgorithm");
+extern const String OPT_CMP_INDENT_HEURISTIC OP("Settings/IndentHeuristic");
 
 // Image Compare options
 extern const String OPT_CMP_IMG_FILEPATTERNS OP("Settings/ImageFilePatterns");

diff --git a/Src/OptionsDiffOptions.cpp b/Src/OptionsDiffOptions.cpp
index 00157d5..1cd2e7a 100644 (file)
--- a/Src/OptionsDiffOptions.cpp
+++ b/Src/OptionsDiffOptions.cpp
@@ -22,6 +22,7 @@ void SetDefaults(COptionsMgr *pOptionsMgr)
        pOptionsMgr->InitOption(OPT_CMP_IGNORE_CASE, false);
        pOptionsMgr->InitOption(OPT_CMP_IGNORE_EOL, false);
        pOptionsMgr->InitOption(OPT_CMP_DIFF_ALGORITHM, (int)0);
+       pOptionsMgr->InitOption(OPT_CMP_INDENT_HEURISTIC, true);
 }
 
 void Load(const COptionsMgr *pOptionsMgr, DIFFOPTIONS& options)
@@ -32,6 +33,7 @@ void Load(const COptionsMgr *pOptionsMgr, DIFFOPTIONS& options)
        options.bIgnoreCase = pOptionsMgr->GetBool(OPT_CMP_IGNORE_CASE);
        options.bIgnoreEol = pOptionsMgr->GetBool(OPT_CMP_IGNORE_EOL);
        options.nDiffAlgorithm = pOptionsMgr->GetInt(OPT_CMP_DIFF_ALGORITHM);
+       options.bIndentHeuristic = pOptionsMgr->GetBool(OPT_CMP_INDENT_HEURISTIC);
 }
 
 void Save(COptionsMgr *pOptionsMgr, const DIFFOPTIONS& options)
@@ -42,6 +44,7 @@ void Save(COptionsMgr *pOptionsMgr, const DIFFOPTIONS& options)
        pOptionsMgr->SaveOption(OPT_CMP_IGNORE_CASE, options.bIgnoreCase);
        pOptionsMgr->SaveOption(OPT_CMP_IGNORE_EOL, options.bIgnoreEol);
        pOptionsMgr->SaveOption(OPT_CMP_DIFF_ALGORITHM, options.nDiffAlgorithm);
+       pOptionsMgr->SaveOption(OPT_CMP_INDENT_HEURISTIC, options.bIndentHeuristic);
 }
 
 }

diff --git a/Src/PropCompare.cpp b/Src/PropCompare.cpp
index d82ee2a..fae27e3 100644 (file)
--- a/Src/PropCompare.cpp
+++ b/Src/PropCompare.cpp
@@ -29,6 +29,7 @@ PropCompare::PropCompare(COptionsMgr *optionsMgr)
  , m_bMatchSimilarLines(false)
  , m_bFilterCommentsLines(false)
  , m_nDiffAlgorithm(0)
+ , m_bIndentHeuristic(true)
 {
 }
 
@@ -37,6 +38,7 @@ void PropCompare::DoDataExchange(CDataExchange* pDX)
        CPropertyPage::DoDataExchange(pDX);
        //{{AFX_DATA_MAP(PropCompare)
        DDX_CBIndex(pDX, IDC_DIFF_ALGORITHM, m_nDiffAlgorithm);
+       DDX_Check(pDX, IDC_INDENT_HEURISTIC, m_bIndentHeuristic);
        DDX_Check(pDX, IDC_IGNCASE_CHECK, m_bIgnoreCase);
        DDX_Check(pDX, IDC_IGNBLANKS_CHECK, m_bIgnoreBlankLines);
        DDX_Check(pDX, IDC_FILTERCOMMENTS_CHECK, m_bFilterCommentsLines);
@@ -46,12 +48,14 @@ void PropCompare::DoDataExchange(CDataExchange* pDX)
        DDX_Check(pDX, IDC_MOVED_BLOCKS, m_bMovedBlocks);
        DDX_Check(pDX, IDC_MATCH_SIMILAR_LINES, m_bMatchSimilarLines);
        //}}AFX_DATA_MAP
+       UpdateControls();
 }
 
 
 BEGIN_MESSAGE_MAP(PropCompare, CPropertyPage)
        //{{AFX_MSG_MAP(PropCompare)
        ON_BN_CLICKED(IDC_COMPARE_DEFAULTS, OnDefaults)
+       ON_CBN_SELCHANGE(IDC_DIFF_ALGORITHM, OnCbnSelchangeDiffAlgorithm)
        //}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
@@ -71,6 +75,7 @@ void PropCompare::ReadOptions()
        m_bMovedBlocks = GetOptionsMgr()->GetBool(OPT_CMP_MOVED_BLOCKS);
        m_bMatchSimilarLines = GetOptionsMgr()->GetBool(OPT_CMP_MATCH_SIMILAR_LINES);
        m_nDiffAlgorithm = GetOptionsMgr()->GetInt(OPT_CMP_DIFF_ALGORITHM);
+       m_bIndentHeuristic = GetOptionsMgr()->GetBool(OPT_CMP_INDENT_HEURISTIC);
 }
 
 /** 
@@ -89,6 +94,7 @@ void PropCompare::WriteOptions()
        GetOptionsMgr()->SaveOption(OPT_CMP_MOVED_BLOCKS, m_bMovedBlocks);
        GetOptionsMgr()->SaveOption(OPT_CMP_MATCH_SIMILAR_LINES, m_bMatchSimilarLines);
        GetOptionsMgr()->SaveOption(OPT_CMP_DIFF_ALGORITHM, m_nDiffAlgorithm);
+       GetOptionsMgr()->SaveOption(OPT_CMP_INDENT_HEURISTIC, m_bIndentHeuristic);
 }
 
 /** 
@@ -126,5 +132,17 @@ void PropCompare::OnDefaults()
        m_bMovedBlocks = GetOptionsMgr()->GetDefault<bool>(OPT_CMP_MOVED_BLOCKS);
        m_bMatchSimilarLines = GetOptionsMgr()->GetDefault<bool>(OPT_CMP_MATCH_SIMILAR_LINES);
        m_nDiffAlgorithm = GetOptionsMgr()->GetDefault<unsigned>(OPT_CMP_DIFF_ALGORITHM);
+       m_bIndentHeuristic = GetOptionsMgr()->GetDefault<bool>(OPT_CMP_INDENT_HEURISTIC);
        UpdateData(FALSE);
 }
+
+void PropCompare::OnCbnSelchangeDiffAlgorithm()
+{
+       UpdateControls();
+}
+
+void PropCompare::UpdateControls()
+{
+       CComboBox * pCombo = (CComboBox*)GetDlgItem(IDC_DIFF_ALGORITHM);
+       EnableDlgItem(IDC_INDENT_HEURISTIC, pCombo->GetCurSel() != 0);
+}

diff --git a/Src/PropCompare.h b/Src/PropCompare.h
index 16980df..53bf37d 100644 (file)
--- a/Src/PropCompare.h
+++ b/Src/PropCompare.h
@@ -39,6 +39,7 @@ public:
        bool    m_bMatchSimilarLines;
        bool    m_bFilterCommentsLines;
        int     m_nDiffAlgorithm;
+       bool    m_bIndentHeuristic;
        //}}AFX_DATA
 
 
@@ -55,6 +56,9 @@ protected:
        //{{AFX_MSG(PropCompare)
        afx_msg BOOL OnInitDialog() override;
        afx_msg void OnDefaults();
+       afx_msg void OnCbnSelchangeDiffAlgorithm();
        //}}AFX_MSG
        DECLARE_MESSAGE_MAP()
+
+       void UpdateControls();
 };

diff --git a/Src/resource.h b/Src/resource.h
index 92004f0..9345528 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -517,6 +517,7 @@
 #define IDC_SWAP12_STATIC               8826\r
 #define IDC_SWAP02_STATIC               8827\r
 #define IDC_DIFF_ALGORITHM              8828\r
+#define IDC_INDENT_HEURISTIC            8829\r
 #define IDS_SPLASH_DEVELOPERS           8976\r
 #define IDS_SPLASH_GPLTEXT              8977\r
 #define IDS_MESSAGEBOX_OK               9001\r
@@ -1243,7 +1244,7 @@
 #define _APS_3D_CONTROLS                     1\r
 #define _APS_NEXT_RESOURCE_VALUE        250\r
 #define _APS_NEXT_COMMAND_VALUE         33660\r
-#define _APS_NEXT_CONTROL_VALUE         8829\r
+#define _APS_NEXT_CONTROL_VALUE         8830\r
 #define _APS_NEXT_SYMED_VALUE           116\r
 #endif\r
 #endif\r

diff --git a/Src/xdiff_gnudiff_compat.cpp b/Src/xdiff_gnudiff_compat.cpp
index 3f9b983..7ce9db4 100644 (file)
--- a/Src/xdiff_gnudiff_compat.cpp
+++ b/Src/xdiff_gnudiff_compat.cpp
@@ -56,6 +56,8 @@ unsigned long make_xdl_flags(const DiffutilsOptions& options)
        default:\r
                break;\r
        }\r
+       if (options.m_bIndentHeuristic)\r
+               xdl_flags |= XDF_INDENT_HEURISTIC;\r
        return xdl_flags;\r
 }\r
 \r

diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po
index 790ca7f..46645ee 100644 (file)
--- a/Translations/WinMerge/Basque.po
+++ b/Translations/WinMerge/Basque.po
@@ -2067,6 +2067,14 @@ msgstr "Gaitu bloke &mugitu atzematea"
 msgid "&Match similar lines"
 msgstr "&Berdindu antzeko lerroak"
 
+#: Merge.rc:57F02FB4
+msgid "Diff &algorithm (Experimental):"
+msgstr ""
+
+#: Merge.rc:6AE6FCAE
+msgid "Enable indent &heuristic"
+msgstr ""
+
 #: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
@@ -2077,10 +2085,6 @@ msgstr "Aipamenak"
 msgid "Filter Comments"
 msgstr "&Iragazki Aipamenak"
 
-#: Merge.rc:57F02FB4
-msgid "Diff &algorithm (Experimental):"
-msgstr ""
-
 #: Merge.rc:3BB91A82
 #, c-format
 msgid "Editor"

diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po
index 4364233..2c6730d 100644 (file)
--- a/Translations/WinMerge/Brazilian.po
+++ b/Translations/WinMerge/Brazilian.po
@@ -2067,6 +2067,14 @@ msgstr "A&tivar a detecção dos blocos movidos"
 msgid "&Match similar lines"
 msgstr "&Combinar com linhas similares"
 
+#: Merge.rc:57F02FB4
+msgid "Diff &algorithm (Experimental):"
+msgstr ""
+
+#: Merge.rc:6AE6FCAE
+msgid "Enable indent &heuristic"
+msgstr ""
+
 #: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
@@ -2077,10 +2085,6 @@ msgstr "Comentários"
 msgid "Filter Comments"
 msgstr "Comentários do Filtro"
 
-#: Merge.rc:57F02FB4
-msgid "Diff &algorithm (Experimental):"
-msgstr ""
-
 #: Merge.rc:3BB91A82
 #, c-format
 msgid "Editor"

diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po
index 93b539f..329abae 100644 (file)
--- a/Translations/WinMerge/Bulgarian.po
+++ b/Translations/WinMerge/Bulgarian.po
@@ -2064,6 +2064,14 @@ msgstr "Позволи разпознаване на преместен &бло
 msgid "&Match similar lines"
 msgstr "Съответствие на подобни редове"
 
+#: Merge.rc:57F02FB4
+msgid "Diff &algorithm (Experimental):"
+msgstr ""
+
+#: Merge.rc:6AE6FCAE
+msgid "Enable indent &heuristic"
+msgstr ""
+
 #: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
@@ -2074,10 +2082,6 @@ msgstr "Коментари"
 msgid "Filter Comments"
 msgstr "Филтър за коментари"
 
-#: Merge.rc:57F02FB4
-msgid "Diff &algorithm (Experimental):"
-msgstr ""
-
 #: Merge.rc:3BB91A82
 #, c-format
 msgid "Editor"

diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po
index 9205fb1..1e8ae6c 100644 (file)
--- a/Translations/WinMerge/Catalan.po
+++ b/Translations/WinMerge/Catalan.po
@@ -2063,6 +2063,14 @@ msgstr "&Habilita detecció de blocs desplaçats"
 msgid "&Match similar lines"
 msgstr "Em&parella les línies similars"
 
+#: Merge.rc:57F02FB4
+msgid "Diff &algorithm (Experimental):"
+msgstr ""
+
+#: Merge.rc:6AE6FCAE
+msgid "Enable indent &heuristic"
+msgstr ""
+
 #: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
@@ -2073,10 +2081,6 @@ msgstr "Comentaris"
 msgid "Filter Comments"
 msgstr "&Filtra els comentaris"
 
-#: Merge.rc:57F02FB4
-msgid "Diff &algorithm (Experimental):"
-msgstr ""
-
 #: Merge.rc:3BB91A82
 #, c-format
 msgid "Editor"

diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po
index dd345d0..59be0a7 100644 (file)
--- a/Translations/WinMerge/ChineseSimplified.po
+++ b/Translations/WinMerge/ChineseSimplified.po
@@ -2066,6 +2066,14 @@ msgstr "启用检测移动的区块(&N)"
 msgid "&Match similar lines"
 msgstr "匹配相似的行(&M)"
 
+#: Merge.rc:57F02FB4
+msgid "Diff &algorithm (Experimental):"
+msgstr ""
+
+#: Merge.rc:6AE6FCAE
+msgid "Enable indent &heuristic"
+msgstr ""
+
 #: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
@@ -2076,10 +2084,6 @@ msgstr "备注"
 msgid "Filter Comments"
 msgstr "过滤注释"
 
-#: Merge.rc:57F02FB4
-msgid "Diff &algorithm (Experimental):"
-msgstr ""
-
 #: Merge.rc:3BB91A82
 #, c-format
 msgid "Editor"

diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po
index aab24ed..2576580 100644 (file)
--- a/Translations/WinMerge/ChineseTraditional.po
+++ b/Translations/WinMerge/ChineseTraditional.po
@@ -2074,6 +2074,14 @@ msgstr "偵測移位的區塊(&N)"
 msgid "&Match similar lines"
 msgstr "找出相似行(&M)"
 
+#: Merge.rc:57F02FB4
+msgid "Diff &algorithm (Experimental):"
+msgstr ""
+
+#: Merge.rc:6AE6FCAE
+msgid "Enable indent &heuristic"
+msgstr ""
+
 #: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
@@ -2084,10 +2092,6 @@ msgstr "備註"
 msgid "Filter Comments"
 msgstr "篩選器註解"
 
-#: Merge.rc:57F02FB4
-msgid "Diff &algorithm (Experimental):"
-msgstr ""
-
 #: Merge.rc:3BB91A82
 #, c-format
 msgid "Editor"

diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po
index e71b262..588b074 100644 (file)
--- a/Translations/WinMerge/Croatian.po
+++ b/Translations/WinMerge/Croatian.po
@@ -2064,6 +2064,14 @@ msgstr "Omogući &razlikovanje premještenih blokova"
 msgid "&Match similar lines"
 msgstr "&Jednake retke"
 
+#: Merge.rc:57F02FB4
+msgid "Diff &algorithm (Experimental):"
+msgstr ""
+
+#: Merge.rc:6AE6FCAE
+msgid "Enable indent &heuristic"
+msgstr ""
+
 #: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
@@ -2074,10 +2082,6 @@ msgstr "Komentari"
 msgid "Filter Comments"
 msgstr "Filtriraj komentare"
 
-#: Merge.rc:57F02FB4
-msgid "Diff &algorithm (Experimental):"
-msgstr ""
-
 #: Merge.rc:3BB91A82
 #, c-format
 msgid "Editor"

diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po
index 7d4e99f..7d57fb9 100644 (file)
--- a/Translations/WinMerge/Czech.po
+++ b/Translations/WinMerge/Czech.po
@@ -2066,6 +2066,14 @@ msgstr "Povolit zjišťování přesunutých &bloků"
 msgid "&Match similar lines"
 msgstr "Za&rovnat podobné řádky"
 
+#: Merge.rc:57F02FB4
+msgid "Diff &algorithm (Experimental):"
+msgstr ""
+
+#: Merge.rc:6AE6FCAE
+msgid "Enable indent &heuristic"
+msgstr ""
+
 #: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
@@ -2076,10 +2084,6 @@ msgstr "Komentáře"
 msgid "Filter Comments"
 msgstr "Filtrovat kom&entáře"
 
-#: Merge.rc:57F02FB4
-msgid "Diff &algorithm (Experimental):"
-msgstr ""
-
 #: Merge.rc:3BB91A82
 #, c-format
 msgid "Editor"

diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po
index b24eb72..50506d8 100644 (file)
--- a/Translations/WinMerge/Danish.po
+++ b/Translations/WinMerge/Danish.po
@@ -2069,6 +2069,14 @@ msgstr "&Aktiver detektion af flyttede blokke"
 msgid "&Match similar lines"
 msgstr "&Match ens linjer"
 
+#: Merge.rc:57F02FB4
+msgid "Diff &algorithm (Experimental):"
+msgstr ""
+
+#: Merge.rc:6AE6FCAE
+msgid "Enable indent &heuristic"
+msgstr ""
+
 #: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
@@ -2079,10 +2087,6 @@ msgstr "Kommentarer"
 msgid "Filter Comments"
 msgstr "Filter Kommentarer"
 
-#: Merge.rc:57F02FB4
-msgid "Diff &algorithm (Experimental):"
-msgstr ""
-
 #: Merge.rc:3BB91A82
 #, c-format
 msgid "Editor"

diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po
index b6c1ee4..48fca71 100644 (file)
--- a/Translations/WinMerge/Dutch.po
+++ b/Translations/WinMerge/Dutch.po
@@ -2071,6 +2071,14 @@ msgstr "Detectie verplaatste blokken inschakelen"
 msgid "&Match similar lines"
 msgstr "Gelijke regels laten overeenkomen"
 
+#: Merge.rc:57F02FB4
+msgid "Diff &algorithm (Experimental):"
+msgstr ""
+
+#: Merge.rc:6AE6FCAE
+msgid "Enable indent &heuristic"
+msgstr ""
+
 #: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
@@ -2081,10 +2089,6 @@ msgstr "Opmerkingen"
 msgid "Filter Comments"
 msgstr "Filter-opmerkingen"
 
-#: Merge.rc:57F02FB4
-msgid "Diff &algorithm (Experimental):"
-msgstr ""
-
 #: Merge.rc:3BB91A82
 #, c-format
 msgid "Editor"

diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot
index 30f49ab..b79d743 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-05-04 19:20+0000\n"
+"POT-Creation-Date: 2019-05-11 09:49+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
@@ -1672,6 +1672,14 @@ msgstr ""
 msgid "&Match similar lines"
 msgstr ""
 
+#: Merge.rc:57F02FB4
+msgid "Diff &algorithm (Experimental):"
+msgstr ""
+
+#: Merge.rc:6AE6FCAE
+msgid "Enable indent &heuristic"
+msgstr ""
+
 #: Merge.rc:4C3E0A2F
 msgid "Comments"
 msgstr ""
@@ -1680,10 +1688,6 @@ msgstr ""
 msgid "Filter Comments"
 msgstr ""
 
-#: Merge.rc:57F02FB4
-msgid "Diff &algorithm (Experimental):"
-msgstr ""
-
 #: Merge.rc:3BB91A82
 msgid "Editor"
 msgstr ""

diff --git a/Translations/WinMerge/Finnish.po b/Translations/WinMerge/Finnish.po
index 583c9c1..bb96e06 100644 (file)
--- a/Translations/WinMerge/Finnish.po
+++ b/Translations/WinMerge/Finnish.po
@@ -2061,6 +2061,14 @@ msgstr "Ota siirretyn lohkon tunnistus käyttöön"
 msgid "&Match similar lines"
 msgstr "Täsmää samanlaiset rivit"
 
+#: Merge.rc:57F02FB4
+msgid "Diff &algorithm (Experimental):"
+msgstr ""
+
+#: Merge.rc:6AE6FCAE
+msgid "Enable indent &heuristic"
+msgstr ""
+
 #: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
@@ -2071,10 +2079,6 @@ msgstr "Kommentit"
 msgid "Filter Comments"
 msgstr "Suodatin kommentit"
 
-#: Merge.rc:57F02FB4
-msgid "Diff &algorithm (Experimental):"
-msgstr ""
-
 #: Merge.rc:3BB91A82
 #, c-format
 msgid "Editor"

diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po
index 0f21b58..1ffb1b7 100644 (file)
--- a/Translations/WinMerge/French.po
+++ b/Translations/WinMerge/French.po
@@ -2068,6 +2068,14 @@ msgstr "&Activer la détection des blocs déplacés"
 msgid "&Match similar lines"
 msgstr "Assortir les &lignes similaires"
 
+#: Merge.rc:57F02FB4
+msgid "Diff &algorithm (Experimental):"
+msgstr ""
+
+#: Merge.rc:6AE6FCAE
+msgid "Enable indent &heuristic"
+msgstr ""
+
 #: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
@@ -2078,10 +2086,6 @@ msgstr "Commentaires"
 msgid "Filter Comments"
 msgstr "Filtrer les commentaires"
 
-#: Merge.rc:57F02FB4
-msgid "Diff &algorithm (Experimental):"
-msgstr ""
-
 #: Merge.rc:3BB91A82
 #, c-format
 msgid "Editor"

diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po
index f13669c..3a89241 100644 (file)
--- a/Translations/WinMerge/Galician.po
+++ b/Translations/WinMerge/Galician.po
@@ -2064,6 +2064,14 @@ msgstr "A&ctivar detección de bloques movidos"
 msgid "&Match similar lines"
 msgstr "&Combinar as liñas semellantes"
 
+#: Merge.rc:57F02FB4
+msgid "Diff &algorithm (Experimental):"
+msgstr ""
+
+#: Merge.rc:6AE6FCAE
+msgid "Enable indent &heuristic"
+msgstr ""
+
 #: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
@@ -2074,10 +2082,6 @@ msgstr "Comentarios"
 msgid "Filter Comments"
 msgstr "Filtrar comentarios"
 
-#: Merge.rc:57F02FB4
-msgid "Diff &algorithm (Experimental):"
-msgstr ""
-
 #: Merge.rc:3BB91A82
 #, c-format
 msgid "Editor"

diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po
index de9a889..afd6dbd 100644 (file)
--- a/Translations/WinMerge/German.po
+++ b/Translations/WinMerge/German.po
@@ -2066,6 +2066,14 @@ msgstr "Verschobene &Blöcke erkennen"
 msgid "&Match similar lines"
 msgstr "Ä&hnliche Zeilen angleichen"
 
+#: Merge.rc:57F02FB4
+msgid "Diff &algorithm (Experimental):"
+msgstr ""
+
+#: Merge.rc:6AE6FCAE
+msgid "Enable indent &heuristic"
+msgstr ""
+
 #: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
@@ -2076,10 +2084,6 @@ msgstr "Kommentare"
 msgid "Filter Comments"
 msgstr "Kommentare filtern"
 
-#: Merge.rc:57F02FB4
-msgid "Diff &algorithm (Experimental):"
-msgstr ""
-
 #: Merge.rc:3BB91A82
 #, c-format
 msgid "Editor"

diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po
index 61937c5..079591c 100644 (file)
--- a/Translations/WinMerge/Greek.po
+++ b/Translations/WinMerge/Greek.po
@@ -2063,6 +2063,14 @@ msgstr "Ενεργοποίηση ανι&χνεύσεως μετακινηθέν
 msgid "&Match similar lines"
 msgstr "Αντιστοίχιση παρομοίων γραμμών"
 
+#: Merge.rc:57F02FB4
+msgid "Diff &algorithm (Experimental):"
+msgstr ""
+
+#: Merge.rc:6AE6FCAE
+msgid "Enable indent &heuristic"
+msgstr ""
+
 #: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
@@ -2073,10 +2081,6 @@ msgstr "Σχόλια"
 msgid "Filter Comments"
 msgstr "Σχόλια Φίλτρων"
 
-#: Merge.rc:57F02FB4
-msgid "Diff &algorithm (Experimental):"
-msgstr ""
-
 #: Merge.rc:3BB91A82
 #, c-format
 msgid "Editor"

diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po
index 7fdf17e..3c096d0 100644 (file)
--- a/Translations/WinMerge/Hungarian.po
+++ b/Translations/WinMerge/Hungarian.po
@@ -2064,6 +2064,14 @@ msgstr "Mozgatott &blokk észlelés bekapcsolása"
 msgid "&Match similar lines"
 msgstr ""
 
+#: Merge.rc:57F02FB4
+msgid "Diff &algorithm (Experimental):"
+msgstr ""
+
+#: Merge.rc:6AE6FCAE
+msgid "Enable indent &heuristic"
+msgstr ""
+
 #: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
@@ -2074,10 +2082,6 @@ msgstr "Megjegyzések"
 msgid "Filter Comments"
 msgstr ""
 
-#: Merge.rc:57F02FB4
-msgid "Diff &algorithm (Experimental):"
-msgstr ""
-
 #: Merge.rc:3BB91A82
 #, c-format
 msgid "Editor"

diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po
index 5c6ded8..23ec18c 100644 (file)
--- a/Translations/WinMerge/Italian.po
+++ b/Translations/WinMerge/Italian.po
@@ -2064,6 +2064,14 @@ msgstr "Attiva il rilevamento di blocc&hi spostati"
 msgid "&Match similar lines"
 msgstr "&Metti in corrispondenza linee simili"
 
+#: Merge.rc:57F02FB4
+msgid "Diff &algorithm (Experimental):"
+msgstr ""
+
+#: Merge.rc:6AE6FCAE
+msgid "Enable indent &heuristic"
+msgstr ""
+
 #: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
@@ -2074,10 +2082,6 @@ msgstr "Commenti"
 msgid "Filter Comments"
 msgstr "Filtra i commenti"
 
-#: Merge.rc:57F02FB4
-msgid "Diff &algorithm (Experimental):"
-msgstr ""
-
 #: Merge.rc:3BB91A82
 #, c-format
 msgid "Editor"

diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po
index 70f2daa..a3b2b4c 100644 (file)
--- a/Translations/WinMerge/Japanese.po
+++ b/Translations/WinMerge/Japanese.po
@@ -1687,6 +1687,14 @@ msgstr "移動ブロック検出を有効にする(&N)"
 msgid "&Match similar lines"
 msgstr "類似行をマッチさせる(&M)"
 
+#: Merge.rc:57F02FB4
+msgid "Diff &algorithm (Experimental):"
+msgstr "Diff アルゴリズム (実験的機能)(&A):"
+
+#: Merge.rc:6AE6FCAE
+msgid "Enable indent &heuristic"
+msgstr "indent heuristic を有効にする(&H)"
+
 #: Merge.rc:4C3E0A2F
 msgid "Comments"
 msgstr "コメント"
@@ -1695,10 +1703,6 @@ msgstr "コメント"
 msgid "Filter Comments"
 msgstr "コメントの差異を無視する"
 
-#: Merge.rc:57F02FB4
-msgid "Diff &algorithm (Experimental):"
-msgstr "Diff アルゴリズム (実験的機能)(&A):"
-
 #: Merge.rc:3BB91A82
 msgid "Editor"
 msgstr "エディタ"

diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po
index 8435f58..5a21a3d 100644 (file)
--- a/Translations/WinMerge/Korean.po
+++ b/Translations/WinMerge/Korean.po
@@ -2068,6 +2068,14 @@ msgstr "이동된 블럭 감지 사용하기"
 msgid "&Match similar lines"
 msgstr "비슷한 줄 일치시키기(&M)"
 
+#: Merge.rc:57F02FB4
+msgid "Diff &algorithm (Experimental):"
+msgstr ""
+
+#: Merge.rc:6AE6FCAE
+msgid "Enable indent &heuristic"
+msgstr ""
+
 #: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
@@ -2078,10 +2086,6 @@ msgstr "코멘트"
 msgid "Filter Comments"
 msgstr "코멘트 필터링하기"
 
-#: Merge.rc:57F02FB4
-msgid "Diff &algorithm (Experimental):"
-msgstr ""
-
 #: Merge.rc:3BB91A82
 #, c-format
 msgid "Editor"

diff --git a/Translations/WinMerge/Lithuanian.po b/Translations/WinMerge/Lithuanian.po
index e1ba762..cfac53f 100644 (file)
--- a/Translations/WinMerge/Lithuanian.po
+++ b/Translations/WinMerge/Lithuanian.po
@@ -1681,6 +1681,14 @@ msgstr "Įju&ngti perkeltų blokų aptikimą"
 msgid "&Match similar lines"
 msgstr "&Sutapdinti panašias eilutes"
 
+#: Merge.rc:57F02FB4
+msgid "Diff &algorithm (Experimental):"
+msgstr ""
+
+#: Merge.rc:6AE6FCAE
+msgid "Enable indent &heuristic"
+msgstr ""
+
 #: Merge.rc:4C3E0A2F
 msgid "Comments"
 msgstr "Komentarai"
@@ -1689,10 +1697,6 @@ msgstr "Komentarai"
 msgid "Filter Comments"
 msgstr "Filtro komentarai"
 
-#: Merge.rc:57F02FB4
-msgid "Diff &algorithm (Experimental):"
-msgstr ""
-
 #: Merge.rc:3BB91A82
 msgid "Editor"
 msgstr "Redaktoriaus"

diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po
index af0cce0..02c9080 100644 (file)
--- a/Translations/WinMerge/Norwegian.po
+++ b/Translations/WinMerge/Norwegian.po
@@ -2064,6 +2064,14 @@ msgstr "&Aktiver flyttet blokk-oppdagelse"
 msgid "&Match similar lines"
 msgstr "&Match lignende linjer"
 
+#: Merge.rc:57F02FB4
+msgid "Diff &algorithm (Experimental):"
+msgstr ""
+
+#: Merge.rc:6AE6FCAE
+msgid "Enable indent &heuristic"
+msgstr ""
+
 #: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
@@ -2074,10 +2082,6 @@ msgstr "Kommentarer"
 msgid "Filter Comments"
 msgstr "Filter-kommentarer"
 
-#: Merge.rc:57F02FB4
-msgid "Diff &algorithm (Experimental):"
-msgstr ""
-
 #: Merge.rc:3BB91A82
 #, c-format
 msgid "Editor"

diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po
index 6d27244..8fe48f5 100644 (file)
--- a/Translations/WinMerge/Persian.po
+++ b/Translations/WinMerge/Persian.po
@@ -2071,6 +2071,14 @@ msgstr "&n فعال کردن تشخيص قطعه جابجا شده "
 msgid "&Match similar lines"
 msgstr "&M مطابقت کردن خطوط مشابه "
 
+#: Merge.rc:57F02FB4
+msgid "Diff &algorithm (Experimental):"
+msgstr ""
+
+#: Merge.rc:6AE6FCAE
+msgid "Enable indent &heuristic"
+msgstr ""
+
 #: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
@@ -2081,10 +2089,6 @@ msgstr " يادداشتها "
 msgid "Filter Comments"
 msgstr " پالايه توضيحات "
 
-#: Merge.rc:57F02FB4
-msgid "Diff &algorithm (Experimental):"
-msgstr ""
-
 #: Merge.rc:3BB91A82
 #, c-format
 msgid "Editor"

diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po
index ce63e18..844605d 100644 (file)
--- a/Translations/WinMerge/Polish.po
+++ b/Translations/WinMerge/Polish.po
@@ -2065,6 +2065,14 @@ msgstr "Włącz &wykrywanie przeniesionych bloków"
 msgid "&Match similar lines"
 msgstr "Dopasuje podobne linie"
 
+#: Merge.rc:57F02FB4
+msgid "Diff &algorithm (Experimental):"
+msgstr ""
+
+#: Merge.rc:6AE6FCAE
+msgid "Enable indent &heuristic"
+msgstr ""
+
 #: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
@@ -2075,10 +2083,6 @@ msgstr "Komentarze"
 msgid "Filter Comments"
 msgstr "Filtruj komentarze"
 
-#: Merge.rc:57F02FB4
-msgid "Diff &algorithm (Experimental):"
-msgstr ""
-
 #: Merge.rc:3BB91A82
 #, c-format
 msgid "Editor"

diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po
index 33e3213..0fe1711 100644 (file)
--- a/Translations/WinMerge/Portuguese.po
+++ b/Translations/WinMerge/Portuguese.po
@@ -2064,6 +2064,14 @@ msgstr "Ativar deteção de bloco movido"
 msgid "&Match similar lines"
 msgstr "Comparar linhas semelhantes"
 
+#: Merge.rc:57F02FB4
+msgid "Diff &algorithm (Experimental):"
+msgstr ""
+
+#: Merge.rc:6AE6FCAE
+msgid "Enable indent &heuristic"
+msgstr ""
+
 #: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
@@ -2074,10 +2082,6 @@ msgstr "Comentários"
 msgid "Filter Comments"
 msgstr "Filtrar comentários"
 
-#: Merge.rc:57F02FB4
-msgid "Diff &algorithm (Experimental):"
-msgstr ""
-
 #: Merge.rc:3BB91A82
 #, c-format
 msgid "Editor"

diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po
index 460b172..c1a14af 100644 (file)
--- a/Translations/WinMerge/Romanian.po
+++ b/Translations/WinMerge/Romanian.po
@@ -2064,6 +2064,14 @@ msgstr "Activea&ză detecţie blocuri mutate"
 msgid "&Match similar lines"
 msgstr "Potriveşte linii si&milare"
 
+#: Merge.rc:57F02FB4
+msgid "Diff &algorithm (Experimental):"
+msgstr ""
+
+#: Merge.rc:6AE6FCAE
+msgid "Enable indent &heuristic"
+msgstr ""
+
 #: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
@@ -2074,10 +2082,6 @@ msgstr "Comentarii"
 msgid "Filter Comments"
 msgstr "Comentarii filtre"
 
-#: Merge.rc:57F02FB4
-msgid "Diff &algorithm (Experimental):"
-msgstr ""
-
 #: Merge.rc:3BB91A82
 #, c-format
 msgid "Editor"

diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po
index 97d4a3d..ac19fb8 100644 (file)
--- a/Translations/WinMerge/Russian.po
+++ b/Translations/WinMerge/Russian.po
@@ -2067,6 +2067,14 @@ msgstr "Обнаружение переме&щенных блоков"
 msgid "&Match similar lines"
 msgstr "Искать похожие строки"
 
+#: Merge.rc:57F02FB4
+msgid "Diff &algorithm (Experimental):"
+msgstr ""
+
+#: Merge.rc:6AE6FCAE
+msgid "Enable indent &heuristic"
+msgstr ""
+
 #: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
@@ -2077,10 +2085,6 @@ msgstr "Комментарии"
 msgid "Filter Comments"
 msgstr "Фильтр комментариев"
 
-#: Merge.rc:57F02FB4
-msgid "Diff &algorithm (Experimental):"
-msgstr ""
-
 #: Merge.rc:3BB91A82
 #, c-format
 msgid "Editor"

diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po
index fd8b172..810b953 100644 (file)
--- a/Translations/WinMerge/Serbian.po
+++ b/Translations/WinMerge/Serbian.po
@@ -2047,6 +2047,14 @@ msgstr "Омогући откривање премештених група"
 msgid "&Match similar lines"
 msgstr "Упореди сличне редове"
 
+#: Merge.rc:57F02FB4
+msgid "Diff &algorithm (Experimental):"
+msgstr ""
+
+#: Merge.rc:6AE6FCAE
+msgid "Enable indent &heuristic"
+msgstr ""
+
 #: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
@@ -2057,10 +2065,6 @@ msgstr "Напомене"
 msgid "Filter Comments"
 msgstr "Филтрирај напомене"
 
-#: Merge.rc:57F02FB4
-msgid "Diff &algorithm (Experimental):"
-msgstr ""
-
 #: Merge.rc:3BB91A82
 #, c-format
 msgid "Editor"

diff --git a/Translations/WinMerge/Sinhala.po b/Translations/WinMerge/Sinhala.po
index f8a033b..a79c970 100644 (file)
--- a/Translations/WinMerge/Sinhala.po
+++ b/Translations/WinMerge/Sinhala.po
@@ -2061,6 +2061,14 @@ msgstr "E&nable moved block detection"
 msgid "&Match similar lines"
 msgstr "සමාන පේළි ගලපන්න"
 
+#: Merge.rc:57F02FB4
+msgid "Diff &algorithm (Experimental):"
+msgstr ""
+
+#: Merge.rc:6AE6FCAE
+msgid "Enable indent &heuristic"
+msgstr ""
+
 #: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
@@ -2071,10 +2079,6 @@ msgstr "විවේචන"
 msgid "Filter Comments"
 msgstr "Filter Comments"
 
-#: Merge.rc:57F02FB4
-msgid "Diff &algorithm (Experimental):"
-msgstr ""
-
 #: Merge.rc:3BB91A82
 #, c-format
 msgid "Editor"

diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po
index e2a0f5d..5dfb91a 100644 (file)
--- a/Translations/WinMerge/Slovak.po
+++ b/Translations/WinMerge/Slovak.po
@@ -2064,6 +2064,14 @@ msgstr "Zapnúť &detekciu pohyblivého bloku"
 msgid "&Match similar lines"
 msgstr "&Podobné riadky ako zhodné"
 
+#: Merge.rc:57F02FB4
+msgid "Diff &algorithm (Experimental):"
+msgstr ""
+
+#: Merge.rc:6AE6FCAE
+msgid "Enable indent &heuristic"
+msgstr ""
+
 #: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
@@ -2074,10 +2082,6 @@ msgstr "Komentáre"
 msgid "Filter Comments"
 msgstr "Filtrovať komentáre"
 
-#: Merge.rc:57F02FB4
-msgid "Diff &algorithm (Experimental):"
-msgstr ""
-
 #: Merge.rc:3BB91A82
 #, c-format
 msgid "Editor"

diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po
index 5c1d2f4..bc03692 100644 (file)
--- a/Translations/WinMerge/Slovenian.po
+++ b/Translations/WinMerge/Slovenian.po
@@ -2067,6 +2067,14 @@ msgstr "Omogoči &razlikovanje premaknjenih blokov"
 msgid "&Match similar lines"
 msgstr "&Ujemanje enakih vrstic"
 
+#: Merge.rc:57F02FB4
+msgid "Diff &algorithm (Experimental):"
+msgstr ""
+
+#: Merge.rc:6AE6FCAE
+msgid "Enable indent &heuristic"
+msgstr ""
+
 #: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
@@ -2077,10 +2085,6 @@ msgstr "Komentarji"
 msgid "Filter Comments"
 msgstr "Komentarji filtrov"
 
-#: Merge.rc:57F02FB4
-msgid "Diff &algorithm (Experimental):"
-msgstr ""
-
 #: Merge.rc:3BB91A82
 #, c-format
 msgid "Editor"

diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po
index b33d5cb..2156822 100644 (file)
--- a/Translations/WinMerge/Spanish.po
+++ b/Translations/WinMerge/Spanish.po
@@ -2066,6 +2066,14 @@ msgstr "Habilitar detecció&n de bloques movidos"
 msgid "&Match similar lines"
 msgstr "Co&mbinar con líneas similares"
 
+#: Merge.rc:57F02FB4
+msgid "Diff &algorithm (Experimental):"
+msgstr ""
+
+#: Merge.rc:6AE6FCAE
+msgid "Enable indent &heuristic"
+msgstr ""
+
 #: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
@@ -2076,10 +2084,6 @@ msgstr "Comentarios"
 msgid "Filter Comments"
 msgstr "Filtrar comentarios"
 
-#: Merge.rc:57F02FB4
-msgid "Diff &algorithm (Experimental):"
-msgstr ""
-
 #: Merge.rc:3BB91A82
 #, c-format
 msgid "Editor"

diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po
index 0026bd3..1883bec 100644 (file)
--- a/Translations/WinMerge/Swedish.po
+++ b/Translations/WinMerge/Swedish.po
@@ -2069,6 +2069,14 @@ msgstr "Möjliggör urskiljning av flyttade block"
 msgid "&Match similar lines"
 msgstr "Urskilj liknande rader"
 
+#: Merge.rc:57F02FB4
+msgid "Diff &algorithm (Experimental):"
+msgstr ""
+
+#: Merge.rc:6AE6FCAE
+msgid "Enable indent &heuristic"
+msgstr ""
+
 #: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
@@ -2079,10 +2087,6 @@ msgstr "Kommentarer"
 msgid "Filter Comments"
 msgstr "FilterKommentarer"
 
-#: Merge.rc:57F02FB4
-msgid "Diff &algorithm (Experimental):"
-msgstr ""
-
 #: Merge.rc:3BB91A82
 #, c-format
 msgid "Editor"

diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po
index a4b5ac0..8a78b3f 100644 (file)
--- a/Translations/WinMerge/Turkish.po
+++ b/Translations/WinMerge/Turkish.po
@@ -2067,6 +2067,14 @@ msgstr "Taşı&nan Blok Algılaması Kullanılsın"
 msgid "&Match similar lines"
 msgstr "&Benzer Satırlar Eşleştirilsin"
 
+#: Merge.rc:57F02FB4
+msgid "Diff &algorithm (Experimental):"
+msgstr ""
+
+#: Merge.rc:6AE6FCAE
+msgid "Enable indent &heuristic"
+msgstr ""
+
 #: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
@@ -2077,10 +2085,6 @@ msgstr "Açıklamalar"
 msgid "Filter Comments"
 msgstr "Açıklamalar Süzülsün"
 
-#: Merge.rc:57F02FB4
-msgid "Diff &algorithm (Experimental):"
-msgstr ""
-
 #: Merge.rc:3BB91A82
 #, c-format
 msgid "Editor"

diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po
index 1b16baf..33e2e70 100644 (file)
--- a/Translations/WinMerge/Ukrainian.po
+++ b/Translations/WinMerge/Ukrainian.po
@@ -2065,6 +2065,14 @@ msgstr "Виявлення перемі&щених блоків"
 msgid "&Match similar lines"
 msgstr "Виконати пошук схожих рядків"
 
+#: Merge.rc:57F02FB4
+msgid "Diff &algorithm (Experimental):"
+msgstr ""
+
+#: Merge.rc:6AE6FCAE
+msgid "Enable indent &heuristic"
+msgstr ""
+
 #: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
@@ -2075,10 +2083,6 @@ msgstr "Коментарі"
 msgid "Filter Comments"
 msgstr "Фільтр коментарів"
 
-#: Merge.rc:57F02FB4
-msgid "Diff &algorithm (Experimental):"
-msgstr ""
-
 #: Merge.rc:3BB91A82
 #, c-format
 msgid "Editor"