Format resource file

diff --git a/Src/Merge.rc b/Src/Merge.rc
index fcb54c3..79fe612 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -83,7 +83,7 @@ BEGIN
         POPUP "Op&en"\r
         BEGIN\r
             MENUITEM "with &Registered Application", ID_FILE_OPEN_REGISTERED\r
-            MENUITEM "with &External Editor\tCtrl+Alt+E",       ID_FILE_OPEN_WITHEDITOR\r
+            MENUITEM "with &External Editor\tCtrl+Alt+E", ID_FILE_OPEN_WITHEDITOR\r
             MENUITEM "&with...",                    ID_FILE_OPEN_WITH\r
         END\r
     END\r
@@ -464,13 +464,13 @@ BEGIN
         MENUITEM SEPARATOR\r
         POPUP "&Diff Context"\r
         BEGIN\r
-            MENUITEM "&All Lines",                        ID_VIEW_DIFFCONTEXT_ALL\r
-            MENUITEM "&0 Lines",                          ID_VIEW_DIFFCONTEXT_0\r
-            MENUITEM "&1 Line",                           ID_VIEW_DIFFCONTEXT_1\r
-            MENUITEM "&3 Lines",                          ID_VIEW_DIFFCONTEXT_3\r
-            MENUITEM "&5 Lines",                          ID_VIEW_DIFFCONTEXT_5\r
-            MENUITEM "&7 Lines",                          ID_VIEW_DIFFCONTEXT_7\r
-            MENUITEM "&9 Lines",                          ID_VIEW_DIFFCONTEXT_9\r
+            MENUITEM "&All Lines",                  ID_VIEW_DIFFCONTEXT_ALL\r
+            MENUITEM "&0 Lines",                    ID_VIEW_DIFFCONTEXT_0\r
+            MENUITEM "&1 Line",                     ID_VIEW_DIFFCONTEXT_1\r
+            MENUITEM "&3 Lines",                    ID_VIEW_DIFFCONTEXT_3\r
+            MENUITEM "&5 Lines",                    ID_VIEW_DIFFCONTEXT_5\r
+            MENUITEM "&7 Lines",                    ID_VIEW_DIFFCONTEXT_7\r
+            MENUITEM "&9 Lines",                    ID_VIEW_DIFFCONTEXT_9\r
             MENUITEM "&Toggle All and 0-9 Lines\tCtrl+D", ID_VIEW_DIFFCONTEXT_TOGGLE\r
         END\r
         MENUITEM SEPARATOR\r
@@ -791,7 +791,7 @@ BEGIN
     "A",            ID_EDIT_SELECT_ALL,     VIRTKEY, CONTROL, NOINVERT\r
     "C",            ID_EDIT_COPY,           VIRTKEY, CONTROL, NOINVERT\r
     "D",            ID_VIEW_DIFFCONTEXT_TOGGLE, VIRTKEY, CONTROL, NOINVERT\r
-       "E",            ID_FILE_OPEN_WITHEDITOR, VIRTKEY, ALT, CONTROL, NOINVERT\r
+    "E",            ID_FILE_OPEN_WITHEDITOR, VIRTKEY, CONTROL, ALT, NOINVERT\r
     "C",            ID_EDIT_COPY_LINENUMBERS, VIRTKEY, SHIFT, CONTROL, NOINVERT\r
     "F",            ID_EDIT_FIND,           VIRTKEY, CONTROL, NOINVERT\r
     "G",            ID_EDIT_WMGOTO,         VIRTKEY, CONTROL, NOINVERT\r
@@ -1682,16 +1682,15 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,36,222,10\r
     CONTROL         "&Include unique subfolders contents",IDC_COMPARE_WALKSUBDIRS,\r
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,48,202,10\r
-    CONTROL         "&Include Subfolders",IDC_RECURS_CHECK,\r
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,202,10\r
+    CONTROL         "&Include Subfolders",IDC_RECURS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,202,10\r
     CONTROL         "&Automatically expand all subfolders",IDC_EXPAND_SUBDIRS,\r
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,72,202,10\r
     CONTROL         "Ignore &Reparse Points",IDC_IGNORE_REPARSEPOINTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,84,202,10\r
     LTEXT           "&Quick compare limit (MB):",IDC_STATIC,7,96,200,10\r
-    EDITTEXT        IDC_COMPARE_QUICKC_LIMIT,7,108,30,14,ES_AUTOHSCROLL,\r
+    EDITTEXT        IDC_COMPARE_QUICKC_LIMIT,7,108,30,14,ES_AUTOHSCROLL\r
     PUSHBUTTON      "Defaults",IDC_COMPAREFOLDER_DEFAULTS,7,198,70,14\r
     LTEXT           "&Number of compare threads (a negative value implies addition of the number of available CPU cores):",IDC_STATIC,7,124,200,30\r
-    EDITTEXT        IDC_COMPARE_THREAD_COUNT,7,156,30,14,ES_AUTOHSCROLL,\r
+    EDITTEXT        IDC_COMPARE_THREAD_COUNT,7,156,30,14,ES_AUTOHSCROLL\r
 END\r
 \r
 IDD_PROPPAGE_COMPARE_BINARY DIALOGEX 0, 0, 235, 205\r

diff --git a/Src/resource.h b/Src/resource.h
index 37de78b..912f14b 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -1209,16 +1209,16 @@
 #define IDC_COMPAREBINARY_CHARACTERSET  33391\r
 #define IDC_COMPAREBINARY_DEFAULTS      33392\r
 #define ID_HELP_CHECKFORUPDATES         33393\r
-#define IDS_UNPACK_AUTO                 33394\r
-#define IDS_NO_PREDIFFER                33395\r
-#define IDS_SUGGESTED_PLUGINS           33396\r
-#define IDS_NOT_SUGGESTED_PLUGINS       33397\r
 #define IDS_COMPMETHOD_FULL_CONTENTS    33398\r
 #define IDS_COMPMETHOD_QUICK_CONTENTS   33399\r
 #define IDS_COMPMETHOD_BINARY_CONTENTS  33400\r
 #define IDS_COMPMETHOD_MODDATE          33401\r
 #define IDS_COMPMETHOD_DATESIZE         33402\r
 #define IDS_COMPMETHOD_SIZE             33403\r
+#define IDS_UNPACK_AUTO                 33494\r
+#define IDS_NO_PREDIFFER                33495\r
+#define IDS_SUGGESTED_PLUGINS           33496\r
+#define IDS_NOT_SUGGESTED_PLUGINS       33497\r
 #define IDS_PRIVATEBUILD_FMT            33501\r
 #define IDS_CHECKFORUPDATES_UPTODATE    33502\r
 #define IDS_CHECKFORUPDATES_NEWVERSION  33503\r