IDR_POPUP_DIRVIEW MENU DISCARDABLE
BEGIN
- POPUP "_POPUP_"
+ POPUP "_ITEM_POPUP_"
BEGIN
MENUITEM "Copiar arquivo para a esquerda", ID_DIR_COPY_FILE_TO_LEFT
MENUITEM "Copiar arquivo para a direita", ID_DIR_COPY_FILE_TO_RIGHT
MENUITEM "Abrir da Direita", ID_DIR_OPEN_RIGHT
MENUITEM "Abrir da Direita com...", ID_DIR_OPEN_RIGHT_WITH
END
+ POPUP "_HDR_POPUP_"
+ BEGIN
+ MENUITEM "Edit columns", ID_EDIT_COLUMNS
+ END
END
IDR_POPUP_EDITOR_HEADERBAR MENU DISCARDABLE
WS_TABSTOP,WS_EX_STATICEDGE
END
+IDD_DIRCOLS DIALOG DISCARDABLE 0, 0, 273, 162
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Display Columns"
+FONT 8, "MS Sans Serif"
+BEGIN
+ DEFPUSHBUTTON "OK",IDOK,141,129,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,81,129,50,14
+ GROUPBOX "Show columns",IDC_GROUP_SHOW,7,17,124,100
+ LISTBOX IDC_LIST_SHOW,42,31,83,79,LBS_NOINTEGRALHEIGHT |
+ LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
+ PUSHBUTTON "&Up",IDC_UP,13,43,23,13
+ PUSHBUTTON "&Down",IDC_DOWN,13,67,23,13
+ GROUPBOX "Hide columns",IDC_GROUP_HIDE,181,17,85,103
+ LISTBOX IDC_LIST_HIDE,192,31,66,79,LBS_NOINTEGRALHEIGHT |
+ LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
+ PUSHBUTTON "<==",IDC_ADD,141,41,29,11
+ PUSHBUTTON "==>",IDC_REMOVE,141,76,29,11
+END
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
TOPMARGIN, 7
BOTTOMMARGIN, 149
END
+
+ IDD_DIRCOLS, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 266
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 155
+ END
END
#endif // APSTUDIO_INVOKED
STRINGTABLE DISCARDABLE
BEGIN
- IDS_FILENAME_HEADER "Nome de Arquivo"
- IDS_DIR_HEADER "Diretório"
- IDS_RESULT_HEADER "Resultados da comparação"
+ IDS_COLHDR_FILENAME "Nome de Arquivo"
+ IDS_COLHDR_DIR "Diretório"
+ IDS_COLHDR_RESULT "Resultados da comparação"
IDS_FILE_COMPARISON_TITLE "Comparação de Arquivo"
IDS_DIFF_NUMBER_STATUS_FMT "Diferença %1 de %2"
IDS_NO_DIFF_SEL_FMT "%1 Diferença(s) encontrada(s)"
IDS_VSS_RUN_ERROR "Erro ao executar o comando do sistema de versões."
IDS_DIFF_OPEN_NO_SET_PROPS
"Alterações foram feitas no arquivo corrente nesta sessão de comparação. Alguns ajustes podem não acontecer até que a comparação ao atual arquivo seja reiniciada."
- IDS_LTIME_HEADER "Data da Esquerda"
- IDS_RTIME_HEADER "Data da Direita"
- IDS_EXTENSION_HEADER "Extensão"
+ IDS_COLHDR_LTIMEM "Data da Esquerda"
+ IDS_COLHDR_RTIMEM "Data da Direita"
+ IDS_COLHDR_EXTENSION "Extensão"
IDS_CONFIRM_DELETE_ITEMS
"Você tem certeza que deseja excluir %1 de %2 do(s) objecto(s) selecionado(s)?"
IDS_DEL_LEFT_FMT "Excluir a esquerda %1 de %2 objeto(s) selecionado(s)"
#define IDD_PROPPAGE_REGISTRY 113
#define IDD_EDITOR_HEADERBAR 114
#define IDR_POPUP_EDITOR_HEADERBAR 115
+#define IDD_DIRCOLS 117
#define IDS_VERSION_FMT 130
#define IDS_ALLFILES 131
#define IDS_CONFIRM_ALL_LEFT 132
#define IDS_SAVEVSS_FMT 157
#define IDS_VSSERROR 158
#define IDS_NOPROJECT 159
-#define IDS_FILENAME_HEADER 160
-#define IDS_DIR_HEADER 161
-#define IDS_RESULT_HEADER 162
+#define IDS_COLHDR_FILENAME 160
+#define IDS_COLHDR_DIR 161
+#define IDS_COLHDR_RESULT 162
#define IDS_FILE_COMPARISON_TITLE 163
#define IDS_DIFF_NUMBER_STATUS_FMT 164
#define IDS_NO_DIFF_SEL 165
#define IDS_VSS_CMD 168
#define IDS_VSS_RUN_ERROR 169
#define IDS_DIFF_OPEN_NO_SET_PROPS 170
-#define IDS_LTIME_HEADER 171
-#define IDS_RTIME_HEADER 172
-#define IDS_EXTENSION_HEADER 173
+#define IDS_COLHDR_LTIMEM 171
+#define IDS_COLHDR_RTIMEM 172
+#define IDS_COLHDR_EXTENSION 173
#define IDS_CONFIRM_DELETE_ITEMS 174
#define IDS_DEL_LEFT_FMT 175
#define IDS_DEL_RIGHT_FMT 176
#define IDS_DEL_BOTH_FMT 181
#define IDS_COPY_TO_RIGHT 182
#define IDS_COPY_TO_RIGHT_MAIN 183
+#define IDS_COLHDR_LSIZE 183
#define IDS_DELETE_DIR_FAILED 184
#define IDS_COPY_FILE_FAILED 185
#define IDS_COPY_DIR_FAILED 186
#define IDS_STATUS_COPYALL2L 199
#define IDS_STATUS_COPYALL2R 200
#define IDS_PROGRAMFILES 201
+#define IDS_COLHDR_RSIZE 202
+#define IDS_COLHDR_LTIMEC 203
+#define IDS_COLHDR_RTIMEC 204
+#define IDS_COLHDR_NEWER 205
+#define IDS_COLHDR_LVERSION 206
+#define IDS_COLHDR_RVERSION 207
+#define IDS_LEFTONLY 208
+#define IDS_RIGHTONLY 209
+#define IDS_COLHDR_RESULT_ABBR 210
+#define IDS_COLHDR_LATTRIBUTES 211
+#define IDS_COLHDR_RATTRIBUTES 212
#define IDB_EQUAL 213
+#define IDS_FILE_SKIPPED 213
#define IDB_NOTEQUAL 214
+#define IDS_DIR_SKIPPED 214
#define IDB_RFOLDER 215
#define IDB_UNKNOWN 216
#define IDB_BINARYSAME 217
#define IDC_WINMERGE_PATH_SAVE 1047
#define IDC_STATIC_TITLE_LEFT 1048
#define IDC_STATIC_TITLE_RIGHT 1049
+#define IDC_GROUP_SHOW 1053
+#define IDC_LIST_SHOW 1054
+#define IDC_UP 1055
+#define IDC_DOWN 1056
+#define IDC_GROUP_HIDE 1057
+#define IDC_LIST_HIDE 1058
+#define IDC_ADD 1059
+#define IDC_REMOVE 1060
#define IDS_NUM_REPLACED 8501
#define IDS_EDIT_TEXT_NOT_FOUND 8502
#define IDS_LINE_STATUS_INFO 8503
#define ID_EDIT_FIND_PREVIOUS 32820
#define ID_SHOWLINEDIFF 32821
#define ID_EDITOR_COPY_PATH 32822
+#define ID_EDIT_COLUMNS 32822
#define ID_EDITOR_COPY_FILENAME 32823
// Next default values for new objects
-//
+//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
-#define _APS_NEXT_RESOURCE_VALUE 116
-#define _APS_NEXT_COMMAND_VALUE 32822
-#define _APS_NEXT_CONTROL_VALUE 1050
+#define _APS_NEXT_RESOURCE_VALUE 118
+#define _APS_NEXT_COMMAND_VALUE 32823
+#define _APS_NEXT_CONTROL_VALUE 1061
#define _APS_NEXT_SYMED_VALUE 108
#endif
#endif
IDR_POPUP_DIRVIEW MENU DISCARDABLE
BEGIN
- POPUP "_POPUP_"
+ POPUP "_ITEM_POPUP_"
BEGIN
MENUITEM "¸´ÖÆÎļþµ½×ó±ß", ID_DIR_COPY_FILE_TO_LEFT
MENUITEM "¸´ÖÆÎļþµ½ÓÒ±ß", ID_DIR_COPY_FILE_TO_RIGHT
MENUITEM "´ò¿ªÓÒ±ß", ID_DIR_OPEN_RIGHT
MENUITEM "´ò¿ªÓÒ±ßÒÔ...", ID_DIR_OPEN_RIGHT_WITH
END
+ POPUP "_HDR_POPUP_"
+ BEGIN
+ MENUITEM "Edit columns", ID_EDIT_COLUMNS
+ END
END
IDR_POPUP_EDITOR_HEADERBAR MENU DISCARDABLE
WS_TABSTOP,WS_EX_STATICEDGE
END
+IDD_DIRCOLS DIALOG DISCARDABLE 0, 0, 273, 162
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Display Columns"
+FONT 8, "MS Sans Serif"
+BEGIN
+ DEFPUSHBUTTON "OK",IDOK,141,129,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,81,129,50,14
+ GROUPBOX "Show columns",IDC_GROUP_SHOW,7,17,124,100
+ LISTBOX IDC_LIST_SHOW,42,31,83,79,LBS_NOINTEGRALHEIGHT |
+ LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
+ PUSHBUTTON "&Up",IDC_UP,13,43,23,13
+ PUSHBUTTON "&Down",IDC_DOWN,13,67,23,13
+ GROUPBOX "Hide columns",IDC_GROUP_HIDE,181,17,85,103
+ LISTBOX IDC_LIST_HIDE,192,31,66,79,LBS_NOINTEGRALHEIGHT |
+ LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
+ PUSHBUTTON "<==",IDC_ADD,141,41,29,11
+ PUSHBUTTON "==>",IDC_REMOVE,141,76,29,11
+END
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
STRINGTABLE FIXED IMPURE
BEGIN
- IDS_FILENAME_HEADER "ÎļþÃû³Æ"
- IDS_DIR_HEADER "Îļþ¼Ð"
- IDS_RESULT_HEADER "±È¶Ô½á¹û"
+ 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_VSS_CMD "SS.EXE ·¾¶(&P):"
IDS_VSS_RUN_ERROR "Ö´Ðа汾ϵͳÃüÁî´íÎó¡£"
IDS_DIFF_OPEN_NO_SET_PROPS "ÔÚÄ¿Ç°Îļþ±È¶ÔÆÚ¼äÒÑÓÐÐ޸ġ£ ÔÚÖØÐÂÆô¶¯Ä¿Ç°Îļþ±È¶ÔÇ°£¬Ò»Ð©ÉèÖò»»áÉúЧ¡£"
- IDS_LTIME_HEADER "×ó±ßÈÕÆÚ"
- IDS_RTIME_HEADER "ÓÒ±ßÈÕÆÚ"
- IDS_EXTENSION_HEADER "À©Õ¹Ãû"
+ IDS_COLHDR_LTIMEM "×ó±ßÈÕÆÚ"
+ IDS_COLHDR_RTIMEM "ÓÒ±ßÈÕÆÚ"
+ IDS_COLHDR_EXTENSION "À©Õ¹Ãû"
IDS_CONFIRM_DELETE_ITEMS "ÄúÈ·¶¨ÒªÉ¾³ý %1 ÔÚ %2 Ñ¡ÔñµÄÏîÄ¿Âð£¿"
IDS_DEL_LEFT_FMT "ɾ³ý×ó±ß %1 ÔÚ %2 Ñ¡ÔñµÄÏîÄ¿"
END
#define IDD_PROPPAGE_REGISTRY 113
#define IDD_EDITOR_HEADERBAR 114
#define IDR_POPUP_EDITOR_HEADERBAR 115
+#define IDD_DIRCOLS 117
#define IDS_VERSION_FMT 130
#define IDS_ALLFILES 131
#define IDS_CONFIRM_ALL_LEFT 132
#define IDS_SAVEVSS_FMT 157
#define IDS_VSSERROR 158
#define IDS_NOPROJECT 159
-#define IDS_FILENAME_HEADER 160
-#define IDS_DIR_HEADER 161
-#define IDS_RESULT_HEADER 162
+#define IDS_COLHDR_FILENAME 160
+#define IDS_COLHDR_DIR 161
+#define IDS_COLHDR_RESULT 162
#define IDS_FILE_COMPARISON_TITLE 163
#define IDS_DIFF_NUMBER_STATUS_FMT 164
#define IDS_NO_DIFF_SEL 165
#define IDS_VSS_CMD 168
#define IDS_VSS_RUN_ERROR 169
#define IDS_DIFF_OPEN_NO_SET_PROPS 170
-#define IDS_LTIME_HEADER 171
-#define IDS_RTIME_HEADER 172
-#define IDS_EXTENSION_HEADER 173
+#define IDS_COLHDR_LTIMEM 171
+#define IDS_COLHDR_RTIMEM 172
+#define IDS_COLHDR_EXTENSION 173
#define IDS_CONFIRM_DELETE_ITEMS 174
#define IDS_DEL_LEFT_FMT 175
#define IDS_DEL_RIGHT_FMT 176
#define IDS_DEL_BOTH_FMT 181
#define IDS_COPY_TO_RIGHT 182
#define IDS_COPY_TO_RIGHT_MAIN 183
+#define IDS_COLHDR_LSIZE 183
#define IDS_DELETE_DIR_FAILED 184
#define IDS_COPY_FILE_FAILED 185
#define IDS_COPY_DIR_FAILED 186
#define IDS_STATUS_COPYALL2L 199
#define IDS_STATUS_COPYALL2R 200
#define IDS_PROGRAMFILES 201
+#define IDS_COLHDR_RSIZE 202
+#define IDS_COLHDR_LTIMEC 203
+#define IDS_COLHDR_RTIMEC 204
+#define IDS_COLHDR_NEWER 205
+#define IDS_COLHDR_LVERSION 206
+#define IDS_COLHDR_RVERSION 207
+#define IDS_LEFTONLY 208
+#define IDS_RIGHTONLY 209
+#define IDS_COLHDR_RESULT_ABBR 210
+#define IDS_COLHDR_LATTRIBUTES 211
+#define IDS_COLHDR_RATTRIBUTES 212
#define IDB_EQUAL 213
+#define IDS_FILE_SKIPPED 213
#define IDB_NOTEQUAL 214
+#define IDS_DIR_SKIPPED 214
#define IDB_RFOLDER 215
#define IDB_UNKNOWN 216
#define IDB_BINARYSAME 217
#define IDC_WINMERGE_PATH_SAVE 1047
#define IDC_STATIC_TITLE_LEFT 1048
#define IDC_STATIC_TITLE_RIGHT 1049
+#define IDC_GROUP_SHOW 1053
+#define IDC_LIST_SHOW 1054
+#define IDC_UP 1055
+#define IDC_DOWN 1056
+#define IDC_GROUP_HIDE 1057
+#define IDC_LIST_HIDE 1058
+#define IDC_ADD 1059
+#define IDC_REMOVE 1060
#define IDS_NUM_REPLACED 8501
#define IDS_EDIT_TEXT_NOT_FOUND 8502
#define IDS_LINE_STATUS_INFO 8503
#define ID_EDIT_FIND_PREVIOUS 32820
#define ID_SHOWLINEDIFF 32821
#define ID_EDITOR_COPY_PATH 32822
+#define ID_EDIT_COLUMNS 32822
#define ID_EDITOR_COPY_FILENAME 32823
// Next default values for new objects
-//
+//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
-#define _APS_NEXT_RESOURCE_VALUE 116
-#define _APS_NEXT_COMMAND_VALUE 32822
-#define _APS_NEXT_CONTROL_VALUE 1050
+#define _APS_NEXT_RESOURCE_VALUE 118
+#define _APS_NEXT_COMMAND_VALUE 32823
+#define _APS_NEXT_CONTROL_VALUE 1061
#define _APS_NEXT_SYMED_VALUE 108
#endif
#endif
IDR_POPUP_DIRVIEW MENU DISCARDABLE
BEGIN
- POPUP "_POPUP_"
+ POPUP "_ITEM_POPUP_"
BEGIN
MENUITEM "½Æ»sÀɮר쥪Ãä", ID_DIR_COPY_FILE_TO_LEFT
MENUITEM "½Æ»sÀɮרì¥kÃä", ID_DIR_COPY_FILE_TO_RIGHT
MENUITEM "¶}±Ò¥kÃä", ID_DIR_OPEN_RIGHT
MENUITEM "¶}±Ò¥kÃä¥H...", ID_DIR_OPEN_RIGHT_WITH
END
+ POPUP "_HDR_POPUP_"
+ BEGIN
+ MENUITEM "Edit columns", ID_EDIT_COLUMNS
+ END
END
IDR_POPUP_EDITOR_HEADERBAR MENU DISCARDABLE
WS_TABSTOP,WS_EX_STATICEDGE
END
+IDD_DIRCOLS DIALOG DISCARDABLE 0, 0, 273, 162
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Display Columns"
+FONT 8, "MS Sans Serif"
+BEGIN
+ DEFPUSHBUTTON "OK",IDOK,141,129,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,81,129,50,14
+ GROUPBOX "Show columns",IDC_GROUP_SHOW,7,17,124,100
+ LISTBOX IDC_LIST_SHOW,42,31,83,79,LBS_NOINTEGRALHEIGHT |
+ LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
+ PUSHBUTTON "&Up",IDC_UP,13,43,23,13
+ PUSHBUTTON "&Down",IDC_DOWN,13,67,23,13
+ GROUPBOX "Hide columns",IDC_GROUP_HIDE,181,17,85,103
+ LISTBOX IDC_LIST_HIDE,192,31,66,79,LBS_NOINTEGRALHEIGHT |
+ LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
+ PUSHBUTTON "<==",IDC_ADD,141,41,29,11
+ PUSHBUTTON "==>",IDC_REMOVE,141,76,29,11
+END
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
STRINGTABLE DISCARDABLE
BEGIN
- IDS_FILENAME_HEADER "ÀɮצWºÙ"
- IDS_DIR_HEADER "¸ê®Æ§¨"
- IDS_RESULT_HEADER "¤ñ¹ïµ²ªG"
+ 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_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_LTIME_HEADER "¥ªÃä¤é´Á"
- IDS_RTIME_HEADER "¥kÃä¤é´Á"
- IDS_EXTENSION_HEADER "°ÆÀɦW"
+ IDS_COLHDR_LTIMEM "¥ªÃä¤é´Á"
+ IDS_COLHDR_RTIMEM "¥kÃä¤é´Á"
+ IDS_COLHDR_EXTENSION "°ÆÀɦW"
IDS_CONFIRM_DELETE_ITEMS "§A½T©wn§R°£ %1 ¦b %2 ¿ï¨úªº¶µ¥Ø¶Ü¡H"
IDS_DEL_LEFT_FMT "§R°£¥ªÃä %1 ¦b %2 ¿ï¨úªº¶µ¥Ø"
END
#define IDD_PROPPAGE_REGISTRY 113
#define IDD_EDITOR_HEADERBAR 114
#define IDR_POPUP_EDITOR_HEADERBAR 115
+#define IDD_DIRCOLS 117
#define IDS_VERSION_FMT 130
#define IDS_ALLFILES 131
#define IDS_CONFIRM_ALL_LEFT 132
#define IDS_SAVEVSS_FMT 157
#define IDS_VSSERROR 158
#define IDS_NOPROJECT 159
-#define IDS_FILENAME_HEADER 160
-#define IDS_DIR_HEADER 161
-#define IDS_RESULT_HEADER 162
+#define IDS_COLHDR_FILENAME 160
+#define IDS_COLHDR_DIR 161
+#define IDS_COLHDR_RESULT 162
#define IDS_FILE_COMPARISON_TITLE 163
#define IDS_DIFF_NUMBER_STATUS_FMT 164
#define IDS_NO_DIFF_SEL 165
#define IDS_VSS_CMD 168
#define IDS_VSS_RUN_ERROR 169
#define IDS_DIFF_OPEN_NO_SET_PROPS 170
-#define IDS_LTIME_HEADER 171
-#define IDS_RTIME_HEADER 172
-#define IDS_EXTENSION_HEADER 173
+#define IDS_COLHDR_LTIMEM 171
+#define IDS_COLHDR_RTIMEM 172
+#define IDS_COLHDR_EXTENSION 173
#define IDS_CONFIRM_DELETE_ITEMS 174
#define IDS_DEL_LEFT_FMT 175
#define IDS_DEL_RIGHT_FMT 176
#define IDS_DEL_BOTH_FMT 181
#define IDS_COPY_TO_RIGHT 182
#define IDS_COPY_TO_RIGHT_MAIN 183
+#define IDS_COLHDR_LSIZE 183
#define IDS_DELETE_DIR_FAILED 184
#define IDS_COPY_FILE_FAILED 185
#define IDS_COPY_DIR_FAILED 186
#define IDS_STATUS_COPYALL2L 199
#define IDS_STATUS_COPYALL2R 200
#define IDS_PROGRAMFILES 201
+#define IDS_COLHDR_RSIZE 202
+#define IDS_COLHDR_LTIMEC 203
+#define IDS_COLHDR_RTIMEC 204
+#define IDS_COLHDR_NEWER 205
+#define IDS_COLHDR_LVERSION 206
+#define IDS_COLHDR_RVERSION 207
+#define IDS_LEFTONLY 208
+#define IDS_RIGHTONLY 209
+#define IDS_COLHDR_RESULT_ABBR 210
+#define IDS_COLHDR_LATTRIBUTES 211
+#define IDS_COLHDR_RATTRIBUTES 212
#define IDB_EQUAL 213
+#define IDS_FILE_SKIPPED 213
#define IDB_NOTEQUAL 214
+#define IDS_DIR_SKIPPED 214
#define IDB_RFOLDER 215
#define IDB_UNKNOWN 216
#define IDB_BINARYSAME 217
#define IDC_WINMERGE_PATH_SAVE 1047
#define IDC_STATIC_TITLE_LEFT 1048
#define IDC_STATIC_TITLE_RIGHT 1049
+#define IDC_GROUP_SHOW 1053
+#define IDC_LIST_SHOW 1054
+#define IDC_UP 1055
+#define IDC_DOWN 1056
+#define IDC_GROUP_HIDE 1057
+#define IDC_LIST_HIDE 1058
+#define IDC_ADD 1059
+#define IDC_REMOVE 1060
#define IDS_NUM_REPLACED 8501
#define IDS_EDIT_TEXT_NOT_FOUND 8502
#define IDS_LINE_STATUS_INFO 8503
#define ID_EDIT_FIND_PREVIOUS 32820
#define ID_SHOWLINEDIFF 32821
#define ID_EDITOR_COPY_PATH 32822
+#define ID_EDIT_COLUMNS 32822
#define ID_EDITOR_COPY_FILENAME 32823
// Next default values for new objects
-//
+//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
-#define _APS_NEXT_RESOURCE_VALUE 116
-#define _APS_NEXT_COMMAND_VALUE 32822
-#define _APS_NEXT_CONTROL_VALUE 1050
+#define _APS_NEXT_RESOURCE_VALUE 118
+#define _APS_NEXT_COMMAND_VALUE 32823
+#define _APS_NEXT_CONTROL_VALUE 1061
#define _APS_NEXT_SYMED_VALUE 108
#endif
#endif
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
2003-08-25 Laoran
[ 783507 ] normalize replaceSelection and ListCopy
OSDN Git Service
