PATCH: [ 773296 ] Add shell integration

diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
index 23bc063..583fbe5 100644 (file)
--- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
+++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
@@ -461,6 +461,11 @@ FONT 9, "
 BEGIN
     CONTROL         "ͬÎļþ¼Ð¹ØÁª",IDC_ASSOC_DIRECTORY,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,7,7,221,15
+    CONTROL         "Add to explorer context menu",IDC_EXPLORER_CONTEXT,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,108,10
+    EDITTEXT        IDC_WINMERGE_PATH,7,34,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Browse...",IDC_WINMERGE_PATH_BROWSE,180,34,50,14
+    PUSHBUTTON      "Save path",IDC_WINMERGE_PATH_SAVE,8,51,50,14
 END
 
 

diff --git a/Src/Languages/ChineseSimplified/resource.h b/Src/Languages/ChineseSimplified/resource.h
index 5a22640..be30800 100644 (file)
--- a/Src/Languages/ChineseSimplified/resource.h
+++ b/Src/Languages/ChineseSimplified/resource.h
@@ -159,6 +159,10 @@
 #define IDC_DIFFERENCE_DELETED_COLOR    1041
 #define IDC_SEL_DIFFERENCE_DELETED_COLOR 1042
 #define IDC_SEL_DIFFERENCE_TEXT_COLOR   1043
+#define IDC_EXPLORER_CONTEXT            1044
+#define IDC_WINMERGE_PATH_BROWSE        1045
+#define IDC_WINMERGE_PATH               1046
+#define IDC_WINMERGE_PATH_SAVE          1047
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO            8503
@@ -365,7 +369,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        114
 #define _APS_NEXT_COMMAND_VALUE         32822
-#define _APS_NEXT_CONTROL_VALUE         1044
+#define _APS_NEXT_CONTROL_VALUE         1048
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif

diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
index a7fff84..ff287ff 100644 (file)
--- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
+++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
@@ -460,6 +460,11 @@ FONT 9, "
 BEGIN
     CONTROL         "ÃöÁp¨ì¸ê®Æ§¨",IDC_ASSOC_DIRECTORY,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,7,7,221,15
+    CONTROL         "Add to explorer context menu",IDC_EXPLORER_CONTEXT,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,108,10
+    EDITTEXT        IDC_WINMERGE_PATH,7,34,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Browse...",IDC_WINMERGE_PATH_BROWSE,180,34,50,14
+    PUSHBUTTON      "Save path",IDC_WINMERGE_PATH_SAVE,8,51,50,14
 END
 
 

diff --git a/Src/Languages/ChineseTraditional/resource.h b/Src/Languages/ChineseTraditional/resource.h
index 5a22640..be30800 100644 (file)
--- a/Src/Languages/ChineseTraditional/resource.h
+++ b/Src/Languages/ChineseTraditional/resource.h
@@ -159,6 +159,10 @@
 #define IDC_DIFFERENCE_DELETED_COLOR    1041
 #define IDC_SEL_DIFFERENCE_DELETED_COLOR 1042
 #define IDC_SEL_DIFFERENCE_TEXT_COLOR   1043
+#define IDC_EXPLORER_CONTEXT            1044
+#define IDC_WINMERGE_PATH_BROWSE        1045
+#define IDC_WINMERGE_PATH               1046
+#define IDC_WINMERGE_PATH_SAVE          1047
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO            8503
@@ -365,7 +369,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        114
 #define _APS_NEXT_COMMAND_VALUE         32822
-#define _APS_NEXT_CONTROL_VALUE         1044
+#define _APS_NEXT_CONTROL_VALUE         1048
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif

diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc
index 6275520..e23dabb 100644 (file)
--- a/Src/Languages/Czech/MergeCzech.rc
+++ b/Src/Languages/Czech/MergeCzech.rc
@@ -495,6 +495,11 @@ FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
     CONTROL         "Associated with directories",IDC_ASSOC_DIRECTORY,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,7,221,15
+    CONTROL         "Add to explorer context menu",IDC_EXPLORER_CONTEXT,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,108,10
+    EDITTEXT        IDC_WINMERGE_PATH,7,34,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Browse...",IDC_WINMERGE_PATH_BROWSE,180,34,50,14
+    PUSHBUTTON      "Save path",IDC_WINMERGE_PATH_SAVE,8,51,50,14
 END
 
 

diff --git a/Src/Languages/Czech/resource.h b/Src/Languages/Czech/resource.h
index 5a22640..be30800 100644 (file)
--- a/Src/Languages/Czech/resource.h
+++ b/Src/Languages/Czech/resource.h
@@ -159,6 +159,10 @@
 #define IDC_DIFFERENCE_DELETED_COLOR    1041
 #define IDC_SEL_DIFFERENCE_DELETED_COLOR 1042
 #define IDC_SEL_DIFFERENCE_TEXT_COLOR   1043
+#define IDC_EXPLORER_CONTEXT            1044
+#define IDC_WINMERGE_PATH_BROWSE        1045
+#define IDC_WINMERGE_PATH               1046
+#define IDC_WINMERGE_PATH_SAVE          1047
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO            8503
@@ -365,7 +369,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        114
 #define _APS_NEXT_COMMAND_VALUE         32822
-#define _APS_NEXT_CONTROL_VALUE         1044
+#define _APS_NEXT_CONTROL_VALUE         1048
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif

diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc
index 54117cc..5e2d665 100644 (file)
--- a/Src/Languages/Danish/MergeDanish.rc
+++ b/Src/Languages/Danish/MergeDanish.rc
@@ -493,6 +493,11 @@ FONT 8, "MS Sans Serif"
 BEGIN
     CONTROL         "Associeret med mapper",IDC_ASSOC_DIRECTORY,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,7,221,15
+    CONTROL         "Add to explorer context menu",IDC_EXPLORER_CONTEXT,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,108,10
+    EDITTEXT        IDC_WINMERGE_PATH,7,34,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Browse...",IDC_WINMERGE_PATH_BROWSE,180,34,50,14
+    PUSHBUTTON      "Save path",IDC_WINMERGE_PATH_SAVE,8,51,50,14
 END
 
 

diff --git a/Src/Languages/Danish/resource.h b/Src/Languages/Danish/resource.h
index 5a22640..be30800 100644 (file)
--- a/Src/Languages/Danish/resource.h
+++ b/Src/Languages/Danish/resource.h
@@ -159,6 +159,10 @@
 #define IDC_DIFFERENCE_DELETED_COLOR    1041
 #define IDC_SEL_DIFFERENCE_DELETED_COLOR 1042
 #define IDC_SEL_DIFFERENCE_TEXT_COLOR   1043
+#define IDC_EXPLORER_CONTEXT            1044
+#define IDC_WINMERGE_PATH_BROWSE        1045
+#define IDC_WINMERGE_PATH               1046
+#define IDC_WINMERGE_PATH_SAVE          1047
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO            8503
@@ -365,7 +369,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        114
 #define _APS_NEXT_COMMAND_VALUE         32822
-#define _APS_NEXT_CONTROL_VALUE         1044
+#define _APS_NEXT_CONTROL_VALUE         1048
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif

diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc
index 9120d94..0abf93b 100644 (file)
--- a/Src/Languages/Dutch/MergeDutch.rc
+++ b/Src/Languages/Dutch/MergeDutch.rc
@@ -497,6 +497,11 @@ FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
     CONTROL         "Associated with directories",IDC_ASSOC_DIRECTORY,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,7,221,15
+    CONTROL         "Add to explorer context menu",IDC_EXPLORER_CONTEXT,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,108,10
+    EDITTEXT        IDC_WINMERGE_PATH,7,34,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Browse...",IDC_WINMERGE_PATH_BROWSE,180,34,50,14
+    PUSHBUTTON      "Save path",IDC_WINMERGE_PATH_SAVE,8,51,50,14
 END
 
 

diff --git a/Src/Languages/Dutch/resource.h b/Src/Languages/Dutch/resource.h
index 5a22640..be30800 100644 (file)
--- a/Src/Languages/Dutch/resource.h
+++ b/Src/Languages/Dutch/resource.h
@@ -159,6 +159,10 @@
 #define IDC_DIFFERENCE_DELETED_COLOR    1041
 #define IDC_SEL_DIFFERENCE_DELETED_COLOR 1042
 #define IDC_SEL_DIFFERENCE_TEXT_COLOR   1043
+#define IDC_EXPLORER_CONTEXT            1044
+#define IDC_WINMERGE_PATH_BROWSE        1045
+#define IDC_WINMERGE_PATH               1046
+#define IDC_WINMERGE_PATH_SAVE          1047
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO            8503
@@ -365,7 +369,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        114
 #define _APS_NEXT_COMMAND_VALUE         32822
-#define _APS_NEXT_CONTROL_VALUE         1044
+#define _APS_NEXT_CONTROL_VALUE         1048
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif

diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc
index 8e74b8c..9e3bbb9 100644 (file)
--- a/Src/Languages/French/MergeFrench.rc
+++ b/Src/Languages/French/MergeFrench.rc
@@ -497,6 +497,11 @@ FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
     CONTROL         "Associe avec les répertoires",IDC_ASSOC_DIRECTORY,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,221,15
+    CONTROL         "Add to explorer context menu",IDC_EXPLORER_CONTEXT,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,108,10
+    EDITTEXT        IDC_WINMERGE_PATH,7,34,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Browse...",IDC_WINMERGE_PATH_BROWSE,180,34,50,14
+    PUSHBUTTON      "Save path",IDC_WINMERGE_PATH_SAVE,8,51,50,14
 END
 
 

diff --git a/Src/Languages/French/resource.h b/Src/Languages/French/resource.h
index 5a22640..be30800 100644 (file)
--- a/Src/Languages/French/resource.h
+++ b/Src/Languages/French/resource.h
@@ -159,6 +159,10 @@
 #define IDC_DIFFERENCE_DELETED_COLOR    1041
 #define IDC_SEL_DIFFERENCE_DELETED_COLOR 1042
 #define IDC_SEL_DIFFERENCE_TEXT_COLOR   1043
+#define IDC_EXPLORER_CONTEXT            1044
+#define IDC_WINMERGE_PATH_BROWSE        1045
+#define IDC_WINMERGE_PATH               1046
+#define IDC_WINMERGE_PATH_SAVE          1047
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO            8503
@@ -365,7 +369,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        114
 #define _APS_NEXT_COMMAND_VALUE         32822
-#define _APS_NEXT_CONTROL_VALUE         1044
+#define _APS_NEXT_CONTROL_VALUE         1048
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif

diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc
index 2731aeb..5a3c911 100644 (file)
--- a/Src/Languages/German/MergeGerman.rc
+++ b/Src/Languages/German/MergeGerman.rc
@@ -501,6 +501,11 @@ BEGIN
     CONTROL         "mit Verzeichnissen verknüpfen (Explorer-Kontextmenü)",
                     IDC_ASSOC_DIRECTORY,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,7,7,221,15
+    CONTROL         "Add to explorer context menu",IDC_EXPLORER_CONTEXT,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,108,10
+    EDITTEXT        IDC_WINMERGE_PATH,7,34,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Browse...",IDC_WINMERGE_PATH_BROWSE,180,34,50,14
+    PUSHBUTTON      "Save path",IDC_WINMERGE_PATH_SAVE,8,51,50,14
 END
 
 

diff --git a/Src/Languages/German/resource.h b/Src/Languages/German/resource.h
index 5a22640..be30800 100644 (file)
--- a/Src/Languages/German/resource.h
+++ b/Src/Languages/German/resource.h
@@ -159,6 +159,10 @@
 #define IDC_DIFFERENCE_DELETED_COLOR    1041
 #define IDC_SEL_DIFFERENCE_DELETED_COLOR 1042
 #define IDC_SEL_DIFFERENCE_TEXT_COLOR   1043
+#define IDC_EXPLORER_CONTEXT            1044
+#define IDC_WINMERGE_PATH_BROWSE        1045
+#define IDC_WINMERGE_PATH               1046
+#define IDC_WINMERGE_PATH_SAVE          1047
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO            8503
@@ -365,7 +369,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        114
 #define _APS_NEXT_COMMAND_VALUE         32822
-#define _APS_NEXT_CONTROL_VALUE         1044
+#define _APS_NEXT_CONTROL_VALUE         1048
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif

diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc
index f76085a..179cf43 100644 (file)
--- a/Src/Languages/Italian/MergeItalian.rc
+++ b/Src/Languages/Italian/MergeItalian.rc
@@ -494,6 +494,11 @@ FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
     CONTROL         "Associated with directories",IDC_ASSOC_DIRECTORY,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,7,221,15
+    CONTROL         "Add to explorer context menu",IDC_EXPLORER_CONTEXT,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,108,10
+    EDITTEXT        IDC_WINMERGE_PATH,7,34,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Browse...",IDC_WINMERGE_PATH_BROWSE,180,34,50,14
+    PUSHBUTTON      "Save path",IDC_WINMERGE_PATH_SAVE,8,51,50,14
 END
 
 

diff --git a/Src/Languages/Italian/resource.h b/Src/Languages/Italian/resource.h
index 5a22640..be30800 100644 (file)
--- a/Src/Languages/Italian/resource.h
+++ b/Src/Languages/Italian/resource.h
@@ -159,6 +159,10 @@
 #define IDC_DIFFERENCE_DELETED_COLOR    1041
 #define IDC_SEL_DIFFERENCE_DELETED_COLOR 1042
 #define IDC_SEL_DIFFERENCE_TEXT_COLOR   1043
+#define IDC_EXPLORER_CONTEXT            1044
+#define IDC_WINMERGE_PATH_BROWSE        1045
+#define IDC_WINMERGE_PATH               1046
+#define IDC_WINMERGE_PATH_SAVE          1047
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO            8503
@@ -365,7 +369,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        114
 #define _APS_NEXT_COMMAND_VALUE         32822
-#define _APS_NEXT_CONTROL_VALUE         1044
+#define _APS_NEXT_CONTROL_VALUE         1048
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif

diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc
index 716ec30..b2b17e4 100644 (file)
--- a/Src/Languages/Korean/MergeKorean.rc
+++ b/Src/Languages/Korean/MergeKorean.rc
@@ -448,6 +448,11 @@ FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
     CONTROL         "µð·ºÅ丮¿Í ¿¬°è",IDC_ASSOC_DIRECTORY,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,7,221,15
+    CONTROL         "Add to explorer context menu",IDC_EXPLORER_CONTEXT,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,108,10
+    EDITTEXT        IDC_WINMERGE_PATH,7,34,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Browse...",IDC_WINMERGE_PATH_BROWSE,180,34,50,14
+    PUSHBUTTON      "Save path",IDC_WINMERGE_PATH_SAVE,8,51,50,14
 END
 
 

diff --git a/Src/Languages/Korean/resource.h b/Src/Languages/Korean/resource.h
index 5a22640..be30800 100644 (file)
--- a/Src/Languages/Korean/resource.h
+++ b/Src/Languages/Korean/resource.h
@@ -159,6 +159,10 @@
 #define IDC_DIFFERENCE_DELETED_COLOR    1041
 #define IDC_SEL_DIFFERENCE_DELETED_COLOR 1042
 #define IDC_SEL_DIFFERENCE_TEXT_COLOR   1043
+#define IDC_EXPLORER_CONTEXT            1044
+#define IDC_WINMERGE_PATH_BROWSE        1045
+#define IDC_WINMERGE_PATH               1046
+#define IDC_WINMERGE_PATH_SAVE          1047
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO            8503
@@ -365,7 +369,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        114
 #define _APS_NEXT_COMMAND_VALUE         32822
-#define _APS_NEXT_CONTROL_VALUE         1044
+#define _APS_NEXT_CONTROL_VALUE         1048
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif

diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc
index f2cdb53..6fd8e32 100644 (file)
--- a/Src/Languages/Slovak/MergeSlovak.rc
+++ b/Src/Languages/Slovak/MergeSlovak.rc
@@ -497,6 +497,11 @@ FONT 8, "MS Sans Serif"
 BEGIN
     CONTROL         "Priraï k adresárom",IDC_ASSOC_DIRECTORY,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,7,221,15
+    CONTROL         "Add to explorer context menu",IDC_EXPLORER_CONTEXT,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,108,10
+    EDITTEXT        IDC_WINMERGE_PATH,7,34,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Browse...",IDC_WINMERGE_PATH_BROWSE,180,34,50,14
+    PUSHBUTTON      "Save path",IDC_WINMERGE_PATH_SAVE,8,51,50,14
 END
 
 

diff --git a/Src/Languages/Slovak/resource.h b/Src/Languages/Slovak/resource.h
index 5a22640..be30800 100644 (file)
--- a/Src/Languages/Slovak/resource.h
+++ b/Src/Languages/Slovak/resource.h
@@ -159,6 +159,10 @@
 #define IDC_DIFFERENCE_DELETED_COLOR    1041
 #define IDC_SEL_DIFFERENCE_DELETED_COLOR 1042
 #define IDC_SEL_DIFFERENCE_TEXT_COLOR   1043
+#define IDC_EXPLORER_CONTEXT            1044
+#define IDC_WINMERGE_PATH_BROWSE        1045
+#define IDC_WINMERGE_PATH               1046
+#define IDC_WINMERGE_PATH_SAVE          1047
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO            8503
@@ -365,7 +369,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        114
 #define _APS_NEXT_COMMAND_VALUE         32822
-#define _APS_NEXT_CONTROL_VALUE         1044
+#define _APS_NEXT_CONTROL_VALUE         1048
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif

diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc
index 654393a..a4f9da2 100644 (file)
--- a/Src/Languages/Spanish/MergeSpanish.rc
+++ b/Src/Languages/Spanish/MergeSpanish.rc
@@ -494,6 +494,11 @@ FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
     CONTROL         "Associated with directories",IDC_ASSOC_DIRECTORY,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,7,221,15
+    CONTROL         "Add to explorer context menu",IDC_EXPLORER_CONTEXT,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,108,10
+    EDITTEXT        IDC_WINMERGE_PATH,7,34,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Browse...",IDC_WINMERGE_PATH_BROWSE,180,34,50,14
+    PUSHBUTTON      "Save path",IDC_WINMERGE_PATH_SAVE,8,51,50,14
 END
 
 

diff --git a/Src/Languages/Spanish/resource.h b/Src/Languages/Spanish/resource.h
index 5a22640..be30800 100644 (file)
--- a/Src/Languages/Spanish/resource.h
+++ b/Src/Languages/Spanish/resource.h
@@ -159,6 +159,10 @@
 #define IDC_DIFFERENCE_DELETED_COLOR    1041
 #define IDC_SEL_DIFFERENCE_DELETED_COLOR 1042
 #define IDC_SEL_DIFFERENCE_TEXT_COLOR   1043
+#define IDC_EXPLORER_CONTEXT            1044
+#define IDC_WINMERGE_PATH_BROWSE        1045
+#define IDC_WINMERGE_PATH               1046
+#define IDC_WINMERGE_PATH_SAVE          1047
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO            8503
@@ -365,7 +369,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        114
 #define _APS_NEXT_COMMAND_VALUE         32822
-#define _APS_NEXT_CONTROL_VALUE         1044
+#define _APS_NEXT_CONTROL_VALUE         1048
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif