OSDN Git Service

Update Brazilian, Chinese Simplified, Chinese Traditional with new strings. Reorder...
authorPerry Rapp <elsapo@users.sourceforge.net>
Wed, 27 Aug 2003 12:04:05 +0000 (12:04 +0000)
committerPerry Rapp <elsapo@users.sourceforge.net>
Wed, 27 Aug 2003 12:04:05 +0000 (12:04 +0000)
Src/Languages/Brazilian/MergeBrazilian.rc
Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
Src/readme.txt

index 2878429..9bb4ab1 100644 (file)
@@ -1054,12 +1054,38 @@ BEGIN
     IDS_STATUS_COPYR2L      "Copiando da direita para esquerda"
     IDS_STATUS_COPYALL2L    "Copiando tudo para esquerda"
     IDS_STATUS_COPYALL2R    "Copiando tudo para direita"
+    IDS_PROGRAMFILES        "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
+    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"
 END
 
 STRINGTABLE DISCARDABLE 
 BEGIN
     IDS_NUM_REPLACED        "Substituindo %1 texto(s)."
     IDS_EDIT_TEXT_NOT_FOUND "Não foi possível localizar""%s"""
+    IDS_LINE_STATUS_INFO    "Line: %s Characters: %d EOL: %s"
+    IDS_EMPTY_LINE_STATUS_INFO "Line: %s"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    IDC_STATIC_TITLE_LEFT   "Right click on the path to copy"
+    IDC_STATIC_TITLE_RIGHT  "Right click on the path to copy"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    IDS_LEFTONLY            "Left Only"
+    IDS_RIGHTONLY           "Right Only"
+    IDS_COLHDR_RESULT_ABBR  "Short Result"
+    IDS_COLHDR_LATTRIBUTES  "Left Attributes"
+    IDS_COLHDR_RATTRIBUTES  "Right Attributes"
+    IDS_FILE_SKIPPED        "File skipped"
+    IDS_DIR_SKIPPED         "Directory skipped"
 END
 
 #endif    // Portuguese (Brazil) resources
index 7d30e6e..3e3a615 100644 (file)
@@ -656,13 +656,11 @@ STRINGTABLE FIXED IMPURE
 BEGIN
     IDR_MAINFRAME           "WinMerge"
     IDR_MERGETYPE           "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
-    IDD_OPEN                "WinMerge Õâ¸öÎļþ¼Ð"
+    IDS_WINMERGE_THIS_DIRECTORY "WinMerge Õâ¸öÎļþ¼Ð"
 END
 
 STRINGTABLE FIXED IMPURE
 BEGIN
-    CBRS_BORDER_3D          " "
-    129                     " "
     IDS_VERSION_FMT         "°æ±¾ %1"
     IDS_ALLFILES            "ËùÓÐÎļþ (*.*)|*.*||"
     IDS_CONFIRM_ALL_LEFT    "ÄúÈ·¶¨Òª¸´ÖÆËùÓв»Í¬µ½×ó±ßÎļþÂð£¿"
@@ -681,87 +679,124 @@ END
 
 STRINGTABLE FIXED IMPURE
 BEGIN
-    IDS_SAVE_AS_TITLE       "Áí´æΪ"
-    IDS_SELECT_FILES_OR_FOLDERS "ÄúµÄÑ¡Ôñ±ØÐëÊÇÁ½Õ߶¼ÊÇÎļþ»òÁ½Õ߶¼ÊÇÎļþ¼Ð"
-    IDS_BACKUP_FAILED_PROMPT "ÎÞ·¨±¸·ÝԭʼµÄÎļþ¡£\nÎÞÂÛÈçºÎÒª¼ÌÐøÂð£¿"
-    IDS_OPTIONS_TITLE       "Ñ¡Ïî"
-    IDS_OPEN_TITLE          "´ò¿ª"
-    IDS_CONFIRM_DELETE      "ɾ³ýÎļþ %1£¿"
-    IDS_EDIT_WINDOW_TITLE_FMT "±à¼­ %1"
-    IDS_FILESSAME           "Ñ¡ÔñµÄÎļþÍêÈ«Ïàͬ¡£"
-    IDS_FILEUNIQUE          "Ñ¡ÔñµÄÎļþ²»´æÔÚÓÚÁ½±ßµÄÎļþ¼Ð£¬Òò´ËÎÞ·¨±È¶Ô¡£"
-    IDS_FILEERROR           "Ò»¸ö´íÎó·¢ÉúÓڱȶÔÎļþʱ¡£"
-    IDS_SAVEREADONLY_FMT    "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
-    IDS_SAVE_FMT            "±£´æ¸ü¸Äµ½ %1£¿"
-    IDS_FILEBINARY          "¶þ½øÖÆÎļþÎÞ·¨×÷ÊÓ¾õµÄ±È¶Ô¡£"
-    IDS_SAVEVSS_FMT         "%1 ±ê¼ÇΪֻ¶Á¡£ ÄúÒª´Ó°æ±¾ÏµÍ³¼ì²éËü£¬»¹ÊÇÒÔÒ»¸ö²»Í¬µÄÃû³Æ±£´æËü£¿"
-    IDS_VSSERROR            "³¢ÊÔ¼ì²éÎļþʱ°æ±¾ÏµÍ³·µ»ØÒ»¸ö´íÎó¡£ ÎÞ·¨¼ÌÐø..."
-    IDS_NOPROJECT           "Äú±ØÐëÖ¸¶¨Ò»¸ö SourceSafe ÏîĿ·¾¶ÒÔ±ã¼ÌÐø (ÀýÈ磺  $/MyProject)"
+    AFX_IDS_APP_TITLE       "WinMerge"
+    AFX_IDS_IDLEMESSAGE     "¾ÍÐ÷"
 END
 
 STRINGTABLE FIXED IMPURE
 BEGIN
-    IDS_COLHDR_FILENAME     "ÎļþÃû³Æ"
-    IDS_COLHDR_DIR          "Îļþ¼Ð"
-    IDS_COLHDR_RESULT       "±È¶Ô½á¹û"
-    IDS_FILE_COMPARISON_TITLE "Îļþ±È¶Ô"
-    IDS_DIFF_NUMBER_STATUS_FMT "²»Í¬ %1 ÔÚ %2"
-    IDS_NO_DIFF_SEL         "%1 ²»Í¬ÕÒµ½"
-    IDS_FILEISDIR           "Îļþ¼ÐÎļþÎÞ·¨×öÊÓ¾õµÄ±È¶Ô¡£"
-    IDS_CC_CMD              "cleartool.exe Â·¾¶(&P):"
-    IDS_VSS_CMD             "SS.EXE Â·¾¶(&P):"
-    IDS_VSS_RUN_ERROR       "Ö´Ðа汾ϵͳÃüÁî´íÎó¡£"
-    IDS_DIFF_OPEN_NO_SET_PROPS "ÔÚÄ¿Ç°Îļþ±È¶ÔÆÚ¼äÒÑÓÐÐ޸ġ£ ÔÚÖØÐÂÆô¶¯Ä¿Ç°Îļþ±È¶ÔÇ°£¬Ò»Ð©ÉèÖò»»áÉúЧ¡£"
-    IDS_COLHDR_LTIMEM       "×ó±ßÈÕÆÚ"
-    IDS_COLHDR_RTIMEM       "ÓÒ±ßÈÕÆÚ"
-    IDS_COLHDR_EXTENSION    "À©Õ¹Ãû"
-    IDS_CONFIRM_DELETE_ITEMS "ÄúÈ·¶¨ÒªÉ¾³ý %1 ÔÚ %2 Ñ¡ÔñµÄÏîÄ¿Âð£¿"
-    IDS_DEL_LEFT_FMT        "ɾ³ý×ó±ß %1 ÔÚ %2 Ñ¡ÔñµÄÏîÄ¿"
+    ID_INDICATOR_EXT        "EXT"
+    ID_INDICATOR_CAPS       "CAP"
+    ID_INDICATOR_NUM        "NUM"
+    ID_INDICATOR_SCRL       "SCRL"
+    ID_INDICATOR_OVR        "OVR"
+    ID_INDICATOR_REC        "REC"
 END
 
 STRINGTABLE FIXED IMPURE
 BEGIN
-    IDS_DEL_RIGHT_FMT       "ɾ³ýÓұߠ%1 ÔÚ %2 Ñ¡ÔñµÄÏîÄ¿"
-    IDS_DELETE_FAILED       "ɾ³ýÎļþ %1 Ê§°Ü£º %2"
-    IDS_CONFIRM_DELETE_DIR  "ɾ³ýÎļþ¼Ð %1£¿"
-    IDS_REMOVE_DIR_FAILED   "ÒƳýÎļþ¼Ðʧ°Ü£º %1"
-    IDS_COPY_TO_LEFT        "¸´ÖƵ½×ó±ß %1 ÔÚ %2 Ñ¡ÔñµÄÏîÄ¿"
-    IDS_COPY_TO_LEFT_MAIN   "ɾ³ýÁ½±ß %1 ÔÚ %2 Ñ¡ÔñµÄÏîÄ¿"
-    IDS_COPY_TO_RIGHT       "¸´ÖƵ½Óұߠ%1 ÔÚ %2 Ñ¡ÔñµÄÏîÄ¿"
-    IDS_DELETE_DIR_FAILED   "ɾ³ýÎļþ¼Ð %1 Ê§°Ü£º %s"
-    IDS_COPY_FILE_FAILED    "ÕýÔÚ¸´ÖÆÎļþ %1 Ê§°Ü£º %2"
-    IDS_COPY_DIR_FAILED     "ÕýÔÚ¸´ÖÆÎļþ¼Ð %1 Ê§°Ü£º %2"
-    IDS_ERROR_FILE_WRITEABLE "´íÎó¼ì²éÄ¿±êдÈëÐÔ"
-    IDS_ERROR_BACKUP        "´íÎ󱸷ÝÎļþ"
-    IDS_CONFIRM_COPY_SINGLE "ÄúÈ·¶¨Òª¸´ÖÆ %1 µ½ %2 Âð£¿"
-    IDS_CONFIRM_DELETE_SINGLE "ÄúÈ·¶¨ÒªÉ¾³ý %1 Âð£¿"
-    IDS_BIN_FILES_SAME      "¶þ½øÖÆÎļþÍêÈ«Ïàͬ"
+    ID_FILE_NEW             "½¨Á¢Ò»¸öÐÂÎļþ\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_DIRECT    " "
+    ID_FILE_PRINT_PREVIEW   "ÏÔʾÕûÒ³\nÔ¤ÀÀ´òÓ¡"
 END
 
 STRINGTABLE FIXED IMPURE
 BEGIN
-    IDS_FILESAVE_FAILED     "±£´æ %1 Ê§°Ü¡£ÄúÒªÒÔÒ»¸ö²»Í¬µÄúû³Æ±£´æÎļþÂð£¿"
-    IDS_ERROR_FILE_NOT_FOUND "ÎļþÕÒ²»µ½: %1"
-    IDS_ERROR_INCOMPARABLE  "Ñ¡ÔñÒª±È¶ÔµÄÁ½¸öÏÖ´æÎļþ¼Ð»òÎļþ"
-    IDS_STATUS_RESCANNING                     "ɨÃèÎļþ..."
-    IDS_STATUS_OPENING_SELECTION              "´ò¿ªÑ¡Ôñ"
-    IDS_STATUS_COPYL2R      "ÕýÔÚ¸´ÖÆ×ó±ßµ½ÓÒ±ß"
-    IDS_STATUS_COPYR2L      "ÕýÔÚ¸´ÖÆÓұߵ½×ó±ß"
-    IDS_STATUS_COPYALL2L    "ÕýÔÚÈ«²¿¸´ÖƵ½×ó±ß"
-    IDS_STATUS_COPYALL2R    "ÕýÔÚÈ«²¿¸´ÖƵ½ÓÒ±ß"
+    ID_APP_ABOUT            "ÏÔʾ³ÌÐòÐÅÏ¢£¬°æ±¾ºÅÂëºÍ°æȨ\n¹ØÓÚ"
+    ID_APP_EXIT             "À뿪ӦÓóÌÐò£»ÌáʾҪ±£´æÎļþ\nÍ˳ö"
 END
 
 STRINGTABLE FIXED IMPURE
 BEGIN
-    IDS_NUM_REPLACED        "ÒÑÌæ»» %1 ¸ö×Ö·û´®¡£"
-    IDS_EDIT_TEXT_NOT_FOUND "ÎÞ·¨Ñ°ÕÒ×Ö·û´®¡¸%s¡¹"
+    ID_FILE_MRU_FIRST       "´ò¿ªÕâ¸öÎļþ"
+    ID_FILE_MRU_FILE2       "´ò¿ªÕâ¸öÎļþ"
+    ID_FILE_MRU_FILE3       "´ò¿ªÕâ¸öÎļþ"
+    ID_FILE_MRU_FILE4       "´ò¿ªÕâ¸öÎļþ"
+    ID_FILE_MRU_FILE5       "´ò¿ªÕâ¸öÎļþ"
+    ID_FILE_MRU_FILE6       "´ò¿ªÕâ¸öÎļþ"
+    ID_FILE_MRU_FILE7       "´ò¿ªÕâ¸öÎļþ"
+    ID_FILE_MRU_FILE8       "´ò¿ªÕâ¸öÎļþ"
+    ID_FILE_MRU_FILE9       "´ò¿ªÕâ¸öÎļþ"
+    ID_FILE_MRU_FILE10      "´ò¿ªÕâ¸öÎļþ"
+    ID_FILE_MRU_FILE11      "´ò¿ªÕâ¸öÎļþ"
+    ID_FILE_MRU_FILE12      "´ò¿ªÕâ¸öÎļþ"
+    ID_FILE_MRU_FILE13      "´ò¿ªÕâ¸öÎļþ"
+    ID_FILE_MRU_FILE14      "´ò¿ªÕâ¸öÎļþ"
+    ID_FILE_MRU_FILE15      "´ò¿ªÕâ¸öÎļþ"
+    ID_FILE_MRU_FILE16      "´ò¿ªÕâ¸öÎļþ"
+END
+
+STRINGTABLE FIXED IMPURE
+BEGIN
+    ID_NEXT_PANE            "Çл»µ½ÏÂÒ»¸ö´°¿Ú\nÏÂÒ»´°¿Ú"
+    ID_PREV_PANE            "Çл»»ØÉÏÒ»¸ö´°¿Ú\nÉÏÒ»´°¿Ú"
+END
+
+STRINGTABLE FIXED IMPURE
+BEGIN
+    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·Ö¸î"
+END
+
+STRINGTABLE FIXED IMPURE
+BEGIN
+    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_PASTE_LINK      " "
+    ID_EDIT_PASTE_SPECIAL   " "
+    ID_EDIT_REPEAT          "Öظ´ÉϴεĶ¯×÷\nÖظ´"
+    ID_EDIT_REPLACE         "ÒÔ²»Í¬µÄÎÄ×ÖÌæ»»Ìض¨µÄÎÄ×Ö\nÌæ»»"
+    ID_EDIT_SELECT_ALL      "Ñ¡ÔñÕû·ÝÎļþ\nÈ«Ñ¡"
+    ID_EDIT_UNDO            "³·ÏúÉϴεĶ¯×÷\n³·Ïú"
+    ID_EDIT_REDO            "Öظ´Ö®Ç°Î´Íê³ÉµÄ¶¯×÷\nÖظ´"
+END
+
+STRINGTABLE FIXED IMPURE
+BEGIN
+    ID_VIEW_TOOLBAR         "ÏÔʾ»òÒþ²Ø¹¤¾ßÀ¸\nÇл»¹¤¾ßÀ¸"
+    ID_VIEW_STATUS_BAR      "ÏÔʾ»òÒþ²Ø״̬À¸\nÇл»×´Ì¬À¸"
+END
+
+STRINGTABLE FIXED IMPURE
+BEGIN
+    AFX_IDS_SCSIZE          "¸ü¸Ä´°¿Ú´óС"
+    AFX_IDS_SCMOVE          "¸ü¸Ä´°¿ÚλÖÃ"
+    AFX_IDS_SCMINIMIZE      "ËõС´°¿ÚΪһ¸öͼ±ê"
+    AFX_IDS_SCMAXIMIZE      "À©´ó´°¿ÚΪÍêÕûÆÁÄ»´óС"
+    AFX_IDS_SCNEXTWINDOW    "Çл»µ½ÏÂÒ»¸öÎļþ´°¿Ú"
+    AFX_IDS_SCPREVWINDOW    "Çл»µ½ÉÏÒ»¸öÎļþ´°¿Ú"
+    AFX_IDS_SCCLOSE         "¹Ø±Õ×÷ÓÃÖд°¿Ú²¢Ìáʾµ½±£´æÕâÎļþ"
+END
+
+STRINGTABLE FIXED IMPURE
+BEGIN
+    AFX_IDS_SCRESTORE       "½«´°¿Ú»¹Ô­³É±ê×¼µÄ´óС"
+    AFX_IDS_SCTASKLIST      "ÆôÓù¤×÷Çåµ¥"
+    AFX_IDS_MDICHILD        "ÆôÓÃÕâ¸ö´°¿Ú"
+END
+
+STRINGTABLE FIXED IMPURE
+BEGIN
+    AFX_IDS_PREVIEW_CLOSE   "¹Ø±ÕÔ¤ÀÀ´òӡģʽ\nÈ¡ÏûÔ¤ÀÀ"
 END
 
 STRINGTABLE FIXED IMPURE
 BEGIN
-    CBRS_ALIGN_BOTTOM       " "
-    32769                   " "
-    32770                   " "
     ID_L2R                  "¸´ÖÆÑ¡ÔñµÄÎÄ×Öµ½ÓÒ±ßÎļþ\n¸´ÖÆÓұߠ(Alt + Right)"
     ID_R2L                  "¸´ÖÆÑ¡ÔñµÄÎÄ×Öµ½×ó±ßÎļþ\n¸´ÖÆ×ó±ß (Alt + Left)"
     ID_UNDO                 " "
@@ -774,15 +809,11 @@ BEGIN
     ID_POPUP_SAVE           " "
     ID_NEXTDIFF             "¾í¶¯µ½ÏÂÒ»¸ö²»Í¬\nÏÂÒ»¸ö²»Í¬ (Alt + Down)"
     ID_OPTIONS_BACKUPORIGINALFILE "±£´æµÄÕâԭʼµÄÒ»¸ö¸±±¾Îª *.bak\n±¸·Ý"
-    32783                   " "
 END
 
 STRINGTABLE FIXED IMPURE
 BEGIN
     ID_OPTIONS_SCROLLTOFIRSTDIFFERENCE "×Ô¶¯µØ¾í¶¯µ½ÕâµÚÒ»¸ö²»Í¬\n¾í¶¯µ½µÚÒ»¸ö"
-    32785                   " "
-    32786                   " "
-    ID_POPUP_EDITFILE       " "
     ID_OPTIONS_IGNOREWHITESPACE "±È¶ÔÎļþʱ²»¹Ü¿Õ°×ºÍÖƱí·û"
     ID_HIDE_BACKUP_FILES    "Òþ²ØÀ©Õ¹ÃûΪ BAK µÄÎļþ"
     ID_HELP_GNULICENSE      "ÏÔʾ GNU ¹«¹²ÊÚȨ"
@@ -792,8 +823,6 @@ BEGIN
     ID_ALL_RIGHT            "¸´ÖÆËùÓв»Í¬µ½ÓÒ±ßÎļþ\nËùÓе½ÓÒ±ß"
     ID_VIEW_SELECTFONT      "Ñ¡Ôñ²»Í¬ÊÓͼµÄ×ÖÐÍ\nÑ¡Ôñ²»Í¬ÊÓͼ×ÖÐÍ"
     ID_VIEW_USEDEFAULTFONT  "ʹÓÃÔ¤ÉèµÄϵͳ×ÖÐÍÓÚ²»Í¬ÊÓͼ\nÔ¤Éè×ÖÐÍ"
-    ID_POPUP_COPYALLDIFFSTOOTHERSIDE " "
-    ID_POPUP_COPYALLDIFFSFROMOTHERSIDE " "
     ID_DIR_COPY_FILE_TO_LEFT "¸´ÖÆÑ¡ÔñµÄÎļþµ½ÒÑÃüÃûµÄÎļþ¼Ð"
 END
 
@@ -819,188 +848,127 @@ END
 
 STRINGTABLE FIXED IMPURE
 BEGIN
-    ID_DIR_OPEN_RIGHT_WITH  "´ò¿ªÓÒ±ßÎļþÒÔ..."
-    ID_OPTIONS_SHOWBINARIES "ÏÔʾ¶þ½øÖÆÎļþ"
-    ID_VIEW_WHITESPACE      "ÏÔʾ¿Õ°×ºÍÖƱí·û×Ö·û"
-    ID_REFRESH              "¸üÐÂÏÔʾ\n¸üР(F5)"
-END
-
-STRINGTABLE FIXED IMPURE
-BEGIN
-    AFX_IDS_APP_TITLE       "WinMerge"
-    AFX_IDS_IDLEMESSAGE     "¾ÍÐ÷"
-    AFX_IDS_HELPMODEMESSAGE " "
-    AFX_IDS_APP_TITLE_EMBEDDING " "
-    AFX_IDS_COMPANY_NAME    " "
-    AFX_IDS_OBJ_TITLE_INPLACE " "
-    57350                   " "
-    57351                   " "
-    57352                   " "
-    57353                   " "
-    57354                   " "
-    57355                   " "
-    57356                   " "
-    57357                   " "
-    57358                   " "
-    57359                   " "
-END
-
-STRINGTABLE FIXED IMPURE
-BEGIN
-    ID_FILE_NEW             "½¨Á¢Ò»¸öÐÂÎļþ\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_DIRECT    " "
-    ID_FILE_PRINT_PREVIEW   "ÏÔʾÕûÒ³\nÔ¤ÀÀ´òÓ¡"
-    ID_FILE_UPDATE          " "
-    ID_FILE_SAVE_COPY_AS    " "
-    ID_FILE_SEND_MAIL       " "
-    57613                   " "
-    57614                   " "
-    57615                   " "
+    IDS_SAVE_AS_TITLE       "Áí´æΪ"
+    IDS_SELECT_FILES_OR_FOLDERS "ÄúµÄÑ¡Ôñ±ØÐëÊÇÁ½Õ߶¼ÊÇÎļþ»òÁ½Õ߶¼ÊÇÎļþ¼Ð"
+    IDS_BACKUP_FAILED_PROMPT "ÎÞ·¨±¸·ÝԭʼµÄÎļþ¡£\nÎÞÂÛÈçºÎÒª¼ÌÐøÂð£¿"
+    IDS_OPTIONS_TITLE       "Ñ¡Ïî"
+    IDS_OPEN_TITLE          "´ò¿ª"
+    IDS_CONFIRM_DELETE      "ɾ³ýÎļþ %1£¿"
+    IDS_EDIT_WINDOW_TITLE_FMT "±à¼­ %1"
+    IDS_FILESSAME           "Ñ¡ÔñµÄÎļþÍêÈ«Ïàͬ¡£"
+    IDS_FILEUNIQUE          "Ñ¡ÔñµÄÎļþ²»´æÔÚÓÚÁ½±ßµÄÎļþ¼Ð£¬Òò´ËÎÞ·¨±È¶Ô¡£"
+    IDS_FILEERROR           "Ò»¸ö´íÎó·¢ÉúÓڱȶÔÎļþʱ¡£"
+    IDS_SAVEREADONLY_FMT    "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
+    IDS_SAVE_FMT            "±£´æ¸ü¸Äµ½ %1£¿"
+    IDS_FILEBINARY          "¶þ½øÖÆÎļþÎÞ·¨×÷ÊÓ¾õµÄ±È¶Ô¡£"
+    IDS_SAVEVSS_FMT         "%1 ±ê¼ÇΪֻ¶Á¡£ ÄúÒª´Ó°æ±¾ÏµÍ³¼ì²éËü£¬»¹ÊÇÒÔÒ»¸ö²»Í¬µÄÃû³Æ±£´æËü£¿"
+    IDS_VSSERROR            "³¢ÊÔ¼ì²éÎļþʱ°æ±¾ÏµÍ³·µ»ØÒ»¸ö´íÎó¡£ ÎÞ·¨¼ÌÐø..."
+    IDS_NOPROJECT           "Äú±ØÐëÖ¸¶¨Ò»¸ö SourceSafe ÏîĿ·¾¶ÒÔ±ã¼ÌÐø (ÀýÈ磺  $/MyProject)"
 END
 
 STRINGTABLE FIXED IMPURE
 BEGIN
-    ID_FILE_MRU_FIRST       "´ò¿ªÕâ¸öÎļþ"
-    ID_FILE_MRU_FILE2       "´ò¿ªÕâ¸öÎļþ"
-    ID_FILE_MRU_FILE3       "´ò¿ªÕâ¸öÎļþ"
-    ID_FILE_MRU_FILE4       "´ò¿ªÕâ¸öÎļþ"
-    ID_FILE_MRU_FILE5       "´ò¿ªÕâ¸öÎļþ"
-    ID_FILE_MRU_FILE6       "´ò¿ªÕâ¸öÎļþ"
-    ID_FILE_MRU_FILE7       "´ò¿ªÕâ¸öÎļþ"
-    ID_FILE_MRU_FILE8       "´ò¿ªÕâ¸öÎļþ"
-    ID_FILE_MRU_FILE9       "´ò¿ªÕâ¸öÎļþ"
-    ID_FILE_MRU_FILE10      "´ò¿ªÕâ¸öÎļþ"
-    ID_FILE_MRU_FILE11      "´ò¿ªÕâ¸öÎļþ"
-    ID_FILE_MRU_FILE12      "´ò¿ªÕâ¸öÎļþ"
-    ID_FILE_MRU_FILE13      "´ò¿ªÕâ¸öÎļþ"
-    ID_FILE_MRU_FILE14      "´ò¿ªÕâ¸öÎļþ"
-    ID_FILE_MRU_FILE15      "´ò¿ªÕâ¸öÎļþ"
-    ID_FILE_MRU_FILE16      "´ò¿ªÕâ¸öÎļþ"
+    IDS_NORWEGIAN_BOKMAL    "Norsk (Bokmal)"
 END
 
 STRINGTABLE FIXED IMPURE
 BEGIN
-    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_PASTE_LINK      " "
-    ID_EDIT_PASTE_SPECIAL   " "
-    ID_EDIT_REPEAT          "Öظ´ÉϴεĶ¯×÷\nÖظ´"
-    ID_EDIT_REPLACE         "ÒÔ²»Í¬µÄÎÄ×ÖÌæ»»Ìض¨µÄÎÄ×Ö\nÌæ»»"
-    ID_EDIT_SELECT_ALL      "Ñ¡ÔñÕû·ÝÎļþ\nÈ«Ñ¡"
-    ID_EDIT_UNDO            "³·ÏúÉϴεĶ¯×÷\n³·Ïú"
-    ID_EDIT_REDO            "Öظ´Ö®Ç°Î´Íê³ÉµÄ¶¯×÷\nÖظ´"
-    57645                   " "
-    57646                   " "
-    57647                   " "
+    IDS_SPANISH_MODERN      "Español (Moderno)"
 END
 
 STRINGTABLE FIXED IMPURE
 BEGIN
-    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·Ö¸î"
-    57654                   " "
-    57655                   " "
-    57656                   " "
-    57657                   " "
-    57658                   " "
-    57659                   " "
-    57660                   " "
-    57661                   " "
-    57662                   " "
-END
-
-STRINGTABLE FIXED IMPURE
-BEGIN
-    ID_APP_ABOUT            "ÏÔʾ³ÌÐòÐÅÏ¢£¬°æ±¾ºÅÂëºÍ°æȨ\n¹ØÓÚ"
-    ID_APP_EXIT             "À뿪ӦÓóÌÐò£»ÌáʾҪ±£´æÎļþ\nÍ˳ö"
-    ID_HELP_INDEX           " "
-    ID_HELP_FINDER          " "
-    ID_HELP_USING           " "
-    ID_CONTEXT_HELP         " "
-    ID_HELP                 " "
-    ID_DEFAULT_HELP         " "
-    57672                   " "
-    57673                   " "
-    57674                   " "
-    57675                   " "
-    57676                   " "
-    57677                   " "
-    57678                   " "
-    57679                   " "
+    IDS_COLHDR_FILENAME     "ÎļþÃû³Æ"
+    IDS_COLHDR_DIR          "Îļþ¼Ð"
+    IDS_COLHDR_RESULT       "±È¶Ô½á¹û"
+    IDS_FILE_COMPARISON_TITLE "Îļþ±È¶Ô"
+    IDS_DIFF_NUMBER_STATUS_FMT "²»Í¬ %1 ÔÚ %2"
+    IDS_NO_DIFF_SEL         "%1 ²»Í¬ÕÒµ½"
+    IDS_FILEISDIR           "Îļþ¼ÐÎļþÎÞ·¨×öÊÓ¾õµÄ±È¶Ô¡£"
+    IDS_CC_CMD              "cleartool.exe Â·¾¶(&P):"
+    IDS_VSS_CMD             "SS.EXE Â·¾¶(&P):"
+    IDS_VSS_RUN_ERROR       "Ö´Ðа汾ϵͳÃüÁî´íÎó¡£"
+    IDS_DIFF_OPEN_NO_SET_PROPS "ÔÚÄ¿Ç°Îļþ±È¶ÔÆÚ¼äÒÑÓÐÐ޸ġ£ ÔÚÖØÐÂÆô¶¯Ä¿Ç°Îļþ±È¶ÔÇ°£¬Ò»Ð©ÉèÖò»»áÉúЧ¡£"
+    IDS_COLHDR_LTIMEM       "×ó±ßÈÕÆÚ"
+    IDS_COLHDR_RTIMEM       "ÓÒ±ßÈÕÆÚ"
+    IDS_COLHDR_EXTENSION    "À©Õ¹Ãû"
+    IDS_CONFIRM_DELETE_ITEMS "ÄúÈ·¶¨ÒªÉ¾³ý %1 ÔÚ %2 Ñ¡ÔñµÄÏîÄ¿Âð£¿"
+    IDS_DEL_LEFT_FMT        "ɾ³ý×ó±ß %1 ÔÚ %2 Ñ¡ÔñµÄÏîÄ¿"
 END
 
 STRINGTABLE FIXED IMPURE
 BEGIN
-    ID_NEXT_PANE            "Çл»µ½ÏÂÒ»¸ö´°¿Ú\nÏÂÒ»´°¿Ú"
-    ID_PREV_PANE            "Çл»»ØÉÏÒ»¸ö´°¿Ú\nÉÏÒ»´°¿Ú"
+    IDS_DEL_RIGHT_FMT       "ɾ³ýÓұߠ%1 ÔÚ %2 Ñ¡ÔñµÄÏîÄ¿"
+    IDS_DELETE_FAILED       "ɾ³ýÎļþ %1 Ê§°Ü£º %2"
+    IDS_CONFIRM_DELETE_DIR  "ɾ³ýÎļþ¼Ð %1£¿"
+    IDS_REMOVE_DIR_FAILED   "ÒƳýÎļþ¼Ðʧ°Ü£º %1"
+    IDS_COPY_TO_LEFT        "¸´ÖƵ½×ó±ß %1 ÔÚ %2 Ñ¡ÔñµÄÏîÄ¿"
+    IDS_COPY_TO_LEFT_MAIN   "ɾ³ýÁ½±ß %1 ÔÚ %2 Ñ¡ÔñµÄÏîÄ¿"
+    IDS_COPY_TO_RIGHT       "¸´ÖƵ½Óұߠ%1 ÔÚ %2 Ñ¡ÔñµÄÏîÄ¿"
+    IDS_DELETE_DIR_FAILED   "ɾ³ýÎļþ¼Ð %1 Ê§°Ü£º %s"
+    IDS_COPY_FILE_FAILED    "ÕýÔÚ¸´ÖÆÎļþ %1 Ê§°Ü£º %2"
+    IDS_COPY_DIR_FAILED     "ÕýÔÚ¸´ÖÆÎļþ¼Ð %1 Ê§°Ü£º %2"
+    IDS_ERROR_FILE_WRITEABLE "´íÎó¼ì²éÄ¿±êдÈëÐÔ"
+    IDS_ERROR_BACKUP        "´íÎ󱸷ÝÎļþ"
+    IDS_CONFIRM_COPY_SINGLE "ÄúÈ·¶¨Òª¸´ÖÆ %1 µ½ %2 Âð£¿"
+    IDS_CONFIRM_DELETE_SINGLE "ÄúÈ·¶¨ÒªÉ¾³ý %1 Âð£¿"
+    IDS_BIN_FILES_SAME      "¶þ½øÖÆÎļþÍêÈ«Ïàͬ"
 END
 
 STRINGTABLE FIXED IMPURE
 BEGIN
-    ID_INDICATOR_EXT        "EXT"
-    ID_INDICATOR_CAPS       "CAP"
-    ID_INDICATOR_NUM        "NUM"
-    ID_INDICATOR_SCRL       "SCRL"
-    ID_INDICATOR_OVR        "OVR"
-    ID_INDICATOR_REC        "REC"
+    ID_DIR_OPEN_RIGHT_WITH  "´ò¿ªÓÒ±ßÎļþÒÔ..."
+    ID_OPTIONS_SHOWBINARIES "ÏÔʾ¶þ½øÖÆÎļþ"
+    ID_VIEW_WHITESPACE      "ÏÔʾ¿Õ°×ºÍÖƱí·û×Ö·û"
+    ID_REFRESH              "¸üÐÂÏÔʾ\n¸üР(F5)"
+    ID_SHOWLINEDIFF         "Highlight difference in current line"
+    ID_EDITOR_COPY_PATH     "Copy full Path"
+    ID_EDITOR_COPY_FILENAME "Copy Filename"
 END
 
 STRINGTABLE FIXED IMPURE
 BEGIN
-    ID_VIEW_TOOLBAR         "ÏÔʾ»òÒþ²Ø¹¤¾ßÀ¸\nÇл»¹¤¾ßÀ¸"
-    ID_VIEW_STATUS_BAR      "ÏÔʾ»òÒþ²Ø״̬À¸\nÇл»×´Ì¬À¸"
-    59394                   " "
-    59395                   " "
-    59396                   " "
-    59397                   " "
-    59398                   " "
-    59399                   " "
-    59400                   " "
-    59401                   " "
-    59402                   " "
-    59403                   " "
-    59404                   " "
-    59405                   " "
-    59406                   " "
-    59407                   " "
+    IDS_FILESAVE_FAILED     "±£´æ %1 Ê§°Ü¡£ÄúÒªÒÔÒ»¸ö²»Í¬µÄúû³Æ±£´æÎļþÂð£¿"
+    IDS_ERROR_FILE_NOT_FOUND "ÎļþÕÒ²»µ½: %1"
+    IDS_ERROR_INCOMPARABLE  "Ñ¡ÔñÒª±È¶ÔµÄÁ½¸öÏÖ´æÎļþ¼Ð»òÎļþ"
+    IDS_STATUS_RESCANNING                     "ɨÃèÎļþ..."
+    IDS_STATUS_OPENING_SELECTION              "´ò¿ªÑ¡Ôñ"
+    IDS_STATUS_COPYL2R      "ÕýÔÚ¸´ÖÆ×ó±ßµ½ÓÒ±ß"
+    IDS_STATUS_COPYR2L      "ÕýÔÚ¸´ÖÆÓұߵ½×ó±ß"
+    IDS_STATUS_COPYALL2L    "ÕýÔÚÈ«²¿¸´ÖƵ½×ó±ß"
+    IDS_STATUS_COPYALL2R    "ÕýÔÚÈ«²¿¸´ÖƵ½ÓÒ±ß"
+    IDS_PROGRAMFILES        "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
+    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"
 END
 
 STRINGTABLE FIXED IMPURE
 BEGIN
-    AFX_IDS_SCSIZE          "¸ü¸Ä´°¿Ú´óС"
-    AFX_IDS_SCMOVE          "¸ü¸Ä´°¿ÚλÖÃ"
-    AFX_IDS_SCMINIMIZE      "ËõС´°¿ÚΪһ¸öͼ±ê"
-    AFX_IDS_SCMAXIMIZE      "À©´ó´°¿ÚΪÍêÕûÆÁÄ»´óС"
-    AFX_IDS_SCNEXTWINDOW    "Çл»µ½ÏÂÒ»¸öÎļþ´°¿Ú"
-    AFX_IDS_SCPREVWINDOW    "Çл»µ½ÉÏÒ»¸öÎļþ´°¿Ú"
-    AFX_IDS_SCCLOSE         "¹Ø±Õ×÷ÓÃÖд°¿Ú²¢Ìáʾµ½±£´æÕâÎļþ"
+    IDS_NUM_REPLACED        "ÒÑÌæ»» %1 ¸ö×Ö·û´®¡£"
+    IDS_EDIT_TEXT_NOT_FOUND "ÎÞ·¨Ñ°ÕÒ×Ö·û´®¡¸%s¡¹"
+    IDS_LINE_STATUS_INFO    "Line: %s Characters: %d EOL: %s"
+    IDS_EMPTY_LINE_STATUS_INFO "Line: %s"
 END
 
-STRINGTABLE FIXED IMPURE
+STRINGTABLE DISCARDABLE 
 BEGIN
-    AFX_IDS_SCRESTORE       "½«´°¿Ú»¹Ô­³É±ê×¼µÄ´óС"
-    AFX_IDS_SCTASKLIST      "ÆôÓù¤×÷Çåµ¥"
-    AFX_IDS_MDICHILD        "ÆôÓÃÕâ¸ö´°¿Ú"
+    IDC_STATIC_TITLE_LEFT   "Right click on the path to copy"
+    IDC_STATIC_TITLE_RIGHT  "Right click on the path to copy"
 END
 
-STRINGTABLE FIXED IMPURE
+STRINGTABLE DISCARDABLE 
 BEGIN
-    AFX_IDS_PREVIEW_CLOSE   "¹Ø±ÕÔ¤ÀÀ´òӡģʽ\nÈ¡ÏûÔ¤ÀÀ"
+    IDS_LEFTONLY            "Left Only"
+    IDS_RIGHTONLY           "Right Only"
+    IDS_COLHDR_RESULT_ABBR  "Short Result"
+    IDS_COLHDR_LATTRIBUTES  "Left Attributes"
+    IDS_COLHDR_RATTRIBUTES  "Right Attributes"
+    IDS_FILE_SKIPPED        "File skipped"
+    IDS_DIR_SKIPPED         "Directory skipped"
 END
 
 #endif    // Chinese (Traditional) resources
index 5b8e66d..ebe4208 100644 (file)
@@ -772,84 +772,123 @@ END
 
 STRINGTABLE PRELOAD DISCARDABLE 
 BEGIN
-    IDS_SAVE_AS_TITLE       "¥t¦s·sÀÉ"
-    IDS_SELECT_FILES_OR_FOLDERS "§Aªº¿ï¨ú¥²¶·¬O¨âªÌ³£¬OÀɮשΨâªÌ³£¬O¸ê®Æ§¨"
-    IDS_BACKUP_FAILED_PROMPT "µLªk³Æ¥÷­ì©lªºÀɮסC\nµL½×¦p¦ó­nÄ~Äò¶Ü¡H"
-    IDS_OPTIONS_TITLE       "¿ï¶µ"
-    IDS_OPEN_TITLE          "¶}±Ò"
-    IDS_CONFIRM_DELETE      "§R°£ÀÉ®× %1¡H"
-    IDS_EDIT_WINDOW_TITLE_FMT "½s¿è %1"
-    IDS_FILESSAME           "¿ï¨úªºÀɮק¹¥þ¬Û¦P¡C"
-    IDS_FILEUNIQUE          "¿ï¨úªºÀɮפ£¦s¦b©ó¨âÃ䪺¸ê®Æ§¨¡A¦]¦¹µLªk¤ñ¹ï¡C"
-    IDS_FILEERROR           "¤@­Ó¿ù»~µo¥Í©ó¤ñ¹ïÀɮ׮ɡC"
-    IDS_SAVEREADONLY_FMT    "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
-    IDS_SAVE_FMT            "Àx¦s§ó§ï¨ì %1¡H"
-    IDS_FILEBINARY          "¤G¶i¨îÀÉ®×µLªk§@µøıªº¤ñ¹ï¡C"
-    IDS_SAVEVSS_FMT         "%1 ¼Ð°O¬°°ßŪ¡C §A­n±qª©¥»¨t²ÎÀˬd¥¦¡AÁÙ¬O¥H¤@­Ó¤£¦Pªº¦WºÙÀx¦s¥¦¡H"
-    IDS_VSSERROR            "¹Á¸ÕÀˬdÀɮ׮ɪ©¥»¨t²Îªð¦^¤@­Ó¿ù»~¡C µLªkÄ~Äò..."
-    IDS_NOPROJECT           "§A¥²¶·«ü©w¤@­Ó SourceSafe ±M®×¸ô®|¥H«KÄ~Äò (¨Ò¦p¡G  $/MyProject)"
+    AFX_IDS_APP_TITLE       "WinMerge"
+    AFX_IDS_IDLEMESSAGE     "´Nºü"
 END
 
 STRINGTABLE DISCARDABLE 
 BEGIN
-    IDS_COLHDR_FILENAME     "ÀɮצWºÙ"
-    IDS_COLHDR_DIR          "¸ê®Æ§¨"
-    IDS_COLHDR_RESULT       "¤ñ¹ïµ²ªG"
-    IDS_FILE_COMPARISON_TITLE "Àɮפñ¹ï"
-    IDS_DIFF_NUMBER_STATUS_FMT "¤£¦P %1 ¦b %2"
-    IDS_NO_DIFF_SEL         "%1 ¤£¦P§ä¨ì"
-    IDS_FILEISDIR           "¸ê®Æ§¨ÀÉ®×µLªk°µµøıªº¤ñ¹ï¡C"
-    IDS_CC_CMD              "cleartool.exe ¸ô®|(&P):"
-    IDS_VSS_CMD             "SS.EXE ¸ô®|(&P):"
-    IDS_VSS_RUN_ERROR       "¿ù»~°õ¦æª©¥»¨t²Î«ü¥O¡C"
-    IDS_DIFF_OPEN_NO_SET_PROPS "¦b¥Ø«eÀɮפñ¹ï´Á¶¡¤w¦³­×§ï¡C ¦b­«·s±Ò°Ê¥Ø«eÀɮפñ¹ï«e¡A¤@¨Ç³]©w¤£·|¥Í®Ä¡C"
-    IDS_COLHDR_LTIMEM       "¥ªÃä¤é´Á"
-    IDS_COLHDR_RTIMEM       "¥kÃä¤é´Á"
-    IDS_COLHDR_EXTENSION    "°ÆÀɦW"
-    IDS_CONFIRM_DELETE_ITEMS "§A½T©w­n§R°£ %1 ¦b %2 ¿ï¨úªº¶µ¥Ø¶Ü¡H"
-    IDS_DEL_LEFT_FMT        "§R°£¥ªÃä %1 ¦b %2 ¿ï¨úªº¶µ¥Ø"
+    ID_INDICATOR_EXT        "EXT"
+    ID_INDICATOR_CAPS       "CAP"
+    ID_INDICATOR_NUM        "NUM"
+    ID_INDICATOR_SCRL       "SCRL"
+    ID_INDICATOR_OVR        "OVR"
+    ID_INDICATOR_REC        "REC"
+END
+
+STRINGTABLE PRELOAD DISCARDABLE 
+BEGIN
+    ID_FILE_NEW             "«Ø¥ß¤@­Ó·s¤å¥ó\n·s¼W"
+    ID_FILE_OPEN            "¶}±Ò¤@­Ó²{¦s¤å¥ó\n¶}±Ò (Ctrl+O)"
+    ID_FILE_CLOSE           "Ãö³¬§@¥Î¤¤¤å¥ó\nÃö³¬"
+    ID_FILE_SAVE            "Àx¦s§@¥Î¤¤¤å¥ó\nÀx¦s (Ctrl+S)"
+    ID_FILE_SAVE_AS         "¥H¤@­Ó·s¦WºÙÀx¦s§@¥Î¤¤¤å¥ó\n¥t¦s·sÀÉ"
+    ID_FILE_PAGE_SETUP      "Åܧó¦C¦L¿ï¶µ\nª©­±³]©w"
+    ID_FILE_PRINT_SETUP     "Åܧó¦Lªí¾÷©M¦C¦L¿ï¶µ\n¦C¦L³]©w"
+    ID_FILE_PRINT           "¦C¦L§@¥Î¤¤¤å¥ó\n¦C¦L"
+    ID_FILE_PRINT_DIRECT    " "
+    ID_FILE_PRINT_PREVIEW   "Åã¥Ü¾ã­¶\n¹wÄý¦C¦L"
+END
+
+STRINGTABLE PRELOAD DISCARDABLE 
+BEGIN
+    ID_APP_ABOUT            "Åã¥Üµ{¦¡¸ê°T¡Aª©¥»¸¹½X©Mª©Åv\nÃö©ó"
+    ID_APP_EXIT             "Â÷¶}À³¥Îµ{¦¡¡F´£¥Ü­nÀx¦s¤å¥ó\nµ²§ô"
 END
 
 STRINGTABLE DISCARDABLE 
 BEGIN
-    IDS_DEL_RIGHT_FMT       "§R°£¥kÃä %1 ¦b %2 ¿ï¨úªº¶µ¥Ø"
-    IDS_DELETE_FAILED       "§R°£ÀÉ®× %1 ¥¢±Ñ¡G %2"
-    IDS_CONFIRM_DELETE_DIR  "§R°£¸ê®Æ§¨ %1¡H"
-    IDS_REMOVE_DIR_FAILED   "²¾°£¸ê®Æ§¨¥¢±Ñ¡G %1"
-    IDS_COPY_TO_LEFT        "½Æ»s¨ì¥ªÃä %1 ¦b %2 ¿ï¨úªº¶µ¥Ø"
-    IDS_COPY_TO_LEFT_MAIN   "§R°£¨âÃä %1 ¦b %2 ¿ï¨úªº¶µ¥Ø"
-    IDS_COPY_TO_RIGHT       "½Æ»s¨ì¥kÃä %1 ¦b %2 ¿ï¨úªº¶µ¥Ø"
-    IDS_DELETE_DIR_FAILED   "§R°£¸ê®Æ§¨ %1 ¥¢±Ñ¡G %s"
-    IDS_COPY_FILE_FAILED    "¥¿¦b½Æ»sÀÉ®× %1 ¥¢±Ñ¡G %2"
-    IDS_COPY_DIR_FAILED     "¥¿¦b½Æ»s¸ê®Æ§¨ %1 ¥¢±Ñ¡G %2"
-    IDS_ERROR_FILE_WRITEABLE "¿ù»~Àˬd¥Ø¼Ð¼g¤J©Ê"
-    IDS_ERROR_BACKUP        "¿ù»~³Æ¥÷ÀÉ®×"
-    IDS_CONFIRM_COPY_SINGLE "§A½T©w­n½Æ»s %1 ¨ì %2 ¶Ü¡H"
-    IDS_CONFIRM_DELETE_SINGLE "§A½T©w­n§R°£ %1 ¶Ü¡H"
-    IDS_BIN_FILES_SAME      "¤G¶i¨îÀɮק¹¥þ¬Û¦P"
+    ID_FILE_MRU_FIRST       "¶}±Ò³o­Ó¤å¥ó"
+    ID_FILE_MRU_FILE2       "¶}±Ò³o­Ó¤å¥ó"
+    ID_FILE_MRU_FILE3       "¶}±Ò³o­Ó¤å¥ó"
+    ID_FILE_MRU_FILE4       "¶}±Ò³o­Ó¤å¥ó"
+    ID_FILE_MRU_FILE5       "¶}±Ò³o­Ó¤å¥ó"
+    ID_FILE_MRU_FILE6       "¶}±Ò³o­Ó¤å¥ó"
+    ID_FILE_MRU_FILE7       "¶}±Ò³o­Ó¤å¥ó"
+    ID_FILE_MRU_FILE8       "¶}±Ò³o­Ó¤å¥ó"
+    ID_FILE_MRU_FILE9       "¶}±Ò³o­Ó¤å¥ó"
+    ID_FILE_MRU_FILE10      "¶}±Ò³o­Ó¤å¥ó"
+    ID_FILE_MRU_FILE11      "¶}±Ò³o­Ó¤å¥ó"
+    ID_FILE_MRU_FILE12      "¶}±Ò³o­Ó¤å¥ó"
+    ID_FILE_MRU_FILE13      "¶}±Ò³o­Ó¤å¥ó"
+    ID_FILE_MRU_FILE14      "¶}±Ò³o­Ó¤å¥ó"
+    ID_FILE_MRU_FILE15      "¶}±Ò³o­Ó¤å¥ó"
+    ID_FILE_MRU_FILE16      "¶}±Ò³o­Ó¤å¥ó"
 END
 
 STRINGTABLE DISCARDABLE 
 BEGIN
-    IDS_FILESAVE_FAILED     "Àx¦s %1 ¥¢±Ñ¡C§A­n¥H¤@­Ó¤£¦Pªº¦WºÙÀx¦sÀɮ׶ܡH"
-    IDS_ERROR_FILE_NOT_FOUND "Àɮק䤣¨ì: %1"
-    IDS_ERROR_INCOMPARABLE  "¿ï¨ú­n¤ñ¹ïªº¨â­Ó²{¦s¸ê®Æ§¨©ÎÀÉ®×"
-    IDS_STATUS_RESCANNING                     "±½´yÀÉ®×..."
-    IDS_STATUS_OPENING_SELECTION                     "¶}±Ò¿ï¨ú"
-    IDS_STATUS_COPYL2R      "¥¿¦b½Æ»s¥ªÃä¨ì¥kÃä"
-    IDS_STATUS_COPYR2L      "¥¿¦b½Æ»s¥kÃä¨ì¥ªÃä"
-    IDS_STATUS_COPYALL2L    "¥¿¦b¥þ³¡½Æ»s¨ì¥ªÃä"
-    IDS_STATUS_COPYALL2R    "¥¿¦b¥þ³¡½Æ»s¨ì¥kÃä"
+    ID_NEXT_PANE            "¤Á´«¨ì¤U¤@­Óµøµ¡\n¤U¤@µøµ¡"
+    ID_PREV_PANE            "¤Á´«¦^¤W¤@­Óµøµ¡\n¤W¤@µøµ¡"
 END
 
 STRINGTABLE DISCARDABLE 
 BEGIN
-    IDS_NUM_REPLACED        "¤w¨ú¥N %1 ­Ó¦r¦ê¡C"
-    IDS_EDIT_TEXT_NOT_FOUND "µLªk´M§ä¦r¦ê¡u%s¡v"
+    ID_WINDOW_NEW           "¬°§@¥Î¤¤¤å¥ó¶}±Ò¥t¤@­Óµøµ¡\n·sµøµ¡"
+    ID_WINDOW_ARRANGE       "±Æ¦C¹Ï¥Ü¦bµøµ¡ªº©³³¡\n±Æ¦C¹Ï¥Ü"
+    ID_WINDOW_CASCADE       "±Æ¦Cµøµ¡Åý¥¦­Ì©¼¦¹Âл\n­«Å|µøµ¡"
+    ID_WINDOW_TILE_HORZ     "«DÂл\ªº±Æ¦Cµøµ¡\n¨Ã¦Cµøµ¡"
+    ID_WINDOW_TILE_VERT     "«DÂл\ªº±Æ¦Cµøµ¡\n¨Ã¦Cµøµ¡"
+    ID_WINDOW_SPLIT         "¤À³Î¥Ø«eµøµ¡\n¤À³Î"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    ID_EDIT_CLEAR           "²M°£¿ï¨úªº½d³ò\n§R°£"
+    ID_EDIT_CLEAR_ALL       "¥þ³¡§R°£\n¥þ³¡§R°£"
+    ID_EDIT_COPY            "½Æ»s¿ï¨ú¨Ã©ñ¸m¥¦¨ì³o°Å¶Kï\n½Æ»s"
+    ID_EDIT_CUT             "°Å¤U¿ï¨ú¨Ã©ñ¸m¥¦¨ì°Å¶Kï\n°Å¤U"
+    ID_EDIT_FIND            "´M§ä«ü©w¤å¦r\n´M§ä"
+    ID_EDIT_PASTE           "´¡¤J°Å¶K鷺®e\n¶K¤W"
+    ID_EDIT_PASTE_LINK      " "
+    ID_EDIT_PASTE_SPECIAL   " "
+    ID_EDIT_REPEAT          "­«½Æ¤W¦¸ªº°Ê§@\n­«½Æ"
+    ID_EDIT_REPLACE         "¥H¤£¦Pªº¤å¦r¨ú¥N¯S©wªº¤å¦r\n¨ú¥N"
+    ID_EDIT_SELECT_ALL      "¿ï¨ú¾ã¥÷¤å¥ó\n¥þ¿ï"
+    ID_EDIT_UNDO            "´_­ì¤W¦¸ªº°Ê§@\n´_­ì"
+    ID_EDIT_REDO            "­«°µ¤§«e¥¼§¹¦¨ªº°Ê§@\n­«°µ"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    ID_VIEW_TOOLBAR         "Åã¥Ü©ÎÁôÂäu¨ã¦C\n¤Á´«¤u¨ã¦C"
+    ID_VIEW_STATUS_BAR      "Åã¥Ü©ÎÁôÂꬺA¦C\n¤Á´«ª¬ºA¦C"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    AFX_IDS_SCSIZE          "§ó§ïµøµ¡¤j¤p"
+    AFX_IDS_SCMOVE          "§ó§ïµøµ¡¦ì¸m"
+    AFX_IDS_SCMINIMIZE      "ÁY¤pµøµ¡¬°¤@­Ó¹Ï¥Ü"
+    AFX_IDS_SCMAXIMIZE      "ÂX¤jµøµ¡¬°§¹¾ã¿Ã¹õ¤j¤p"
+    AFX_IDS_SCNEXTWINDOW    "¤Á´«¨ì¤U¤@­Ó¤å¥óµøµ¡"
+    AFX_IDS_SCPREVWINDOW    "¤Á´«¨ì¤W¤@­Ó¤å¥óµøµ¡"
+    AFX_IDS_SCCLOSE         "Ãö³¬§@¥Î¤¤µøµ¡¨Ã´£¥Ü¨ìÀx¦s³o¤å¥ó"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    AFX_IDS_SCRESTORE       "±Nµøµ¡Á٭즨¼Ð·Çªº¤j¤p"
+    AFX_IDS_SCTASKLIST      "±Ò¥Î¤u§@²M³æ"
+    AFX_IDS_MDICHILD        "±Ò¥Î³o­Óµøµ¡"
 END
 
 STRINGTABLE DISCARDABLE 
+BEGIN
+    AFX_IDS_PREVIEW_CLOSE   "Ãö³¬¹wÄý¦C¦L¼Ò¦¡\n¨ú®ø¹wÄý"
+END
 
+STRINGTABLE DISCARDABLE 
 BEGIN
     ID_L2R                  "½Æ»s¿ï¨úªº¤å¦r¨ì¥kÃäÀÉ®×\n½Æ»s¥kÃä (Alt + Right)"
     ID_R2L                  "½Æ»s¿ï¨úªº¤å¦r¨ì¥ªÃäÀÉ®×\n½Æ»s¥ªÃä (Alt + Left)"
@@ -903,144 +942,155 @@ BEGIN
     ID_DIR_OPEN_RIGHT       "¶}±Ò¥kÃäÀÉ®×"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE PRELOAD DISCARDABLE 
 BEGIN
-    ID_DIR_OPEN_RIGHT_WITH  "¶}±Ò¥kÃäÀÉ®×¥H..."
-    ID_OPTIONS_SHOWBINARIES "Åã¥Ü¤G¶i¨îÀÉ®×"
-    ID_VIEW_WHITESPACE      "Åã¥ÜªÅ¥Õ©M¸õ®æ¦r¤¸"
-    ID_REFRESH              "§ó·sÅã¥Ü\n§ó·s (F5)"
+    IDS_SAVE_AS_TITLE       "¥t¦s·sÀÉ"
+    IDS_SELECT_FILES_OR_FOLDERS "§Aªº¿ï¨ú¥²¶·¬O¨âªÌ³£¬OÀɮשΨâªÌ³£¬O¸ê®Æ§¨"
+    IDS_BACKUP_FAILED_PROMPT "µLªk³Æ¥÷­ì©lªºÀɮסC\nµL½×¦p¦ó­nÄ~Äò¶Ü¡H"
+    IDS_OPTIONS_TITLE       "¿ï¶µ"
+    IDS_OPEN_TITLE          "¶}±Ò"
+    IDS_CONFIRM_DELETE      "§R°£ÀÉ®× %1¡H"
+    IDS_EDIT_WINDOW_TITLE_FMT "½s¿è %1"
+    IDS_FILESSAME           "¿ï¨úªºÀɮק¹¥þ¬Û¦P¡C"
+    IDS_FILEUNIQUE          "¿ï¨úªºÀɮפ£¦s¦b©ó¨âÃ䪺¸ê®Æ§¨¡A¦]¦¹µLªk¤ñ¹ï¡C"
+    IDS_FILEERROR           "¤@­Ó¿ù»~µo¥Í©ó¤ñ¹ïÀɮ׮ɡC"
+    IDS_SAVEREADONLY_FMT    "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
+    IDS_SAVE_FMT            "Àx¦s§ó§ï¨ì %1¡H"
+    IDS_FILEBINARY          "¤G¶i¨îÀÉ®×µLªk§@µøıªº¤ñ¹ï¡C"
+    IDS_SAVEVSS_FMT         "%1 ¼Ð°O¬°°ßŪ¡C §A­n±qª©¥»¨t²ÎÀˬd¥¦¡AÁÙ¬O¥H¤@­Ó¤£¦Pªº¦WºÙÀx¦s¥¦¡H"
+    IDS_VSSERROR            "¹Á¸ÕÀˬdÀɮ׮ɪ©¥»¨t²Îªð¦^¤@­Ó¿ù»~¡C µLªkÄ~Äò..."
+    IDS_NOPROJECT           "§A¥²¶·«ü©w¤@­Ó SourceSafe ±M®×¸ô®|¥H«KÄ~Äò (¨Ò¦p¡G  $/MyProject)"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE FIXED IMPURE
 BEGIN
-    AFX_IDS_APP_TITLE       "WinMerge"
-    AFX_IDS_IDLEMESSAGE     "´Nºü"
-    AFX_IDS_HELPMODEMESSAGE " "
-    AFX_IDS_APP_TITLE_EMBEDDING " "
-    AFX_IDS_COMPANY_NAME    " "
-    AFX_IDS_OBJ_TITLE_INPLACE " "
-
+    IDS_NORWEGIAN_BOKMAL    "Norsk (Bokmal)"
 END
 
 STRINGTABLE DISCARDABLE 
 BEGIN
-    ID_FILE_NEW             "«Ø¥ß¤@­Ó·s¤å¥ó\n·s¼W"
-    ID_FILE_OPEN            "¶}±Ò¤@­Ó²{¦s¤å¥ó\n¶}±Ò (Ctrl+O)"
-    ID_FILE_CLOSE           "Ãö³¬§@¥Î¤¤¤å¥ó\nÃö³¬"
-    ID_FILE_SAVE            "Àx¦s§@¥Î¤¤¤å¥ó\nÀx¦s (Ctrl+S)"
-    ID_FILE_SAVE_AS         "¥H¤@­Ó·s¦WºÙÀx¦s§@¥Î¤¤¤å¥ó\n¥t¦s·sÀÉ"
-    ID_FILE_PAGE_SETUP      "Åܧó¦C¦L¿ï¶µ\nª©­±³]©w"
-    ID_FILE_PRINT_SETUP     "Åܧó¦Lªí¾÷©M¦C¦L¿ï¶µ\n¦C¦L³]©w"
-    ID_FILE_PRINT           "¦C¦L§@¥Î¤¤¤å¥ó\n¦C¦L"
-    ID_FILE_PRINT_DIRECT    " "
-    ID_FILE_PRINT_PREVIEW   "Åã¥Ü¾ã­¶\n¹wÄý¦C¦L"
-    ID_FILE_UPDATE          " "
-    ID_FILE_SAVE_COPY_AS    " "
-    ID_FILE_SEND_MAIL       " "
+    IDS_SPANISH_MODERN      "Espanol (Moderno)"
 END
 
 STRINGTABLE DISCARDABLE 
 BEGIN
-    ID_FILE_MRU_FIRST       "¶}±Ò³o­Ó¤å¥ó"
-    ID_FILE_MRU_FILE2       "¶}±Ò³o­Ó¤å¥ó"
-    ID_FILE_MRU_FILE3       "¶}±Ò³o­Ó¤å¥ó"
-    ID_FILE_MRU_FILE4       "¶}±Ò³o­Ó¤å¥ó"
-    ID_FILE_MRU_FILE5       "¶}±Ò³o­Ó¤å¥ó"
-    ID_FILE_MRU_FILE6       "¶}±Ò³o­Ó¤å¥ó"
-    ID_FILE_MRU_FILE7       "¶}±Ò³o­Ó¤å¥ó"
-    ID_FILE_MRU_FILE8       "¶}±Ò³o­Ó¤å¥ó"
-    ID_FILE_MRU_FILE9       "¶}±Ò³o­Ó¤å¥ó"
-    ID_FILE_MRU_FILE10      "¶}±Ò³o­Ó¤å¥ó"
-    ID_FILE_MRU_FILE11      "¶}±Ò³o­Ó¤å¥ó"
-    ID_FILE_MRU_FILE12      "¶}±Ò³o­Ó¤å¥ó"
-    ID_FILE_MRU_FILE13      "¶}±Ò³o­Ó¤å¥ó"
-    ID_FILE_MRU_FILE14      "¶}±Ò³o­Ó¤å¥ó"
-    ID_FILE_MRU_FILE15      "¶}±Ò³o­Ó¤å¥ó"
-    ID_FILE_MRU_FILE16      "¶}±Ò³o­Ó¤å¥ó"
+    IDS_COLHDR_FILENAME     "ÀɮצWºÙ"
+    IDS_COLHDR_DIR          "¸ê®Æ§¨"
+    IDS_COLHDR_RESULT       "¤ñ¹ïµ²ªG"
+    IDS_FILE_COMPARISON_TITLE "Àɮפñ¹ï"
+    IDS_DIFF_NUMBER_STATUS_FMT "¤£¦P %1 ¦b %2"
+    IDS_NO_DIFF_SEL         "%1 ¤£¦P§ä¨ì"
+    IDS_FILEISDIR           "¸ê®Æ§¨ÀÉ®×µLªk°µµøıªº¤ñ¹ï¡C"
+    IDS_CC_CMD              "cleartool.exe ¸ô®|(&P):"
+    IDS_VSS_CMD             "SS.EXE ¸ô®|(&P):"
+    IDS_VSS_RUN_ERROR       "¿ù»~°õ¦æª©¥»¨t²Î«ü¥O¡C"
+    IDS_DIFF_OPEN_NO_SET_PROPS "¦b¥Ø«eÀɮפñ¹ï´Á¶¡¤w¦³­×§ï¡C ¦b­«·s±Ò°Ê¥Ø«eÀɮפñ¹ï«e¡A¤@¨Ç³]©w¤£·|¥Í®Ä¡C"
+    IDS_COLHDR_LTIMEM       "¥ªÃä¤é´Á"
+    IDS_COLHDR_RTIMEM       "¥kÃä¤é´Á"
+    IDS_COLHDR_EXTENSION    "°ÆÀɦW"
+    IDS_CONFIRM_DELETE_ITEMS "§A½T©w­n§R°£ %1 ¦b %2 ¿ï¨úªº¶µ¥Ø¶Ü¡H"
+    IDS_DEL_LEFT_FMT        "§R°£¥ªÃä %1 ¦b %2 ¿ï¨úªº¶µ¥Ø"
 END
 
 STRINGTABLE DISCARDABLE 
 BEGIN
-    ID_EDIT_CLEAR           "²M°£¿ï¨úªº½d³ò\n§R°£"
-    ID_EDIT_CLEAR_ALL       "¥þ³¡§R°£\n¥þ³¡§R°£"
-    ID_EDIT_COPY            "½Æ»s¿ï¨ú¨Ã©ñ¸m¥¦¨ì³o°Å¶Kï\n½Æ»s"
-    ID_EDIT_CUT             "°Å¤U¿ï¨ú¨Ã©ñ¸m¥¦¨ì°Å¶Kï\n°Å¤U"
-    ID_EDIT_FIND            "´M§ä«ü©w¤å¦r\n´M§ä"
-    ID_EDIT_PASTE           "´¡¤J°Å¶K鷺®e\n¶K¤W"
-    ID_EDIT_PASTE_LINK      " "
-    ID_EDIT_PASTE_SPECIAL   " "
-    ID_EDIT_REPEAT          "­«½Æ¤W¦¸ªº°Ê§@\n­«½Æ"
-    ID_EDIT_REPLACE         "¥H¤£¦Pªº¤å¦r¨ú¥N¯S©wªº¤å¦r\n¨ú¥N"
-    ID_EDIT_SELECT_ALL      "¿ï¨ú¾ã¥÷¤å¥ó\n¥þ¿ï"
-    ID_EDIT_UNDO            "´_­ì¤W¦¸ªº°Ê§@\n´_­ì"
-    ID_EDIT_REDO            "­«°µ¤§«e¥¼§¹¦¨ªº°Ê§@\n­«°µ"
+    IDS_DEL_RIGHT_FMT       "§R°£¥kÃä %1 ¦b %2 ¿ï¨úªº¶µ¥Ø"
+    IDS_DELETE_FAILED       "§R°£ÀÉ®× %1 ¥¢±Ñ¡G %2"
+    IDS_CONFIRM_DELETE_DIR  "§R°£¸ê®Æ§¨ %1¡H"
+    IDS_REMOVE_DIR_FAILED   "²¾°£¸ê®Æ§¨¥¢±Ñ¡G %1"
+    IDS_COPY_TO_LEFT        "½Æ»s¨ì¥ªÃä %1 ¦b %2 ¿ï¨úªº¶µ¥Ø"
+    IDS_COPY_TO_LEFT_MAIN   "§R°£¨âÃä %1 ¦b %2 ¿ï¨úªº¶µ¥Ø"
+    IDS_COPY_TO_RIGHT       "½Æ»s¨ì¥kÃä %1 ¦b %2 ¿ï¨úªº¶µ¥Ø"
+    IDS_DELETE_DIR_FAILED   "§R°£¸ê®Æ§¨ %1 ¥¢±Ñ¡G %s"
+    IDS_COPY_FILE_FAILED    "¥¿¦b½Æ»sÀÉ®× %1 ¥¢±Ñ¡G %2"
+    IDS_COPY_DIR_FAILED     "¥¿¦b½Æ»s¸ê®Æ§¨ %1 ¥¢±Ñ¡G %2"
+    IDS_ERROR_FILE_WRITEABLE "¿ù»~Àˬd¥Ø¼Ð¼g¤J©Ê"
+    IDS_ERROR_BACKUP        "¿ù»~³Æ¥÷ÀÉ®×"
+    IDS_CONFIRM_COPY_SINGLE "§A½T©w­n½Æ»s %1 ¨ì %2 ¶Ü¡H"
+    IDS_CONFIRM_DELETE_SINGLE "§A½T©w­n§R°£ %1 ¶Ü¡H"
+    IDS_BIN_FILES_SAME      "¤G¶i¨îÀɮק¹¥þ¬Û¦P"
 END
 
 STRINGTABLE DISCARDABLE 
 BEGIN
-    ID_WINDOW_NEW           "¬°§@¥Î¤¤¤å¥ó¶}±Ò¥t¤@­Óµøµ¡\n·sµøµ¡"
-    ID_WINDOW_ARRANGE       "±Æ¦C¹Ï¥Ü¦bµøµ¡ªº©³³¡\n±Æ¦C¹Ï¥Ü"
-    ID_WINDOW_CASCADE       "±Æ¦Cµøµ¡Åý¥¦­Ì©¼¦¹Âл\n­«Å|µøµ¡"
-    ID_WINDOW_TILE_HORZ     "«DÂл\ªº±Æ¦Cµøµ¡\n¨Ã¦Cµøµ¡"
-    ID_WINDOW_TILE_VERT     "«DÂл\ªº±Æ¦Cµøµ¡\n¨Ã¦Cµøµ¡"
-    ID_WINDOW_SPLIT         "¤À³Î¥Ø«eµøµ¡\n¤À³Î"
+    ID_DIR_OPEN_RIGHT_WITH  "¶}±Ò¥kÃäÀÉ®×¥H..."
+    ID_OPTIONS_SHOWBINARIES "Åã¥Ü¤G¶i¨îÀÉ®×"
+    ID_VIEW_WHITESPACE      "Åã¥ÜªÅ¥Õ©M¸õ®æ¦r¤¸"
+    ID_REFRESH              "§ó·sÅã¥Ü\n§ó·s (F5)"
+    ID_SHOWLINEDIFF         "Highlight difference in current line"
+    ID_EDITOR_COPY_PATH     "Copy full Path"
+    ID_EDITOR_COPY_FILENAME "Copy Filename"
 END
 
 STRINGTABLE DISCARDABLE 
 BEGIN
-    ID_APP_ABOUT            "Åã¥Üµ{¦¡¸ê°T¡Aª©¥»¸¹½X©Mª©Åv\nÃö©ó"
-    ID_APP_EXIT             "Â÷¶}À³¥Îµ{¦¡¡F´£¥Ü­nÀx¦s¤å¥ó\nµ²§ô"
-    ID_HELP_INDEX           " "
-    ID_HELP_FINDER          " "
-    ID_HELP_USING           " "
-    ID_CONTEXT_HELP         " "
-    ID_HELP                 " "
-    ID_DEFAULT_HELP         " "
+    IDS_FILESAVE_FAILED     "Àx¦s %1 ¥¢±Ñ¡C§A­n¥H¤@­Ó¤£¦Pªº¦WºÙÀx¦sÀɮ׶ܡH"
+    IDS_ERROR_FILE_NOT_FOUND "Àɮק䤣¨ì: %1"
+    IDS_ERROR_INCOMPARABLE  "¿ï¨ú­n¤ñ¹ïªº¨â­Ó²{¦s¸ê®Æ§¨©ÎÀÉ®×"
+    IDS_STATUS_RESCANNING                     "±½´yÀÉ®×..."
+    IDS_STATUS_OPENING_SELECTION                     "¶}±Ò¿ï¨ú"
+    IDS_STATUS_COPYL2R      "¥¿¦b½Æ»s¥ªÃä¨ì¥kÃä"
+    IDS_STATUS_COPYR2L      "¥¿¦b½Æ»s¥kÃä¨ì¥ªÃä"
+    IDS_STATUS_COPYALL2L    "¥¿¦b¥þ³¡½Æ»s¨ì¥ªÃä"
+    IDS_STATUS_COPYALL2R    "¥¿¦b¥þ³¡½Æ»s¨ì¥kÃä"
+    IDS_PROGRAMFILES        "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
+    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"
 END
 
 STRINGTABLE DISCARDABLE 
 BEGIN
-    ID_NEXT_PANE            "¤Á´«¨ì¤U¤@­Óµøµ¡\n¤U¤@µøµ¡"
-    ID_PREV_PANE            "¤Á´«¦^¤W¤@­Óµøµ¡\n¤W¤@µøµ¡"
+    IDS_NUM_REPLACED        "¤w¨ú¥N %1 ­Ó¦r¦ê¡C"
+    IDS_EDIT_TEXT_NOT_FOUND "µLªk´M§ä¦r¦ê¡u%s¡v"
+    IDS_LINE_STATUS_INFO    "Line: %s Characters: %d EOL: %s"
+    IDS_EMPTY_LINE_STATUS_INFO "Line: %s"
 END
 
 STRINGTABLE DISCARDABLE 
 BEGIN
-    ID_INDICATOR_EXT        "EXT"
-    ID_INDICATOR_CAPS       "CAP"
-    ID_INDICATOR_NUM        "NUM"
-    ID_INDICATOR_SCRL       "SCRL"
-    ID_INDICATOR_OVR        "OVR"
-    ID_INDICATOR_REC        "REC"
+    IDC_STATIC_TITLE_LEFT   "Right click on the path to copy"
+    IDC_STATIC_TITLE_RIGHT  "Right click on the path to copy"
 END
 
 STRINGTABLE DISCARDABLE 
 BEGIN
-    ID_VIEW_TOOLBAR         "Åã¥Ü©ÎÁôÂäu¨ã¦C\n¤Á´«¤u¨ã¦C"
-    ID_VIEW_STATUS_BAR      "Åã¥Ü©ÎÁôÂꬺA¦C\n¤Á´«ª¬ºA¦C"
+    IDS_LEFTONLY            "Left Only"
+    IDS_RIGHTONLY           "Right Only"
+    IDS_COLHDR_RESULT_ABBR  "Short Result"
+    IDS_COLHDR_LATTRIBUTES  "Left Attributes"
+    IDS_COLHDR_RATTRIBUTES  "Right Attributes"
+    IDS_FILE_SKIPPED        "File skipped"
+    IDS_DIR_SKIPPED         "Directory skipped"
 END
 
 STRINGTABLE DISCARDABLE 
 BEGIN
-    AFX_IDS_SCSIZE          "§ó§ïµøµ¡¤j¤p"
-    AFX_IDS_SCMOVE          "§ó§ïµøµ¡¦ì¸m"
-    AFX_IDS_SCMINIMIZE      "ÁY¤pµøµ¡¬°¤@­Ó¹Ï¥Ü"
-    AFX_IDS_SCMAXIMIZE      "ÂX¤jµøµ¡¬°§¹¾ã¿Ã¹õ¤j¤p"
-    AFX_IDS_SCNEXTWINDOW    "¤Á´«¨ì¤U¤@­Ó¤å¥óµøµ¡"
-    AFX_IDS_SCPREVWINDOW    "¤Á´«¨ì¤W¤@­Ó¤å¥óµøµ¡"
-    AFX_IDS_SCCLOSE         "Ãö³¬§@¥Î¤¤µøµ¡¨Ã´£¥Ü¨ìÀx¦s³o¤å¥ó"
+    AFX_IDS_HELPMODEMESSAGE " "
+    AFX_IDS_APP_TITLE_EMBEDDING " "
+    AFX_IDS_COMPANY_NAME    " "
+    AFX_IDS_OBJ_TITLE_INPLACE " "
+
 END
 
 STRINGTABLE DISCARDABLE 
 BEGIN
-    AFX_IDS_SCRESTORE       "±Nµøµ¡Á٭즨¼Ð·Çªº¤j¤p"
-    AFX_IDS_SCTASKLIST      "±Ò¥Î¤u§@²M³æ"
-    AFX_IDS_MDICHILD        "±Ò¥Î³o­Óµøµ¡"
+    ID_FILE_UPDATE          " "
+    ID_FILE_SAVE_COPY_AS    " "
+    ID_FILE_SEND_MAIL       " "
 END
 
 STRINGTABLE DISCARDABLE 
 BEGIN
-    AFX_IDS_PREVIEW_CLOSE   "Ãö³¬¹wÄý¦C¦L¼Ò¦¡\n¨ú®ø¹wÄý"
+    ID_HELP_INDEX           " "
+    ID_HELP_FINDER          " "
+    ID_HELP_USING           " "
+    ID_CONTEXT_HELP         " "
+    ID_HELP                 " "
+    ID_DEFAULT_HELP         " "
 END
 
 #endif    // Chinese (Traditional) resources
index 869288f..89e66c0 100644 (file)
@@ -1,8 +1,14 @@
+2003-08-27 Perry
+ Add new colhdrs from patch#781529 to Brazilian.
+ Reorder ChineseSimplified string tables to match English, and add missing entries.
+ Reorder ChineseTraditional string tables to match English, and add missing entries.
+  Languages: Brazilian, ChineseSimplified, ChineseTraditional
+
 2003-08-26 Perry
  Implement fix for BUG#794514: 'Comparison Summary' not updated properly
   WinMerge: DirDoc.cpp
  i18n effects of patch#781529: new popup menu, new dialog, alter existing col header strings
-  Brazilian, ChineseSimplified, ChineseTraditional
+  Languages: Brazilian, ChineseSimplified, ChineseTraditional
   
 2003-08-25 Laoran
  [ 783507 ] normalize replaceSelection and ListCopy