PATCH: [ 778403 ] Fix accel keys in lang files

diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
index 583fbe5..b94f069 100644 (file)
--- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
+++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
@@ -191,6 +191,7 @@ END
 
 IDR_MAINFRAME ACCELERATORS FIXED IMPURE
 BEGIN
+    "A",            ID_EDIT_SELECT_ALL,     VIRTKEY, CONTROL, NOINVERT
     "C",            ID_EDIT_COPY,                  VIRTKEY, CONTROL, NOINVERT
     "F",            ID_EDIT_FIND,                  VIRTKEY, CONTROL, NOINVERT
     "H",            ID_EDIT_REPLACE,                  VIRTKEY, CONTROL, NOINVERT
@@ -199,6 +200,9 @@ BEGIN
     "P",            ID_FILE_PRINT,                  VIRTKEY, CONTROL, NOINVERT
     "S",            ID_FILE_SAVE,                  VIRTKEY, CONTROL, NOINVERT
     "V",            ID_EDIT_PASTE,                  VIRTKEY, CONTROL, NOINVERT
+    "X",            ID_EDIT_CUT,            VIRTKEY, CONTROL, NOINVERT
+    "Y",            ID_EDIT_REDO,           VIRTKEY, CONTROL, NOINVERT
+    "Z",            ID_EDIT_UNDO,           VIRTKEY, CONTROL, NOINVERT
     VK_BACK,        ID_EDIT_UNDO,                  VIRTKEY, ALT, NOINVERT
     VK_DELETE,      ID_EDIT_CUT,                  VIRTKEY, SHIFT, NOINVERT
     VK_DOWN,        ID_NEXTDIFF,                  VIRTKEY, ALT, NOINVERT
@@ -216,7 +220,6 @@ BEGIN
     VK_RETURN,      ID_CURDIFF,                  VIRTKEY, ALT, NOINVERT
     VK_RIGHT,       ID_L2R,                  VIRTKEY, ALT, NOINVERT
     VK_UP,          ID_PREVDIFF,                  VIRTKEY, ALT, NOINVERT
-    "X",            ID_EDIT_CUT,                  VIRTKEY, CONTROL, NOINVERT
 END
 
 
@@ -964,5 +967,5 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 #include "afxprint.rc"       // printing/print preview resources
 #endif
 /////////////////////////////////////////////////////////////////////////////
-#endif    
+#endif
 // not APSTUDIO_INVOKED

diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
index ff287ff..a3eb001 100644 (file)
--- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
+++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
@@ -27,18 +27,18 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 // TEXTINCLUDE
 //
 
-1 TEXTINCLUDE DISCARDABLE 
+1 TEXTINCLUDE DISCARDABLE
 BEGIN
     "resource.h\0"
 END
 
-2 TEXTINCLUDE DISCARDABLE 
+2 TEXTINCLUDE DISCARDABLE
 BEGIN
     "#include ""afxres.h""\r\n"
     "\0"
 END
 
-3 TEXTINCLUDE DISCARDABLE 
+3 TEXTINCLUDE DISCARDABLE
 BEGIN
     "#define _AFX_NO_OLE_RESOURCES\r\n"
     "#define _AFX_NO_TRACKER_RESOURCES\r\n"
@@ -188,8 +188,9 @@ END
 // Accelerator
 //
 
-IDR_MAINFRAME ACCELERATORS FIXED IMPURE 
+IDR_MAINFRAME ACCELERATORS FIXED IMPURE
 BEGIN
+    "A",            ID_EDIT_SELECT_ALL,     VIRTKEY, CONTROL, NOINVERT
     "C",            ID_EDIT_COPY,                  VIRTKEY, CONTROL, NOINVERT
     "F",            ID_EDIT_FIND,                  VIRTKEY, CONTROL, NOINVERT
     "H",            ID_EDIT_REPLACE,                  VIRTKEY, CONTROL, NOINVERT
@@ -198,6 +199,9 @@ BEGIN
     "P",            ID_FILE_PRINT,                  VIRTKEY, CONTROL, NOINVERT
     "S",            ID_FILE_SAVE,                  VIRTKEY, CONTROL, NOINVERT
     "V",            ID_EDIT_PASTE,                  VIRTKEY, CONTROL, NOINVERT
+    "X",            ID_EDIT_CUT,            VIRTKEY, CONTROL, NOINVERT
+    "Y",            ID_EDIT_REDO,           VIRTKEY, CONTROL, NOINVERT
+    "Z",            ID_EDIT_UNDO,           VIRTKEY, CONTROL, NOINVERT
     VK_BACK,        ID_EDIT_UNDO,                  VIRTKEY, ALT, NOINVERT
     VK_DELETE,      ID_EDIT_CUT,                  VIRTKEY, SHIFT, NOINVERT
     VK_DOWN,        ID_NEXTDIFF,                  VIRTKEY, ALT, NOINVERT
@@ -215,7 +219,6 @@ BEGIN
     VK_RETURN,      ID_CURDIFF,                  VIRTKEY, ALT, NOINVERT
     VK_RIGHT,       ID_L2R,                  VIRTKEY, ALT, NOINVERT
     VK_UP,          ID_PREVDIFF,                  VIRTKEY, ALT, NOINVERT
-    "X",            ID_EDIT_CUT,                  VIRTKEY, CONTROL, NOINVERT
 END
 
 
@@ -248,17 +251,17 @@ CAPTION "
 FONT 9, "·s²Ó©úÅé"
 BEGIN
     LTEXT           "¥ªÃä(&L):",-1,34,24,19,8
-    COMBOBOX        IDC_RIGHT_EDIT,56,22,182,94,CBS_DROPDOWN | CBS_AUTOHSCROLL | 
+    COMBOBOX        IDC_RIGHT_EDIT,56,22,182,94,CBS_DROPDOWN | CBS_AUTOHSCROLL |
                     WS_VSCROLL | WS_TABSTOP,WS_EX_ACCEPTFILES
     PUSHBUTTON      "ÂsÄý(&B)...",IDC_LEFT_BUTTON,241,22,38,12
     LTEXT           "¥kÃä(&R):",-1,33,40,20,8
-    COMBOBOX        IDC_RIGHT_COMBO,56,38,182,95,CBS_DROPDOWN | CBS_AUTOHSCROLL | 
+    COMBOBOX        IDC_RIGHT_COMBO,56,38,182,95,CBS_DROPDOWN | CBS_AUTOHSCROLL |
                     WS_VSCROLL | WS_TABSTOP,WS_EX_ACCEPTFILES
     PUSHBUTTON      "ÂsÄý(&W)...",IDC_RIGHT_BUTTON,241,38,38,12
     LTEXT           "°ÆÀɦW(&X):",-1,16,56,37,8
-    COMBOBOX        IDC_MESSAGE,56,54,151,95,CBS_DROPDOWN | CBS_AUTOHSCROLL | 
+    COMBOBOX        IDC_MESSAGE,56,54,151,95,CBS_DROPDOWN | CBS_AUTOHSCROLL |
                     WS_VSCROLL | WS_TABSTOP
-    CONTROL         "¤l¸ê®Æ§¨(&C)",IDC_WHITESPACE_CHECK,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "¤l¸ê®Æ§¨(&C)",IDC_WHITESPACE_CHECK,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,35,77,57,10
     DEFPUSHBUTTON   "½T©w",1,295,11,50,14
     PUSHBUTTON      "¨ú®ø",CBRS_SIZE_FIXED,295,28,50,14
@@ -276,7 +279,7 @@ BEGIN
     PUSHBUTTON      "¨ú®ø",CBRS_SIZE_FIXED,173,121,50,14
     PUSHBUTTON      "¥t¦s·sÀÉ...",IDSAVEAS,103,121,50,14
     LTEXT           "±M®×:",-1,9,61,25,8
-    COMBOBOX        IDC_RIGHT_COMBO,36,58,215,114,CBS_DROPDOWN | CBS_AUTOHSCROLL | 
+    COMBOBOX        IDC_RIGHT_COMBO,36,58,215,114,CBS_DROPDOWN | CBS_AUTOHSCROLL |
                     WS_VSCROLL | WS_TABSTOP
     LTEXT           "¥Î¤á:",-1,13,80,18,8
     EDITTEXT        IDC_USER,36,78,58,14,ES_AUTOHSCROLL
@@ -293,7 +296,7 @@ BEGIN
     LTEXT           "cleartool.exe ¸ô®|(&P):",IDC_SCROLL_CHECK,16,42,68,8
     EDITTEXT        IDC_PATH_EDIT,85,40,116,12,ES_AUTOHSCROLL
     PUSHBUTTON      "ÂsÄý(&B)...",IDC_BROWSE_BUTTON,206,40,42,12
-    COMBOBOX        IDC_VER_SYS,85,20,157,41,CBS_DROPDOWNLIST | WS_VSCROLL | 
+    COMBOBOX        IDC_VER_SYS,85,20,157,41,CBS_DROPDOWNLIST | WS_VSCROLL |
                     WS_TABSTOP
     LTEXT           "ª©¥»¨t²Î(&V)",-1,16,22,60,10
 END
@@ -304,21 +307,21 @@ CAPTION "
 FONT 9, "·s²Ó©úÅé"
 BEGIN
     GROUPBOX        "³]©w",-1,7,7,221,94
-    CONTROL         "³Æ¥÷­ì©lªºÀÉ®×(&B)",IDC_BACKUP_CHECK,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "³Æ¥÷­ì©lªºÀÉ®×(&B)",IDC_BACKUP_CHECK,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,17,19,83,10
     CONTROL         "¦Û°Ê¦a±²°Ê¨ì²Ä¤@­Ó¤£¦P(&S)",IDC_SCROLL_CHECK,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,17,30,129,10
-    CONTROL         "©¿²¤ªÅ¥Õ¦C(&K)",IDC_VERSION,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "©¿²¤ªÅ¥Õ¦C(&K)",IDC_VERSION,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,17,41,71,10
-    CONTROL         "©¿²¤¤j¤p¼g(&C)",IDC_WWW,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "©¿²¤¤j¤p¼g(&C)",IDC_WWW,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,17,52,69,10
-    CONTROL         "±Ó·P¹ï¦Cµ²§ô(&E)",IDC_USER,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "±Ó·P¹ï¦Cµ²§ô(&E)",IDC_USER,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,17,63,74,10
-    CONTROL         "°±¥Î¤Þ¤Hª`¥Øªº¿Ã¹õ(&D)",IDC_DISABLE_SPLASH,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "°±¥Î¤Þ¤Hª`¥Øªº¿Ã¹õ(&D)",IDC_DISABLE_SPLASH,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,17,74,100,10
-    CONTROL         "¦Û°Ê­«·s±½´y(&R)",IDC_AUTOMRESCAN_CHECK,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "¦Û°Ê­«·s±½´y(&R)",IDC_AUTOMRESCAN_CHECK,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,17,85,75,10
-    CONTROL         "¤ñ¹ïªÅ¥Õ©M¸õ®æ(&W)",IDC_WHITESPACE,"Button",BS_AUTORADIOBUTTON | 
+    CONTROL         "¤ñ¹ïªÅ¥Õ©M¸õ®æ(&W)",IDC_WHITESPACE,"Button",BS_AUTORADIOBUTTON |
                     WS_GROUP,125,45,87,10
     CONTROL         "©¿²¤ªÅ¥Õ©M¸õ®æ§ó§ï(&H)",IDC_WHITE_CHANGE,"Button",
                     BS_AUTORADIOBUTTON,125,56,99,10
@@ -327,7 +330,7 @@ BEGIN
     GROUPBOX        "¸õ®æ",-1,7,105,221,30,WS_GROUP
     LTEXT           "¸õ®æ¤j¤p(&T):",-1,10,119,35,8
     EDITTEXT        IDC_TAB_EDIT,47,117,22,12,ES_AUTOHSCROLL | ES_NUMBER,WS_EX_RIGHT
-    CONTROL         "´¡¤J¸õ®æ¦r¤¸(&T)",IDC_PROP_INSERT_TABS,"Button",BS_AUTORADIOBUTTON | 
+    CONTROL         "´¡¤J¸õ®æ¦r¤¸(&T)",IDC_PROP_INSERT_TABS,"Button",BS_AUTORADIOBUTTON |
                     WS_GROUP,79,113,76,10
     CONTROL         "´¡¤JªÅ¥Õ(&N)",IDC_PROP_INSERT_SPACES,"Button",BS_AUTORADIOBUTTON,79,122,
                     59,10
@@ -340,7 +343,7 @@ FONT 9, "
 BEGIN
     PUSHBUTTON      "½T©w",IDOK,154,16,52,14
     PUSHBUTTON      "¨ú®ø",IDCANCEL,154,33,52,14
-    LISTBOX         1037,5,16,141,89,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | 
+    LISTBOX         1037,5,16,141,89,LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
                     WS_TABSTOP
     LTEXT           "¥i¥Îªº»y¨¥:",-1,7,7,66,8
 END
@@ -351,11 +354,11 @@ CAPTION "
 FONT 9, "·s²Ó©úÅé"
 BEGIN
     COMBOBOX        IDC_EDIT_FINDTEXT,46,6,135,135,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "¥þ¦r«÷¼g¶·¬Û²Å(&W)",IDC_EDIT_WHOLE_WORD,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "¥þ¦r«÷¼g¶·¬Û²Å(&W)",IDC_EDIT_WHOLE_WORD,"Button",BS_AUTOCHECKBOX |
                     WS_GROUP | WS_TABSTOP,4,26,100,12
-    CONTROL         "¤j¤p¼g¶·¬Û²Å(&C)",IDC_EDIT_MATCH_CASE,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "¤j¤p¼g¶·¬Û²Å(&C)",IDC_EDIT_MATCH_CASE,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,4,40,75,12
-    CONTROL         "¤@¯ë¹Bºâ¦¡(&E)",IDC_EDIT_REGEXP,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "¤@¯ë¹Bºâ¦¡(&E)",IDC_EDIT_REGEXP,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,4,54,77,12
     CONTROL         "¤W²¾(&U)",IDC_EDIT_DIRECTION_UP,"Button",BS_AUTORADIOBUTTON | WS_GROUP,
                     111,36,43,12
@@ -371,15 +374,15 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "¨ú¥N"
 FONT 9, "·s²Ó©úÅé"
 BEGIN
-    COMBOBOX        IDC_EDIT_FINDTEXT,52,7,116,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | 
+    COMBOBOX        IDC_EDIT_FINDTEXT,52,7,116,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL |
                     WS_TABSTOP
-    COMBOBOX        IDC_EDIT_REPLACE_WITH,52,24,116,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | 
+    COMBOBOX        IDC_EDIT_REPLACE_WITH,52,24,116,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL |
                     WS_TABSTOP
-    CONTROL         "¥þ¦r«÷¼g¶·¬Û²Å(&W)",IDC_EDIT_WHOLE_WORD,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "¥þ¦r«÷¼g¶·¬Û²Å(&W)",IDC_EDIT_WHOLE_WORD,"Button",BS_AUTOCHECKBOX |
                     WS_GROUP | WS_TABSTOP,5,46,91,12
-    CONTROL         "¤j¤p¼g¶·¬Û²Å(&C)",IDC_EDIT_MATCH_CASE,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "¤j¤p¼g¶·¬Û²Å(&C)",IDC_EDIT_MATCH_CASE,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,5,60,73,12
-    CONTROL         "¤@¯ë¹Bºâ¦¡(&E)",IDC_EDIT_REGEXP,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "¤@¯ë¹Bºâ¦¡(&E)",IDC_EDIT_REGEXP,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,5,74,77,12
     CONTROL         "¿ï¨ú(&S)",IDC_EDIT_SCOPE_SELECTION,"Button",BS_AUTORADIOBUTTON | WS_GROUP,
                     102,57,59,10
@@ -402,7 +405,7 @@ BEGIN
     DEFPUSHBUTTON   "°É¸Õ",1,35,90,50,14
     PUSHBUTTON      "¨ú®ø",CBRS_SIZE_FIXED,194,90,50,14
     PUSHBUTTON      "¥t¦s·sÀÉ...",IDSAVEAS,114,90,50,14
-    EDITTEXT        IDC_COMMENTS,18,21,243,56,ES_MULTILINE | ES_AUTOVSCROLL | 
+    EDITTEXT        IDC_COMMENTS,18,21,243,56,ES_MULTILINE | ES_AUTOVSCROLL |
                     ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL
     LTEXT           "µù¸Ñ",-1,18,7,34,10
 END
@@ -421,13 +424,13 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "ÂoÃè"
 FONT 9, "·s²Ó©úÅé"
 BEGIN
-    CONTROL         "©¿²¤¦C²Å¦X¤U¦Cªº¼Ë¦¡",IDC_IGNOREREGEXP,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "©¿²¤¦C²Å¦X¤U¦Cªº¼Ë¦¡",IDC_IGNOREREGEXP,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,7,7,221,15
     LTEXT           "¤@¯ë¹Bºâ¦¡ (¨C¦C¤@­Ó):",-1,7,28,221,8
-    EDITTEXT        IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE | ES_AUTOHSCROLL | 
+    EDITTEXT        IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE | ES_AUTOHSCROLL |
                     ES_WANTRETURN
     LTEXT           "ÀÉ®×ÂoÃè:",-1,7,128,60,10
-    COMBOBOX        IDC_FILE_FILTER,81,126,136,63,CBS_DROPDOWNLIST | WS_VSCROLL | 
+    COMBOBOX        IDC_FILE_FILTER,81,126,136,63,CBS_DROPDOWNLIST | WS_VSCROLL |
                     WS_TABSTOP
 END
 
@@ -458,7 +461,7 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "µn¿ý"
 FONT 9, "·s²Ó©úÅé", 0, 0, 0x1
 BEGIN
-    CONTROL         "ÃöÁp¨ì¸ê®Æ§¨",IDC_ASSOC_DIRECTORY,"Button",BS_AUTOCHECKBOX | 
+    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
@@ -564,16 +567,16 @@ IDB_BINARYDIFF          BITMAP  DISCARDABLE     "res\\binarydiff.bmp"
 IDD_PROP_VSS DLGINIT
 BEGIN
     1018, 0x403, 5, 0
-0x6f4e, 0x656e, "\000" 
+0x6f4e, 0x656e, "\000"
     1018, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065, 
-0x6c28, 0x7365, 0x2073, 0x6874, 0x6e61, 0x3520, 0x302e, 0x0029, 
+0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
+0x6c28, 0x7365, 0x2073, 0x6874, 0x6e61, 0x3520, 0x302e, 0x0029,
     1018, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065, 
-0x3528, 0x302e, 0x6120, 0x646e, 0x6120, 0x6f62, 0x6576, 0x0029, 
+0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
+0x3528, 0x302e, 0x6120, 0x646e, 0x6120, 0x6f62, 0x6576, 0x0029,
     1018, 0x403, 19, 0
-0x6152, 0x6974, 0x6e6f, 0x6c61, 0x4320, 0x656c, 0x7261, 0x6143, 0x6573, 
-"\000" 
+0x6152, 0x6974, 0x6e6f, 0x6c61, 0x4320, 0x656c, 0x7261, 0x6143, 0x6573,
+"\000"
     0
 END
 
@@ -589,14 +592,14 @@ IDR_MARGIN_CURSOR       CURSOR  DISCARDABLE     "res\\mg_cur.cur"
 // String Table
 //
 
-STRINGTABLE FIXED IMPURE 
+STRINGTABLE FIXED IMPURE
 BEGIN
     IDR_MAINFRAME           "WinMerge"
     IDR_MERGETYPE           "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
     IDD_OPEN                "WinMerge ³o­Ó¸ê®Æ§¨"
 END
 
-STRINGTABLE FIXED IMPURE 
+STRINGTABLE FIXED IMPURE
 BEGIN
     CBRS_BORDER_3D          " "
     129                     " "
@@ -616,7 +619,7 @@ BEGIN
     IDS_CANT_COMPARE_FILES  "µLªk¤ñ¹ïÀÉ®×"
 END
 
-STRINGTABLE FIXED IMPURE 
+STRINGTABLE FIXED IMPURE
 BEGIN
     IDS_SAVE_AS_TITLE       "¥t¦s·sÀÉ"
     IDS_SELECT_FILES_OR_FOLDERS "§Aªº¿ï¨ú¥²¶·¬O¨âªÌ³£¬OÀɮשΨâªÌ³£¬O¸ê®Æ§¨"
@@ -636,7 +639,7 @@ BEGIN
     IDS_NOPROJECT           "§A¥²¶·«ü©w¤@­Ó SourceSafe ±M®×¸ô®|¥H«KÄ~Äò (¨Ò¦p¡G  $/MyProject)"
 END
 
-STRINGTABLE FIXED IMPURE 
+STRINGTABLE FIXED IMPURE
 BEGIN
     IDS_FILENAME_HEADER     "ÀɮצWºÙ"
     IDS_DIR_HEADER          "¸ê®Æ§¨"
@@ -656,7 +659,7 @@ BEGIN
     IDS_DEL_LEFT_FMT        "§R°£¥ªÃä %1 ¦b %2 ¿ï¨úªº¶µ¥Ø"
 END
 
-STRINGTABLE FIXED IMPURE 
+STRINGTABLE FIXED IMPURE
 BEGIN
     IDS_DEL_RIGHT_FMT       "§R°£¥kÃä %1 ¦b %2 ¿ï¨úªº¶µ¥Ø"
     IDS_DELETE_FAILED       "§R°£ÀÉ®× %1 ¥¢±Ñ¡G %2"
@@ -675,7 +678,7 @@ BEGIN
     IDS_BIN_FILES_SAME      "¤G¶i¨îÀɮק¹¥þ¬Û¦P"
 END
 
-STRINGTABLE FIXED IMPURE 
+STRINGTABLE FIXED IMPURE
 BEGIN
     IDS_FILESAVE_FAILED     "Àx¦s %1 ¥¢±Ñ¡C§A­n¥H¤@­Ó¤£¦Pªº¦WºÙÀx¦sÀɮ׶ܡH"
     IDS_ERROR_FILE_NOT_FOUND "Àɮק䤣¨ì: %1"
@@ -688,13 +691,13 @@ BEGIN
     IDS_STATUS_COPYALL2R    "¥¿¦b¥þ³¡½Æ»s¨ì¥kÃä"
 END
 
-STRINGTABLE FIXED IMPURE 
+STRINGTABLE FIXED IMPURE
 BEGIN
     IDS_NUM_REPLACED        "¤w¨ú¥N %1 ­Ó¦r¦ê¡C"
     IDS_EDIT_TEXT_NOT_FOUND "µLªk´M§ä¦r¦ê¡u%s¡v"
 END
 
-STRINGTABLE FIXED IMPURE 
+STRINGTABLE FIXED IMPURE
 BEGIN
     CBRS_ALIGN_BOTTOM       " "
     32769                   " "
@@ -714,7 +717,7 @@ BEGIN
     32783                   " "
 END
 
-STRINGTABLE FIXED IMPURE 
+STRINGTABLE FIXED IMPURE
 BEGIN
     ID_OPTIONS_SCROLLTOFIRSTDIFFERENCE "¦Û°Ê¦a±²°Ê¨ì³o²Ä¤@­Ó¤£¦P\n±²°Ê¨ì²Ä¤@­Ó"
     32785                   " "
@@ -734,7 +737,7 @@ BEGIN
     ID_DIR_COPY_FILE_TO_LEFT "½Æ»s¿ï¨úªºÀɮרì¤w©R¦Wªº¸ê®Æ§¨"
 END
 
-STRINGTABLE FIXED IMPURE 
+STRINGTABLE FIXED IMPURE
 BEGIN
     ID_DIR_COPY_FILE_TO_RIGHT "½Æ»s¿ï¨úªºÀɮרì¤w©R¦Wªº¸ê®Æ§¨"
     ID_VIEW_LANGUAGE        "¿ï¨ú¥Ø«e¥Î¤á¤¶­±»y¨¥\n»y¨¥"
@@ -754,7 +757,7 @@ BEGIN
     ID_DIR_OPEN_RIGHT       "¶}±Ò¥kÃäÀÉ®×"
 END
 
-STRINGTABLE FIXED IMPURE 
+STRINGTABLE FIXED IMPURE
 BEGIN
     ID_DIR_OPEN_RIGHT_WITH  "¶}±Ò¥kÃäÀÉ®×¥H..."
     ID_OPTIONS_SHOWBINARIES "Åã¥Ü¤G¶i¨îÀÉ®×"
@@ -762,7 +765,7 @@ BEGIN
     ID_REFRESH              "§ó·sÅã¥Ü\n§ó·s (F5)"
 END
 
-STRINGTABLE FIXED IMPURE 
+STRINGTABLE FIXED IMPURE
 BEGIN
     AFX_IDS_APP_TITLE       "WinMerge"
     AFX_IDS_IDLEMESSAGE     "´Nºü"
@@ -782,7 +785,7 @@ BEGIN
     57359                   " "
 END
 
-STRINGTABLE FIXED IMPURE 
+STRINGTABLE FIXED IMPURE
 BEGIN
     ID_FILE_NEW             "«Ø¥ß¤@­Ó·s¤å¥ó\n·s¼W"
     ID_FILE_OPEN            "¶}±Ò¤@­Ó²{¦s¤å¥ó\n¶}±Ò (Ctrl+O)"
@@ -802,7 +805,7 @@ BEGIN
     57615                   " "
 END
 
-STRINGTABLE FIXED IMPURE 
+STRINGTABLE FIXED IMPURE
 BEGIN
     ID_FILE_MRU_FIRST       "¶}±Ò³o­Ó¤å¥ó"
     ID_FILE_MRU_FILE2       "¶}±Ò³o­Ó¤å¥ó"
@@ -822,7 +825,7 @@ BEGIN
     ID_FILE_MRU_FILE16      "¶}±Ò³o­Ó¤å¥ó"
 END
 
-STRINGTABLE FIXED IMPURE 
+STRINGTABLE FIXED IMPURE
 BEGIN
     ID_EDIT_CLEAR           "²M°£¿ï¨úªº½d³ò\n§R°£"
     ID_EDIT_CLEAR_ALL       "¥þ³¡§R°£\n¥þ³¡§R°£"
@@ -842,7 +845,7 @@ BEGIN
     57647                   " "
 END
 
-STRINGTABLE FIXED IMPURE 
+STRINGTABLE FIXED IMPURE
 BEGIN
     ID_WINDOW_NEW           "¬°§@¥Î¤¤¤å¥ó¶}±Ò¥t¤@­Óµøµ¡\n·sµøµ¡"
     ID_WINDOW_ARRANGE       "±Æ¦C¹Ï¥Ü¦bµøµ¡ªº©³³¡\n±Æ¦C¹Ï¥Ü"
@@ -861,7 +864,7 @@ BEGIN
     57662                   " "
 END
 
-STRINGTABLE FIXED IMPURE 
+STRINGTABLE FIXED IMPURE
 BEGIN
     ID_APP_ABOUT            "Åã¥Üµ{¦¡¸ê°T¡Aª©¥»¸¹½X©Mª©Åv\nÃö©ó"
     ID_APP_EXIT             "Â÷¶}À³¥Îµ{¦¡¡F´£¥Ü­nÀx¦s¤å¥ó\nµ²§ô"
@@ -881,13 +884,13 @@ BEGIN
     57679                   " "
 END
 
-STRINGTABLE FIXED IMPURE 
+STRINGTABLE FIXED IMPURE
 BEGIN
     ID_NEXT_PANE            "¤Á´«¨ì¤U¤@­Óµøµ¡\n¤U¤@µøµ¡"
     ID_PREV_PANE            "¤Á´«¦^¤W¤@­Óµøµ¡\n¤W¤@µøµ¡"
 END
 
-STRINGTABLE FIXED IMPURE 
+STRINGTABLE FIXED IMPURE
 BEGIN
     ID_INDICATOR_EXT        "EXT"
     ID_INDICATOR_CAPS       "CAP"
@@ -897,7 +900,7 @@ BEGIN
     ID_INDICATOR_REC        "REC"
 END
 
-STRINGTABLE FIXED IMPURE 
+STRINGTABLE FIXED IMPURE
 BEGIN
     ID_VIEW_TOOLBAR         "Åã¥Ü©ÎÁôÂäu¨ã¦C\n¤Á´«¤u¨ã¦C"
     ID_VIEW_STATUS_BAR      "Åã¥Ü©ÎÁôÂꬺA¦C\n¤Á´«ª¬ºA¦C"
@@ -917,7 +920,7 @@ BEGIN
     59407                   " "
 END
 
-STRINGTABLE FIXED IMPURE 
+STRINGTABLE FIXED IMPURE
 BEGIN
     AFX_IDS_SCSIZE          "§ó§ïµøµ¡¤j¤p"
     AFX_IDS_SCMOVE          "§ó§ïµøµ¡¦ì¸m"
@@ -928,14 +931,14 @@ BEGIN
     AFX_IDS_SCCLOSE         "Ãö³¬§@¥Î¤¤µøµ¡¨Ã´£¥Ü¨ìÀx¦s³o¤å¥ó"
 END
 
-STRINGTABLE FIXED IMPURE 
+STRINGTABLE FIXED IMPURE
 BEGIN
     AFX_IDS_SCRESTORE       "±Nµøµ¡Á٭즨¼Ð·Çªº¤j¤p"
     AFX_IDS_SCTASKLIST      "±Ò¥Î¤u§@²M³æ"
     AFX_IDS_MDICHILD        "±Ò¥Î³o­Óµøµ¡"
 END
 
-STRINGTABLE FIXED IMPURE 
+STRINGTABLE FIXED IMPURE
 BEGIN
     AFX_IDS_PREVIEW_CLOSE   "Ãö³¬¹wÄý¦C¦L¼Ò¦¡\n¨ú®ø¹wÄý"
 END

diff --git a/Src/readme.txt b/Src/readme.txt
index f6cbe70..748d804 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -3,6 +3,8 @@
   WinMerge: MainFrm.cpp
  PATCH: [ 778384 ] Sync OnDropFiles() from MainFrame to SuperComboBox
   common: SuperComboBox.cpp
+ PATCH: [ 778403 ] Fix accel keys in lang files
+  Languages: ChineseSimplified, ChineseTraditional 
 
 2003-07-27 Perry
  PATCH: [ 778290 ] Typo in comment