PATCH: [ 806785 ] Add menuitem to show/hide skipped files

diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc
index 7f59c5a..b43119c 100644 (file)
--- a/Src/Languages/Brazilian/MergeBrazilian.rc
+++ b/Src/Languages/Brazilian/MergeBrazilian.rc
@@ -139,6 +139,7 @@ BEGIN
         MENUITEM "Só arquivos da &Esquerda",    ID_OPTIONS_SHOWUNIQUELEFT
         MENUITEM "Só Arquivos da Di&reita",     ID_OPTIONS_SHOWUNIQUERIGHT
         MENUITEM "Exibir Arquivos &Binários",   ID_OPTIONS_SHOWBINARIES
+        MENUITEM "Show S&kipped Files",         ID_OPTIONS_SHOWSKIPPED
         MENUITEM "Es&conder Arquivos *.BAK",    ID_HIDE_BACKUP_FILES
         MENUITEM SEPARATOR
         MENUITEM "Escolher &Fonte...",          ID_VIEW_SELECTFONT
@@ -1001,6 +1002,7 @@ BEGIN
     ID_DIR_OPEN_LEFT        "Abrir arquivo a esquerda"
     ID_DIR_OPEN_LEFT_WITH   "Abrir arquivo a esquerda com..."
     ID_DIR_OPEN_RIGHT       "Abrir arquivo a direita"
+    ID_OPTIONS_SHOWSKIPPED  "Displays skipped files"
 END
 
 // IDS_SAVE_AS_TITLE SYNCHRO
@@ -1078,7 +1080,6 @@ BEGIN
     ID_EDITOR_COPY_FILENAME "Copy Filename"
     ID_VIEW_DETAIL_BAR      "Toggle Diff Pane"
     ID_FILE_LEFT_READONLY   "Change left file/dir read-only status"
-    ID_FILE_RIGHT_READONLY  "Change right file/dir read-only status"
 END
 
 // ID_EOL_TO_DOS SYNCHRO
@@ -1087,6 +1088,7 @@ BEGIN
     ID_EOL_TO_DOS           "Convert EOL to DOS mode"
     ID_EOL_TO_UNIX          "Convert EOL to UNIX mode"
     ID_EOL_TO_MAC           "Convert EOL to MAC mode"
+    ID_OPTIONS_SHOWSKIPPED  "Displays skipped files"
 END
 
 STRINGTABLE DISCARDABLE 

diff --git a/Src/Languages/Brazilian/resource.h b/Src/Languages/Brazilian/resource.h
index 7f57061..09d8998 100644 (file)
--- a/Src/Languages/Brazilian/resource.h
+++ b/Src/Languages/Brazilian/resource.h
@@ -415,6 +415,7 @@
 #define ID_EOL_TO_DOS                   32836
 #define ID_EOL_TO_UNIX                  32837
 #define ID_EOL_TO_MAC                   32838
+#define ID_OPTIONS_SHOWSKIPPED          32839
 
 // Next default values for new objects
 // 
@@ -422,7 +423,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        118
-#define _APS_NEXT_COMMAND_VALUE         32839
+#define _APS_NEXT_COMMAND_VALUE         32840
 #define _APS_NEXT_CONTROL_VALUE         1064
 #define _APS_NEXT_SYMED_VALUE           108
 #endif

diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
index 66d88d1..4ecc888 100644 (file)
--- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
+++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
@@ -134,6 +134,7 @@ BEGIN
         MENUITEM "ÏÔʾ×ó±ßµ¥Ò»µÄÎļþ(&F)",      ID_OPTIONS_SHOWUNIQUELEFT
         MENUITEM "ÏÔʾÓұߵ¥Ò»µÄÎļþ(&G)",      ID_OPTIONS_SHOWUNIQUERIGHT
         MENUITEM "ÏÔʾ¶þ½øÖÆÎļþ(&H)",          ID_OPTIONS_SHOWBINARIES
+        MENUITEM "Show S&kipped Files",         ID_OPTIONS_SHOWSKIPPED
         MENUITEM "Òþ²Ø *.BAK Îļþ(&B)",         ID_HIDE_BACKUP_FILES
         MENUITEM SEPARATOR
         MENUITEM "Ñ¡Ôñ×ÖÐÍ(&F)...",             ID_VIEW_SELECTFONT
@@ -861,6 +862,7 @@ BEGIN
     ID_DIR_OPEN_LEFT        "´ò¿ª×ó±ßÎļþ"
     ID_DIR_OPEN_LEFT_WITH   "´ò¿ª×ó±ßÎļþÒÔ ..."
     ID_DIR_OPEN_RIGHT       "´ò¿ªÓÒ±ßÎļþ"
+    ID_OPTIONS_SHOWSKIPPED  "Displays skipped files"
 END
 
 // IDS_SAVE_AS_TITLE SYNCHRO

diff --git a/Src/Languages/ChineseSimplified/resource.h b/Src/Languages/ChineseSimplified/resource.h
index 7f57061..09d8998 100644 (file)
--- a/Src/Languages/ChineseSimplified/resource.h
+++ b/Src/Languages/ChineseSimplified/resource.h
@@ -415,6 +415,7 @@
 #define ID_EOL_TO_DOS                   32836
 #define ID_EOL_TO_UNIX                  32837
 #define ID_EOL_TO_MAC                   32838
+#define ID_OPTIONS_SHOWSKIPPED          32839
 
 // Next default values for new objects
 // 
@@ -422,7 +423,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        118
-#define _APS_NEXT_COMMAND_VALUE         32839
+#define _APS_NEXT_COMMAND_VALUE         32840
 #define _APS_NEXT_CONTROL_VALUE         1064
 #define _APS_NEXT_SYMED_VALUE           108
 #endif

diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
index f1d069a..0080c40 100644 (file)
--- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
+++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
@@ -135,6 +135,7 @@ BEGIN
         MENUITEM "Åã¥Ü¥ªÃä³æ¤@ªºÀÉ®×(&F)",      ID_OPTIONS_SHOWUNIQUELEFT
         MENUITEM "Åã¥Ü¥kÃä³æ¤@ªºÀÉ®×(&G)",      ID_OPTIONS_SHOWUNIQUERIGHT
         MENUITEM "Åã¥Ü¤G¶i¨îÀÉ®×(&H)",          ID_OPTIONS_SHOWBINARIES
+        MENUITEM "Show S&kipped Files",         ID_OPTIONS_SHOWSKIPPED
         MENUITEM "ÁôÂÃ *.BAK ÀÉ®×(&B)",         ID_HIDE_BACKUP_FILES
         MENUITEM SEPARATOR
         MENUITEM "¿ï¨ú¦r«¬(&F)...",             ID_VIEW_SELECTFONT
@@ -968,6 +969,7 @@ BEGIN
     ID_DIR_OPEN_LEFT        "¶}±Ò¥ªÃäÀÉ®×"
     ID_DIR_OPEN_LEFT_WITH   "¶}±Ò¥ªÃäÀÉ®×¥H ..."
     ID_DIR_OPEN_RIGHT       "¶}±Ò¥kÃäÀÉ®×"
+    ID_OPTIONS_SHOWSKIPPED  "Displays skipped files"
 END
 
 // IDS_SAVE_AS_TITLE SYNCHRO

diff --git a/Src/Languages/ChineseTraditional/resource.h b/Src/Languages/ChineseTraditional/resource.h
index 7f57061..09d8998 100644 (file)
--- a/Src/Languages/ChineseTraditional/resource.h
+++ b/Src/Languages/ChineseTraditional/resource.h
@@ -415,6 +415,7 @@
 #define ID_EOL_TO_DOS                   32836
 #define ID_EOL_TO_UNIX                  32837
 #define ID_EOL_TO_MAC                   32838
+#define ID_OPTIONS_SHOWSKIPPED          32839
 
 // Next default values for new objects
 // 
@@ -422,7 +423,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        118
-#define _APS_NEXT_COMMAND_VALUE         32839
+#define _APS_NEXT_COMMAND_VALUE         32840
 #define _APS_NEXT_CONTROL_VALUE         1064
 #define _APS_NEXT_SYMED_VALUE           108
 #endif

diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc
index fec3298..24a7ad3 100644 (file)
--- a/Src/Languages/Czech/MergeCzech.rc
+++ b/Src/Languages/Czech/MergeCzech.rc
@@ -139,6 +139,7 @@ BEGIN
         MENUITEM "Show Le&ft Unique Files",     ID_OPTIONS_SHOWUNIQUELEFT
         MENUITEM "Show Ri&ght Unique Files",    ID_OPTIONS_SHOWUNIQUERIGHT
         MENUITEM "S&how Binary Files",          ID_OPTIONS_SHOWBINARIES
+        MENUITEM "Show S&kipped Files",         ID_OPTIONS_SHOWSKIPPED
         MENUITEM "Skrýt soubory s pøíponou *.&BAK", ID_HIDE_BACKUP_FILES
         MENUITEM SEPARATOR
         MENUITEM "&Zvolit písmo...",            ID_VIEW_SELECTFONT
@@ -991,6 +992,7 @@ BEGIN
     ID_DIR_OPEN_LEFT        "Open left file"
     ID_DIR_OPEN_LEFT_WITH   "Open left file with ..."
     ID_DIR_OPEN_RIGHT       "Open right file"
+    ID_OPTIONS_SHOWSKIPPED  "Displays skipped files"
 END
 
 // IDS_SAVE_AS_TITLE SYNCHRO

diff --git a/Src/Languages/Czech/resource.h b/Src/Languages/Czech/resource.h
index 7f57061..09d8998 100644 (file)
--- a/Src/Languages/Czech/resource.h
+++ b/Src/Languages/Czech/resource.h
@@ -415,6 +415,7 @@
 #define ID_EOL_TO_DOS                   32836
 #define ID_EOL_TO_UNIX                  32837
 #define ID_EOL_TO_MAC                   32838
+#define ID_OPTIONS_SHOWSKIPPED          32839
 
 // Next default values for new objects
 // 
@@ -422,7 +423,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        118
-#define _APS_NEXT_COMMAND_VALUE         32839
+#define _APS_NEXT_COMMAND_VALUE         32840
 #define _APS_NEXT_CONTROL_VALUE         1064
 #define _APS_NEXT_SYMED_VALUE           108
 #endif

diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc
index 3bf6316..68c8789 100644 (file)
--- a/Src/Languages/Danish/MergeDanish.rc
+++ b/Src/Languages/Danish/MergeDanish.rc
@@ -139,6 +139,7 @@ BEGIN
         MENUITEM "Vis &venstre unikke filer",   ID_OPTIONS_SHOWUNIQUELEFT
         MENUITEM "Vis &højre unikke filer",     ID_OPTIONS_SHOWUNIQUERIGHT
         MENUITEM "Vis &binære filer",           ID_OPTIONS_SHOWBINARIES
+        MENUITEM "Show S&kipped Files",         ID_OPTIONS_SHOWSKIPPED
         MENUITEM "Gem *.&BAK filer",            ID_HIDE_BACKUP_FILES
         MENUITEM SEPARATOR
         MENUITEM "Vælg &skrifttype...",         ID_VIEW_SELECTFONT
@@ -989,6 +990,7 @@ BEGIN
     ID_DIR_OPEN_LEFT        "Åben venstre fil"
     ID_DIR_OPEN_LEFT_WITH   "Åben venstre fil med ..."
     ID_DIR_OPEN_RIGHT       "Åben højre fil"
+    ID_OPTIONS_SHOWSKIPPED  "Displays skipped files"
 END
 
 // IDS_SAVE_AS_TITLE SYNCHRO

diff --git a/Src/Languages/Danish/resource.h b/Src/Languages/Danish/resource.h
index 7f57061..09d8998 100644 (file)
--- a/Src/Languages/Danish/resource.h
+++ b/Src/Languages/Danish/resource.h
@@ -415,6 +415,7 @@
 #define ID_EOL_TO_DOS                   32836
 #define ID_EOL_TO_UNIX                  32837
 #define ID_EOL_TO_MAC                   32838
+#define ID_OPTIONS_SHOWSKIPPED          32839
 
 // Next default values for new objects
 // 
@@ -422,7 +423,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        118
-#define _APS_NEXT_COMMAND_VALUE         32839
+#define _APS_NEXT_COMMAND_VALUE         32840
 #define _APS_NEXT_CONTROL_VALUE         1064
 #define _APS_NEXT_SYMED_VALUE           108
 #endif

diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc
index 9443b8c..35c551e 100644 (file)
--- a/Src/Languages/Dutch/MergeDutch.rc
+++ b/Src/Languages/Dutch/MergeDutch.rc
@@ -140,6 +140,7 @@ BEGIN
         MENUITEM "Toon &Unieke Bestanden (rechts)",
                                                 ID_OPTIONS_SHOWUNIQUERIGHT
         MENUITEM "S&how Binary Files",          ID_OPTIONS_SHOWBINARIES
+        MENUITEM "Show S&kipped Files",         ID_OPTIONS_SHOWSKIPPED
         MENUITEM "Verberg *.&BAK Bestanden",    ID_HIDE_BACKUP_FILES
         MENUITEM SEPARATOR
         MENUITEM "Kies  &Font...",              ID_VIEW_SELECTFONT
@@ -996,6 +997,7 @@ BEGIN
     ID_DIR_OPEN_LEFT        "Open left file"
     ID_DIR_OPEN_LEFT_WITH   "Open left file with ..."
     ID_DIR_OPEN_RIGHT       "Open right file"
+    ID_OPTIONS_SHOWSKIPPED  "Displays skipped files"
 END
 
 // IDS_SAVE_AS_TITLE SYNCHRO

diff --git a/Src/Languages/Dutch/resource.h b/Src/Languages/Dutch/resource.h
index 7f57061..09d8998 100644 (file)
--- a/Src/Languages/Dutch/resource.h
+++ b/Src/Languages/Dutch/resource.h
@@ -415,6 +415,7 @@
 #define ID_EOL_TO_DOS                   32836
 #define ID_EOL_TO_UNIX                  32837
 #define ID_EOL_TO_MAC                   32838
+#define ID_OPTIONS_SHOWSKIPPED          32839
 
 // Next default values for new objects
 // 
@@ -422,7 +423,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        118
-#define _APS_NEXT_COMMAND_VALUE         32839
+#define _APS_NEXT_COMMAND_VALUE         32840
 #define _APS_NEXT_CONTROL_VALUE         1064
 #define _APS_NEXT_SYMED_VALUE           108
 #endif

diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc
index 89aa009..5935eaf 100644 (file)
--- a/Src/Languages/French/MergeFrench.rc
+++ b/Src/Languages/French/MergeFrench.rc
@@ -139,6 +139,7 @@ BEGIN
         MENUITEM "Fichiers Uniquement à &Gauche", ID_OPTIONS_SHOWUNIQUELEFT
         MENUITEM "Fichiers Uniquement à D&roite", ID_OPTIONS_SHOWUNIQUERIGHT
         MENUITEM "Fichiers &Binaires",          ID_OPTIONS_SHOWBINARIES
+        MENUITEM "Show S&kipped Files",         ID_OPTIONS_SHOWSKIPPED
         MENUITEM "&Cacher les Fichiers *.BAK",  ID_HIDE_BACKUP_FILES
         MENUITEM SEPARATOR
         MENUITEM "Sélectionner la &police...",  ID_VIEW_SELECTFONT
@@ -996,6 +997,7 @@ BEGIN
     ID_DIR_OPEN_LEFT        "Ouvrir le fichier de gauche"
     ID_DIR_OPEN_LEFT_WITH   "Ouvrir le fichier de gauche avec ..."
     ID_DIR_OPEN_RIGHT       "Ouvrir le fichier de droite"
+    ID_OPTIONS_SHOWSKIPPED  "Displays skipped files"
 END
 
 // IDS_SAVE_AS_TITLE SYNCHRO

diff --git a/Src/Languages/French/resource.h b/Src/Languages/French/resource.h
index 7f57061..09d8998 100644 (file)
--- a/Src/Languages/French/resource.h
+++ b/Src/Languages/French/resource.h
@@ -415,6 +415,7 @@
 #define ID_EOL_TO_DOS                   32836
 #define ID_EOL_TO_UNIX                  32837
 #define ID_EOL_TO_MAC                   32838
+#define ID_OPTIONS_SHOWSKIPPED          32839
 
 // Next default values for new objects
 // 
@@ -422,7 +423,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        118
-#define _APS_NEXT_COMMAND_VALUE         32839
+#define _APS_NEXT_COMMAND_VALUE         32840
 #define _APS_NEXT_CONTROL_VALUE         1064
 #define _APS_NEXT_SYMED_VALUE           108
 #endif

diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc
index 071e84b..5422310 100644 (file)
--- a/Src/Languages/German/MergeGerman.rc
+++ b/Src/Languages/German/MergeGerman.rc
@@ -143,6 +143,7 @@ BEGIN
         MENUITEM "Zeige eindeutige Dateien &rechts",
                                                 ID_OPTIONS_SHOWUNIQUERIGHT
         MENUITEM "Zeige Binär&dateien",         ID_OPTIONS_SHOWBINARIES
+        MENUITEM "Show S&kipped Files",         ID_OPTIONS_SHOWSKIPPED
         MENUITEM "*.&BAK-Dateien verstecken",   ID_HIDE_BACKUP_FILES
         MENUITEM SEPARATOR
         MENUITEM "Schrift &auswählen...",       ID_VIEW_SELECTFONT
@@ -1001,6 +1002,7 @@ BEGIN
     ID_DIR_OPEN_LEFT        "Open left file"
     ID_DIR_OPEN_LEFT_WITH   "Open left file with ..."
     ID_DIR_OPEN_RIGHT       "Open right file"
+    ID_OPTIONS_SHOWSKIPPED  "Displays skipped files"
 END
 
 // IDS_SAVE_AS_TITLE SYNCHRO

diff --git a/Src/Languages/German/resource.h b/Src/Languages/German/resource.h
index 7f57061..09d8998 100644 (file)
--- a/Src/Languages/German/resource.h
+++ b/Src/Languages/German/resource.h
@@ -415,6 +415,7 @@
 #define ID_EOL_TO_DOS                   32836
 #define ID_EOL_TO_UNIX                  32837
 #define ID_EOL_TO_MAC                   32838
+#define ID_OPTIONS_SHOWSKIPPED          32839
 
 // Next default values for new objects
 // 
@@ -422,7 +423,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        118
-#define _APS_NEXT_COMMAND_VALUE         32839
+#define _APS_NEXT_COMMAND_VALUE         32840
 #define _APS_NEXT_CONTROL_VALUE         1064
 #define _APS_NEXT_SYMED_VALUE           108
 #endif

diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc
index 269aa19..f3ac00e 100644 (file)
--- a/Src/Languages/Italian/MergeItalian.rc
+++ b/Src/Languages/Italian/MergeItalian.rc
@@ -138,6 +138,7 @@ BEGIN
         MENUITEM "Mostra file unici de sinistra", ID_OPTIONS_SHOWUNIQUELEFT
         MENUITEM "Mostra file unici de destra", ID_OPTIONS_SHOWUNIQUERIGHT
         MENUITEM "S&how Binary Files",          ID_OPTIONS_SHOWBINARIES
+        MENUITEM "Show S&kipped Files",         ID_OPTIONS_SHOWSKIPPED
         MENUITEM "&Nascondi file *.BAK",        ID_HIDE_BACKUP_FILES
         MENUITEM SEPARATOR
         MENUITEM "&Carattere...",               ID_VIEW_SELECTFONT
@@ -990,6 +991,7 @@ BEGIN
     ID_DIR_OPEN_LEFT        "Open left file"
     ID_DIR_OPEN_LEFT_WITH   "Open left file with ..."
     ID_DIR_OPEN_RIGHT       "Open right file"
+    ID_OPTIONS_SHOWSKIPPED  "Displays skipped files"
 END
 
 // IDS_SAVE_AS_TITLE SYNCHRO

diff --git a/Src/Languages/Italian/resource.h b/Src/Languages/Italian/resource.h
index 7f57061..09d8998 100644 (file)
--- a/Src/Languages/Italian/resource.h
+++ b/Src/Languages/Italian/resource.h
@@ -415,6 +415,7 @@
 #define ID_EOL_TO_DOS                   32836
 #define ID_EOL_TO_UNIX                  32837
 #define ID_EOL_TO_MAC                   32838
+#define ID_OPTIONS_SHOWSKIPPED          32839
 
 // Next default values for new objects
 // 
@@ -422,7 +423,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        118
-#define _APS_NEXT_COMMAND_VALUE         32839
+#define _APS_NEXT_COMMAND_VALUE         32840
 #define _APS_NEXT_CONTROL_VALUE         1064
 #define _APS_NEXT_SYMED_VALUE           108
 #endif

diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc
index a9432b9..a841412 100644 (file)
--- a/Src/Languages/Korean/MergeKorean.rc
+++ b/Src/Languages/Korean/MergeKorean.rc
@@ -104,6 +104,7 @@ BEGIN
         MENUITEM "¿ìÃø À¯´ÏÅ©(unique)ÇÑ ÆÄÀÏ º¸±â(&G)",
                                                 ID_OPTIONS_SHOWUNIQUERIGHT
         MENUITEM "¹ÙÀ̳ʸ® ÆÄÀÏ º¸±â(&H)",      ID_OPTIONS_SHOWBINARIES
+        MENUITEM "Show S&kipped Files",         ID_OPTIONS_SHOWSKIPPED
         MENUITEM "¹é¾÷(*.BAK) ÆÄÀÏ ¼û±â±â(&B)", ID_HIDE_BACKUP_FILES
         MENUITEM SEPARATOR
         MENUITEM "ÆùÆ® ¼±ÅÃ(&F)...",            ID_VIEW_SELECTFONT
@@ -960,6 +961,7 @@ BEGIN
     ID_DIR_OPEN_LEFT        "¿ÞÂÊ ÆÄÀÏÀ» ¿±´Ï´Ù."
     ID_DIR_OPEN_LEFT_WITH   "¿ÞÂÊ ÆÄÀÏÀ» ¿¬°á ÇÁ·Î±×·¥À» ¼±ÅÃÇؼ­ ¿±´Ï´Ù. ..."
     ID_DIR_OPEN_RIGHT       "¿À¸¥ÂÊ ÆÄÀÏÀ» ¿±´Ï´Ù."
+    ID_OPTIONS_SHOWSKIPPED  "Displays skipped files"
 END
 
 // IDS_SAVE_AS_TITLE SYNCHRO

diff --git a/Src/Languages/Korean/resource.h b/Src/Languages/Korean/resource.h
index 7f57061..09d8998 100644 (file)
--- a/Src/Languages/Korean/resource.h
+++ b/Src/Languages/Korean/resource.h
@@ -415,6 +415,7 @@
 #define ID_EOL_TO_DOS                   32836
 #define ID_EOL_TO_UNIX                  32837
 #define ID_EOL_TO_MAC                   32838
+#define ID_OPTIONS_SHOWSKIPPED          32839
 
 // Next default values for new objects
 // 
@@ -422,7 +423,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        118
-#define _APS_NEXT_COMMAND_VALUE         32839
+#define _APS_NEXT_COMMAND_VALUE         32840
 #define _APS_NEXT_CONTROL_VALUE         1064
 #define _APS_NEXT_SYMED_VALUE           108
 #endif

diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc
index cee2fa5..a5d9286 100644 (file)
--- a/Src/Languages/Norwegian/MergeNorwegian.rc
+++ b/Src/Languages/Norwegian/MergeNorwegian.rc
@@ -139,6 +139,7 @@ BEGIN
         MENUITEM "Vis &venstre unike filer",    ID_OPTIONS_SHOWUNIQUELEFT
         MENUITEM "Vis &høyre unike filer",      ID_OPTIONS_SHOWUNIQUERIGHT
         MENUITEM "Vis &binære filer",           ID_OPTIONS_SHOWBINARIES
+        MENUITEM "Show S&kipped Files",         ID_OPTIONS_SHOWSKIPPED
         MENUITEM "Skjul *.&BAK filer",          ID_HIDE_BACKUP_FILES
         MENUITEM SEPARATOR
         MENUITEM "Velg &skrifttype...",         ID_VIEW_SELECTFONT
@@ -990,6 +991,7 @@ BEGIN
     ID_DIR_OPEN_LEFT        "Åpne venstre fil"
     ID_DIR_OPEN_LEFT_WITH   "Åpne venstre fil med ..."
     ID_DIR_OPEN_RIGHT       "Åpne høyre fil"
+    ID_OPTIONS_SHOWSKIPPED  "Displays skipped files"
 END
 
 // IDS_SAVE_AS_TITLE SYNCHRO

diff --git a/Src/Languages/Norwegian/resource.h b/Src/Languages/Norwegian/resource.h
index 7f57061..09d8998 100644 (file)
--- a/Src/Languages/Norwegian/resource.h
+++ b/Src/Languages/Norwegian/resource.h
@@ -415,6 +415,7 @@
 #define ID_EOL_TO_DOS                   32836
 #define ID_EOL_TO_UNIX                  32837
 #define ID_EOL_TO_MAC                   32838
+#define ID_OPTIONS_SHOWSKIPPED          32839
 
 // Next default values for new objects
 // 
@@ -422,7 +423,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        118
-#define _APS_NEXT_COMMAND_VALUE         32839
+#define _APS_NEXT_COMMAND_VALUE         32840
 #define _APS_NEXT_CONTROL_VALUE         1064
 #define _APS_NEXT_SYMED_VALUE           108
 #endif

diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc
index 67b2e8b..7246245 100644 (file)
--- a/Src/Languages/Slovak/MergeSlovak.rc
+++ b/Src/Languages/Slovak/MergeSlovak.rc
@@ -139,6 +139,7 @@ BEGIN
         MENUITEM "Show Le&ft Unique Files",     ID_OPTIONS_SHOWUNIQUELEFT
         MENUITEM "Show Ri&ght Unique Files",    ID_OPTIONS_SHOWUNIQUERIGHT
         MENUITEM "Zobraz binárne súbory",       ID_OPTIONS_SHOWBINARIES
+        MENUITEM "Show S&kipped Files",         ID_OPTIONS_SHOWSKIPPED
         MENUITEM "Skry\9d súbory s príponou *.&BAK", ID_HIDE_BACKUP_FILES
         MENUITEM SEPARATOR
         MENUITEM "&Zvoli\9d písmo...",            ID_VIEW_SELECTFONT
@@ -994,6 +995,7 @@ BEGIN
     ID_DIR_OPEN_LEFT        "Otvor ¾avý súbor"
     ID_DIR_OPEN_LEFT_WITH   "Otovr ¾avý súbor s..."
     ID_DIR_OPEN_RIGHT       "Otvor pravý súbor"
+    ID_OPTIONS_SHOWSKIPPED  "Displays skipped files"
 END
 
 // IDS_SAVE_AS_TITLE SYNCHRO

diff --git a/Src/Languages/Slovak/resource.h b/Src/Languages/Slovak/resource.h
index 7f57061..09d8998 100644 (file)
--- a/Src/Languages/Slovak/resource.h
+++ b/Src/Languages/Slovak/resource.h
@@ -415,6 +415,7 @@
 #define ID_EOL_TO_DOS                   32836
 #define ID_EOL_TO_UNIX                  32837
 #define ID_EOL_TO_MAC                   32838
+#define ID_OPTIONS_SHOWSKIPPED          32839
 
 // Next default values for new objects
 // 
@@ -422,7 +423,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        118
-#define _APS_NEXT_COMMAND_VALUE         32839
+#define _APS_NEXT_COMMAND_VALUE         32840
 #define _APS_NEXT_CONTROL_VALUE         1064
 #define _APS_NEXT_SYMED_VALUE           108
 #endif

diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc
index 01dcdc2..bf0059c 100644 (file)
--- a/Src/Languages/Spanish/MergeSpanish.rc
+++ b/Src/Languages/Spanish/MergeSpanish.rc
@@ -139,6 +139,7 @@ BEGIN
         MENUITEM "Ver Archivos Unicos de izquierdo", ID_OPTIONS_SHOWUNIQUELEFT
         MENUITEM "Ver Archivos Unicos de derecho", ID_OPTIONS_SHOWUNIQUERIGHT
         MENUITEM "S&how Binary Files",          ID_OPTIONS_SHOWBINARIES
+        MENUITEM "Show S&kipped Files",         ID_OPTIONS_SHOWSKIPPED
         MENUITEM "Esconder Archivos de Tipo *.&BAK", ID_HIDE_BACKUP_FILES
         MENUITEM SEPARATOR
         MENUITEM "Cambiar el Fuente...",        ID_VIEW_SELECTFONT
@@ -993,6 +994,7 @@ BEGIN
     ID_DIR_OPEN_LEFT        "Open left file"
     ID_DIR_OPEN_LEFT_WITH   "Open left file with ..."
     ID_DIR_OPEN_RIGHT       "Open right file"
+    ID_OPTIONS_SHOWSKIPPED  "Displays skipped files"
 END
 
 // IDS_SAVE_AS_TITLE SYNCHRO

diff --git a/Src/Languages/Spanish/resource.h b/Src/Languages/Spanish/resource.h
index 7f57061..09d8998 100644 (file)
--- a/Src/Languages/Spanish/resource.h
+++ b/Src/Languages/Spanish/resource.h
@@ -415,6 +415,7 @@
 #define ID_EOL_TO_DOS                   32836
 #define ID_EOL_TO_UNIX                  32837
 #define ID_EOL_TO_MAC                   32838
+#define ID_OPTIONS_SHOWSKIPPED          32839
 
 // Next default values for new objects
 // 
@@ -422,7 +423,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        118
-#define _APS_NEXT_COMMAND_VALUE         32839
+#define _APS_NEXT_COMMAND_VALUE         32840
 #define _APS_NEXT_CONTROL_VALUE         1064
 #define _APS_NEXT_SYMED_VALUE           108
 #endif

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index d925239..765ee56 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -80,11 +80,13 @@ BEGIN_MESSAGE_MAP(CMainFrame, CMDIFrameWnd)
        ON_COMMAND(ID_OPTIONS_SHOWUNIQUELEFT, OnOptionsShowUniqueLeft)
        ON_COMMAND(ID_OPTIONS_SHOWUNIQUERIGHT, OnOptionsShowUniqueRight)
        ON_COMMAND(ID_OPTIONS_SHOWBINARIES, OnOptionsShowBinaries)
+       ON_COMMAND(ID_OPTIONS_SHOWSKIPPED, OnOptionsShowSkipped)
        ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWDIFFERENT, OnUpdateOptionsShowdifferent)
        ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWIDENTICAL, OnUpdateOptionsShowidentical)
        ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWUNIQUELEFT, OnUpdateOptionsShowuniqueleft)
        ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWUNIQUERIGHT, OnUpdateOptionsShowuniqueright)
        ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWBINARIES, OnUpdateOptionsShowBinaries)
+       ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWSKIPPED, OnUpdateOptionsShowSkipped)
        ON_WM_CREATE()
        ON_WM_MENUCHAR()
        ON_COMMAND(ID_FILE_OPEN, OnFileOpen)
@@ -135,7 +137,7 @@ CMainFrame::CMainFrame()
        m_bShowIdent = theApp.GetProfileInt(_T("Settings"), _T("ShowIdentical"), TRUE)!=0;
        m_bShowBinaries = theApp.GetProfileInt(_T("Settings"), _T("ShowBinaries"), TRUE)!=0;
        m_bShowErrors = TRUE;
-       m_bShowSkipped = TRUE;
+       m_bShowSkipped = theApp.GetProfileInt(_T("Settings"), _T("ShowSkipped"), TRUE)!=0;
        m_bBackup = theApp.GetProfileInt(_T("Settings"), _T("BackupFile"), TRUE)!=0;
        m_bViewWhitespace = theApp.GetProfileInt(_T("Settings"), _T("ViewWhitespace"), FALSE)!=0;
        m_bScrollToFirst = theApp.GetProfileInt(_T("Settings"), _T("ScrollToFirst"), FALSE)!=0;
@@ -327,6 +329,9 @@ void CMainFrame::RedisplayAllDirDocs()
        }
 }
 
+/**
+ * @brief Show/Hide different files/directories
+ */
 void CMainFrame::OnOptionsShowDifferent() 
 {
        m_bShowDiff = !m_bShowDiff;
@@ -334,6 +339,9 @@ void CMainFrame::OnOptionsShowDifferent()
        RedisplayAllDirDocs();
 }
 
+/**
+ * @brief Show/Hide identical files/directories
+ */
 void CMainFrame::OnOptionsShowIdentical() 
 {
        m_bShowIdent = !m_bShowIdent;
@@ -341,6 +349,10 @@ void CMainFrame::OnOptionsShowIdentical()
        RedisplayAllDirDocs();
 }
 
+/**
+ * @brief Show/Hide left-only files/directories
+ */
+
 void CMainFrame::OnOptionsShowUniqueLeft() 
 {
        m_bShowUniqueLeft = !m_bShowUniqueLeft;
@@ -348,6 +360,9 @@ void CMainFrame::OnOptionsShowUniqueLeft()
        RedisplayAllDirDocs();
 }
 
+/**
+ * @brief Show/Hide right-only files/directories
+ */
 void CMainFrame::OnOptionsShowUniqueRight() 
 {
        m_bShowUniqueRight = !m_bShowUniqueRight;
@@ -355,6 +370,9 @@ void CMainFrame::OnOptionsShowUniqueRight()
        RedisplayAllDirDocs();
 }
 
+/**
+ * @brief Show/Hide binary files
+ */
 void CMainFrame::OnOptionsShowBinaries()
 {
        m_bShowBinaries = !m_bShowBinaries;
@@ -362,6 +380,16 @@ void CMainFrame::OnOptionsShowBinaries()
        RedisplayAllDirDocs();
 }
 
+/**
+ * @brief Show/Hide skipped files/directories
+ */
+void CMainFrame::OnOptionsShowSkipped()
+{
+       m_bShowSkipped = !m_bShowSkipped;
+       theApp.WriteProfileInt(_T("Settings"), _T("ShowSkipped"), m_bShowSkipped);
+       RedisplayAllDirDocs();
+}
+
 void CMainFrame::OnUpdateOptionsShowdifferent(CCmdUI* pCmdUI) 
 {
        pCmdUI->SetCheck(m_bShowDiff);
@@ -387,6 +415,14 @@ void CMainFrame::OnUpdateOptionsShowBinaries(CCmdUI* pCmdUI)
        pCmdUI->SetCheck(m_bShowBinaries);
 }
 
+void CMainFrame::OnUpdateOptionsShowSkipped(CCmdUI* pCmdUI)
+{
+       pCmdUI->SetCheck(m_bShowSkipped);
+}
+
+/**
+ * @brief Show/Hide backup files
+ */
 void CMainFrame::OnHideBackupFiles() 
 {
        m_bHideBak = ! m_bHideBak;
@@ -399,7 +435,9 @@ void CMainFrame::OnUpdateHideBackupFiles(CCmdUI* pCmdUI)
        pCmdUI->SetCheck(m_bHideBak);
 }
 
-/// Show GNU licence information in notepad (local file) or in Web Browser
+/**
+ * @brief Show GNU licence information in notepad (local file) or in Web Browser
+ */
 void CMainFrame::OnHelpGnulicense() 
 {
        CString spath = GetModulePath() + _T("\\Copying");

diff --git a/Src/MainFrm.h b/Src/MainFrm.h
index 759da8d..469a09d 100644 (file)
--- a/Src/MainFrm.h
+++ b/Src/MainFrm.h
@@ -163,11 +163,13 @@ protected:
        afx_msg void OnOptionsShowUniqueLeft();
        afx_msg void OnOptionsShowUniqueRight();
        afx_msg void OnOptionsShowBinaries();
+       afx_msg void OnOptionsShowSkipped();
        afx_msg void OnUpdateOptionsShowdifferent(CCmdUI* pCmdUI);
        afx_msg void OnUpdateOptionsShowidentical(CCmdUI* pCmdUI);
        afx_msg void OnUpdateOptionsShowuniqueleft(CCmdUI* pCmdUI);
        afx_msg void OnUpdateOptionsShowuniqueright(CCmdUI* pCmdUI);
        afx_msg void OnUpdateOptionsShowBinaries(CCmdUI* pCmdUI);
+       afx_msg void OnUpdateOptionsShowSkipped(CCmdUI* pCmdUI);
        afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
        afx_msg LRESULT OnMenuChar(UINT nChar, UINT nFlags, CMenu* pMenu) ;
        afx_msg void OnFileOpen();

diff --git a/Src/Merge.rc b/Src/Merge.rc
index cacb76a..8596608 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -29,18 +29,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 // TEXTINCLUDE
 //
 
-1 TEXTINCLUDE DISCARDABLE 
+1 TEXTINCLUDE DISCARDABLE
 BEGIN
     "resource.h\0"
 END
 
-2 TEXTINCLUDE DISCARDABLE 
+2 TEXTINCLUDE DISCARDABLE
 BEGIN
     "#include ""afxres.h""\r\n"
     "\0"
 END
 
-3 TEXTINCLUDE DISCARDABLE 
+3 TEXTINCLUDE DISCARDABLE
 BEGIN
     "#define _AFX_NO_OLE_RESOURCES\r\n"
     "#define _AFX_NO_TRACKER_RESOURCES\r\n"
@@ -75,17 +75,17 @@ IDR_MERGETYPE           ICON    DISCARDABLE     "res\\MergeDoc.ico"
 // Menu
 //
 
-IDR_POPUP_DIFFVIEW MENU DISCARDABLE 
+IDR_POPUP_DIFFVIEW MENU DISCARDABLE
 BEGIN
     POPUP "_POPUP_"
     BEGIN
         MENUITEM "Copy to other side",          ID_POPUP_COPYTOOTHERSIDE
         MENUITEM "Copy from other side",        ID_POPUP_COPYFROMOTHERSIDE
         MENUITEM SEPARATOR
-        MENUITEM "Copy all diffs to other side...", 
+        MENUITEM "Copy all diffs to other side...",
                                                 ID_POPUP_COPYALLDIFFSTOOTHERSIDE
 
-        MENUITEM "Copy all diffs from other side...", 
+        MENUITEM "Copy all diffs from other side...",
                                                 ID_POPUP_COPYALLDIFFSFROMOTHERSIDE
 
         MENUITEM SEPARATOR
@@ -95,7 +95,7 @@ BEGIN
     END
 END
 
-IDR_MAINFRAME MENU PRELOAD DISCARDABLE 
+IDR_MAINFRAME MENU PRELOAD DISCARDABLE
 BEGIN
     POPUP "&File"
     BEGIN
@@ -139,6 +139,7 @@ BEGIN
         MENUITEM "Show Le&ft Unique Files",     ID_OPTIONS_SHOWUNIQUELEFT
         MENUITEM "Show Ri&ght Unique Files",    ID_OPTIONS_SHOWUNIQUERIGHT
         MENUITEM "S&how Binary Files",          ID_OPTIONS_SHOWBINARIES
+        MENUITEM "Show S&kipped Files",         ID_OPTIONS_SHOWSKIPPED
         MENUITEM "Hide *.&BAK Files",           ID_HIDE_BACKUP_FILES
         MENUITEM SEPARATOR
         MENUITEM "Select &Font...",             ID_VIEW_SELECTFONT
@@ -184,7 +185,7 @@ BEGIN
     END
 END
 
-IDR_POPUP_DIRVIEW MENU DISCARDABLE 
+IDR_POPUP_DIRVIEW MENU DISCARDABLE
 BEGIN
     POPUP "_ITEM_POPUP_"
     BEGIN
@@ -205,7 +206,7 @@ BEGIN
     END
 END
 
-IDR_POPUP_EDITOR_HEADERBAR MENU DISCARDABLE 
+IDR_POPUP_EDITOR_HEADERBAR MENU DISCARDABLE
 BEGIN
     POPUP "_POPUP_"
     BEGIN
@@ -220,7 +221,7 @@ END
 // Accelerator
 //
 
-IDR_MAINFRAME ACCELERATORS PRELOAD MOVEABLE PURE 
+IDR_MAINFRAME ACCELERATORS PRELOAD MOVEABLE PURE
 BEGIN
     "A",            ID_EDIT_SELECT_ALL,     VIRTKEY, CONTROL, NOINVERT
     "C",            ID_EDIT_COPY,           VIRTKEY, CONTROL, NOINVERT
@@ -285,19 +286,19 @@ CAPTION "Select Files or Directories..."
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
     LTEXT           "&Left:",IDC_STATIC,38,24,15,8
-    COMBOBOX        IDC_LEFT_COMBO,56,22,182,94,CBS_DROPDOWN | 
+    COMBOBOX        IDC_LEFT_COMBO,56,22,182,94,CBS_DROPDOWN |
                     CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP,
                     WS_EX_ACCEPTFILES
     PUSHBUTTON      "&Browse...",IDC_LEFT_BUTTON,241,22,38,12
     LTEXT           "&Right:",IDC_STATIC,33,40,20,8
-    COMBOBOX        IDC_RIGHT_COMBO,56,38,182,95,CBS_DROPDOWN | 
+    COMBOBOX        IDC_RIGHT_COMBO,56,38,182,95,CBS_DROPDOWN |
                     CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP,
                     WS_EX_ACCEPTFILES
     PUSHBUTTON      "Bro&wse...",IDC_RIGHT_BUTTON,241,38,38,12
     LTEXT           "E&xtensions:",IDC_STATIC,16,56,37,8
-    COMBOBOX        IDC_EXT_COMBO,56,54,151,95,CBS_DROPDOWN | 
+    COMBOBOX        IDC_EXT_COMBO,56,54,151,95,CBS_DROPDOWN |
                     CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Re&cursive",IDC_RECURS_CHECK,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "Re&cursive",IDC_RECURS_CHECK,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,35,77,48,10
     DEFPUSHBUTTON   "OK",IDOK,295,11,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,295,28,50,14
@@ -315,7 +316,7 @@ BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,173,121,50,14
     PUSHBUTTON      "Save As...",IDSAVEAS,103,121,50,14
     LTEXT           "Project:",IDC_STATIC,9,61,25,8
-    COMBOBOX        IDC_PROJECT_COMBO,36,58,215,114,CBS_DROPDOWN | 
+    COMBOBOX        IDC_PROJECT_COMBO,36,58,215,114,CBS_DROPDOWN |
                     CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     LTEXT           "User:",IDC_STATIC,13,80,18,8
     EDITTEXT        IDC_USER,36,78,58,14,ES_AUTOHSCROLL
@@ -332,7 +333,7 @@ BEGIN
     LTEXT           "&Path to cleartool.exe:",IDC_VSS_L1,16,42,68,8
     EDITTEXT        IDC_PATH_EDIT,85,40,116,12,ES_AUTOHSCROLL
     PUSHBUTTON      "&Browse...",IDC_BROWSE_BUTTON,206,40,42,12
-    COMBOBOX        IDC_VER_SYS,85,20,157,41,CBS_DROPDOWNLIST | WS_VSCROLL | 
+    COMBOBOX        IDC_VER_SYS,85,20,157,41,CBS_DROPDOWNLIST | WS_VSCROLL |
                     WS_TABSTOP
     LTEXT           "&Versioning System",IDC_STATIC,16,22,60,10
 END
@@ -383,7 +384,7 @@ FONT 8, "MS Sans Serif"
 BEGIN
     PUSHBUTTON      "OK",IDOK,154,16,52,14
     PUSHBUTTON      "Cancel",IDCANCEL,154,33,52,14
-    LISTBOX         IDC_LANGUAGE_LIST,5,16,141,89,LBS_NOINTEGRALHEIGHT | 
+    LISTBOX         IDC_LANGUAGE_LIST,5,16,141,89,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP
     LTEXT           "Available languages:",IDC_STATIC,7,7,66,8
 END
@@ -393,7 +394,7 @@ STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Find"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    COMBOBOX        IDC_EDIT_FINDTEXT,41,6,135,138,CBS_DROPDOWN | WS_VSCROLL | 
+    COMBOBOX        IDC_EDIT_FINDTEXT,41,6,135,138,CBS_DROPDOWN | WS_VSCROLL |
                     WS_TABSTOP
     CONTROL         "Match &whole word only",IDC_EDIT_WHOLE_WORD,"Button",
                     BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,4,26,100,12
@@ -401,7 +402,7 @@ BEGIN
                     BS_AUTOCHECKBOX | WS_TABSTOP,4,40,64,12
     CONTROL         "Regular &expression",IDC_EDIT_REGEXP,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,4,54,77,12
-    CONTROL         "&Up",IDC_EDIT_DIRECTION_UP,"Button",BS_AUTORADIOBUTTON | 
+    CONTROL         "&Up",IDC_EDIT_DIRECTION_UP,"Button",BS_AUTORADIOBUTTON |
                     WS_GROUP,111,36,25,12
     CONTROL         "&Down",IDC_EDIT_DIRECTION_DOWN,"Button",
                     BS_AUTORADIOBUTTON,111,48,35,12
@@ -416,9 +417,9 @@ STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Replace"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    COMBOBOX        IDC_EDIT_FINDTEXT,52,7,116,30,CBS_DROPDOWN | CBS_SORT | 
+    COMBOBOX        IDC_EDIT_FINDTEXT,52,7,116,30,CBS_DROPDOWN | CBS_SORT |
                     WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_EDIT_REPLACE_WITH,52,24,116,30,CBS_DROPDOWN | 
+    COMBOBOX        IDC_EDIT_REPLACE_WITH,52,24,116,30,CBS_DROPDOWN |
                     CBS_SORT | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Match &whole word only",IDC_EDIT_WHOLE_WORD,"Button",
                     BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,5,46,91,12
@@ -447,7 +448,7 @@ BEGIN
     DEFPUSHBUTTON   "CheckOut",IDOK,35,90,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,194,90,50,14
     PUSHBUTTON      "Save As...",IDSAVEAS,114,90,50,14
-    EDITTEXT        IDC_COMMENTS,18,21,243,56,ES_MULTILINE | ES_AUTOVSCROLL | 
+    EDITTEXT        IDC_COMMENTS,18,21,243,56,ES_MULTILINE | ES_AUTOVSCROLL |
                     ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL
     LTEXT           "Comments",IDC_STATIC,18,7,34,10
 END
@@ -471,10 +472,10 @@ BEGIN
                     7,221,15
     LTEXT           "Regular Expressions (one per line):",IDC_STATIC,7,28,
                     221,8
-    EDITTEXT        IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE | 
+    EDITTEXT        IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE |
                     ES_AUTOHSCROLL | ES_WANTRETURN
     LTEXT           "File filter:",IDC_STATIC,7,128,60,10
-    COMBOBOX        IDC_FILE_FILTER,73,126,117,63,CBS_DROPDOWNLIST | 
+    COMBOBOX        IDC_FILE_FILTER,73,126,117,63,CBS_DROPDOWNLIST |
                     WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "Edit",IDC_EDIT_FILE_FILTER,194,126,34,13,WS_DISABLED
 END
@@ -485,26 +486,26 @@ CAPTION "Colors"
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
     LTEXT           "Difference:",IDC_STATIC,43,29,36,8
-    CONTROL         "Dif",IDC_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | 
-                    WS_TABSTOP,98,29,17,14,WS_EX_TRANSPARENT | 
+    CONTROL         "Dif",IDC_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW |
+                    WS_TABSTOP,98,29,17,14,WS_EX_TRANSPARENT |
                     WS_EX_CLIENTEDGE
     LTEXT           "Selected Difference:",IDC_STATIC,13,49,66,8
-    CONTROL         "Dif",IDC_SEL_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | 
-                    WS_TABSTOP,98,49,17,14,WS_EX_TRANSPARENT | 
+    CONTROL         "Dif",IDC_SEL_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW |
+                    WS_TABSTOP,98,49,17,14,WS_EX_TRANSPARENT |
                     WS_EX_CLIENTEDGE
     LTEXT           "Background",IDC_STATIC,86,15,40,8
     LTEXT           "Deleted",IDC_STATIC,137,15,26,8
-    CONTROL         "Dif",IDC_DIFFERENCE_DELETED_COLOR,"Button",BS_OWNERDRAW | 
-                    WS_TABSTOP,141,29,17,14,WS_EX_TRANSPARENT | 
+    CONTROL         "Dif",IDC_DIFFERENCE_DELETED_COLOR,"Button",BS_OWNERDRAW |
+                    WS_TABSTOP,141,29,17,14,WS_EX_TRANSPARENT |
                     WS_EX_CLIENTEDGE
     CONTROL         "Dif",IDC_SEL_DIFFERENCE_DELETED_COLOR,"Button",
-                    BS_OWNERDRAW | WS_TABSTOP,141,49,17,14,WS_EX_TRANSPARENT | 
+                    BS_OWNERDRAW | WS_TABSTOP,141,49,17,14,WS_EX_TRANSPARENT |
                     WS_EX_CLIENTEDGE
-    CONTROL         "Dif",IDC_DIFFERENCE_TEXT_COLOR,"Button",BS_OWNERDRAW | 
-                    WS_TABSTOP,184,29,17,14,WS_EX_TRANSPARENT | 
+    CONTROL         "Dif",IDC_DIFFERENCE_TEXT_COLOR,"Button",BS_OWNERDRAW |
+                    WS_TABSTOP,184,29,17,14,WS_EX_TRANSPARENT |
                     WS_EX_CLIENTEDGE
     CONTROL         "Dif",IDC_SEL_DIFFERENCE_TEXT_COLOR,"Button",
-                    BS_OWNERDRAW | WS_TABSTOP,184,49,17,14,WS_EX_TRANSPARENT | 
+                    BS_OWNERDRAW | WS_TABSTOP,184,49,17,14,WS_EX_TRANSPARENT |
                     WS_EX_CLIENTEDGE
     LTEXT           "Text",IDC_STATIC,184,15,15,8
 END
@@ -515,7 +516,7 @@ CAPTION "Dialog"
 FONT 8, "MS Sans Serif"
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,106,136,50,14
-    EDITTEXT        IDC_EDIT1,7,7,264,123,ES_MULTILINE | ES_READONLY | 
+    EDITTEXT        IDC_EDIT1,7,7,264,123,ES_MULTILINE | ES_READONLY |
                     WS_VSCROLL
 END
 
@@ -535,11 +536,11 @@ IDD_EDITOR_HEADERBAR DIALOGEX 0, 0, 373, 12
 STYLE WS_CHILD
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
-    EDITTEXT        IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | 
-                    ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT 
+    EDITTEXT        IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL |
+                    ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT
                     WS_TABSTOP,WS_EX_STATICEDGE
-    EDITTEXT        IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | 
-                    ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT 
+    EDITTEXT        IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL |
+                    ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT
                     WS_TABSTOP,WS_EX_STATICEDGE
 END
 
@@ -551,12 +552,12 @@ BEGIN
     DEFPUSHBUTTON   "OK",IDOK,141,129,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,81,129,50,14
     GROUPBOX        "Show columns",IDC_GROUP_SHOW,7,17,124,100
-    LISTBOX         IDC_LIST_SHOW,42,31,83,79,LBS_NOINTEGRALHEIGHT | 
+    LISTBOX         IDC_LIST_SHOW,42,31,83,79,LBS_NOINTEGRALHEIGHT |
                     LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "&Up",IDC_UP,13,43,23,13
     PUSHBUTTON      "&Down",IDC_DOWN,13,67,23,13
     GROUPBOX        "Hide columns",IDC_GROUP_HIDE,181,17,85,103
-    LISTBOX         IDC_LIST_HIDE,192,31,66,79,LBS_NOINTEGRALHEIGHT | 
+    LISTBOX         IDC_LIST_HIDE,192,31,66,79,LBS_NOINTEGRALHEIGHT |
                     LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "<==",IDC_ADD,141,41,29,11
     PUSHBUTTON      "==>",IDC_REMOVE,141,76,29,11
@@ -615,7 +616,7 @@ END
 //
 
 #ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
+GUIDELINES DESIGNINFO DISCARDABLE
 BEGIN
     IDD_ABOUTBOX, DIALOG
     BEGIN
@@ -773,16 +774,16 @@ IDB_FILESKIP            BITMAP  DISCARDABLE     "res\\fileskip.bmp"
 IDD_PROP_VSS DLGINIT
 BEGIN
     IDC_VER_SYS, 0x403, 5, 0
-0x6f4e, 0x656e, "\000" 
+0x6f4e, 0x656e, "\000"
     IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065, 
-0x6c28, 0x7365, 0x2073, 0x6874, 0x6e61, 0x3520, 0x302e, 0x0029, 
+0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
+0x6c28, 0x7365, 0x2073, 0x6874, 0x6e61, 0x3520, 0x302e, 0x0029,
     IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065, 
-0x3528, 0x302e, 0x6120, 0x646e, 0x6120, 0x6f62, 0x6576, 0x0029, 
+0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
+0x3528, 0x302e, 0x6120, 0x646e, 0x6120, 0x6f62, 0x6576, 0x0029,
     IDC_VER_SYS, 0x403, 19, 0
-0x6152, 0x6974, 0x6e6f, 0x6c61, 0x4320, 0x656c, 0x7261, 0x6143, 0x6573, 
-"\000" 
+0x6152, 0x6974, 0x6e6f, 0x6c61, 0x4320, 0x656c, 0x7261, 0x6143, 0x6573,
+"\000"
     0
 END
 
@@ -799,14 +800,14 @@ IDR_MARGIN_CURSOR       CURSOR  DISCARDABLE     "res\\mg_cur.cur"
 // String Table
 //
 
-STRINGTABLE PRELOAD DISCARDABLE 
+STRINGTABLE PRELOAD DISCARDABLE
 BEGIN
     IDR_MAINFRAME           "WinMerge"
     IDR_MERGETYPE           "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
     IDS_WINMERGE_THIS_DIRECTORY "WinMerge this directory"
 END
 
-STRINGTABLE PRELOAD DISCARDABLE 
+STRINGTABLE PRELOAD DISCARDABLE
 BEGIN
     IDS_VERSION_FMT         "Version %1"
     IDS_ALLFILES            "All Files (*.*)|*.*||"
@@ -824,13 +825,13 @@ BEGIN
     IDS_CANT_COMPARE_FILES  "Unable to compare files"
 END
 
-STRINGTABLE PRELOAD DISCARDABLE 
+STRINGTABLE PRELOAD DISCARDABLE
 BEGIN
     AFX_IDS_APP_TITLE       "WinMerge"
     AFX_IDS_IDLEMESSAGE     "Ready"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     ID_INDICATOR_EXT        "EXT"
     ID_INDICATOR_CAPS       "CAP"
@@ -840,7 +841,7 @@ BEGIN
     ID_INDICATOR_REC        "REC"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     ID_FILE_NEW             "Create a new document\nNew"
     ID_FILE_OPEN            "Open an existing document\nOpen (Ctrl+O)"
@@ -853,13 +854,13 @@ BEGIN
     ID_FILE_PRINT_PREVIEW   "Display full pages\nPrint Preview"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     ID_APP_ABOUT            "Display program information, version number and copyright\nAbout"
     ID_APP_EXIT             "Quit the application; prompts to save documents\nExit"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     ID_FILE_MRU_FILE1       "Open this document"
     ID_FILE_MRU_FILE2       "Open this document"
@@ -879,13 +880,13 @@ BEGIN
     ID_FILE_MRU_FILE16      "Open this document"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     ID_NEXT_PANE            "Switch to the next window pane\nNext Pane"
     ID_PREV_PANE            "Switch back to the previous window pane\nPrevious Pane"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     ID_WINDOW_NEW           "Open another window for the active document\nNew Window"
     ID_WINDOW_ARRANGE       "Arrange icons at the bottom of the window\nArrange Icons"
@@ -895,7 +896,7 @@ BEGIN
     ID_WINDOW_SPLIT         "Split the active window into panes\nSplit"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     ID_EDIT_CLEAR           "Erase the selection\nErase"
     ID_EDIT_CLEAR_ALL       "Erase everything\nErase All"
@@ -910,13 +911,13 @@ BEGIN
     ID_EDIT_REDO            "Redo the previously undone action\nRedo"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     ID_VIEW_TOOLBAR         "Show or hide the toolbar\nToggle ToolBar"
     ID_VIEW_STATUS_BAR      "Show or hide the status bar\nToggle StatusBar"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     AFX_IDS_SCSIZE          "Change the window size"
     AFX_IDS_SCMOVE          "Change the window position"
@@ -927,19 +928,19 @@ BEGIN
     AFX_IDS_SCCLOSE         "Close the active window and prompts to save the documents"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     AFX_IDS_SCRESTORE       "Restore the window to normal size"
     AFX_IDS_SCTASKLIST      "Activate Task List"
     AFX_IDS_MDICHILD        "Activate this window"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     AFX_IDS_PREVIEW_CLOSE   "Close print preview mode\nCancel Preview"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     ID_L2R                  "Copy the selected text to the right file\nCopy Right (Alt Right)"
     ID_R2L                  "Copy the selected text to the left file\nCopy Left (Alt Left)"
@@ -947,13 +948,13 @@ BEGIN
     ID_OPTIONS_SHOWDIFFERENT "Displays files that have differences"
     ID_PREVDIFF             "Scroll to the previous difference\nPrev Diff (Alt Up)"
     ID_NEXTDIFF             "Scroll to the next difference\nNext Diff (Alt Down)"
-    ID_OPTIONS_BACKUPORIGINALFILE 
+    ID_OPTIONS_BACKUPORIGINALFILE
                             "Save a copy of the original as *.bak\nBackup"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
-    ID_OPTIONS_SCROLLTOFIRSTDIFFERENCE 
+    ID_OPTIONS_SCROLLTOFIRSTDIFFERENCE
                             "Automatically scrolls to the first difference\nScroll First"
     ID_OPTIONS_IGNOREWHITESPACE "Disregards whitespace when comparing files"
     ID_HIDE_BACKUP_FILES    "Hides files with extension BAK"
@@ -967,7 +968,7 @@ BEGIN
     ID_DIR_COPY_FILE_TO_LEFT "Copy selected file to named directory"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     ID_DIR_COPY_FILE_TO_RIGHT "Copy selected file to named directory"
     ID_VIEW_LANGUAGE        "Select the current user interfacce language\nLanguage"
@@ -980,20 +981,22 @@ BEGIN
     ID_DIR_DEL_RIGHT        "Delete selected item on right"
     ID_DIFFSTATUS           "placeholder for status count"
     ID_OPTIONS_SHOWUNIQUELEFT "Displays files that exist in only on left side"
-    ID_OPTIONS_SHOWUNIQUERIGHT 
+    ID_OPTIONS_SHOWUNIQUERIGHT
                             "Displays files that exist in only on right side"
     ID_DIR_DEL_BOTH         "Delete selected item(s) on both sides"
     ID_DIR_OPEN_LEFT        "Open left file"
     ID_DIR_OPEN_LEFT_WITH   "Open left file with ..."
     ID_DIR_OPEN_RIGHT       "Open right file"
+    ID_FILE_RIGHT_READONLY  "Change right file/dir read-only status"
+    ID_OPTIONS_SHOWSKIPPED  "Displays skipped files"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_SAVE_AS_TITLE       "Save As"
-    IDS_SELECT_FILES_OR_FOLDERS 
+    IDS_SELECT_FILES_OR_FOLDERS
                             "Your selections must be either both files or both folders"
-    IDS_BACKUP_FAILED_PROMPT 
+    IDS_BACKUP_FAILED_PROMPT
                             "Unable to backup original file.\nContinue anyway?"
     IDS_OPTIONS_TITLE       "Options"
     IDS_OPEN_TITLE          "Open"
@@ -1010,7 +1013,7 @@ BEGIN
     IDS_NOPROJECT           "You must specify a SourceSafe project path in order to continue (ie:  $/MyProject)"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_COLHDR_FILENAME     "Filename"
     IDS_COLHDR_DIR          "Directory"
@@ -1022,17 +1025,17 @@ BEGIN
     IDS_CC_CMD              "&Path to cleartool.exe :"
     IDS_VSS_CMD             "&Path to SS.EXE :"
     IDS_VSS_RUN_ERROR       "Error executing versioning system command."
-    IDS_DIFF_OPEN_NO_SET_PROPS 
+    IDS_DIFF_OPEN_NO_SET_PROPS
                             "Modifications have been made to the current file comparison session.  Some settings may not take place until the current file comparison is restarted."
     IDS_COLHDR_LTIMEM       "Left Date"
     IDS_COLHDR_RTIMEM       "Right Date"
     IDS_COLHDR_EXTENSION    "Extension"
-    IDS_CONFIRM_DELETE_ITEMS 
+    IDS_CONFIRM_DELETE_ITEMS
                             "Are you sure you want to delete %1 of %2 selected item(s) ?"
     IDS_DEL_LEFT_FMT        "Delete left side %1 of %2 selected item(s)"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_DEL_RIGHT_FMT       "Delete right side %1 of %2 selected item(s)"
     IDS_DELETE_FILE_FAILED  "Delete file %1 failed: %2"
@@ -1052,7 +1055,7 @@ BEGIN
     IDS_BIN_FILES_SAME      "Binary files are identical"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     ID_DIR_OPEN_RIGHT_WITH  "Open right file with..."
     ID_OPTIONS_SHOWBINARIES "Displays binary files"
@@ -1063,17 +1066,16 @@ BEGIN
     ID_EDITOR_COPY_FILENAME "Copy Filename"
     ID_VIEW_DETAIL_BAR      "Toggle Diff Pane"
     ID_FILE_LEFT_READONLY   "Change left file/dir read-only status"
-    ID_FILE_RIGHT_READONLY  "Change right file/dir read-only status"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     ID_EOL_TO_DOS           "Convert EOL to DOS mode"
     ID_EOL_TO_UNIX          "Convert EOL to UNIX mode"
     ID_EOL_TO_MAC           "Convert EOL to MAC mode"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_FILESAVE_FAILED     "Saving %1 failed. Would you like to save the file under a different name?"
     IDS_ERROR_FILE_NOT_FOUND "File not found: %1"
@@ -1093,7 +1095,7 @@ BEGIN
     IDS_COLHDR_RVERSION     "Right File Version"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_LEFTONLY            "Left Only"
     IDS_RIGHTONLY           "Right Only"
@@ -1105,12 +1107,12 @@ BEGIN
     IDS_STATUSBAR_READONLY  "RO"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_PRIVATEBUILD_FMT    "Private Build: %1"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_NUM_REPLACED        "Replaced %1 string(s)."
     IDS_EDIT_TEXT_NOT_FOUND "Cannot find string""%s"""
@@ -1119,13 +1121,13 @@ BEGIN
     IDS_LINE_STATUS_INFO    "Line: %s Characters: %d"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDC_STATIC_TITLE_LEFT   "Right click on the path to copy"
     IDC_STATIC_TITLE_RIGHT  "Right click on the path to copy"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_AFRIKAANS           "Afrikaans"
     IDS_ALBANIAN            "Albanian"
@@ -1142,7 +1144,7 @@ BEGIN
     IDS_ARABIC_JORDAN       "Arabic (Jordan)"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_ARABIC_LEBANON      "Arabic (Lebanon)"
     IDS_ARABIC_KUWAIT       "Arabic (Kuwait)"
@@ -1162,7 +1164,7 @@ BEGIN
     IDS_CHINESE_SINGAPORE   "Chinese (Singapore)"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_CHINESE_MACAU       "Chinese (Macau SAR)"
     IDS_CROATIAN            "Croatian"
@@ -1182,7 +1184,7 @@ BEGIN
     IDS_ENGLISH_BELIZE      "English (Belize)"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_ENGLISH_TRINIDAD    "English (Trinidad)"
     IDS_ENGLISH_ZIMBABWE    "English (Zimbabwe)"
@@ -1202,7 +1204,7 @@ BEGIN
     IDS_GERMAN_SWISS        "Deutsch (Schweiz)"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_GERMAN_AUSTRIAN     "Deutsch (Österreich)"
     IDS_GERMAN_LUXEMBOURG   "Deutsch (Luxemburg)"
@@ -1222,7 +1224,7 @@ BEGIN
     IDS_KOREAN_JOHAB        "Korean (Johab)"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_LATVIAN             "Latvian"
     IDS_LITHUANIAN          "Lithuanian"
@@ -1242,7 +1244,7 @@ BEGIN
     IDS_SINDHI              "Sindhi"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_SLOVAK              "Slovak"
     IDS_SLOVENIAN           "Slovensko"
@@ -1262,7 +1264,7 @@ BEGIN
     IDS_SPANISH_URUGUAY     "Español (Uruguay)"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_SPANISH_PARAGUAY    "Español (Paraguay)"
     IDS_SPANISH_BOLIVIA     "Español (Bolivia)"
@@ -1282,7 +1284,7 @@ BEGIN
     IDS_URDU_INDIA          "Urdu (India)"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_UZBEK_LATIN         "Uzbek (Latin)"
     IDS_UZBEK_CYRILLIC      "Uzbek (Cyrillic)"

diff --git a/Src/readme.txt b/Src/readme.txt
index 5db5f92..570ae6d 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -2,6 +2,9 @@
  PATCH: [ 781013 ] 256 Color icon
   Applying to languages
   Languages/res: Merge.ico
+ PATCH: [ 806785 ] Add menuitem to show/hide skipped files
+  WinMerge: MainFrm.h MainFrm.cpp Merge.rc resource.h
+  Languages: *.rc resource.h
 
 2003-09-15 Kimmo
  BUG: [ 806552 ] DirView icons missing?

diff --git a/Src/resource.h b/Src/resource.h
index 7f57061..09d8998 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -415,6 +415,7 @@
 #define ID_EOL_TO_DOS                   32836
 #define ID_EOL_TO_UNIX                  32837
 #define ID_EOL_TO_MAC                   32838
+#define ID_OPTIONS_SHOWSKIPPED          32839
 
 // Next default values for new objects
 // 
@@ -422,7 +423,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        118
-#define _APS_NEXT_COMMAND_VALUE         32839
+#define _APS_NEXT_COMMAND_VALUE         32840
 #define _APS_NEXT_CONTROL_VALUE         1064
 #define _APS_NEXT_SYMED_VALUE           108
 #endif