//WinMerge resource script (for English only).
-//
-// $Id: Merge2.rc 6021 2008-10-20 18:07:27Z kimmov $
#include "resource.h"
#include "afxres.h"
IDI_COMPARE_ABORTED ICON "res\\aborted.ico"
IDI_FILEFILTER ICON "res\\FileFilter.ico"
IDI_LINEFILTER ICON "res\\LineFilter.ico"
+IDI_SUBSTITUTIONFILTER ICON "res\\SubstitutionFilter.ico"
IDI_EQUALTEXTFILE ICON "res\\equaltextfile.ico"
IDI_NOTEQUALTEXTFILE ICON "res\\notequaltextfile.ico"
IDI_EQUALIMAGE ICON "res\\equalimage.ico"
IDI_NOTEQUALIMAGE ICON "res\\notequalimage.ico"
+IDI_EQUALWEBPAGE ICON "res\\equalwebpage.ico"
+IDI_NOTEQUALWEBPAGE ICON "res\\notequalwebpage.ico"
IDI_TREE_STATE_COLLAPSED ICON "res\\treestate_collapsed.ico"
IDI_TREE_STATE_EXPANDED ICON "res\\treestate_expanded.ico"
BUTTON ID_L2RNEXT
BUTTON ID_R2LNEXT
SEPARATOR
- BUTTON ID_OPTIONS
- SEPARATOR
BUTTON ID_ALL_RIGHT
BUTTON ID_ALL_LEFT
SEPARATOR
BUTTON ID_AUTO_MERGE
SEPARATOR
+ BUTTON ID_FIRSTFILE
+ BUTTON ID_PREVFILE
+ BUTTON ID_NEXTFILE
+ BUTTON ID_LASTFILE
+ SEPARATOR
+ BUTTON ID_OPTIONS
+ SEPARATOR
BUTTON ID_REFRESH
+ SEPARATOR
END
IDR_SPLASH IMAGE "res\\splash.jpg"
IDR_LOGO IMAGE "res\\logo.jpg"
+IDR_MARGIN_ICONS_PNG IMAGE "res\\mg_icons.png"
/////////////////////////////////////////////////////////////////////////////
IDB_TOOLBAR_ENABLED8BIT BITMAP "res\\ToolbarEnabled8bit.bmp"
IDB_TOOLBAR_ENABLED BITMAP "res\\ToolbarEnabled.bmp"
IDB_TOOLBAR_ENABLED32 BITMAP "res\\ToolbarEnabled32.bmp"
-IDB_TOOLBAR_ENABLED_MASK BITMAP "res\\ToolbarEnabledMask.bmp"
-IDB_TOOLBAR_ENABLED_MASK32 BITMAP "res\\ToolbarEnabledMask32.bmp"
IDB_EDIT_COPY BITMAP "res\\copy.bmp"
IDB_EDIT_CUT BITMAP "res\\cut.bmp"
IDB_EDIT_PASTE BITMAP "res\\paste.bmp"
IDB_RIGHT BITMAP "res\\right.bmp"
IDB_BOTH BITMAP "res\\both.bmp"
IDB_ALL BITMAP "res\\all.bmp"
-IDB_LEFT_TO_RIGHT BITMAP "res\\left_to_right.bmp"
-IDB_LEFT_TO_MIDDLE BITMAP "res\\left_to_middle.bmp"
-IDB_RIGHT_TO_LEFT BITMAP "res\\right_to_left.bmp"
-IDB_RIGHT_TO_MIDDLE BITMAP "res\\right_to_middle.bmp"
-IDB_MIDDLE_TO_LEFT BITMAP "res\\middle_to_left.bmp"
-IDB_MIDDLE_TO_RIGHT BITMAP "res\\middle_to_right.bmp"
+IDB_COPY_LEFT_TO_RIGHT BITMAP "res\\copy_left_to_right.bmp"
+IDB_COPY_LEFT_TO_MIDDLE BITMAP "res\\copy_left_to_middle.bmp"
+IDB_COPY_RIGHT_TO_LEFT BITMAP "res\\copy_right_to_left.bmp"
+IDB_COPY_RIGHT_TO_MIDDLE BITMAP "res\\copy_right_to_middle.bmp"
+IDB_COPY_MIDDLE_TO_LEFT BITMAP "res\\copy_middle_to_left.bmp"
+IDB_COPY_MIDDLE_TO_RIGHT BITMAP "res\\copy_middle_to_right.bmp"
+IDB_MOVE_LEFT_TO_RIGHT BITMAP "res\\move_left_to_right.bmp"
+IDB_MOVE_LEFT_TO_MIDDLE BITMAP "res\\move_left_to_middle.bmp"
+IDB_MOVE_RIGHT_TO_LEFT BITMAP "res\\move_right_to_left.bmp"
+IDB_MOVE_RIGHT_TO_MIDDLE BITMAP "res\\move_right_to_middle.bmp"
+IDB_MOVE_MIDDLE_TO_LEFT BITMAP "res\\move_middle_to_left.bmp"
+IDB_MOVE_MIDDLE_TO_RIGHT BITMAP "res\\move_middle_to_right.bmp"
IDB_COPY_FROM_LEFT BITMAP "res\\from_left.bmp"
IDB_COPY_FROM_RIGHT BITMAP "res\\from_right.bmp"
-IDB_LEFT_TO_BROWSE BITMAP "res\\left_to_browse.bmp"
-IDB_MIDDLE_TO_BROWSE BITMAP "res\\middle_to_browse.bmp"
-IDB_RIGHT_TO_BROWSE BITMAP "res\\right_to_browse.bmp"
+IDB_COPY_SELECTED_LINES_FROM_LEFT BITMAP "res\\selected_lines_from_left.bmp"
+IDB_COPY_SELECTED_LINES_FROM_RIGHT BITMAP "res\\selected_lines_from_right.bmp"
+IDB_COPY_SELECTED_LINES_LEFT_TO_RIGHT BITMAP "res\\selected_lines_left_to_right.bmp"
+IDB_COPY_SELECTED_LINES_LEFT_TO_MIDDLE BITMAP "res\\selected_lines_left_to_middle.bmp"
+IDB_COPY_SELECTED_LINES_MIDDLE_TO_LEFT BITMAP "res\\selected_lines_middle_to_left.bmp"
+IDB_COPY_SELECTED_LINES_MIDDLE_TO_RIGHT BITMAP "res\\selected_lines_middle_to_right.bmp"
+IDB_COPY_SELECTED_LINES_RIGHT_TO_MIDDLE BITMAP "res\\selected_lines_right_to_middle.bmp"
+IDB_COPY_SELECTED_LINES_RIGHT_TO_LEFT BITMAP "res\\selected_lines_right_to_left.bmp"
+IDB_COPY_LEFT_TO_BROWSE BITMAP "res\\copy_left_to_browse.bmp"
+IDB_COPY_MIDDLE_TO_BROWSE BITMAP "res\\copy_middle_to_browse.bmp"
+IDB_COPY_RIGHT_TO_BROWSE BITMAP "res\\copy_right_to_browse.bmp"
IDB_MOVE_LEFT_TO_BROWSE BITMAP "res\\move_left_to_browse.bmp"
IDB_MOVE_MIDDLE_TO_BROWSE BITMAP "res\\move_middle_to_browse.bmp"
IDB_MOVE_RIGHT_TO_BROWSE BITMAP "res\\move_right_to_browse.bmp"
IDB_VIEW_ZOOMIN BITMAP "res\\zoom_in.bmp"
IDB_VIEW_ZOOMOUT BITMAP "res\\zoom_out.bmp"
IDB_FILE_OPENCONFLICT BITMAP "res\\open_conflict.bmp"
-IDB_FILE_NEW3 BITMAP "res\\New3_16.bmp"
IDB_PLUGINS_LIST BITMAP "res\\plugins.bmp"
IDB_MERGE_COMPARE BITMAP "res\\compare.bmp"
IDB_MERGE_COMPARE_LEFT1_LEFT2 BITMAP "res\\compare_left1_left2.bmp"
IDB_MERGE_COMPARE_RIGHT1_RIGHT2 BITMAP "res\\compare_right1_right2.bmp"
IDB_MERGE_COMPARE_LEFT1_RIGHT2 BITMAP "res\\compare_left1_right2.bmp"
IDB_MERGE_COMPARE_LEFT2_RIGHT1 BITMAP "res\\compare_left2_right1.bmp"
+IDB_FILE_NEW_TABLE BITMAP "res\\new_table.bmp"
+IDB_FILE_NEW_HEX BITMAP "res\\new_hex.bmp"
+IDB_FILE_NEW_IMAGE BITMAP "res\\new_image.bmp"
+IDB_FILE_NEW_WEBPAGE BITMAP "res\\new_webpage.bmp"
+IDB_FILE_NEW3 BITMAP "res\\new3.bmp"
+IDB_FILE_NEW3_TABLE BITMAP "res\\new3_table.bmp"
+IDB_FILE_NEW3_HEX BITMAP "res\\new3_hex.bmp"
+IDB_FILE_NEW3_IMAGE BITMAP "res\\new3_image.bmp"
+IDB_FILE_NEW3_WEBPAGE BITMAP "res\\new3_webpage.bmp"
/////////////////////////////////////////////////////////////////////////////
//
BLOCK "040904e4"
BEGIN
VALUE "Comments", "\0"
- VALUE "CompanyName", "http://winmerge.org\0"
+ VALUE "CompanyName", "https://winmerge.org\0"
VALUE "FileDescription", "WinMerge\0"
VALUE "FileVersion", STRFILEVER
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "(c) 1996-2019 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "(c) 1996-2023 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMergeU.EXE\0"
VALUE "PrivateBuild", STRPRIVATEBUILD
VALUE "ProductName", "WinMerge\0"
OSDN Git Service
