From: Perry Rapp <elsapo@users.sourceforge.net>
Date: Wed, 20 Aug 2003 14:28:19 +0000 (+0000)
Subject: Updated color property page in ChineseSimplified (patch#768740).
X-Git-Tag: 2.16.5~7854
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=fcd39f22571210222fd49066074cc1542046b7e6;p=winmerge-jp%2Fwinmerge-jp.git

Updated color property page in ChineseSimplified (patch#768740).
---

diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
index c7978be4a..8ae6e801c 100644
--- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
+++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
@@ -451,12 +451,27 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "ÑÕÉ«"
 FONT 9, "ËÎÌå", 0, 0, 0x1
 BEGIN
-    LTEXT           "²»Í¬:",-1,15,18,36,8
+    LTEXT           "²»Í¬:",IDC_STATIC,43,18,36,8
     CONTROL         "²»Í¬",IDC_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,83,15,17,
                     14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE
-    LTEXT           "ÒÑÑ¡Ôñ:",-1,14,36,66,8
+    LTEXT           "ÒÑÑ¡Ôñ:",IDC_STATIC,14,36,66,8
     CONTROL         "ÒÑÑ¡Ôñ",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 FIXED IMPURE  0, 0, 278, 157
diff --git a/Src/readme.txt b/Src/readme.txt
index 399be9608..da2ad231f 100644
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -3,7 +3,9 @@
   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
+  Languages\Norwegian: resource.h Norwegian/MergeNorwegian.rc
+ Updated color property page in ChineseSimplified (patch#768740).
+  Languages\ChineseSimplified: MergeChineseSimplified.rc resource.h
 
 2003-08-20 Christian
  PATCH: [ 791487 ] Norwegian (bokmål) translation