OSDN Git Service

PATCH: [ 1234629 ] New Chinese(Simplified) translation .rc file
authorPerry Rapp <elsapo@users.sourceforge.net>
Mon, 11 Jul 2005 23:20:36 +0000 (23:20 +0000)
committerPerry Rapp <elsapo@users.sourceforge.net>
Mon, 11 Jul 2005 23:20:36 +0000 (23:20 +0000)
  Src/Languages: MergeChineseSimplified.rc

Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
Src/readme.txt

index fcbf6d3..305261b 100644 (file)
@@ -1,5 +1,6 @@
 //Microsoft Developer Studio generated resource script.
 //translated by liaobin@jite.net 2003-07-15
+//translation updated by xmpdhml@bj1860.net 2005-07-08
 //$Id$
 #include "resource.h"
 
@@ -78,11 +79,11 @@ IDR_POPUP_MERGEVIEW MENU
 BEGIN
     POPUP "_POPUP_"
     BEGIN
-        MENUITEM "¸´ÖƵ½ÓÒ±ß(&R)",              ID_L2R
-        MENUITEM "¸´ÖƵ½×ó±ß(&L)",              ID_R2L
+        MENUITEM "¸´ÖƵ½ÓÒ²à(&R)",              ID_L2R
+        MENUITEM "¸´ÖƵ½×ó²à(&L)",              ID_R2L
         MENUITEM SEPARATOR
-        MENUITEM "&Highlight Line Word Diff",   ID_SHOWLINEWORDDIFF
-        MENUITEM "H&ighlight Line Char Diff",   ID_SHOWLINECHARDIFF
+        MENUITEM "¸ßÁÁÐÐÖдÊÓﲻͬ(&H)",        ID_SHOWLINEWORDDIFF
+        MENUITEM "¸ßÁÁÐÐÖÐ×Ö·û²»Í¬(&I)",        ID_SHOWLINECHARDIFF
         MENUITEM SEPARATOR
         MENUITEM "³·Ïú(&U)",                    ID_EDIT_UNDO
         MENUITEM "Öظ´(&R)",                    ID_EDIT_REDO
@@ -91,7 +92,7 @@ BEGIN
         MENUITEM "¸´ÖÆ(&C)",                    ID_EDIT_COPY
         MENUITEM "Õ³Ìù(&P)",                    ID_EDIT_PASTE
         MENUITEM SEPARATOR
-        MENUITEM "&Goto...",                    ID_EDIT_WMGOTO
+        MENUITEM "תµ½(&G)...",                 ID_EDIT_WMGOTO
     END
 END
 
@@ -99,9 +100,9 @@ IDR_MAINFRAME MENU
 BEGIN
     POPUP "Îļþ(&F)"
     BEGIN
-        MENUITEM "&New\tCtrl+N",                ID_FILE_NEW
+        MENUITEM "н¨(&N)\tCtrl+N",            ID_FILE_NEW
         MENUITEM "´ò¿ª(&O)...\tCtrl+O",         ID_FILE_OPEN
-        MENUITEM "Open Project...\tCtrl+J",     ID_FILE_OPENPROJECT
+        MENUITEM "´ò¿ª¹¤³Ì...\tCtrl+J",         ID_FILE_OPENPROJECT
         MENUITEM SEPARATOR
         MENUITEM "Í˳ö(&X)",                    ID_APP_EXIT
     END
@@ -111,33 +112,33 @@ BEGIN
     END
     POPUP "ÊÓͼ(&V)"
     BEGIN
-        MENUITEM "Ñ¡Ôñ×ÖÐÍ(&F)...",             ID_VIEW_SELECTFONT
-        MENUITEM "ʹÓÃĬÈÏ×ÖÐÍ(&O)",          ID_VIEW_USEDEFAULTFONT
+        MENUITEM "Ñ¡Ôñ×ÖÌå(&F)...",             ID_VIEW_SELECTFONT
+        MENUITEM "ʹÓÃĬÈÏ×ÖÌå(&O)",            ID_VIEW_USEDEFAULTFONT
         MENUITEM SEPARATOR
         MENUITEM "¹¤¾ßÀ¸(&T)",                  ID_VIEW_TOOLBAR
         MENUITEM "״̬À¸(&S)",                  ID_VIEW_STATUS_BAR
         MENUITEM SEPARATOR
         MENUITEM "ÓïÑÔ(&L)...",                 ID_VIEW_LANGUAGE
     END
-    POPUP "&Tools"
+    POPUP "¹¤¾ß(&T)"
     BEGIN
-        MENUITEM "&Filters...",                 ID_TOOLS_FILTERS
-        MENUITEM "&Generate Patch...",          ID_TOOLS_GENERATEPATCH
+        MENUITEM "¹ýÂËÆ÷(&F)...",               ID_TOOLS_FILTERS
+        MENUITEM "Éú³É Patch(&G)...",           ID_TOOLS_GENERATEPATCH
     END
-    POPUP "&Plugins"
+    POPUP "²å¼þ(&P)"
     BEGIN
-        MENUITEM "&Manual Unpacking",           ID_UNPACK_MANUAL
-        MENUITEM "&Automatic Unpacking",        ID_UNPACK_AUTO
+        MENUITEM "ÊÖ¶¯½â°ü(&M)",                ID_UNPACK_MANUAL
+        MENUITEM "×Ô¶¯½â°ü(&A)",                ID_UNPACK_AUTO
         MENUITEM SEPARATOR
-        MENUITEM "&Edit with Unpacker",         ID_POPUP_OPEN_WITH_UNPACKER
+        MENUITEM "Óýâ°ü³ÌÐò´ò¿ª(&E)",          ID_POPUP_OPEN_WITH_UNPACKER
         MENUITEM SEPARATOR
-        MENUITEM "&Reload plugins",             ID_RELOAD_PLUGINS
+        MENUITEM "ÖØÐÂ×°Èë²å¼þ(&R)",            ID_RELOAD_PLUGINS
     END
     POPUP "´°¿Ú(&W)"
     BEGIN
         MENUITEM "¹Ø±Õ",                        ID_FILE_CLOSE
         MENUITEM SEPARATOR
-        MENUITEM "Change &Pane\tF6",            ID_WINDOW_CHANGE_PANE
+        MENUITEM "Çл»´°¸ñ(&P)\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
         MENUITEM "ˮƽ²¢ÅÅ(&H)",                ID_WINDOW_TILE_HORZ
         MENUITEM "´¹Ö±²¢ÅÅ(&V)",                ID_WINDOW_TILE_VERT
@@ -147,8 +148,8 @@ BEGIN
     BEGIN
         MENUITEM "Óû§ÊÖ²á(&C)...\tF1",         ID_HELP_CONTENTS
         MENUITEM SEPARATOR
-        MENUITEM "C&onfiguration...",           ID_HELP_GETCONFIG
-        MENUITEM "A&rchive Support disabled...",ID_HELP_MERGE7ZMISMATCH
+        MENUITEM "ÅäÖÃ(&O)...",                 ID_HELP_GETCONFIG
+        MENUITEM "ѹËõ°üÖ§³ÖÒѽûÓÃ(&R)...",     ID_HELP_MERGE7ZMISMATCH
         MENUITEM SEPARATOR
         MENUITEM "GNU ¹«¹²ÊÚȨ...",             ID_HELP_GNULICENSE
         MENUITEM "¹ØÓÚ WinMerge(&A)...",        ID_APP_ABOUT
@@ -159,12 +160,12 @@ IDR_DIRVIEWMENU MENU
 BEGIN
     POPUP "Îļþ(&F)"
     BEGIN
-        MENUITEM "&New\tCtrl+N",                ID_FILE_NEW
+        MENUITEM "н¨(&N)\tCtrl+N",            ID_FILE_NEW
         MENUITEM "´ò¿ª(&O)...\tCtrl+O",         ID_FILE_OPEN
-        MENUITEM "Open Project...\tCtrl+J",     ID_FILE_OPENPROJECT
+        MENUITEM "´ò¿ª¹¤³Ì...\tCtrl+J",         ID_FILE_OPENPROJECT
         MENUITEM SEPARATOR
-        MENUITEM "L&eft Read-only",             ID_FILE_LEFT_READONLY
-        MENUITEM "Ri&ght Read-only",            ID_FILE_RIGHT_READONLY
+        MENUITEM "×ó²àÖ»¶Á(&E)",                ID_FILE_LEFT_READONLY
+        MENUITEM "ÓÒ²àÖ»¶Á(&G)",                ID_FILE_RIGHT_READONLY
         MENUITEM SEPARATOR
         MENUITEM "Í˳ö(&X)",                    ID_APP_EXIT
     END
@@ -174,7 +175,7 @@ BEGIN
         MENUITEM "¸´ÖÆ(&C)\tCtrl+C",            ID_EDIT_COPY
         MENUITEM "Õ³Ìù(&P)\tCtrl+V",            ID_EDIT_PASTE
         MENUITEM SEPARATOR
-        MENUITEM "Select &All\tCtrl+A",         ID_EDIT_SELECT_ALL
+        MENUITEM "Ñ¡ÔñËùÓÐ(&A)\tCtrl+A",        ID_EDIT_SELECT_ALL
         MENUITEM SEPARATOR
         MENUITEM "Ñ¡Ïî(&O)...",                 ID_OPTIONS
         MENUITEM SEPARATOR
@@ -184,57 +185,57 @@ BEGIN
     BEGIN
         MENUITEM "ÏÔʾÍêÈ«ÏàͬµÄÎļþ(&I)",      ID_OPTIONS_SHOWIDENTICAL
         MENUITEM "ÏÔʾ²»Í¬µÄÎļþ(&D)",          ID_OPTIONS_SHOWDIFFERENT
-        MENUITEM "ÏÔʾ×ó±ßµ¥Ò»µÄÎļþ(&F)",      ID_OPTIONS_SHOWUNIQUELEFT
-        MENUITEM "ÏÔʾÓұߵ¥Ò»µÄÎļþ(&G)",      ID_OPTIONS_SHOWUNIQUERIGHT
+        MENUITEM "ÏÔʾֻÔÚ×ó²àµÄÎļþ(&F)",      ID_OPTIONS_SHOWUNIQUELEFT
+        MENUITEM "ÏÔʾֻÔÚÓÒ²àµÄÎļþ(&G)",      ID_OPTIONS_SHOWUNIQUERIGHT
         MENUITEM "ÏÔʾ¶þ½øÖÆÎļþ(&H)",          ID_OPTIONS_SHOWBINARIES
-        MENUITEM "Show S&kipped Files",         ID_OPTIONS_SHOWSKIPPED
+        MENUITEM "ÏÔʾÌø¹ýµÄÎļþ(&K)",          ID_OPTIONS_SHOWSKIPPED
         MENUITEM SEPARATOR
-        MENUITEM "Ñ¡Ôñ×ÖÐÍ(&F)...",             ID_VIEW_SELECTFONT
-        MENUITEM "ʹÓÃĬÈÏ×ÖÐÍ(&O)",          ID_VIEW_USEDEFAULTFONT
+        MENUITEM "Ñ¡Ôñ×ÖÌå(&F)...",             ID_VIEW_SELECTFONT
+        MENUITEM "ʹÓÃĬÈÏ×ÖÌå(&O)",            ID_VIEW_USEDEFAULTFONT
         MENUITEM SEPARATOR
         MENUITEM "¹¤¾ßÀ¸(&T)",                  ID_VIEW_TOOLBAR
         MENUITEM "״̬À¸(&S)",                  ID_VIEW_STATUS_BAR
-        MENUITEM "Compa&re Statepane",          ID_VIEW_DIR_STATEPANE
+        MENUITEM "¶Ô±È½á¹û´°(&R)",              ID_VIEW_DIR_STATEPANE
         MENUITEM SEPARATOR
         MENUITEM "ÓïÑÔ(&L)...",                 ID_VIEW_LANGUAGE
     END
-    POPUP "&Merge"
+    POPUP "ºÏ²¢(&M)"
     BEGIN
-        MENUITEM "ÏÂÒ»²»Í¬(&N)\tAlt+Down",      ID_NEXTDIFF
-        MENUITEM "ÉÏÒ»²»Í¬(&P)\tAlt+Up",        ID_PREVDIFF
+        MENUITEM "ÏÂÒ»´¦²»Í¬(&N)\tAlt+Down",    ID_NEXTDIFF
+        MENUITEM "ÉÏÒ»´¦²»Í¬(&P)\tAlt+Up",      ID_PREVDIFF
         MENUITEM SEPARATOR
-        MENUITEM "µÚÒ»¸ö²»Í¬(&F)\tAlt+Home",    ID_FIRSTDIFF
+        MENUITEM "µÚÒ»´¦²»Í¬(&F)\tAlt+Home",    ID_FIRSTDIFF
         MENUITEM "µ±Ç°²»Í¬(&C)\tAlt+Enter",     ID_CURDIFF
-        MENUITEM "ÉϴεIJ»Í¬(&D)\tAlt+End",     ID_LASTDIFF
+        MENUITEM "×îºóÒ»´¦²»Í¬(&D)\tAlt+End",   ID_LASTDIFF
         MENUITEM SEPARATOR
-        MENUITEM "¸´ÖƵ½ÓÒ±ß(&R)\tAlt+Right",   ID_L2R
-        MENUITEM "¸´ÖƵ½×ó±ß(&L)\tAlt+Left",    ID_R2L
+        MENUITEM "¸´ÖƵ½ÓÒ²à(&R)\tAlt+Right",   ID_L2R
+        MENUITEM "¸´ÖƵ½×ó²à(&L)\tAlt+Left",    ID_R2L
         MENUITEM SEPARATOR
-        MENUITEM "È«²¿¸´ÖƵ½ÓÒ±ß(&A)",          ID_ALL_RIGHT
-        MENUITEM "È«²¿¸´ÖƵ½×ó±ß(&E)",          ID_ALL_LEFT
+        MENUITEM "È«²¿¸´ÖƵ½ÓÒ²à(&A)",          ID_ALL_RIGHT
+        MENUITEM "È«²¿¸´ÖƵ½×ó²à(&E)",          ID_ALL_LEFT
         MENUITEM SEPARATOR
-        MENUITEM "&Delete\tDel",                ID_MERGE_DELETE
+        MENUITEM "ɾ³ý(&D)\tDel",               ID_MERGE_DELETE
     END
-    POPUP "&Tools"
+    POPUP "¹¤¾ß(&T)"
     BEGIN
-        MENUITEM "&Customize Columns...",       ID_TOOLS_CUSTOMIZECOLUMNS
-        MENUITEM "&Filters...",                 ID_TOOLS_FILTERS
-        MENUITEM "&Generate Patch...",          ID_TOOLS_GENERATEPATCH
+        MENUITEM "Ñ¡ÔñÁÐ(&C)...",               ID_TOOLS_CUSTOMIZECOLUMNS
+        MENUITEM "¹ýÂËÆ÷(&F)...",               ID_TOOLS_FILTERS
+        MENUITEM "Éú³É Patch(&G)...",           ID_TOOLS_GENERATEPATCH
     END
-    POPUP "&Plugins"
+    POPUP "²å¼þ(&P)"
     BEGIN
-        MENUITEM "&Manual Unpacking",           ID_UNPACK_MANUAL
-        MENUITEM "&Automatic Unpacking",        ID_UNPACK_AUTO
+        MENUITEM "ÊÖ¶¯½â°ü(&M)",                ID_UNPACK_MANUAL
+        MENUITEM "×Ô¶¯½â°ü(&A)",                ID_UNPACK_AUTO
         MENUITEM SEPARATOR
-        MENUITEM "&Edit with Unpacker",         ID_POPUP_OPEN_WITH_UNPACKER
+        MENUITEM "Óýâ°ü³ÌÐò´ò¿ª(&E)",          ID_POPUP_OPEN_WITH_UNPACKER
         MENUITEM SEPARATOR
-        MENUITEM "&Reload plugins",             ID_RELOAD_PLUGINS
+        MENUITEM "ÖØÐÂ×°Èë²å¼þ(&R)",            ID_RELOAD_PLUGINS
     END
     POPUP "´°¿Ú(&W)"
     BEGIN
         MENUITEM "¹Ø±Õ",                        ID_FILE_CLOSE
         MENUITEM SEPARATOR
-        MENUITEM "Change &Pane\tF6",            ID_WINDOW_CHANGE_PANE
+        MENUITEM "Çл»´°¸ñ(&P)\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
         MENUITEM "ˮƽ²¢ÅÅ(&H)",                ID_WINDOW_TILE_HORZ
         MENUITEM "´¹Ö±²¢ÅÅ(&V)",                ID_WINDOW_TILE_VERT
@@ -244,8 +245,8 @@ BEGIN
     BEGIN
         MENUITEM "Óû§ÊÖ²á(&C)...\tF1",         ID_HELP_CONTENTS
         MENUITEM SEPARATOR
-        MENUITEM "C&onfiguration...",           ID_HELP_GETCONFIG
-        MENUITEM "A&rchive Support disabled...",ID_HELP_MERGE7ZMISMATCH
+        MENUITEM "ÅäÖÃ(&O)...",                 ID_HELP_GETCONFIG
+        MENUITEM "ѹËõ°üÖ§³ÖÒѽûÓÃ(&R)...",     ID_HELP_MERGE7ZMISMATCH
         MENUITEM SEPARATOR
         MENUITEM "GNU ¹«¹²ÊÚȨ...",             ID_HELP_GNULICENSE
         MENUITEM "¹ØÓÚ WinMerge(&A)...",        ID_APP_ABOUT
@@ -256,33 +257,33 @@ IDR_MERGEVIEWMENU MENU
 BEGIN
     POPUP "Îļþ(&F)"
     BEGIN
-        MENUITEM "&New\tCtrl+N",                ID_FILE_NEW
+        MENUITEM "н¨(&N)\tCtrl+N",            ID_FILE_NEW
         MENUITEM "´ò¿ª(&O)...\tCtrl+O",         ID_FILE_OPEN
-        MENUITEM "Open Project...\tCtrl+J",     ID_FILE_OPENPROJECT
+        MENUITEM "´ò¿ª¹¤³Ì...\tCtrl+J",         ID_FILE_OPENPROJECT
         MENUITEM SEPARATOR
         MENUITEM "±£´æ(&S)\tCtrl+S",            ID_FILE_SAVE
-        POPUP "Save &Left"
+        POPUP "±£´æ×ó²à(&L)"
         BEGIN
-            MENUITEM "&Save",                       ID_FILE_SAVE_LEFT
-            MENUITEM "Save &As...",                 ID_FILE_SAVEAS_LEFT
+            MENUITEM "±£´æ(&S)",                    ID_FILE_SAVE_LEFT
+            MENUITEM "Áí´æΪ(&A)...",               ID_FILE_SAVEAS_LEFT
         END
-        POPUP "Save &Right"
+        POPUP "±£´æÓÒ²à(&R)"
         BEGIN
-            MENUITEM "&Save",                       ID_FILE_SAVE_RIGHT
-            MENUITEM "Save &As...",                 ID_FILE_SAVEAS_RIGHT
+            MENUITEM "±£´æ(&S)",                    ID_FILE_SAVE_RIGHT
+            MENUITEM "Áí´æΪ(&A)...",               ID_FILE_SAVEAS_RIGHT
         END
         MENUITEM SEPARATOR
-        MENUITEM "L&eft Read-only",             ID_FILE_LEFT_READONLY
-        MENUITEM "Ri&ght Read-only",            ID_FILE_RIGHT_READONLY
+        MENUITEM "×ó²àÖ»¶Á(&E)",                ID_FILE_LEFT_READONLY
+        MENUITEM "ÓÒ²àÖ»¶Á(&G)",                ID_FILE_RIGHT_READONLY
         MENUITEM SEPARATOR
-        POPUP "&Format for"
+        POPUP "»Ø³µ¸ñʽ(&F)"
         BEGIN
             MENUITEM "&DOS (CRLF)",                 ID_EOL_TO_DOS
             MENUITEM "&UNIX (LF)",                  ID_EOL_TO_UNIX
             MENUITEM "&MAC (CR)",                   ID_EOL_TO_MAC
         END
         MENUITEM SEPARATOR
-        MENUITEM "Merge Mode\tF9",              ID_FILE_MERGINGMODE
+        MENUITEM "ºÏ²¢Ä£Ê½\tF9",                ID_FILE_MERGINGMODE
         MENUITEM SEPARATOR
         MENUITEM "Í˳ö(&X)",                    ID_APP_EXIT
     END
@@ -295,25 +296,25 @@ BEGIN
         MENUITEM "¸´ÖÆ(&C)\tCtrl+C",            ID_EDIT_COPY
         MENUITEM "Õ³Ìù(&P)\tCtrl+V",            ID_EDIT_PASTE
         MENUITEM SEPARATOR
-        MENUITEM "Select &All\tCtrl+A",         ID_EDIT_SELECT_ALL
+        MENUITEM "Ñ¡ÔñËùÓÐ(&A)\tCtrl+A",        ID_EDIT_SELECT_ALL
         MENUITEM SEPARATOR
-        MENUITEM "&Highlight Line Word Diff\tF4", ID_SHOWLINEWORDDIFF
-        MENUITEM "&Highlight Line Char Diff\tShift+F4", ID_SHOWLINECHARDIFF
+        MENUITEM "¸ßÁÁÐÐÖдÊÓﲻͬ(&H)\tF4",    ID_SHOWLINEWORDDIFF
+        MENUITEM "¸ßÁÁÐÐÖÐ×Ö·û²»Í¬(&I)\tF4",    ID_SHOWLINECHARDIFF
         MENUITEM SEPARATOR
-        MENUITEM "ѰÕÒ(&I)...\tCtrl+F",         ID_EDIT_FIND
+        MENUITEM "²éÕÒ(&I)...\tCtrl+F",         ID_EDIT_FIND
         MENUITEM "Ìæ»»(&C)...\tCtrl+H",         ID_EDIT_REPLACE
         MENUITEM SEPARATOR
-        POPUP "&Scripts"
+        POPUP "½Å±¾(&S)"
         BEGIN
-            MENUITEM "< Empty >",               ID_NO_EDIT_SCRIPTS
+            MENUITEM "< Empty >",                   ID_NO_EDIT_SCRIPTS
         END
         MENUITEM SEPARATOR
-        POPUP "Advanced"
+        POPUP "¸ß¼¶"
         BEGIN
-            MENUITEM "&Copy With Line Numbers\tCtrl+Shift+C",
+            MENUITEM "´øÐкŸ´ÖÆ(&C)\tCtrl+Shift+C",
                                                     ID_EDIT_COPY_LINENUMBERS
         END
-        MENUITEM "&Go To...\tCtrl+G",           ID_EDIT_WMGOTO
+        MENUITEM "תµ½(&G)...\tCtrl+G",         ID_EDIT_WMGOTO
         MENUITEM SEPARATOR
         MENUITEM "Ñ¡Ïî(&O)...",                 ID_OPTIONS
         MENUITEM SEPARATOR
@@ -321,61 +322,61 @@ BEGIN
     END
     POPUP "ÊÓͼ(&V)"
     BEGIN
-        MENUITEM "Ñ¡Ôñ×ÖÐÍ(&F)...",             ID_VIEW_SELECTFONT
-        MENUITEM "ʹÓÃĬÈÏ×ÖÐÍ(&O)",          ID_VIEW_USEDEFAULTFONT
+        MENUITEM "Ñ¡Ôñ×ÖÌå(&F)...",             ID_VIEW_SELECTFONT
+        MENUITEM "ʹÓÃĬÈÏ×ÖÌå(&O)",            ID_VIEW_USEDEFAULTFONT
         MENUITEM SEPARATOR
-        MENUITEM "ÏÔʾ¿Õ°×ºÍÖƱí·û(&V)",          ID_VIEW_WHITESPACE
-        MENUITEM "Vie&w Line Differences",      ID_VIEW_LINEDIFFS
+        MENUITEM "ÏÔʾ¿Õ°×ºÍÖƱí·û(&V)",        ID_VIEW_WHITESPACE
+        MENUITEM "ÏÔʾÐÐÖв»Í¬(&W)",            ID_VIEW_LINEDIFFS
         MENUITEM SEPARATOR
         MENUITEM "¹¤¾ßÀ¸(&T)",                  ID_VIEW_TOOLBAR
         MENUITEM "״̬À¸(&S)",                  ID_VIEW_STATUS_BAR
-        MENUITEM "Diff &Pane",                  ID_VIEW_DETAIL_BAR
-        MENUITEM "Location &Pane",              ID_VIEW_LOCATION_BAR
+        MENUITEM "¶Ô±È´°¸ñ(&P)",                ID_VIEW_DETAIL_BAR
+        MENUITEM "λÖô°¸ñ(&C)",                ID_VIEW_LOCATION_BAR
         MENUITEM SEPARATOR
         MENUITEM "ÓïÑÔ(&L)...",                 ID_VIEW_LANGUAGE
     END
-    POPUP "&Merge"
+    POPUP "ºÏ²¢(&M)"
     BEGIN
-        MENUITEM "ÏÂÒ»²»Í¬(&N)\tAlt+Down",      ID_NEXTDIFF
-        MENUITEM "ÉÏÒ»²»Í¬(&P)\tAlt+Up",        ID_PREVDIFF
+        MENUITEM "ÏÂÒ»´¦²»Í¬(&N)\tAlt+Down",    ID_NEXTDIFF
+        MENUITEM "ÉÏÒ»´¦²»Í¬(&P)\tAlt+Up",      ID_PREVDIFF
         MENUITEM SEPARATOR
-        MENUITEM "µÚÒ»¸ö²»Í¬(&F)\tAlt+Home",    ID_FIRSTDIFF
+        MENUITEM "µÚÒ»´¦²»Í¬(&F)\tAlt+Home",    ID_FIRSTDIFF
         MENUITEM "µ±Ç°²»Í¬(&C)\tAlt+Enter",     ID_CURDIFF
-        MENUITEM "ÉϴεIJ»Í¬(&D)\tAlt+End",     ID_LASTDIFF
+        MENUITEM "×îºóÒ»´¦²»Í¬(&D)\tAlt+End",   ID_LASTDIFF
         MENUITEM SEPARATOR
-        MENUITEM "¸´ÖƵ½ÓÒ±ß(&R)\tAlt+Right",   ID_L2R
-        MENUITEM "¸´ÖƵ½×ó±ß(&L)\tAlt+Left",    ID_R2L
+        MENUITEM "¸´ÖƵ½ÓÒ²à(&R)\tAlt+Right",   ID_L2R
+        MENUITEM "¸´ÖƵ½×ó²à(&L)\tAlt+Left",    ID_R2L
         MENUITEM SEPARATOR
-        MENUITEM "Copy to Right and Advance\tAlt+Ctrl+Right", ID_L2RNEXT
-        MENUITEM "Copy to Left and Advance\tAlt+Ctrl+Left", ID_R2LNEXT
+        MENUITEM "¸´ÖƵ½ÓҲಢǰ½ø\tAlt+Ctrl+Right", ID_L2RNEXT
+        MENUITEM "¸´ÖƵ½×ó²à²¢Ç°½ø\tAlt+Ctrl+Left", ID_R2LNEXT
         MENUITEM SEPARATOR
-        MENUITEM "È«²¿¸´ÖƵ½ÓÒ±ß(&A)",          ID_ALL_RIGHT
-        MENUITEM "È«²¿¸´ÖƵ½×ó±ß(&E)",          ID_ALL_LEFT
+        MENUITEM "È«²¿¸´ÖƵ½ÓÒ²à(&A)",          ID_ALL_RIGHT
+        MENUITEM "È«²¿¸´ÖƵ½×ó²à(&E)",          ID_ALL_LEFT
     END
-    POPUP "&Tools"
+    POPUP "¹¤¾ß(&T)"
     BEGIN
-        MENUITEM "&Filters...",                 ID_TOOLS_FILTERS
-        MENUITEM "&Generate Patch...",          ID_TOOLS_GENERATEPATCH
+        MENUITEM "¹ýÂËÆ÷(&F)...",               ID_TOOLS_FILTERS
+        MENUITEM "Éú³É Patch(&G)...",           ID_TOOLS_GENERATEPATCH
     END
-    POPUP "&Plugins"
+    POPUP "²å¼þ(&P)"
     BEGIN
-        MENUITEM "&Manual Unpacking",           ID_UNPACK_MANUAL
-        MENUITEM "&Automatic Unpacking",        ID_UNPACK_AUTO
+        MENUITEM "ÊÖ¶¯½â°ü(&M)",                ID_UNPACK_MANUAL
+        MENUITEM "×Ô¶¯½â°ü(&A)",                ID_UNPACK_AUTO
         MENUITEM SEPARATOR
-        MENUITEM "&Edit with Unpacker",         ID_POPUP_OPEN_WITH_UNPACKER
+        MENUITEM "Óýâ°ü³ÌÐò´ò¿ª(&E)",          ID_POPUP_OPEN_WITH_UNPACKER
         MENUITEM SEPARATOR
-        POPUP "&Prediffer"
+        POPUP "Ô¤±È½Ï(&P)"
         BEGIN
             MENUITEM SEPARATOR
         END
         MENUITEM SEPARATOR
-        MENUITEM "&Reload plugins",             ID_RELOAD_PLUGINS
+        MENUITEM "ÖØÐÂ×°Èë²å¼þ(&R)",            ID_RELOAD_PLUGINS
     END
     POPUP "´°¿Ú(&W)"
     BEGIN
         MENUITEM "¹Ø±Õ",                        ID_FILE_CLOSE
         MENUITEM SEPARATOR
-        MENUITEM "Change &Pane\tF6",            ID_WINDOW_CHANGE_PANE
+        MENUITEM "Çл»´°¸ñ(&P)\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
         MENUITEM "ˮƽ²¢ÅÅ(&H)",                ID_WINDOW_TILE_HORZ
         MENUITEM "´¹Ö±²¢ÅÅ(&V)",                ID_WINDOW_TILE_VERT
@@ -385,8 +386,8 @@ BEGIN
     BEGIN
         MENUITEM "Óû§ÊÖ²á(&C)...\tF1",         ID_HELP_CONTENTS
         MENUITEM SEPARATOR
-        MENUITEM "C&onfiguration...",           ID_HELP_GETCONFIG
-        MENUITEM "A&rchive Support disabled...",ID_HELP_MERGE7ZMISMATCH
+        MENUITEM "ÅäÖÃ(&O)...",                 ID_HELP_GETCONFIG
+        MENUITEM "ѹËõ°üÖ§³ÖÒѽûÓÃ(&R)...",     ID_HELP_MERGE7ZMISMATCH
         MENUITEM SEPARATOR
         MENUITEM "GNU ¹«¹²ÊÚȨ...",             ID_HELP_GNULICENSE
         MENUITEM "¹ØÓÚ WinMerge(&A)...",        ID_APP_ABOUT
@@ -397,60 +398,60 @@ IDR_POPUP_DIRVIEW MENU
 BEGIN
     POPUP "_ITEM_POPUP_"
     BEGIN
-        POPUP "&Copy"
+        POPUP "¸´ÖÆ(&C)"
         BEGIN
-            MENUITEM "&Left to Right",              ID_DIR_COPY_LEFT_TO_RIGHT
-            MENUITEM "L&eft to...",                 ID_DIR_COPY_LEFT_TO_BROWSE
-            MENUITEM "&Right to Left",              ID_DIR_COPY_RIGHT_TO_LEFT
-            MENUITEM "R&ight to...",                ID_DIR_COPY_RIGHT_TO_BROWSE
+            MENUITEM "´Ó×óµ½ÓÒ(&L)",                ID_DIR_COPY_LEFT_TO_RIGHT
+            MENUITEM "´Ó×óµ½(&E)...",               ID_DIR_COPY_LEFT_TO_BROWSE
+            MENUITEM "´ÓÓÒµ½×ó(&R)",                ID_DIR_COPY_RIGHT_TO_LEFT
+            MENUITEM "´ÓÓÒµ½(&I)...",               ID_DIR_COPY_RIGHT_TO_BROWSE
         END
-        POPUP "&Move"
+        POPUP "Òƶ¯(&M)"
         BEGIN
-            MENUITEM "&Left to...",                 ID_DIR_MOVE_LEFT_TO_BROWSE
-            MENUITEM "&Right to...",                ID_DIR_MOVE_RIGHT_TO_BROWSE
+            MENUITEM "´Ó×óµ½(&L)...",               ID_DIR_MOVE_LEFT_TO_BROWSE
+            MENUITEM "´ÓÓÒµ½(&R)...",               ID_DIR_MOVE_RIGHT_TO_BROWSE
         END
-        POPUP "&Delete"
+        POPUP "ɾ³ý(&D)"
         BEGIN
-            MENUITEM "&Left",                       ID_DIR_DEL_LEFT
-            MENUITEM "&Right",                      ID_DIR_DEL_RIGHT
-            MENUITEM "&Both",                       ID_DIR_DEL_BOTH
+            MENUITEM "×ó²à(&L)",                    ID_DIR_DEL_LEFT
+            MENUITEM "ÓÒ²à(&R)",                    ID_DIR_DEL_RIGHT
+            MENUITEM "Á½²à(&B)",                    ID_DIR_DEL_BOTH
         END
-        MENUITEM "&Hide Files",                     ID_DIR_HIDE_FILENAMES
+        MENUITEM "Òþ²ØÎļþ(&H)",                ID_DIR_HIDE_FILENAMES
         MENUITEM SEPARATOR
-        POPUP "&Open Left"
+        POPUP "´ò¿ª×ó²à(&O)"
         BEGIN
-            MENUITEM "with &Registered Application", ID_DIR_OPEN_LEFT
-            MENUITEM "with &External Editor",       ID_DIR_OPEN_LEFT_WITHEDITOR
-            MENUITEM "&with...",                    ID_DIR_OPEN_LEFT_WITH
+            MENUITEM "ÓÃĬÈϳÌÐò(&R)",              ID_DIR_OPEN_LEFT
+            MENUITEM "ÓÃÍⲿ±à¼­Æ÷(&E)",            ID_DIR_OPEN_LEFT_WITHEDITOR
+            MENUITEM "Ñ¡Ôñ³ÌÐò(&W)...",             ID_DIR_OPEN_LEFT_WITH
         END
-        POPUP "O&pen Right"
+        POPUP "´ò¿ªÓÒ²à(&P)"
         BEGIN
-            MENUITEM "with &Registered Application", ID_DIR_OPEN_RIGHT
-            MENUITEM "with &External Editor",       ID_DIR_OPEN_RIGHT_WITHEDITOR
-            MENUITEM "&with...",                    ID_DIR_OPEN_RIGHT_WITH
+            MENUITEM "ÓÃĬÈϳÌÐò(&R)",              ID_DIR_OPEN_RIGHT
+            MENUITEM "ÓÃÍⲿ±à¼­Æ÷(&E)",            ID_DIR_OPEN_RIGHT_WITHEDITOR
+            MENUITEM "Ñ¡Ôñ³ÌÐò(&W)...",             ID_DIR_OPEN_RIGHT_WITH
         END
         MENUITEM SEPARATOR
-        POPUP "Cop&y Pathnames"
+        POPUP "¸´ÖÆÈ«Ãû(&Y)"
         BEGIN
-            MENUITEM "&Left (%1 of %2)",            ID_DIR_COPY_PATHNAMES_LEFT
-            MENUITEM "&Right (%1 of %2)",           ID_DIR_COPY_PATHNAMES_RIGHT
-            MENUITEM "&Both (%1 of %2)",            ID_DIR_COPY_PATHNAMES_BOTH
+            MENUITEM "×ó²à(&L)(%1¸ö ¹²%2¸ö)",       ID_DIR_COPY_PATHNAMES_LEFT
+            MENUITEM "ÓÒ²à(&R)(%1¸ö ¹²%2¸ö)",       ID_DIR_COPY_PATHNAMES_RIGHT
+            MENUITEM "Á½²à(&B)(%1¸ö ¹²%2¸ö)",       ID_DIR_COPY_PATHNAMES_BOTH
         END
-        MENUITEM "Copy &Filenames",                 ID_DIR_COPY_FILENAMES
+        MENUITEM "¸´ÖÆÎļþÃû(&F)",              ID_DIR_COPY_FILENAMES
         MENUITEM SEPARATOR
         POPUP "&Zip"
         BEGIN
-            MENUITEM "&Left... (%1 of %2)",         ID_DIR_ZIP_LEFT
-            MENUITEM "&Right... (%1 of %2)",        ID_DIR_ZIP_RIGHT
-            MENUITEM "&Both... (%1 of %2)",         ID_DIR_ZIP_BOTH
-            MENUITEM "&Differences... (%1 of %2)",  ID_DIR_ZIP_BOTH_DIFFS_ONLY
+            MENUITEM "×ó²à(&L)...(%1¸ö ¹²%2¸ö)",    ID_DIR_ZIP_LEFT
+            MENUITEM "ÓÒ²à(&R)...(%1¸ö ¹²%2¸ö)",    ID_DIR_ZIP_RIGHT
+            MENUITEM "Á½²à(&B)...(%1¸ö ¹²%2¸ö)",    ID_DIR_ZIP_BOTH
+            MENUITEM "Á½²à²»Í¬(&D)...(%1¸ö ¹²%2¸ö)",ID_DIR_ZIP_BOTH_DIFFS_ONLY
         END
         MENUITEM SEPARATOR
-        MENUITEM "&Refresh",                        ID_DIR_RESCAN
+        MENUITEM "Ë¢ÐÂ(&R)",                    ID_DIR_RESCAN
     END
     POPUP "_HDR_POPUP_"
     BEGIN
-        MENUITEM "&Customize Columns...",       ID_TOOLS_CUSTOMIZECOLUMNS
+        MENUITEM "Ñ¡ÔñÁÐ(&C)...",               ID_TOOLS_CUSTOMIZECOLUMNS
     END
 END
 
@@ -458,17 +459,17 @@ IDR_POPUP_EDITOR_HEADERBAR MENU
 BEGIN
     POPUP "_POPUP_"
     BEGIN
-        MENUITEM "&Copy Full Path",             ID_EDITOR_COPY_PATH
-        MENUITEM "Copy &Filename",              ID_EDITOR_COPY_FILENAME
+        MENUITEM "¸´ÖÆÈ«Ãû(&C)",                ID_EDITOR_COPY_PATH
+        MENUITEM "¸´ÖÆÎļþÃû(&F)",              ID_EDITOR_COPY_FILENAME
     END
 END
 
 IDR_POPUP_PLUGINS_SETTINGS MENU
 BEGIN
-    POPUP "Prediffer Settings"
+    POPUP "Ô¤±È½ÏÉèÖÃ"
     BEGIN
-        MENUITEM "&No prediffer",               ID_PREDIFF_MANUAL
-        MENUITEM "Auto prediffer",              ID_PREDIFF_AUTO
+        MENUITEM "²»Ê¹ÓÃ(&N)",                  ID_PREDIFF_MANUAL
+        MENUITEM "×Ô¶¯",                        ID_PREDIFF_AUTO
     END
 END
 
@@ -476,12 +477,12 @@ IDR_POPUP_LOCATIONBAR MENU
 BEGIN
     POPUP "_POPUP_"
     BEGIN
-        MENUITEM "G&oto Diff",                  ID_LOCBAR_GOTODIFF
-        MENUITEM "&Goto...",                    ID_EDIT_WMGOTO
+        MENUITEM "תµ½²»Í¬(&O)",                ID_LOCBAR_GOTODIFF
+        MENUITEM "תµ½(&G)...",                 ID_EDIT_WMGOTO
         MENUITEM SEPARATOR
-        MENUITEM "&No Moved Blocks",            ID_DISPLAY_MOVED_NONE
-        MENUITEM "&All Moved Blocks",           ID_DISPLAY_MOVED_ALL
-        MENUITEM "Moved Block for &Current Diff", ID_DISPLAY_MOVED_FOLLOW_DIFF
+        MENUITEM "²»ÏÔʾÒƶ¯Çø¿é(&N)",          ID_DISPLAY_MOVED_NONE
+        MENUITEM "ËùÓÐÒƶ¯Çø¿é(&A)",            ID_DISPLAY_MOVED_ALL
+        MENUITEM "µ±Ç°²»Í¬´¦Òƶ¯Çø¿é(&C)",      ID_DISPLAY_MOVED_FOLLOW_DIFF
     END
 END
 
@@ -553,12 +554,12 @@ BEGIN
     LTEXT           "°æ±¾ 1.0",IDC_VERSION,64,23,84,8,SS_NOPREFIX
     LTEXT           "(Private Build)",IDC_PRIVATEBUILD,63,33,153,8
     LTEXT           "±£ÁôËùÓÐȨÀû¡£",IDC_STATIC,7,60,170,8
-    LTEXT           "°Ý·Ã WinMerge Ê×Ò³£¡",IDC_WWW,7,107,209,8
+    LTEXT           "·ÃÎÊ WinMerge Ê×Ò³!",IDC_WWW,7,107,209,8
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,103,209,1
     LTEXT           "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8
-    LTEXT           "Contributors are listed in",IDC_STATIC,7,81,208,8
+    LTEXT           "¹±Ï×ÕßÃûµ¥ÁÐÓÚÏÂÃæµÄÎļþÖÐ",IDC_STATIC,7,81,208,8
     LTEXT           "Contributors.txt",IDC_STATIC,7,91,153,8
-    PUSHBUTTON      "Show...",IDC_OPEN_CONTRIBUTORS,165,95,50,14
+    PUSHBUTTON      "ÏÔʾ...",IDC_OPEN_CONTRIBUTORS,165,95,50,14
 END
 
 IDD_OPEN DIALOGEX 0, 0, 364, 126
@@ -567,29 +568,29 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU |
 CAPTION "Ñ¡ÔñÎļþ»òÎļþ¼Ð..."
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    RTEXT           "×ó±ß(&L):",IDC_STATIC,13,24,40,8
+    RTEXT           "×ó²à(&L):",IDC_STATIC,13,24,40,8    
     COMBOBOX        IDC_LEFT_COMBO,56,22,182,94,CBS_DROPDOWN | CBS_AUTOHSCROLL |
                     WS_VSCROLL | WS_TABSTOP,WS_EX_ACCEPTFILES
     PUSHBUTTON      "ä¯ÀÀ(&B)...",IDC_LEFT_BUTTON,242,22,50,12
-    RTEXT           "ÓÒ±ß(&R):",IDC_STATIC,13,40,40,8
+    RTEXT           "ÓÒ²à(&R):",IDC_STATIC,13,40,40,8
     COMBOBOX        IDC_RIGHT_COMBO,56,38,182,95,CBS_DROPDOWN | CBS_AUTOHSCROLL |
                     WS_VSCROLL | WS_TABSTOP,WS_EX_ACCEPTFILES
     PUSHBUTTON      "ä¯ÀÀ(&W)...",IDC_RIGHT_BUTTON,242,38,50,12
-    RTEXT           "&Filter:",IDC_STATIC,13,56,40,8
+    RTEXT           "¹ýÂËÆ÷(&F):",IDC_STATIC,13,56,40,8
     COMBOBOX        IDC_EXT_COMBO,56,54,182,95,CBS_DROPDOWN | CBS_AUTOHSCROLL |
                     WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Select...",IDC_SELECT_FILTER,242,54,50,12
-    RTEXT           "&Unpacker:",IDC_STATIC,13,72,40,8
+    PUSHBUTTON      "Ñ¡Ôñ...",IDC_SELECT_FILTER,242,54,50,12
+    RTEXT           "½â°ü³ÌÐò(&U):",IDC_STATIC,13,72,40,8
     EDITTEXT        IDC_UNPACKER_EDIT,56,70,181,12,ES_AUTOHSCROLL |
                     ES_READONLY
-    PUSHBUTTON      "Select...",IDC_SELECT_UNPACKER,242,70,50,12
-    CONTROL         "&Include Subfolders",IDC_RECURS_CHECK,"Button",
+    PUSHBUTTON      "Ñ¡Ôñ...",IDC_SELECT_UNPACKER,242,70,50,12
+    CONTROL         "°üº¬×ÓĿ¼(&I)",IDC_RECURS_CHECK,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,56,86,181,10
-    LTEXT           "Status:",IDC_OPEN_STATUS,15,102,182,8
+    LTEXT           "״̬:",IDC_OPEN_STATUS,15,102,182,8
     DEFPUSHBUTTON   "È·¶¨",IDOK,306,11,50,14
     PUSHBUTTON      "È¡Ïû",IDCANCEL,306,28,50,14
-    GROUPBOX        "Ҫ±È¶ÔµÄÎļþ»òÎļþ¼Ð",IDC_FILES_DIRS_GROUP,7,7,292,111
-    PUSHBUTTON   "Save project",IDC_SAVEPROJECT,306,56,50,14
+    GROUPBOX        "Ҫ¶Ô±ÈµÄÎļþ»òÎļþ¼Ð",IDC_FILES_DIRS_GROUP,7,7,292,111
+    PUSHBUTTON      "±£´æ¹¤³Ì",IDC_SAVEPROJECT,306,56,50,14
 END
 
 IDD_VSS DIALOGEX 0, 0, 257, 166
@@ -600,31 +601,31 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     LTEXT           "",IDC_STATIC,7,7,243,47,SS_SUNKEN
     LTEXT           "IDS_SAVEVSS_FMT",IDC_MESSAGE,14,13,231,34
-    LTEXT           "Database:",IDC_STATIC,7,64,36,8
+    LTEXT           "Êý¾Ý¿â:",IDC_STATIC,7,64,36,8
     COMBOBOX        IDC_DATABASE_LIST,48,63,202,114,CBS_DROPDOWN |
                     CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Project:",IDC_STATIC,7,81,36,8
+    LTEXT           "¹¤³Ì:",IDC_STATIC,7,81,36,8
     COMBOBOX        IDC_PROJECT_COMBO,48,78,202,114,CBS_DROPDOWN |
                     CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "User:",IDC_STATIC,7,99,36,8
+    LTEXT           "Óû§Ãû:",IDC_STATIC,7,99,36,8
     EDITTEXT        IDC_USER,48,96,70,14,ES_AUTOHSCROLL
-    RTEXT           "Password:",IDC_STATIC,122,99,55,8
+    RTEXT           "ÃÜÂë:",IDC_STATIC,122,99,55,8
     EDITTEXT        IDC_PASSWORD,180,96,70,14,ES_PASSWORD | ES_AUTOHSCROLL
-    CONTROL         "Link to Destination VSS project",IDC_VCPROJ_SYNC,"Button",
+    CONTROL         "Á¬½Óµ½Ä¿±ê VSS ¹¤³Ì",IDC_VCPROJ_SYNC,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,115,235,8
-    CONTROL         "Apply to all items",IDC_MULTI_CHECKOUT,"Button",
+    CONTROL         "Ó¦ÓÃÓÚËùÓÐÏîÄ¿",IDC_MULTI_CHECKOUT,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,125,235,8
-    DEFPUSHBUTTON   "Check Out",IDOK,91,145,50,14
-    PUSHBUTTON      "Save As...",IDC_SAVE_AS,145,145,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,200,145,50,14
+    DEFPUSHBUTTON   "Ç©³ö",IDOK,91,145,50,14
+    PUSHBUTTON      "Áí´æΪ...",IDC_SAVE_AS,145,145,50,14
+    PUSHBUTTON      "È¡Ïû",IDCANCEL,200,145,50,14
 END
 
 IDD_PROP_VSS DIALOGEX 0, 0, 235, 157
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
-CAPTION "°æ±¾ÏµÍ³"
+CAPTION "°æ±¾¿ØÖÆϵͳ"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    LTEXT           "°æ±¾ÏµÍ³(&V)",IDC_STATIC,7,7,221,10
+    LTEXT           "°æ±¾¿ØÖÆϵͳ(&V)",IDC_STATIC,7,7,221,10
     COMBOBOX        IDC_VER_SYS,7,18,166,98,CBS_DROPDOWNLIST | WS_VSCROLL |
                     WS_TABSTOP
     LTEXT           "cleartool.exe Â·¾¶(&P):",IDC_SCROLL_CHECK,7,37,221,10
@@ -637,29 +638,29 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
 CAPTION "³£¹æ"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    CONTROL         "±¸·ÝԭʼÎļþ(&B)",IDC_BACKUP_CHECK,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,7,83,10
-    CONTROL         "×Ô¶¯¹ö¶¯µ½µÚÒ»¸ö²»Í¬(&S)",IDC_SCROLL_CHECK,"Button",
+    CONTROL         "±¸·ÝԭʼÎļþ(&B)",IDC_BACKUP_CHECK,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,7,83,10
+    CONTROL         "×Ô¶¯¹ö¶¯µ½µÚÒ»´¦²»Í¬(&S)",IDC_SCROLL_CHECK,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,17,129,10
-    CONTROL         "Í£ÓÃÒýÈËעĿµÄÆÁÄ»(&D)",IDC_DISABLE_SPLASH,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,27,100,10
-    CONTROL         "&Close compare Statepane automatically",IDC_CMPPANE_AUTOCLOSE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
-    CONTROL         "Cl&ose windows with ESC",IDC_ESC_CLOSES_WINDOW,"Button",
+    CONTROL         "Í£ÓÃÆô¶¯ÆÁÄ»(&D)",IDC_DISABLE_SPLASH,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,27,100,10
+    CONTROL         "×Ô¶¯¹Ø±Õ¶Ô±È½á¹û´°(&C)",IDC_CMPPANE_AUTOCLOSE,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
+    CONTROL         "ESC¹Ø±Õ´°¿Ú(&O)",IDC_ESC_CLOSES_WINDOW,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
-    CONTROL         "Automatically verify paths in Open-dialog",
+    CONTROL         "ÔÚ¡°´ò¿ª¡±¶Ô»°¿òÖÐ×Ô¶¯Ñé֤·¾¶",
                     IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,7,57,206,10
-    CONTROL         "&Allow only one instance to run",IDC_SINGLE_INSTANCE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,67,206,10
-    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,82,221,37
-    CONTROL         "&Folder compare",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
-    CONTROL         "Fil&e compare",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,104,206,10
-    PUSHBUTTON      "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,132,50,13,NOT
+    CONTROL         "Ö»ÔÊÐíÔËÐÐÒ»¸öʵÀý(&A)",IDC_SINGLE_INSTANCE,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,67,206,10
+    GROUPBOX        "ÔÊÐí¶à¸ö¶Ô±È´°¿Ú",IDC_STATIC,7,82,221,37
+    CONTROL         "Îļþ¼Ð¶Ô±È(&F)",IDC_MULTIDOC_DIRCMP,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+    CONTROL         "Îļþ¶Ô±È(&E)",IDC_MULTIDOC_FILECMP,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,15,104,206,10
+    PUSHBUTTON      "ÖØÖÃ",IDC_RESET_ALL_MESSAGE_BOXES,178,132,50,13,NOT
                     WS_TABSTOP
-    LTEXT           "WinMerge allows hiding some common messageboxes. Press button to make all messageboxes visible again.",
+    LTEXT           "WinMerge ÔÊÐíÄúÒþ²ØһЩÏûÏ¢Ìáʾ¡£\nµã»÷´Ë°´Å¥ÒÔʹËùÓÐÒþ²ØµÄÏûÏ¢ÌáʾÖØÐÂÏÔʾ¡£",
                     IDC_STATIC,7,124,168,31
 END
 
@@ -671,31 +672,31 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     PUSHBUTTON      "È·¶¨",IDOK,154,16,52,14
     PUSHBUTTON      "È¡Ïû",IDCANCEL,154,33,52,14
-    LISTBOX         1037,5,16,141,89,LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
-                    WS_TABSTOP | LBS_SORT
+    LISTBOX         1037,5,16,141,89,LBS_SORT | LBS_NOINTEGRALHEIGHT |
+                    WS_VSCROLL | WS_TABSTOP
     LTEXT           "¿ÉÓõÄÓïÑÔ:",IDC_STATIC,7,7,140,8
 END
 
 IDD_EDIT_FIND DIALOGEX 30, 73, 283, 66
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
     WS_SYSMENU
-CAPTION "²éѯ"
+CAPTION "²éÕÒ"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    LTEXT           "²éѯÄÚÈÝ(&N):",IDC_STATIC,7,9,50,8
+    LTEXT           "²éÕÒÄÚÈÝ(&N):",IDC_STATIC,7,9,50,8
     COMBOBOX        IDC_EDIT_FINDTEXT,59,7,160,65,CBS_DROPDOWN |
                     CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "È«×ÖÆ¥Åä(&W)",IDC_EDIT_WHOLE_WORD,"Button",BS_AUTOCHECKBOX |
-                    WS_GROUP | WS_TABSTOP,7,27,135,10
-    CONTROL         "Çø·Ö´óСд(&C)",IDC_EDIT_MATCH_CASE,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,37,135,10
-    CONTROL         "ʹÓùæÔò±í´ïʽ(&E)",IDC_EDIT_REGEXP,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,47,135,10
+    CONTROL         "È«×ÖÆ¥Åä(&W)",IDC_EDIT_WHOLE_WORD,"Button",
+                    BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,27,135,10
+    CONTROL         "Çø·Ö´óСд(&C)",IDC_EDIT_MATCH_CASE,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,37,135,10
+    CONTROL         "ʹÓÃÕýÔò±í´ïʽ(&E)",IDC_EDIT_REGEXP,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,47,135,10
     GROUPBOX        "·½Ïò",IDC_STATIC,148,23,70,36,WS_GROUP
-    CONTROL         "ÉÏÒÆ(&U)",IDC_EDIT_DIRECTION_UP,"Button",BS_AUTORADIOBUTTON | WS_GROUP,
-                    154,34,50,10
-    CONTROL         "ÏÂÒÆ(&D)",IDC_EDIT_DIRECTION_DOWN,"Button",BS_AUTORADIOBUTTON,111,48,41,12
-    DEFPUSHBUTTON   "ÕÒÏÂÒ»¸ö(&F)",IDOK,226,7,50,14,WS_GROUP
+    CONTROL         "ÏòÉÏ(&U)",IDC_EDIT_DIRECTION_UP,"Button",BS_AUTORADIOBUTTON | WS_GROUP,
+                    154,33,50,10
+    CONTROL         "ÏòÏÂ(&D)",IDC_EDIT_DIRECTION_DOWN,"Button",BS_AUTORADIOBUTTON,154,44,41,12
+    DEFPUSHBUTTON   "²éÕÒÏÂÒ»´¦(&F)",IDOK,226,7,50,14,WS_GROUP
     PUSHBUTTON      "È¡Ïû",IDCANCEL,226,24,50,14
 END
 
@@ -711,16 +712,16 @@ BEGIN
     LTEXT           "Ì滻Ϊ(&P):",IDC_STATIC,7,24,65,8
     COMBOBOX        IDC_EDIT_REPLACE_WITH,75,22,165,66,CBS_DROPDOWN |
                     CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "È«×ÖÆ¥Åä(&W)",IDC_EDIT_WHOLE_WORD,"Button",BS_AUTOCHECKBOX |
-                    WS_GROUP | WS_TABSTOP,7,44,135,10
-    CONTROL         "Çø·Ö´óСд(&C)",IDC_EDIT_MATCH_CASE,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,54,135,10
-    CONTROL         "ʹÓùæÔò±í´ïʽ(&E)",IDC_EDIT_REGEXP,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,64,135,10
-    CONTROL         "&Don't wrap end of file",IDC_EDIT_SCOPE_DONT_WRAP,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,74,135,10
+    CONTROL         "È«×ÖÆ¥Åä(&W)",IDC_EDIT_WHOLE_WORD,"Button",
+                    BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,44,135,10
+    CONTROL         "Çø·Ö´óСд(&C)",IDC_EDIT_MATCH_CASE,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,54,135,10
+    CONTROL         "ʹÓùæÔò±í´ïʽ(&E)",IDC_EDIT_REGEXP,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,64,135,10
+    CONTROL         "ÖÁÎļþĩβ²»ÔÙ´ÓÍ·ËÑË÷(&D)",IDC_EDIT_SCOPE_DONT_WRAP,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,74,135,10
     GROUPBOX        "Ìæ»»·¶Î§",IDC_STATIC,149,40,90,36,WS_GROUP
-    CONTROL         "ѡÔñ(&S)",IDC_EDIT_SCOPE_SELECTION,"Button",BS_AUTORADIOBUTTON | WS_GROUP,
+    CONTROL         "ѡÖÐÄÚÈÝ(&S)",IDC_EDIT_SCOPE_SELECTION,"Button",BS_AUTORADIOBUTTON | WS_GROUP,
                     154,51,80,10
     CONTROL         "Õû¸öÎļþ(&O)",IDC_EDIT_SCOPE_WHOLE_FILE,"Button",BS_AUTORADIOBUTTON,154,61,
                     80,10
@@ -746,12 +747,12 @@ END
 
 IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 235, 156
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Linefilters"
+CAPTION "ÐйýÂËÆ÷"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     CONTROL         "ºöÂÔ·ûºÏÏÂÁÐÑùʽµÄÐÐ",IDC_IGNOREREGEXP,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,7,7,221,15
-    LTEXT           "¹æÔò±í´ïʽ (ÿÐÐÒ»¸ö):",-1,7,28,221,8
+    LTEXT           "ÕýÔò±í´ïʽ (ÿÐÐÒ»¸ö):",-1,7,28,221,8
     EDITTEXT        IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE | ES_AUTOHSCROLL |
                     ES_WANTRETURN
 END
@@ -767,8 +768,8 @@ BEGIN
     RTEXT           "ÒÑÑ¡Ôñ:",IDC_STATIC,7,49,90,8
     CONTROL         "ÒÑÑ¡Ôñ",IDC_SEL_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,113,49,17,
                     14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE
-    CTEXT           "Background",IDC_STATIC,96,15,50,8
-    CTEXT           "Deleted",IDC_STATIC,145,15,38,8
+    CTEXT           "±³¾°",IDC_STATIC,96,15,50,8
+    CTEXT           "ÒÑɾ³ý",IDC_STATIC,145,15,38,8
     CONTROL         "Dif",IDC_DIFFERENCE_DELETED_COLOR,"Button",BS_OWNERDRAW |
                     WS_TABSTOP,156,29,17,14,WS_EX_TRANSPARENT |
                     WS_EX_CLIENTEDGE
@@ -781,11 +782,11 @@ BEGIN
     CONTROL         "Dif",IDC_SEL_DIFFERENCE_TEXT_COLOR,"Button",
                     BS_OWNERDRAW | WS_TABSTOP,199,49,17,14,WS_EX_TRANSPARENT |
                     WS_EX_CLIENTEDGE
-    CTEXT           "Text",IDC_STATIC,193,15,29,8
+    CTEXT           "ÎÄ×Ö",IDC_STATIC,193,15,29,8
     CONTROL         "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW |
                     WS_TABSTOP,113,69,17,14,WS_EX_TRANSPARENT |
                     WS_EX_CLIENTEDGE
-    RTEXT           "Ignored Difference:",IDC_STATIC,7,69,90,8
+    RTEXT           "ÂÔ¹ýµÄ²»Í¬:",IDC_STATIC,7,69,90,8
     CONTROL         "Dif",IDC_TRIVIAL_DIFF_DELETED_COLOR,"Button",
                     BS_OWNERDRAW | WS_TABSTOP,156,69,17,14,WS_EX_TRANSPARENT |
                     WS_EX_CLIENTEDGE
@@ -795,7 +796,7 @@ BEGIN
     CONTROL         "Dif",IDC_MOVEDBLOCK_COLOR,"Button",BS_OWNERDRAW |
                     WS_TABSTOP,113,89,17,14,WS_EX_TRANSPARENT |
                     WS_EX_CLIENTEDGE
-    RTEXT           "Moved:",IDC_STATIC,7,89,90,8
+    RTEXT           "Òƶ¯Çø¿é:",IDC_STATIC,7,89,90,8
     CONTROL         "Dif",IDC_MOVEDBLOCK_DELETED_COLOR,"Button",
                     BS_OWNERDRAW | WS_TABSTOP,156,89,17,14,WS_EX_TRANSPARENT |
                     WS_EX_CLIENTEDGE
@@ -805,28 +806,28 @@ BEGIN
     CONTROL         "Dif",IDC_SEL_MOVEDBLOCK_COLOR,"Button",BS_OWNERDRAW |
                     WS_TABSTOP,113,109,17,14,WS_EX_TRANSPARENT |
                     WS_EX_CLIENTEDGE
-    RTEXT           "Selected Moved:",IDC_STATIC,7,109,90,8
+    RTEXT           "Ñ¡ÖеÄÒƶ¯Çø¿é:",IDC_STATIC,7,109,90,8
     CONTROL         "Dif",IDC_SEL_MOVEDBLOCK_DELETED_COLOR,"Button",
                     BS_OWNERDRAW | WS_TABSTOP,156,109,17,14,WS_EX_TRANSPARENT |
                     WS_EX_CLIENTEDGE
     CONTROL         "Dif",IDC_SEL_MOVEDBLOCK_TEXT_COLOR,"Button",
                     BS_OWNERDRAW | WS_TABSTOP,199,109,17,14,WS_EX_TRANSPARENT |
                     WS_EX_CLIENTEDGE
-    RTEXT           "Word Difference:",IDC_STATIC,7,129,90,8
+    RTEXT           "´ÊÓﲻͬ:",IDC_STATIC,7,129,90,8
     CONTROL         "Dif",IDC_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW |
                     WS_TABSTOP,113,129,17,14,WS_EX_TRANSPARENT |
                     WS_EX_CLIENTEDGE
     CONTROL         "Dif",IDC_WORDDIFFERENCE_TEXT_COLOR,"Button",
                     BS_OWNERDRAW | WS_TABSTOP,199,129,17,14,WS_EX_TRANSPARENT |
                     WS_EX_CLIENTEDGE
-    RTEXT           "Selected Word Diff:",IDC_STATIC,7,149,90,8
+    RTEXT           "Ñ¡ÖеĴÊÓﲻͬ:",IDC_STATIC,7,149,90,8
     CONTROL         "Dif",IDC_SEL_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW |
                     WS_TABSTOP,113,149,17,14,WS_EX_TRANSPARENT |
                     WS_EX_CLIENTEDGE
     CONTROL         "Dif",IDC_SEL_WORDDIFFERENCE_TEXT_COLOR,"Button",
                     BS_OWNERDRAW | WS_TABSTOP,199,149,17,14,WS_EX_TRANSPARENT |
                     WS_EX_CLIENTEDGE
-    PUSHBUTTON      "Defaults",IDC_COLORDEFAULTS_BTN,166,170,50,14
+    PUSHBUTTON      "ĬÈÏ",IDC_COLORDEFAULTS_BTN,166,170,50,14
 END
 
 IDD_OUTPUT DIALOGEX 0, 0, 278, 157
@@ -844,66 +845,66 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
 CAPTION "System"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    CONTROL         "&Send deleted files to Recycle Bin",IDC_USE_RECYCLE_BIN,
+    CONTROL         "½«É¾³ýµÄÎļþÒÆÖÁ»ØÊÕÕ¾(&S)",IDC_USE_RECYCLE_BIN,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,222,10
-    CONTROL         "&Add to explorer context menu",IDC_EXPLORER_CONTEXT,
+    CONTROL         "Ìí¼Óµ½×ÊÔ´¹ÜÀíÆ÷µÄÓÒ¼ü²Ëµ¥ÖÐ(&A)",IDC_EXPLORER_CONTEXT,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,17,222,10
-    CONTROL         "E&nable advanced menu",IDC_EXPLORER_ADVANCED,"Button",
+    CONTROL         "ÔÊÐí¸ß¼¶²Ëµ¥(&N)",IDC_EXPLORER_ADVANCED,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,18,28,211,10
-    CONTROL         "Ignore time differences less than 3 seconds",
-                    IDC_IGNORE_SMALLTIMEDIFF,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "ºöÂÔ²»×ã3ÃëµÄʱ¼ä²î±ð",
+                    IDC_IGNORE_SMALLTIMEDIFF,"Button", BS_AUTOCHECKBOX |
                     WS_TABSTOP,8,39,222,10
-    LTEXT           "&External editor:",IDC_STATIC,7,49,222,8
+    LTEXT           "Íⲿ±à¼­Æ÷(&E)",IDC_STATIC,7,49,222,8
     EDITTEXT        IDC_EXT_EDITOR_PATH,7,59,167,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "&Browse...",IDC_EXT_EDITOR_BROWSE,179,59,50,14
+    PUSHBUTTON      "ä¯ÀÀ(&B)...",IDC_EXT_EDITOR_BROWSE,179,59,50,14
 END
 
 IDD_GENERATE_PATCH DIALOGEX 0, 0, 340, 180
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
     WS_SYSMENU
-CAPTION "Patch Generator"
+CAPTION "PatchÉú³ÉÆ÷"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    LTEXT           "File&1:",IDC_STATIC,7,10,36,8
+    LTEXT           "Îļþ&1:",IDC_STATIC,7,10,36,8
     COMBOBOX        IDC_DIFF_FILE1,48,7,230,93,CBS_DROPDOWN |
                     CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "&Browse...",IDC_DIFF_BROWSE_FILE1,283,7,50,14
-    LTEXT           "File&2:",IDC_STATIC,7,27,36,8
+    PUSHBUTTON      "ä¯ÀÀ(&B)...",IDC_DIFF_BROWSE_FILE1,283,7,50,14
+    LTEXT           "Îļþ&2:",IDC_STATIC,7,27,36,8
     COMBOBOX        IDC_DIFF_FILE2,48,24,230,96,CBS_DROPDOWN |
                     CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Br&owse...",IDC_DIFF_BROWSE_FILE2,283,24,50,14
-    PUSHBUTTON      "&Swap",IDC_DIFF_SWAPFILES,283,41,50,14
-    CONTROL         "&Append to existing file",IDC_DIFF_APPENDFILE,"Button",
+    PUSHBUTTON      "ä¯ÀÀ(&O)...",IDC_DIFF_BROWSE_FILE2,283,24,50,14
+    PUSHBUTTON      "ÉÏϽ»»»(&S)",IDC_DIFF_SWAPFILES,283,41,50,14
+    CONTROL         "Ìí¼Óµ½ÒÑÓÐÎļþµÄĩβ(&A)",IDC_DIFF_APPENDFILE,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,48,51,230,10
-    LTEXT           "&Result:",IDC_STATIC,7,66,37,8
+    LTEXT           "½á¹û(&R):",IDC_STATIC,7,66,37,8
     COMBOBOX        IDC_DIFF_FILERESULT,48,63,230,96,CBS_DROPDOWN |
                     CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Bro&wse...",IDC_DIFF_BROWSE_RESULT,283,63,50,14
-    GROUPBOX        "&Format",IDC_STATIC,7,81,142,46
-    LTEXT           "St&yle:",IDC_STATIC,13,95,46,8
+    PUSHBUTTON      "ä¯ÀÀ(&W)...",IDC_DIFF_BROWSE_RESULT,283,63,50,14
+    GROUPBOX        "¸ñʽ(&F)",IDC_STATIC,7,81,142,46
+    LTEXT           "Ñùʽ(&Y):",IDC_STATIC,13,95,46,8
     COMBOBOX        IDC_DIFF_STYLE,63,92,80,68,CBS_DROPDOWNLIST | WS_VSCROLL |
                     WS_TABSTOP
     LTEXT           "&Context:",IDC_STATIC,13,109,46,8
     COMBOBOX        IDC_DIFF_CONTEXT,63,108,80,65,CBS_DROPDOWNLIST |
                     WS_DISABLED | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "W&hitespaces",IDC_STATIC,155,81,123,46
-    CONTROL         "Com&pare",IDC_DIFF_WHITESPACE_COMPARE,"Button",
+    GROUPBOX        "¿Õ°×(&H)",IDC_STATIC,155,81,123,46
+    CONTROL         "¶Ô±È(&P)",IDC_DIFF_WHITESPACE_COMPARE,"Button",
                     BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,162,92,110,10
-    CONTROL         "I&gnore changes",IDC_DIFF_WHITESPACE_IGNORE,"Button",
+    CONTROL         "ºöÂԱ仯(G)",IDC_DIFF_WHITESPACE_IGNORE,"Button",
                     BS_AUTORADIOBUTTON | WS_TABSTOP,162,102,110,10
-    CONTROL         "Ig&nore all",IDC_DIFF_WHITESPACE_IGNOREALL,"Button",
+    CONTROL         "ºöÂÔËùÓÐ(&N)",IDC_DIFF_WHITESPACE_IGNOREALL,"Button",
                     BS_AUTORADIOBUTTON | WS_TABSTOP,162,112,110,10
-    CONTROL         "Ignor&e blank lines",IDC_DIFF_WHITESPACE_IGNOREBLANKS,
+    CONTROL         "ºöÂÔ¿ÕÐÐ(&E)",IDC_DIFF_WHITESPACE_IGNOREBLANKS,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,134,142,10
-    CONTROL         "Case sensi&tive",IDC_DIFF_CASESENSITIVE,"Button",
+    CONTROL         "Çø·Ö´óСд(&T)",IDC_DIFF_CASESENSITIVE,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,145,142,10
-    CONTROL         "Inclu&de command line",IDC_DIFF_INCLCMDLINE,"Button",
+    CONTROL         "°üº¬ÃüÁîÐÐ(&D)",IDC_DIFF_INCLCMDLINE,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,155,134,170,10
-    CONTROL         "Open to e&xternal editor",IDC_DIFF_OPENTOEDITOR,"Button",
+    CONTROL         "ÓÃÍⲿ±à¼­Æ÷´ò¿ª(&X)",IDC_DIFF_OPENTOEDITOR,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,155,145,170,10
-    PUSHBUTTON      "Defaults",IDC_DIFF_DEFAULTS,7,159,50,14
-    DEFPUSHBUTTON   "OK",IDOK,230,159,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,283,159,50,14
+    PUSHBUTTON      "ĬÈÏ",IDC_DIFF_DEFAULTS,7,159,50,14
+    DEFPUSHBUTTON   "È·¶¨",IDOK,230,159,50,14
+    PUSHBUTTON      "È¡Ïû",IDCANCEL,283,159,50,14
 END
 
 IDD_EDITOR_HEADERBAR DIALOGEX 0, 0, 373, 12
@@ -921,41 +922,41 @@ END
 IDD_DIRCOLS DIALOGEX 0, 0, 283, 170
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
     WS_SYSMENU
-CAPTION "Display Columns"
+CAPTION "Ñ¡ÔñÏÔʾÁÐ"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    GROUPBOX        "Show columns",IDC_GROUP_SHOW,7,7,129,109
+    GROUPBOX        "ÏÔʾµÄÁÐ",IDC_GROUP_SHOW,7,7,129,109
     LISTBOX         IDC_LIST_SHOW,48,19,80,90,LBS_NOINTEGRALHEIGHT |
                     LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
-    PUSHBUTTON      "&Up",IDC_UP,14,45,27,14
-    PUSHBUTTON      "&Down",IDC_DOWN,14,63,27,14
-    GROUPBOX        "Hide columns",IDC_GROUP_HIDE,180,7,96,109
+    PUSHBUTTON      "ÉÏÒÆ(&U)",IDC_UP,14,45,27,14
+    PUSHBUTTON      "ÏÂÒÆ(&D)",IDC_DOWN,14,63,27,14
+    GROUPBOX        "Òþ²ØµÄÁÐ",IDC_GROUP_HIDE,180,7,96,109
     LISTBOX         IDC_LIST_HIDE,188,19,80,90,LBS_NOINTEGRALHEIGHT |
                     LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
     PUSHBUTTON      "<==",IDC_ADD,143,45,29,14
     PUSHBUTTON      "==>",IDC_REMOVE,143,63,29,14
     EDITTEXT        IDC_COLDLG_DESC,7,122,269,22,ES_MULTILINE | ES_READONLY
-    PUSHBUTTON      "Defaults",IDC_COLDLG_DEFAULTS,7,149,50,14
-    DEFPUSHBUTTON   "OK",IDOK,172,149,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,226,149,50,14
+    PUSHBUTTON      "ĬÈÏ",IDC_COLDLG_DEFAULTS,7,149,50,14
+    DEFPUSHBUTTON   "È·¶¨",IDOK,172,149,50,14
+    PUSHBUTTON      "È¡Ïû",IDCANCEL,226,149,50,14
 END
 
 IDD_SELECTUNPACKER DIALOGEX 0, 0, 293, 126
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
     WS_SYSMENU
-CAPTION "Select Unpacker"
+CAPTION "Ñ¡Ôñ½â°ü³ÌÐò"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,87,99,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,156,99,50,14
-    LTEXT           "File unpacker:",IDC_STATIC,7,18,50,10
+    DEFPUSHBUTTON   "È·¶¨",IDOK,87,99,50,14
+    PUSHBUTTON      "È¡Ïû",IDCANCEL,156,99,50,14
+    LTEXT           "Îļþ½â°ü³ÌÐò:",IDC_STATIC,7,18,68,10
     COMBOBOX        IDC_UNPACKER_NAME,98,16,188,63,CBS_DROPDOWNLIST |
                     WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Display all unpackers, don't check the extension",
+    CONTROL         "²»¼ì²éÀ©Õ¹Ãû£¬ÏÔʾËùÓнâ°ü³ÌÐò¡£",
                     IDC_UNPACKER_ALLOW_ALL,"Button",BS_AUTOCHECKBOX |
                     BS_LEFTTEXT | WS_TABSTOP,7,74,202,13
-    LTEXT           "Extensions list:",IDC_STATIC,7,36,49,10
-    LTEXT           "Description:",IDC_STATIC,7,52,47,10
+    LTEXT           "À©Õ¹Ãû:",IDC_STATIC,7,36,49,10
+    LTEXT           "ÃèÊö:",IDC_STATIC,7,52,47,10
     EDITTEXT        IDC_UNPACKER_SUPPORTED_EXTENSIONS,97,34,176,12,
                     ES_AUTOHSCROLL | ES_READONLY
     EDITTEXT        IDC_UNPACKER_DESCRIPTION,58,50,228,12,ES_AUTOHSCROLL |
@@ -1021,7 +1022,7 @@ BEGIN
                     0x2000
     RTEXT           "",IDC_COUNT_FILESKIP,288,29,26,8,SS_REALSIZEIMAGE |
                     0x2000
-    DEFPUSHBUTTON   "Stop",IDC_COMPARISON_STOP,327,17,83,14
+    DEFPUSHBUTTON   "ֹͣ",IDC_COMPARISON_STOP,327,17,83,14
     CONTROL         "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,4,
                     47,314,9
     RTEXT           "0",IDC_ITEMSCOMPARED,326,47,30,8
@@ -1032,23 +1033,23 @@ END
 IDD_WMGOTO DIALOGEX 0, 0, 210, 70
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
     WS_SYSMENU
-CAPTION "Go To"
+CAPTION "תµ½"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    LTEXT           "G&oto:",IDC_STATIC,7,9,36,8
+    LTEXT           "תµ½(&O):",IDC_STATIC,7,9,36,8
     EDITTEXT        IDC_WMGOTO_PARAM,45,7,102,14,ES_AUTOHSCROLL | ES_NUMBER
-    GROUPBOX        "File",IDC_STATIC,7,27,57,35
-    CONTROL         "&Left",IDC_WMGOTO_FILELEFT,"Button",BS_AUTORADIOBUTTON | 
+    GROUPBOX        "Îļþ",IDC_STATIC,7,27,57,35
+    CONTROL         "×ó²à(&L)",IDC_WMGOTO_FILELEFT,"Button",BS_AUTORADIOBUTTON |
                     WS_GROUP,13,38,48,10
-    CONTROL         "&Right",IDC_WMGOTO_FILERIGHT,"Button",
+    CONTROL         "ÓÒ²à(&R)",IDC_WMGOTO_FILERIGHT,"Button",
                     BS_AUTORADIOBUTTON,13,48,47,10
-    GROUPBOX        "Goto what",IDC_STATIC,69,27,78,35
-    CONTROL         "Li&ne",IDC_WMGOTO_TOLINE,"Button",BS_AUTORADIOBUTTON | 
+    GROUPBOX        "תµ½Àà±ð",IDC_STATIC,69,27,78,35
+    CONTROL         "ÐÐ(&N)",IDC_WMGOTO_TOLINE,"Button",BS_AUTORADIOBUTTON |
                     WS_GROUP,76,38,68,10
-    CONTROL         "&Difference",IDC_WMGOTO_TODIFF,"Button",
+    CONTROL         "²»Í¬´¦(&D)",IDC_WMGOTO_TODIFF,"Button",
                     BS_AUTORADIOBUTTON,76,48,68,10
-    DEFPUSHBUTTON   "&Go To",IDOK,153,7,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,153,24,50,14
+    DEFPUSHBUTTON   "תµ½(&G)",IDOK,153,7,50,14
+    PUSHBUTTON      "È¡Ïû",IDCANCEL,153,24,50,14
 END
 
 IDD_PROPPAGE_COMPARE DIALOGEX 0, 0, 235, 156
@@ -1056,26 +1057,26 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
 CAPTION "Compare"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    GROUPBOX        "Whitespaces",IDC_STATIC,7,7,221,50
-    CONTROL         "±È¶Ô¿Õ°×ºÍÖƱí·û(&W)",IDC_WHITESPACE,"Button",BS_AUTORADIOBUTTON |
+    GROUPBOX        "¿Õ°×",IDC_STATIC,7,7,221,50
+    CONTROL         "¶Ô±È¿Õ°×ºÍÖƱí·û(&W)",IDC_WHITESPACE,"Button",BS_AUTORADIOBUTTON |
                     WS_GROUP,14,19,206,10
     CONTROL         "ºöÂԿհ׺ÍÖƱí·û¸ü¸Ä(&H)",IDC_WHITE_CHANGE,"Button",
                     BS_AUTORADIOBUTTON,14,30,206,10
     CONTROL         "ºöÂÔËùÓпհ׺ÍÖƱí·û(&A)",IDC_ALL_WHITE,"Button",
                     BS_AUTORADIOBUTTON,14,41,206,10
-    CONTROL         "ºöÂÔ¿Õ°×ÁÐ(&K)",IDC_IGNBLANKS_CHECK,"Button",BS_AUTOCHECKBOX |
+    CONTROL         "ºöÂÔ¿ÕÐÐ(&K)",IDC_IGNBLANKS_CHECK,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,7,60,221,10
-    CONTROL         "Ãô¸Ð¶ÔÁÐÍ˳ö(&E)",IDC_IGNCASE_CHECK,"Button",BS_AUTOCHECKBOX |
+    CONTROL         "ºöÂÔ´óСд(&E)",IDC_IGNCASE_CHECK,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,7,70,221,10
-    CONTROL         "Igno&re carriage return differences (DOS/UNIX/MAC)",
+    CONTROL         "ºöÂÔ»»Ðзû²î±ð(&R) (DOS/UNIX/MAC)",
                     IDC_EOL_SENSITIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
                     7,80,221,10
-    CONTROL         "E&nable moved block detection",IDC_MOVED_BLOCKS,"Button",
+    CONTROL         "ÔÊÐí¼ì²âÒƶ¯Çø¿é(&N)",IDC_MOVED_BLOCKS,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10
-    LTEXT           "&File Compare method:",IDC_STATIC,7,105,70,9
+    LTEXT           "Îļþ¶Ô±È·½·¨(&F)",IDC_STATIC,7,105,70,9
     COMBOBOX        IDC_COMPAREMETHODCOMBO,79,103,84,52,CBS_DROPDOWNLIST |
                     WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Defaults",IDC_COMPARE_DEFAULTS,7,121,50,14
+    PUSHBUTTON      "ĬÈÏ",IDC_COMPARE_DEFAULTS,7,121,50,14
 END
 
 IDD_PROPPAGE_EDITOR DIALOGEX 0, 0, 235, 156
@@ -1083,30 +1084,30 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
 CAPTION "Editor"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    CONTROL         "Ç¿µ÷Óï·¨",IDC_HILITE_CHECK,"Button",
+    CONTROL         "Óï·¨¸ßÁÁ(&H)",IDC_HILITE_CHECK,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,7,215,10
-    CONTROL         "Apply to &unrecognized side",
+    CONTROL         "Ó¦ÓÃÓÚδʶ±ðµÄÒ»²à(&U)",
                     IDC_UNREC_APPLYSYNTAX,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,18,18,204,10
     CONTROL         "×Ô¶¯ÖØÐÂɨÃè(&R)",IDC_AUTOMRESCAN_CHECK,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,28,215,10
-    CONTROL         "&Preserve original EOL chars",IDC_MIXED_EOL,"Button",
+    CONTROL         "±£³ÖԭʼµÄ»»Ðзû(&P)",IDC_MIXED_EOL,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,38,215,10
     GROUPBOX        "ÖƱí·û",IDC_STATIC,7,54,221,33,WS_GROUP
-    LTEXT           "ÖƱí·û´óС(&T):",IDC_STATIC,10,68,42,8
+    LTEXT           "¿í¶È(&T)",IDC_STATIC,10,68,43,8
     EDITTEXT        IDC_TAB_EDIT,60,66,22,12,ES_AUTOHSCROLL | ES_NUMBER,
                     WS_EX_RIGHT
     CONTROL         "²åÈëÖƱí·û(&T)",IDC_PROP_INSERT_TABS,"Button",
                     BS_AUTORADIOBUTTON | WS_GROUP,85,63,137,10
-    CONTROL         "²åÈë¿Õ°×(&N)",IDC_PROP_INSERT_SPACES,"Button",
+    CONTROL         "²åÈë¿Õ¸ñ(&N)",IDC_PROP_INSERT_SPACES,"Button",
                     BS_AUTORADIOBUTTON,85,72,137,10
-    GROUPBOX        "Line Difference Coloring",IDC_LINE_COLORING_GROUP,7,97,
+    GROUPBOX        "ÐÐÖжԱÈ",IDC_LINE_COLORING_GROUP,7,97,
                     221,41
-    CONTROL         "View line differences",IDC_VIEW_LINE_DIFFERENCES,"Button",
+    CONTROL         "ÏÔʾÐÐÖв»Í¬",IDC_VIEW_LINE_DIFFERENCES,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,16,108,100,8
-    CONTROL         "Break on words",IDC_BREAK_ON_WORDS,"Button",
+    CONTROL         "ÒÔ´ÊÓï·Ö¸ô",IDC_BREAK_ON_WORDS,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,148,108,73,8
-    COMBOBOX        IDC_BREAK_TYPE,16,120,143,34,CBS_DROPDOWNLIST | 
+    COMBOBOX        IDC_BREAK_TYPE,16,120,143,34,CBS_DROPDOWNLIST |
                     WS_VSCROLL | WS_TABSTOP
 END
 
@@ -1119,122 +1120,122 @@ END
 
 IDD_FILEFILTERS DIALOGEX 0, 0, 356, 135
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION
-CAPTION "Filefilters"
+CAPTION "Îļþ¹ýÂËÆ÷"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     CONTROL         "List1",IDC_FILTERFILE_LIST,"SysListView32",LVS_REPORT |
                     LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER |
                     WS_BORDER | WS_TABSTOP,7,7,342,100
-    PUSHBUTTON      "New...",IDC_FILTERFILE_NEWBTN,188,114,50,14
-    PUSHBUTTON      "Edit...",IDC_FILTERFILE_EDITBTN,244,114,50,14
-    PUSHBUTTON      "Delete...",IDC_FILTERFILE_DELETEBTN,299,114,50,14
+    PUSHBUTTON      "н¨...",IDC_FILTERFILE_NEWBTN,188,114,50,14
+    PUSHBUTTON      "±à¼­...",IDC_FILTERFILE_EDITBTN,244,114,50,14
+    PUSHBUTTON      "ɾ³ý...",IDC_FILTERFILE_DELETEBTN,299,114,50,14
 END
 
 IDD_SAVECLOSING DIALOGEX 0, 0, 262, 154
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
     WS_SYSMENU
-CAPTION "Save modified files?"
+CAPTION "±£´æÐ޸ĺóµÄÎļþÂð£¿"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    GROUPBOX        "Left side file",IDC_SAVECLOSING_LEFTFRAME,7,7,248,55
+    GROUPBOX        "×ó²àÎļþ",IDC_SAVECLOSING_LEFTFRAME,7,7,248,55
     EDITTEXT        IDC_SAVECLOSING_LEFTFILE,16,19,230,14,ES_AUTOHSCROLL |
                     ES_READONLY
-    CONTROL         "&Save changes",IDC_SAVECLOSING_SAVELEFT,"Button",
+    CONTROL         "±£´æÐÞ¸Ä(&S)",IDC_SAVECLOSING_SAVELEFT,"Button",
                     BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,36,230,10
-    CONTROL         "&Discard changes",IDC_SAVECLOSING_DISCARDLEFT,"Button",
+    CONTROL         "·ÅÆúÐÞ¸Ä(&D)",IDC_SAVECLOSING_DISCARDLEFT,"Button",
                     BS_AUTORADIOBUTTON,16,46,230,10
-    GROUPBOX        "Right side file",IDC_SAVECLOSING_RIGHTFRAME,7,70,248,55
+    GROUPBOX        "ÓÒ²àÎļþ",IDC_SAVECLOSING_RIGHTFRAME,7,70,248,55
     EDITTEXT        IDC_SAVECLOSING_RIGHTFILE,16,82,230,14,ES_AUTOHSCROLL |
                     ES_READONLY
-    CONTROL         "S&ave changes",IDC_SAVECLOSING_SAVERIGHT,"Button",
+    CONTROL         "±£´æÐÞ¸Ä(&A)",IDC_SAVECLOSING_SAVERIGHT,"Button",
                     BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
-    CONTROL         "Dis&card changes",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
+    CONTROL         "·ÅÆúÐÞ¸Ä(&C)",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
                     BS_AUTORADIOBUTTON,16,109,230,10
-    PUSHBUTTON      "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
-    DEFPUSHBUTTON   "OK",IDOK,149,133,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,205,133,50,14
+    PUSHBUTTON      "·ÅÆúËùÓÐÐÞ¸Ä",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
+    DEFPUSHBUTTON   "È·¶¨",IDOK,149,133,50,14
+    PUSHBUTTON      "È¡Ïû",IDCANCEL,205,133,50,14
 END
 
 IDD_PROPPAGE_CODEPAGE DIALOGEX 0, 0, 235, 117
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
-CAPTION "Codepage"
+CAPTION "´úÂëÒ³"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    CONTROL         "Detect codepage info for these files : .html, .rc, .xml \nneed to restart session",
+    CONTROL         "¶ÔÒÔÏÂÎļþ½øÐдúÂëÒ³¼ì²â : .html, .rc, .xml\nÐèÒªÖØÆô»á»°",
                     IDC_DETECT_CODEPAGE,"Button",BS_AUTOCHECKBOX | BS_TOP |
                     BS_MULTILINE | WS_TABSTOP,13,74,210,29
-    CONTROL         "System codepage",IDC_CP_SYSTEM,"Button",
+    CONTROL         "ϵͳ´úÂëÒ³",IDC_CP_SYSTEM,"Button",
                     BS_AUTORADIOBUTTON | WS_GROUP,13,20,210,10
-    CONTROL         "According to WinMerge User Interface",IDC_CP_UI,"Button",
+    CONTROL         "Óë WinMerge Óû§½çÃæÒ»ÖÂ",IDC_CP_UI,"Button",
                     BS_AUTORADIOBUTTON,13,33,210,10
-    CONTROL         "Custom codepage :",IDC_CP_CUSTOM,"Button",
+    CONTROL         "Ö¸¶¨´úÂëÒ³ :",IDC_CP_CUSTOM,"Button",
                     BS_AUTORADIOBUTTON,13,46,77,10
     EDITTEXT        IDC_CUSTOM_CP_NUMBER,123,45,56,13,ES_AUTOHSCROLL
-    GROUPBOX        "Default codepage for ANSI files",IDC_STATIC,7,7,221,58
+    GROUPBOX        "ĬÈϵÄANSIÎļþ´úÂëÒ³",IDC_STATIC,7,7,221,58
 END
 
 IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 300, 245
 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_NOPARENTNOTIFY
-CAPTION "WinMerge - Archive support disabled"
+CAPTION "WinMerge - Ñ¹Ëõ°üÖ§³ÖÒѽûÓÃ"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    LTEXT           "Unable to detect 7-Zip version (not installed?)",107,2,
+    LTEXT           "ÎÞ·¨¼ì²â 7-Zip °æ±¾ (ûÓа²×°?)",107,2,
                     2,296,18
     CONTROL         "",IDC_STATIC,"Static",SS_GRAYRECT,2,22,296,1
-    LTEXT           "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\nessential components to be copied to the program directory for standalone operation.",
+    LTEXT           "ѹËõ°üÖ§³ÖÐèÒªÄúµÄ¼ÆËã»úÉÏ°²×°ÓР7-Zip 3.11 »ò¸ü¸ßµÄ°æ±¾£¬\n»òÊǽ«ËüµÄ×é¼þ¸´ÖƵ½±¾³ÌÐòµÄÎļþ¼ÐÖÐÒÔ¹©µ¥¶ÀʹÓá£",
                     IDC_STATIC,2,26,296,26
-    LTEXT           "There must also be an appropriate interface plugin (Merge7z*.dll) on the path.",
+    LTEXT           "ÔÚ²å¼þ·¾¶Öл¹ÐèÒªÓÐÊʵ±µÄ½Ó¿Ú²å¼þ(Merge7z*.dll)¡£",
                     IDC_STATIC,2,52,296,18
-    LTEXT           "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available.",
+    LTEXT           "PÔÚ¶ÔÓ¦ÓÚ×îаæ7-ZipµÄ²å¼þÃæÊÀ֮ǰ£¬ÇëʹÓÃÒÔÏÂÍƼöµÄ°æ±¾¡£",
                     IDC_STATIC,2,70,296,26
-    CTEXT           "Version",IDC_STATIC,146,98,56,20,SS_CENTERIMAGE | 
+    CTEXT           "°æ±¾",IDC_STATIC,146,98,56,20,SS_CENTERIMAGE |
                     SS_SUNKEN
-    CTEXT           "Plugin required\n(dllbuild %04u)",102,204,98,94,20,
+    CTEXT           "ÐèÒªµÄ²å¼þ\n(dllbuild %04u)",102,204,98,94,20,
                     SS_SUNKEN
-    LTEXT           "Recommended version of 7-Zip:",IDC_STATIC,2,120,142,10,
+    LTEXT           "ÍƼöµÄ 7-Zip °æ±¾£º",IDC_STATIC,2,120,142,10,
                     SS_CENTERIMAGE
     CTEXT           "0.00",110,146,120,20,10,SS_CENTERIMAGE | SS_SUNKEN
-    CTEXT           "present",109,168,120,34,10,SS_CENTERIMAGE | SS_SUNKEN
-    CTEXT           "Merge7z000U.dll",111,204,120,58,10,SS_CENTERIMAGE | 
+    CTEXT           "ÏÖ´æ",109,168,120,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "Merge7z000U.dll",111,204,120,58,10,SS_CENTERIMAGE |
                     SS_SUNKEN
-    CTEXT           "present",112,264,120,34,10,SS_CENTERIMAGE | SS_SUNKEN
-    LTEXT           "7-Zip software installed on your computer:",IDC_STATIC,
+    CTEXT           "ÏÖ´æ",112,264,120,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "Äú¼ÆËã»úÉÏ°²×°µÄ 7-Zip £º",IDC_STATIC,
                     2,132,142,10,SS_CENTERIMAGE
-    CTEXT           "none",120,146,132,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "ÎÞ",120,146,132,56,10,SS_CENTERIMAGE | SS_SUNKEN
     CTEXT           "",121,204,132,58,10,SS_CENTERIMAGE | SS_SUNKEN
-    CTEXT           "missing",122,264,132,34,10,SS_CENTERIMAGE | SS_SUNKEN
-    LTEXT           "7-Zip components for standalone operation:",IDC_STATIC,
+    CTEXT           "ûÓÐ",122,264,132,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "¹©µ¥¶ÀʹÓõĠ7-Zip ×é¼þ£º",IDC_STATIC,
                     2,144,142,10,SS_CENTERIMAGE
-    CTEXT           "none",130,146,144,56,10,SS_CENTERIMAGE | SS_SUNKEN
+    CTEXT           "ÎÞ",130,146,144,56,10,SS_CENTERIMAGE | SS_SUNKEN
     CTEXT           "",131,204,144,58,10,SS_CENTERIMAGE | SS_SUNKEN
-    CTEXT           "outdated",132,264,144,34,10,SS_CENTERIMAGE | SS_SUNKEN
-    LTEXT           "Plugins on path:",9001,2,160,100,8
-    CONTROL         "Don't display this &message again.\n(You can always recall this message from help menu.)",
-                    106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | 
+    CTEXT           "¹ýÆÚ",132,264,144,34,10,SS_CENTERIMAGE | SS_SUNKEN
+    LTEXT           "·¾¶ÖеIJå¼þ£º",9001,2,160,100,8
+    CONTROL         "²»ÔÙÏÔʾ´ËÏûÏ¢(&M)¡£\n(Äú¿ÉÒÔ´Ó°ïÖú²Ëµ¥Öе÷³öÕâ¸ö¶Ô»°¿ò¡£)",
+                    106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE |
                     WS_TABSTOP,2,225,218,18
-    DEFPUSHBUTTON   "OK",IDOK,236,226,50,14,WS_GROUP
-    CONTROL         "Plugin Download",108,"Button",BS_OWNERDRAW | WS_TABSTOP,
+    DEFPUSHBUTTON   "È·¶¨",IDOK,236,226,50,14,WS_GROUP
+    CONTROL         "ÏÂÔزå¼þ",108,"Button",BS_OWNERDRAW | WS_TABSTOP,
                     236,160,62,10
-    LISTBOX         105,2,170,296,52,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | 
+    LISTBOX         105,2,170,296,52,LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
                     WS_HSCROLL | WS_GROUP | WS_TABSTOP
 END
 
 IDD_PREFERENCES DIALOGEX 0, 0, 352, 260
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
     WS_SYSMENU
-CAPTION "Options"
+CAPTION "Ñ¡Ïî"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,187,237,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,241,237,50,14
-    PUSHBUTTON      "Help",IDC_TREEOPT_HELP,295,237,50,14
+    DEFPUSHBUTTON   "È·¶¨",IDOK,187,237,50,14
+    PUSHBUTTON      "È¡Ïû",IDCANCEL,241,237,50,14
+    PUSHBUTTON      "°ïÖú",IDC_TREEOPT_HELP,295,237,50,14
     CONTROL         "Tree1",IDC_TREEOPT_PAGES,"SysTreeView32",TVS_DISABLEDRAGDROP |
                     TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,20,96,202
     CONTROL         "",IDC_TREEOPT_HOSTFRAME,"Static",SS_BLACKFRAME | NOT WS_VISIBLE |
                     WS_DISABLED,110,0,235,222
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,230,338,1
-    LTEXT           " Categories",IDC_STATIC,7,7,96,13,SS_CENTERIMAGE |
+    LTEXT           " ·ÖÀà",IDC_STATIC,7,7,96,13,SS_CENTERIMAGE | 
                     SS_SUNKEN
 END
 
@@ -1243,62 +1244,62 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
 CAPTION "Dialog"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    RTEXT           "Keywords:",IDC_STATIC,0,20,70,8
-    RTEXT           "Function names:",IDC_STATIC,0,40,70,8
-    RTEXT           "Comments:",IDC_STATIC,0,60,70,8
-    RTEXT           "Numbers:",IDC_STATIC,0,80,70,8
-    RTEXT           "Operators:",IDC_STATIC,0,100,70,8
-    RTEXT           "Strings:",IDC_STATIC,0,120,70,8
-    RTEXT           "Preprocessor:",IDC_STATIC,0,140,70,8
-    RTEXT           "User 1:",IDC_STATIC,0,160,70,8
-    RTEXT           "User 2:",IDC_STATIC,0,180,70,8
-    CTEXT           "Text",IDC_STATIC,73,7,34,8
-    CONTROL         "Button1",IDC_SCOLOR_KEYWORDS,"Button",BS_OWNERDRAW | 
-                    WS_TABSTOP,83,19,17,14,WS_EX_TRANSPARENT | 
+    RTEXT           "¹Ø¼ü×Ö:",IDC_STATIC,0,20,70,8
+    RTEXT           "º¯ÊýÃû:",IDC_STATIC,0,40,70,8
+    RTEXT           "×¢ÊÍ:",IDC_STATIC,0,60,70,8
+    RTEXT           "Êý×Ö:",IDC_STATIC,0,80,70,8
+    RTEXT           "²Ù×÷·û:",IDC_STATIC,0,100,70,8
+    RTEXT           "×Ö·û´®:",IDC_STATIC,0,120,70,8
+    RTEXT           "Ô¤´¦ÀíÖ¸Áî:",IDC_STATIC,0,140,70,8
+    RTEXT           "Óû§¶¨Òå 1:",IDC_STATIC,0,160,70,8
+    RTEXT           "Óû§¶¨Òå 2:",IDC_STATIC,0,180,70,8
+    CTEXT           "ÎÄ×Ö",IDC_STATIC,73,7,34,8
+    CONTROL         "Button1",IDC_SCOLOR_KEYWORDS,"Button",BS_OWNERDRAW |
+                    WS_TABSTOP,83,19,17,14,WS_EX_TRANSPARENT |
                     WS_EX_CLIENTEDGE
-    CONTROL         "Bold",IDC_SCOLOR_KEYWORDS_BOLD,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "¼Ó´Ö",IDC_SCOLOR_KEYWORDS_BOLD,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,110,21,55,10
-    CONTROL         "Button1",IDC_SCOLOR_FUNCTIONS,"Button",BS_OWNERDRAW | 
-                    WS_TABSTOP,83,39,17,14,WS_EX_TRANSPARENT | 
+    CONTROL         "Button1",IDC_SCOLOR_FUNCTIONS,"Button",BS_OWNERDRAW |
+                    WS_TABSTOP,83,39,17,14,WS_EX_TRANSPARENT |
                     WS_EX_CLIENTEDGE
-    CONTROL         "Bold",IDC_SCOLOR_FUNCTIONS_BOLD,"Button",
+    CONTROL         "¼Ó´Ö",IDC_SCOLOR_FUNCTIONS_BOLD,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,110,40,55,10
-    CONTROL         "Button1",IDC_SCOLOR_COMMENTS,"Button",BS_OWNERDRAW | 
-                    WS_TABSTOP,83,59,17,14,WS_EX_TRANSPARENT | 
+    CONTROL         "Button1",IDC_SCOLOR_COMMENTS,"Button",BS_OWNERDRAW |
+                    WS_TABSTOP,83,59,17,14,WS_EX_TRANSPARENT |
                     WS_EX_CLIENTEDGE
-    CONTROL         "Bold",IDC_SCOLOR_COMMENTS_BOLD,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "¼Ó´Ö",IDC_SCOLOR_COMMENTS_BOLD,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,110,60,55,10
-    CONTROL         "Button1",IDC_SCOLOR_NUMBERS,"Button",BS_OWNERDRAW | 
-                    WS_TABSTOP,83,79,17,14,WS_EX_TRANSPARENT | 
+    CONTROL         "Button1",IDC_SCOLOR_NUMBERS,"Button",BS_OWNERDRAW |
+                    WS_TABSTOP,83,79,17,14,WS_EX_TRANSPARENT |
                     WS_EX_CLIENTEDGE
-    CONTROL         "Bold",IDC_SCOLOR_NUMBERS_BOLD,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "¼Ó´Ö",IDC_SCOLOR_NUMBERS_BOLD,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,110,80,55,10
-    CONTROL         "Button1",IDC_SCOLOR_OPERATORS,"Button",BS_OWNERDRAW | 
-                    WS_TABSTOP,83,99,17,14,WS_EX_TRANSPARENT | 
+    CONTROL         "Button1",IDC_SCOLOR_OPERATORS,"Button",BS_OWNERDRAW |
+                    WS_TABSTOP,83,99,17,14,WS_EX_TRANSPARENT |
                     WS_EX_CLIENTEDGE
-    CONTROL         "Bold",IDC_SCOLOR_OPERATORS_BOLD,"Button",
+    CONTROL         "¼Ó´Ö",IDC_SCOLOR_OPERATORS_BOLD,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,110,100,55,10
-    CONTROL         "Button1",IDC_SCOLOR_STRINGS,"Button",BS_OWNERDRAW | 
-                    WS_TABSTOP,83,119,17,14,WS_EX_TRANSPARENT | 
+    CONTROL         "Button1",IDC_SCOLOR_STRINGS,"Button",BS_OWNERDRAW |
+                    WS_TABSTOP,83,119,17,14,WS_EX_TRANSPARENT |
                     WS_EX_CLIENTEDGE
-    CONTROL         "Bold",IDC_SCOLOR_STRINGS_BOLD,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "¼Ó´Ö",IDC_SCOLOR_STRINGS_BOLD,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,110,120,55,10
-    CONTROL         "Button1",IDC_SCOLOR_PREPROCESSOR,"Button",BS_OWNERDRAW | 
-                    WS_TABSTOP,83,139,17,14,WS_EX_TRANSPARENT | 
+    CONTROL         "Button1",IDC_SCOLOR_PREPROCESSOR,"Button",BS_OWNERDRAW |
+                    WS_TABSTOP,83,139,17,14,WS_EX_TRANSPARENT |
                     WS_EX_CLIENTEDGE
-    CONTROL         "Bold",IDC_SCOLOR_PREPROCESSOR_BOLD,"Button",
+    CONTROL         "¼Ó´Ö",IDC_SCOLOR_PREPROCESSOR_BOLD,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,110,140,55,10
-    CONTROL         "Button1",IDC_SCOLOR_USER1,"Button",BS_OWNERDRAW | 
-                    WS_TABSTOP,83,159,17,14,WS_EX_TRANSPARENT | 
+    CONTROL         "Button1",IDC_SCOLOR_USER1,"Button",BS_OWNERDRAW |
+                    WS_TABSTOP,83,159,17,14,WS_EX_TRANSPARENT |
                     WS_EX_CLIENTEDGE
-    CONTROL         "Bold",IDC_SCOLOR_USER1_BOLD,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "¼Ó´Ö",IDC_SCOLOR_USER1_BOLD,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,110,160,55,10
-    CONTROL         "Button1",IDC_SCOLOR_USER2,"Button",BS_OWNERDRAW | 
-                    WS_TABSTOP,83,179,17,14,WS_EX_TRANSPARENT | 
+    CONTROL         "Button1",IDC_SCOLOR_USER2,"Button",BS_OWNERDRAW |
+                    WS_TABSTOP,83,179,17,14,WS_EX_TRANSPARENT |
                     WS_EX_CLIENTEDGE
-    CONTROL         "Bold",IDC_SCOLOR_USER2_BOLD,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "¼Ó´Ö",IDC_SCOLOR_USER2_BOLD,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,110,180,55,10
-    PUSHBUTTON      "Defaults",IDC_SCOLORS_BDEFAULTS,182,179,50,14
+    PUSHBUTTON      "ĬÈÏ",IDC_SCOLORS_BDEFAULTS,182,179,50,14
 END
 
 
@@ -1325,7 +1326,7 @@ BEGIN
     BEGIN
         BLOCK "040903a8"
         BEGIN
-            VALUE "Comments", "Translated by liaobin\0"
+            VALUE "Comments", "Translated by liaobin and xmpdhml\0"
             VALUE "FileDescription", "WinMerge Application\0"
             VALUE "FileVersion", "000.000.000.000\0"
             VALUE "InternalName", "WinMerge\0"
@@ -1456,22 +1457,22 @@ END
 
 STRINGTABLE
 BEGIN
-    ID_FILE_NEW             "Create empty documents\nNew Documents (Ctrl+N)"
+    ID_FILE_NEW             "н¨Ò»¸ö¿ÕÎĵµ\nн¨ (Ctrl+N)"
     ID_FILE_OPEN            "´ò¿ªÒ»¸öÏÖ´æÎļþ\n´ò¿ª (Ctrl+O)"
-    ID_FILE_CLOSE           "¹Ø±Õ×÷ÓÃÖÐÎļþ\n¹Ø±Õ"
-    ID_FILE_SAVE            "±£´æ×÷ÓÃÖÐÎļþ\n±£´æ (Ctrl+S)"
-    ID_FILE_SAVE_AS         "ÒÔÒ»¸öÐÂÃû³Æ±£´æ×÷ÓÃÖÐÎļþ\nÁí´æеµ"
-    ID_FILE_PAGE_SETUP      "±ä¸ü´òÓ¡Ñ¡Ïî\n°æÃæÉ趨"
-    ID_FILE_PRINT_SETUP     "±ä¸ü´òÓ¡»úºÍ´òÓ¡Ñ¡Ïî\n´òÓ¡É趨"
-    ID_FILE_PRINT           "´òÓ¡×÷ÓÃÖÐÎļþ\n´òÓ¡"
-    ID_FILE_PRINT_PREVIEW   "ÏÔʾÕûÒ³\nÔ¤ÀÀ´òÓ¡"
-    ID_FILE_OPENPROJECT     "Open project file\nProject file (Ctrl+J)"
+    ID_FILE_CLOSE           "¹Ø±Õµ±Ç°Îļþ\n¹Ø±Õ"
+    ID_FILE_SAVE            "±£´æµ±Ç°Îļþ\n±£´æ (Ctrl+S)"
+    ID_FILE_SAVE_AS         "ÒÔÒ»¸öÐÂÃû³Æ±£´æµ±Ç°ÖÐÎļþ\nÁí´æΪ"
+    ID_FILE_PAGE_SETUP      "¸ü¸Ä´òÓ¡Ñ¡Ïî\n°æÃæÉ趨"
+    ID_FILE_PRINT_SETUP     "¸ü¸Ä´òÓ¡»úºÍ´òÓ¡Ñ¡Ïî\n´òÓ¡É趨"
+    ID_FILE_PRINT           "´òÓ¡µ±Ç°Îļþ\n´òÓ¡"
+    ID_FILE_PRINT_PREVIEW   "Ô¤ÀÀ´òÓ¡µÄЧ¹û\n´òÓ¡Ô¤ÀÀ"
+    ID_FILE_OPENPROJECT     "´ò¿ª¹¤³ÌÎļþ\n´ò¿ª¹¤³Ì (Ctrl+J)"
 END
 
 STRINGTABLE
 BEGIN
     ID_APP_ABOUT            "ÏÔʾ³ÌÐòÐÅÏ¢£¬°æ±¾ºÅÂëºÍ°æȨ\n¹ØÓÚ"
-    ID_APP_EXIT             "À뿪ӦÓóÌÐò£»ÌáʾҪ±£´æÎļþ\nÍ˳ö"
+    ID_APP_EXIT             "Í˳öÓ¦ÓóÌÐò£»Ìáʾ±£´æÎļþ\nÍ˳ö"
 END
 
 STRINGTABLE
@@ -1497,30 +1498,30 @@ END
 STRINGTABLE
 BEGIN
     ID_NEXT_PANE            "Çл»µ½ÏÂÒ»¸ö´°¿Ú\nÏÂÒ»´°¿Ú"
-    ID_PREV_PANE            "Çл»»ØÉÏÒ»¸ö´°¿Ú\nÉÏÒ»´°¿Ú"
+    ID_PREV_PANE            "Çл»µ½ÉÏÒ»¸ö´°¿Ú\nÉÏÒ»´°¿Ú"
 END
 
 STRINGTABLE
 BEGIN
-    ID_WINDOW_NEW           "Ϊ×÷ÓÃÖÐÎļþ´ò¿ªÁíÒ»¸ö´°¿Ú\nд°¿Ú"
-    ID_WINDOW_ARRANGE       "ÅÅÁÐͼ±êÔÚ´°¿ÚµÄµ×²¿\nÅÅÁÐͼ±ê"
+    ID_WINDOW_NEW           "Ϊµ±Ç°Îļþ´ò¿ªÁíÒ»¸ö´°¿Ú\nд°¿Ú"
+    ID_WINDOW_ARRANGE       "ÔÚ´°¿ÚµÄµ×²¿ÅÅÁÐͼ±ê\nÅÅÁÐͼ±ê"
     ID_WINDOW_CASCADE       "ÅÅÁд°¿ÚÈÃËüÃDZ˴˸²¸ÇnÖصü´°¿Ú"
     ID_WINDOW_TILE_HORZ     "·Ç¸²¸ÇµÄÅÅÁд°¿Ú\n²¢Áд°¿Ú"
     ID_WINDOW_TILE_VERT     "·Ç¸²¸ÇµÄÅÅÁд°¿Ú\n²¢Áд°¿Ú"
-    ID_WINDOW_SPLIT         "·Ö¸îĿÇ°´°¿Ú\n·Ö¸î"
+    ID_WINDOW_SPLIT         "·Ö¸îµ±Ç°´°¿Ú\n·Ö¸î"
 END
 
 STRINGTABLE
 BEGIN
-    ID_EDIT_CLEAR           "Çå³ýÑ¡ÔñµÄ·¶Î§\nɾ³ý"
+    ID_EDIT_CLEAR           "Çå³ýÑ¡ÖеÄÄÚÈÝ\nɾ³ý"
     ID_EDIT_CLEAR_ALL       "È«²¿É¾³ý\nÈ«²¿É¾³ý"
-    ID_EDIT_COPY            "¸´ÖÆÑ¡Ôñ²¢·ÅÖÃËüµ½Õâ¼ôÌù²¾\n¸´ÖÆ"
-    ID_EDIT_CUT             "¼ôÇÐÑ¡Ôñ²¢·ÅÖÃËüµ½¼ôÌù²¾\n¼ôÇÐ"
-    ID_EDIT_FIND            "Ñ°ÕÒÖ¸¶¨ÎÄ×Ö\nÑ°ÕÒ"
-    ID_EDIT_PASTE           "²åÈë¼ôÌù²¾ÄÚÈÝ\nÕ³Ìù"
+    ID_EDIT_COPY            "¸´ÖÆÑ¡ÖÐÄÚÈݵ½¼ôÌù°å\n¸´ÖÆ"
+    ID_EDIT_CUT             "ɾ³ýÑ¡ÖÐÄÚÈݲ¢·ÅÖõ½¼ôÌù°å\n¼ôÇÐ"
+    ID_EDIT_FIND            "²éÕÒÖ¸¶¨ÎÄ×Ö\n²éÕÒ"
+    ID_EDIT_PASTE           "²åÈë¼ôÌù°åÖеÄÄÚÈÝ\nÕ³Ìù"
     ID_EDIT_REPEAT          "Öظ´ÉϴεĶ¯×÷\nÖظ´"
-    ID_EDIT_REPLACE         "ÒÔ²»Í¬µÄÎÄ×ÖÌæ»»Ìض¨µÄÎÄ×Ö\nÌæ»»"
-    ID_EDIT_SELECT_ALL      "Ñ¡ÔñÕû·ÝÎļþ\nȫѡ"
+    ID_EDIT_REPLACE         "²éÕÒÖ¸¶¨ÎÄ×Ö²¢Ìæ»»\nÌæ»»"
+    ID_EDIT_SELECT_ALL      "Ñ¡ÔñÈ«²¿ÄÚÈÝ\nȫѡ"
     ID_EDIT_UNDO            "³·ÏúÉϴεĶ¯×÷\n³·Ïú"
     ID_EDIT_REDO            "Öظ´Ö®Ç°Î´Íê³ÉµÄ¶¯×÷\nÖظ´"
 END
@@ -1536,10 +1537,10 @@ BEGIN
     AFX_IDS_SCSIZE          "¸ü¸Ä´°¿Ú´óС"
     AFX_IDS_SCMOVE          "¸ü¸Ä´°¿ÚλÖÃ"
     AFX_IDS_SCMINIMIZE      "ËõС´°¿ÚΪһ¸öͼ±ê"
-    AFX_IDS_SCMAXIMIZE      "À©´ó´°¿ÚΪÍêÕûÆÁÄ»´óС"
+    AFX_IDS_SCMAXIMIZE      "À©´ó´°¿Úµ½Õû¸öÆÁÄ»"
     AFX_IDS_SCNEXTWINDOW    "Çл»µ½ÏÂÒ»¸öÎļþ´°¿Ú"
     AFX_IDS_SCPREVWINDOW    "Çл»µ½ÉÏÒ»¸öÎļþ´°¿Ú"
-    AFX_IDS_SCCLOSE         "¹Ø±Õ×÷ÓÃÖд°¿Ú²¢Ìáʾµ½±£´æÕâÎļþ"
+    AFX_IDS_SCCLOSE         "¹Ø±Õµ±Ç°´°¿Ú²¢Ìáʾµ½±£´æÕâÎļþ"
 END
 
 STRINGTABLE
@@ -1551,7 +1552,7 @@ END
 
 STRINGTABLE
 BEGIN
-    AFX_IDS_PREVIEW_CLOSE   "¹Ø±ÕÔ¤ÀÀ´òӡģʽ\nÈ¡ÏûÔ¤ÀÀ"
+    AFX_IDS_PREVIEW_CLOSE   "¹Ø±Õ´òÓ¡Ô¤ÀÀģʽ\nÈ¡ÏûÔ¤ÀÀ"
 END
 
 // WINMERGE INFORMATION
@@ -1565,60 +1566,60 @@ END
 // OPTIONS NAME TO PRESERVE/UNIFY EOL
 STRINGTABLE
 BEGIN
-    IDC_MIXED_EOL           "Preserve original EOL chars"
+    IDC_MIXED_EOL           "±£ÁôԭʼµÄ»»Ðзû"
 END
 
 // DIRECTORY DIFFING : SUMMARY BAR
 STRINGTABLE
 BEGIN
-    IDC_COMPARISON_STOP     "Stop"
-    IDC_COMPARISON_CLOSE    "Press any key"
+    IDC_COMPARISON_STOP     "ֹͣ"
+    IDC_COMPARISON_CLOSE    "Çë°´ÈÎÒâ¼ü"
 END
 
 // EDITOR : FILENAME BAR
 STRINGTABLE
 BEGIN
-    IDC_STATIC_TITLE_LEFT   "Right click on the path to copy"
-    IDC_STATIC_TITLE_RIGHT  "Right click on the path to copy"
+    IDC_STATIC_TITLE_LEFT   "ÓÒ¼üµã»÷·¾¶¸´ÖƵ½¼ôÌù°å"
+    IDC_STATIC_TITLE_RIGHT  "ÓÒ¼üµã»÷·¾¶¸´ÖƵ½¼ôÌù°å"
 END
 
 // IDS_MESSAGEBOX_OK SYNCHRO
 STRINGTABLE
 BEGIN
-    IDS_MESSAGEBOX_OK       "&Ok"
-    IDS_MESSAGEBOX_CANCEL   "&Cancel"
-    IDS_MESSAGEBOX_ABORT    "&Abort"
-    IDS_MESSAGEBOX_RETRY    "&Retry"
-    IDS_MESSAGEBOX_IGNORE   "&Ignore"
-    IDS_MESSAGEBOX_IGNOREALL "Ignore &all"
-    IDS_MESSAGEBOX_YES      "&Yes"
+    IDS_MESSAGEBOX_OK       "È·¶¨(&O)"
+    IDS_MESSAGEBOX_CANCEL   "È¡Ïû(&C)"
+    IDS_MESSAGEBOX_ABORT    "ÖÐÖ¹(&A)"
+    IDS_MESSAGEBOX_RETRY    "ÖØÊÔ(&R)"
+    IDS_MESSAGEBOX_IGNORE   "ºöÂÔ(&I)"
+    IDS_MESSAGEBOX_IGNOREALL "ºöÂÔËùÓÐ(&A)"
+    IDS_MESSAGEBOX_YES      "ÊÇ(&Y)"
 END
 
 // "DO NOT SHOW AGAIN" MESSAGEBOXES (2)
 STRINGTABLE
 BEGIN
-    IDS_MESSAGEBOX_YES_TO_ALL "Yes to &all"
-    IDS_MESSAGEBOX_NO       "&No"
-    IDS_MESSAGEBOX_NO_TO_ALL "No to a&ll"
-    IDS_MESSAGEBOX_CONTINUE "&Continue"
-    IDS_MESSAGEBOX_SKIP     "&Skip"
-    IDS_MESSAGEBOX_SKIPALL  "Skip &all"
-    IDS_MESSAGEBOX_HELP     "&Help"
-    IDS_MESSAGEBOX_DONT_DISPLAY_AGAIN "Don't display this &message again."
-    IDS_MESSAGEBOX_DONT_ASK_AGAIN "Don't ask this &question again."
+    IDS_MESSAGEBOX_YES_TO_ALL "È«²¿¶¼ÊÇ(&A)"
+    IDS_MESSAGEBOX_NO       "·ñ(&N)"
+    IDS_MESSAGEBOX_NO_TO_ALL "È«²¿¶¼·ñ(&L)"
+    IDS_MESSAGEBOX_CONTINUE "¼ÌÐø(&C)"
+    IDS_MESSAGEBOX_SKIP     "Ìø¹ý(&S)"
+    IDS_MESSAGEBOX_SKIPALL  "È«²¿Ìø¹ý(&A)"
+    IDS_MESSAGEBOX_HELP     "°ïÖú(&H)"
+    IDS_MESSAGEBOX_DONT_DISPLAY_AGAIN "²»ÔÙÌáʾ´ËÏûÏ¢(&M)¡£"
+    IDS_MESSAGEBOX_DONT_ASK_AGAIN "²»ÔÙѯÎÊ´ËÎÊÌâ(&Q)¡£"
 END
 
 // Options-dialog page captions
 STRINGTABLE
 BEGIN
-    IDS_OPTIONSPG_GENERAL   "General"
-    IDS_OPTIONSPG_COMPARE   "Compare"
-    IDS_OPTIONSPG_EDITOR    "Editor"
-    IDS_OPTIONSPG_COLORS    "Colors"
-    IDS_OPTIONSPG_SYSTEM    "System"
-    IDS_OPTIONSPG_VERSIONCONTROL "Version Control"
-    IDS_OPTIONSPG_CODEPAGE  "Codepage"
-    IDS_OPTIONSPG_SYNTAXCOLORS "Syntax colors"
+    IDS_OPTIONSPG_GENERAL   "Ò»°ã"
+    IDS_OPTIONSPG_COMPARE   "±È½Ï"
+    IDS_OPTIONSPG_EDITOR    "±à¼­Æ÷"
+    IDS_OPTIONSPG_COLORS    "ÑÕÉ«"
+    IDS_OPTIONSPG_SYSTEM    "ϵͳ"
+    IDS_OPTIONSPG_VERSIONCONTROL "°æ±¾¿ØÖÆ"
+    IDS_OPTIONSPG_CODEPAGE  "´úÂëÒ³"
+    IDS_OPTIONSPG_SYNTAXCOLORS "Óï·¨¸ßÁÁ"
 END
 
 // WINMERGE CUSTOM STRINGS
@@ -1647,39 +1648,40 @@ END
 STRINGTABLE
 BEGIN
     IDS_OPTIONS_TITLE       "Ñ¡Ïî (%1)"
-    IDS_MESSAGE_BOX_ARE_RESET "All message boxes are now displayed again."
-    IDS_DIFF_OPEN_NO_SET_PROPS "ÔÚÄ¿Ç°Îļþ±È¶ÔÆÚ¼äÒÑÓÐÐ޸ġ£ ÔÚÖØÐÂÆô¶¯Ä¿Ç°Îļþ±È¶ÔÇ°£¬Ò»Ð©ÉèÖò»»áÉúЧ¡£"
-    IDS_FONT_CHANGE         "Ñ¡ÔñµÄ×ÖÐͱä¸ü²»»áÌ×Óõ½ÈκÎÄ¿Ç°ÏÔÏÖ²»Í¬µÄ´°¿Ú¡£"
+    IDS_MESSAGE_BOX_ARE_RESET "ËùÓÐÌáʾÐÅÏ¢ÒѾ­ÖØÉèΪÏÔʾ¡£"
+    IDS_DIFF_OPEN_NO_SET_PROPS
+                            "ÔÚµ±Ç°Îļþ¶Ô±ÈÆÚ¼äÒÑÓÐÐ޸ġ£ÔÚÖØÐÂÆô¶¯µ±Ç°Îļþ¶Ô±ÈÇ°£¬Ò»Ð©ÉèÖò»»áÉúЧ¡£"
+    IDS_FONT_CHANGE         "Ñ¡ÔñµÄ×ÖÌå¸ü¸Ä²»»áÓ¦Óõ½ÒѾ­´ò¿ªµÄ±È½Ï´°¿Ú¡£"
 END
 
 // BROWSE FILE
 STRINGTABLE
 BEGIN
     IDS_OPEN_TITLE          "´ò¿ª"
-    IDS_PROGRAMFILES        "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
+    IDS_PROGRAMFILES        "³ÌÐò|*.exe;*.bat;*.cmd|ËùÓÐÎļþ (*.*)|*.*||"
     IDS_ALLFILES            "ËùÓÐÎļþ (*.*)|*.*||"
-    IDS_PROJECTFILES        "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
+    IDS_PROJECTFILES        "WinMerge ¹¤³ÌÎļþ (*.WinMerge)|*.WinMerge||"
     IDS_PROJECTFILES_EXT    "WinMerge"
 END
 
 // COMPARE OPTIONS
 STRINGTABLE
 BEGIN
-    IDS_COMPMETHOD_FULL_CONTENTS "Full Contents"
-    IDS_COMPMETHOD_QUICK_CONTENTS "Quick Contents"
-    IDS_COMPMETHOD_MODDATE  "Modified date"
+    IDS_COMPMETHOD_FULL_CONTENTS "È«²¿ÄÚÈÝ"
+    IDS_COMPMETHOD_QUICK_CONTENTS "¿ìËÙÄÚÈÝ"
+    IDS_COMPMETHOD_MODDATE  "ÐÞ¸ÄÈÕÆÚ"
 END
 
 // FILTER OPTIONS
 STRINGTABLE
 BEGIN
-    IDS_FILTERFILE_NAMETITLE "Name"
-    IDS_FILTERFILE_PATHTITLE "Location"
-    IDS_FILTER_TITLE        "Filters"
+    IDS_FILTERFILE_NAMETITLE "Ãû³Æ"
+    IDS_FILTERFILE_PATHTITLE "λÖÃ"
+    IDS_FILTER_TITLE        "¹ýÂËÆ÷"
     IDS_FILTER_PREFIX       "[F] "
-    IDS_FILTERFILE_DESCTITLE "Description"
-    IDS_FILEFILTER_SAVENEW  "Select filename for new filter"
-    IDS_FILEFILTER_FILEMASK "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
+    IDS_FILTERFILE_DESCTITLE "ÃèÊö"
+    IDS_FILEFILTER_SAVENEW  "Ñ¡ÔñйýÂËÆ÷µÄÎļþÃû"
+    IDS_FILEFILTER_FILEMASK "¹ýÂËÆ÷Îļþ (*.flt)|*.flt|ËùÓÐÎļþ (*.*)|*.*||"
 END
 
 // VERSION CONTROL OPTIONS
@@ -1692,37 +1694,37 @@ END
 // WINDOWS TITLES
 STRINGTABLE
 BEGIN
-    IDS_DIRECTORY_WINDOW_TITLE "Îļþ¼Ð±È¶Ô½á¹û"
-    IDS_FILE_COMPARISON_TITLE "Îļþ±È¶Ô"
-    IDS_EMPTY_LEFT_FILE     "Untitled left"
-    IDS_EMPTY_RIGHT_FILE    "Untitled right"
+    IDS_DIRECTORY_WINDOW_TITLE "Îļþ¼Ð¶Ô±È½á¹û"
+    IDS_FILE_COMPARISON_TITLE "Îļþ¶Ô±È"
+    IDS_EMPTY_LEFT_FILE     "δÃüÃû ×ó"
+    IDS_EMPTY_RIGHT_FILE    "δÃüÃû ÓÒ"
 END
 
 // STATUS BAR : CURRENT OPERATION STATUS
 STRINGTABLE
 BEGIN
-    IDS_STATUS_RESCANNING                     "ɨÃèÎļþ..."
-    IDS_STATUS_OPENING_SELECTION              "´ò¿ªÑ¡Ôñ"
-    IDS_STATUS_COPYL2R      "ÕýÔÚ¸´ÖÆ×ó±ßµ½ÓÒ±ß"
-    IDS_STATUS_COPYR2L      "ÕýÔÚ¸´ÖÆÓұߵ½×ó±ß"
-    IDS_STATUS_COPYALL2L    "ÕýÔÚÈ«²¿¸´ÖƵ½×ó±ß"
-    IDS_STATUS_COPYALL2R    "ÕýÔÚÈ«²¿¸´ÖƵ½ÓÒ±ß"
-    IDS_STATUS_COPYFILES    "Copying files..."
-    IDS_STATUS_DELETEFILES  "Deleting files..."
-    IDS_STATUS_MOVEFILES    "Moving files..."
+    IDS_STATUS_RESCANNING   "ɨÃèÎļþ..."
+    IDS_STATUS_OPENING_SELECTION "´ò¿ªÑ¡Ôñ"
+    IDS_STATUS_COPYL2R      "ÕýÔÚ´Ó×ó²à¸´ÖƵ½ÓÒ²à"
+    IDS_STATUS_COPYR2L      "ÕýÔÚ´ÓÓҲิÖƵ½×ó²à"
+    IDS_STATUS_COPYALL2L    "ÕýÔÚÈ«²¿¸´ÖƵ½×ó²à"
+    IDS_STATUS_COPYALL2R    "ÕýÔÚÈ«²¿¸´ÖƵ½ÓÒ²à"
+    IDS_STATUS_COPYFILES    "ÕýÔÚ¸´ÖÆÎļþ..."
+    IDS_STATUS_DELETEFILES  "ÕýÔÚɾ³ýÎļþ..."
+    IDS_STATUS_MOVEFILES    "ÕýÔÚÒƶ¯Îļþ..."
 END
 
 // STATUS BAR : OTHER PANES (MOSTLY FOR EDITOR)
 STRINGTABLE
 BEGIN
-    IDS_LINE_STATUS_INFO_EOL "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
-    IDS_EMPTY_LINE_STATUS_INFO "Line: %s"
-    IDS_LINE_STATUS_INFO    "Ln: %s  Col: %d/%d  Ch: %d/%d"
-    IDS_MERGEMODE_MERGING   "Merge"
-    IDS_DIFF_NUMBER_STATUS_FMT "²»Í¬ %1 ÔÚ %2"
-    IDS_NO_DIFF_SEL_FMT         "%1 ²»Í¬ÕÒµ½"
-    IDS_1_DIFF_FOUND        "1 Difference Found"
-    IDS_STATUSBAR_READONLY  "RO"
+    IDS_LINE_STATUS_INFO_EOL "ÐÐ: %s  ÁÐ: %d/%d  ×Ö·û: %d/%d  »»Ðзû: %s"
+    IDS_EMPTY_LINE_STATUS_INFO "ÐÐ: %s"
+    IDS_LINE_STATUS_INFO    "ÐÐ: %s  ÁÐ: %d/%d  ×Ö·û: %d/%d"
+    IDS_MERGEMODE_MERGING   "ºÏ²¢"
+    IDS_DIFF_NUMBER_STATUS_FMT "µÚ %1 ´¦²»Í¬(¹² %2 ´¦)"
+    IDS_NO_DIFF_SEL_FMT     "¹²ÕÒµ½ %1 ´¦²»Í¬"
+    IDS_1_DIFF_FOUND        "ÕÒµ½ 1 ´¦²»Í¬"
+    IDS_STATUSBAR_READONLY  "Ö»¶Á"
 END
 
 // MORE STATUS PANES
@@ -1735,25 +1737,25 @@ END
 // OPEN DIALOG
 STRINGTABLE
 BEGIN
-    IDS_ERROR_INCOMPARABLE  "Ñ¡ÔñÒª±È¶ÔµÄÁ½¸öÏÖ´æÎļþ¼Ð»òÎļþ"
-    IDS_DIRSEL_TAG          "Directory Selection"
-    IDS_OPEN_FILESDIRS      "Select two directories or two files to compare."
-    IDS_OPEN_LEFTINVALID    "Left path is invalid!"
-    IDS_OPEN_RIGHTINVALID   "Right path is invalid!"
-    IDS_OPEN_BOTHINVALID    "Both paths are invalid!"
-    IDS_OPEN_UNPACKERDISABLED "Choose two files to enable unpacker selection."
-    IDS_OPEN_MISMATCH       "Cannot compare file and directory!"
+    IDS_ERROR_INCOMPARABLE  "Ñ¡ÔñÁ½¸öÒÑ´æÔÚµÄÎļþ¼Ð»òÎļþ½øÐжԱÈ"
+    IDS_DIRSEL_TAG          "Ñ¡ÔñÎļþ¼Ð"
+    IDS_OPEN_FILESDIRS      "Ñ¡ÔñÒª½øÐжԱȵÄÁ½¸öÎļþ¼Ð»òÁ½¸öÎļþ¡£"
+    IDS_OPEN_LEFTINVALID    "×ó²à·¾¶²»´æÔÚ!"
+    IDS_OPEN_RIGHTINVALID   "ÓҲ෾¶²»´æÔÚ!"
+    IDS_OPEN_BOTHINVALID    "Á½¸ö·¾¶¶¼²»´æÔÚ!"
+    IDS_OPEN_UNPACKERDISABLED "Ñ¡ÔñÁ½¸öÎļþÒÔÆôÓýâ°ü³ÌÐò."
+    IDS_OPEN_MISMATCH       "²»ÄÜÔÚÎļþºÍÎļþ¼ÐÖ®¼ä½øÐжԱÈ!"
 END
 
 // LOADING FILE
 STRINGTABLE
 BEGIN
-    IDS_ERROR_FILE_NOT_FOUND "ÎļþÕÒ²»µ½: %1"
-    IDS_ERROR_FILE_NOT_UNPACKED "File not unpacked: %1"
-    IDS_BINFILES_IDENTICAL   "%1\n%2\n\nare identical binary files."
-    IDS_BINFILES_DIFFERENT   "%1\n%2\n\nare different binary files."
-    IDS_OTHER_IS_BINARY      "%1\n\nis binary file. Cannot compare binary and text files."
-    IDS_ERROR_FILEOPEN       "Cannot open file\n%1\n\n%2"
+    IDS_ERROR_FILE_NOT_FOUND "ÕÒ²»µ½Îļþ: %1"
+    IDS_ERROR_FILE_NOT_UNPACKED "Îļþδ½â°ü: %1"
+    IDS_BINFILES_IDENTICAL  "%1\n%2\n\nÊÇÍêÈ«ÏàͬµÄ¶þ½øÖÆÎļþ¡£"
+    IDS_BINFILES_DIFFERENT  "%1\n%2\n\nÊDz»Í¬µÄ¶þ½øÖÆÎļþ¡£"
+    IDS_OTHER_IS_BINARY     "%1\n\nÊǶþ½øÖÆÎļþ£¬²»ÄÜÔÚ¶þ½øÖÆÎļþºÍÎı¾ÎļþÖ®¼ä½øÐжԱȡ£"
+    IDS_ERROR_FILEOPEN      "ÎÞ·¨´ò¿ªÎļþ\n%1\n\n%2"
 END
 
 // SAVING FILE
@@ -1761,92 +1763,94 @@ STRINGTABLE
 BEGIN
     IDS_SAVE_AS_TITLE       "Áí´æΪ"
     IDS_SAVE_FMT            "±£´æ¸ü¸Äµ½ %1£¿"
-    IDS_SAVEREADONLY_FMT    "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
-    IDS_ERROR_FILE_WRITEABLE "´íÎó¼ì²éÄ¿±êдÈëÐÔ"
-    IDS_ERROR_BACKUP        "´íÎ󱸷ÝÎļþ"
-    IDS_BACKUP_FAILED_PROMPT
-                            "Unable to backup original file:\n%1\n\nContinue anyway?"
-    IDS_FILESAVE_FAILED     "Saving file failed.\n%1\n%2\nDo you want to:\n\t-use a different filename (Press Ok)\n\t-abort the current operation (Press Cancel)?"
-    IDS_FILEPACK_FAILED_LEFT "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"
-    IDS_FILEPACK_FAILED_RIGHT "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"
-    IDS_FILECHANGED_ONDISK  "Another application has updated file\n%1\nsince WinMerge loaded it.\n\nOverwrite changed file?"
-    IDS_SAVEREADONLY_MULTI  "%1\nis marked read-only. Would you like to override the read-only item?"
-    IDS_FILECHANGED_RESCAN  "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nIf you want to refresh files close current file compare and load files again."
-    IDS_SAVE_LEFT_AS        "Save Left File As"
-    IDS_SAVE_RIGHT_AS       "Save Right File As"
+    IDS_SAVEREADONLY_FMT    "%1 ±ê¼ÇΪֻ¶Á¡£ÄúÏ£Íû¸²¸ÇÖ»¶ÁÎļþÂð£¿Ñ¡¡°·ñ¡±¿ÉÒÔÓÃÆäËüÎļþÃû±£´æ¡£"
+    IDS_ERROR_FILE_WRITEABLE "Ä¿±ê¿ÉдÈëÐÔ¼ì²é³ö´í"
+    IDS_ERROR_BACKUP        "±¸·ÝÎļþʱ³ö´í"
+    IDS_BACKUP_FAILED_PROMPT "ÎÞ·¨±¸·ÝԭʼÎļþ:\n%1\n\nÈÔÈ»¼ÌÐøÂð£¿"
+    IDS_FILESAVE_FAILED     "±£´æÎļþʧ°Ü¡£\n%1\n%2\nÇëÑ¡Ôñ:\n\t-ÓÃÆäËüÎļþÃû±£´æ(µã»÷¡°È·¶¨¡±)\n\t-ÖÐÖ¹µ±Ç°²Ù×÷(µã»÷¡°È¡Ïû¡±)"
+    IDS_FILEPACK_FAILED_LEFT
+                            "²å¼þ '%2' ÎÞ·¨½«Äú¶Ô×ó²àÎļþµÄÐ޸Ĵò°üµ½ '%1' ÖС£\n\nԭʼÎļþ²»»á¸Ä±ä¡£\n\nÄúÒª½«Î´´ò°üµÄ°æ±¾±£´æΪÆäËüÎļþÂð£¿"
+    IDS_FILEPACK_FAILED_RIGHT
+                            "²å¼þ '%2' ÎÞ·¨½«Äú¶ÔÓÒ²àÎļþµÄÐ޸Ĵò°üµ½ '%1' ÖС£\n\nԭʼÎļþ²»»á¸Ä±ä¡£\n\nÄúÒª½«Î´´ò°üµÄ°æ±¾±£´æΪÆäËüÎļþÂð£¿"
+    IDS_FILECHANGED_ONDISK  "%1\nÔÚ WinMerge ´ò¿ª´ËÎļþºó£¬\nÆäËü³ÌÐòÓÖ¶ÔËü½øÐÐÁËÐ޸ġ£\n\nÒª¸²¸ÇÒѱ»Ð޸ĵÄÎļþÂð£¿"
+    IDS_SAVEREADONLY_MULTI  "%1\nÎļþ±ê¼ÇΪֻ¶Á¡£ÄúÒª¸²¸ÇÖ»¶ÁµÄÎļþÂð£¿"
+    IDS_FILECHANGED_RESCAN  "%1\nÔÚ WinMerge ÉÏ´ÎɨÃè´ËÎļþºó£¬\nÆäËü³ÌÐòÓÖ¶ÔËü½øÐÐÁËÐ޸ġ£\n\nҪˢÐÂÎļþÄÚÈÝ£¬Çë¹Ø±Õµ±Ç°¶Ô±È´°¿Ú²¢ÖØдò¿ªÕâÁ½¸öÎļþ¡£"
+    IDS_SAVE_LEFT_AS        "×ó²àÎļþÁí´æΪ"
+    IDS_SAVE_RIGHT_AS       "ÓÒ²àÎļþÁí´æΪ"
 END
 
 // Editing/Merging file
 STRINGTABLE
 BEGIN
-    IDS_VIEWS_OUTOFSYNC     "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing."
+    IDS_VIEWS_OUTOFSYNC     "Îĵµ²»Í¬²½£¬ÎÞ·¨½øÐкϲ¢¡£\n\nÇëË¢ÐÂÎĵµºóÔÙ¼ÌÐø¡£"
 END
 
 // VSS
 STRINGTABLE
 BEGIN
-    IDS_NOPROJECT           "Äú±ØÐëÖ¸¶¨Ò»¸ö SourceSafe ÏîĿ·¾¶ÒÔ±ã¼ÌÐø (ÀýÈ磺  $/MyProject)"
-    IDS_VSS_CHECKOUT_STATUS "Checkout files from VSS..."
-    IDS_VSSERROR            "³¢ÊÔ¼ì²éÎļþʱ°æ±¾ÏµÍ³·µ»ØÒ»¸ö´íÎó¡£ ÎÞ·¨¼ÌÐø..."
-    IDS_VSS_RUN_ERROR       "Ö´Ðа汾ϵͳÃüÁî´íÎó¡£"
-    IDS_VSSFOLDER_AND_FILE_NOMATCH "The VSS Working Folder and the location of the current file do not match. Continue?"
-    IDS_VSS_NODATABASES     "No VSS database(s) found!"
-    IDS_VSS_ERRORFROM       "Error from VSS:"
+    IDS_NOPROJECT           "Äú±ØÐëÖ¸¶¨Ò»¸ö SourceSafe ÏîĿ·¾¶ÒÔ±ã¼ÌÐø (ÀýÈ磺 $/MyProject)"
+    IDS_VSS_CHECKOUT_STATUS "´ÓVSSÖÐÇ©³öÎļþ..."
+    IDS_VSSERROR            "ÔÚÇ©³ö(Checkout)Îļþʱ°æ±¾¿ØÖÆϵͳ·µ»ØÒ»¸ö´íÎó¡£ÎÞ·¨¼ÌÐø..."
+    IDS_VSS_RUN_ERROR       "Ö´Ðа汾¿ØÖÆϵͳÃüÁîʱ³ö´í¡£"
+    IDS_VSSFOLDER_AND_FILE_NOMATCH
+                            "VSS ¹¤×÷Îļþ¼Ð(Working Folder)Ó뵱ǰÎļþλÖò»·û¡£ÊÇ·ñ¼ÌÐø£¿"
+    IDS_VSS_NODATABASES     "δÕÒµ½ VSS Êý¾Ý¿â£¡"
+    IDS_VSS_ERRORFROM       "VSS ·µ»Ø´íÎó:"
 END
 
 // VSS system
 STRINGTABLE
 BEGIN
-    IDS_VCS_NONE            "None"
-    IDS_VCS_VSS4            "Visual SourceSafe (less than 5.0)"
-    IDS_VCS_VSS5            "Visual SourceSafe (5.0 and above)"
+    IDS_VCS_NONE            "ÎÞ"
+    IDS_VCS_VSS4            "Visual SourceSafe (5.0 ÒÔÇ°°æ±¾)"
+    IDS_VCS_VSS5            "Visual SourceSafe (5.0 ¼°ÒÔºó°æ±¾)"
     IDS_VCS_CLEARCASE       "Rational ClearCase"
-    IDS_BREAK_ON_WHITESPACE "Break at whitespace"
-    IDS_BREAK_ON_PUNCTUATION "Break at whitespace or punctuation"
+    IDS_BREAK_ON_WHITESPACE "ÒÔ¿Õ°×·Ö¸ô"
+    IDS_BREAK_ON_PUNCTUATION "ÒÔ¿Õ°×»ò±êµã·Ö¸ô"
 END
 
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN
-    ID_DIR_COPY_LEFT_TO_RIGHT "¸´ÖÆÑ¡ÔñµÄÎļþµ½ÒÑÃüÃûµÄÎļþ¼Ð"
-    ID_DIR_COPY_LEFT_TO_BROWSE "Copy selected file to custom directory"
-    ID_DIR_COPY_RIGHT_TO_LEFT "¸´ÖÆÑ¡ÔñµÄÎļþµ½ÒÑÃüÃûµÄÎļþ¼Ð"
-    ID_DIR_COPY_RIGHT_TO_BROWSE "Copy selected file to custom directory"
-    ID_DIR_DEL_LEFT         "ɾ³ýÔÚ×ó±ßµÄÑ¡ÔñÏîÄ¿"
-    ID_DIR_DEL_RIGHT        "ɾ³ýÔÚÓұߵÄÑ¡ÔñÏîÄ¿"
-    ID_DIR_DEL_BOTH         "ɾ³ýÁ½±ßµÄÑ¡ÔñÏîÄ¿"
-    ID_DIR_HIDE_FILENAMES   "Hide selected item(s) (on the fly filter)"
-    IDS_COPY_TO_LEFT        "Right to Left (%1)"
-    IDS_COPY_TO_RIGHT       "Left to Right (%1)"
-    IDS_COPY_TO_LEFT2       "Right to Left (%1 of %2)"
-    IDS_COPY_TO_RIGHT2      "Left to Right (%1 of %2)"
-    IDS_COPY_LEFT_TO        "Left to... (%1)"
-    IDS_COPY_RIGHT_TO       "Right to... (%1)"
-    IDS_COPY_LEFT_TO2       "Left to... (%1 of %2)"
-    IDS_COPY_RIGHT_TO2      "Right to... (%1 of %2)"
+    ID_DIR_COPY_LEFT_TO_RIGHT "¸´ÖÆÑ¡ÔñµÄÎļþµ½ÓÒ²àÎļþ¼Ð"
+    ID_DIR_COPY_LEFT_TO_BROWSE "¸´ÖÆÑ¡ÔñµÄÎļþµ½ÆäËüÎļþ¼Ð"
+    ID_DIR_COPY_RIGHT_TO_LEFT "¸´ÖÆÑ¡ÔñµÄÎļþµ½×ó²àÎļþ¼Ð"
+    ID_DIR_COPY_RIGHT_TO_BROWSE "¸´ÖÆÑ¡ÔñµÄÎļþµ½ÆäËüÎļþ¼Ð"
+    ID_DIR_DEL_LEFT         "ɾ³ý×ó²àÑ¡ÖеÄÏîÄ¿"
+    ID_DIR_DEL_RIGHT        "ɾ³ýÓÒ²àÑ¡ÖеÄÏîÄ¿"
+    ID_DIR_DEL_BOTH         "ɾ³ýÁ½²àÑ¡ÖеÄÏîÄ¿"
+    ID_DIR_HIDE_FILENAMES   "Òþ²ØÑ¡ÖеÄÏîÄ¿(¼´Ê±¹ýÂË)"
+    IDS_COPY_TO_LEFT        "ÓҲൽ×ó²à (%1)"
+    IDS_COPY_TO_RIGHT       "×ó²àµ½ÓÒ²à (%1)"
+    IDS_COPY_TO_LEFT2       "ÓҲൽ×ó²à (%1 of %2)"
+    IDS_COPY_TO_RIGHT2      "×ó²àµ½ÓÒ²à (%1 of %2)"
+    IDS_COPY_LEFT_TO        "×ó²àµ½... (%1)"
+    IDS_COPY_RIGHT_TO       "ÓҲൽ... (%1)"
+    IDS_COPY_LEFT_TO2       "×ó²àµ½... (%1 of %2)"
+    IDS_COPY_RIGHT_TO2      "ÓҲൽ... (%1 of %2)"
 END
 
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)  (2)
 STRINGTABLE
 BEGIN
-    IDS_DEL_LEFT_FMT        "Left (%1)"
-    IDS_DEL_RIGHT_FMT       "Right (%1)"
-    IDS_DEL_BOTH_FMT        "Both (%1)"
-    IDS_DEL_LEFT_FMT2       "Left (%1 of %2)"
-    IDS_DEL_RIGHT_FMT2      "Right (%1 of %2)"
-    IDS_DEL_BOTH_FMT2       "Both (%1 of %2)"
-    IDS_SELECT_DESTFOLDER   "Select destination folder"
-    IDS_MOVE_LEFT_TO        "Left to... (%1)"
-    IDS_MOVE_RIGHT_TO       "Right to... (%1)"
-    IDS_MOVE_LEFT_TO2       "Left to... (%1 of %2)"
-    IDS_MOVE_RIGHT_TO2      "Right to... (%1 of %2)"
+    IDS_DEL_LEFT_FMT        "×ó²à (%1)"
+    IDS_DEL_RIGHT_FMT       "ÓÒ²à (%1)"
+    IDS_DEL_BOTH_FMT        "Á½²à (%1)"
+    IDS_DEL_LEFT_FMT2       "×ó²à (%1 ¹²%2)"
+    IDS_DEL_RIGHT_FMT2      "ÓÒ²à (%1 ¹²%2)"
+    IDS_DEL_BOTH_FMT2       "Á½²à (%1 ¹²%2)"
+    IDS_SELECT_DESTFOLDER   "Ñ¡ÔñÄ¿±êÎļþ¼Ð"
+    IDS_MOVE_LEFT_TO        "×ó²àµ½... (%1)"
+    IDS_MOVE_RIGHT_TO       "ÓҲൽ... (%1)"
+    IDS_MOVE_LEFT_TO2       "×ó²àµ½... (%1 ¹²%2)"
+    IDS_MOVE_RIGHT_TO2      "ÓҲൽ... (%1 ¹²%2)"
 END
 
 // DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION
 STRINGTABLE
 BEGIN
-    IDS_CONFIRM_ALL_LEFT    "ÄúÈ·¶¨Òª¸´ÖÆËùÓв»Í¬µ½×ó±ßÎļþÂð£¿"
-    IDS_CONFIRM_ALL_RIGHT   "ÄúÈ·¶¨Òª¸´ÖÆËùÓв»Í¬µ½ÓÒ±ßÎļþÂð£¿"
+    IDS_CONFIRM_ALL_LEFT    "ÄúÈ·¶¨Òª¸´ÖÆËùÓв»Í¬µ½×ó²àÎļþÂð£¿"
+    IDS_CONFIRM_ALL_RIGHT   "ÄúÈ·¶¨Òª¸´ÖÆËùÓв»Í¬µ½ÓÒ²àÎļþÂð£¿"
     IDS_CONFIRM_COPY_SINGLE "ÄúÈ·¶¨Òª¸´ÖÆ\n\n%1\nµ½\n%2\nÂð£¿"
     IDS_CONFIRM_COPY2DIR    "ÄúÈ·¶¨Òª¸´ÖÆ %1 ÔÚ %2 Ñ¡ÔñµÄÏîÄ¿"
     IDS_CONFIRM_DELETE_ITEMS "ÄúÈ·¶¨ÒªÉ¾³ý %1 ÔÚ %2 Ñ¡ÔñµÄÏîÄ¿Âð£¿"
@@ -1857,37 +1861,36 @@ END
 // DIRECTORY DIFFING : OPEN FILE
 STRINGTABLE
 BEGIN
-    ID_DIR_OPEN_LEFT        "´ò¿ª×ó±ßÎļþ"
-    ID_DIR_OPEN_LEFT_WITHEDITOR "Open the left file to external editor"
-    ID_DIR_OPEN_LEFT_WITH   "´ò¿ª×ó±ßÎļþÒÔ ..."
-    ID_DIR_OPEN_RIGHT       "´ò¿ªÓÒ±ßÎļþ"
-    ID_DIR_OPEN_RIGHT_WITHEDITOR "Open the right file to external editor"
-    ID_DIR_OPEN_RIGHT_WITH  "´ò¿ªÓÒ±ßÎļþÒÔ..."
-    IDS_CANNOT_EXECUTE_FILE "Cannot execute %1"
-    ID_DIR_COPY_FILENAMES   "Copy filenames to clipboard"
-    ID_DIR_COPY_PATHNAMES_LEFT "Copy left side pathnames to clipboard"
-    ID_DIR_COPY_PATHNAMES_RIGHT "Copy right side pathnames to clipboard"
-    ID_DIR_COPY_PATHNAMES_BOTH "Copy both sides pathnames to clipboard"
+    ID_DIR_OPEN_LEFT        "´ò¿ª×ó²àÎļþ"
+    ID_DIR_OPEN_LEFT_WITHEDITOR "ÓÃÍⲿ±à¼­Æ÷´ò¿ª×ó²àÎļþ"
+    ID_DIR_OPEN_LEFT_WITH   "Ñ¡Ôñ³ÌÐòÒÔ´ò¿ª×ó²àÎļþ ..."
+    ID_DIR_OPEN_RIGHT       "´ò¿ªÓÒ²àÎļþ"
+    ID_DIR_OPEN_RIGHT_WITHEDITOR "ÓÃÍⲿ±à¼­Æ÷´ò¿ªÓÒ²àÎļþ"
+    ID_DIR_OPEN_RIGHT_WITH  "Ñ¡Ôñ³ÌÐòÒÔ´ò¿ªÓÒ²àÎļþ ..."
+    IDS_CANNOT_EXECUTE_FILE "ÎÞ·¨Ö´ÐР%1"
+    ID_DIR_COPY_FILENAMES   "½«ÎļþÃû¸´ÖƵ½¼ôÌù°å"
+    ID_DIR_COPY_PATHNAMES_LEFT "½«×ó²àµÄ·¾¶Ãû¸´ÖƵ½¼ôÌù°å"
+    ID_DIR_COPY_PATHNAMES_RIGHT "½«ÓÒ²àµÄ·¾¶Ãû¸´ÖƵ½¼ôÌù°å"
+    ID_DIR_COPY_PATHNAMES_BOTH "½«Á½²àµÄ·¾¶Ãû¸´ÖƵ½¼ôÌù°å"
 END
 
 // DIRECTORY DIFFING : 7ZIP
 STRINGTABLE
 BEGIN
-    IDS_UNKNOWN_ARCHIVE_FORMAT "Unknown archive format"
-    ID_DIR_ZIP_LEFT         "Add items from left side to archive"
-    ID_DIR_ZIP_RIGHT        "Add items from right side to archive"
-    ID_DIR_ZIP_BOTH         "Add items from both sides to archive"
-    ID_DIR_ZIP_BOTH_DIFFS_ONLY "Add different items to archive (both sides)"
-    ID_DIR_MOVE_LEFT_TO_BROWSE 
-                            "Move selected file on left to custom directory"
-    ID_DIR_MOVE_RIGHT_TO_BROWSE 
-                            "Move selected file on right to custom directory"
+    IDS_UNKNOWN_ARCHIVE_FORMAT "δ֪µÄѹËõ°ü¸ñʽ"
+    ID_DIR_ZIP_LEFT         "´Ó×ó²àÌí¼Óµ½Ñ¹Ëõ°ü"
+    ID_DIR_ZIP_RIGHT        "´ÓÓÒ²àÌí¼Óµ½Ñ¹Ëõ°ü"
+    ID_DIR_ZIP_BOTH         "´ÓÁ½²àÌí¼Óµ½Ñ¹Ëõ°ü"
+    ID_DIR_ZIP_BOTH_DIFFS_ONLY "½«Á½²àÖв»ÏàͬµÄÌí¼Óµ½Ñ¹Ëõ°ü"
+    ID_DIR_MOVE_LEFT_TO_BROWSE "½«×ó²àÑ¡ÖеÄÎļþÒƶ¯µ½Ö¸¶¨Îļþ¼Ð"
+    ID_DIR_MOVE_RIGHT_TO_BROWSE "½«ÓÒ²àÑ¡ÖеÄÎļþÒƶ¯µ½Ö¸¶¨Îļþ¼Ð"
+
 END
 
 // DIRECTORY DIFFING : GENERATE REPORT
 STRINGTABLE
 BEGIN
-    IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2"
+    IDS_DIRECTORY_REPORT_TITLE "¶Ô±È %1 ºÍ %2"
 END
 
 // DIRECTORY DIFFING : COLUMN TITLES
@@ -1895,179 +1898,172 @@ STRINGTABLE
 BEGIN
     IDS_COLHDR_FILENAME     "ÎļþÃû³Æ"
     IDS_COLHDR_DIR          "Îļþ¼Ð"
-    IDS_COLHDR_RESULT       "±È¶Ô½á¹û"
-    IDS_COLHDR_LTIMEM       "×ó±ßÈÕÆÚ"
-    IDS_COLHDR_RTIMEM       "ÓÒ±ßÈÕÆÚ"
+    IDS_COLHDR_RESULT       "¶Ô±È½á¹û"
+    IDS_COLHDR_LTIMEM       "×ó²àÈÕÆÚ"
+    IDS_COLHDR_RTIMEM       "ÓÒ²àÈÕÆÚ"
     IDS_COLHDR_EXTENSION    "À©Õ¹Ãû"
-    IDS_COLHDR_LSIZE        "Left Size"
-    IDS_COLHDR_RSIZE        "Right Size"
-    IDS_COLHDR_LTIMEC       "Left Creation Time"
-    IDS_COLHDR_RTIMEC       "Right Creation Time"
-    IDS_COLHDR_NEWER        "Newer File"
-    IDS_COLHDR_LVERSION     "Left File Version"
-    IDS_COLHDR_RVERSION     "Right File Version"
-    IDS_COLHDR_RESULT_ABBR  "Short Result"
-    IDS_COLHDR_LATTRIBUTES  "Left Attributes"
-    IDS_COLHDR_RATTRIBUTES  "Right Attributes"
+    IDS_COLHDR_LSIZE        "×ó²àÎļþ´óС"
+    IDS_COLHDR_RSIZE        "ÓÒ²àÎļþ´óС"
+    IDS_COLHDR_LTIMEC       "×ó²à½¨Á¢Ê±¼ä"
+    IDS_COLHDR_RTIMEC       "ÓҲཨÁ¢Ê±¼ä"
+    IDS_COLHDR_NEWER        "½ÏеÄÎļþ"
+    IDS_COLHDR_LVERSION     "×ó²àÎļþ°æ±¾"
+    IDS_COLHDR_RVERSION     "ÓÒ²àÎļþ°æ±¾"
+    IDS_COLHDR_RESULT_ABBR  "¼ò¶ÌµÄ½á¹û"
+    IDS_COLHDR_LATTRIBUTES  "×ó²àÊôÐÔ"
+    IDS_COLHDR_RATTRIBUTES  "ÓÒ²àÊôÐÔ"
 END
 
 // DIRECTORY DIFFING : COLUMN TITLES (2)
 STRINGTABLE
 BEGIN
-    IDS_COLHDR_LENCODING    "Left Encoding"
-    IDS_COLHDR_RENCODING    "Right Encoding"
-    IDS_COLHDR_NDIFFS       "#differences"
-    IDS_COLHDR_NSDIFFS      "#sig. differences"
-    IDS_COLHDR_BINARY       "Binary"
+    IDS_COLHDR_LENCODING    "×ó²àÎļþ±àÂë"
+    IDS_COLHDR_RENCODING    "ÓÒ²àÎļþ±àÂë"
+    IDS_COLHDR_NDIFFS       "²»Í¬´¦×ÜÊý"
+    IDS_COLHDR_NSDIFFS      "±ê³öµÄ²»Í¬¸öÊý"
+    IDS_COLHDR_BINARY       "¶þ½øÖÆ"
 END
 
 // DIRECTORY DIFFING : FILE COMPARISON RESULT, FULL & SHORTENED FORMS
 STRINGTABLE
 BEGIN
-    IDS_CANT_COMPARE_FILES  "ÎÞ·¨±È¶ÔÎļþ"
-    IDS_FILE_SKIPPED        "File skipped"
-    IDS_DIR_SKIPPED         "Directory skipped"
+    IDS_CANT_COMPARE_FILES  "ÎÞ·¨¶Ô±ÈÎļþ"
+    IDS_FILE_SKIPPED        "ÎļþÒÑÌø¹ý"
+    IDS_DIR_SKIPPED         "Îļþ¼ÐÒÑÌø¹ý"
     IDS_ONLY_IN_FMT         "Ö»ÔÚ %1"
     IDS_BIN_FILES_SAME      "¶þ½øÖÆÎļþÍêÈ«Ïàͬ"
     IDS_IDENTICAL           "ÍêÈ«Ïàͬ"
     IDS_BIN_FILES_DIFF      "¶þ½øÖÆÎļþ²»Í¬"
     IDS_FILES_ARE_DIFFERENT "Îļþ²»Í¬"
-    IDS_LEFTONLY            "Left Only"
-    IDS_RIGHTONLY           "Right Only"
-    IDS_DIFFERENT           "Different"
+    IDS_LEFTONLY            "Ö»´æÔÚ×ó²à"
+    IDS_RIGHTONLY           "Ö»´æÔÚÓÒ²à"
+    IDS_DIFFERENT           "²»Í¬"
 END
 
 // DIRECTORY DIFFING : SUMMARY BAR
 STRINGTABLE
 BEGIN
-    IDS_ELAPSED_TIME        "Elapsed time: %ld ms"
-    IDS_STATUS_SELITEM1     "1 item selected"
-    IDS_STATUS_SELITEMS     "%1 items selected"
+    IDS_ELAPSED_TIME        "Ö´ÐÐʱ¼ä: %ld ºÁÃë"
+    IDS_STATUS_SELITEM1     "Ñ¡ÔñÁË 1 ¸öÏîÄ¿"
+    IDS_STATUS_SELITEMS     "Ñ¡ÔñÁË %1 ¸öÏîÄ¿"
 END
 
 // DIRECTORY DIFFING : COLUMN DESCRIPTIONS
 STRINGTABLE
 BEGIN
-    IDS_COLDESC_FILENAME    "Filename or directory name."
-    IDS_COLDESC_DIR         "Subdirectory name when subdirectories are included."
-    IDS_COLDESC_RESULT      "Comparison result, long form."
-    IDS_COLDESC_LTIMEM      "Left side modification date."
-    IDS_COLDESC_RTIMEM      "Right side modification date."
-    IDS_COLDESC_EXTENSION   "File's extension."
-    IDS_COLDESC_LSIZE       "Left file size in bytes."
-    IDS_COLDESC_RSIZE       "Right file size in bytes."
-    IDS_COLDESC_LTIMEC      "Left side creation time."
-    IDS_COLDESC_RTIMEC      "Right side creation time."
-    IDS_COLDESC_NEWER       "Tells which side has newer modification date."
-    IDS_COLDESC_LVERSION    "Left side file version, only for some filetypes."
-    IDS_COLDESC_RVERSION    "Right side file version, only for some filetypes."
-    IDS_COLDESC_RESULT_ABBR "Short comparison result."
-    IDS_COLDESC_LATTRIBUTES "Left side attributes."
-    IDS_COLDESC_RATTRIBUTES "Right side attributes."
+    IDS_COLDESC_FILENAME    "ÎļþÃû»òÎļþ¼ÐÃû¡£"
+    IDS_COLDESC_DIR         "Ëù´¦µÄ×ÓÎļþ¼ÐÃû¡£"
+    IDS_COLDESC_RESULT      "±È½Ï½á¹û£¬½Ï³¤µÄ¸ñʽ¡£"
+    IDS_COLDESC_LTIMEM      "×ó²àµÄ×îºóÐÞ¸ÄÈÕÆÚ¡£"
+    IDS_COLDESC_RTIMEM      "ÓÒ²àµÄ×îºóÐÞ¸ÄÈÕÆÚ¡£"
+    IDS_COLDESC_EXTENSION   "ÎļþµÄÀ©Õ¹Ãû¡£"
+    IDS_COLDESC_LSIZE       "×ó²àÎļþ³¤¶È×Ö½ÚÊý¡£"
+    IDS_COLDESC_RSIZE       "ÓÒ²àÎļþ³¤¶È×Ö½ÚÊý¡£"
+    IDS_COLDESC_LTIMEC      "×ó²àµÄ´´½¨Ê±¼ä¡£"
+    IDS_COLDESC_RTIMEC      "ÓÒ²àµÄ´´½¨Ê±¼ä¡£"
+    IDS_COLDESC_NEWER       "ÏÔʾ³öÄIJàÊǽÏÍíÐ޸ĹýµÄ¡£"
+    IDS_COLDESC_LVERSION    "×ó²àÎļþµÄ°æ±¾£¬Ö»¶ÔһЩÎļþÀàÐÍÓÐЧ¡£"
+    IDS_COLDESC_RVERSION    "ÓÒ²àÎļþµÄ°æ±¾£¬Ö»¶ÔһЩÎļþÀàÐÍÓÐЧ¡£"
+    IDS_COLDESC_RESULT_ABBR "¶Ì¸ñʽµÄ±È½Ï½á¹û¡£"
+    IDS_COLDESC_LATTRIBUTES "×ó²àµÄÊôÐÔ¡£"
+    IDS_COLDESC_RATTRIBUTES "ÓÒ²àµÄÊôÐÔ¡£"
 END
 
 // DIRECTORY DIFFING : COLUMN DESCRIPTIONS (2)
 STRINGTABLE
 BEGIN
-    IDS_COLDESC_LENCODING   "Left side encoding."
-    IDS_COLDESC_RENCODING   "Right side encoding."
-    IDS_COLDESC_NDIFFS      "Number of total differences."
-    IDS_COLDESC_NSDIFFS     "Number of differences not counting ignored ones."
-    IDS_COLDESC_BINARY      "Shows asterisk (*) if file is binary."
+    IDS_COLDESC_LENCODING   "×ó²àÎļþµÄ×Ö·û±àÂë¡£"
+    IDS_COLDESC_RENCODING   "ÓÒ²àÎļþµÄ×Ö·û±àÂë¡£"
+    IDS_COLDESC_NDIFFS      "²»Í¬Ö®´¦µÄ×ÜÊý¡£"
+    IDS_COLDESC_NSDIFFS     "²»°üº¬ºöÂԵIJ»Í¬Ö®´¦µÄ¸öÊý¡£"
+    IDS_COLDESC_BINARY      "ÔÚ¶þ½øÖÆÎļþ´¦ÏÔʾÐǺÅ(*)¡£"
 END
 
 // FILE COMPARISON RESULT : MESSAGES
 STRINGTABLE
 BEGIN
-    IDS_FILE_TO_ITSELF      "The same file is opened in both panels."
+    IDS_FILE_TO_ITSELF      "Á½²à´ò¿ªµÄÊÇͬһ¸öÎļþ¡£"
     IDS_FILESSAME           "Ñ¡ÔñµÄÎļþÍêÈ«Ïàͬ¡£"
-    IDS_FILEUNIQUE          "Ñ¡ÔñµÄÎļþ²»´æÔÚÓÚÁ½±ßµÄÎļþ¼Ð£¬Òò´ËÎÞ·¨±È¶Ô¡£"
-    IDS_FILEERROR           "Ò»¸ö´íÎó·¢ÉúÓڱȶÔÎļþʱ¡£"
-    IDS_FILEBINARY          "¶þ½øÖÆÎļþÎÞ·¨×÷ÊÓ¾õµÄ±È¶Ô¡£"
-    IDS_TEMP_FILEERROR      "Temporary files could not be created. Check your temporary path settings."
-    IDS_FILEISDIR           "Îļþ¼ÐÎļþÎÞ·¨×öÊÓ¾õµÄ±È¶Ô¡£"
-    IDS_SUGGEST_IGNOREEOL   "These files use different carriage return types.\n\n\
-                            Do you want to treat all carriage return types as equivalent for this comparison?\n\n\
-                            Note: If you always want to treat all carriage return types \
-                            as equivalent, set the option 'Ignore carriage return \
-                            differences..' in the Compare tab of the options dialog\
-                            (available under Edit/Options)."
-    IDS_SUGGEST_PRESERVEEOL "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n With the current options, they will be unified to the main type.\n Do you want to change the options and preserve the different EOL ?"
-    IDS_PREDIFFER_ERROR      "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
-    IDS_SUGGEST_IGNORECODEPAGE "Different codepages found in left (cp%d) and right (cp%d) files. \nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to treat both files as being in the default windows codepage (recommended)?"
+    IDS_FILEUNIQUE          "Ñ¡ÔñµÄÎļþ²»´æÔÚÓÚÁ½²àµÄÎļþ¼Ð£¬Òò´ËÎÞ·¨¶Ô±È¡£"
+    IDS_FILEERROR           "Ò»¸ö´íÎó·¢ÉúÓÚ¶Ô±ÈÎļþʱ¡£"
+    IDS_FILEBINARY          "¶þ½øÖÆÎļþÎÞ·¨×÷ÊÓ¾õµÄ¶Ô±È¡£"
+    IDS_TEMP_FILEERROR      "ÎÞ·¨´´½¨ÁÙʱÎļþ¡£Çë¼ì²éÄúµÄÁÙʱ·¾¶ÉèÖá£"
+    IDS_FILEISDIR           "²»ÄÜÔÚÎļþ¼ÐºÍÎļþÖ®¼ä×ö¶Ô±È¡£"
+    IDS_SUGGEST_IGNOREEOL   "Îļþº¬Óв»Í¬µÄ»»Ðзû\n\nÄúÒªÔڴ˴ζԱÈÖкöÂÔ»»ÐзûµÄ²î±ðÂð£¿\n\nÌáʾ£ºÈç¹ûÄú×ÜÊǺöÂÔ»»ÐзûµÄ²»Í¬£¬ÇëÔÚ¡°±à¼­/Ñ¡ÏµÄ¡°±È½Ï¡±Ò³Öй´Ñ¡¡°ºöÂÔ»»Ðзû²î±ð¡±¡£"
+    IDS_SUGGEST_PRESERVEEOL "ÔÚÎļþ¡°%1¡±Öк¬Óв»Í¬µÄ»»Ðзû(DOS/UNIX/MAC)¡£\n¶ÔÓ¦ÓÚµ±Ç°µÄÑ¡ÏËüÃǽ«Í³Ò»³ÉΪһÖÖ¸ñʽ¡£\nÄúÒª¸Ä±äÑ¡ÏîÉèÖÃÒÔ±£ÁôԭʼµÄ²»Í¬µÄ»»ÐзûÂð£¿"
+    IDS_PREDIFFER_ERROR     "ÔÚʹÓòå¼þ¡°%2¡±¶ÔÎļþ¡°%1¡±½øÐÐÔ¤±È½Ïʱ·¢ÉúÁËÒ»¸ö´íÎó¡£Ô¤±È½Ï½«²»»á±»²ÉÓá£"
+    IDS_SUGGEST_IGNORECODEPAGE "×óÓÒÁ½²àΪ²»Í¬´úÂëÒ³µÄÎļþ(×ó²àΪcp%d£¬ÓÒ²àΪcp%d)¡£\n·Ö±ðÒÔ²»Í¬´úÂëÒ³ÏÔʾ½«»áÓнϺõÄЧ¹û£¬µ«ÊǺϲ¢/¸´ÖÆ»áÓÐΣÏÕ¡£\nÄúÒªÒÔWiondowsĬÈϵĴúÂëÒ³ÏÔʾÁ½¸öÎļþÂð(ÍƼö)£¿"
 END
 
 // EDITOR : SHOW LINE DIFF
 STRINGTABLE
 BEGIN
-    IDS_LINEDIFF_NODIFF     "No difference"
-    IDS_LINEDIFF_NODIFF_CAPTION "Line difference"
+    IDS_LINEDIFF_NODIFF     "ûÓв»Í¬"
+    IDS_LINEDIFF_NODIFF_CAPTION "ÐÐÄÚ²»Í¬"
 END
 
 // EDITOR : SEARCH/REPLACE DIALOGS
 STRINGTABLE
 BEGIN
     IDS_NUM_REPLACED        "ÒÑÌæ»» %1 ¸ö×Ö·û´®¡£"
-    IDS_EDIT_TEXT_NOT_FOUND "ÎÞ·¨ѰÕÒ×Ö·û´®¡¸%s¡¹"
+    IDS_EDIT_TEXT_NOT_FOUND "ÎÞ·¨²éÕÒ×Ö·û´®¡¸%s¡¹"
 END
 
 // EDITOR : FILENAME BAR POPUP
 STRINGTABLE
 BEGIN
-    ID_EDITOR_COPY_PATH     "Copy Full Path"
-    ID_EDITOR_COPY_FILENAME "Copy Filename"
+    ID_EDITOR_COPY_PATH     "¸´ÖÆÈ«Ãû"
+    ID_EDITOR_COPY_FILENAME "¸´ÖÆÎļþÃû"
 END
 
 // CREATE PATCH
 STRINGTABLE
 BEGIN
-    IDS_DIFF_SUCCEEDED      "Patch file succesfully written."
-    IDS_DIFF_ITEM1NOTFOUND  "1. item is not found or is directory!"
-    IDS_DIFF_ITEM2NOTFOUND  "2. item is not found or is directory!"
-    IDS_DIFF_FILEOVERWRITE  "The patch file already exists. Do you want to overwrite it?"
-    IDS_DIFF_SELECTEDFILES  "[%1 files selected]"
-    IDS_DIFF_NORMAL         "Normal"
+    IDS_DIFF_SUCCEEDED      "³É¹¦Ð´ÈëpatchÎļþ¡£"
+    IDS_DIFF_ITEM1NOTFOUND  "1. ÌõĿδÕÒµ½»òÕßËüÊÇÒ»¸öÎļþ¼Ð!"
+    IDS_DIFF_ITEM2NOTFOUND  "2. ÌõĿδÕÒµ½»òÕßËüÊÇÒ»¸öÎļþ¼Ð!"
+    IDS_DIFF_FILEOVERWRITE  "patchÎļþÒѾ­´æÔÚ£¬ÄúÒª¸²¸ÇËüÂð£¿"
+    IDS_DIFF_SELECTEDFILES  "[Ñ¡ÖР%1 ¸öÎļþ]"
+    IDS_DIFF_NORMAL         "ÆÕͨ"
     IDS_DIFF_CONTEXT        "Context"
     IDS_DIFF_UNIFIED        "Unified"
-    IDS_FILEWRITE_ERROR     "Could not write to file %1."
-    IDS_PATH_NOT_ABSOLUTE   "%1\n is not absolute path!"
-    IDS_CANNOT_CREATE_BINARYPATCH "Cannot create a pactch file from binary files."
-    IDS_CANNOT_CREATE_DIRPATCH "Cannot create a patch file from directories."
-    IDS_SAVEFILES_FORPATCH  "Please save all files first.\n\nCreating a patch requires that there are no unsaved changes in files."
+    IDS_FILEWRITE_ERROR     "ÎÞ·¨Ð´ÈëÎļþ %1¡£"
+    IDS_PATH_NOT_ABSOLUTE   "%1\n ²»ÊÇÒ»¸ö¾ø¶Ô·¾¶!"
+    IDS_CANNOT_CREATE_BINARYPATCH "ÎÞ·¨Îª¶þ½øÖÆÎļþ´´½¨ pactch¡£"
+    IDS_CANNOT_CREATE_DIRPATCH "ÎÞ·¨ÎªÎļþ¼Ð´´½¨ pactch¡£"
+    IDS_SAVEFILES_FORPATCH  "Çë±£´æÎļþ¡£\n\n´´½¨ patch ÒªÇóÎļþÖÐûÓÐδ±£´æµÄ¸Ä¶¯¡£"
 END
 
 STRINGTABLE
 BEGIN
-    IDS_DIR_RESULTS_EMPTIED "Current directory comparison results will be cleared."
-    IDS_NO_ZIP_SUPPORT      "Archive support is not enabled.\n
-                            All needed components (7-zip and/or Merge7z*.dll) for archive support cannot be found.
-                            See manual for more info about archive support and how to enable it."
+    IDS_DIR_RESULTS_EMPTIED "µ±Ç°µÄÎļþ¼Ð¶Ô±È½á¹û½«»á±»Çå³ý¡£"
+    IDS_NO_ZIP_SUPPORT      "ûÓÐÆôÓÃѹËõ°üÖ§³Ö¡£\n \nûÕÒµ½Ö§³ÖѹËõ°üËùÐèÒªµÄ×é¼þ(7-zip »ò Merge7z*.dll)¡£\nÇë²é¿´ÊÖ²á»ñµÃÓйØѹËõ°üÖ§³Ö¼°ÈçºÎÆôÓõĸü¶àÐÅÏ¢¡£"
 END
 
 // Regular expression errors
 STRINGTABLE
 BEGIN
-    IDS_REGEXP_ERROR        "Regular expression error"
-    IDS_REGEXP_NOMATCH      "No match"
-    IDS_REGEXP_INVALID      "Invalid regular expression"
-    IDS_REGEXP_COLL_CHAR    "Invalid collation character"
-    IDS_REGEXP_CHAR_CLASS   "Invalid character class name"
-    IDS_REGEXP_TRAILING_BS  "Trailing backslash"
-    IDS_REGEXP_INVALID_BACKREF "Invalid back reference"
-    IDS_REGEXP_UNMATCHED_BRACK "Unmatched [ or [^"
-    IDS_REGEXP_UNMATCHED_PAREN "Unmatched ( or \\("
-    IDS_REGEXP_UNMATCHED_BRACE "Unmatched \\{"
-    IDS_REGEXP_INVALID_BRACE "Invalid content of \\{\\}"
-    IDS_REGEXP_RANGE_END    "Invalid range end"
-    IDS_REGEXP_OUTOFMEM     "Out of memory"
+    IDS_REGEXP_ERROR        "ÕýÔò±í´ïʽ´íÎó"
+    IDS_REGEXP_NOMATCH      "²»Æ¥Åä"
+    IDS_REGEXP_INVALID      "ÎÞЧµÄÕýÔò±í´ïʽ"
+    IDS_REGEXP_COLL_CHAR    "ÎÞЧµÄ collation character"
+    IDS_REGEXP_CHAR_CLASS   "ÎÞЧµÄ×Ö·ûÀà(character class)Ãû"
+    IDS_REGEXP_TRAILING_BS  "ĩβµÄ·´Ð±¸Ü"
+    IDS_REGEXP_INVALID_BACKREF "ÎÞЧµÄ back reference"
+    IDS_REGEXP_UNMATCHED_BRACK "δÅä¶ÔµÄ [ or [^"
+    IDS_REGEXP_UNMATCHED_PAREN "δÅä¶ÔµÄ ( or \\("
+    IDS_REGEXP_UNMATCHED_BRACE "δÅä¶ÔµÄ \\{"
+    IDS_REGEXP_INVALID_BRACE "\\{\\}µÄÄÚÈÝÎÞЧ"
+    IDS_REGEXP_RANGE_END    "ÎÞЧµÄ·¶Î§½áβ"
+    IDS_REGEXP_OUTOFMEM     "ÄÚ´æ²»×ã"
     IDS_REGEXP_INVALID_PREV_EXP "Invalid preceding regular expression"
-    IDS_REGEXP_PREMATURE_END "Premature end of regular expression"
-    IDS_REGEXP_TOO_BIG      "Regular expression too big"
+    IDS_REGEXP_PREMATURE_END "ÕýÔò±í´ïʽ¹ýÔçµØ½áÊø"
+    IDS_REGEXP_TOO_BIG      "ÕýÔò±í´ïʽ̫´ó"
 END
 
 STRINGTABLE
 BEGIN
-    IDS_REGEXP_UNMATCHED_RPAREN "Unmatched ) or \\)"
+    IDS_REGEXP_UNMATCHED_RPAREN "δÅä¶ÔµÄ ) or \\)"
 END
 
 // LANGUAGE NAMES #1
@@ -2246,85 +2242,85 @@ END
 // CODEPAGE GEOGRAPHIC GROUPS
 STRINGTABLE
 BEGIN
-       IDS_CPG_WESTERN_EUROPEAN        "Western European"
-       IDS_CPG_EASTERN_EUROPEAN        "Eastern European"
-       IDS_CPG_EAST_ASIAN              "East Asian"
-       IDS_CPG_SOUTH_ASIAN             "SE & SW Asian"
-       IDS_CPG_MIDDLE_EASTERN          "Middle Eastern"
-       IDS_CPG_NA                      "Not applicable"
+    IDS_CPG_WESTERN_EUROPEAN "Western European"
+    IDS_CPG_EASTERN_EUROPEAN "Eastern European"
+    IDS_CPG_EAST_ASIAN      "East Asian"
+    IDS_CPG_SOUTH_ASIAN     "SE & SW Asian"
+    IDS_CPG_MIDDLE_EASTERN  "Middle Eastern"
+    IDS_CPG_NA              "Not applicable"
 END
 
 // CODEPAGE PLATFORM GROUPS
 STRINGTABLE
 BEGIN
-       IDS_CPP_WINDOWS                 "MS-Windows"
-       IDS_CPP_DOS                     "MS-DOS"
-       IDS_CPP_MACINTOSH               "Macintosh"
-       IDS_CPP_IBM                     "IBM"
-       IDS_CPP_NA                      "Not applicable"
+    IDS_CPP_WINDOWS         "MS-Windows"
+    IDS_CPP_DOS             "MS-DOS"
+    IDS_CPP_MACINTOSH       "Macintosh"
+    IDS_CPP_IBM             "IBM"
+    IDS_CPP_NA              "Not applicable"
 END
 
 // CODEPAGES #1 (IBM)
 STRINGTABLE
 BEGIN
-       IDS_CP_EBCDIC                   "EBCDIC"
-       IDS_CP_IBM_EBCDIC_CYRILLIC      "IBM EBCDIC Cyrillic"
+    IDS_CP_EBCDIC           "EBCDIC"
+    IDS_CP_IBM_EBCDIC_CYRILLIC "IBM EBCDIC Cyrillic"
 END
 
 // CODEPAGES #1 (DOS)
 STRINGTABLE
 BEGIN
-       IDS_CP_DOS_US                   "MS-DOS Latin US"
-       IDS_CP_DOS_ARABIC               "MS-DOS Arabic"
-       IDS_CP_DOS_GREEK                "MS-DOS Greek"
-       IDS_CP_DOS_BALTIC               "MS-DOS Baltic Rim"
-       IDS_CP_DOS_LATIN1               "MS-DOS Latin 1"
-       IDS_CP_DOS_GREEK1               "MS-DOS Greek 1"
-       IDS_CP_DOS_LATIN2               "MS-DOS Latin 2"
-       IDS_CP_DOS_CYRILLIC             "MS-DOS Cyrillic"
-       IDS_CP_DOS_TURKISH              "MS-DOS Turkish"
-       IDS_CP_DOS_PORTUGUESE           "MS-DOS Portuguese"
+    IDS_CP_DOS_US           "MS-DOS Latin US"
+    IDS_CP_DOS_ARABIC       "MS-DOS Arabic"
+    IDS_CP_DOS_GREEK        "MS-DOS Greek"
+    IDS_CP_DOS_BALTIC       "MS-DOS Baltic Rim"
+    IDS_CP_DOS_LATIN1       "MS-DOS Latin 1"
+    IDS_CP_DOS_GREEK1       "MS-DOS Greek 1"
+    IDS_CP_DOS_LATIN2       "MS-DOS Latin 2"
+    IDS_CP_DOS_CYRILLIC     "MS-DOS Cyrillic"
+    IDS_CP_DOS_TURKISH      "MS-DOS Turkish"
+    IDS_CP_DOS_PORTUGUESE   "MS-DOS Portuguese"
 END
 
 // CODEPAGES #2 (more DOS)
 STRINGTABLE
 BEGIN
-       IDS_CP_DOS_ICELANDIC            "MS-DOS Icelandic"
-       IDS_CP_DOS_HEBREW               "MS-DOS Hebrew"
-       IDS_CP_DOS_FRENCH_CANADA        "MS-DOS French Canada"
-       IDS_CP_DOS_NORDIC               "MS-DOS Nordic"
-       IDS_CP_DOS_CYRILLIC_CIS1        "MS-DOS Cyrillic CIS 1"
-       IDS_CP_DOS_GREEK2               "MS-DOS Greek 2"
+    IDS_CP_DOS_ICELANDIC    "MS-DOS Icelandic"
+    IDS_CP_DOS_HEBREW       "MS-DOS Hebrew"
+    IDS_CP_DOS_FRENCH_CANADA "MS-DOS French Canada"
+    IDS_CP_DOS_NORDIC       "MS-DOS Nordic"
+    IDS_CP_DOS_CYRILLIC_CIS1 "MS-DOS Cyrillic CIS 1"
+    IDS_CP_DOS_GREEK2       "MS-DOS Greek 2"
 END
 
 // CODEPAGES #3 (Windows)
 STRINGTABLE
 BEGIN
-       IDS_CP_WINDOWS_THAI             "Windows Thai"
-       IDS_CP_WINDOWS_JAPANESE         "Windows Japanese"
-       IDS_CP_WINDOWS_CHINESE_SIMP     "Windows Simplified Chinese"
-       IDS_CP_WINDOWS_KOREAN           "Windows Korean"
-       IDS_CP_WINDOWS_CHINESE_TRAD     "Windows Traditional Chinese"
-       IDS_CP_WINDOWS_LATIN2           "Windows Latin 2"
-       IDS_CP_WINDOWS_CYRILLIC         "Windows Cyrillic (Slavic)"
-       IDS_CP_WINDOWS_LATIN1           "Windows Latin 1"
-       IDS_CP_WINDOWS_GREEK            "Windows Greek"
-       IDS_CP_WINDOWS_TURKISH          "Windows Latin 5 (Turkish)"
-       IDS_CP_WINDOWS_HEBREW           "Windows Hebrew"
-       IDS_CP_WINDOWS_ARABIC           "Windows Arabic"
-       IDS_CP_WINDOWS_BALTIC           "Windows Baltic Rim"
-       IDS_CP_WINDOWS_VIETNAM          "Windows Vietnamese"
+    IDS_CP_WINDOWS_THAI     "Windows Thai"
+    IDS_CP_WINDOWS_JAPANESE "Windows Japanese"
+    IDS_CP_WINDOWS_CHINESE_SIMP "Windows Simplified Chinese"
+    IDS_CP_WINDOWS_KOREAN   "Windows Korean"
+    IDS_CP_WINDOWS_CHINESE_TRAD "Windows Traditional Chinese"
+    IDS_CP_WINDOWS_LATIN2   "Windows Latin 2"
+    IDS_CP_WINDOWS_CYRILLIC "Windows Cyrillic (Slavic)"
+    IDS_CP_WINDOWS_LATIN1   "Windows Latin 1"
+    IDS_CP_WINDOWS_GREEK    "Windows Greek"
+    IDS_CP_WINDOWS_TURKISH  "Windows Latin 5 (Turkish)"
+    IDS_CP_WINDOWS_HEBREW   "Windows Hebrew"
+    IDS_CP_WINDOWS_ARABIC   "Windows Arabic"
+    IDS_CP_WINDOWS_BALTIC   "Windows Baltic Rim"
+    IDS_CP_WINDOWS_VIETNAM  "Windows Vietnamese"
 END
 
 // CODEPAGES #4 (Macintosh)
 STRINGTABLE
 BEGIN
-       IDS_CP_MACINTOSH_ROMAN          "Macintosh Roman"
-       IDS_CP_MACINTOSH_GREEK          "Macintosh Greek"
-       IDS_CP_MACINTOSH_CYRILLIC       "Macintosh Cyrillic"
-       IDS_CP_MACINTOSH_CENTRAL_EUROPE "Macintosh "
-       IDS_CP_MACINTOSH_ICELANDIC      "Macintosh Central Europe"
-       IDS_CP_MACINTOSH_TURKISH        "Macintosh Turkish"
+    IDS_CP_MACINTOSH_ROMAN  "Macintosh Roman"
+    IDS_CP_MACINTOSH_GREEK  "Macintosh Greek"
+    IDS_CP_MACINTOSH_CYRILLIC "Macintosh Cyrillic"
+    IDS_CP_MACINTOSH_CENTRAL_EUROPE "Macintosh "
+    IDS_CP_MACINTOSH_ICELANDIC "Macintosh Central Europe"
+    IDS_CP_MACINTOSH_TURKISH "Macintosh Turkish"
 END
 
 // CODEPAGES #5 (Extra (alias) information)
@@ -2333,41 +2329,41 @@ BEGIN
        IDS_CP_WINDOWS_JAPANESE_EXTRA   ""
        IDS_CP_WINDOWS_CHINESE_SIMP_EXTRA ""
        IDS_CP_WINDOWS_KOREAN_EXTRA     ""
-       IDS_CP_WINDOWS_LATIN2_EXTRA     "Approximates ISO-8859-2"
+    IDS_CP_WINDOWS_LATIN2_EXTRA "Approximates ISO-8859-2"
        IDS_CP_WINDOWS_CHINESE_TRAD_EXTRA ""
        IDS_CP_WINDOWS_CYRILLIC_EXTRA   ""
-       IDS_CP_WINDOWS_LATIN1_EXTRA     "Approximates ISO-8859-1"
-       IDS_CP_WINDOWS_GREEK_EXTRA      "Approximates ISO-8859-7"
-       IDS_CP_WINDOWS_TURKISH_EXTRA    "Approximates ISO-8859-9"
-       IDS_CP_WINDOWS_HEBREW_EXTRA     "Approximates ISO-8859-8"
+    IDS_CP_WINDOWS_LATIN1_EXTRA "Approximates ISO-8859-1"
+    IDS_CP_WINDOWS_GREEK_EXTRA "Approximates ISO-8859-7"
+    IDS_CP_WINDOWS_TURKISH_EXTRA "Approximates ISO-8859-9"
+    IDS_CP_WINDOWS_HEBREW_EXTRA "Approximates ISO-8859-8"
 END
 
 // MENU STRINGS
 // FILE MENU
 STRINGTABLE
 BEGIN
-    ID_FILE_SAVE_LEFT       "Save the left file"
-    ID_FILE_SAVE_RIGHT      "Save the right file"
-    ID_FILE_SAVEAS_LEFT     "Save the left file with name..."
-    ID_FILE_SAVEAS_RIGHT    "Save the right file with name..."
-    ID_FILE_LEFT_READONLY   "Change left file/dir read-only status"
-    ID_FILE_RIGHT_READONLY  "Change right file/dir read-only status"
-    ID_EOL_TO_DOS           "Convert EOL to DOS mode"
-    ID_EOL_TO_UNIX          "Convert EOL to UNIX mode"
-    ID_EOL_TO_MAC           "Convert EOL to MAC mode"
-    ID_FILE_MERGINGMODE     "Switch between editing and merging modes"
+    ID_FILE_SAVE_LEFT       "±£´æ×ó²àµÄÎļþ"
+    ID_FILE_SAVE_RIGHT      "±£´æÓÒ²àµÄÎļþ"
+    ID_FILE_SAVEAS_LEFT     "½«×ó²àÎļþ±£´æΪָ¶¨ÎļþÃû..."
+    ID_FILE_SAVEAS_RIGHT    "½«ÓÒ²àÎļþ±£´æΪָ¶¨ÎļþÃû..."
+    ID_FILE_LEFT_READONLY   "¸Ä±ä×ó²àÎļþ/Îļþ¼ÐµÄÖ»¶ÁÊôÐÔ"
+    ID_FILE_RIGHT_READONLY  "¸Ä±äÓÒ²àÎļþ/Îļþ¼ÐµÄÖ»¶ÁÊôÐÔ"
+    ID_EOL_TO_DOS           "½«»»Ðзûת»»Îª DOS Ä£Ê½"
+    ID_EOL_TO_UNIX          "½«»»Ðзûת»»Îª UNIX Ä£Ê½"
+    ID_EOL_TO_MAC           "½«»»Ðзûת»»Îª MAC Ä£Ê½"
+    ID_FILE_MERGINGMODE     "Ôڱ༭ģʽºÍºÏ²¢Ä£Ê½Ö®¼äÇл»"
 END
 
 // EDIT MENU
 STRINGTABLE
 BEGIN
-    ID_SHOWLINEWORDDIFF     "Highlight word difference in current line\nWord Diff in Current Line (F4)"
-    ID_SHOWLINECHARDIFF     "Highlight char difference in current line\nChar Diff in Current Line (Shift+F4)"
-    ID_EDIT_WMGOTO          "Go to line or difference\nGo to (Ctrl+G)"
+    ID_SHOWLINEWORDDIFF     "¸ßÁÁÏÔʾµ±Ç°ÐÐÖеIJ»Í¬´ÊÓï\nÐÐÖв»Í¬´ÊÓï (F4)"
+    ID_SHOWLINECHARDIFF     "¸ßÁÁÏÔʾµ±Ç°ÐÐÖеIJ»Í¬×Ö·û\nÐÐÖв»Í¬×Ö·û (Shift+F4)"
+    ID_EDIT_WMGOTO          "תµ½ÐкŻòij´¦²»Í¬\nתµ½ (Ctrl+G)"
     ID_OPTIONS              "É趨³ÌÐòÑ¡Ïî\nÑ¡Ïî"
     ID_REFRESH              "¸üÐÂÏÔʾ\n¸üР(F5)"
-    ID_EDIT_COPY_LINENUMBERS "Copy selected lines to clipboard adding linenumbers to line begin"
-    ID_DIR_RESCAN            "Refresh selected items"
+    ID_EDIT_COPY_LINENUMBERS "½«µ±Ç°Ñ¡ÖеÄÐи´ÖƵ½¼ôÌù°å²¢ÔÚÿÐÐÇ°Ìí¼ÓÐкÅ"
+    ID_DIR_RESCAN           "Ë¢ÐÂÑ¡ÖеÄÏîÄ¿"
 END
 
 // VIEW MENU (FILE TYPE)
@@ -2375,23 +2371,23 @@ STRINGTABLE
 BEGIN
     ID_OPTIONS_SHOWIDENTICAL "ÏÔʾÍêÈ«ÏàͬµÄÎļþ"
     ID_OPTIONS_SHOWDIFFERENT "ÏÔʾÓв»Í¬µÄÎļþ"
-    ID_OPTIONS_SHOWUNIQUELEFT "ÏÔʾֻ´æÔÚÓÚ×ó±ßµÄÎļþ"
-    ID_OPTIONS_SHOWUNIQUERIGHT "ÏÔʾֻ´æÔÚÓÚÓұߵÄÎļþ"
+    ID_OPTIONS_SHOWUNIQUELEFT "ÏÔʾֻ´æÔÚÓÚ×ó²àµÄÎļþ"
+    ID_OPTIONS_SHOWUNIQUERIGHT "ÏÔʾֻ´æÔÚÓÚÓÒ²àµÄÎļþ"
     ID_OPTIONS_SHOWBINARIES "ÏÔʾ¶þ½øÖÆÎļþ"
-    ID_OPTIONS_SHOWSKIPPED  "Displays skipped files"
+    ID_OPTIONS_SHOWSKIPPED  "ÏÔʾ·¹ýµÄÎļþ"
 END
 
 // VIEW MENU
 STRINGTABLE
 BEGIN
-    ID_VIEW_SELECTFONT      "Select the font for the view\nSelect View Font"
-    ID_VIEW_USEDEFAULTFONT  "Revert to using the default system font for view\nDefault Font"
+    ID_VIEW_SELECTFONT      "ΪÊÓͼѡÔñ×ÖÌå\nÑ¡ÔñÊÓͼ×ÖÌå"
+    ID_VIEW_USEDEFAULTFONT  "°ÑÊÓͼµÄ×ÖÌå»Ö¸´ÎªÏµÍ³×ÖÌå\nĬÈÏ×ÖÌå"
     ID_VIEW_WHITESPACE      "ÏÔʾ¿Õ°×ºÍÖƱí·û×Ö·û"
-    ID_VIEW_DETAIL_BAR      "Toggle Diff Pane"
-    ID_VIEW_LOCATION_BAR    "Location pane shows overall picture from files"
-    ID_VIEW_DIR_STATEPANE   "Show directory compare statepane"
-    ID_VIEW_LANGUAGE        "Ñ¡ÔñĿÇ°Óû§½Ó¿ÚÓïÑÔ\nÓïÑÔ"
-    ID_VIEW_LINEDIFFS       "Shows differences inside lines with different color\nShow Line Diff"
+    ID_VIEW_DETAIL_BAR      "ÏÔʾ/Òþ²Ø¶Ô±È´°¸ñ"
+    ID_VIEW_LOCATION_BAR    "λÖô°¸ñÏÔʾÎļþµÄ×ÜÌåÇé¿ö"
+    ID_VIEW_DIR_STATEPANE   "ÏÔʾÎļþ¼Ð¶Ô±È½á¹û´°"
+    ID_VIEW_LANGUAGE        "Ñ¡Ôñµ±Ç°Óû§½Ó¿ÚÓïÑÔ\nÓïÑÔ"
+    ID_VIEW_LINEDIFFS       "ÒÔ²»Í¬µÄÑÕÉ«ÏÔʾÐÐÖеIJ»Í¬\nÏÔʾÐÐÖв»Í¬"
 END
 
 // MERGE MENU
@@ -2400,48 +2396,48 @@ BEGIN
     ID_PREVDIFF             "¾í¶¯µ½ÉÏÒ»¸ö²»Í¬\nÉÏÒ»¸ö²»Í¬ (Alt + Up)"
     ID_NEXTDIFF             "¾í¶¯µ½ÏÂÒ»¸ö²»Í¬\nÏÂÒ»¸ö²»Í¬ (Alt + Down)"
     ID_FIRSTDIFF            "¾í¶¯µ½µÚÒ»¸ö²»Í¬\nµÚÒ»¸ö²»Í¬ (Alt+Home)"
-    ID_CURDIFF              "¾í¶¯µ½Ä¿Ç°²»Í¬\nÄ¿Ç°²»Í¬ (Alt+Enter)"
+    ID_CURDIFF              "¾í¶¯µ½µ±Ç°²»Í¬\nµ±Ç°²»Í¬ (Alt+Enter)"
     ID_LASTDIFF             "¾í¶¯µ½ÉϴεIJ»Í¬\nÉϴεIJ»Í¬ (Alt+End)"
-    ID_L2R                  "¸´ÖÆÑ¡ÔñµÄÎÄ×Öµ½ÓÒ±ßÎļþ\n¸´ÖÆÓұߠ(Alt + Right)"
-    ID_R2L                  "¸´ÖÆÑ¡ÔñµÄÎÄ×Öµ½×ó±ßÎļþ\n¸´ÖÆ×ó±ß (Alt + Left)"
-    ID_L2RNEXT              "Copy difference to right and advance to next\nCopy Right and Advance (Ctrl+Alt+Right)"
-    ID_R2LNEXT              "Copy difference to left and advance to next\nCopy Left and Advance (Ctrl+Alt+Left)"
-    ID_ALL_RIGHT            "¸´ÖÆËùÓв»Í¬µ½ÓÒ±ßÎļþ\nËùÓе½ÓÒ±ß"
-    ID_ALL_LEFT             "¸´ÖÆËùÓв»Í¬µ½×ó±ßÎļþ\nËùÓе½×ó±ß"
-    ID_MERGE_DELETE         "Delete selected items from both directories"
+    ID_L2R                  "¸´ÖÆÑ¡ÔñµÄÎÄ×Öµ½ÓÒ²àÎļþ\n¸´ÖÆÓÒ²à (Alt + Right)"
+    ID_R2L                  "¸´ÖÆÑ¡ÔñµÄÎÄ×Öµ½×ó²àÎļþ\n¸´ÖÆ×ó²à (Alt + Left)"
+    ID_L2RNEXT              "½«µ±Ç°²»Í¬´¦¸´ÖƵ½ÓҲಢǰ½øµ½ÏÂÒ»´¦²»Í¬\n¸´ÖƵ½ÓҲಢǰ½ø (Ctrl+Alt+Right)"
+    ID_R2LNEXT              "½«µ±Ç°²»Í¬´¦¸´ÖƵ½×ó²à²¢Ç°½øµ½ÏÂÒ»´¦²»Í¬\n¸´ÖƵ½×ó²à²¢Ç°½ø (Ctrl+Alt+Left)"
+    ID_ALL_RIGHT            "¸´ÖÆËùÓв»Í¬µ½ÓÒ²àÎļþ\nËùÓе½ÓÒ²à"
+    ID_ALL_LEFT             "¸´ÖÆËùÓв»Í¬µ½×ó²àÎļþ\nËùÓе½×ó²à"
+    ID_MERGE_DELETE         "ɾ³ýÁ½²àÖÐÑ¡ÖеÄÏîÄ¿"
 END
 
 // TOOLS MENU
 STRINGTABLE
 BEGIN
-    ID_TOOLS_CUSTOMIZECOLUMNS "Select and reorder directory compare columns"
-    ID_TOOLS_GENERATEPATCH  "Generate a patch-file"
-    ID_TOOLS_FILTERS        "Select and modify filters"
+    ID_TOOLS_CUSTOMIZECOLUMNS "Ñ¡Ôñ¼°ÅÅÐòÎļþ¼Ð¶Ô±ÈÏÔʾµÄÁÐ"
+    ID_TOOLS_GENERATEPATCH  "Éú³ÉÒ»¸öpatchÎļþ"
+    ID_TOOLS_FILTERS        "Ñ¡Ôñ¼°Ð޸ĹýÂËÆ÷"
 END
 
 // PLUGINS MENU
 STRINGTABLE
 BEGIN
-    ID_UNPACK_MANUAL        "The user selects the unpacker (no unpacking when comparing dir)"
-    ID_UNPACK_AUTO          "The adapted unpacker is applied to both files (one file only needs the extension)"
-    ID_POPUP_OPEN_WITH_UNPACKER "Select an unpacker to edit this file"
-    ID_NO_PREDIFFER         "No prediffer (normal)"
-    ID_SUGGESTED_PLUGINS    "Suggested plugins"
-    ID_NOT_SUGGESTED_PLUGINS "Others plugins"
-    ID_RELOAD_PLUGINS       "Unload all plugins and reload them (for developpers)"
+    ID_UNPACK_MANUAL        "ÈÃÓû§Ñ¡Ôñ½â°ü³ÌÐò (¶Ô±ÈÎļþ¼Ðʱ²»½øÐнâ°ü)"
+    ID_UNPACK_AUTO          "ÔÚÁ½¸öÎļþÉÏÓ¦ÓÃÊʵ±µÄ½â°ü³ÌÐò (ÎļþÖ»ÐèÒªÓÐÊʵ±µÄÀ©Õ¹Ãû)"
+    ID_POPUP_OPEN_WITH_UNPACKER "Ñ¡ÔñÒ»¸ö½â°ü³ÌÐòÀ´±à¼­Õâ¸öÎļþ"
+    ID_NO_PREDIFFER         "ûÓÐÔ¤±È½Ï³ÌÐò (ÆÕͨ)"
+    ID_SUGGESTED_PLUGINS    "ÍƼöµÄ²å¼þ"
+    ID_NOT_SUGGESTED_PLUGINS "ÆäËü²å¼þ"
+    ID_RELOAD_PLUGINS       "жÔØËùÓвå¼þ²¢ÖØÐÂÔØÈë (¿ª·¢ÕßÓÃ)"
 END
 
 // WINDOW MENU
 STRINGTABLE
 BEGIN
-    ID_WINDOW_CHANGE_PANE   "Activates next file visible\nActive next File"
+    ID_WINDOW_CHANGE_PANE   "Çл»µ½ÏÂÒ»¸ö¿É¼ûµÄÎļþ´°¸ñ\nÇл»µ½Ï¸öÎļþ"
 END
 
 // HELP MENU
 STRINGTABLE
 BEGIN
     ID_HELP_CONTENTS        "ÏÔʾ WinMerge Óû§°ïÖú\n°ïÖú"
-    ID_HELP_GETCONFIG       "Outputs current WinMerge version info and configuration to text file"
+    ID_HELP_GETCONFIG       "½«µ±Ç°µÄ WinMerge °æ±¾ÐÅÏ¢¼°ÅäÖÃÊä³öµ½Îı¾Îļþ"
     ID_HELP_GNULICENSE      "ÏÔʾ GNU ¹«¹²ÊÚȨ"
     IDS_PRIVATEBUILD_FMT    "Private Build: %1"
 END
@@ -2449,28 +2445,28 @@ END
 // PLUGINS DIALOGS AND DYNAMIC MENUS
 STRINGTABLE
 BEGIN
-    ID_TITLE_PLUGINS_SETTINGS "Plugin Settings"
-    ID_PREDIFF_MANUAL       "No prediffer"
-    ID_PREDIFF_AUTO         "Prediff if possible"
-    ID_NO_EDIT_SCRIPTS      "< Empty >"
-    ID_NO_SCT_SCRIPTS       "WSH not found - .sct scripts disabled"
-    IDS_USERCHOICE_NONE     "<None>"
-    IDS_USERCHOICE_AUTOMATIC "<Automatic>"
+    ID_TITLE_PLUGINS_SETTINGS "²å¼þÉèÖÃ"
+    ID_PREDIFF_MANUAL       "ûÓÐÔ¤±È½Ï³ÌÐò"
+    ID_PREDIFF_AUTO         "Èç¹û¿ÉÄÜ£¬½øÐÐÔ¤±È½Ï"
+    ID_NO_EDIT_SCRIPTS      "< ¿Õ >"
+    ID_NO_SCT_SCRIPTS       "WSH Î´´òµ½ - .sct ½Å±¾ÒѽûÓÃ"
+    IDS_USERCHOICE_NONE     "<ÎÞ>"
+    IDS_USERCHOICE_AUTOMATIC "<×Ô¶¯>"
 END
 
 // LOCATIONBAR CONTEXT MENU
 STRINGTABLE
 BEGIN
-    ID_DISPLAY_MOVED_NONE   "Do not display moved blocks"
-    ID_DISPLAY_MOVED_ALL    "Display all moved blacks"
-    ID_DISPLAY_MOVED_FOLLOW_DIFF "Display moved blocks only from current diff"
-    ID_LOCBAR_GOTODIFF      "Go to diff under cursor"
-    ID_LOCBAR_GOTODIFF_FMT  "G&oto Diff %1 of %2"
-    ID_LOCBAR_GOTOLINE_FMT  "G&oto Line %1"
+    ID_DISPLAY_MOVED_NONE   "²»ÏÔʾÒƶ¯Çø¿é"
+    ID_DISPLAY_MOVED_ALL    "ÏÔʾËùÓÐÒƶ¯Çø¿é"
+    ID_DISPLAY_MOVED_FOLLOW_DIFF "Ö»ÏÔʾµ±Ç°´¦µÄÒƶ¯Çø¿é"
+    ID_LOCBAR_GOTODIFF      "תµ½¹â±ê´¦²»Í¬"
+    ID_LOCBAR_GOTODIFF_FMT  "תµ½µÚ %1 ´¦²»Í¬(¹² %2 ´¦)(&O)"
+    ID_LOCBAR_GOTOLINE_FMT  "תµ½µÚ %1 ÐÐ(&O)"
 END
 
 // END STRINGS SYNCHRO
-#endif    // Chinese (Traditional) resources
+#endif    // Chinese (Simplified) resources
 /////////////////////////////////////////////////////////////////////////////
 
 
index b2356d5..c14c7ce 100644 (file)
@@ -6,6 +6,8 @@
  PATCH: [ 1229024 ] Rename CPropFilter to CPropLineFilter
   Rename class
    Src: PropLineFilter.cpp PropLineFilter.h
+ PATCH: [ 1234629 ] New Chinese(Simplified) translation .rc file
+  Src/Languages: MergeChineseSimplified.rc
 
 2005-07-08 Tim
  PATCH: [ 1232760 ] Icon for 'Merge->Delete'