Rename "Ignored Substitutions" to "Substitution Filters"

diff --git a/Src/CompareEngines/Wrap_DiffUtils.cpp b/Src/CompareEngines/Wrap_DiffUtils.cpp
index 8c4dea6..6fc177d 100644 (file)
--- a/Src/CompareEngines/Wrap_DiffUtils.cpp
+++ b/Src/CompareEngines/Wrap_DiffUtils.cpp
@@ -75,14 +75,14 @@ void DiffUtils::SetFilterList(FilterList * list)
        m_pFilterList = list;
 }
 
-void DiffUtils::SetIgnoredSubstitutionsList(std::shared_ptr<SubstitutionList> list)
+void DiffUtils::SetSubstitutionList(std::shared_ptr<SubstitutionList> list)
 {
-       m_pDiffWrapper->SetIgnoredSubstitutionsList(list);
+       m_pDiffWrapper->SetSubstitutionList(list);
 }
 
-void DiffUtils::ClearIgnoredSubstitutionsList()
+void DiffUtils::ClearSubstitutionList()
 {
-       m_pDiffWrapper->SetIgnoredSubstitutionsList(nullptr);
+       m_pDiffWrapper->SetSubstitutionList(nullptr);
 }
 
 /**
@@ -165,8 +165,8 @@ int DiffUtils::diffutils_compare_files()
                                        int QtyLinesRight = (trans_b1 - trans_a1) + 1;
        
                                        if(m_pOptions->m_filterCommentsLines ||
-                                               (m_pDiffWrapper->GetIgnoredSubstitutionsList() &&
-                                                m_pDiffWrapper->GetIgnoredSubstitutionsList()->HasRegExps()))
+                                               (m_pDiffWrapper->GetSubstitutionList() &&
+                                                m_pDiffWrapper->GetSubstitutionList()->HasRegExps()))
                                        {
                                                OP_TYPE op = OP_NONE;
                                                if (deletes == 0 && inserts == 0)

diff --git a/Src/CompareEngines/Wrap_DiffUtils.h b/Src/CompareEngines/Wrap_DiffUtils.h
index b47d980..9dc03bf 100644 (file)
--- a/Src/CompareEngines/Wrap_DiffUtils.h
+++ b/Src/CompareEngines/Wrap_DiffUtils.h
@@ -34,8 +34,8 @@ public:
        void SetCompareOptions(const CompareOptions & options);
        void SetFilterList(FilterList * list);
        void ClearFilterList();
-       void SetIgnoredSubstitutionsList(std::shared_ptr<SubstitutionList> plist);
-       void ClearIgnoredSubstitutionsList();
+       void SetSubstitutionList(std::shared_ptr<SubstitutionList> plist);
+       void ClearSubstitutionList();
        void SetFileData(int items, file_data *data);
        int diffutils_compare_files();
        bool RegExpFilter(int StartPos, int EndPos, const file_data *pinf) const;

diff --git a/Src/CompareOptions.cpp b/Src/CompareOptions.cpp
index 154dd38..a99e482 100644 (file)
--- a/Src/CompareOptions.cpp
+++ b/Src/CompareOptions.cpp
@@ -43,7 +43,7 @@ DiffutilsOptions::DiffutilsOptions(const DiffutilsOptions& options)
 , m_filterCommentsLines(options.m_filterCommentsLines)
 , m_diffAlgorithm(options.m_diffAlgorithm)
 , m_bIndentHeuristic(options.m_bIndentHeuristic)
-, m_bCompletelyBlankOutIgnoredChanges(options.m_bCompletelyBlankOutIgnoredChanges)
+, m_bCompletelyBlankOutIgnoredDiffereneces(options.m_bCompletelyBlankOutIgnoredDiffereneces)
 , m_outputStyle(options.m_outputStyle)
 {
 }
@@ -90,7 +90,7 @@ DiffutilsOptions::DiffutilsOptions()
 : m_outputStyle(DIFF_OUTPUT_NORMAL)
 , m_contextLines(0)
 , m_filterCommentsLines(false)
-, m_bCompletelyBlankOutIgnoredChanges(false)
+, m_bCompletelyBlankOutIgnoredDiffereneces(false)
 , m_bIndentHeuristic(true)
 , m_diffAlgorithm(DIFF_ALGORITHM_DEFAULT)
 {
@@ -105,7 +105,7 @@ DiffutilsOptions::DiffutilsOptions(const CompareOptions& options)
 , m_outputStyle(DIFF_OUTPUT_NORMAL)
 , m_contextLines(0)
 , m_filterCommentsLines(false)
-, m_bCompletelyBlankOutIgnoredChanges(false)
+, m_bCompletelyBlankOutIgnoredDiffereneces(false)
 , m_bIndentHeuristic(true)
 , m_diffAlgorithm(DIFF_ALGORITHM_DEFAULT)
 {
@@ -118,7 +118,7 @@ DiffutilsOptions::DiffutilsOptions(const CompareOptions& options)
 void DiffutilsOptions::SetFromDiffOptions(const DIFFOPTIONS & options)
 {
        CompareOptions::SetFromDiffOptions(options);
-       m_bCompletelyBlankOutIgnoredChanges = options.bCompletelyBlankOutIgnoredChanges;
+       m_bCompletelyBlankOutIgnoredDiffereneces = options.bCompletelyBlankOutIgnoredChanges;
        m_filterCommentsLines = options.bFilterCommentsLines;
        m_bIndentHeuristic = options.bIndentHeuristic;
        switch (options.nDiffAlgorithm)
@@ -220,7 +220,7 @@ void DiffutilsOptions::SetToDiffUtils()
  */
 void DiffutilsOptions::GetAsDiffOptions(DIFFOPTIONS &options) const
 {
-       options.bCompletelyBlankOutIgnoredChanges = m_bCompletelyBlankOutIgnoredChanges;
+       options.bCompletelyBlankOutIgnoredChanges = m_bCompletelyBlankOutIgnoredDiffereneces;
        options.bFilterCommentsLines = m_filterCommentsLines;
        options.bIgnoreBlankLines = m_bIgnoreBlankLines;
        options.bIgnoreCase = m_bIgnoreCase;

diff --git a/Src/CompareOptions.h b/Src/CompareOptions.h
index 85b284d..e1a5c00 100644 (file)
--- a/Src/CompareOptions.h
+++ b/Src/CompareOptions.h
@@ -126,7 +126,7 @@ public:
        bool m_filterCommentsLines;/**< Ignore Multiline comments differences.*/
        enum DiffAlgorithm m_diffAlgorithm; /** Diff algorithm */
        bool m_bIndentHeuristic; /**< Indent heuristic */
-       bool m_bCompletelyBlankOutIgnoredChanges; /**< Completely blank out ignored changes */
+       bool m_bCompletelyBlankOutIgnoredDiffereneces; /**< Completely blank out ignored differences */
 };
 
 /**

diff --git a/Src/DiffContext.h b/Src/DiffContext.h
index 55cdd73..4f9af4a 100644 (file)
--- a/Src/DiffContext.h
+++ b/Src/DiffContext.h
@@ -195,7 +195,7 @@ public:
        bool m_bRecursive; /**< Do we include subfolders to compare? */
        bool m_bPluginsEnabled; /**< Are plugins enabled? */
        std::unique_ptr<FilterList> m_pFilterList; /**< Filter list for line filters */
-       std::shared_ptr<SubstitutionList> m_pSubstitutionList; /// list for Ignored Substitutions
+       std::shared_ptr<SubstitutionList> m_pSubstitutionList; /// list for Substitution Filters
 
 private:
        /**

diff --git a/Src/DiffWrapper.cpp b/Src/DiffWrapper.cpp
index 71fed66..f8fbafd 100644 (file)
--- a/Src/DiffWrapper.cpp
+++ b/Src/DiffWrapper.cpp
@@ -962,7 +962,7 @@ CDiffWrapper::LoadWinMergeDiffsFromDiffUtilsScript(struct change * script, const
                                                op = OP_TRIVIAL;
                                }
 
-                               if (op == OP_TRIVIAL && m_options.m_bCompletelyBlankOutIgnoredChanges)
+                               if (op == OP_TRIVIAL && m_options.m_bCompletelyBlankOutIgnoredDiffereneces)
                                        op = OP_NONE;
                                if (op != OP_NONE)
                                        AddDiffRange(m_pDiffList, trans_a0-1, trans_b0-1, trans_a1-1, trans_b1-1, op);
@@ -1381,12 +1381,12 @@ void CDiffWrapper::SetFilterList(const FilterList* pFilterList)
        }
 }
 
-const SubstitutionList* CDiffWrapper::GetIgnoredSubstitutionsList() const
+const SubstitutionList* CDiffWrapper::GetSubstitutionList() const
 {
        return m_pSubstitutionList.get();
 }
 
-void CDiffWrapper::SetIgnoredSubstitutionsList(std::shared_ptr<SubstitutionList> pSubstitutionList)
+void CDiffWrapper::SetSubstitutionList(std::shared_ptr<SubstitutionList> pSubstitutionList)
 {
        m_pSubstitutionList = pSubstitutionList;
 }

diff --git a/Src/DiffWrapper.h b/Src/DiffWrapper.h
index 2e4b616..7261906 100644 (file)
--- a/Src/DiffWrapper.h
+++ b/Src/DiffWrapper.h
@@ -184,8 +184,8 @@ public:
        void WritePatchFileTerminator(enum output_style output_style);
        void SetFilterList(const String& filterStr);
        void SetFilterList(const FilterList *pFilterList);
-       const SubstitutionList* GetIgnoredSubstitutionsList() const;
-       void SetIgnoredSubstitutionsList(std::shared_ptr<SubstitutionList> pIgnoredSubstitutionsList);
+       const SubstitutionList* GetSubstitutionList() const;
+       void SetSubstitutionList(std::shared_ptr<SubstitutionList> pSubstitutionFiltersList);
        void SetFilterCommentsSourceDef(CrystalLineParser::TextDefinition *def) { m_pFilterCommentsDef = def; };
        void SetFilterCommentsSourceDef(const String& ext);
        void EnablePlugins(bool enable);

diff --git a/Src/DirDoc.cpp b/Src/DirDoc.cpp
index 1b1f300..feba562 100644 (file)
--- a/Src/DirDoc.cpp
+++ b/Src/DirDoc.cpp
@@ -31,7 +31,7 @@
 #include "OptionsMgr.h"
 #include "OptionsDiffOptions.h"
 #include "LineFiltersList.h"
-#include "IgnoredSubstitutionsList.h"
+#include "SubstitutionFiltersList.h"
 #include "FileFilterHelper.h"
 #include "unicoder.h"
 #include "DirActions.h"
@@ -201,18 +201,18 @@ void CDirDoc::LoadLineFilterList(CDiffContext *pCtxt)
                pCtxt->m_pFilterList->AddRegExp(*it);
 }
 
-void CDirDoc::LoadIgnoredSubstitutionsList(CDiffContext* pCtxt)
+void CDirDoc::LoadSubstitutionFiltersList(CDiffContext* pCtxt)
 {
        ASSERT(pCtxt != nullptr);
 
-       bool ignoredSubstitutionsEnabled = GetOptionsMgr()->GetBool(OPT_IGNORED_SUBSTITUTIONS_ENABLED);
-       if (!ignoredSubstitutionsEnabled || theApp.m_pIgnoredSubstitutionsList->GetCount() == 0)
+       bool SubstitutionFiltersEnabled = GetOptionsMgr()->GetBool(OPT_SUBSTITUTION_FILTERS_ENABLED);
+       if (!SubstitutionFiltersEnabled || theApp.m_pSubstitutionFiltersList->GetCount() == 0)
        {
                pCtxt->m_pSubstitutionList.reset();
                return;
        }
 
-       pCtxt->m_pSubstitutionList = theApp.m_pIgnoredSubstitutionsList->MakeSubstitutionList();
+       pCtxt->m_pSubstitutionList = theApp.m_pSubstitutionFiltersList->MakeSubstitutionList();
 }
 
 void CDirDoc::DiffThreadCallback(int& state)
@@ -223,7 +223,7 @@ void CDirDoc::DiffThreadCallback(int& state)
 void CDirDoc::InitDiffContext(CDiffContext *pCtxt)
 {
        LoadLineFilterList(pCtxt);
-       LoadIgnoredSubstitutionsList(pCtxt);
+       LoadSubstitutionFiltersList(pCtxt);
 
        DIFFOPTIONS options = {0};
        Options::DiffOptions::Load(GetOptionsMgr(), options);

diff --git a/Src/DirDoc.h b/Src/DirDoc.h
index 54e4d3f..c4a4b85 100644 (file)
--- a/Src/DirDoc.h
+++ b/Src/DirDoc.h
@@ -123,7 +123,7 @@ public:
 protected:
        void InitDiffContext(CDiffContext *pCtxt);
        void LoadLineFilterList(CDiffContext *pCtxt);
-       void LoadIgnoredSubstitutionsList(CDiffContext* pCtxt);
+       void LoadSubstitutionFiltersList(CDiffContext* pCtxt);
 
        // Generated message map functions
        //{{AFX_MSG(CDirDoc)

diff --git a/Src/FolderCmp.cpp b/Src/FolderCmp.cpp
index b8c15b7..e354479 100644 (file)
--- a/Src/FolderCmp.cpp
+++ b/Src/FolderCmp.cpp
@@ -212,9 +212,9 @@ int FolderCmp::prepAndCompareFiles(DIFFITEM &di)
                                else
                                        m_pDiffUtilsEngine->ClearFilterList();
                                if (m_pCtxt->m_pSubstitutionList != nullptr)
-                                       m_pDiffUtilsEngine->SetIgnoredSubstitutionsList(m_pCtxt->m_pSubstitutionList);
+                                       m_pDiffUtilsEngine->SetSubstitutionList(m_pCtxt->m_pSubstitutionList);
                                else
-                                       m_pDiffUtilsEngine->ClearIgnoredSubstitutionsList();
+                                       m_pDiffUtilsEngine->ClearSubstitutionList();
                        }
                        if (tFiles.GetSize() == 2)
                        {
@@ -267,7 +267,7 @@ int FolderCmp::prepAndCompareFiles(DIFFITEM &di)
                                dw.SetCompareFiles(tFiles);
                                dw.SetOptions(m_pCtxt->GetOptions());
                                dw.SetFilterList(m_pCtxt->m_pFilterList.get());
-                               dw.SetIgnoredSubstitutionsList(m_pCtxt->m_pSubstitutionList);
+                               dw.SetSubstitutionList(m_pCtxt->m_pSubstitutionList);
                                dw.SetFilterCommentsSourceDef(Ext);
                                dw.SetCreateDiffList(&diffList);
                                dw.LoadWinMergeDiffsFromDiffUtilsScript3(

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index 0363c15..b7af47e 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -33,10 +33,10 @@
 #include "HexMergeView.h"
 #include "ImgMergeFrm.h"
 #include "LineFiltersList.h"
-#include "IgnoredSubstitutionsList.h"
+#include "SubstitutionFiltersList.h"
 #include "ConflictFileParser.h"
 #include "LineFiltersDlg.h"
-#include "IgnoredSubstitutionsDlg.h"
+#include "SubstitutionFiltersDlg.h"
 #include "paths.h"
 #include "Environment.h"
 #include "PatchTool.h"
@@ -1653,15 +1653,15 @@ void CMainFrame::OnToolsFilters()
        String title = _("Filters");
        CPropertySheet sht(title.c_str());
        LineFiltersDlg lineFiltersDlg;
-       IgnoredSubstitutionsDlg ignoredSubstitutionsDlg;
+       SubstitutionFiltersDlg substitutionFiltersDlg;
        FileFiltersDlg fileFiltersDlg;
        std::unique_ptr<LineFiltersList> lineFilters(new LineFiltersList());
-       std::unique_ptr<IgnoredSubstitutionsList> ignoredSubstitutions(new IgnoredSubstitutionsList());
+       std::unique_ptr<SubstitutionFiltersList> SubstitutionFilters(new SubstitutionFiltersList());
        String selectedFilter;
        const String origFilter = theApp.m_pGlobalFileFilter->GetFilterNameOrMask();
        sht.AddPage(&fileFiltersDlg);
        sht.AddPage(&lineFiltersDlg);
-       sht.AddPage(&ignoredSubstitutionsDlg);
+       sht.AddPage(&substitutionFiltersDlg);
        sht.m_psh.dwFlags |= PSH_NOAPPLYNOW; // Hide 'Apply' button since we don't need it
 
        // Make sure all filters are up-to-date
@@ -1675,12 +1675,12 @@ void CMainFrame::OnToolsFilters()
        lineFilters->CloneFrom(theApp.m_pLineFilters.get());
        lineFiltersDlg.SetList(lineFilters.get());
 
-       const bool ignoredSubstitutionsEnabledOrig = GetOptionsMgr()->GetBool(OPT_IGNORED_SUBSTITUTIONS_ENABLED);
+       const bool SubstitutionFiltersEnabledOrig = GetOptionsMgr()->GetBool(OPT_SUBSTITUTION_FILTERS_ENABLED);
 
-       ignoredSubstitutionsDlg.m_bEnabled = ignoredSubstitutionsEnabledOrig;
+       substitutionFiltersDlg.m_bEnabled = SubstitutionFiltersEnabledOrig;
        
-       ignoredSubstitutions->CloneFrom(theApp.m_pIgnoredSubstitutionsList.get());
-       ignoredSubstitutionsDlg.SetList(ignoredSubstitutions.get());
+       SubstitutionFilters->CloneFrom(theApp.m_pSubstitutionFiltersList.get());
+       substitutionFiltersDlg.SetList(SubstitutionFilters.get());
 
        sht.SetActivePage(AfxGetApp()->GetProfileInt(_T("Settings"), _T("FilterStartPage"), 0));
 
@@ -1708,8 +1708,8 @@ void CMainFrame::OnToolsFilters()
                bool linefiltersEnabled = lineFiltersDlg.m_bIgnoreRegExp;
                GetOptionsMgr()->SaveOption(OPT_LINEFILTER_ENABLED, linefiltersEnabled);
 
-               bool ignoredSubstitutionsEnabled = ignoredSubstitutionsDlg.m_bEnabled;
-               GetOptionsMgr()->SaveOption(OPT_IGNORED_SUBSTITUTIONS_ENABLED, ignoredSubstitutionsEnabled);
+               bool SubstitutionFiltersEnabled = substitutionFiltersDlg.m_bEnabled;
+               GetOptionsMgr()->SaveOption(OPT_SUBSTITUTION_FILTERS_ENABLED, SubstitutionFiltersEnabled);
 
                // Check if compare documents need rescanning
                bool bFileCompareRescan = false;
@@ -1721,9 +1721,9 @@ void CMainFrame::OnToolsFilters()
                        if
                        (
                                   linefiltersEnabled != lineFiltersEnabledOrig
-                               || ignoredSubstitutionsEnabled != ignoredSubstitutionsEnabledOrig
+                               || SubstitutionFiltersEnabled != SubstitutionFiltersEnabledOrig
                                || !lineFilters->Compare(theApp.m_pLineFilters.get())
-                               || !ignoredSubstitutions->Compare(theApp.m_pIgnoredSubstitutionsList.get())
+                               || !SubstitutionFilters->Compare(theApp.m_pSubstitutionFiltersList.get())
                        )
                        {
                                bFileCompareRescan = true;
@@ -1745,8 +1745,8 @@ void CMainFrame::OnToolsFilters()
                theApp.m_pLineFilters->CloneFrom(lineFilters.get());
                theApp.m_pLineFilters->SaveFilters();
 
-               theApp.m_pIgnoredSubstitutionsList->CloneFrom(ignoredSubstitutions.get());
-               theApp.m_pIgnoredSubstitutionsList->SaveFilters();
+               theApp.m_pSubstitutionFiltersList->CloneFrom(SubstitutionFilters.get());
+               theApp.m_pSubstitutionFiltersList->SaveFilters();
 
                if (bFileCompareRescan)
                {

diff --git a/Src/Merge.cpp b/Src/Merge.cpp
index 86f6474..a7673cf 100644 (file)
--- a/Src/Merge.cpp
+++ b/Src/Merge.cpp
@@ -38,7 +38,7 @@
 #include "paths.h"
 #include "FileFilterHelper.h"
 #include "LineFiltersList.h"
-#include "IgnoredSubstitutionsList.h"
+#include "SubstitutionFiltersList.h"
 #include "SyntaxColors.h"
 #include "CCrystalTextMarkers.h"
 #include "OptionsSyntaxColors.h"
@@ -106,7 +106,7 @@ CMergeApp::CMergeApp() :
 , m_bEscShutdown(false)
 , m_bExitIfNoDiff(MergeCmdLineInfo::Disabled)
 , m_pLineFilters(new LineFiltersList())
-, m_pIgnoredSubstitutionsList(new IgnoredSubstitutionsList())
+, m_pSubstitutionFiltersList(new SubstitutionFiltersList())
 , m_pSyntaxColors(new SyntaxColors())
 , m_pMarkers(new CCrystalTextMarkers())
 , m_bMergingMode(false)
@@ -309,8 +309,8 @@ BOOL CMergeApp::InitInstance()
                        m_pLineFilters->Import(oldFilter);
        }
 
-       if (m_pIgnoredSubstitutionsList != nullptr)
-               m_pIgnoredSubstitutionsList->Initialize(GetOptionsMgr());
+       if (m_pSubstitutionFiltersList != nullptr)
+               m_pSubstitutionFiltersList->Initialize(GetOptionsMgr());
 
        // Check if filter folder is set, and create it if not
        String pathMyFolders = GetOptionsMgr()->GetString(OPT_FILTER_USERPATH);

diff --git a/Src/Merge.h b/Src/Merge.h
index 6ee99a5..bc0cfe0 100644 (file)
--- a/Src/Merge.h
+++ b/Src/Merge.h
@@ -34,7 +34,7 @@ class MergeCmdLineInfo;
 class ProjectFile;
 class COptionsMgr;
 class LineFiltersList;
-class IgnoredSubstitutionsList;
+class SubstitutionFiltersList;
 class SyntaxColors;
 class CCrystalTextMarkers;
 
@@ -66,7 +66,7 @@ public:
        CCrystalTextMarkers * GetMainMarkers() const { return m_pMarkers.get(); }
        MergeCmdLineInfo::ExitNoDiff m_bExitIfNoDiff; /**< Exit if files are identical? */
        std::unique_ptr<LineFiltersList> m_pLineFilters; /**< List of linefilters */
-       std::unique_ptr<IgnoredSubstitutionsList> m_pIgnoredSubstitutionsList;
+       std::unique_ptr<SubstitutionFiltersList> m_pSubstitutionFiltersList;
 
        WORD GetLangId() const;
        void SetIndicators(CStatusBar &, const UINT *, int) const;

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 6c36f0b..609d24a 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -72,7 +72,7 @@ BEGIN
         MENUITEM "Copy fro&m Right",            ID_COPY_FROM_RIGHT\r
         MENUITEM SEPARATOR\r
         MENUITEM "&Select Line Difference\tF4", ID_SELECTLINEDIFF\r
-        MENUITEM "Add this change to &Ignored Substitutions", ID_ADD_TO_IGNORED_SUBSTITUTIONS\r
+        MENUITEM "Add this change to Substitution &Filters", ID_ADD_TO_IGNORED_SUBSTITUTIONS\r
         MENUITEM SEPARATOR\r
         MENUITEM "&Undo",                       ID_EDIT_UNDO\r
         MENUITEM "&Redo",                       ID_EDIT_REDO\r
@@ -1182,12 +1182,12 @@ END
 \r
 IDD_IGNORED_SUSBSTITUTIONS_DLG DIALOGEX 0, 0, 530, 176\r
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION\r
-CAPTION "Ignored Substitutions"\r
+CAPTION "Substitution Filters"\r
 FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
 BEGIN\r
     LTEXT           "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected.",IDC_STATIC,8,6,516,19\r
     CONTROL         "Enable",IDC_IGNORED_SUSBSTITUTIONS_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,28,351,9\r
-    CONTROL         "",IDC_IGNORED_SUBSTITUTIONS_FILTER,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_EDITLABELS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,6,40,516,111\r
+    CONTROL         "",IDC_SUBSTITUTION_FILTERS,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_EDITLABELS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,6,40,516,111\r
     PUSHBUTTON      "Add",IDC_LFILTER_ADDBTN,7,156,50,14\r
     PUSHBUTTON      "Remove",IDC_LFILTER_REMOVEBTN,63,156,50,14\r
     PUSHBUTTON      "Clear",IDC_LFILTER_CLEARBTN,474,156,50,14\r
@@ -1433,7 +1433,7 @@ BEGIN
     LTEXT           "Diff &algorithm (Experimental):",IDC_STATIC,7,144,239,10\r
     COMBOBOX        IDC_DIFF_ALGORITHM,6,156,240,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
     CONTROL         "Enable indent &heuristic",IDC_INDENT_HEURISTIC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,174,239,10\r
-    CONTROL         "Completely unhighlight the ignored changes",IDC_COMPLETELY_BLANK_OUT_IGNORED_CHANGES,\r
+    CONTROL         "Completely unhighlight the ignored differences",IDC_COMPLETELY_BLANK_OUT_IGNORED_DIFFERENCES,\r
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,186,239,10\r
     PUSHBUTTON      "Defaults",IDC_COMPARE_DEFAULTS,161,228,88,14\r
 END\r
@@ -3553,9 +3553,9 @@ STRINGTABLE
 BEGIN\r
     IDS_IGNSUB_STR1 "<Edit here>"\r
     IDS_IGNSUB_STR2 "No differences to select found"\r
-    IDS_IGNSUB_STR3 "No differences found to add as ignored substitution"\r
-    IDS_IGNSUB_STR4 "The pair is already present in the list of Ignored Substitutions"\r
-    IDS_IGNSUB_STR5 "Add this change to Ignored Substitutions?"\r
+    IDS_IGNSUB_STR3 "No differences found to add as substitution filter"\r
+    IDS_IGNSUB_STR4 "The pair is already present in the list of Substitution Filters"\r
+    IDS_IGNSUB_STR5 "Add this change to Substitution Filters?"\r
 END\r
 \r
 STRINGTABLE\r

diff --git a/Src/Merge.vs2017.vcxproj b/Src/Merge.vs2017.vcxproj
index 5782ec0..d6f27a0 100644 (file)
--- a/Src/Merge.vs2017.vcxproj
+++ b/Src/Merge.vs2017.vcxproj
@@ -533,7 +533,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
     </ClCompile>\r
     <ClCompile Include="DirSelectFilesDlg.cpp" />\r
-    <ClCompile Include="IgnoredSubstitutionsList.cpp">\r
+    <ClCompile Include="SubstitutionFiltersList.cpp">\r
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
       <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
     </ClCompile>\r
@@ -755,7 +755,7 @@
       <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
     </ClCompile>\r
     <ClCompile Include="LineFiltersDlg.cpp" />\r
-    <ClCompile Include="IgnoredSubstitutionsDlg.cpp" />\r
+    <ClCompile Include="SubstitutionFiltersDlg.cpp" />\r
     <ClCompile Include="SubeditList.cpp" />\r
     <ClCompile Include="LineFiltersList.cpp">\r
       <PrecompiledHeader>Use</PrecompiledHeader>\r
@@ -1124,7 +1124,7 @@
     <ClInclude Include="Common\Bitmap.h" />\r
     <ClInclude Include="charsets.h" />\r
     <ClInclude Include="DirSelectFilesDlg.h" />\r
-    <ClInclude Include="IgnoredSubstitutionsList.h" />\r
+    <ClInclude Include="SubstitutionFiltersList.h" />\r
     <ClInclude Include="MergeFrameCommon.h" />\r
     <ClInclude Include="MergeEditFrm.h" />\r
     <ClInclude Include="Common\ClipBoard.h" />\r
@@ -1208,7 +1208,7 @@
     <ClInclude Include="Common\LanguageSelect.h" />\r
     <ClInclude Include="JumpList.h" />\r
     <ClInclude Include="LineFiltersDlg.h" />\r
-    <ClInclude Include="IgnoredSubstitutionsDlg.h" />\r
+    <ClInclude Include="SubstitutionFiltersDlg.h" />\r
     <ClInclude Include="LineFiltersList.h" />\r
     <ClInclude Include="SubstitutionList.h" />\r
     <ClInclude Include="LoadSaveCodepageDlg.h" />\r

diff --git a/Src/Merge.vs2017.vcxproj.filters b/Src/Merge.vs2017.vcxproj.filters
index 7852426..a0b427b 100644 (file)
--- a/Src/Merge.vs2017.vcxproj.filters
+++ b/Src/Merge.vs2017.vcxproj.filters
@@ -919,7 +919,7 @@
     <ClCompile Include="..\Externals\crystaledit\editlib\utils\hqbitmap.cpp">\r
       <Filter>EditLib\Utils</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="IgnoredSubstitutionsDlg.cpp">\r
+    <ClCompile Include="SubstitutionFiltersDlg.cpp">\r
       <Filter>MFCGui\Dialogs\Source Files</Filter>\r
     </ClCompile>\r
     <ClCompile Include="..\Externals\crystaledit\editlib\parsers\javascript.cpp">\r
@@ -931,7 +931,7 @@
     <ClCompile Include="SubstitutionList.cpp">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="IgnoredSubstitutionsList.cpp">\r
+    <ClCompile Include="SubstitutionFiltersList.cpp">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
   </ItemGroup>\r
@@ -1665,13 +1665,13 @@
     <ClInclude Include="LineFiltersList.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="IgnoredSubstitutionsDlg.h">\r
+    <ClInclude Include="SubstitutionFiltersDlg.h">\r
       <Filter>MFCGui\Dialogs\Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="SubstitutionList.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="IgnoredSubstitutionsList.h">\r
+    <ClInclude Include="SubstitutionFiltersList.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
   </ItemGroup>\r

diff --git a/Src/Merge.vs2019.vcxproj b/Src/Merge.vs2019.vcxproj
index bf4f71b..606070f 100644 (file)
--- a/Src/Merge.vs2019.vcxproj
+++ b/Src/Merge.vs2019.vcxproj
@@ -535,7 +535,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
     </ClCompile>\r
     <ClCompile Include="DirSelectFilesDlg.cpp" />\r
-    <ClCompile Include="IgnoredSubstitutionsList.cpp">\r
+    <ClCompile Include="SubstitutionFiltersList.cpp">\r
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
       <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
     </ClCompile>\r
@@ -757,7 +757,7 @@
       <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
     </ClCompile>\r
     <ClCompile Include="LineFiltersDlg.cpp" />\r
-    <ClCompile Include="IgnoredSubstitutionsDlg.cpp" />\r
+    <ClCompile Include="SubstitutionFiltersDlg.cpp" />\r
     <ClCompile Include="SubeditList.cpp" />\r
     <ClCompile Include="LineFiltersList.cpp">\r
       <PrecompiledHeader>Use</PrecompiledHeader>\r
@@ -1126,7 +1126,7 @@
     <ClInclude Include="Common\Bitmap.h" />\r
     <ClInclude Include="charsets.h" />\r
     <ClInclude Include="DirSelectFilesDlg.h" />\r
-    <ClInclude Include="IgnoredSubstitutionsList.h" />\r
+    <ClInclude Include="SubstitutionFiltersList.h" />\r
     <ClInclude Include="MergeFrameCommon.h" />\r
     <ClInclude Include="MergeEditFrm.h" />\r
     <ClInclude Include="Common\ClipBoard.h" />\r
@@ -1210,7 +1210,7 @@
     <ClInclude Include="Common\LanguageSelect.h" />\r
     <ClInclude Include="JumpList.h" />\r
     <ClInclude Include="LineFiltersDlg.h" />\r
-    <ClInclude Include="IgnoredSubstitutionsDlg.h" />\r
+    <ClInclude Include="SubstitutionFiltersDlg.h" />\r
     <ClInclude Include="LineFiltersList.h" />\r
     <ClInclude Include="SubstitutionList.h" />\r
     <ClInclude Include="LoadSaveCodepageDlg.h" />\r

diff --git a/Src/Merge.vs2019.vcxproj.filters b/Src/Merge.vs2019.vcxproj.filters
index 7852426..a0b427b 100644 (file)
--- a/Src/Merge.vs2019.vcxproj.filters
+++ b/Src/Merge.vs2019.vcxproj.filters
@@ -919,7 +919,7 @@
     <ClCompile Include="..\Externals\crystaledit\editlib\utils\hqbitmap.cpp">\r
       <Filter>EditLib\Utils</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="IgnoredSubstitutionsDlg.cpp">\r
+    <ClCompile Include="SubstitutionFiltersDlg.cpp">\r
       <Filter>MFCGui\Dialogs\Source Files</Filter>\r
     </ClCompile>\r
     <ClCompile Include="..\Externals\crystaledit\editlib\parsers\javascript.cpp">\r
@@ -931,7 +931,7 @@
     <ClCompile Include="SubstitutionList.cpp">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="IgnoredSubstitutionsList.cpp">\r
+    <ClCompile Include="SubstitutionFiltersList.cpp">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
   </ItemGroup>\r
@@ -1665,13 +1665,13 @@
     <ClInclude Include="LineFiltersList.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="IgnoredSubstitutionsDlg.h">\r
+    <ClInclude Include="SubstitutionFiltersDlg.h">\r
       <Filter>MFCGui\Dialogs\Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="SubstitutionList.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="IgnoredSubstitutionsList.h">\r
+    <ClInclude Include="SubstitutionFiltersList.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
   </ItemGroup>\r

diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
index 7704c20..70672f4 100644 (file)
--- a/Src/MergeDoc.cpp
+++ b/Src/MergeDoc.cpp
@@ -39,7 +39,7 @@
 #include "MergeLineFlags.h"
 #include "FileOrFolderSelect.h"
 #include "LineFiltersList.h"
-#include "IgnoredSubstitutionsList.h"
+#include "SubstitutionFiltersList.h"
 #include "TempFile.h"
 #include "codepage_detect.h"
 #include "SelectUnpackerDlg.h"
@@ -303,13 +303,13 @@ int CMergeDoc::Rescan(bool &bBinary, IDENTLEVEL &identical,
                m_diffWrapper.SetFilterList(_T(""));
        }
 
-       if (GetOptionsMgr()->GetBool(OPT_IGNORED_SUBSTITUTIONS_ENABLED) && theApp.m_pIgnoredSubstitutionsList)
+       if (GetOptionsMgr()->GetBool(OPT_SUBSTITUTION_FILTERS_ENABLED) && theApp.m_pSubstitutionFiltersList)
        {
-               m_diffWrapper.SetIgnoredSubstitutionsList(theApp.m_pIgnoredSubstitutionsList->MakeSubstitutionList());
+               m_diffWrapper.SetSubstitutionList(theApp.m_pSubstitutionFiltersList->MakeSubstitutionList());
        }
        else
        {
-               m_diffWrapper.SetIgnoredSubstitutionsList(nullptr);
+               m_diffWrapper.SetSubstitutionList(nullptr);
        }
 
        if (GetView(0, 0)->m_CurSourceDef->type != 0)

diff --git a/Src/MergeDoc.h b/Src/MergeDoc.h
index 228cad0..3160ded 100644 (file)
--- a/Src/MergeDoc.h
+++ b/Src/MergeDoc.h
@@ -258,7 +258,7 @@ public:
 public:
        typedef enum { BYTEDIFF, WORDDIFF } DIFFLEVEL;
        void Showlinediff(CMergeEditView *pView, bool bReversed = false);
-       void AddToIgnoredSubstitutions(CMergeEditView* pView, bool bReversed = false);
+       void AddToSubstitutionFilters(CMergeEditView* pView, bool bReversed = false);
        std::vector<WordDiff> GetWordDiffArrayInDiffBlock(int nDiff);
        std::vector<WordDiff> GetWordDiffArray(int nLineIndex);
        void ClearWordDiffCache(int nDiff = -1);

diff --git a/Src/MergeDocLineDiffs.cpp b/Src/MergeDocLineDiffs.cpp
index 5a403c0..73f464d 100644 (file)
--- a/Src/MergeDocLineDiffs.cpp
+++ b/Src/MergeDocLineDiffs.cpp
@@ -13,7 +13,7 @@
 #include "DiffTextBuffer.h"
 #include "stringdiffs.h"
 #include "UnicodeString.h"
-#include "IgnoredSubstitutionsList.h"
+#include "SubstitutionFiltersList.h"
 #include "Merge.h"
 
 #ifdef _DEBUG
@@ -67,7 +67,7 @@ void CMergeDoc::Showlinediff(CMergeEditView *pView, bool bReversed)
                HighlightDiffRect(m_pView[pView->m_nThisGroup][nBuffer], rc[nBuffer]);
 }
 
-void CMergeDoc::AddToIgnoredSubstitutions(CMergeEditView* pView, bool bReversed)
+void CMergeDoc::AddToSubstitutionFilters(CMergeEditView* pView, bool bReversed)
 {
        if (m_nBuffers != 2)
                return; /// Not clear what to do for a 3-way merge
@@ -79,7 +79,7 @@ void CMergeDoc::AddToIgnoredSubstitutions(CMergeEditView* pView, bool bReversed)
        if (std::all_of(rc, rc + m_nBuffers, [](auto& rc) { return rc.top == -1; }))
        {
                String caption = _("Line difference");
-               String msg = _("No differences found to add as ignored substitution");
+               String msg = _("No differences found to add as substitution filter");
                MessageBox(pView->GetSafeHwnd(), msg.c_str(), caption.c_str(), MB_OK);
                return;
        }
@@ -98,26 +98,26 @@ void CMergeDoc::AddToIgnoredSubstitutions(CMergeEditView* pView, bool bReversed)
        }
 
 
-       /// Check whether the pair is already registered with Ignored Substitutions
-       IgnoredSubstitutionsList &ignoredSubstitutionsList = *theApp.m_pIgnoredSubstitutionsList.get();
-       for (int f = 0; f < ignoredSubstitutionsList.GetCount(); f++)
+       /// Check whether the pair is already registered with Substitution Filters
+       SubstitutionFiltersList &SubstitutionFiltersList = *theApp.m_pSubstitutionFiltersList.get();
+       for (int f = 0; f < SubstitutionFiltersList.GetCount(); f++)
        {
-               String str0 = ignoredSubstitutionsList.GetAt(f).pattern;
-               String str1 = ignoredSubstitutionsList.GetAt(f).replacement;
+               String str0 = SubstitutionFiltersList.GetAt(f).pattern;
+               String str1 = SubstitutionFiltersList.GetAt(f).replacement;
                if ( str0 == selectedText[0] && str1 == selectedText[1])
                {
-                       String caption = _("The pair is already present in the list of Ignored Substitutions");
+                       String caption = _("The pair is already present in the list of Substitution Filters");
                        String msg = strutils::format(_T("\"%s\" <-> \"%s\""), selectedText[0], selectedText[1]);
                        MessageBox(pView->GetSafeHwnd(), msg.c_str(), caption.c_str(), MB_OK);
                        return; /// The substitution pair is already registered
                }
        }
 
-       String caption = _("Add this change to Ignored Substitutions?");
+       String caption = _("Add this change to Substitution Filters?");
        String msg = strutils::format(_T("\"%s\" <-> \"%s\""), selectedText[0], selectedText[1]);
        if (MessageBox(pView->GetSafeHwnd(), msg.c_str(), caption.c_str(), MB_YESNO) == IDYES)
        {
-               ignoredSubstitutionsList.Add(selectedText[0], selectedText[1], false, true, false, true);
+               SubstitutionFiltersList.Add(selectedText[0], selectedText[1], false, true, false, true);
                FlushAndRescan(true);
                //Rescan();
        }

diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp
index 174d4b9..3c96b7f 100644 (file)
--- a/Src/MergeEditView.cpp
+++ b/Src/MergeEditView.cpp
@@ -159,8 +159,8 @@ BEGIN_MESSAGE_MAP(CMergeEditView, CCrystalEditViewEx)
        ON_UPDATE_COMMAND_UI(ID_SELECTLINEDIFF, OnUpdateSelectLineDiff)
        ON_COMMAND(ID_SELECTPREVLINEDIFF, OnSelectLineDiff<true>)
        ON_UPDATE_COMMAND_UI(ID_SELECTPREVLINEDIFF, OnUpdateSelectLineDiff)
-       ON_COMMAND(ID_ADD_TO_IGNORED_SUBSTITUTIONS, OnAddToIgnoredSubstitutions)
-       ON_UPDATE_COMMAND_UI(ID_ADD_TO_IGNORED_SUBSTITUTIONS, OnUpdateAddToIgnoredSubstitutions)
+       ON_COMMAND(ID_ADD_TO_IGNORED_SUBSTITUTIONS, OnAddToSubstitutionFilters)
+       ON_UPDATE_COMMAND_UI(ID_ADD_TO_IGNORED_SUBSTITUTIONS, OnUpdateAddToSubstitutionFilters)
        ON_WM_CONTEXTMENU()
        ON_UPDATE_COMMAND_UI(ID_EDIT_REPLACE, OnUpdateEditReplace)
        ON_COMMAND(ID_FILE_LEFT_READONLY, OnLeftReadOnly)
@@ -2798,13 +2798,13 @@ void CMergeEditView::OnUpdateSelectLineDiff(CCmdUI* pCmdUI)
        pCmdUI->Enable(!GetDocument()->IsEditedAfterRescan());
 }
 
-void CMergeEditView::OnAddToIgnoredSubstitutions()
+void CMergeEditView::OnAddToSubstitutionFilters()
 {
        // Pass this to the document, to compare this file to other
-       GetDocument()->AddToIgnoredSubstitutions(this, false);
+       GetDocument()->AddToSubstitutionFilters(this, false);
 }
 
-void CMergeEditView::OnUpdateAddToIgnoredSubstitutions(CCmdUI* pCmdUI)
+void CMergeEditView::OnUpdateAddToSubstitutionFilters(CCmdUI* pCmdUI)
 {
        pCmdUI->Enable(GetDocument()->m_nBuffers == 2 && !GetDocument()->IsEditedAfterRescan());
 }

diff --git a/Src/MergeEditView.h b/Src/MergeEditView.h
index c46ade1..50faea8 100644 (file)
--- a/Src/MergeEditView.h
+++ b/Src/MergeEditView.h
@@ -283,8 +283,8 @@ protected:
        template<bool reversed>
        afx_msg void OnSelectLineDiff();
        afx_msg void OnUpdateSelectLineDiff(CCmdUI* pCmdUI);
-       afx_msg void OnAddToIgnoredSubstitutions();
-       afx_msg void OnUpdateAddToIgnoredSubstitutions(CCmdUI* pCmdUI);
+       afx_msg void OnAddToSubstitutionFilters();
+       afx_msg void OnUpdateAddToSubstitutionFilters(CCmdUI* pCmdUI);
        afx_msg void OnContextMenu(CWnd* pWnd, CPoint point);
        afx_msg void OnUpdateEditReplace(CCmdUI* pCmdUI);
        afx_msg void OnLeftReadOnly();

diff --git a/Src/OptionsDef.h b/Src/OptionsDef.h
index f4d0a33..272a556 100644 (file)
--- a/Src/OptionsDef.h
+++ b/Src/OptionsDef.h
@@ -250,8 +250,8 @@ extern const String OPT_FILEFILTER_CURRENT OP("Settings/FileFilterCurrent");
 extern const String OPT_FILTER_USERPATH OP("Settings/UserFilterPath");
 extern const String OPT_FILEFILTER_SHARED OP("Settings/Filters/Shared");
 
-/// Ignored Susbstitutions
-extern const String OPT_IGNORED_SUBSTITUTIONS_ENABLED OP("Settings/IgnoredSubstitutionsEnabled");
+/// Substitution Filters
+extern const String OPT_SUBSTITUTION_FILTERS_ENABLED OP("Settings/SubstitutionFiltersEnabled");
 
 // Archive support
 extern const String OPT_ARCHIVE_ENABLE OP("Merge7z/Enable");

diff --git a/Src/OptionsInit.cpp b/Src/OptionsInit.cpp
index e30f7fa..ee776b5 100644 (file)
--- a/Src/OptionsInit.cpp
+++ b/Src/OptionsInit.cpp
@@ -166,7 +166,7 @@ void Init(COptionsMgr *pOptions)
        pOptions->InitOption(OPT_CUSTOM_TEMP_PATH, _T(""));
 
        pOptions->InitOption(OPT_LINEFILTER_ENABLED, false);
-       pOptions->InitOption(OPT_IGNORED_SUBSTITUTIONS_ENABLED, false);
+       pOptions->InitOption(OPT_SUBSTITUTION_FILTERS_ENABLED, false);
 
        pOptions->InitOption(OPT_FILEFILTER_CURRENT, _T("*.*"));
        // CMainFrame initializes this when it is empty.

diff --git a/Src/PropCompare.cpp b/Src/PropCompare.cpp
index f476254..78aa2bf 100644 (file)
--- a/Src/PropCompare.cpp
+++ b/Src/PropCompare.cpp
@@ -48,7 +48,7 @@ void PropCompare::DoDataExchange(CDataExchange* pDX)
        DDX_Radio(pDX, IDC_WHITESPACE, m_nIgnoreWhite);
        DDX_Check(pDX, IDC_MOVED_BLOCKS, m_bMovedBlocks);
        DDX_Check(pDX, IDC_MATCH_SIMILAR_LINES, m_bMatchSimilarLines);
-       DDX_Check(pDX, IDC_COMPLETELY_BLANK_OUT_IGNORED_CHANGES, m_bCompleteBlankOutIgnoredChanges);
+       DDX_Check(pDX, IDC_COMPLETELY_BLANK_OUT_IGNORED_DIFFERENCES, m_bCompleteBlankOutIgnoredChanges);
        //}}AFX_DATA_MAP
        UpdateControls();
 }

diff --git a/Src/SubeditList.cpp b/Src/SubeditList.cpp
index d03fc22..a1a5870 100644 (file)
--- a/Src/SubeditList.cpp
+++ b/Src/SubeditList.cpp
@@ -94,7 +94,7 @@ int CSubeditList::HitTestEx(CPoint &point, int *col) const
 BEGIN_MESSAGE_MAP(CSubeditList, CListCtrl)
        //{{AFX_MSG_MAP(CSubeditList)
                // NOTE - the ClassWizard will add and remove mapping macros here.
-       ON_NOTIFY(LVN_ENDLABELEDIT, IDC_IGNORED_SUBSTITUTIONS_FILTER, OnEndLabelEdit)
+       ON_NOTIFY(LVN_ENDLABELEDIT, IDC_SUBSTITUTION_FILTERS, OnEndLabelEdit)
        ON_WM_LBUTTONDOWN()
        //}}AFX_MSG_MAP
 END_MESSAGE_MAP()

diff --git a/Src/IgnoredSubstitutionsDlg.cpp b/Src/SubstitutionFiltersDlg.cpp
similarity index 75%
rename from Src/IgnoredSubstitutionsDlg.cpp
rename to Src/SubstitutionFiltersDlg.cpp
index d14a99c..1506dc3 100644 (file)
--- a/Src/IgnoredSubstitutionsDlg.cpp
+++ b/Src/SubstitutionFiltersDlg.cpp
@@ -1,13 +1,13 @@
 /**
- *  @file IgnoredSubstitutionsDlg.cpp
+ *  @file SubstitutionFiltersDlg.cpp
  *
- *  @brief Implementation of Ignored Substitutions dialog
+ *  @brief Implementation of Substitution Filters dialog
  */ 
 
 #include "stdafx.h"
-#include "IgnoredSubstitutionsList.h"
+#include "SubstitutionFiltersList.h"
 #include "Merge.h"
-#include "IgnoredSubstitutionsDlg.h"
+#include "SubstitutionFiltersDlg.h"
 #include <Poco/Exception.h>
 
 #ifdef _DEBUG
@@ -20,16 +20,16 @@ static TCHAR FilterHelpLocation[] = _T("::/htmlhelp/Filters.html");
 /////////////////////////////////////////////////////////////////////////////
 // CPropLineFilter property page
 
-IMPLEMENT_DYNAMIC(IgnoredSubstitutionsDlg, CTrPropertyPage)
+IMPLEMENT_DYNAMIC(SubstitutionFiltersDlg, CTrPropertyPage)
 
 /**
  * @brief Constructor.
  */
-IgnoredSubstitutionsDlg::IgnoredSubstitutionsDlg()
-       : CTrPropertyPage(IgnoredSubstitutionsDlg::IDD)
-       , m_pIgnoredSubstitutionsList(nullptr)
+SubstitutionFiltersDlg::SubstitutionFiltersDlg()
+       : CTrPropertyPage(SubstitutionFiltersDlg::IDD)
+       , m_pSubstitutionFiltersList(nullptr)
 {
-       //{{AFX_DATA_INIT(IgnoredSubstitutionsFiltersDlg)
+       //{{AFX_DATA_INIT(SubstitutionFiltersFiltersDlg)
        m_bEnabled = false;
        //}}AFX_DATA_INIT
        m_strCaption = theApp.LoadDialogCaption(m_lpszTemplateName).c_str();
@@ -39,22 +39,22 @@ IgnoredSubstitutionsDlg::IgnoredSubstitutionsDlg()
        m_psp.dwFlags |= PSP_USEHICON;
 }
 
-void IgnoredSubstitutionsDlg::DoDataExchange(CDataExchange* pDX)
+void SubstitutionFiltersDlg::DoDataExchange(CDataExchange* pDX)
 {
        CPropertyPage::DoDataExchange(pDX);
-       //{{AFX_DATA_MAP(IgnoredSubstitutionsFiltersDlg)
+       //{{AFX_DATA_MAP(SubstitutionFiltersFiltersDlg)
        DDX_Check(pDX, IDC_IGNORED_SUSBSTITUTIONS_ENABLED, m_bEnabled);
-       DDX_Control(pDX, IDC_IGNORED_SUBSTITUTIONS_FILTER, m_listFilters);
+       DDX_Control(pDX, IDC_SUBSTITUTION_FILTERS, m_listFilters);
        //}}AFX_DATA_MAP
 }
 
-BEGIN_MESSAGE_MAP(IgnoredSubstitutionsDlg, CTrPropertyPage)
-       //{{AFX_MSG_MAP(IgnoredSubstitutionsFiltersDlg)
+BEGIN_MESSAGE_MAP(SubstitutionFiltersDlg, CTrPropertyPage)
+       //{{AFX_MSG_MAP(SubstitutionFiltersFiltersDlg)
        ON_COMMAND(ID_HELP, OnHelp)
        ON_BN_CLICKED(IDC_LFILTER_ADDBTN, OnBnClickedAddBtn)
        ON_BN_CLICKED(IDC_LFILTER_CLEARBTN, OnBnClickedClearBtn)
        ON_BN_CLICKED(IDC_LFILTER_REMOVEBTN, OnBnClickedRemovebtn)
-       ON_NOTIFY(LVN_ENDLABELEDIT, IDC_IGNORED_SUBSTITUTIONS_FILTER, OnEndLabelEdit)
+       ON_NOTIFY(LVN_ENDLABELEDIT, IDC_SUBSTITUTION_FILTERS, OnEndLabelEdit)
        //}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
@@ -65,7 +65,7 @@ END_MESSAGE_MAP()
 /**
  * @brief Initialize the dialog.
  */
-BOOL IgnoredSubstitutionsDlg::OnInitDialog()
+BOOL SubstitutionFiltersDlg::OnInitDialog()
 {
        CTrPropertyPage::OnInitDialog();
 
@@ -83,7 +83,7 @@ static CString RemoveMnemonic(String text)
        return ucr::toTString(textu8).c_str();
 }
 
-void IgnoredSubstitutionsDlg::InitList()
+void SubstitutionFiltersDlg::InitList()
 {
        m_listFilters.SetExtendedStyle(LVS_EX_CHECKBOXES | LVS_EX_FULLROWSELECT | LVS_EX_INFOTIP);
 
@@ -99,11 +99,11 @@ void IgnoredSubstitutionsDlg::InitList()
        m_listFilters.SetBooleanValueColumn(3);
        m_listFilters.SetBooleanValueColumn(4);
 
-       if (m_pIgnoredSubstitutionsList)
+       if (m_pSubstitutionFiltersList)
        {
-               for (int i = 0; i < (int)m_pIgnoredSubstitutionsList->GetCount(); i++)
+               for (int i = 0; i < (int)m_pSubstitutionFiltersList->GetCount(); i++)
                {
-                       const IgnoredSubstitution& item = m_pIgnoredSubstitutionsList->GetAt(i);
+                       const SubstitutionFilter& item = m_pSubstitutionFiltersList->GetAt(i);
                        m_listFilters.InsertItem(i, item.pattern.c_str());
                        m_listFilters.SetItemText(i, 1, item.replacement.c_str());
                        m_listFilters.SetItemBooleanValue(i, 2, item.useRegExp);
@@ -117,7 +117,7 @@ void IgnoredSubstitutionsDlg::InitList()
 /**
  * @brief Open help from mainframe when user presses F1.
  */
-void IgnoredSubstitutionsDlg::OnHelp()
+void SubstitutionFiltersDlg::OnHelp()
 {
        theApp.ShowHelp(FilterHelpLocation);
 }
@@ -125,7 +125,7 @@ void IgnoredSubstitutionsDlg::OnHelp()
 /**
  * @brief Called when Add-button is clicked.
  */
-void IgnoredSubstitutionsDlg::OnBnClickedAddBtn()
+void SubstitutionFiltersDlg::OnBnClickedAddBtn()
 {
        int num = m_listFilters.GetItemCount();
        int ind = m_listFilters.InsertItem(num, _("<Edit here>").c_str());
@@ -145,7 +145,7 @@ void IgnoredSubstitutionsDlg::OnBnClickedAddBtn()
 /**
  * @brief Called when Clear-button is clicked.
  */
-void IgnoredSubstitutionsDlg::OnBnClickedClearBtn()
+void SubstitutionFiltersDlg::OnBnClickedClearBtn()
 {
        m_listFilters.DeleteAllItems();
 }
@@ -153,9 +153,9 @@ void IgnoredSubstitutionsDlg::OnBnClickedClearBtn()
 /**
  * @brief Save filters to list when exiting the dialog.
  */
-BOOL IgnoredSubstitutionsDlg::OnApply()
+BOOL SubstitutionFiltersDlg::OnApply()
 {
-       m_pIgnoredSubstitutionsList->Empty();
+       m_pSubstitutionFiltersList->Empty();
 
        for (int i = 0; i < m_listFilters.GetItemCount(); i++)
        {
@@ -167,14 +167,14 @@ BOOL IgnoredSubstitutionsDlg::OnApply()
                if (useRegExp)
                        matchWholeWordOnly = false;
                bool enabled = !!m_listFilters.GetCheck(i);
-               m_pIgnoredSubstitutionsList->Add(symbolBeforeRename, symbolAfterRename,
+               m_pSubstitutionFiltersList->Add(symbolBeforeRename, symbolAfterRename,
                        useRegExp, caseSensitive, matchWholeWordOnly, enabled);
        }
 
        // Test
        try
        {
-               m_pIgnoredSubstitutionsList->MakeSubstitutionList(true);
+               m_pSubstitutionFiltersList->MakeSubstitutionList(true);
        }
        catch (Poco::RegularExpressionException& e)
        {
@@ -190,15 +190,15 @@ BOOL IgnoredSubstitutionsDlg::OnApply()
  * @brief Sets external filter list.
  * @param [in] list External filter list.
  */
-void IgnoredSubstitutionsDlg::SetList(IgnoredSubstitutionsList *list)
+void SubstitutionFiltersDlg::SetList(SubstitutionFiltersList *list)
 {
-       m_pIgnoredSubstitutionsList = list;
+       m_pSubstitutionFiltersList = list;
 }
 
 /**
  * @brief Called when Remove button is clicked.
  */
-void IgnoredSubstitutionsDlg::OnBnClickedRemovebtn()
+void SubstitutionFiltersDlg::OnBnClickedRemovebtn()
 {
        int sel = m_listFilters.GetNextItem(-1, LVNI_SELECTED);
        if (sel != -1)
@@ -218,7 +218,7 @@ void IgnoredSubstitutionsDlg::OnBnClickedRemovebtn()
 /**
  * @brief Called when in-place editing has finished.
  */
-void IgnoredSubstitutionsDlg::OnEndLabelEdit(NMHDR *pNMHDR, LRESULT *pResult)
+void SubstitutionFiltersDlg::OnEndLabelEdit(NMHDR *pNMHDR, LRESULT *pResult)
 {
        m_listFilters.OnEndLabelEdit(pNMHDR, pResult);
 }

diff --git a/Src/IgnoredSubstitutionsDlg.h b/Src/SubstitutionFiltersDlg.h
similarity index 68%
rename from Src/IgnoredSubstitutionsDlg.h
rename to Src/SubstitutionFiltersDlg.h
index a811a0b..3ef6e67 100644 (file)
--- a/Src/IgnoredSubstitutionsDlg.h
+++ b/Src/SubstitutionFiltersDlg.h
@@ -1,5 +1,5 @@
 /** 
- * @file  IgnoredSubstitutionsDlg.h
+ * @file  SubstitutionFiltersDlg.h
  *
  * @brief Declaration file for Line Filter dialog
  *
@@ -9,27 +9,27 @@
 #include "TrDialogs.h"
 #include "SubeditList.h"
 
-class IgnoredSubstitutionFiltersList;
+class SubstitutionFilterFiltersList;
 
-class IgnoredSubstitutionsDlg : public CTrPropertyPage
+class SubstitutionFiltersDlg : public CTrPropertyPage
 {
-       DECLARE_DYNAMIC(IgnoredSubstitutionsDlg)
+       DECLARE_DYNAMIC(SubstitutionFiltersDlg)
 
 // Construction
 public:
-       IgnoredSubstitutionsDlg();
+       SubstitutionFiltersDlg();
 
-       void SetList(IgnoredSubstitutionsList *list);
+       void SetList(SubstitutionFiltersList *list);
 
 // Dialog Data
-       //{{AFX_DATA(IgnoredSubstitutionsDlg)
+       //{{AFX_DATA(SubstitutionFiltersDlg)
        enum { IDD = IDD_IGNORED_SUSBSTITUTIONS_DLG };
        bool m_bEnabled;
        //}}AFX_DATA
 
 // Overrides
        // ClassWizard generate virtual function overrides
-       //{{AFX_VIRTUAL(IgnoredSubstitutionsDlg)
+       //{{AFX_VIRTUAL(SubstitutionFiltersDlg)
        protected:
        virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
        //}}AFX_VIRTUAL
@@ -38,7 +38,7 @@ public:
 protected:
 
        // Generated message map functions
-       //{{AFX_MSG(IgnoredSubstitutionsDlg)
+       //{{AFX_MSG(SubstitutionFiltersDlg)
        virtual BOOL OnInitDialog() override;
        afx_msg void OnHelp();
        virtual BOOL OnApply() override;
@@ -54,5 +54,5 @@ protected:
 private:
        CSubeditList m_listFilters; /**< List control having filter strings */
 
-       IgnoredSubstitutionsList *m_pIgnoredSubstitutionsList;
+       SubstitutionFiltersList *m_pSubstitutionFiltersList;
 };

diff --git a/Src/IgnoredSubstitutionsList.cpp b/Src/SubstitutionFiltersList.cpp
similarity index 68%
rename from Src/IgnoredSubstitutionsList.cpp
rename to Src/SubstitutionFiltersList.cpp
index 1159958..39e725d 100644 (file)
--- a/Src/IgnoredSubstitutionsList.cpp
+++ b/Src/SubstitutionFiltersList.cpp
@@ -1,11 +1,11 @@
 /** 
- * @file  IgnoredSubstitutionsList.cpp
+ * @file  SubstitutionFiltersList.cpp
  *
- * @brief Implementation for IgnoredSubstitutionsFiltersList class.
+ * @brief Implementation for SubstitutionFiltersList class.
  */
 
 #include "pch.h"
-#include "IgnoredSubstitutionsList.h"
+#include "SubstitutionFiltersList.h"
 #include "SubstitutionList.h"
 #include <vector>
 #include <cassert>
@@ -13,13 +13,13 @@
 #include "OptionsMgr.h"
 #include "UnicodeString.h"
 
-/** @brief Registry key for saving Ignored Substitutions filters. */
-static const TCHAR IgnoredSubstitutionsRegPath[] = _T("IgnoredSubstitutions");
+/** @brief Registry key for saving Substitution filters. */
+static const TCHAR SubstitutionFiltersRegPath[] = _T("SubstitutionFilters");
 
 /**
  * @brief Default constructor.
  */
-IgnoredSubstitutionsList::IgnoredSubstitutionsList()
+SubstitutionFiltersList::SubstitutionFiltersList()
 : m_pOptionsMgr(nullptr)
 {
 }
@@ -27,7 +27,7 @@ IgnoredSubstitutionsList::IgnoredSubstitutionsList()
 /**
  * @brief Destructor, empties the list.
  */
-IgnoredSubstitutionsList::~IgnoredSubstitutionsList()
+SubstitutionFiltersList::~SubstitutionFiltersList()
 {
 }
 
@@ -36,10 +36,10 @@ IgnoredSubstitutionsList::~IgnoredSubstitutionsList()
  * @param [in] filter Filter string to add.
  * @param [in] enabled Is filter enabled?
  */
-void IgnoredSubstitutionsList::Add(const String& filter0, const String& filter1,
+void SubstitutionFiltersList::Add(const String& filter0, const String& filter1,
        bool useRegExp, bool caseSensitive, bool matchWholeWordOnly, bool enabled)
 {
-       IgnoredSubstitution item;
+       SubstitutionFilter item;
        item.useRegExp = useRegExp;
        item.caseSensitive = caseSensitive;
        item.matchWholeWordOnly = matchWholeWordOnly;
@@ -55,7 +55,7 @@ void IgnoredSubstitutionsList::Add(const String& filter0, const String& filter1,
  * @return Filter item from the index. If the index is beyond table limit,
  *  return the last item in the list.
  */
-const IgnoredSubstitution& IgnoredSubstitutionsList::GetAt(size_t ind) const
+const SubstitutionFilter& SubstitutionFiltersList::GetAt(size_t ind) const
 {
        if (ind < m_items.size())
                return m_items[ind];
@@ -69,14 +69,14 @@ const IgnoredSubstitution& IgnoredSubstitutionsList::GetAt(size_t ind) const
  * list are removed and new items added from the given list.
  * @param [in] list List to clone.
  */
-void IgnoredSubstitutionsList::CloneFrom(const IgnoredSubstitutionsList *list)
+void SubstitutionFiltersList::CloneFrom(const SubstitutionFiltersList *list)
 {
        Empty();
        size_t count = list->GetCount();
 
        for (size_t i = 0; i < count; i++)
        {
-               const IgnoredSubstitution &item = list->GetAt(i);
+               const SubstitutionFilter &item = list->GetAt(i);
                Add(item.pattern, item.replacement, item.useRegExp,
                        item.caseSensitive, item.matchWholeWordOnly, item.enabled);
        }
@@ -87,15 +87,15 @@ void IgnoredSubstitutionsList::CloneFrom(const IgnoredSubstitutionsList *list)
  * @param [in] list List to compare.
  * @return true if lists are identical, false otherwise.
  */
-bool IgnoredSubstitutionsList::Compare(const IgnoredSubstitutionsList *list) const
+bool SubstitutionFiltersList::Compare(const SubstitutionFiltersList *list) const
 {
        if (list->GetCount() != GetCount())
                return false;
 
        for (size_t i = 0; i < GetCount(); i++)
        {
-               const IgnoredSubstitution &item1 = list->GetAt(i);
-               const IgnoredSubstitution &item2 = GetAt(i);
+               const SubstitutionFilter &item1 = list->GetAt(i);
+               const SubstitutionFilter &item2 = GetAt(i);
 
                if
                (
@@ -115,10 +115,10 @@ bool IgnoredSubstitutionsList::Compare(const IgnoredSubstitutionsList *list) con
  * @brief Read filter list from the options system.
  * @param [in] pOptionsMgr Pointer to options system.
  */
-void IgnoredSubstitutionsList::Initialize(COptionsMgr *pOptionsMgr)
+void SubstitutionFiltersList::Initialize(COptionsMgr *pOptionsMgr)
 {
        assert(pOptionsMgr != nullptr);
-       String valuename(IgnoredSubstitutionsRegPath);
+       String valuename(SubstitutionFiltersRegPath);
 
        m_pOptionsMgr = pOptionsMgr;
 
@@ -129,27 +129,27 @@ void IgnoredSubstitutionsList::Initialize(COptionsMgr *pOptionsMgr)
 
        for (unsigned i = 0; i < count; i++)
        {
-               String nameEnabled = strutils::format(_T("%s/Enabled%02u"), IgnoredSubstitutionsRegPath, i);
+               String nameEnabled = strutils::format(_T("%s/Enabled%02u"), SubstitutionFiltersRegPath, i);
                m_pOptionsMgr->InitOption(nameEnabled, true);
                bool enabled = m_pOptionsMgr->GetBool(nameEnabled);
 
-               String nameUseRegExp = strutils::format(_T("%s/UseRegExp%02u"), IgnoredSubstitutionsRegPath, i);
+               String nameUseRegExp = strutils::format(_T("%s/UseRegExp%02u"), SubstitutionFiltersRegPath, i);
                m_pOptionsMgr->InitOption(nameUseRegExp, false);
                bool useRegExp = m_pOptionsMgr->GetBool(nameUseRegExp);
 
-               String nameCaseSensitive = strutils::format(_T("%s/CaseSensitive%02u"), IgnoredSubstitutionsRegPath, i);
+               String nameCaseSensitive = strutils::format(_T("%s/CaseSensitive%02u"), SubstitutionFiltersRegPath, i);
                m_pOptionsMgr->InitOption(nameCaseSensitive, false);
                bool caseSensitive = m_pOptionsMgr->GetBool(nameCaseSensitive);
 
-               String nameMatchWholeWordOnly = strutils::format(_T("%s/MatchWholeWordOnly%02u"), IgnoredSubstitutionsRegPath, i);
+               String nameMatchWholeWordOnly = strutils::format(_T("%s/MatchWholeWordOnly%02u"), SubstitutionFiltersRegPath, i);
                m_pOptionsMgr->InitOption(nameMatchWholeWordOnly, false);
                bool matchWholeWordOnly = m_pOptionsMgr->GetBool(nameMatchWholeWordOnly);
 
-               String name0 = strutils::format(_T("%s/Pattern%02u"), IgnoredSubstitutionsRegPath, i);
+               String name0 = strutils::format(_T("%s/Pattern%02u"), SubstitutionFiltersRegPath, i);
                m_pOptionsMgr->InitOption(name0, _T(""));
                String pattern = m_pOptionsMgr->GetString(name0);
 
-               String name1 = strutils::format(_T("%s/Replacement%02u"), IgnoredSubstitutionsRegPath, i);
+               String name1 = strutils::format(_T("%s/Replacement%02u"), SubstitutionFiltersRegPath, i);
                m_pOptionsMgr->InitOption(name1, _T(""));
                String replacement = m_pOptionsMgr->GetString(name1);
 
@@ -158,12 +158,12 @@ void IgnoredSubstitutionsList::Initialize(COptionsMgr *pOptionsMgr)
 }
 
 /**
- * @brief Save Ignored Substitutions to options system.
+ * @brief Save Substitution Filters to options system.
  */
-void IgnoredSubstitutionsList::SaveFilters()
+void SubstitutionFiltersList::SaveFilters()
 {
        assert(m_pOptionsMgr != nullptr);
-       String valuename(IgnoredSubstitutionsRegPath);
+       String valuename(SubstitutionFiltersRegPath);
 
        size_t count = m_items.size();
        valuename += _T("/Values");
@@ -171,51 +171,51 @@ void IgnoredSubstitutionsList::SaveFilters()
 
        for (size_t i = 0; i < count; i++)
        {
-               const IgnoredSubstitution& item = m_items[i];
+               const SubstitutionFilter& item = m_items[i];
 
-               String nameEnabled = strutils::format(_T("%s/Enabled%02u"), IgnoredSubstitutionsRegPath, i);
+               String nameEnabled = strutils::format(_T("%s/Enabled%02u"), SubstitutionFiltersRegPath, i);
                m_pOptionsMgr->InitOption(nameEnabled, true);
                m_pOptionsMgr->SaveOption(nameEnabled, item.enabled);
 
-               String nameUseRegExp = strutils::format(_T("%s/UseRegExp%02u"), IgnoredSubstitutionsRegPath, i);
+               String nameUseRegExp = strutils::format(_T("%s/UseRegExp%02u"), SubstitutionFiltersRegPath, i);
                m_pOptionsMgr->InitOption(nameUseRegExp, false);
                m_pOptionsMgr->SaveOption(nameUseRegExp, item.useRegExp);
 
-               String nameCaseSensitive = strutils::format(_T("%s/CaseSensitive%02u"), IgnoredSubstitutionsRegPath, i);
+               String nameCaseSensitive = strutils::format(_T("%s/CaseSensitive%02u"), SubstitutionFiltersRegPath, i);
                m_pOptionsMgr->InitOption(nameCaseSensitive, false);
                m_pOptionsMgr->SaveOption(nameCaseSensitive, item.caseSensitive);
 
-               String nameMatchWholeWordOnly = strutils::format(_T("%s/MatchWholeWordOnly%02u"), IgnoredSubstitutionsRegPath, i);
+               String nameMatchWholeWordOnly = strutils::format(_T("%s/MatchWholeWordOnly%02u"), SubstitutionFiltersRegPath, i);
                m_pOptionsMgr->InitOption(nameMatchWholeWordOnly, false);
                m_pOptionsMgr->SaveOption(nameMatchWholeWordOnly, item.matchWholeWordOnly);
 
-               String name0 = strutils::format(_T("%s/Pattern%02u"), IgnoredSubstitutionsRegPath, i);
+               String name0 = strutils::format(_T("%s/Pattern%02u"), SubstitutionFiltersRegPath, i);
                m_pOptionsMgr->InitOption(name0, _T(""));
                m_pOptionsMgr->SaveOption(name0, item.pattern);
 
-               String name1 = strutils::format(_T("%s/Replacement%02u"), IgnoredSubstitutionsRegPath, i);
+               String name1 = strutils::format(_T("%s/Replacement%02u"), SubstitutionFiltersRegPath, i);
                m_pOptionsMgr->InitOption(name1, _T(""));
                m_pOptionsMgr->SaveOption(name1, item.replacement);
        }
 
        // Remove options we don't need anymore
        // We could have earlier 10 pcs but now we only need 5
-       String filterEnabled = strutils::format(_T("%s/Enabled%02u"), IgnoredSubstitutionsRegPath, count);
+       String filterEnabled = strutils::format(_T("%s/Enabled%02u"), SubstitutionFiltersRegPath, count);
        int retvalEnabled = m_pOptionsMgr->RemoveOption(filterEnabled);
 
-       String filterUseRegExp = strutils::format(_T("%s/UseRegExp%02u"), IgnoredSubstitutionsRegPath, count);
+       String filterUseRegExp = strutils::format(_T("%s/UseRegExp%02u"), SubstitutionFiltersRegPath, count);
        int retvalUseRegExp = m_pOptionsMgr->RemoveOption(filterUseRegExp);
 
-       String filterCaseSensitive = strutils::format(_T("%s/CaseSensitive%02u"), IgnoredSubstitutionsRegPath, count);
+       String filterCaseSensitive = strutils::format(_T("%s/CaseSensitive%02u"), SubstitutionFiltersRegPath, count);
        int retvalCaseSensitive = m_pOptionsMgr->RemoveOption(filterCaseSensitive);
 
-       String filterMatchWholeWordOnly = strutils::format(_T("%s/MatchWholeWordOnly%02u"), IgnoredSubstitutionsRegPath, count);
+       String filterMatchWholeWordOnly = strutils::format(_T("%s/MatchWholeWordOnly%02u"), SubstitutionFiltersRegPath, count);
        int retvalMatchWholeWordOnly = m_pOptionsMgr->RemoveOption(filterMatchWholeWordOnly);
 
-       String filter0 = strutils::format(_T("%s/Pattern%02u"), IgnoredSubstitutionsRegPath, count);
+       String filter0 = strutils::format(_T("%s/Pattern%02u"), SubstitutionFiltersRegPath, count);
        int retval0 = m_pOptionsMgr->RemoveOption(filter0);
 
-       String filter1 = strutils::format(_T("%s/Replacement%02u"), IgnoredSubstitutionsRegPath, count);
+       String filter1 = strutils::format(_T("%s/Replacement%02u"), SubstitutionFiltersRegPath, count);
        int retval1 = m_pOptionsMgr->RemoveOption(filter1);
 
        while (retvalEnabled == COption::OPT_OK || retvalUseRegExp == COption::OPT_OK ||
@@ -223,22 +223,22 @@ void IgnoredSubstitutionsList::SaveFilters()
                retval0 == COption::OPT_OK || retval1 == COption::OPT_OK)
        {
                ++count;
-               filterEnabled = strutils::format(_T("%s/Enabled%02u"), IgnoredSubstitutionsRegPath, count);
+               filterEnabled = strutils::format(_T("%s/Enabled%02u"), SubstitutionFiltersRegPath, count);
                retvalEnabled = m_pOptionsMgr->RemoveOption(filterEnabled);
-               filterUseRegExp = strutils::format(_T("%s/UseRegExp%02u"), IgnoredSubstitutionsRegPath, count);
+               filterUseRegExp = strutils::format(_T("%s/UseRegExp%02u"), SubstitutionFiltersRegPath, count);
                retvalUseRegExp = m_pOptionsMgr->RemoveOption(filterUseRegExp);
-               filterCaseSensitive = strutils::format(_T("%s/CaseSensitive%02u"), IgnoredSubstitutionsRegPath, count);
+               filterCaseSensitive = strutils::format(_T("%s/CaseSensitive%02u"), SubstitutionFiltersRegPath, count);
                retvalCaseSensitive = m_pOptionsMgr->RemoveOption(filterCaseSensitive);
-               filterMatchWholeWordOnly = strutils::format(_T("%s/MatchWholeWordOnly%02u"), IgnoredSubstitutionsRegPath, count);
+               filterMatchWholeWordOnly = strutils::format(_T("%s/MatchWholeWordOnly%02u"), SubstitutionFiltersRegPath, count);
                retvalMatchWholeWordOnly = m_pOptionsMgr->RemoveOption(filterMatchWholeWordOnly);
-               filter0 = strutils::format(_T("%s/Pattern%02u"), IgnoredSubstitutionsRegPath, count);
+               filter0 = strutils::format(_T("%s/Pattern%02u"), SubstitutionFiltersRegPath, count);
                retval0 = m_pOptionsMgr->RemoveOption(filter0);
-               filter1 = strutils::format(_T("%s/Replacement%02u"), IgnoredSubstitutionsRegPath, count);
+               filter1 = strutils::format(_T("%s/Replacement%02u"), SubstitutionFiltersRegPath, count);
                retval1 = m_pOptionsMgr->RemoveOption(filter1);
        }
 }
 
-std::shared_ptr<SubstitutionList> IgnoredSubstitutionsList::MakeSubstitutionList(bool throwIfInvalid)
+std::shared_ptr<SubstitutionList> SubstitutionFiltersList::MakeSubstitutionList(bool throwIfInvalid)
 {
        int i = 0;
        std::shared_ptr<SubstitutionList> plist(new SubstitutionList);

diff --git a/Src/IgnoredSubstitutionsList.h b/Src/SubstitutionFiltersList.h
similarity index 63%
rename from Src/IgnoredSubstitutionsList.h
rename to Src/SubstitutionFiltersList.h
index 1be6af0..2bdf71d 100644 (file)
--- a/Src/IgnoredSubstitutionsList.h
+++ b/Src/SubstitutionFiltersList.h
@@ -1,7 +1,7 @@
 /** 
- * @file IgnoredSubstitutionsList.h
+ * @file SubstitutionFiltersList.h
  *
- * @brief Declaration file for IgnoredSubstitutionsList class
+ * @brief Declaration file for SubstitutionFiltersList class
  */
 #pragma once
 
@@ -15,7 +15,7 @@ class COptionsMgr;
 /**
  @brief Structure for filter.
  */
-struct IgnoredSubstitution
+struct SubstitutionFilter
 {
        bool enabled;
        bool useRegExp;
@@ -28,18 +28,18 @@ struct IgnoredSubstitution
 /**
  @brief List of raw Ignored Substitution pairs.
  */
-class IgnoredSubstitutionsList
+class SubstitutionFiltersList
 {
 public:
-       IgnoredSubstitutionsList();
-       ~IgnoredSubstitutionsList();
+       SubstitutionFiltersList();
+       ~SubstitutionFiltersList();
 
        void Add(const String& pattern, const String& replacement, bool useRegExp, bool caseSensitive, bool matchWholeWordOnly, bool enabled);
        size_t GetCount() const;
        void Empty();
-       const IgnoredSubstitution &GetAt(size_t ind) const;
-       void CloneFrom(const IgnoredSubstitutionsList *list);
-       bool Compare(const IgnoredSubstitutionsList *list) const;
+       const SubstitutionFilter &GetAt(size_t ind) const;
+       void CloneFrom(const SubstitutionFiltersList *list);
+       bool Compare(const SubstitutionFiltersList *list) const;
 
        void Initialize(COptionsMgr *pOptionsMgr);
        void SaveFilters();
@@ -47,7 +47,7 @@ public:
        std::shared_ptr<SubstitutionList> MakeSubstitutionList(bool throwIfInvalid = false);
 
 private:
-       std::vector<IgnoredSubstitution> m_items; /**< List for linefilter items */
+       std::vector<SubstitutionFilter> m_items; /**< List for linefilter items */
        COptionsMgr * m_pOptionsMgr; /**< Options-manager for storage */
 };
 
@@ -55,7 +55,7 @@ private:
  * @brief Returns count of items in the list.
  * @return Count of filters in the list.
  */
-inline size_t IgnoredSubstitutionsList::GetCount() const
+inline size_t SubstitutionFiltersList::GetCount() const
 {
        return m_items.size();
 }
@@ -63,7 +63,7 @@ inline size_t IgnoredSubstitutionsList::GetCount() const
 /**
  * @brief Empties the list.
  */
-inline void IgnoredSubstitutionsList::Empty()
+inline void SubstitutionFiltersList::Empty()
 {
        m_items.clear();
 }

diff --git a/Src/resource.h b/Src/resource.h
index a39e45a..87e2739 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -457,7 +457,7 @@
 #define IDC_LFILTER_ADDBTN              1321\r
 #define IDC_LFILTER_EDITBTN             1322\r
 #define IDC_LFILTER_REMOVEBTN           1323\r
-#define IDC_IGNORED_SUBSTITUTIONS_FILTER 1324\r
+#define IDC_SUBSTITUTION_FILTERS 1324\r
 #define IDC_ASK_MULTIWINDOW_CLOSE       1326\r
 #define IDC_COLDLG_LIST                 1327\r
 #define IDC_PRESERVE_FILETIME           1328\r
@@ -560,7 +560,7 @@
 #define IDC_INDENT_HEURISTIC            8829\r
 #define IDC_LIST_FILE                   8830\r
 #define IDC_FLDCONFIRM_DONTASKAGAIN     8831\r
-#define IDC_COMPLETELY_BLANK_OUT_IGNORED_CHANGES 8833\r
+#define IDC_COMPLETELY_BLANK_OUT_IGNORED_DIFFERENCES 8833\r
 #define IDC_LFILTER_CLEARBTN            8836\r
 #define IDS_SPLASH_DEVELOPERS           8976\r
 #define IDS_SPLASH_GPLTEXT              8977\r

diff --git a/Translations/TranslationsStatus.html b/Translations/TranslationsStatus.html
index c95051d..d574de7 100644 (file)
--- a/Translations/TranslationsStatus.html
+++ b/Translations/TranslationsStatus.html
@@ -155,7 +155,7 @@
     <td class="right fuzzy">0</td>
     <td class="right untranslated">0</td>
     <td class="right">100 %</td>
-    <td class="center">2021-01-26</td>
+    <td class="center">2021-01-27</td>
   </tr>
   <tr>
     <td class="left">Finnish</td>
@@ -187,9 +187,9 @@
   <tr>
     <td class="left">German</td>
     <td class="right">1023</td>
-    <td class="right translated">1020</td>
+    <td class="right translated">1019</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">3</td>
+    <td class="right untranslated">4</td>
     <td class="right">100 %</td>
     <td class="center">2021-01-18</td>
   </tr>
@@ -223,9 +223,9 @@
   <tr>
     <td class="left">Japanese</td>
     <td class="right">1023</td>
-    <td class="right translated">1023</td>
+    <td class="right translated">1022</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">0</td>
+    <td class="right untranslated">1</td>
     <td class="right">100 %</td>
     <td class="center">2021-01-26</td>
   </tr>
@@ -241,9 +241,9 @@
   <tr>
     <td class="left">Lithuanian</td>
     <td class="right">1023</td>
-    <td class="right translated">1020</td>
+    <td class="right translated">1019</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">3</td>
+    <td class="right untranslated">4</td>
     <td class="right">100 %</td>
     <td class="center">2021-01-19</td>
   </tr>
@@ -295,9 +295,9 @@
   <tr>
     <td class="left">Russian</td>
     <td class="right">1023</td>
-    <td class="right translated">1000</td>
+    <td class="right translated">999</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">23</td>
+    <td class="right untranslated">24</td>
     <td class="right">98 %</td>
     <td class="center">2020-11-29</td>
   </tr>
@@ -331,9 +331,9 @@
   <tr>
     <td class="left">Slovenian</td>
     <td class="right">1023</td>
-    <td class="right translated">1020</td>
+    <td class="right translated">1019</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">3</td>
+    <td class="right untranslated">4</td>
     <td class="right">100 %</td>
     <td class="center">2021-01-19</td>
   </tr>

diff --git a/Translations/TranslationsStatus.md b/Translations/TranslationsStatus.md
index 431e3aa..f52416d 100644 (file)
--- a/Translations/TranslationsStatus.md
+++ b/Translations/TranslationsStatus.md
@@ -17,27 +17,27 @@ Status from **2021-01-27**:
 | Czech                |  1023 |        614 |     0 |          409 |     60 % |             |
 | Danish               |  1023 |        652 |     0 |          371 |     64 % |  2013-01-13 |
 | Dutch                |  1023 |        991 |     0 |           32 |     97 % |  2018-09-06 |
-| English              |  1023 |       1023 |     0 |            0 |    100 % |  2021-01-26 |
+| English              |  1023 |       1023 |     0 |            0 |    100 % |  2021-01-27 |
 | Finnish              |  1023 |        917 |     0 |          106 |     90 % |             |
 | French               |  1023 |        910 |     2 |          111 |     89 % |  2019-06-02 |
 | Galician             |  1023 |       1019 |     0 |            4 |    100 % |  2021-01-22 |
-| German               |  1023 |       1020 |     0 |            3 |    100 % |  2021-01-18 |
+| German               |  1023 |       1019 |     0 |            4 |    100 % |  2021-01-18 |
 | Greek                |  1023 |        615 |     0 |          408 |     60 % |             |
 | Hungarian            |  1023 |        548 |     0 |          475 |     54 % |  2011-01-24 |
 | Italian              |  1023 |        920 |     0 |          103 |     90 % |  2019-07-12 |
-| Japanese             |  1023 |       1023 |     0 |            0 |    100 % |  2021-01-26 |
+| Japanese             |  1023 |       1022 |     0 |            1 |    100 % |  2021-01-26 |
 | Korean               |  1023 |        874 |     0 |          149 |     85 % |  2018-02-05 |
-| Lithuanian           |  1023 |       1020 |     0 |            3 |    100 % |  2021-01-19 |
+| Lithuanian           |  1023 |       1019 |     0 |            4 |    100 % |  2021-01-19 |
 | Norwegian            |  1023 |        644 |     0 |          379 |     63 % |             |
 | Persian              |  1023 |        655 |     0 |          368 |     64 % |  2013-08-15 |
 | Polish               |  1023 |        960 |     0 |           63 |     94 % |             |
 | Portuguese           |  1023 |        995 |     0 |           28 |     97 % |  2020-11-29 |
 | Romanian             |  1023 |        573 |    44 |          406 |     60 % |             |
-| Russian              |  1023 |       1000 |     0 |           23 |     98 % |  2020-11-29 |
+| Russian              |  1023 |        999 |     0 |           24 |     98 % |  2020-11-29 |
 | Serbian              |  1023 |        643 |     0 |          380 |     63 % |             |
 | Sinhala              |  1023 |        573 |    63 |          387 |     62 % |  2010-12-12 |
 | Slovak               |  1023 |        990 |     0 |           33 |     97 % |  2020-11-02 |
-| Slovenian            |  1023 |       1020 |     0 |            3 |    100 % |  2021-01-19 |
+| Slovenian            |  1023 |       1019 |     0 |            4 |    100 % |  2021-01-19 |
 | Spanish              |  1023 |        886 |     0 |          137 |     87 % |  2020-04-03 |
 | Swedish              |  1023 |        920 |     0 |          103 |     90 % |  2019-10-07 |
 | Turkish              |  1023 |        986 |     0 |           37 |     96 % |  2020-09-08 |

diff --git a/Translations/TranslationsStatus.xml b/Translations/TranslationsStatus.xml
index 85873cd..a87acd7 100644 (file)
--- a/Translations/TranslationsStatus.xml
+++ b/Translations/TranslationsStatus.xml
@@ -232,7 +232,7 @@
     <translation template="1">
       <language>English</language>
       <file>English.pot</file>
-      <update>2021-01-26</update>
+      <update>2021-01-27</update>
       <strings>
         <count>1023</count>
         <translated>1023</translated>
@@ -306,9 +306,9 @@
       <update>2021-01-18</update>
       <strings>
         <count>1023</count>
-        <translated>1020</translated>
+        <translated>1019</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>3</untranslated>
+        <untranslated>4</untranslated>
       </strings>
       <translators>
         <translator maintainer="1">
@@ -398,9 +398,9 @@
       <update>2021-01-26</update>
       <strings>
         <count>1023</count>
-        <translated>1023</translated>
+        <translated>1022</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>0</untranslated>
+        <untranslated>1</untranslated>
       </strings>
       <translators>
         <translator>
@@ -444,9 +444,9 @@
       <update>2021-01-19</update>
       <strings>
         <count>1023</count>
-        <translated>1020</translated>
+        <translated>1019</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>3</untranslated>
+        <untranslated>4</untranslated>
       </strings>
       <translators>
         <translator>
@@ -567,9 +567,9 @@
       <update>2020-11-29</update>
       <strings>
         <count>1023</count>
-        <translated>1000</translated>
+        <translated>999</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>23</untranslated>
+        <untranslated>24</untranslated>
       </strings>
       <translators>
         <translator>
@@ -658,9 +658,9 @@
       <update>2021-01-19</update>
       <strings>
         <count>1023</count>
-        <translated>1020</translated>
+        <translated>1019</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>3</untranslated>
+        <untranslated>4</untranslated>
       </strings>
       <translators>
         <translator>

diff --git a/Translations/WinMerge/Arabic.po b/Translations/WinMerge/Arabic.po
index a21cb5b..841a310 100644 (file)
--- a/Translations/WinMerge/Arabic.po
+++ b/Translations/WinMerge/Arabic.po
@@ -42,7 +42,7 @@ msgstr "نسخ م&ن اليمين"
 msgid "&Select Line Difference\tF4"
 msgstr "تحديد الاختلاف في الس&طر\tF4"
 
-msgid "Add this change to &Ignored Substitutions"
+msgid "Add this change to Substitution &Filters"
 msgstr ""
 
 msgid "&Undo"
@@ -1133,7 +1133,7 @@ msgstr "تعديل"
 msgid "Remove"
 msgstr "حذف"
 
-msgid "Ignored Substitutions"
+msgid "Substitution Filters"
 msgstr ""
 
 msgid "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
@@ -1370,7 +1370,7 @@ msgstr "خوارزمية المقارنة (تجريبي):"
 msgid "Enable indent &heuristic"
 msgstr "تفعيل الم&سافة البادئة الإرشادية"
 
-msgid "Completely unhighlight the ignored changes"
+msgid "Completely unhighlight the ignored differences"
 msgstr ""
 
 msgid "Editor"
@@ -3553,13 +3553,13 @@ msgstr ""
 msgid "No differences to select found"
 msgstr ""
 
-msgid "No differences found to add as ignored substitution"
+msgid "No differences found to add as substitution filter"
 msgstr ""
 
-msgid "The pair is already present in the list of Ignored Substitutions"
+msgid "The pair is already present in the list of Substitution Filters"
 msgstr ""
 
-msgid "Add this change to Ignored Substitutions?"
+msgid "Add this change to Substitution Filters?"
 msgstr ""
 
 msgid "Text only"

diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po
index 56ea38d..ab9fa19 100644 (file)
--- a/Translations/WinMerge/Basque.po
+++ b/Translations/WinMerge/Basque.po
@@ -50,7 +50,7 @@ msgstr ""
 msgid "&Select Line Difference\tF4"
 msgstr "Hautatu &Lerro Ezberdintasuna\tF4"
 
-msgid "Add this change to &Ignored Substitutions"
+msgid "Add this change to Substitution &Filters"
 msgstr ""
 
 #, c-format
@@ -1429,7 +1429,7 @@ msgstr "Editatu"
 msgid "Remove"
 msgstr "Kendu"
 
-msgid "Ignored Substitutions"
+msgid "Substitution Filters"
 msgstr ""
 
 msgid "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
@@ -1725,7 +1725,7 @@ msgstr ""
 msgid "Enable indent &heuristic"
 msgstr ""
 
-msgid "Completely unhighlight the ignored changes"
+msgid "Completely unhighlight the ignored differences"
 msgstr ""
 
 #, c-format
@@ -4161,13 +4161,13 @@ msgstr ""
 msgid "No differences to select found"
 msgstr ""
 
-msgid "No differences found to add as ignored substitution"
+msgid "No differences found to add as substitution filter"
 msgstr ""
 
-msgid "The pair is already present in the list of Ignored Substitutions"
+msgid "The pair is already present in the list of Substitution Filters"
 msgstr ""
 
-msgid "Add this change to Ignored Substitutions?"
+msgid "Add this change to Substitution Filters?"
 msgstr ""
 
 msgid "Text only"

diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po
index 8e18133..d85953e 100644 (file)
--- a/Translations/WinMerge/Brazilian.po
+++ b/Translations/WinMerge/Brazilian.po
@@ -49,7 +49,7 @@ msgstr "Copiar d&a Direita"
 msgid "&Select Line Difference\tF4"
 msgstr "&Selecionar a Diferença da Linha\tF4"
 
-msgid "Add this change to &Ignored Substitutions"
+msgid "Add this change to Substitution &Filters"
 msgstr ""
 
 #, c-format
@@ -1427,7 +1427,7 @@ msgstr "Editar"
 msgid "Remove"
 msgstr "Remover"
 
-msgid "Ignored Substitutions"
+msgid "Substitution Filters"
 msgstr ""
 
 msgid "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
@@ -1724,7 +1724,7 @@ msgstr "&Algoritmo diff (Experimental):"
 msgid "Enable indent &heuristic"
 msgstr "Ativar &heurística de recuo"
 
-msgid "Completely unhighlight the ignored changes"
+msgid "Completely unhighlight the ignored differences"
 msgstr ""
 
 #, c-format
@@ -4282,13 +4282,13 @@ msgstr ""
 msgid "No differences to select found"
 msgstr ""
 
-msgid "No differences found to add as ignored substitution"
+msgid "No differences found to add as substitution filter"
 msgstr ""
 
-msgid "The pair is already present in the list of Ignored Substitutions"
+msgid "The pair is already present in the list of Substitution Filters"
 msgstr ""
 
-msgid "Add this change to Ignored Substitutions?"
+msgid "Add this change to Substitution Filters?"
 msgstr ""
 
 msgid "Text only"

diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po
index 34df7a7..3383d30 100644 (file)
--- a/Translations/WinMerge/Bulgarian.po
+++ b/Translations/WinMerge/Bulgarian.po
@@ -38,7 +38,7 @@ msgstr "Копиране отд&ясно"
 msgid "&Select Line Difference\tF4"
 msgstr "&Избиране на разликите на реда\tF4"
 
-msgid "Add this change to &Ignored Substitutions"
+msgid "Add this change to Substitution &Filters"
 msgstr ""
 
 msgid "&Undo"
@@ -1127,7 +1127,7 @@ msgstr "Променяне"
 msgid "Remove"
 msgstr "Премахване"
 
-msgid "Ignored Substitutions"
+msgid "Substitution Filters"
 msgstr ""
 
 msgid "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
@@ -1364,7 +1364,7 @@ msgstr "&Алгоритъм за различия (експер.):"
 msgid "Enable indent &heuristic"
 msgstr "П&редполагане на отстъпа"
 
-msgid "Completely unhighlight the ignored changes"
+msgid "Completely unhighlight the ignored differences"
 msgstr ""
 
 msgid "Editor"
@@ -3524,13 +3524,13 @@ msgstr ""
 msgid "No differences to select found"
 msgstr ""
 
-msgid "No differences found to add as ignored substitution"
+msgid "No differences found to add as substitution filter"
 msgstr ""
 
-msgid "The pair is already present in the list of Ignored Substitutions"
+msgid "The pair is already present in the list of Substitution Filters"
 msgstr ""
 
-msgid "Add this change to Ignored Substitutions?"
+msgid "Add this change to Substitution Filters?"
 msgstr ""
 
 msgid "Text only"

diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po
index 107632f..0cfd96f 100644 (file)
--- a/Translations/WinMerge/Catalan.po
+++ b/Translations/WinMerge/Catalan.po
@@ -46,7 +46,7 @@ msgstr "Copia des de la dreta"
 msgid "&Select Line Difference\tF4"
 msgstr "&Selecciona la diferència a la línia\tF4"
 
-msgid "Add this change to &Ignored Substitutions"
+msgid "Add this change to Substitution &Filters"
 msgstr ""
 
 #, c-format
@@ -1426,7 +1426,7 @@ msgstr "Edita"
 msgid "Remove"
 msgstr "Suprimeix"
 
-msgid "Ignored Substitutions"
+msgid "Substitution Filters"
 msgstr ""
 
 msgid "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
@@ -1723,7 +1723,7 @@ msgstr ""
 msgid "Enable indent &heuristic"
 msgstr ""
 
-msgid "Completely unhighlight the ignored changes"
+msgid "Completely unhighlight the ignored differences"
 msgstr ""
 
 #, c-format
@@ -4090,13 +4090,13 @@ msgstr ""
 msgid "No differences to select found"
 msgstr ""
 
-msgid "No differences found to add as ignored substitution"
+msgid "No differences found to add as substitution filter"
 msgstr ""
 
-msgid "The pair is already present in the list of Ignored Substitutions"
+msgid "The pair is already present in the list of Substitution Filters"
 msgstr ""
 
-msgid "Add this change to Ignored Substitutions?"
+msgid "Add this change to Substitution Filters?"
 msgstr ""
 
 msgid "Text only"

diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po
index fe323f3..b5b4f31 100644 (file)
--- a/Translations/WinMerge/ChineseSimplified.po
+++ b/Translations/WinMerge/ChineseSimplified.po
@@ -44,7 +44,7 @@ msgstr "从右侧复制(&M)"
 msgid "&Select Line Difference\tF4"
 msgstr "选中行内差异(&S)\tF4"
 
-msgid "Add this change to &Ignored Substitutions"
+msgid "Add this change to Substitution &Filters"
 msgstr ""
 
 msgid "&Undo"
@@ -1134,7 +1134,7 @@ msgstr "编辑"
 msgid "Remove"
 msgstr "删除"
 
-msgid "Ignored Substitutions"
+msgid "Substitution Filters"
 msgstr ""
 
 msgid "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
@@ -1371,7 +1371,7 @@ msgstr "比较算法 (实验性) (&A):"
 msgid "Enable indent &heuristic"
 msgstr "启用启发式缩进(&H)"
 
-msgid "Completely unhighlight the ignored changes"
+msgid "Completely unhighlight the ignored differences"
 msgstr ""
 
 msgid "Editor"
@@ -3592,13 +3592,13 @@ msgstr ""
 msgid "No differences to select found"
 msgstr ""
 
-msgid "No differences found to add as ignored substitution"
+msgid "No differences found to add as substitution filter"
 msgstr ""
 
-msgid "The pair is already present in the list of Ignored Substitutions"
+msgid "The pair is already present in the list of Substitution Filters"
 msgstr ""
 
-msgid "Add this change to Ignored Substitutions?"
+msgid "Add this change to Substitution Filters?"
 msgstr ""
 
 msgid "Text only"

diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po
index bb65426..518d061 100644 (file)
--- a/Translations/WinMerge/ChineseTraditional.po
+++ b/Translations/WinMerge/ChineseTraditional.po
@@ -49,7 +49,7 @@ msgstr "從右邊複製(&M)"
 msgid "&Select Line Difference\tF4"
 msgstr "選取行內差異(&S)\tF4"
 
-msgid "Add this change to &Ignored Substitutions"
+msgid "Add this change to Substitution &Filters"
 msgstr ""
 
 #, c-format
@@ -1437,7 +1437,7 @@ msgstr "編輯"
 msgid "Remove"
 msgstr "移除"
 
-msgid "Ignored Substitutions"
+msgid "Substitution Filters"
 msgstr ""
 
 msgid "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
@@ -1734,7 +1734,7 @@ msgstr ""
 msgid "Enable indent &heuristic"
 msgstr ""
 
-msgid "Completely unhighlight the ignored changes"
+msgid "Completely unhighlight the ignored differences"
 msgstr ""
 
 #, c-format
@@ -4170,13 +4170,13 @@ msgstr ""
 msgid "No differences to select found"
 msgstr ""
 
-msgid "No differences found to add as ignored substitution"
+msgid "No differences found to add as substitution filter"
 msgstr ""
 
-msgid "The pair is already present in the list of Ignored Substitutions"
+msgid "The pair is already present in the list of Substitution Filters"
 msgstr ""
 
-msgid "Add this change to Ignored Substitutions?"
+msgid "Add this change to Substitution Filters?"
 msgstr ""
 
 msgid "Text only"

diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po
index f71e136..fac00dd 100644 (file)
--- a/Translations/WinMerge/Croatian.po
+++ b/Translations/WinMerge/Croatian.po
@@ -47,7 +47,7 @@ msgstr ""
 msgid "&Select Line Difference\tF4"
 msgstr "&Označi različite retke\tF4"
 
-msgid "Add this change to &Ignored Substitutions"
+msgid "Add this change to Substitution &Filters"
 msgstr ""
 
 #, c-format
@@ -1427,7 +1427,7 @@ msgstr "Uređivanje"
 msgid "Remove"
 msgstr "Ukloni"
 
-msgid "Ignored Substitutions"
+msgid "Substitution Filters"
 msgstr ""
 
 msgid "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
@@ -1724,7 +1724,7 @@ msgstr ""
 msgid "Enable indent &heuristic"
 msgstr ""
 
-msgid "Completely unhighlight the ignored changes"
+msgid "Completely unhighlight the ignored differences"
 msgstr ""
 
 #, c-format
@@ -4161,13 +4161,13 @@ msgstr ""
 msgid "No differences to select found"
 msgstr ""
 
-msgid "No differences found to add as ignored substitution"
+msgid "No differences found to add as substitution filter"
 msgstr ""
 
-msgid "The pair is already present in the list of Ignored Substitutions"
+msgid "The pair is already present in the list of Substitution Filters"
 msgstr ""
 
-msgid "Add this change to Ignored Substitutions?"
+msgid "Add this change to Substitution Filters?"
 msgstr ""
 
 msgid "Text only"

diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po
index 140b17c..3359723 100644 (file)
--- a/Translations/WinMerge/Czech.po
+++ b/Translations/WinMerge/Czech.po
@@ -47,7 +47,7 @@ msgstr ""
 msgid "&Select Line Difference\tF4"
 msgstr "Vybrat roz&díl v řádku\tF4"
 
-msgid "Add this change to &Ignored Substitutions"
+msgid "Add this change to Substitution &Filters"
 msgstr ""
 
 #, c-format
@@ -1429,7 +1429,7 @@ msgstr "Upr&avit"
 msgid "Remove"
 msgstr "O&dstranit"
 
-msgid "Ignored Substitutions"
+msgid "Substitution Filters"
 msgstr ""
 
 msgid "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
@@ -1726,7 +1726,7 @@ msgstr ""
 msgid "Enable indent &heuristic"
 msgstr ""
 
-msgid "Completely unhighlight the ignored changes"
+msgid "Completely unhighlight the ignored differences"
 msgstr ""
 
 #, c-format
@@ -4092,13 +4092,13 @@ msgstr ""
 msgid "No differences to select found"
 msgstr ""
 
-msgid "No differences found to add as ignored substitution"
+msgid "No differences found to add as substitution filter"
 msgstr ""
 
-msgid "The pair is already present in the list of Ignored Substitutions"
+msgid "The pair is already present in the list of Substitution Filters"
 msgstr ""
 
-msgid "Add this change to Ignored Substitutions?"
+msgid "Add this change to Substitution Filters?"
 msgstr ""
 
 msgid "Text only"

diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po
index aa660f9..e24dc20 100644 (file)
--- a/Translations/WinMerge/Danish.po
+++ b/Translations/WinMerge/Danish.po
@@ -48,7 +48,7 @@ msgstr ""
 msgid "&Select Line Difference\tF4"
 msgstr "&Vælg linjeforskel\tF4""
 
-msgid "Add this change to &Ignored Substitutions"
+msgid "Add this change to Substitution &Filters"
 msgstr ""
 
 #, c-format
@@ -1430,7 +1430,7 @@ msgstr "Rediger"
 msgid "Remove"
 msgstr "Fjern"
 
-msgid "Ignored Substitutions"
+msgid "Substitution Filters"
 msgstr ""
 
 msgid "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
@@ -1727,7 +1727,7 @@ msgstr ""
 msgid "Enable indent &heuristic"
 msgstr ""
 
-msgid "Completely unhighlight the ignored changes"
+msgid "Completely unhighlight the ignored differences"
 msgstr ""
 
 #, c-format
@@ -4200,13 +4200,13 @@ msgstr ""
 msgid "No differences to select found"
 msgstr ""
 
-msgid "No differences found to add as ignored substitution"
+msgid "No differences found to add as substitution filter"
 msgstr ""
 
-msgid "The pair is already present in the list of Ignored Substitutions"
+msgid "The pair is already present in the list of Substitution Filters"
 msgstr ""
 
-msgid "Add this change to Ignored Substitutions?"
+msgid "Add this change to Substitution Filters?"
 msgstr ""
 
 msgid "Text only"

diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po
index 9502020..d375aa1 100644 (file)
--- a/Translations/WinMerge/Dutch.po
+++ b/Translations/WinMerge/Dutch.po
@@ -42,7 +42,7 @@ msgstr "Van rechts kopiëren"
 msgid "&Select Line Difference\tF4"
 msgstr "Regelverschil selecteren\tF4"
 
-msgid "Add this change to &Ignored Substitutions"
+msgid "Add this change to Substitution &Filters"
 msgstr ""
 
 msgid "&Undo"
@@ -1134,7 +1134,7 @@ msgstr "Bewerken"
 msgid "Remove"
 msgstr "Verwijderen"
 
-msgid "Ignored Substitutions"
+msgid "Substitution Filters"
 msgstr ""
 
 msgid "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
@@ -1371,7 +1371,7 @@ msgstr "Vergelijkingsalgoritme (experimenteel):"
 msgid "Enable indent &heuristic"
 msgstr "Inspringing-heuristiek inschakelen"
 
-msgid "Completely unhighlight the ignored changes"
+msgid "Completely unhighlight the ignored differences"
 msgstr ""
 
 msgid "Editor"
@@ -3601,13 +3601,13 @@ msgstr ""
 msgid "No differences to select found"
 msgstr ""
 
-msgid "No differences found to add as ignored substitution"
+msgid "No differences found to add as substitution filter"
 msgstr ""
 
-msgid "The pair is already present in the list of Ignored Substitutions"
+msgid "The pair is already present in the list of Substitution Filters"
 msgstr ""
 
-msgid "Add this change to Ignored Substitutions?"
+msgid "Add this change to Substitution Filters?"
 msgstr ""
 
 msgid "Text only"

diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot
index 0ac5079..7788a8f 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: https://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2021-01-26 15:53+0000\n"
+"POT-Creation-Date: 2021-01-27 23:46+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
@@ -35,7 +35,7 @@ msgstr ""
 msgid "&Select Line Difference\tF4"
 msgstr ""
 
-msgid "Add this change to &Ignored Substitutions"
+msgid "Add this change to Substitution &Filters"
 msgstr ""
 
 msgid "&Undo"
@@ -1122,7 +1122,7 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-msgid "Ignored Substitutions"
+msgid "Substitution Filters"
 msgstr ""
 
 msgid "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
@@ -1359,7 +1359,7 @@ msgstr ""
 msgid "Enable indent &heuristic"
 msgstr ""
 
-msgid "Completely unhighlight the ignored changes"
+msgid "Completely unhighlight the ignored differences"
 msgstr ""
 
 msgid "Editor"
@@ -3188,13 +3188,13 @@ msgstr ""
 msgid "No differences to select found"
 msgstr ""
 
-msgid "No differences found to add as ignored substitution"
+msgid "No differences found to add as substitution filter"
 msgstr ""
 
-msgid "The pair is already present in the list of Ignored Substitutions"
+msgid "The pair is already present in the list of Substitution Filters"
 msgstr ""
 
-msgid "Add this change to Ignored Substitutions?"
+msgid "Add this change to Substitution Filters?"
 msgstr ""
 
 msgid "Text only"

diff --git a/Translations/WinMerge/Finnish.po b/Translations/WinMerge/Finnish.po
index 925c655..cbd1884 100644 (file)
--- a/Translations/WinMerge/Finnish.po
+++ b/Translations/WinMerge/Finnish.po
@@ -45,7 +45,7 @@ msgstr "Kopioi &oikealta"
 msgid "&Select Line Difference\tF4"
 msgstr "Valitse riviero\tF4"
 
-msgid "Add this change to &Ignored Substitutions"
+msgid "Add this change to Substitution &Filters"
 msgstr ""
 
 #, c-format
@@ -1427,7 +1427,7 @@ msgstr "Muokkaa"
 msgid "Remove"
 msgstr "Poista"
 
-msgid "Ignored Substitutions"
+msgid "Substitution Filters"
 msgstr ""
 
 msgid "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
@@ -1724,7 +1724,7 @@ msgstr "Ero&algoritmi (kokeellinen):"
 msgid "Enable indent &heuristic"
 msgstr "Ota käyttöön &heuristinen sisennys"
 
-msgid "Completely unhighlight the ignored changes"
+msgid "Completely unhighlight the ignored differences"
 msgstr ""
 
 #, c-format
@@ -4263,13 +4263,13 @@ msgstr ""
 msgid "No differences to select found"
 msgstr ""
 
-msgid "No differences found to add as ignored substitution"
+msgid "No differences found to add as substitution filter"
 msgstr ""
 
-msgid "The pair is already present in the list of Ignored Substitutions"
+msgid "The pair is already present in the list of Substitution Filters"
 msgstr ""
 
-msgid "Add this change to Ignored Substitutions?"
+msgid "Add this change to Substitution Filters?"
 msgstr ""
 
 msgid "Text only"

diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po
index 81368a4..7169beb 100644 (file)
--- a/Translations/WinMerge/French.po
+++ b/Translations/WinMerge/French.po
@@ -52,7 +52,7 @@ msgstr "Copier depuis la Droite"
 msgid "&Select Line Difference\tF4"
 msgstr "&Sélectionner la distinction\tF4"
 
-msgid "Add this change to &Ignored Substitutions"
+msgid "Add this change to Substitution &Filters"
 msgstr ""
 
 #, c-format
@@ -1436,7 +1436,7 @@ msgstr "Editer"
 msgid "Remove"
 msgstr "Supprimer"
 
-msgid "Ignored Substitutions"
+msgid "Substitution Filters"
 msgstr ""
 
 msgid "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
@@ -1733,7 +1733,7 @@ msgstr "Diff &algorithme (expérimental) :"
 msgid "Enable indent &heuristic"
 msgstr "Activer l'indentation &heuristique"
 
-msgid "Completely unhighlight the ignored changes"
+msgid "Completely unhighlight the ignored differences"
 msgstr ""
 
 #, c-format
@@ -4336,13 +4336,13 @@ msgstr ""
 msgid "No differences to select found"
 msgstr ""
 
-msgid "No differences found to add as ignored substitution"
+msgid "No differences found to add as substitution filter"
 msgstr ""
 
-msgid "The pair is already present in the list of Ignored Substitutions"
+msgid "The pair is already present in the list of Substitution Filters"
 msgstr ""
 
-msgid "Add this change to Ignored Substitutions?"
+msgid "Add this change to Substitution Filters?"
 msgstr ""
 
 msgid "Text only"

diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po
index 6b68390..b0c4df7 100644 (file)
--- a/Translations/WinMerge/Galician.po
+++ b/Translations/WinMerge/Galician.po
@@ -48,8 +48,8 @@ msgstr "Copiar da &dereita"
 msgid "&Select Line Difference\tF4"
 msgstr "&Seleccionar a diferenza entre liñas\tF4"
 
-msgid "Add this change to &Ignored Substitutions"
-msgstr "Engadir este cambio ás Substitucións &ignoradas"
+msgid "Add this change to Substitution &Filters"
+msgstr ""
 
 #, c-format
 msgid "&Undo"
@@ -1428,8 +1428,8 @@ msgstr "Editar"
 msgid "Remove"
 msgstr "Eliminar"
 
-msgid "Ignored Substitutions"
-msgstr "Substitucións ignoradas"
+msgid "Substitution Filters"
+msgstr ""
 
 msgid "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
 msgstr "Os cambios que aparecen nos paneis como os pares que se amosan máis abaixe serán ignorados ou marcados como non significantes. Non afecta aos Patches."
@@ -1725,7 +1725,7 @@ msgstr "Algoritmo de diferenciación (exper.):"
 msgid "Enable indent &heuristic"
 msgstr "Activar sangrado &heurístico"
 
-msgid "Completely unhighlight the ignored changes"
+msgid "Completely unhighlight the ignored differences"
 msgstr ""
 
 #, c-format
@@ -4330,14 +4330,14 @@ msgstr "<Editar aquí>"
 msgid "No differences to select found"
 msgstr "Non se atoparon deferenzas que seleccionar"
 
-msgid "No differences found to add as ignored substitution"
-msgstr "Non se atoparon deferenzas para engadir ás substitucións ignoradas"
+msgid "No differences found to add as substitution filter"
+msgstr ""
 
-msgid "The pair is already present in the list of Ignored Substitutions"
-msgstr "O par xa está presente na lista de Substitucións ignoradas"
+msgid "The pair is already present in the list of Substitution Filters"
+msgstr ""
 
-msgid "Add this change to Ignored Substitutions?"
-msgstr "Engadir este cambio ás Substitucións ignoradas?"
+msgid "Add this change to Substitution Filters?"
+msgstr ""
 
 msgid "Text only"
 msgstr ""

diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po
index 9e0e750..6c0834b 100644 (file)
--- a/Translations/WinMerge/German.po
+++ b/Translations/WinMerge/German.po
@@ -47,8 +47,8 @@ msgstr "V&on rechts kopieren"
 msgid "&Select Line Difference\tF4"
 msgstr "Zeilen&unterschied markieren\tF4"
 
-msgid "Add this change to &Ignored Substitutions"
-msgstr "Diese Änderung zu den &ignorierten Ersetzungen hinzufügen"
+msgid "Add this change to Substitution &Filters"
+msgstr ""
 
 #, c-format
 msgid "&Undo"
@@ -1427,8 +1427,8 @@ msgstr "Bearbeiten"
 msgid "Remove"
 msgstr "Entfernen"
 
-msgid "Ignored Substitutions"
-msgstr "Ignorierte Ersetzungen"
+msgid "Substitution Filters"
+msgstr ""
 
 msgid "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
 msgstr "Änderungen, die in den Bereichen als die unten aufgeführten Paare erscheinen, werden ignoriert oder als unbedeutend markiert.\nPatches sind nicht betroffen."
@@ -1724,8 +1724,8 @@ msgstr "&Diff-Algorithmus (experimentell):"
 msgid "Enable indent &heuristic"
 msgstr "&Heuristischen Einzug aktivieren"
 
-msgid "Completely unhighlight the ignored changes"
-msgstr "Ignorierte Änderungen komplett nicht markieren"
+msgid "Completely unhighlight the ignored differences"
+msgstr ""
 
 #, c-format
 msgid "Editor"
@@ -3943,14 +3943,14 @@ msgstr "<Hier bearbeiten>"
 msgid "No differences to select found"
 msgstr "Keine Unterschiede zur Auswahl gefunden."
 
-msgid "No differences found to add as ignored substitution"
-msgstr "Keine Unterschiede zum Hinzufügen zu ignorierten Ersetzungen gefunden."
+msgid "No differences found to add as substitution filter"
+msgstr ""
 
-msgid "The pair is already present in the list of Ignored Substitutions"
-msgstr "Das Paar ist bereits in der Liste der ignorierten Ersetzungen vorhanden."
+msgid "The pair is already present in the list of Substitution Filters"
+msgstr ""
 
-msgid "Add this change to Ignored Substitutions?"
-msgstr "Diese Änderung zu den ignorierten Ersetzungen hinzufügen?"
+msgid "Add this change to Substitution Filters?"
+msgstr ""
 
 msgid "Text only"
 msgstr ""

diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po
index 67ff8a9..d143639 100644 (file)
--- a/Translations/WinMerge/Greek.po
+++ b/Translations/WinMerge/Greek.po
@@ -46,7 +46,7 @@ msgstr ""
 msgid "&Select Line Difference\tF4"
 msgstr "Επιλογή Δια&φοράς Γραμμής\tF4"
 
-msgid "Add this change to &Ignored Substitutions"
+msgid "Add this change to Substitution &Filters"
 msgstr ""
 
 #, c-format
@@ -1426,7 +1426,7 @@ msgstr "Επεξεργασία"
 msgid "Remove"
 msgstr "Διαγραφή"
 
-msgid "Ignored Substitutions"
+msgid "Substitution Filters"
 msgstr ""
 
 msgid "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
@@ -1723,7 +1723,7 @@ msgstr ""
 msgid "Enable indent &heuristic"
 msgstr ""
 
-msgid "Completely unhighlight the ignored changes"
+msgid "Completely unhighlight the ignored differences"
 msgstr ""
 
 #, c-format
@@ -4139,13 +4139,13 @@ msgstr ""
 msgid "No differences to select found"
 msgstr ""
 
-msgid "No differences found to add as ignored substitution"
+msgid "No differences found to add as substitution filter"
 msgstr ""
 
-msgid "The pair is already present in the list of Ignored Substitutions"
+msgid "The pair is already present in the list of Substitution Filters"
 msgstr ""
 
-msgid "Add this change to Ignored Substitutions?"
+msgid "Add this change to Substitution Filters?"
 msgstr ""
 
 msgid "Text only"

diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po
index 483cd58..08f2aa2 100644 (file)
--- a/Translations/WinMerge/Hungarian.po
+++ b/Translations/WinMerge/Hungarian.po
@@ -47,7 +47,7 @@ msgstr ""
 msgid "&Select Line Difference\tF4"
 msgstr ""
 
-msgid "Add this change to &Ignored Substitutions"
+msgid "Add this change to Substitution &Filters"
 msgstr ""
 
 #, c-format
@@ -1427,7 +1427,7 @@ msgstr "Szerkesztés"
 msgid "Remove"
 msgstr "Eltávolítás"
 
-msgid "Ignored Substitutions"
+msgid "Substitution Filters"
 msgstr ""
 
 msgid "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
@@ -1724,7 +1724,7 @@ msgstr ""
 msgid "Enable indent &heuristic"
 msgstr ""
 
-msgid "Completely unhighlight the ignored changes"
+msgid "Completely unhighlight the ignored differences"
 msgstr ""
 
 #, c-format
@@ -4066,13 +4066,13 @@ msgstr ""
 msgid "No differences to select found"
 msgstr ""
 
-msgid "No differences found to add as ignored substitution"
+msgid "No differences found to add as substitution filter"
 msgstr ""
 
-msgid "The pair is already present in the list of Ignored Substitutions"
+msgid "The pair is already present in the list of Substitution Filters"
 msgstr ""
 
-msgid "Add this change to Ignored Substitutions?"
+msgid "Add this change to Substitution Filters?"
 msgstr ""
 
 msgid "Text only"

diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po
index 57a0cab..af94385 100644 (file)
--- a/Translations/WinMerge/Italian.po
+++ b/Translations/WinMerge/Italian.po
@@ -41,7 +41,7 @@ msgstr "Copia da &destra"
 msgid "&Select Line Difference\tF4"
 msgstr "&Seleziona differenze riga\tF4"
 
-msgid "Add this change to &Ignored Substitutions"
+msgid "Add this change to Substitution &Filters"
 msgstr ""
 
 msgid "&Undo"
@@ -1130,7 +1130,7 @@ msgstr "Modifica"
 msgid "Remove"
 msgstr "Rimuovi"
 
-msgid "Ignored Substitutions"
+msgid "Substitution Filters"
 msgstr ""
 
 msgid "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
@@ -1367,7 +1367,7 @@ msgstr "&Algoritmo differenze (sperimentale):"
 msgid "Enable indent &heuristic"
 msgstr "Abilita rientro &euristico"
 
-msgid "Completely unhighlight the ignored changes"
+msgid "Completely unhighlight the ignored differences"
 msgstr ""
 
 msgid "Editor"
@@ -3574,13 +3574,13 @@ msgstr ""
 msgid "No differences to select found"
 msgstr ""
 
-msgid "No differences found to add as ignored substitution"
+msgid "No differences found to add as substitution filter"
 msgstr ""
 
-msgid "The pair is already present in the list of Ignored Substitutions"
+msgid "The pair is already present in the list of Substitution Filters"
 msgstr ""
 
-msgid "Add this change to Ignored Substitutions?"
+msgid "Add this change to Substitution Filters?"
 msgstr ""
 
 msgid "Text only"

diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po
index 08acc21..7693eca 100644 (file)
--- a/Translations/WinMerge/Japanese.po
+++ b/Translations/WinMerge/Japanese.po
@@ -42,8 +42,8 @@ msgstr "右側からコピー(&M)"
 msgid "&Select Line Difference\tF4"
 msgstr "行内差異を選択(&S)\tF4"
 
-msgid "Add this change to &Ignored Substitutions"
-msgstr "この差異を置換フィルターに追加する(&I)"
+msgid "Add this change to Substitution &Filters"
+msgstr "この差異を置換フィルターに追加する(&F)"
 
 msgid "&Undo"
 msgstr "元に戻す(&U)"
@@ -1129,7 +1129,7 @@ msgstr "編集"
 msgid "Remove"
 msgstr "削除"
 
-msgid "Ignored Substitutions"
+msgid "Substitution Filters"
 msgstr "置換フィルター"
 
 msgid "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
@@ -1370,7 +1370,7 @@ msgstr "Diff アルゴリズム (実験的機能)(&A):"
 msgid "Enable indent &heuristic"
 msgstr "Indent heuristic を有効にする(&H)"
 
-msgid "Completely unhighlight the ignored changes"
+msgid "Completely unhighlight the ignored differences"
 msgstr "無視された差異の行を同一行の色と同じにする"
 
 msgid "Editor"
@@ -3568,13 +3568,13 @@ msgstr "<ここを編集>"
 msgid "No differences to select found"
 msgstr "選択する差異がありません"
 
-msgid "No differences found to add as ignored substitution"
+msgid "No differences found to add as substitution filter"
 msgstr "置換フィルターに追加する差異がありません"
 
-msgid "The pair is already present in the list of Ignored Substitutions"
+msgid "The pair is already present in the list of Substitution Filters"
 msgstr "このペアは、既に置換フィルターのリストに存在します"
 
-msgid "Add this change to Ignored Substitutions?"
+msgid "Add this change to Substitution Filters?"
 msgstr "この差異を置換フィルターに追加しますか?"
 
 msgid "Text only"

diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po
index edcccbe..7a76c29 100644 (file)
--- a/Translations/WinMerge/Korean.po
+++ b/Translations/WinMerge/Korean.po
@@ -51,7 +51,7 @@ msgstr "오른쪽에서 복사(&M)"
 msgid "&Select Line Difference\tF4"
 msgstr "줄 차이점 선택(&S)\tF4"
 
-msgid "Add this change to &Ignored Substitutions"
+msgid "Add this change to Substitution &Filters"
 msgstr ""
 
 #, c-format
@@ -1431,7 +1431,7 @@ msgstr "편집"
 msgid "Remove"
 msgstr "제거"
 
-msgid "Ignored Substitutions"
+msgid "Substitution Filters"
 msgstr ""
 
 msgid "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
@@ -1728,7 +1728,7 @@ msgstr ""
 msgid "Enable indent &heuristic"
 msgstr ""
 
-msgid "Completely unhighlight the ignored changes"
+msgid "Completely unhighlight the ignored differences"
 msgstr ""
 
 #, c-format
@@ -4269,13 +4269,13 @@ msgstr ""
 msgid "No differences to select found"
 msgstr ""
 
-msgid "No differences found to add as ignored substitution"
+msgid "No differences found to add as substitution filter"
 msgstr ""
 
-msgid "The pair is already present in the list of Ignored Substitutions"
+msgid "The pair is already present in the list of Substitution Filters"
 msgstr ""
 
-msgid "Add this change to Ignored Substitutions?"
+msgid "Add this change to Substitution Filters?"
 msgstr ""
 
 msgid "Text only"

diff --git a/Translations/WinMerge/Lithuanian.po b/Translations/WinMerge/Lithuanian.po
index 5a95d96..ef84841 100644 (file)
--- a/Translations/WinMerge/Lithuanian.po
+++ b/Translations/WinMerge/Lithuanian.po
@@ -44,8 +44,8 @@ msgstr "Kopijuoti iš &dešinės"
 msgid "&Select Line Difference\tF4"
 msgstr "&Pažymėti skirtumą\tF4"
 
-msgid "Add this change to &Ignored Substitutions"
-msgstr "Pridėti šį pakeitimą prie &ignoruojamų pakaitalų"
+msgid "Add this change to Substitution &Filters"
+msgstr ""
 
 msgid "&Undo"
 msgstr "Atša&ukti"
@@ -1131,8 +1131,8 @@ msgstr "Redaguoti"
 msgid "Remove"
 msgstr "Pašalinti"
 
-msgid "Ignored Substitutions"
-msgstr "Ignoruojami pakaitalai"
+msgid "Substitution Filters"
+msgstr ""
 
 msgid "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
 msgstr "Pakeitimai, kurie rodomi skyduose kaip toliau išvardytos poros, bus ignoruojami arba pažymėti kaip nereikšmingi. Pataisos nepaveikiamos."
@@ -1368,8 +1368,8 @@ msgstr "Lyginimo &algoritmas (Bandymai):"
 msgid "Enable indent &heuristic"
 msgstr "Įgalinti &heuristinę įtrauką"
 
-msgid "Completely unhighlight the ignored changes"
-msgstr "Visiškai nuimti paryškinimą ignoruojamiems keitimams"
+msgid "Completely unhighlight the ignored differences"
+msgstr ""
 
 msgid "Editor"
 msgstr "Redaktoriaus"
@@ -3197,14 +3197,14 @@ msgstr "<Redaguoti čia>"
 msgid "No differences to select found"
 msgstr "Nerasta skirtumų, kuriuos būtų galima pasirinkti"
 
-msgid "No differences found to add as ignored substitution"
-msgstr "Nerasta skirtumų, kuriuos būtų galima pridėti kaip ignoruojamą pakaitalą"
+msgid "No differences found to add as substitution filter"
+msgstr ""
 
-msgid "The pair is already present in the list of Ignored Substitutions"
-msgstr "Pora jau yra ignoruojamų pakaitalų sąraše"
+msgid "The pair is already present in the list of Substitution Filters"
+msgstr ""
 
-msgid "Add this change to Ignored Substitutions?"
-msgstr "Pridėti šį pakeitimą prie ignoruojamų pakaitalų?"
+msgid "Add this change to Substitution Filters?"
+msgstr ""
 
 msgid "Text only"
 msgstr ""

diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po
index 20df568..d7f91da 100644 (file)
--- a/Translations/WinMerge/Norwegian.po
+++ b/Translations/WinMerge/Norwegian.po
@@ -47,7 +47,7 @@ msgstr ""
 msgid "&Select Line Difference\tF4"
 msgstr "&Marker linjeforskjell\tF4"
 
-msgid "Add this change to &Ignored Substitutions"
+msgid "Add this change to Substitution &Filters"
 msgstr ""
 
 #, c-format
@@ -1427,7 +1427,7 @@ msgstr "Rediger"
 msgid "Remove"
 msgstr "Fjern"
 
-msgid "Ignored Substitutions"
+msgid "Substitution Filters"
 msgstr ""
 
 msgid "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
@@ -1724,7 +1724,7 @@ msgstr ""
 msgid "Enable indent &heuristic"
 msgstr ""
 
-msgid "Completely unhighlight the ignored changes"
+msgid "Completely unhighlight the ignored differences"
 msgstr ""
 
 #, c-format
@@ -4161,13 +4161,13 @@ msgstr ""
 msgid "No differences to select found"
 msgstr ""
 
-msgid "No differences found to add as ignored substitution"
+msgid "No differences found to add as substitution filter"
 msgstr ""
 
-msgid "The pair is already present in the list of Ignored Substitutions"
+msgid "The pair is already present in the list of Substitution Filters"
 msgstr ""
 
-msgid "Add this change to Ignored Substitutions?"
+msgid "Add this change to Substitution Filters?"
 msgstr ""
 
 msgid "Text only"

diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po
index e179401..9620336 100644 (file)
--- a/Translations/WinMerge/Persian.po
+++ b/Translations/WinMerge/Persian.po
@@ -48,7 +48,7 @@ msgstr ""
 msgid "&Select Line Difference\tF4"
 msgstr "&S انتخاب خط تفاوت \tF4"
 
-msgid "Add this change to &Ignored Substitutions"
+msgid "Add this change to Substitution &Filters"
 msgstr ""
 
 #, c-format
@@ -1432,7 +1432,7 @@ msgstr " ويرايش "
 msgid "Remove"
 msgstr " برداشتن "
 
-msgid "Ignored Substitutions"
+msgid "Substitution Filters"
 msgstr ""
 
 msgid "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
@@ -1729,7 +1729,7 @@ msgstr ""
 msgid "Enable indent &heuristic"
 msgstr ""
 
-msgid "Completely unhighlight the ignored changes"
+msgid "Completely unhighlight the ignored differences"
 msgstr ""
 
 #, c-format
@@ -4204,13 +4204,13 @@ msgstr ""
 msgid "No differences to select found"
 msgstr ""
 
-msgid "No differences found to add as ignored substitution"
+msgid "No differences found to add as substitution filter"
 msgstr ""
 
-msgid "The pair is already present in the list of Ignored Substitutions"
+msgid "The pair is already present in the list of Substitution Filters"
 msgstr ""
 
-msgid "Add this change to Ignored Substitutions?"
+msgid "Add this change to Substitution Filters?"
 msgstr ""
 
 msgid "Text only"

diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po
index 959db7d..73824bf 100644 (file)
--- a/Translations/WinMerge/Polish.po
+++ b/Translations/WinMerge/Polish.po
@@ -41,7 +41,7 @@ msgstr "Kopiuj z prawej"
 msgid "&Select Line Difference\tF4"
 msgstr "Zaznacz różniące się linie\tF4"
 
-msgid "Add this change to &Ignored Substitutions"
+msgid "Add this change to Substitution &Filters"
 msgstr ""
 
 msgid "&Undo"
@@ -1128,7 +1128,7 @@ msgstr "Edytuj"
 msgid "Remove"
 msgstr "Usuń"
 
-msgid "Ignored Substitutions"
+msgid "Substitution Filters"
 msgstr ""
 
 msgid "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
@@ -1365,7 +1365,7 @@ msgstr "Algorytm różnicowy (eksperyment.):"
 msgid "Enable indent &heuristic"
 msgstr "Włącz heurystykę wcięcia"
 
-msgid "Completely unhighlight the ignored changes"
+msgid "Completely unhighlight the ignored differences"
 msgstr ""
 
 msgid "Editor"
@@ -3194,13 +3194,13 @@ msgstr ""
 msgid "No differences to select found"
 msgstr ""
 
-msgid "No differences found to add as ignored substitution"
+msgid "No differences found to add as substitution filter"
 msgstr ""
 
-msgid "The pair is already present in the list of Ignored Substitutions"
+msgid "The pair is already present in the list of Substitution Filters"
 msgstr ""
 
-msgid "Add this change to Ignored Substitutions?"
+msgid "Add this change to Substitution Filters?"
 msgstr ""
 
 msgid "Text only"

diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po
index f00e5e2..fa8af36 100644 (file)
--- a/Translations/WinMerge/Portuguese.po
+++ b/Translations/WinMerge/Portuguese.po
@@ -44,7 +44,7 @@ msgstr "C&opiar da Direita"
 msgid "&Select Line Difference\tF4"
 msgstr "&Selecionar diferença de linha\tF4"
 
-msgid "Add this change to &Ignored Substitutions"
+msgid "Add this change to Substitution &Filters"
 msgstr ""
 
 msgid "&Undo"
@@ -1137,7 +1137,7 @@ msgstr "Editar"
 msgid "Remove"
 msgstr "Remover"
 
-msgid "Ignored Substitutions"
+msgid "Substitution Filters"
 msgstr ""
 
 msgid "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
@@ -1374,7 +1374,7 @@ msgstr "Diff &algoritmo (Experimental):"
 msgid "Enable indent &heuristic"
 msgstr "Ativar travessão &heurístico"
 
-msgid "Completely unhighlight the ignored changes"
+msgid "Completely unhighlight the ignored differences"
 msgstr ""
 
 msgid "Editor"
@@ -3638,13 +3638,13 @@ msgstr ""
 msgid "No differences to select found"
 msgstr ""
 
-msgid "No differences found to add as ignored substitution"
+msgid "No differences found to add as substitution filter"
 msgstr ""
 
-msgid "The pair is already present in the list of Ignored Substitutions"
+msgid "The pair is already present in the list of Substitution Filters"
 msgstr ""
 
-msgid "Add this change to Ignored Substitutions?"
+msgid "Add this change to Substitution Filters?"
 msgstr ""
 
 msgid "Text only"

diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po
index a8feacc..0b0e691 100644 (file)
--- a/Translations/WinMerge/Romanian.po
+++ b/Translations/WinMerge/Romanian.po
@@ -47,7 +47,7 @@ msgstr ""
 msgid "&Select Line Difference\tF4"
 msgstr "&Selectează diferenţele pe linie\tF4"
 
-msgid "Add this change to &Ignored Substitutions"
+msgid "Add this change to Substitution &Filters"
 msgstr ""
 
 #, c-format
@@ -1427,7 +1427,7 @@ msgstr "Editează"
 msgid "Remove"
 msgstr "Înlătură"
 
-msgid "Ignored Substitutions"
+msgid "Substitution Filters"
 msgstr ""
 
 msgid "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
@@ -1724,7 +1724,7 @@ msgstr ""
 msgid "Enable indent &heuristic"
 msgstr ""
 
-msgid "Completely unhighlight the ignored changes"
+msgid "Completely unhighlight the ignored differences"
 msgstr ""
 
 #, c-format
@@ -4140,13 +4140,13 @@ msgstr ""
 msgid "No differences to select found"
 msgstr ""
 
-msgid "No differences found to add as ignored substitution"
+msgid "No differences found to add as substitution filter"
 msgstr ""
 
-msgid "The pair is already present in the list of Ignored Substitutions"
+msgid "The pair is already present in the list of Substitution Filters"
 msgstr ""
 
-msgid "Add this change to Ignored Substitutions?"
+msgid "Add this change to Substitution Filters?"
 msgstr ""
 
 msgid "Text only"

diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po
index c6109b9..70fb643 100644 (file)
--- a/Translations/WinMerge/Russian.po
+++ b/Translations/WinMerge/Russian.po
@@ -43,8 +43,8 @@ msgstr "Копировать справа"
 msgid "&Select Line Difference\tF4"
 msgstr "&Выбрать отличие\tF4"
 
-msgid "Add this change to &Ignored Substitutions"
-msgstr "Добавить в список игнорируемых подстановок"
+msgid "Add this change to Substitution &Filters"
+msgstr ""
 
 msgid "&Undo"
 msgstr "&Отменить"
@@ -1130,8 +1130,8 @@ msgstr "Изменить"
 msgid "Remove"
 msgstr "Удалить"
 
-msgid "Ignored Substitutions"
-msgstr "Игнорируемые подстановки"
+msgid "Substitution Filters"
+msgstr ""
 
 msgid "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
 msgstr "Изменения в тексте соответсвующие парам в списке ниже будут игнорироваться"
@@ -1367,8 +1367,8 @@ msgstr "Алгоритм сравнения (эксперимент.):"
 msgid "Enable indent &heuristic"
 msgstr "Включать эвристику отступов"
 
-msgid "Completely unhighlight the ignored changes"
-msgstr "Никак вообще не выделять игнорируемые изменения"
+msgid "Completely unhighlight the ignored differences"
+msgstr ""
 
 msgid "Editor"
 msgstr "Редактор"
@@ -3196,13 +3196,13 @@ msgstr ""
 msgid "No differences to select found"
 msgstr ""
 
-msgid "No differences found to add as ignored substitution"
+msgid "No differences found to add as substitution filter"
 msgstr ""
 
-msgid "The pair is already present in the list of Ignored Substitutions"
+msgid "The pair is already present in the list of Substitution Filters"
 msgstr ""
 
-msgid "Add this change to Ignored Substitutions?"
+msgid "Add this change to Substitution Filters?"
 msgstr ""
 
 msgid "Text only"

diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po
index f9382bf..ce18afd 100644 (file)
--- a/Translations/WinMerge/Serbian.po
+++ b/Translations/WinMerge/Serbian.po
@@ -46,7 +46,7 @@ msgstr ""
 msgid "&Select Line Difference\tF4"
 msgstr "&Изабери различите редове\tF4"
 
-msgid "Add this change to &Ignored Substitutions"
+msgid "Add this change to Substitution &Filters"
 msgstr ""
 
 #, c-format
@@ -1414,7 +1414,7 @@ msgstr "Уреди"
 msgid "Remove"
 msgstr "Уклони"
 
-msgid "Ignored Substitutions"
+msgid "Substitution Filters"
 msgstr ""
 
 msgid "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
@@ -1707,7 +1707,7 @@ msgstr ""
 msgid "Enable indent &heuristic"
 msgstr ""
 
-msgid "Completely unhighlight the ignored changes"
+msgid "Completely unhighlight the ignored differences"
 msgstr ""
 
 #, c-format
@@ -4133,13 +4133,13 @@ msgstr ""
 msgid "No differences to select found"
 msgstr ""
 
-msgid "No differences found to add as ignored substitution"
+msgid "No differences found to add as substitution filter"
 msgstr ""
 
-msgid "The pair is already present in the list of Ignored Substitutions"
+msgid "The pair is already present in the list of Substitution Filters"
 msgstr ""
 
-msgid "Add this change to Ignored Substitutions?"
+msgid "Add this change to Substitution Filters?"
 msgstr ""
 
 msgid "Text only"

diff --git a/Translations/WinMerge/Sinhala.po b/Translations/WinMerge/Sinhala.po
index b5c5a37..320f16f 100644 (file)
--- a/Translations/WinMerge/Sinhala.po
+++ b/Translations/WinMerge/Sinhala.po
@@ -44,7 +44,7 @@ msgstr ""
 msgid "&Select Line Difference\tF4"
 msgstr "පේලි අතර වෙනස තේරීම\tF4"
 
-msgid "Add this change to &Ignored Substitutions"
+msgid "Add this change to Substitution &Filters"
 msgstr ""
 
 #, c-format
@@ -1424,7 +1424,7 @@ msgstr "සංස්කරණය කරන්න"
 msgid "Remove"
 msgstr "ඉවත් කරන්න"
 
-msgid "Ignored Substitutions"
+msgid "Substitution Filters"
 msgstr ""
 
 msgid "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
@@ -1721,7 +1721,7 @@ msgstr ""
 msgid "Enable indent &heuristic"
 msgstr ""
 
-msgid "Completely unhighlight the ignored changes"
+msgid "Completely unhighlight the ignored differences"
 msgstr ""
 
 #, c-format
@@ -4151,13 +4151,13 @@ msgstr ""
 msgid "No differences to select found"
 msgstr ""
 
-msgid "No differences found to add as ignored substitution"
+msgid "No differences found to add as substitution filter"
 msgstr ""
 
-msgid "The pair is already present in the list of Ignored Substitutions"
+msgid "The pair is already present in the list of Substitution Filters"
 msgstr ""
 
-msgid "Add this change to Ignored Substitutions?"
+msgid "Add this change to Substitution Filters?"
 msgstr ""
 
 msgid "Text only"

diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po
index 4fdd71a..73fd5a0 100644 (file)
--- a/Translations/WinMerge/Slovak.po
+++ b/Translations/WinMerge/Slovak.po
@@ -44,7 +44,7 @@ msgstr "Kopírovať &sprava"
 msgid "&Select Line Difference\tF4"
 msgstr "&Vybrať rozdiely riadkov\tF4"
 
-msgid "Add this change to &Ignored Substitutions"
+msgid "Add this change to Substitution &Filters"
 msgstr ""
 
 msgid "&Undo"
@@ -1135,7 +1135,7 @@ msgstr "Upraviť"
 msgid "Remove"
 msgstr "Odstrániť"
 
-msgid "Ignored Substitutions"
+msgid "Substitution Filters"
 msgstr ""
 
 msgid "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
@@ -1372,7 +1372,7 @@ msgstr "&Algoritmus rozdielov (experimentálne):"
 msgid "Enable indent &heuristic"
 msgstr "Povoliť &heuristické odsadenie"
 
-msgid "Completely unhighlight the ignored changes"
+msgid "Completely unhighlight the ignored differences"
 msgstr ""
 
 msgid "Editor"
@@ -3615,13 +3615,13 @@ msgstr ""
 msgid "No differences to select found"
 msgstr ""
 
-msgid "No differences found to add as ignored substitution"
+msgid "No differences found to add as substitution filter"
 msgstr ""
 
-msgid "The pair is already present in the list of Ignored Substitutions"
+msgid "The pair is already present in the list of Substitution Filters"
 msgstr ""
 
-msgid "Add this change to Ignored Substitutions?"
+msgid "Add this change to Substitution Filters?"
 msgstr ""
 
 msgid "Text only"

diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po
index 474da0a..63497ac 100644 (file)
--- a/Translations/WinMerge/Slovenian.po
+++ b/Translations/WinMerge/Slovenian.po
@@ -48,8 +48,8 @@ msgstr "Kopiraj iz de&sne"
 msgid "&Select Line Difference\tF4"
 msgstr "&Izberi razliko vrstice\tF4"
 
-msgid "Add this change to &Ignored Substitutions"
-msgstr "Dodaj to spremembo v Pre&zrte zamenjave"
+msgid "Add this change to Substitution &Filters"
+msgstr ""
 
 #, c-format
 msgid "&Undo"
@@ -1427,8 +1427,8 @@ msgstr "Uredi"
 msgid "Remove"
 msgstr "Odstrani"
 
-msgid "Ignored Substitutions"
-msgstr "Prezrte zamenjave"
+msgid "Substitution Filters"
+msgstr ""
 
 msgid "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
 msgstr "Spremembe, ki se v podoknih pojavijo kot spodaj navedeni pari, bodo prezrte ali označene kot nepomembne. Popravki ne vplivajo."
@@ -1723,8 +1723,8 @@ msgstr "Al&goritem razlik (eksperimen):"
 msgid "Enable indent &heuristic"
 msgstr "Omogoči &hevristični zamik"
 
-msgid "Completely unhighlight the ignored changes"
-msgstr "Popolnoma odstrani označevanje prezrtih sprememb"
+msgid "Completely unhighlight the ignored differences"
+msgstr ""
 
 msgid "Editor"
 msgstr "Urejevalnik"
@@ -4324,14 +4324,14 @@ msgstr "<Uredi tukaj>"
 msgid "No differences to select found"
 msgstr "Ni najdenih nobenih razlik za izbiro"
 
-msgid "No differences found to add as ignored substitution"
-msgstr "Ni najdenih za dodajanje kot prezrto zamenjavo"
+msgid "No differences found to add as substitution filter"
+msgstr ""
 
-msgid "The pair is already present in the list of Ignored Substitutions"
-msgstr "Par je že prisoten na seznamu prezrtih zamenjav"
+msgid "The pair is already present in the list of Substitution Filters"
+msgstr ""
 
-msgid "Add this change to Ignored Substitutions?"
-msgstr "Dodajm to spremembo v Prezrte zamenjave?"
+msgid "Add this change to Substitution Filters?"
+msgstr ""
 
 msgid "Text only"
 msgstr ""

diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po
index 06e8fc2..6248b7d 100644 (file)
--- a/Translations/WinMerge/Spanish.po
+++ b/Translations/WinMerge/Spanish.po
@@ -45,7 +45,7 @@ msgstr ""
 msgid "&Select Line Difference\tF4"
 msgstr "&Seleccionar dif. de línea\tF4"
 
-msgid "Add this change to &Ignored Substitutions"
+msgid "Add this change to Substitution &Filters"
 msgstr ""
 
 msgid "&Undo"
@@ -1134,7 +1134,7 @@ msgstr "Editar"
 msgid "Remove"
 msgstr "Eliminar"
 
-msgid "Ignored Substitutions"
+msgid "Substitution Filters"
 msgstr ""
 
 msgid "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
@@ -1371,7 +1371,7 @@ msgstr ""
 msgid "Enable indent &heuristic"
 msgstr "Habilitar indentación &heuristica"
 
-msgid "Completely unhighlight the ignored changes"
+msgid "Completely unhighlight the ignored differences"
 msgstr ""
 
 msgid "Editor"
@@ -3591,13 +3591,13 @@ msgstr ""
 msgid "No differences to select found"
 msgstr ""
 
-msgid "No differences found to add as ignored substitution"
+msgid "No differences found to add as substitution filter"
 msgstr ""
 
-msgid "The pair is already present in the list of Ignored Substitutions"
+msgid "The pair is already present in the list of Substitution Filters"
 msgstr ""
 
-msgid "Add this change to Ignored Substitutions?"
+msgid "Add this change to Substitution Filters?"
 msgstr ""
 
 msgid "Text only"

diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po
index 6b82389..a3fc0e1 100644 (file)
--- a/Translations/WinMerge/Swedish.po
+++ b/Translations/WinMerge/Swedish.po
@@ -49,7 +49,7 @@ msgstr "Kopiera från Höger"
 msgid "&Select Line Difference\tF4"
 msgstr "Markera Radskillnad\tF4"
 
-msgid "Add this change to &Ignored Substitutions"
+msgid "Add this change to Substitution &Filters"
 msgstr ""
 
 #, c-format
@@ -1429,7 +1429,7 @@ msgstr "Redigera"
 msgid "Remove"
 msgstr "Ta bort"
 
-msgid "Ignored Substitutions"
+msgid "Substitution Filters"
 msgstr ""
 
 msgid "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
@@ -1726,7 +1726,7 @@ msgstr "SkillnadsAlgo (experimentell):"
 msgid "Enable indent &heuristic"
 msgstr "Möjliggör IndragUppfinningsrikhet"
 
-msgid "Completely unhighlight the ignored changes"
+msgid "Completely unhighlight the ignored differences"
 msgstr ""
 
 #, c-format
@@ -4245,13 +4245,13 @@ msgstr ""
 msgid "No differences to select found"
 msgstr ""
 
-msgid "No differences found to add as ignored substitution"
+msgid "No differences found to add as substitution filter"
 msgstr ""
 
-msgid "The pair is already present in the list of Ignored Substitutions"
+msgid "The pair is already present in the list of Substitution Filters"
 msgstr ""
 
-msgid "Add this change to Ignored Substitutions?"
+msgid "Add this change to Substitution Filters?"
 msgstr ""
 
 msgid "Text only"

diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po
index fb0830a..fbb2c54 100644 (file)
--- a/Translations/WinMerge/Turkish.po
+++ b/Translations/WinMerge/Turkish.po
@@ -41,7 +41,7 @@ msgstr "Sağ&dan Kopyala"
 msgid "&Select Line Difference\tF4"
 msgstr "Farklı &Satırları Seç\tF4"
 
-msgid "Add this change to &Ignored Substitutions"
+msgid "Add this change to Substitution &Filters"
 msgstr ""
 
 msgid "&Undo"
@@ -1130,7 +1130,7 @@ msgstr "Düzenle"
 msgid "Remove"
 msgstr "Sil"
 
-msgid "Ignored Substitutions"
+msgid "Substitution Filters"
 msgstr ""
 
 msgid "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
@@ -1367,7 +1367,7 @@ msgstr "&Fark algortiması (Deneysel):"
 msgid "Enable indent &heuristic"
 msgstr "&Sezgisel girinti kullanılsın"
 
-msgid "Completely unhighlight the ignored changes"
+msgid "Completely unhighlight the ignored differences"
 msgstr ""
 
 msgid "Editor"
@@ -3586,13 +3586,13 @@ msgstr ""
 msgid "No differences to select found"
 msgstr ""
 
-msgid "No differences found to add as ignored substitution"
+msgid "No differences found to add as substitution filter"
 msgstr ""
 
-msgid "The pair is already present in the list of Ignored Substitutions"
+msgid "The pair is already present in the list of Substitution Filters"
 msgstr ""
 
-msgid "Add this change to Ignored Substitutions?"
+msgid "Add this change to Substitution Filters?"
 msgstr ""
 
 msgid "Text only"

diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po
index 805fa7a..92c7af7 100644 (file)
--- a/Translations/WinMerge/Ukrainian.po
+++ b/Translations/WinMerge/Ukrainian.po
@@ -48,7 +48,7 @@ msgstr ""
 msgid "&Select Line Difference\tF4"
 msgstr "&Вибрати відмінність\tF4"
 
-msgid "Add this change to &Ignored Substitutions"
+msgid "Add this change to Substitution &Filters"
 msgstr ""
 
 #, c-format
@@ -1428,7 +1428,7 @@ msgstr "Редакція"
 msgid "Remove"
 msgstr "Вилучити"
 
-msgid "Ignored Substitutions"
+msgid "Substitution Filters"
 msgstr ""
 
 msgid "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
@@ -1725,7 +1725,7 @@ msgstr ""
 msgid "Enable indent &heuristic"
 msgstr ""
 
-msgid "Completely unhighlight the ignored changes"
+msgid "Completely unhighlight the ignored differences"
 msgstr ""
 
 #, c-format
@@ -4161,13 +4161,13 @@ msgstr ""
 msgid "No differences to select found"
 msgstr ""
 
-msgid "No differences found to add as ignored substitution"
+msgid "No differences found to add as substitution filter"
 msgstr ""
 
-msgid "The pair is already present in the list of Ignored Substitutions"
+msgid "The pair is already present in the list of Substitution Filters"
 msgstr ""
 
-msgid "Add this change to Ignored Substitutions?"
+msgid "Add this change to Substitution Filters?"
 msgstr ""
 
 msgid "Text only"