Compare Statistics dialog: The number of diff folders was counted in the number of...

diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt
index 14e4656..60138e3 100644 (file)
--- a/Docs/Users/ChangeLog.txt
+++ b/Docs/Users/ChangeLog.txt
@@ -10,6 +10,8 @@ WinMerge 2.16.4
   Folder compare:
   - Bugfix: Generating HTML Folder Compare report including File Compare
      report did not complete (Bitbucket #15)
+  - Bugfix: Compare Statistics dialog: The number of diff folders was
+     counted in the number of diff files
   Plugins:
   - Bugfix: PrediffLineFilter.sct: Wrong encoding for settings
      dialog (Bitbucket #16)

diff --git a/Docs/Users/ReleaseNotes.html b/Docs/Users/ReleaseNotes.html
index d418c57..906767b 100644 (file)
--- a/Docs/Users/ReleaseNotes.html
+++ b/Docs/Users/ReleaseNotes.html
@@ -80,6 +80,7 @@ Please submit bug reports to our <a href="http://bitbucket.org/winmerge/winmerge
 <h4>Folder compare</h4>
 <ul>
   <li>Bugfix: Generating HTML Folder Compare report including File Compare report did not complete (Bitbucket #15)</li>
+  <li>Bugfix: Compare Statistics dialog: The number of diff folders was counted in the number of diff files</li>
 </ul>
 
 <h4>Plugins</h4>

diff --git a/Src/CompareStatisticsDlg.cpp b/Src/CompareStatisticsDlg.cpp
index eb04529..05fbc76 100644 (file)
--- a/Src/CompareStatisticsDlg.cpp
+++ b/Src/CompareStatisticsDlg.cpp
@@ -75,6 +75,7 @@ BOOL CompareStatisticsDlg::OnInitDialog()
                { IDC_STAT_IDENTICFOLDER,  CompareStats::RESULT_DIRSAME,     true },
                { IDC_STAT_IDENTICFILE,    CompareStats::RESULT_SAME,        false },
                { IDC_STAT_IDENTICBINARY,  CompareStats::RESULT_BINSAME,     false },
+               { IDC_STAT_DIFFFOLDER,     CompareStats::RESULT_DIRDIFF,     true },
                { IDC_STAT_DIFFFILE,       CompareStats::RESULT_DIFF,        false },
                { IDC_STAT_DIFFBINARY,     CompareStats::RESULT_BINDIFF,     false },
                { IDC_STAT_LUNIQFOLDER,    CompareStats::RESULT_LDIRUNIQUE,  true },
@@ -113,6 +114,7 @@ BOOL CompareStatisticsDlg::OnInitDialog()
                { IDC_STAT_ILMISSINGFOLDER, IDI_MRFOLDER },
                { IDC_STAT_IMMISSINGFOLDER, IDI_LRFOLDER },
                { IDC_STAT_IRMISSINGFOLDER, IDI_LMFOLDER },
+               { IDC_STAT_INOTEQUALFOLDER, IDI_NOTEQUALFOLDER },
                { IDC_STAT_INOTEQUAL,       IDI_NOTEQUALFILE },
                { IDC_STAT_IDIFFBINFILE,    IDI_BINARYDIFF },
                { IDC_STAT_ILUNIQFILE,      IDI_LFILE },

diff --git a/Src/CompareStats.cpp b/Src/CompareStats.cpp
index 9c26ff9..14a5882 100644 (file)
--- a/Src/CompareStats.cpp
+++ b/Src/CompareStats.cpp
@@ -160,8 +160,15 @@ CompareStats::RESULT CompareStats::GetResultFromCode(unsigned diffcode) const
        }
        else
        {
-               // presumably it is different
-               return di.isBin() ? RESULT_BINDIFF : RESULT_DIFF;
+               if (di.isDirectory())
+               {
+                       return RESULT_DIRDIFF;
+               }
+               else
+               {
+                       // presumably it is different
+                       return di.isBin() ? RESULT_BINDIFF : RESULT_DIFF;
+               }
        }
 }
 

diff --git a/Src/CompareStats.h b/Src/CompareStats.h
index c6c0619..a0e8408 100644 (file)
--- a/Src/CompareStats.h
+++ b/Src/CompareStats.h
@@ -62,6 +62,7 @@ public:
                RESULT_SKIP,
                RESULT_DIRSKIP,
                RESULT_DIRSAME,
+               RESULT_DIRDIFF,
                RESULT_ERROR,
                RESULT_COUNT  //THIS MUST BE THE LAST ITEM
        };

diff --git a/Src/Merge.rc b/Src/Merge.rc
index da4b3a9..108cd37 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -1517,7 +1517,8 @@ BEGIN
     LTEXT           "Folders:",IDC_STATIC,72,7,38,10\r
     LTEXT           "Files:",IDC_STATIC,131,7,39,10\r
     GROUPBOX        "Different",IDC_STATIC,7,15,186,40\r
-    RTEXT           "Text:",IDC_STATIC,11,26,56,10\r
+    ICON            "",IDC_STAT_INOTEQUALFOLDER,72,24,16,16\r
+    RTEXT           "Static",IDC_STAT_DIFFFOLDER,86,25,38,10,SS_SUNKEN\r
     ICON            "",IDC_STAT_INOTEQUAL,131,24,16,16\r
     RTEXT           "Static",IDC_STAT_DIFFFILE,146,25,38,10,SS_SUNKEN\r
     RTEXT           "Binary:",IDC_STATIC,10,40,56,10\r
@@ -1557,7 +1558,8 @@ BEGIN
     LTEXT           "Folders:",IDC_STATIC,72,7,38,10\r
     LTEXT           "Files:",IDC_STATIC,131,7,39,10\r
     GROUPBOX        "Different",IDC_STATIC,7,15,186,40\r
-    RTEXT           "Text:",IDC_STATIC,11,26,56,10\r
+    ICON            "",IDC_STAT_INOTEQUALFOLDER,72,24,16,16\r
+    RTEXT           "Static",IDC_STAT_DIFFFOLDER,86,25,38,10,SS_SUNKEN\r
     ICON            "",IDC_STAT_INOTEQUAL,131,24,16,16\r
     RTEXT           "Static",IDC_STAT_DIFFFILE,146,25,38,10,SS_SUNKEN\r
     RTEXT           "Binary:",IDC_STATIC,10,40,56,10\r

diff --git a/Src/resource.h b/Src/resource.h
index 58bdfc5..64b2208 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -349,77 +349,79 @@
 #define IDC_STAT_IDENTICFOLDER          1213\r
 #define IDC_STAT_IDENTICFILE            1214\r
 #define IDC_STAT_IDENTICBINARY          1215\r
-#define IDC_STAT_DIFFFILE               1216\r
-#define IDC_STAT_DIFFBINARY             1217\r
-#define IDC_STAT_LUNIQFOLDER            1218\r
-#define IDC_STAT_LUNIQFILE              1219\r
-#define IDC_STAT_RUNIQFOLDER            1220\r
-#define IDC_STAT_RUNIQFILE              1221\r
-#define IDC_STAT_MUNIQFOLDER            1222\r
-#define IDC_STAT_MUNIQFILE              1223\r
-#define IDC_STAT_LMISSINGFOLDER         1224\r
-#define IDC_STAT_LMISSINGFILE           1225\r
-#define IDC_STAT_RMISSINGFOLDER         1226\r
-#define IDC_STAT_RMISSINGFILE           1227\r
-#define IDC_STAT_MMISSINGFOLDER         1228\r
-#define IDC_STAT_MMISSINGFILE           1229\r
-#define IDC_STAT_TOTALFOLDER            1230\r
-#define IDC_STAT_TOTALFILE              1231\r
-#define IDC_TREEOPT_IMPORT              1232\r
-#define IDC_TREEOPT_EXPORT              1233\r
-#define IDC_STAT_ILUNIQFOLDER           1234\r
-#define IDC_STAT_IRUNIQFOLDER           1235\r
-#define IDC_STAT_IMUNIQFOLDER           1236\r
-#define IDC_STAT_ILMISSINGFOLDER        1237\r
-#define IDC_STAT_IRMISSINGFOLDER        1238\r
-#define IDC_STAT_IMMISSINGFOLDER        1239\r
-#define IDC_STAT_IIDENTICFOLDER         1240\r
-#define IDC_STAT_INOTEQUAL              1241\r
-#define IDC_STAT_IDIFFBINFILE           1242\r
-#define IDC_STAT_ILUNIQFILE             1243\r
-#define IDC_STAT_IRUNIQFILE             1244\r
-#define IDC_STAT_IMUNIQFILE             1245\r
-#define IDC_STAT_ILMISSINGFILE          1246\r
-#define IDC_STAT_IRMISSINGFILE          1247\r
-#define IDC_STAT_IMMISSINGFILE          1248\r
-#define IDC_STAT_IEQUALFILE             1249\r
-#define IDC_STAT_IEQUALBINFILE          1250\r
-#define IDC_EDITOR_CHARLEVEL            1251\r
-#define IDC_EDITOR_WORDLEVEL            1252\r
-#define IDC_AFFECTS_GROUP               1253\r
-#define IDC_AFFECTS_LEFT_BTN            1254\r
-#define IDC_AFFECTS_MIDDLE_BTN          1255\r
-#define IDC_AFFECTS_RIGHT_BTN           1256\r
-#define IDC_LOAD_FILES_LABEL            1257\r
-#define IDC_LOAD_CODEPAGE_TEXTBOX       1258\r
-#define IDC_LOAD_SAVE_SAME_CODEPAGE     1259\r
-#define IDC_SAVE_FILES_LABEL            1260\r
-#define IDC_SAVE_CODEPAGE_TEXTBOX       1261\r
-#define IDC_LOADING_GROUP               1262\r
-#define IDC_LEFT_FILES_LABEL            1264\r
-#define IDC_MIDDLE_FILES_LABEL          1265\r
-#define IDC_RIGHT_FILES_LABEL           1266\r
-#define IDC_FILTERFILE_TEST_BTN         1267\r
-#define IDC_HEADER                      1268\r
-#define IDC_PROMPT_LABEL                1269\r
-#define IDC_TEST_BTN                    1270\r
-#define IDC_TEST_TEXT                   1271\r
-#define IDC_RESULTS                     1272\r
-#define IDC_IS_DIRECTORY                1273\r
-#define IDC_HEADER_FILTER_NAME          1274\r
-#define IDC_DEFAULT_STANDARD_COLORS     1275\r
-#define IDC_CUSTOM_COLORS_GROUP         1276\r
-#define IDC_WHITESPACE_COLOR_LABEL      1277\r
-#define IDC_TEXT_COLOR_LABEL            1278\r
-#define IDC_SELECTION_COLOR_LABEL       1279\r
-#define IDC_TEXT_COLUMN_LABEL           1280\r
-#define IDC_BACKGROUND_COLUMN_LABEL     1281\r
-#define IDC_WHITESPACE_BKGD_COLOR       1282\r
-#define IDC_REGULAR_BKGD_COLOR          1283\r
-#define IDC_SELECTION_BKGD_COLOR        1284\r
-#define IDC_SELECTION_TEXT_COLOR        1285\r
-#define IDC_REGULAR_TEXT_COLOR          1286\r
-#define IDC_AUTO_COMPLETE_SOURCE        1287\r
+#define IDC_STAT_DIFFFOLDER             1216\r
+#define IDC_STAT_DIFFFILE               1217\r
+#define IDC_STAT_DIFFBINARY             1218\r
+#define IDC_STAT_LUNIQFOLDER            1219\r
+#define IDC_STAT_LUNIQFILE              1220\r
+#define IDC_STAT_RUNIQFOLDER            1221\r
+#define IDC_STAT_RUNIQFILE              1222\r
+#define IDC_STAT_MUNIQFOLDER            1223\r
+#define IDC_STAT_MUNIQFILE              1224\r
+#define IDC_STAT_LMISSINGFOLDER         1225\r
+#define IDC_STAT_LMISSINGFILE           1226\r
+#define IDC_STAT_RMISSINGFOLDER         1227\r
+#define IDC_STAT_RMISSINGFILE           1228\r
+#define IDC_STAT_MMISSINGFOLDER         1229\r
+#define IDC_STAT_MMISSINGFILE           1230\r
+#define IDC_STAT_TOTALFOLDER            1231\r
+#define IDC_STAT_TOTALFILE              1232\r
+#define IDC_TREEOPT_IMPORT              1233\r
+#define IDC_TREEOPT_EXPORT              1234\r
+#define IDC_STAT_ILUNIQFOLDER           1235\r
+#define IDC_STAT_IRUNIQFOLDER           1236\r
+#define IDC_STAT_IMUNIQFOLDER           1237\r
+#define IDC_STAT_ILMISSINGFOLDER        1238\r
+#define IDC_STAT_IRMISSINGFOLDER        1239\r
+#define IDC_STAT_IMMISSINGFOLDER        1240\r
+#define IDC_STAT_IIDENTICFOLDER         1241\r
+#define IDC_STAT_INOTEQUAL              1242\r
+#define IDC_STAT_INOTEQUALFOLDER        1243\r
+#define IDC_STAT_IDIFFBINFILE           1244\r
+#define IDC_STAT_ILUNIQFILE             1245\r
+#define IDC_STAT_IRUNIQFILE             1246\r
+#define IDC_STAT_IMUNIQFILE             1247\r
+#define IDC_STAT_ILMISSINGFILE          1248\r
+#define IDC_STAT_IRMISSINGFILE          1249\r
+#define IDC_STAT_IMMISSINGFILE          1250\r
+#define IDC_STAT_IEQUALFILE             1251\r
+#define IDC_STAT_IEQUALBINFILE          1252\r
+#define IDC_EDITOR_CHARLEVEL            1253\r
+#define IDC_EDITOR_WORDLEVEL            1254\r
+#define IDC_AFFECTS_GROUP               1255\r
+#define IDC_AFFECTS_LEFT_BTN            1256\r
+#define IDC_AFFECTS_MIDDLE_BTN          1257\r
+#define IDC_AFFECTS_RIGHT_BTN           1258\r
+#define IDC_LOAD_FILES_LABEL            1259\r
+#define IDC_LOAD_CODEPAGE_TEXTBOX       1260\r
+#define IDC_LOAD_SAVE_SAME_CODEPAGE     1261\r
+#define IDC_SAVE_FILES_LABEL            1262\r
+#define IDC_SAVE_CODEPAGE_TEXTBOX       1264\r
+#define IDC_LOADING_GROUP               1265\r
+#define IDC_LEFT_FILES_LABEL            1266\r
+#define IDC_MIDDLE_FILES_LABEL          1267\r
+#define IDC_RIGHT_FILES_LABEL           1268\r
+#define IDC_FILTERFILE_TEST_BTN         1269\r
+#define IDC_HEADER                      1270\r
+#define IDC_PROMPT_LABEL                1271\r
+#define IDC_TEST_BTN                    1272\r
+#define IDC_TEST_TEXT                   1273\r
+#define IDC_RESULTS                     1274\r
+#define IDC_IS_DIRECTORY                1275\r
+#define IDC_HEADER_FILTER_NAME          1276\r
+#define IDC_DEFAULT_STANDARD_COLORS     1277\r
+#define IDC_CUSTOM_COLORS_GROUP         1278\r
+#define IDC_WHITESPACE_COLOR_LABEL      1279\r
+#define IDC_TEXT_COLOR_LABEL            1280\r
+#define IDC_SELECTION_COLOR_LABEL       1281\r
+#define IDC_TEXT_COLUMN_LABEL           1282\r
+#define IDC_BACKGROUND_COLUMN_LABEL     1283\r
+#define IDC_WHITESPACE_BKGD_COLOR       1284\r
+#define IDC_REGULAR_BKGD_COLOR          1285\r
+#define IDC_SELECTION_BKGD_COLOR        1286\r
+#define IDC_SELECTION_TEXT_COLOR        1287\r
+#define IDC_REGULAR_TEXT_COLOR          1288\r
+#define IDC_AUTO_COMPLETE_SOURCE        1289\r
 #define IDC_FILTER_USER_BROWSE          1297\r
 #define IDC_FILTER_USER_PATH            1298\r
 #define IDC_FILTERCOMMENTS_CHECK        1299\r

diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po
index cf174b4..f40c149 100644 (file)
--- a/Translations/WinMerge/Basque.po
+++ b/Translations/WinMerge/Basque.po
@@ -1992,10 +1992,6 @@ msgid "Different"
 msgstr "Ezberdin"
 
 #, c-format
-msgid "Text:"
-msgstr "Idazkia:"
-
-#, c-format
 msgid "Binary:"
 msgstr "Binarioa:"
 

diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po
index 5a3428d..5b399de 100644 (file)
--- a/Translations/WinMerge/Brazilian.po
+++ b/Translations/WinMerge/Brazilian.po
@@ -1996,10 +1996,6 @@ msgid "Different"
 msgstr "Diferente"
 
 #, c-format
-msgid "Text:"
-msgstr "Texto:"
-
-#, c-format
 msgid "Binary:"
 msgstr "Binário:"
 

diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po
index 0b00efd..f834984 100644 (file)
--- a/Translations/WinMerge/Bulgarian.po
+++ b/Translations/WinMerge/Bulgarian.po
@@ -1985,10 +1985,6 @@ msgid "Different"
 msgstr "Различни"
 
 #, c-format
-msgid "Text:"
-msgstr "Текст:"
-
-#, c-format
 msgid "Binary:"
 msgstr "Двоични:"
 

diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po
index 9a4bc01..74c3712 100644 (file)
--- a/Translations/WinMerge/Catalan.po
+++ b/Translations/WinMerge/Catalan.po
@@ -1984,10 +1984,6 @@ msgid "Different"
 msgstr "Diferents"
 
 #, c-format
-msgid "Text:"
-msgstr ""
-
-#, c-format
 msgid "Binary:"
 msgstr "Binaris:"
 

diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po
index 75f83f9..5519253 100644 (file)
--- a/Translations/WinMerge/ChineseSimplified.po
+++ b/Translations/WinMerge/ChineseSimplified.po
@@ -1987,10 +1987,6 @@ msgid "Different"
 msgstr "不同"
 
 #, c-format
-msgid "Text:"
-msgstr "文本:"
-
-#, c-format
 msgid "Binary:"
 msgstr "二进制:"
 

diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po
index 686f920..a9a31f2 100644 (file)
--- a/Translations/WinMerge/ChineseTraditional.po
+++ b/Translations/WinMerge/ChineseTraditional.po
@@ -2000,10 +2000,6 @@ msgid "Different"
 msgstr "不同"
 
 #, c-format
-msgid "Text:"
-msgstr "文字："
-
-#, c-format
 msgid "Binary:"
 msgstr "二進制："
 

diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po
index a253af2..bc56c90 100644 (file)
--- a/Translations/WinMerge/Croatian.po
+++ b/Translations/WinMerge/Croatian.po
@@ -1989,10 +1989,6 @@ msgid "Different"
 msgstr "Razlika"
 
 #, c-format
-msgid "Text:"
-msgstr "Tekst"
-
-#, c-format
 msgid "Binary:"
 msgstr "Binarno:"
 

diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po
index 12fe6d7..99dfe0f 100644 (file)
--- a/Translations/WinMerge/Czech.po
+++ b/Translations/WinMerge/Czech.po
@@ -1987,10 +1987,6 @@ msgid "Different"
 msgstr "Rozdílné"
 
 #, c-format
-msgid "Text:"
-msgstr "Textové:"
-
-#, c-format
 msgid "Binary:"
 msgstr "Binární:"
 

diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po
index 2ae929e..0e1238e 100644 (file)
--- a/Translations/WinMerge/Danish.po
+++ b/Translations/WinMerge/Danish.po
@@ -1996,10 +1996,6 @@ msgid "Different"
 msgstr "Forskellige"
 
 #, c-format
-msgid "Text:"
-msgstr "Tekst:"
-
-#, c-format
 msgid "Binary:"
 msgstr "Binær:"
 

diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po
index 5c1932d..ecc8bce 100644 (file)
--- a/Translations/WinMerge/Dutch.po
+++ b/Translations/WinMerge/Dutch.po
@@ -1539,9 +1539,6 @@ msgstr "Bestanden:"
 msgid "Different"
 msgstr "Verschillend"
 
-msgid "Text:"
-msgstr "Tekst:"
-
 msgid "Binary:"
 msgstr "Binair:"
 

diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot
index 01b95b2..3e4c5eb 100644 (file)
--- a/Translations/WinMerge/English.pot
+++ b/Translations/WinMerge/English.pot
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2019-07-22 22:06+0000\n"
+"POT-Creation-Date: 2019-07-28 15:48+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
@@ -1517,9 +1517,6 @@ msgstr ""
 msgid "Different"
 msgstr ""
 
-msgid "Text:"
-msgstr ""
-
 msgid "Binary:"
 msgstr ""
 

diff --git a/Translations/WinMerge/Finnish.po b/Translations/WinMerge/Finnish.po
index baedf10..14d9a84 100644 (file)
--- a/Translations/WinMerge/Finnish.po
+++ b/Translations/WinMerge/Finnish.po
@@ -1982,10 +1982,6 @@ msgid "Different"
 msgstr "Poikkeava"
 
 #, c-format
-msgid "Text:"
-msgstr "Teksti"
-
-#, c-format
 msgid "Binary:"
 msgstr "Binääri:"
 

diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po
index 8437bee..1cf2c3e 100644 (file)
--- a/Translations/WinMerge/French.po
+++ b/Translations/WinMerge/French.po
@@ -2006,10 +2006,6 @@ msgid "Different"
 msgstr "Différent"
 
 #, c-format
-msgid "Text:"
-msgstr "Texte :"
-
-#, c-format
 msgid "Binary:"
 msgstr "Binaire :"
 

diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po
index ed25102..6070338 100644 (file)
--- a/Translations/WinMerge/Galician.po
+++ b/Translations/WinMerge/Galician.po
@@ -1990,10 +1990,6 @@ msgid "Different"
 msgstr "Diferente"
 
 #, c-format
-msgid "Text:"
-msgstr "Texto:"
-
-#, c-format
 msgid "Binary:"
 msgstr "Binario:"
 

diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po
index 75139b1..8024f83 100644 (file)
--- a/Translations/WinMerge/German.po
+++ b/Translations/WinMerge/German.po
@@ -1995,10 +1995,6 @@ msgid "Different"
 msgstr "Unterschiedlich"
 
 #, c-format
-msgid "Text:"
-msgstr "Text:"
-
-#, c-format
 msgid "Binary:"
 msgstr "Binär:"
 

diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po
index c78bef0..348a8aa 100644 (file)
--- a/Translations/WinMerge/Greek.po
+++ b/Translations/WinMerge/Greek.po
@@ -1984,10 +1984,6 @@ msgid "Different"
 msgstr "Διαφορετικά"
 
 #, c-format
-msgid "Text:"
-msgstr "Κείμενο:"
-
-#, c-format
 msgid "Binary:"
 msgstr "Δυαδικά:"
 

diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po
index 2ee117b..1828572 100644 (file)
--- a/Translations/WinMerge/Hungarian.po
+++ b/Translations/WinMerge/Hungarian.po
@@ -1985,10 +1985,6 @@ msgid "Different"
 msgstr "Különböző"
 
 #, c-format
-msgid "Text:"
-msgstr "Szöveg:"
-
-#, c-format
 msgid "Binary:"
 msgstr "Bináris:"
 

diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po
index b864227..6cf6d15 100644 (file)
--- a/Translations/WinMerge/Italian.po
+++ b/Translations/WinMerge/Italian.po
@@ -1537,9 +1537,6 @@ msgstr "File:"
 msgid "Different"
 msgstr "Diversi"
 
-msgid "Text:"
-msgstr "Testo:"
-
 msgid "Binary:"
 msgstr "Binari:"
 

diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po
index 7f94bbd..f76bb93 100644 (file)
--- a/Translations/WinMerge/Japanese.po
+++ b/Translations/WinMerge/Japanese.po
@@ -1541,9 +1541,6 @@ msgstr "ファイル:"
 msgid "Different"
 msgstr "差異あり"
 
-msgid "Text:"
-msgstr "テキスト:"
-
 msgid "Binary:"
 msgstr "バイナリ:"
 

diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po
index e9477b8..776d200 100644 (file)
--- a/Translations/WinMerge/Korean.po
+++ b/Translations/WinMerge/Korean.po
@@ -1997,10 +1997,6 @@ msgid "Different"
 msgstr "다름"
 
 #, c-format
-msgid "Text:"
-msgstr "텍스트:"
-
-#, c-format
 msgid "Binary:"
 msgstr "바이너리:"
 

diff --git a/Translations/WinMerge/Lithuanian.po b/Translations/WinMerge/Lithuanian.po
index ff77401..3b8edf9 100644 (file)
--- a/Translations/WinMerge/Lithuanian.po
+++ b/Translations/WinMerge/Lithuanian.po
@@ -1534,9 +1534,6 @@ msgstr "Failai:"
 msgid "Different"
 msgstr "Yra skirtingi"
 
-msgid "Text:"
-msgstr "Tekstiniai:"
-
 msgid "Binary:"
 msgstr "Binariniai:"
 

diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po
index 75b636a..bd0107f 100644 (file)
--- a/Translations/WinMerge/Norwegian.po
+++ b/Translations/WinMerge/Norwegian.po
@@ -1989,10 +1989,6 @@ msgid "Different"
 msgstr "Forskjellig"
 
 #, c-format
-msgid "Text:"
-msgstr "Tekst:"
-
-#, c-format
 msgid "Binary:"
 msgstr "Binær:"
 

diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po
index 127e121..b0c5419 100644 (file)
--- a/Translations/WinMerge/Persian.po
+++ b/Translations/WinMerge/Persian.po
@@ -1998,10 +1998,6 @@ msgid "Different"
 msgstr " متمايز"
 
 #, c-format
-msgid "Text:"
-msgstr " متن : "
-
-#, c-format
 msgid "Binary:"
 msgstr " دودويي "
 

diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po
index 825d208..e1ba727 100644 (file)
--- a/Translations/WinMerge/Polish.po
+++ b/Translations/WinMerge/Polish.po
@@ -1990,10 +1990,6 @@ msgid "Different"
 msgstr "różnych"
 
 #, c-format
-msgid "Text:"
-msgstr "Tekst:"
-
-#, c-format
 msgid "Binary:"
 msgstr "Binarne:"
 

diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po
index ebe1f6b..3bd81d0 100644 (file)
--- a/Translations/WinMerge/Portuguese.po
+++ b/Translations/WinMerge/Portuguese.po
@@ -1985,10 +1985,6 @@ msgid "Different"
 msgstr "Diferente"
 
 #, c-format
-msgid "Text:"
-msgstr "Texto:"
-
-#, c-format
 msgid "Binary:"
 msgstr "Binário:"
 

diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po
index 1ccd951..3d49948 100644 (file)
--- a/Translations/WinMerge/Romanian.po
+++ b/Translations/WinMerge/Romanian.po
@@ -1985,10 +1985,6 @@ msgid "Different"
 msgstr "Diferite"
 
 #, c-format
-msgid "Text:"
-msgstr "Text:"
-
-#, c-format
 msgid "Binary:"
 msgstr "Binare:"
 

diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po
index c0ea327..cdbf5e8 100644 (file)
--- a/Translations/WinMerge/Russian.po
+++ b/Translations/WinMerge/Russian.po
@@ -1991,10 +1991,6 @@ msgid "Different"
 msgstr "Отличаются"
 
 #, c-format
-msgid "Text:"
-msgstr "Текст:"
-
-#, c-format
 msgid "Binary:"
 msgstr "Двоичный:"
 

diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po
index f0402c8..e9b7d75 100644 (file)
--- a/Translations/WinMerge/Serbian.po
+++ b/Translations/WinMerge/Serbian.po
@@ -1972,10 +1972,6 @@ msgid "Different"
 msgstr "Разлика"
 
 #, c-format
-msgid "Text:"
-msgstr "Текст"
-
-#, c-format
 msgid "Binary:"
 msgstr "Бинарни"
 

diff --git a/Translations/WinMerge/Sinhala.po b/Translations/WinMerge/Sinhala.po
index 9290d79..b0efaf5 100644 (file)
--- a/Translations/WinMerge/Sinhala.po
+++ b/Translations/WinMerge/Sinhala.po
@@ -1984,10 +1984,6 @@ msgid "Different"
 msgstr "වෙනස්"
 
 #, c-format
-msgid "Text:"
-msgstr "වගන්තිය:"
-
-#, c-format
 msgid "Binary:"
 msgstr "ද්වීමය:"
 

diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po
index 746ee18..b719603 100644 (file)
--- a/Translations/WinMerge/Slovak.po
+++ b/Translations/WinMerge/Slovak.po
@@ -1989,10 +1989,6 @@ msgid "Different"
 msgstr "Odlišné"
 
 #, c-format
-msgid "Text:"
-msgstr "Text:"
-
-#, c-format
 msgid "Binary:"
 msgstr "Binárne:"
 

diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po
index 56654cd..b46286a 100644 (file)
--- a/Translations/WinMerge/Slovenian.po
+++ b/Translations/WinMerge/Slovenian.po
@@ -1992,10 +1992,6 @@ msgid "Different"
 msgstr "Razlika"
 
 #, c-format
-msgid "Text:"
-msgstr "Besedilo:"
-
-#, c-format
 msgid "Binary:"
 msgstr "Binarno:"
 

diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po
index b19100a..97438c9 100644 (file)
--- a/Translations/WinMerge/Spanish.po
+++ b/Translations/WinMerge/Spanish.po
@@ -1991,10 +1991,6 @@ msgid "Different"
 msgstr "Diferentes"
 
 #, c-format
-msgid "Text:"
-msgstr "Texto:"
-
-#, c-format
 msgid "Binary:"
 msgstr "Binario:"
 

diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po
index 2184f16..68dc66b 100644 (file)
--- a/Translations/WinMerge/Swedish.po
+++ b/Translations/WinMerge/Swedish.po
@@ -1997,10 +1997,6 @@ msgid "Different"
 msgstr "Olika"
 
 #, c-format
-msgid "Text:"
-msgstr "Text:"
-
-#, c-format
 msgid "Binary:"
 msgstr "Binär:"
 

diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po
index 56fd8f0..8f8b788 100644 (file)
--- a/Translations/WinMerge/Turkish.po
+++ b/Translations/WinMerge/Turkish.po
@@ -1992,10 +1992,6 @@ msgid "Different"
 msgstr "Farklılık"
 
 #, c-format
-msgid "Text:"
-msgstr "Metin:"
-
-#, c-format
 msgid "Binary:"
 msgstr "Binary:"
 

diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po
index dffc4df..a467046 100644 (file)
--- a/Translations/WinMerge/Ukrainian.po
+++ b/Translations/WinMerge/Ukrainian.po
@@ -1990,10 +1990,6 @@ msgid "Different"
 msgstr "Відрізняються"
 
 #, c-format
-msgid "Text:"
-msgstr "Текст:"
-
-#, c-format
 msgid "Binary:"
 msgstr "Бінарні:"