Fix issue #804: FeatureRequest - Ignoring options - lack in "button menu"

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index 708ddb4..c97b0a9 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -227,18 +227,22 @@ BEGIN_MESSAGE_MAP(CMainFrame, CMDIFrameWnd)
        ON_COMMAND(ID_PLUGINS_LIST, OnPluginsList)
        ON_UPDATE_COMMAND_UI(ID_STATUS_PLUGIN, OnUpdatePluginName)
        ON_NOTIFY(TBN_DROPDOWN, AFX_IDW_TOOLBAR, OnToolbarButtonDropDown)
-       ON_COMMAND_RANGE(IDC_DIFF_WHITESPACE_COMPARE, IDC_DIFF_WHITESPACE_IGNOREALL, OnDiffWhitespace)
-       ON_UPDATE_COMMAND_UI_RANGE(IDC_DIFF_WHITESPACE_COMPARE, IDC_DIFF_WHITESPACE_IGNOREALL, OnUpdateDiffWhitespace)
-       ON_COMMAND(IDC_DIFF_IGNORECASE, OnDiffIgnoreCase)
-       ON_UPDATE_COMMAND_UI(IDC_DIFF_IGNORECASE, OnUpdateDiffIgnoreCase)
-       ON_COMMAND(IDC_DIFF_IGNOREEOL, OnDiffIgnoreEOL)
-       ON_UPDATE_COMMAND_UI(IDC_DIFF_IGNOREEOL, OnUpdateDiffIgnoreEOL)
-       ON_COMMAND(IDC_DIFF_IGNORECP, OnDiffIgnoreCP)
-       ON_UPDATE_COMMAND_UI(IDC_DIFF_IGNORECP, OnUpdateDiffIgnoreCP)
-       ON_COMMAND(IDC_RECURS_CHECK, OnIncludeSubfolders)
-       ON_UPDATE_COMMAND_UI(IDC_RECURS_CHECK, OnUpdateIncludeSubfolders)
-       ON_COMMAND_RANGE(ID_COMPMETHOD_FULL_CONTENTS, ID_COMPMETHOD_SIZE, OnCompareMethod)
-       ON_UPDATE_COMMAND_UI_RANGE(ID_COMPMETHOD_FULL_CONTENTS, ID_COMPMETHOD_SIZE, OnUpdateCompareMethod)
+       ON_COMMAND_RANGE(ID_DIFF_OPTIONS_WHITESPACE_COMPARE, ID_DIFF_OPTIONS_WHITESPACE_IGNOREALL, OnDiffWhitespace)
+       ON_UPDATE_COMMAND_UI_RANGE(ID_DIFF_OPTIONS_WHITESPACE_COMPARE, ID_DIFF_OPTIONS_WHITESPACE_IGNOREALL, OnUpdateDiffWhitespace)
+       ON_COMMAND(ID_DIFF_OPTIONS_IGNORE_BLANKLINES, OnDiffIgnoreBlankLines)
+       ON_UPDATE_COMMAND_UI(ID_DIFF_OPTIONS_IGNORE_BLANKLINES, OnUpdateDiffIgnoreBlankLines)
+       ON_COMMAND(ID_DIFF_OPTIONS_IGNORE_CASE, OnDiffIgnoreCase)
+       ON_UPDATE_COMMAND_UI(ID_DIFF_OPTIONS_IGNORE_CASE, OnUpdateDiffIgnoreCase)
+       ON_COMMAND(ID_DIFF_OPTIONS_IGNORE_EOL, OnDiffIgnoreEOL)
+       ON_UPDATE_COMMAND_UI(ID_DIFF_OPTIONS_IGNORE_EOL, OnUpdateDiffIgnoreEOL)
+       ON_COMMAND(ID_DIFF_OPTIONS_IGNORE_CODEPAGE, OnDiffIgnoreCP)
+       ON_UPDATE_COMMAND_UI(ID_DIFF_OPTIONS_IGNORE_CODEPAGE, OnUpdateDiffIgnoreCP)
+       ON_COMMAND(ID_DIFF_OPTIONS_IGNORE_COMMENTS, OnDiffIgnoreComments)
+       ON_UPDATE_COMMAND_UI(ID_DIFF_OPTIONS_IGNORE_COMMENTS, OnUpdateDiffIgnoreComments)
+       ON_COMMAND(ID_DIFF_OPTIONS_INCLUDE_SUBFOLDERS, OnIncludeSubfolders)
+       ON_UPDATE_COMMAND_UI(ID_DIFF_OPTIONS_INCLUDE_SUBFOLDERS, OnUpdateIncludeSubfolders)
+       ON_COMMAND_RANGE(ID_DIFF_OPTIONS_COMPMETHOD_FULL_CONTENTS, ID_DIFF_OPTIONS_COMPMETHOD_SIZE, OnCompareMethod)
+       ON_UPDATE_COMMAND_UI_RANGE(ID_DIFF_OPTIONS_COMPMETHOD_FULL_CONTENTS, ID_DIFF_OPTIONS_COMPMETHOD_SIZE, OnUpdateCompareMethod)
        ON_COMMAND_RANGE(ID_MRU_FIRST, ID_MRU_LAST, OnMRUs)
        ON_UPDATE_COMMAND_UI(ID_MRU_FIRST, OnUpdateNoMRUs)
        ON_UPDATE_COMMAND_UI(ID_NO_MRU, OnUpdateNoMRUs)
@@ -2510,13 +2514,25 @@ void CMainFrame::OnToolbarButtonDropDown(NMHDR* pNMHDR, LRESULT* pResult)
 }
 void CMainFrame::OnDiffWhitespace(UINT nID)
 {
-       GetOptionsMgr()->SaveOption(OPT_CMP_IGNORE_WHITESPACE, nID - IDC_DIFF_WHITESPACE_COMPARE);
+       GetOptionsMgr()->SaveOption(OPT_CMP_IGNORE_WHITESPACE, nID - ID_DIFF_OPTIONS_WHITESPACE_COMPARE);
        ApplyDiffOptions();
 }
 
 void CMainFrame::OnUpdateDiffWhitespace(CCmdUI* pCmdUI)
 {
-       pCmdUI->SetRadio((pCmdUI->m_nID - IDC_DIFF_WHITESPACE_COMPARE) == static_cast<UINT>(GetOptionsMgr()->GetInt(OPT_CMP_IGNORE_WHITESPACE)));
+       pCmdUI->SetRadio((pCmdUI->m_nID - ID_DIFF_OPTIONS_WHITESPACE_COMPARE) == static_cast<UINT>(GetOptionsMgr()->GetInt(OPT_CMP_IGNORE_WHITESPACE)));
+       pCmdUI->Enable();
+}
+
+void CMainFrame::OnDiffIgnoreBlankLines()
+{
+       GetOptionsMgr()->SaveOption(OPT_CMP_IGNORE_BLANKLINES, !GetOptionsMgr()->GetBool(OPT_CMP_IGNORE_BLANKLINES));
+       ApplyDiffOptions();
+}
+
+void CMainFrame::OnUpdateDiffIgnoreBlankLines(CCmdUI* pCmdUI)
+{
+       pCmdUI->SetCheck(GetOptionsMgr()->GetBool(OPT_CMP_IGNORE_BLANKLINES));
        pCmdUI->Enable();
 }
 
@@ -2556,6 +2572,18 @@ void CMainFrame::OnUpdateDiffIgnoreCP(CCmdUI* pCmdUI)
        pCmdUI->Enable();
 }
 
+void CMainFrame::OnDiffIgnoreComments()
+{
+       GetOptionsMgr()->SaveOption(OPT_CMP_FILTER_COMMENTLINES, !GetOptionsMgr()->GetBool(OPT_CMP_FILTER_COMMENTLINES));
+       ApplyDiffOptions();
+}
+
+void CMainFrame::OnUpdateDiffIgnoreComments(CCmdUI* pCmdUI)
+{
+       pCmdUI->SetCheck(GetOptionsMgr()->GetBool(OPT_CMP_FILTER_COMMENTLINES));
+       pCmdUI->Enable();
+}
+
 void CMainFrame::OnIncludeSubfolders()
 {
        GetOptionsMgr()->SaveOption(OPT_CMP_INCLUDE_SUBDIRS, !GetOptionsMgr()->GetBool(OPT_CMP_INCLUDE_SUBDIRS));
@@ -2574,12 +2602,12 @@ void CMainFrame::OnUpdateIncludeSubfolders(CCmdUI* pCmdUI)
 
 void CMainFrame::OnCompareMethod(UINT nID)
 { 
-       GetOptionsMgr()->SaveOption(OPT_CMP_METHOD, nID - ID_COMPMETHOD_FULL_CONTENTS);
+       GetOptionsMgr()->SaveOption(OPT_CMP_METHOD, nID - ID_DIFF_OPTIONS_COMPMETHOD_FULL_CONTENTS);
 }
 
 void CMainFrame::OnUpdateCompareMethod(CCmdUI* pCmdUI)
 {
-       pCmdUI->SetRadio((pCmdUI->m_nID - ID_COMPMETHOD_FULL_CONTENTS) == static_cast<UINT>(GetOptionsMgr()->GetInt(OPT_CMP_METHOD)));
+       pCmdUI->SetRadio((pCmdUI->m_nID - ID_DIFF_OPTIONS_COMPMETHOD_FULL_CONTENTS) == static_cast<UINT>(GetOptionsMgr()->GetInt(OPT_CMP_METHOD)));
        pCmdUI->Enable();
 }
 

diff --git a/Src/MainFrm.h b/Src/MainFrm.h
index e30f9c8..7093fc0 100644 (file)
--- a/Src/MainFrm.h
+++ b/Src/MainFrm.h
@@ -289,12 +289,16 @@ protected:
        afx_msg void OnToolbarButtonDropDown(NMHDR* pNMHDR, LRESULT* pResult);
        afx_msg void OnDiffWhitespace(UINT nID);
        afx_msg void OnUpdateDiffWhitespace(CCmdUI* pCmdUI);
+       afx_msg void OnDiffIgnoreBlankLines();
+       afx_msg void OnUpdateDiffIgnoreBlankLines(CCmdUI* pCmdUI);
        afx_msg void OnDiffIgnoreCase();
        afx_msg void OnUpdateDiffIgnoreCase(CCmdUI* pCmdUI);
        afx_msg void OnDiffIgnoreEOL();
        afx_msg void OnUpdateDiffIgnoreEOL(CCmdUI* pCmdUI);
        afx_msg void OnDiffIgnoreCP();
        afx_msg void OnUpdateDiffIgnoreCP(CCmdUI* pCmdUI);
+       afx_msg void OnDiffIgnoreComments();
+       afx_msg void OnUpdateDiffIgnoreComments(CCmdUI* pCmdUI);
        afx_msg void OnIncludeSubfolders();
        afx_msg void OnUpdateIncludeSubfolders(CCmdUI* pCmdUI);
        afx_msg void OnCompareMethod(UINT nID);

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 46cd524..dc43279 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -860,23 +860,25 @@ BEGIN
     BEGIN\r
         POPUP "W&hitespaces"\r
         BEGIN\r
-            MENUITEM "Com&pare",                    IDC_DIFF_WHITESPACE_COMPARE\r
-            MENUITEM "I&gnore changes",             IDC_DIFF_WHITESPACE_IGNORE\r
-            MENUITEM "Ig&nore all",                 IDC_DIFF_WHITESPACE_IGNOREALL\r
+            MENUITEM "Com&pare",                    ID_DIFF_OPTIONS_WHITESPACE_COMPARE\r
+            MENUITEM "I&gnore changes",             ID_DIFF_OPTIONS_WHITESPACE_IGNORE\r
+            MENUITEM "Ig&nore all",                 ID_DIFF_OPTIONS_WHITESPACE_IGNOREALL\r
         END\r
-        MENUITEM "Ignore &case",                IDC_DIFF_IGNORECASE\r
-        MENUITEM "Igno&re carriage return differences (Windows/Unix/Mac)", IDC_DIFF_IGNOREEOL\r
-        MENUITEM "Ignore codepage &differences", IDC_DIFF_IGNORECP\r
+        MENUITEM "Ignore blan&k lines",         ID_DIFF_OPTIONS_IGNORE_BLANKLINES\r
+        MENUITEM "Ignore &case",                ID_DIFF_OPTIONS_IGNORE_CASE\r
+        MENUITEM "Igno&re carriage return differences (Windows/Unix/Mac)", ID_DIFF_OPTIONS_IGNORE_EOL\r
+        MENUITEM "Ignore codepage &differences", ID_DIFF_OPTIONS_IGNORE_CODEPAGE\r
+        MENUITEM "Ignore c&omment differences" ,ID_DIFF_OPTIONS_IGNORE_COMMENTS\r
         MENUITEM SEPARATOR\r
-        MENUITEM "&Include Subfolders",         IDC_RECURS_CHECK\r
+        MENUITEM "&Include Subfolders",         ID_DIFF_OPTIONS_INCLUDE_SUBFOLDERS\r
         POPUP "&Compare method:"\r
         BEGIN\r
-            MENUITEM "Full Contents",               ID_COMPMETHOD_FULL_CONTENTS\r
-            MENUITEM "Quick Contents",              ID_COMPMETHOD_QUICK_CONTENTS\r
-            MENUITEM "Binary Contents",             ID_COMPMETHOD_BINARY_CONTENTS\r
-            MENUITEM "Modified Date",               ID_COMPMETHOD_MODDATE\r
-            MENUITEM "Modified Date and Size",      ID_COMPMETHOD_DATESIZE\r
-            MENUITEM "Size",                        ID_COMPMETHOD_SIZE\r
+            MENUITEM "Full Contents",               ID_DIFF_OPTIONS_COMPMETHOD_FULL_CONTENTS\r
+            MENUITEM "Quick Contents",              ID_DIFF_OPTIONS_COMPMETHOD_QUICK_CONTENTS\r
+            MENUITEM "Binary Contents",             ID_DIFF_OPTIONS_COMPMETHOD_BINARY_CONTENTS\r
+            MENUITEM "Modified Date",               ID_DIFF_OPTIONS_COMPMETHOD_MODDATE\r
+            MENUITEM "Modified Date and Size",      ID_DIFF_OPTIONS_COMPMETHOD_DATESIZE\r
+            MENUITEM "Size",                        ID_DIFF_OPTIONS_COMPMETHOD_SIZE\r
         END\r
     END\r
 END\r

diff --git a/Src/resource.h b/Src/resource.h
index cc8877a..cdb1e8a 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -585,12 +585,21 @@
 #define IDC_EDIT_MARKER_NEW             8822\r
 #define IDC_EDIT_MARKER_DELETE          8823\r
 // COMMANDS\r
-#define ID_COMPMETHOD_FULL_CONTENTS     16432\r
-#define ID_COMPMETHOD_QUICK_CONTENTS    16433\r
-#define ID_COMPMETHOD_BINARY_CONTENTS   16434\r
-#define ID_COMPMETHOD_MODDATE           16435\r
-#define ID_COMPMETHOD_DATESIZE          16436\r
-#define ID_COMPMETHOD_SIZE              16437\r
+#define ID_DIFF_OPTIONS_WHITESPACE_COMPARE   16423\r
+#define ID_DIFF_OPTIONS_WHITESPACE_IGNORE    16424\r
+#define ID_DIFF_OPTIONS_WHITESPACE_IGNOREALL 16425\r
+#define ID_DIFF_OPTIONS_IGNORE_BLANKLINES 16426\r
+#define ID_DIFF_OPTIONS_IGNORE_CASE     16427\r
+#define ID_DIFF_OPTIONS_IGNORE_EOL      16428\r
+#define ID_DIFF_OPTIONS_IGNORE_CODEPAGE 16429\r
+#define ID_DIFF_OPTIONS_IGNORE_COMMENTS 16430\r
+#define ID_DIFF_OPTIONS_INCLUDE_SUBFOLDERS           16431\r
+#define ID_DIFF_OPTIONS_COMPMETHOD_FULL_CONTENTS     16432\r
+#define ID_DIFF_OPTIONS_COMPMETHOD_QUICK_CONTENTS    16433\r
+#define ID_DIFF_OPTIONS_COMPMETHOD_BINARY_CONTENTS   16434\r
+#define ID_DIFF_OPTIONS_COMPMETHOD_MODDATE           16435\r
+#define ID_DIFF_OPTIONS_COMPMETHOD_DATESIZE          16436\r
+#define ID_DIFF_OPTIONS_COMPMETHOD_SIZE              16437\r
 #define ID_DIR_COPY_LEFT_TO_RIGHT       17600\r
 #define ID_DIR_COPY_LEFT_TO_MIDDLE      17601\r
 #define ID_DIR_COPY_LEFT_TO_BROWSE      17602\r

diff --git a/Translations/WinMerge/Arabic.po b/Translations/WinMerge/Arabic.po
index ed35f5c..28a688d 100644 (file)
--- a/Translations/WinMerge/Arabic.po
+++ b/Translations/WinMerge/Arabic.po
@@ -895,6 +895,9 @@ msgstr "تجاهل التغييرات"
 msgid "Ig&nore all"
 msgstr "تجاهل الكل"
 
+msgid "Ignore blan&k lines"
+msgstr "تجاهل الأسطر الفارغة"
+
 msgid "Ignore &case"
 msgstr "تجاهل حالة الحرف (للغة الإنجليزية)"
 
@@ -906,6 +909,9 @@ msgstr ""
 msgid "Ignore codepage &differences"
 msgstr "تجاهل اختلافات ترميز الصفحة"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 msgid "&Include Subfolders"
 msgstr "تضمين المجلدات الفرعية"
 
@@ -1358,12 +1364,6 @@ msgstr "تجاهل الت&غييرات"
 msgid "I&gnore all"
 msgstr "تجاهل ال&كل"
 
-msgid "Ignore blan&k lines"
-msgstr "تجاهل الأسطر الفارغة"
-
-msgid "Ignore c&omment differences"
-msgstr ""
-
 msgid "E&nable moved block detection"
 msgstr "&تفعيل كشف المجموعات التي نقلها"
 

diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po
index a51b6d7..17d41db 100644 (file)
--- a/Translations/WinMerge/Basque.po
+++ b/Translations/WinMerge/Basque.po
@@ -1122,6 +1122,10 @@ msgid "Ig&nore all"
 msgstr "E&zikusi denak"
 
 #, c-format
+msgid "Ignore blan&k lines"
+msgstr "Ezikusi &lerro zuriak"
+
+#, c-format
 msgid "Ignore &case"
 msgstr "Ezikusi &kasua"
 
@@ -1133,6 +1137,9 @@ msgstr "Ezikusi g&urdi itzulera ezberdintasunak (Windows/Unix/Mac)"
 msgid "Ignore codepage &differences"
 msgstr ""
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 #, c-format
 msgid "&Include Subfolders"
 msgstr "&Az&piagiritegiak Barne"
@@ -1709,13 +1716,6 @@ msgid "I&gnore all"
 msgstr "E&zikusi denak"
 
 #, c-format
-msgid "Ignore blan&k lines"
-msgstr "Ezikusi &lerro zuriak"
-
-msgid "Ignore c&omment differences"
-msgstr ""
-
-#, c-format
 msgid "E&nable moved block detection"
 msgstr "Gaitu bloke &mugitu atzematea"
 

diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po
index 60c1e9f..f598044 100644 (file)
--- a/Translations/WinMerge/Brazilian.po
+++ b/Translations/WinMerge/Brazilian.po
@@ -1120,6 +1120,10 @@ msgid "Ig&nore all"
 msgstr "Ig&norar tudo"
 
 #, c-format
+msgid "Ignore blan&k lines"
+msgstr "Ignorar as linha&s em branco"
+
+#, c-format
 msgid "Ignore &case"
 msgstr "Ignorar &caso sensitivo"
 
@@ -1131,6 +1135,9 @@ msgstr "Igno&rar as diferenças de retorno dos procedimentos (Windows/Unix/Mac)"
 msgid "Ignore codepage &differences"
 msgstr "Ignorar as diferenças do código da &página"
 
+msgid "Ignore c&omment differences"
+msgstr "Ignorar diferenças dos c&omentários"
+
 #, c-format
 msgid "&Include Subfolders"
 msgstr "&Incluir as Sub-Pastas"
@@ -1708,13 +1715,6 @@ msgid "I&gnore all"
 msgstr "I&gnorar tudo"
 
 #, c-format
-msgid "Ignore blan&k lines"
-msgstr "Ignorar as linha&s em branco"
-
-msgid "Ignore c&omment differences"
-msgstr "Ignorar diferenças dos c&omentários"
-
-#, c-format
 msgid "E&nable moved block detection"
 msgstr "A&tivar a detecção dos blocos movidos"
 

diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po
index 84eea75..7774743 100644 (file)
--- a/Translations/WinMerge/Bulgarian.po
+++ b/Translations/WinMerge/Bulgarian.po
@@ -891,6 +891,9 @@ msgstr "Пренебре&гване на променените"
 msgid "Ig&nore all"
 msgstr "Пре&небрегване на всички"
 
+msgid "Ignore blan&k lines"
+msgstr "Пренебрегване на пра&зни редове"
+
 msgid "Ignore &case"
 msgstr "Пренебре&гване на регистъра"
 
@@ -900,6 +903,9 @@ msgstr "Пренебрегване на &знаци за нов ред (Windows/
 msgid "Ignore codepage &differences"
 msgstr "Пренебрегване на &разлики в кодова страница"
 
+msgid "Ignore c&omment differences"
+msgstr "Пренебрегване на разлики в &коментари"
+
 msgid "&Include Subfolders"
 msgstr "&Включително подпапките"
 
@@ -1356,12 +1362,6 @@ msgstr "&Пренебрегване на променените"
 msgid "I&gnore all"
 msgstr "Пренебре&гване на всички"
 
-msgid "Ignore blan&k lines"
-msgstr "Пренебрегване на пра&зни редове"
-
-msgid "Ignore c&omment differences"
-msgstr "Пренебрегване на разлики в &коментари"
-
 msgid "E&nable moved block detection"
 msgstr "Разпознаване на преместени па&раграфи"
 

diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po
index f8113cc..246130f 100644 (file)
--- a/Translations/WinMerge/Catalan.po
+++ b/Translations/WinMerge/Catalan.po
@@ -1119,6 +1119,10 @@ msgid "Ig&nore all"
 msgstr "I&gnora'ls tots"
 
 #, c-format
+msgid "Ignore blan&k lines"
+msgstr "&Ignora les línies en blanc"
+
+#, c-format
 msgid "Ignore &case"
 msgstr "Ignora &majúscules/minúscules"
 
@@ -1130,6 +1134,9 @@ msgstr ""
 msgid "Ignore codepage &differences"
 msgstr ""
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 #, c-format
 msgid "&Include Subfolders"
 msgstr "&Inclou-hi les subcarpetes"
@@ -1707,13 +1714,6 @@ msgid "I&gnore all"
 msgstr "Ignora t&ots els espais"
 
 #, c-format
-msgid "Ignore blan&k lines"
-msgstr "&Ignora les línies en blanc"
-
-msgid "Ignore c&omment differences"
-msgstr ""
-
-#, c-format
 msgid "E&nable moved block detection"
 msgstr "&Habilita detecció de blocs desplaçats"
 

diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po
index 758ee7b..dd8a6ec 100644 (file)
--- a/Translations/WinMerge/ChineseSimplified.po
+++ b/Translations/WinMerge/ChineseSimplified.po
@@ -897,6 +897,9 @@ msgstr "忽略空白字符的变化(G)"
 msgid "Ig&nore all"
 msgstr "忽略所有空白字符(&N)"
 
+msgid "Ignore blan&k lines"
+msgstr "忽略空行(&K)"
+
 msgid "Ignore &case"
 msgstr "忽略大小写(&C)"
 
@@ -906,6 +909,9 @@ msgstr "忽略换行符差异 (Windows/Unix/Mac)(&R)"
 msgid "Ignore codepage &differences"
 msgstr "忽略代码页差异(&D)"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 msgid "&Include Subfolders"
 msgstr "包含子目录(&I)"
 
@@ -1359,12 +1365,6 @@ msgstr "忽略空白字符的变化(&I)"
 msgid "I&gnore all"
 msgstr "忽略所有空白字符(&G)"
 
-msgid "Ignore blan&k lines"
-msgstr "忽略空行(&K)"
-
-msgid "Ignore c&omment differences"
-msgstr ""
-
 msgid "E&nable moved block detection"
 msgstr "启用块移动检测(&N)"
 

diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po
index 27638be..5005c7a 100644 (file)
--- a/Translations/WinMerge/ChineseTraditional.po
+++ b/Translations/WinMerge/ChineseTraditional.po
@@ -1128,6 +1128,10 @@ msgid "Ig&nore all"
 msgstr "忽略全部(&N)"
 
 #, c-format
+msgid "Ignore blan&k lines"
+msgstr "忽略空白行(&K)"
+
+#, c-format
 msgid "Ignore &case"
 msgstr "忽略大小寫(&C)"
 
@@ -1139,6 +1143,9 @@ msgstr "忽略換行字元之差異(Windows/Unix/Mac)(&R)"
 msgid "Ignore codepage &differences"
 msgstr "忽略代碼頁不同(&D)"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 #, c-format
 msgid "&Include Subfolders"
 msgstr "包括子資料夾(&I)"
@@ -1718,13 +1725,6 @@ msgid "I&gnore all"
 msgstr "忽略空白處之任何差異(&A)"
 
 #, c-format
-msgid "Ignore blan&k lines"
-msgstr "忽略空白行(&K)"
-
-msgid "Ignore c&omment differences"
-msgstr ""
-
-#, c-format
 msgid "E&nable moved block detection"
 msgstr "偵測移位的區塊(&N)"
 

diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po
index 74c76c0..1517f19 100644 (file)
--- a/Translations/WinMerge/Croatian.po
+++ b/Translations/WinMerge/Croatian.po
@@ -1120,6 +1120,10 @@ msgid "Ig&nore all"
 msgstr "Zanemari &sve"
 
 #, c-format
+msgid "Ignore blan&k lines"
+msgstr "Zanemari prazne &retke"
+
+#, c-format
 msgid "Ignore &case"
 msgstr "Zanemari V/m &slova"
 
@@ -1131,6 +1135,9 @@ msgstr "&Zanemari različitost oznaka završetka retka (Windows/Unix/Mac)"
 msgid "Ignore codepage &differences"
 msgstr ""
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 #, c-format
 msgid "&Include Subfolders"
 msgstr "Uključi i &podmape"
@@ -1708,13 +1715,6 @@ msgid "I&gnore all"
 msgstr "Zanemari &sve"
 
 #, c-format
-msgid "Ignore blan&k lines"
-msgstr "Zanemari prazne &retke"
-
-msgid "Ignore c&omment differences"
-msgstr ""
-
-#, c-format
 msgid "E&nable moved block detection"
 msgstr "Omogući &razlikovanje premještenih blokova"
 

diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po
index 8f9c4a9..5daafd3 100644 (file)
--- a/Translations/WinMerge/Czech.po
+++ b/Translations/WinMerge/Czech.po
@@ -1120,6 +1120,10 @@ msgid "Ig&nore all"
 msgstr "Ignorovat &všechny"
 
 #, c-format
+msgid "Ignore blan&k lines"
+msgstr "Ignorovat prázdné řá&dky"
+
+#, c-format
 msgid "Ignore &case"
 msgstr "Ignorovat &malá a velká písmena"
 
@@ -1131,6 +1135,9 @@ msgstr "Ignorovat rozdíly v &koncích řádků (Windows/Unix/Mac)"
 msgid "Ignore codepage &differences"
 msgstr ""
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 #, c-format
 msgid "&Include Subfolders"
 msgstr "Včetně pod&složek"
@@ -1710,13 +1717,6 @@ msgid "I&gnore all"
 msgstr "Ignorovat &všechny"
 
 #, c-format
-msgid "Ignore blan&k lines"
-msgstr "Ignorovat prázdné řá&dky"
-
-msgid "Ignore c&omment differences"
-msgstr ""
-
-#, c-format
 msgid "E&nable moved block detection"
 msgstr "Povolit zjišťování přesunutých &bloků"
 

diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po
index 073281e..0e6b3f3 100644 (file)
--- a/Translations/WinMerge/Danish.po
+++ b/Translations/WinMerge/Danish.po
@@ -1121,6 +1121,10 @@ msgid "Ig&nore all"
 msgstr "Ign&orer alle"
 
 #, c-format
+msgid "Ignore blan&k lines"
+msgstr "Ignorer blan&ke linjer"
+
+#, c-format
 msgid "Ignore &case"
 msgstr "Ignorer store/små &bogstaver"
 
@@ -1132,6 +1136,9 @@ msgstr "Igno&rer returtegns forskelle (Windows/Unix/Mac)"
 msgid "Ignore codepage &differences"
 msgstr ""
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 #, c-format
 msgid "&Include Subfolders"
 msgstr "&Inkluder undermapper"
@@ -1711,13 +1718,6 @@ msgid "I&gnore all"
 msgstr "I&gnorer alle"
 
 #, c-format
-msgid "Ignore blan&k lines"
-msgstr "Ignorer blan&ke linjer"
-
-msgid "Ignore c&omment differences"
-msgstr ""
-
-#, c-format
 msgid "E&nable moved block detection"
 msgstr "&Aktiver detektion af flyttede blokke"
 

diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po
index f96fea0..c487f33 100644 (file)
--- a/Translations/WinMerge/Dutch.po
+++ b/Translations/WinMerge/Dutch.po
@@ -895,6 +895,9 @@ msgstr "Wijzigingen negeren"
 msgid "Ig&nore all"
 msgstr "Alles negeren"
 
+msgid "Ignore blan&k lines"
+msgstr "Lege regels negeren"
+
 msgid "Ignore &case"
 msgstr "Niet hoofdlettergevoelig"
 
@@ -904,6 +907,9 @@ msgstr "Regeleinde-verschillen negeren (Windows/Unix/Mac)"
 msgid "Ignore codepage &differences"
 msgstr "Tekenset-verschillen negeren"
 
+msgid "Ignore c&omment differences"
+msgstr "Opmerkingsverschillen negeren"
+
 msgid "&Include Subfolders"
 msgstr "Ook in submappen"
 
@@ -1364,12 +1370,6 @@ msgstr "Wijziging negeren"
 msgid "I&gnore all"
 msgstr "Alles negeren"
 
-msgid "Ignore blan&k lines"
-msgstr "Lege regels negeren"
-
-msgid "Ignore c&omment differences"
-msgstr "Opmerkingsverschillen negeren"
-
 msgid "E&nable moved block detection"
 msgstr "Detectie verplaatste blokken inschakelen"
 

diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot
index 8c114f8..69180d7 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-04-20 22:26+0000\n"
+"POT-Creation-Date: 2021-05-27 08:43+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
@@ -888,6 +888,9 @@ msgstr ""
 msgid "Ig&nore all"
 msgstr ""
 
+msgid "Ignore blan&k lines"
+msgstr ""
+
 msgid "Ignore &case"
 msgstr ""
 
@@ -897,6 +900,9 @@ msgstr ""
 msgid "Ignore codepage &differences"
 msgstr ""
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 msgid "&Include Subfolders"
 msgstr ""
 
@@ -1347,12 +1353,6 @@ msgstr ""
 msgid "I&gnore all"
 msgstr ""
 
-msgid "Ignore blan&k lines"
-msgstr ""
-
-msgid "Ignore c&omment differences"
-msgstr ""
-
 msgid "E&nable moved block detection"
 msgstr ""
 

diff --git a/Translations/WinMerge/Finnish.po b/Translations/WinMerge/Finnish.po
index 3e8a726..ca94b09 100644 (file)
--- a/Translations/WinMerge/Finnish.po
+++ b/Translations/WinMerge/Finnish.po
@@ -1120,6 +1120,10 @@ msgid "Ig&nore all"
 msgstr "Hylkää kaikki"
 
 #, c-format
+msgid "Ignore blan&k lines"
+msgstr "Ohita tyhjät rivit"
+
+#, c-format
 msgid "Ignore &case"
 msgstr "Ohita kirjainkoko"
 
@@ -1131,6 +1135,9 @@ msgstr "Ohita rivinvaihtoerot (Windows/Unix/Mac)"
 msgid "Ignore codepage &differences"
 msgstr "Ohita koodisivuerot"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 #, c-format
 msgid "&Include Subfolders"
 msgstr "Sisällytä alihakemistot"
@@ -1708,13 +1715,6 @@ msgid "I&gnore all"
 msgstr "Hylkää kaikki"
 
 #, c-format
-msgid "Ignore blan&k lines"
-msgstr "Ohita tyhjät rivit"
-
-msgid "Ignore c&omment differences"
-msgstr ""
-
-#, c-format
 msgid "E&nable moved block detection"
 msgstr "Ota siirretyn lohkon tunnistus käyttöön"
 

diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po
index 54007f7..c9e377d 100644 (file)
--- a/Translations/WinMerge/French.po
+++ b/Translations/WinMerge/French.po
@@ -1127,6 +1127,10 @@ msgid "Ig&nore all"
 msgstr "Ignorer &tout"
 
 #, c-format
+msgid "Ignore blan&k lines"
+msgstr "Ignorer les lignes &vides"
+
+#, c-format
 msgid "Ignore &case"
 msgstr "Ignorer la ca&sse"
 
@@ -1138,6 +1142,9 @@ msgstr "Ignorer les différences de &fin de ligne (Windows/Unix/Mac)"
 msgid "Ignore codepage &differences"
 msgstr "Ignorer les &différences de page de code"
 
+msgid "Ignore c&omment differences"
+msgstr "Ignorer les différences de c&ommentaire"
+
 #, c-format
 msgid "&Include Subfolders"
 msgstr "&Inclure les sous-dossiers"
@@ -1715,13 +1722,6 @@ msgid "I&gnore all"
 msgstr "Ignorer &tout"
 
 #, c-format
-msgid "Ignore blan&k lines"
-msgstr "Ignorer les lignes &vides"
-
-msgid "Ignore c&omment differences"
-msgstr "Ignorer les différences de c&ommentaire"
-
-#, c-format
 msgid "E&nable moved block detection"
 msgstr "&Activer la détection des blocs déplacés"
 

diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po
index ef93ceb..f5283de 100644 (file)
--- a/Translations/WinMerge/Galician.po
+++ b/Translations/WinMerge/Galician.po
@@ -1121,6 +1121,10 @@ msgid "Ig&nore all"
 msgstr "Ig&norar todo"
 
 #, c-format
+msgid "Ignore blan&k lines"
+msgstr "Ignorar &liñas en branco"
+
+#, c-format
 msgid "Ignore &case"
 msgstr "Ignorar maiúsculas e minúsculas"
 
@@ -1132,6 +1136,9 @@ msgstr "Igno&rar diferenzas nos saltos de liña (Windows/Unix/Mac)"
 msgid "Ignore codepage &differences"
 msgstr "Ignorar &diferenzas de codificación"
 
+msgid "Ignore c&omment differences"
+msgstr "Ignorar diferenzas nos c&omentarios"
+
 #, c-format
 msgid "&Include Subfolders"
 msgstr "&Incluír subcartafoles"
@@ -1709,13 +1716,6 @@ msgid "I&gnore all"
 msgstr "&Ignorar todo"
 
 #, c-format
-msgid "Ignore blan&k lines"
-msgstr "Ignorar &liñas en branco"
-
-msgid "Ignore c&omment differences"
-msgstr "Ignorar diferenzas nos c&omentarios"
-
-#, c-format
 msgid "E&nable moved block detection"
 msgstr "A&ctivar detección de bloques movidos"
 

diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po
index 67d7cfb..1fea14e 100644 (file)
--- a/Translations/WinMerge/German.po
+++ b/Translations/WinMerge/German.po
@@ -1120,6 +1120,10 @@ msgid "Ig&nore all"
 msgstr "&Alle ignorieren"
 
 #, c-format
+msgid "Ignore blan&k lines"
+msgstr "&Leerzeilen ignorieren"
+
+#, c-format
 msgid "Ignore &case"
 msgstr "&Groß-/Kleinschreibung ignorieren"
 
@@ -1131,6 +1135,9 @@ msgstr "&Zeilenumbruchunterschiede (Windows/Unix/Mac) ignorieren"
 msgid "Ignore codepage &differences"
 msgstr "&Codeseiten-Unterschiede ignorieren"
 
+msgid "Ignore c&omment differences"
+msgstr "Kommentarunterschiede ignorieren"
+
 #, c-format
 msgid "&Include Subfolders"
 msgstr "&Unterordner einbeziehen"
@@ -1708,13 +1715,6 @@ msgid "I&gnore all"
 msgstr "&Alle ignorieren"
 
 #, c-format
-msgid "Ignore blan&k lines"
-msgstr "&Leerzeilen ignorieren"
-
-msgid "Ignore c&omment differences"
-msgstr "Kommentarunterschiede ignorieren"
-
-#, c-format
 msgid "E&nable moved block detection"
 msgstr "Verschobene &Blöcke erkennen"
 

diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po
index fb1f8ae..7c2d907 100644 (file)
--- a/Translations/WinMerge/Greek.po
+++ b/Translations/WinMerge/Greek.po
@@ -1119,6 +1119,10 @@ msgid "Ig&nore all"
 msgstr "Να Αγνοηθούν Ό&λα"
 
 #, c-format
+msgid "Ignore blan&k lines"
+msgstr "Οι &κενές γραμμές να αγνοούνται"
+
+#, c-format
 msgid "Ignore &case"
 msgstr "Διάκριση μεταξύ Πεζών/&Κεφαλαίων ανενεργός"
 
@@ -1130,6 +1134,9 @@ msgstr "Διαφορές χαρακτήρων &τερματισμού (Win/Unix/
 msgid "Ignore codepage &differences"
 msgstr ""
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 #, c-format
 msgid "&Include Subfolders"
 msgstr "Οι Υποφάκελοι να &συμπεριληφθούν"
@@ -1707,13 +1714,6 @@ msgid "I&gnore all"
 msgstr "Να αγνοούνται τα &πάντα"
 
 #, c-format
-msgid "Ignore blan&k lines"
-msgstr "Οι &κενές γραμμές να αγνοούνται"
-
-msgid "Ignore c&omment differences"
-msgstr ""
-
-#, c-format
 msgid "E&nable moved block detection"
 msgstr "Ενεργοποίηση ανι&χνεύσεως μετακινηθέντων τμημάτων"
 

diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po
index 87bd5e3..17b3c16 100644 (file)
--- a/Translations/WinMerge/Hungarian.po
+++ b/Translations/WinMerge/Hungarian.po
@@ -1122,6 +1122,10 @@ msgid "Ig&nore all"
 msgstr "Összes mellőzése"
 
 #, c-format
+msgid "Ignore blan&k lines"
+msgstr "Üres sorok mellőzése"
+
+#, c-format
 msgid "Ignore &case"
 msgstr "&Kis-nagybetű különbségek mellőzése"
 
@@ -1133,6 +1137,9 @@ msgstr "Sorvég különbségek mellőzése"
 msgid "Ignore codepage &differences"
 msgstr "Kódtábla különbségek mellőzése"
 
+msgid "Ignore c&omment differences"
+msgstr "Megjegyzés különbségek mellőzése"
+
 #, c-format
 msgid "&Include Subfolders"
 msgstr "&Alkönyvtárakkal együtt"
@@ -1710,13 +1717,6 @@ msgid "I&gnore all"
 msgstr "Összes mellőzése"
 
 #, c-format
-msgid "Ignore blan&k lines"
-msgstr "Üres sorok mellőzése"
-
-msgid "Ignore c&omment differences"
-msgstr "Megjegyzés különbségek mellőzése"
-
-#, c-format
 msgid "E&nable moved block detection"
 msgstr "Mozgatott &blokk észlelés bekapcsolása"
 

diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po
index 73d9b30..6eef00e 100644 (file)
--- a/Translations/WinMerge/Italian.po
+++ b/Translations/WinMerge/Italian.po
@@ -894,6 +894,9 @@ msgstr "Ignora ca&mbiamenti"
 msgid "Ig&nore all"
 msgstr "Ig&nora tutto"
 
+msgid "Ignore blan&k lines"
+msgstr "Ign&ora le linee vuote"
+
 msgid "Ignore &case"
 msgstr "Ig&nora differenze maiuscole/minuscole"
 
@@ -903,6 +906,9 @@ msgstr "I&gnora differenze nei fine riga (Windows/Unix/Mac)"
 msgid "Ignore codepage &differences"
 msgstr "Ignora differenze di codice di &pagina"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 msgid "&Include Subfolders"
 msgstr "&Includi sotto cartelle"
 
@@ -1355,12 +1361,6 @@ msgstr "&Ignora cambiamento"
 msgid "I&gnore all"
 msgstr "I&gnora tutto"
 
-msgid "Ignore blan&k lines"
-msgstr "Ign&ora le linee vuote"
-
-msgid "Ignore c&omment differences"
-msgstr ""
-
 msgid "E&nable moved block detection"
 msgstr "Attiva rilevamento blocc&hi spostati"
 

diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po
index bb103a7..daa253e 100644 (file)
--- a/Translations/WinMerge/Japanese.po
+++ b/Translations/WinMerge/Japanese.po
@@ -895,6 +895,9 @@ msgstr "変更を無視(&G)"
 msgid "Ig&nore all"
 msgstr "すべて無視(&N)"
 
+msgid "Ignore blan&k lines"
+msgstr "空行を無視する(&K)"
+
 msgid "Ignore &case"
 msgstr "大文字と小文字を区別しない(&C)"
 
@@ -904,6 +907,9 @@ msgstr "改行文字の違いを無視する(&R) (Windows/Unix/Mac)"
 msgid "Ignore codepage &differences"
 msgstr "コードページの違いを無視する(&D)"
 
+msgid "Ignore c&omment differences"
+msgstr "コメントの違いを無視する(&O)"
+
 msgid "&Include Subfolders"
 msgstr "サブフォルダーを含める(&I)"
 
@@ -1358,12 +1364,6 @@ msgstr "変更を無視(&I)"
 msgid "I&gnore all"
 msgstr "すべて無視(&G)"
 
-msgid "Ignore blan&k lines"
-msgstr "空行を無視する(&K)"
-
-msgid "Ignore c&omment differences"
-msgstr "コメントの違いを無視する(&O)"
-
 msgid "E&nable moved block detection"
 msgstr "移動ブロック検出を有効にする(&N)"
 

diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po
index 5f6e971..a3764aa 100644 (file)
--- a/Translations/WinMerge/Korean.po
+++ b/Translations/WinMerge/Korean.po
@@ -1125,6 +1125,10 @@ msgid "Ig&nore all"
 msgstr "모두 무시하기(&N)"
 
 #, c-format
+msgid "Ignore blan&k lines"
+msgstr "공백 줄 무시하기(&K)"
+
+#, c-format
 msgid "Ignore &case"
 msgstr "대소문자 무시하기(&C)"
 
@@ -1136,6 +1140,9 @@ msgstr "케리지 리턴 차이 무시하기 (윈도우/유닉스/맥)(&R)"
 msgid "Ignore codepage &differences"
 msgstr "코드페이지 차이 무시하기(&D)"
 
+msgid "Ignore c&omment differences"
+msgstr "주석 차이 무시하기(&O)"
+
 #, c-format
 msgid "&Include Subfolders"
 msgstr "하위 폴더 포함하기(&I)"
@@ -1713,13 +1720,6 @@ msgid "I&gnore all"
 msgstr "모두 무시하기(&G)"
 
 #, c-format
-msgid "Ignore blan&k lines"
-msgstr "공백 줄 무시하기(&K)"
-
-msgid "Ignore c&omment differences"
-msgstr "주석 차이 무시하기(&O)"
-
-#, c-format
 msgid "E&nable moved block detection"
 msgstr "이동된 블럭 감지 사용하기"
 

diff --git a/Translations/WinMerge/Lithuanian.po b/Translations/WinMerge/Lithuanian.po
index 09a3388..7cc67c3 100644 (file)
--- a/Translations/WinMerge/Lithuanian.po
+++ b/Translations/WinMerge/Lithuanian.po
@@ -897,6 +897,9 @@ msgstr "I&gnoruoti pokyčius"
 msgid "Ig&nore all"
 msgstr "Ig&noruoti visus"
 
+msgid "Ignore blan&k lines"
+msgstr "Nepaisyti &tuščių eilučių"
+
 msgid "Ignore &case"
 msgstr "Nepaisyti raidžių &dydžio"
 
@@ -906,6 +909,9 @@ msgstr "Igno&ruoti eil. pabaigų formato skirtumus (Windows/Unix/Mac)"
 msgid "Ignore codepage &differences"
 msgstr "Nepaisyti ko&duočių skirtumų"
 
+msgid "Ignore c&omment differences"
+msgstr "Nepaisyti skirtumų k&omentaruose"
+
 msgid "&Include Subfolders"
 msgstr "Įtraukt&i pakatalogius"
 
@@ -1356,12 +1362,6 @@ msgstr "&Ignoruoti pokyčius"
 msgid "I&gnore all"
 msgstr "I&gnoruoti visus"
 
-msgid "Ignore blan&k lines"
-msgstr "Nepaisyti &tuščių eilučių"
-
-msgid "Ignore c&omment differences"
-msgstr "Nepaisyti skirtumų k&omentaruose"
-
 msgid "E&nable moved block detection"
 msgstr "Įju&ngti perkeltų blokų aptikimą"
 

diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po
index a76615f..1dd33fd 100644 (file)
--- a/Translations/WinMerge/Norwegian.po
+++ b/Translations/WinMerge/Norwegian.po
@@ -1120,6 +1120,10 @@ msgid "Ig&nore all"
 msgstr "Ig&norer alle"
 
 #, c-format
+msgid "Ignore blan&k lines"
+msgstr "Ignorer blan&ke linjer"
+
+#, c-format
 msgid "Ignore &case"
 msgstr "Ignorer store/små &bokstaver"
 
@@ -1131,6 +1135,9 @@ msgstr "Igno&rer linjebruddforskjeller (Windows/Unix/Mac)"
 msgid "Ignore codepage &differences"
 msgstr ""
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 #, c-format
 msgid "&Include Subfolders"
 msgstr "&Inkluder undermapper"
@@ -1708,13 +1715,6 @@ msgid "I&gnore all"
 msgstr "Ignorer &alle"
 
 #, c-format
-msgid "Ignore blan&k lines"
-msgstr "Ignorer blan&ke linjer"
-
-msgid "Ignore c&omment differences"
-msgstr ""
-
-#, c-format
 msgid "E&nable moved block detection"
 msgstr "&Aktiver flyttet blokk-oppdagelse"
 

diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po
index f8ffacc..cda096e 100644 (file)
--- a/Translations/WinMerge/Persian.po
+++ b/Translations/WinMerge/Persian.po
@@ -1121,6 +1121,10 @@ msgid "Ig&nore all"
 msgstr "&n چشم پوشي از همه "
 
 #, c-format
+msgid "Ignore blan&k lines"
+msgstr "&k چشم پوشي از خطوط خالي "
+
+#, c-format
 msgid "Ignore &case"
 msgstr "&c چشم پوشي از اندازه حروف "
 
@@ -1132,6 +1136,9 @@ msgstr "&r چشم پوشي از تفاوت علامت بازگشت به سر س
 msgid "Ignore codepage &differences"
 msgstr ""
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 #, c-format
 msgid "&Include Subfolders"
 msgstr "&I شامل زيرپوشه ها "
@@ -1713,13 +1720,6 @@ msgid "I&gnore all"
 msgstr "&g چشم پوشي از همگي "
 
 #, c-format
-msgid "Ignore blan&k lines"
-msgstr "&k چشم پوشي از خطوط خالي "
-
-msgid "Ignore c&omment differences"
-msgstr ""
-
-#, c-format
 msgid "E&nable moved block detection"
 msgstr "&n فعال کردن تشخيص قطعه جابجا شده "
 

diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po
index c0dc54a..3018027 100644 (file)
--- a/Translations/WinMerge/Polish.po
+++ b/Translations/WinMerge/Polish.po
@@ -894,6 +894,9 @@ msgstr "I&gnoruj zmiany"
 msgid "Ig&nore all"
 msgstr "Ig&noruj wszystkie"
 
+msgid "Ignore blan&k lines"
+msgstr "Ignoruj puste wiersze"
+
 msgid "Ignore &case"
 msgstr "Ignoruj wielkości liter"
 
@@ -903,6 +906,9 @@ msgstr "Igno&ruj znaki końca linii (Windows/Unix/Mac)"
 msgid "Ignore codepage &differences"
 msgstr "Ignoruj różnice strony ko&dowej"
 
+msgid "Ignore c&omment differences"
+msgstr "Ignoruj różnice w komentarzach"
+
 msgid "&Include Subfolders"
 msgstr "Uwzględn&ij podfoldery"
 
@@ -1353,12 +1359,6 @@ msgstr "Ignoruj zmiany"
 msgid "I&gnore all"
 msgstr "Ignoruj wszystkie"
 
-msgid "Ignore blan&k lines"
-msgstr "Ignoruj puste wiersze"
-
-msgid "Ignore c&omment differences"
-msgstr "Ignoruj różnice w komentarzach"
-
 msgid "E&nable moved block detection"
 msgstr "Włącz wykrywanie przeniesionych bloków"
 

diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po
index 411e2f7..f39cded 100644 (file)
--- a/Translations/WinMerge/Portuguese.po
+++ b/Translations/WinMerge/Portuguese.po
@@ -897,6 +897,9 @@ msgstr "Ignorar alterações"
 msgid "Ig&nore all"
 msgstr "Ignorar todas"
 
+msgid "Ignore blan&k lines"
+msgstr "Ignorar linhas em branco"
+
 msgid "Ignore &case"
 msgstr "Ignorar maiúsculas/minúsculas"
 
@@ -906,6 +909,9 @@ msgstr "Igno&rar diferentes tipos de ficheiros (Windows/Unix/Mac)"
 msgid "Ignore codepage &differences"
 msgstr "Ignorar &diferenças nas páginas de código"
 
+msgid "Ignore c&omment differences"
+msgstr "Ignorar diferenças de c&omentários"
+
 msgid "&Include Subfolders"
 msgstr "Incluir Sub-ficheiros"
 
@@ -1366,12 +1372,6 @@ msgstr "&Ignorar alteração"
 msgid "I&gnore all"
 msgstr "I&gnorar tudo"
 
-msgid "Ignore blan&k lines"
-msgstr "Ignorar linhas em branco"
-
-msgid "Ignore c&omment differences"
-msgstr "Ignorar diferenças de c&omentários"
-
 msgid "E&nable moved block detection"
 msgstr "Ativar deteção de bloco movido"
 

diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po
index 0a0c024..e2af001 100644 (file)
--- a/Translations/WinMerge/Romanian.po
+++ b/Translations/WinMerge/Romanian.po
@@ -1120,6 +1120,10 @@ msgid "Ig&nore all"
 msgstr "Ig&noră tot"
 
 #, c-format
+msgid "Ignore blan&k lines"
+msgstr "Ignoră li&nii goale"
+
+#, c-format
 msgid "Ignore &case"
 msgstr "Ignoră minus&cule/majuscule"
 
@@ -1131,6 +1135,9 @@ msgstr "Igno&ră diferenţele sfârşitului de linie (Windows/Unix/Mac)"
 msgid "Ignore codepage &differences"
 msgstr ""
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 #, c-format
 msgid "&Include Subfolders"
 msgstr "&Include subdirectoare"
@@ -1708,13 +1715,6 @@ msgid "I&gnore all"
 msgstr "I&gnoră tot"
 
 #, c-format
-msgid "Ignore blan&k lines"
-msgstr "Ignoră li&nii goale"
-
-msgid "Ignore c&omment differences"
-msgstr ""
-
-#, c-format
 msgid "E&nable moved block detection"
 msgstr "Activea&ză detecţie blocuri mutate"
 

diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po
index 82ae972..dc6d669 100644 (file)
--- a/Translations/WinMerge/Russian.po
+++ b/Translations/WinMerge/Russian.po
@@ -896,6 +896,9 @@ msgstr "Игнорировать изменения"
 msgid "Ig&nore all"
 msgstr "Игнорировать все"
 
+msgid "Ignore blan&k lines"
+msgstr "Игнорировать пуст&ые строки"
+
 msgid "Ignore &case"
 msgstr "Игнорировать р&егистр"
 
@@ -905,6 +908,9 @@ msgstr "Игнорировать концы строк (Win/Unix/Mac)"
 msgid "Ignore codepage &differences"
 msgstr "Игнорировать отличия кодовых страниц"
 
+msgid "Ignore c&omment differences"
+msgstr "Игнорировать отличия в комментариях"
+
 msgid "&Include Subfolders"
 msgstr "&Включая подпапки"
 
@@ -1355,12 +1361,6 @@ msgstr "Игнорировать измененные невидимые"
 msgid "I&gnore all"
 msgstr "Игнорировать &все невидимые"
 
-msgid "Ignore blan&k lines"
-msgstr "Игнорировать пуст&ые строки"
-
-msgid "Ignore c&omment differences"
-msgstr "Игнорировать отличия в комментариях"
-
 msgid "E&nable moved block detection"
 msgstr "Обнаружение переме&щенных блоков"
 

diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po
index cc4bc93..954e57d 100644 (file)
--- a/Translations/WinMerge/Serbian.po
+++ b/Translations/WinMerge/Serbian.po
@@ -1117,6 +1117,10 @@ msgid "Ig&nore all"
 msgstr "За&немари све"
 
 #, c-format
+msgid "Ignore blan&k lines"
+msgstr "Занемари пра&зне редове"
+
+#, c-format
 msgid "Ignore &case"
 msgstr "Занемари под&ударност"
 
@@ -1128,6 +1132,9 @@ msgstr "Занемари &разлике ознака завршетка ред
 msgid "Ignore codepage &differences"
 msgstr ""
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 #, c-format
 msgid "&Include Subfolders"
 msgstr "Укључи и потфасцикле"
@@ -1691,13 +1698,6 @@ msgid "I&gnore all"
 msgstr "Зане&мари све"
 
 #, c-format
-msgid "Ignore blan&k lines"
-msgstr "Занемари пра&зне редове"
-
-msgid "Ignore c&omment differences"
-msgstr ""
-
-#, c-format
 msgid "E&nable moved block detection"
 msgstr "Омогући откривање премештених група"
 

diff --git a/Translations/WinMerge/Sinhala.po b/Translations/WinMerge/Sinhala.po
index dce13b6..81cc5a1 100644 (file)
--- a/Translations/WinMerge/Sinhala.po
+++ b/Translations/WinMerge/Sinhala.po
@@ -1116,6 +1116,10 @@ msgstr "වෙනස්කම් නොසලකා හරින්න"
 msgid "Ig&nore all"
 msgstr "සියල්ල නොසලකා හරින්න"
 
+#, c-format
+msgid "Ignore blan&k lines"
+msgstr "හිස් පේළි නොසලකා හරින්න"
+
 #, fuzzy, c-format
 msgid "Ignore &case"
 msgstr "Ignore &case"
@@ -1128,6 +1132,9 @@ msgstr "Igno&re carriage return differences (Windows/Unix/Mac)"
 msgid "Ignore codepage &differences"
 msgstr ""
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 #, c-format
 msgid "&Include Subfolders"
 msgstr "&Inclure les sous-répertoires"
@@ -1704,13 +1711,6 @@ msgstr "වෙනස නොසලකා හරින්න "
 msgid "I&gnore all"
 msgstr "සියල්ල නොසලකා හරින්න"
 
-#, c-format
-msgid "Ignore blan&k lines"
-msgstr "හිස් පේළි නොසලකා හරින්න"
-
-msgid "Ignore c&omment differences"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "E&nable moved block detection"
 msgstr "E&nable moved block detection"

diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po
index 5135215..258179d 100644 (file)
--- a/Translations/WinMerge/Slovak.po
+++ b/Translations/WinMerge/Slovak.po
@@ -897,6 +897,9 @@ msgstr "I&gnorovať zmeny"
 msgid "Ig&nore all"
 msgstr "Ig&norovať všetko"
 
+msgid "Ignore blan&k lines"
+msgstr "Ignorovať prázdne riad&ky"
+
 msgid "Ignore &case"
 msgstr "Ignorovať m&alé/VEĽKÉ"
 
@@ -906,6 +909,9 @@ msgstr "Igno&rovať rozdiely v zakončení riadkov (Windows/Unix/Mac)"
 msgid "Ignore codepage &differences"
 msgstr "Ignorovať rozdiely kódových stránok"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 msgid "&Include Subfolders"
 msgstr "&Zahrnúť podpriečinky"
 
@@ -1360,12 +1366,6 @@ msgstr "&Ignorovať zmeny"
 msgid "I&gnore all"
 msgstr "I&gnorovať všetko"
 
-msgid "Ignore blan&k lines"
-msgstr "Ignorovať prázdne riad&ky"
-
-msgid "Ignore c&omment differences"
-msgstr ""
-
 msgid "E&nable moved block detection"
 msgstr "Povoliť &zisťovanie presunu bloku"
 

diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po
index f1fd126..a81d172 100644 (file)
--- a/Translations/WinMerge/Slovenian.po
+++ b/Translations/WinMerge/Slovenian.po
@@ -1120,6 +1120,10 @@ msgid "Ig&nore all"
 msgstr "Prezri &vse"
 
 #, c-format
+msgid "Ignore blan&k lines"
+msgstr "Prezri prazne &vrstice"
+
+#, c-format
 msgid "Ignore &case"
 msgstr "Prezri &velikost znakov"
 
@@ -1131,6 +1135,9 @@ msgstr "&Prezri različnost vrste znakov za konec vrstice (EOL)"
 msgid "Ignore codepage &differences"
 msgstr "P&rezri razlike kodnih strani"
 
+msgid "Ignore c&omment differences"
+msgstr "Prezri razlike v k&omentarjih"
+
 #, c-format
 msgid "&Include Subfolders"
 msgstr "&Vključi podmape"
@@ -1707,13 +1714,6 @@ msgid "I&gnore all"
 msgstr "P&rezri vse"
 
 #, c-format
-msgid "Ignore blan&k lines"
-msgstr "Prezri prazne &vrstice"
-
-msgid "Ignore c&omment differences"
-msgstr "Prezri razlike v k&omentarjih"
-
-#, c-format
 msgid "E&nable moved block detection"
 msgstr "Omogoči zazna&vanje premaknjenih blokov"
 

diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po
index cc80cf2..bcf2281 100644 (file)
--- a/Translations/WinMerge/Spanish.po
+++ b/Translations/WinMerge/Spanish.po
@@ -898,6 +898,9 @@ msgstr "I&gnorar cambios"
 msgid "Ig&nore all"
 msgstr "Ig&norar todos"
 
+msgid "Ignore blan&k lines"
+msgstr "Ignorar diferencias de líneas &vacías"
+
 msgid "Ignore &case"
 msgstr "Ignorar MAYÚSCULAS/minús&culas"
 
@@ -907,6 +910,9 @@ msgstr "Igno&rar saltos de línea diferentes (Windows/Unix/Mac)"
 msgid "Ignore codepage &differences"
 msgstr "Ignorar &diferencias en página de códigos"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 msgid "&Include Subfolders"
 msgstr "&Incluir subcarpetas"
 
@@ -1359,12 +1365,6 @@ msgstr "&Ignorar cambios"
 msgid "I&gnore all"
 msgstr "I&gnorar todos"
 
-msgid "Ignore blan&k lines"
-msgstr "Ignorar diferencias de líneas &vacías"
-
-msgid "Ignore c&omment differences"
-msgstr ""
-
 msgid "E&nable moved block detection"
 msgstr "Habilitar detecció&n de bloques movidos"
 

diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po
index 02d88d1..2c66d0e 100644 (file)
--- a/Translations/WinMerge/Swedish.po
+++ b/Translations/WinMerge/Swedish.po
@@ -1122,6 +1122,10 @@ msgid "Ig&nore all"
 msgstr "Åsidosätt allt"
 
 #, c-format
+msgid "Ignore blan&k lines"
+msgstr "Åsidosätt blanka rader"
+
+#, c-format
 msgid "Ignore &case"
 msgstr "Åsidosätt VERSAL/gemen skillnader"
 
@@ -1133,6 +1137,9 @@ msgstr "Åsidosätt RadslutsSkillnader (Windows/Unix/Mac)"
 msgid "Ignore codepage &differences"
 msgstr "Åsidosätt TextKodningsSkillnader"
 
+msgid "Ignore c&omment differences"
+msgstr "Frånse kommentarskillnader"
+
 #, c-format
 msgid "&Include Subfolders"
 msgstr "Inkludera UnderMappar"
@@ -1710,13 +1717,6 @@ msgid "I&gnore all"
 msgstr "Åsidosätt samtliga"
 
 #, c-format
-msgid "Ignore blan&k lines"
-msgstr "Åsidosätt blanka rader"
-
-msgid "Ignore c&omment differences"
-msgstr "Frånse kommentarskillnader"
-
-#, c-format
 msgid "E&nable moved block detection"
 msgstr "Möjliggör urskiljning av flyttade block"
 

diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po
index db0b20c..f90f5e0 100644 (file)
--- a/Translations/WinMerge/Turkish.po
+++ b/Translations/WinMerge/Turkish.po
@@ -895,6 +895,9 @@ msgstr "Değişiklikler &yok sayılsın"
 msgid "Ig&nore all"
 msgstr "Tümü y&ok sayılsın"
 
+msgid "Ignore blan&k lines"
+msgstr "Boş satırlar yo&k sayılsın"
+
 msgid "Ignore &case"
 msgstr "BÜYÜK-küçük &harf ayrımı yapılmasın"
 
@@ -904,6 +907,9 @@ msgstr "Satı&r sonu farklılıkları yok sayılsın (Windows/Unix/Mac)"
 msgid "Ignore codepage &differences"
 msgstr "Ko&d sayfası farklılıkları yok sayılsın"
 
+msgid "Ignore c&omment differences"
+msgstr "Yo&rum farklılıkları yok sayılsın"
+
 msgid "&Include Subfolders"
 msgstr "A&lt klasörler katılsın"
 
@@ -1362,12 +1368,6 @@ msgstr "&Değişiklik yok sayılsın"
 msgid "I&gnore all"
 msgstr "Tümü &yok sayılsın"
 
-msgid "Ignore blan&k lines"
-msgstr "Boş satırlar yo&k sayılsın"
-
-msgid "Ignore c&omment differences"
-msgstr "Yo&rum farklılıkları yok sayılsın"
-
 msgid "E&nable moved block detection"
 msgstr "Taşı&nmış blok algılaması kullanılsın"
 
@@ -3691,57 +3691,3 @@ msgstr "Yalnız bir kopya çalışsın"
 
 msgid "Allow only one instance to run and wait for the instance to terminate"
 msgstr "Yalnız bir kopyanın çalışsın ve kopyanın sonlandırılması beklensin"
-
-#~ msgid "&Goto..."
-#~ msgstr "&Git..."
-
-#~ msgid "&New\tCtrl+N"
-#~ msgstr "Ye&ni\tCtrl+N"
-
-#~ msgid "E&xit"
-#~ msgstr "Çı&kış"
-
-#~ msgid "Cl&ose"
-#~ msgstr "&Kapat"
-
-#~ msgid "File En&coding..."
-#~ msgstr "&Dosya Kodlaması..."
-
-#~ msgid "&Print..."
-#~ msgstr "&Yazdır..."
-
-#~ msgid "Moved Block for &Current Diff"
-#~ msgstr "İmleçteki Fark &Yerine Taşınmış Blok"
-
-#~ msgid "Case sensi&tive"
-#~ msgstr "BÜYÜK-küçük &harf ayrımı yapılsın"
-
-#~ msgid "Go To"
-#~ msgstr "Git"
-
-#~ msgid "G&oto:"
-#~ msgstr "&Git:"
-
-#~ msgid "Comments"
-#~ msgstr "Açıklamalar"
-
-#~ msgid "Filter Comments"
-#~ msgstr "Açıklamalar süzülsün"
-
-#~ msgid "Filefilters"
-#~ msgstr "Dosya Süzgeçleri"
-
-#~ msgid ""
-#~ "Developers:\n"
-#~ "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, "
-#~ "Takashi Sawanaka, Gal Hammer, Alexander Skinner"
-#~ msgstr ""
-#~ "Geliştiriciler:\n"
-#~ "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, "
-#~ "Takashi Sawanaka, Gal Hammer, Alexander Skinner"
-
-#~ msgid "Lua"
-#~ msgstr "Lua"
-
-#~ msgid "VHDL"
-#~ msgstr "VHDL"

diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po
index 245d70a..05c6282 100644 (file)
--- a/Translations/WinMerge/Ukrainian.po
+++ b/Translations/WinMerge/Ukrainian.po
@@ -1121,6 +1121,10 @@ msgid "Ig&nore all"
 msgstr "Нехтувати всюди"
 
 #, c-format
+msgid "Ignore blan&k lines"
+msgstr "Нехтувати порожніми &лініями"
+
+#, c-format
 msgid "Ignore &case"
 msgstr "Нехтувати р&егістр"
 
@@ -1132,6 +1136,9 @@ msgstr "Нехтувати різницею в кінцях рядків (Win/Un
 msgid "Ignore codepage &differences"
 msgstr ""
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 #, c-format
 msgid "&Include Subfolders"
 msgstr "&Враховуючи підтеки"
@@ -1709,13 +1716,6 @@ msgid "I&gnore all"
 msgstr "Нехтувати &всіма пропусками"
 
 #, c-format
-msgid "Ignore blan&k lines"
-msgstr "Нехтувати порожніми &лініями"
-
-msgid "Ignore c&omment differences"
-msgstr ""
-
-#, c-format
 msgid "E&nable moved block detection"
 msgstr "Виявлення перемі&щених блоків"