From: Perry Rapp Date: Wed, 20 Aug 2003 16:37:51 +0000 (+0000) Subject: Updated color property page in Korean (patch#768740). X-Git-Tag: 2.16.5~7845 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=87d5318be2dee136a5d6ec14396b4f14fd95b287;p=winmerge-jp%2Fwinmerge-jp.git Updated color property page in Korean (patch#768740). --- diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc index d91a2936b..02c8898bb 100644 --- a/Src/Languages/Korean/MergeKorean.rc +++ b/Src/Languages/Korean/MergeKorean.rc @@ -433,14 +433,29 @@ STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "»ö»ó" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - LTEXT "´Ù¸¥ ºÎºÐ:",IDC_STATIC,15,18,50,8 + LTEXT "´Ù¸¥ ºÎºÐ:",IDC_STATIC,15,29,50,8 CONTROL "Dif",IDC_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,83,15,17,14,WS_EX_TRANSPARENT | + WS_TABSTOP,83,29,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - LTEXT "¼±ÅÃµÈ ´Ù¸¥ ºÎºÐ:",IDC_STATIC,14,36,66,8 + LTEXT "¼±ÅÃµÈ ´Ù¸¥ ºÎºÐ:",IDC_STATIC,14,49,66,8 CONTROL "Dif",IDC_SEL_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,83,33,17,14,WS_EX_TRANSPARENT | + WS_TABSTOP,83,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 | + 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 DIALOGEX 0, 0, 278, 157 diff --git a/Src/readme.txt b/Src/readme.txt index 6e0abb950..60d272a47 100644 --- a/Src/readme.txt +++ b/Src/readme.txt @@ -3,6 +3,8 @@ WinMerge: DirView.cpp Fix color dialog in Norwegian (Earlier today I forgot to move down the previous labels). Languages\Norwegian: Norwegian/MergeNorwegian.rc + Updated color property page in Korean (patch#768740). + Languages\Korean: MergeKorean.rc 2003-08-20 Kimmo PATCH: [ 791263 ] Remove CStringEx from OpenDlg (and from WinMerge?)