Updated two property pages in Norwegian.

diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc
index 45c3621..ca3077e 100644 (file)
--- a/Src/Languages/Norwegian/MergeNorwegian.rc
+++ b/Src/Languages/Norwegian/MergeNorwegian.rc
@@ -456,6 +456,21 @@ BEGIN
     CONTROL         "Dif",IDC_SEL_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW |
                     WS_TABSTOP,83,33,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 | 
+                    WS_EX_CLIENTEDGE
+    CONTROL         "Dif",IDC_SEL_DIFFERENCE_DELETED_COLOR,"Button",
+                    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 | 
+                    WS_EX_CLIENTEDGE
+    CONTROL         "Dif",IDC_SEL_DIFFERENCE_TEXT_COLOR,"Button",
+                    BS_OWNERDRAW | WS_TABSTOP,184,49,17,14,WS_EX_TRANSPARENT | 
+                    WS_EX_CLIENTEDGE
+    LTEXT           "Text",IDC_STATIC,184,15,15,8
 END
 
 IDD_OUTPUT DIALOG DISCARDABLE  0, 0, 278, 157
@@ -473,8 +488,11 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Registreringer"
 FONT 8, "MS Sans Serif"
 BEGIN
-    CONTROL         "Assosiert 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,6,108,10
+    EDITTEXT        IDC_WINMERGE_PATH,7,19,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "&Browse...",IDC_WINMERGE_PATH_BROWSE,180,19,50,14
+    PUSHBUTTON      "&Save path",IDC_WINMERGE_PATH_SAVE,7,36,50,14
 END
 
 

diff --git a/Src/Languages/Norwegian/resource.h b/Src/Languages/Norwegian/resource.h
index db4495b..a7810b7 100644 (file)
--- a/Src/Languages/Norwegian/resource.h
+++ b/Src/Languages/Norwegian/resource.h
@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}
 // Microsoft Developer Studio generated include file.
-// Used by MergeNorwegian.rc
+// Used by Merge.rc
 //
 #define IDC_CUT                         3
 #define IDC_COPY                        4
@@ -22,6 +22,8 @@
 #define IDD_PROPPAGE_FILTER             111
 #define IDD_OUTPUT                      112
 #define IDD_PROPPAGE_REGISTRY           113
+#define IDD_EDITOR_HEADERBAR            114
+#define IDR_POPUP_EDITOR_HEADERBAR      115
 #define IDS_VERSION_FMT                 130
 #define IDS_ALLFILES                    131
 #define IDS_CONFIRM_ALL_LEFT            132
@@ -97,6 +99,7 @@
 #define IDS_STATUS_COPYR2L              198
 #define IDS_STATUS_COPYALL2L            199
 #define IDS_STATUS_COPYALL2R            200
+#define IDS_PROGRAMFILES                201
 #define IDB_EQUAL                       213
 #define IDB_NOTEQUAL                    214
 #define IDB_RFOLDER                     215
@@ -151,12 +154,23 @@
 #define IDC_EDIT1                       1033
 #define IDC_PROP_INSERT_TABS            1034
 #define IDC_PROP_INSERT_SPACES          1035
-#define IDC_ASSOC_DIRECTORY             1036
 #define IDC_LANGUAGE_LIST               1037
 #define IDC_AUTOMRESCAN_CHECK           1038
 #define IDC_FILE_FILTER                 1039
+#define IDC_DIFFERENCE_TEXT_COLOR       1040
+#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 IDC_STATIC_TITLE_LEFT           1048
+#define IDC_STATIC_TITLE_RIGHT          1049
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
+#define IDS_LINE_STATUS_INFO            8503
+#define IDS_EMPTY_LINE_STATUS_INFO      8504
 #define IDD_EDIT_FIND                   8601
 #define IDD_EDIT_REPLACE                8602
 #define IDC_EDIT_WHOLE_WORD             8603
@@ -350,15 +364,18 @@
 #define ID_VIEW_WHITESPACE              32818
 #define ID_REFRESH                      32819
 #define ID_EDIT_FIND_PREVIOUS           32820
+#define ID_SHOWLINEDIFF                 32821
+#define ID_EDITOR_COPY_PATH             32822
+#define ID_EDITOR_COPY_FILENAME         32823
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        114
-#define _APS_NEXT_COMMAND_VALUE         32820
-#define _APS_NEXT_CONTROL_VALUE         1040
+#define _APS_NEXT_RESOURCE_VALUE        116
+#define _APS_NEXT_COMMAND_VALUE         32822
+#define _APS_NEXT_CONTROL_VALUE         1050
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif

diff --git a/Src/readme.txt b/Src/readme.txt
index 3a39108..399be96 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,6 +1,9 @@
 2003-08-20 Perry
  Added Norwegian to batch build file
   Languages: BuildAll.bat
+ Updated two property pages in Norwegian
+  IDD_PROPPAGE_REGISTRY (patch#789504) and IDD_PROPPAGE_COLORS (patch#768740).
+  Languages: Norwegian/resource.h Norwegian/MergeNorwegian.rc
 
 2003-08-20 Christian
  PATCH: [ 791487 ] Norwegian (bokmål) translation