Merge remote-tracking branch 'upstream/master' into jp

[winmerge-jp/winmerge-jp.git] / Src / Merge.rc

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 8ca7ca8..e3a46e7 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -1476,11 +1476,26 @@ BEGIN
     PUSHBUTTON      "Move &Up",IDC_UP,175,8,55,14\r
     PUSHBUTTON      "Move &Down",IDC_DOWN,175,26,55,14\r
     EDITTEXT        IDC_COLDLG_DESC,175,80,145,50,ES_MULTILINE | ES_READONLY\r
+    PUSHBUTTON      "&Additional Properties",IDC_COLDLG_ADDITIONAL_PROPERTIES,80,143,120,14\r
     PUSHBUTTON      "Defaults",IDC_COLDLG_DEFAULTS,7,143,70,14\r
     DEFPUSHBUTTON   "OK",IDOK,221,143,50,14\r
     PUSHBUTTON      "Cancel",IDCANCEL,275,143,50,14\r
 END\r
 \r
+IDD_DIRADDITIONALPROPS DIALOGEX 0, 0, 331, 163\r
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+CAPTION "Additional Properties"\r
+FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
+BEGIN\r
+    CONTROL         "",IDC_PROPS_TREEVIEW,"SysTreeView32", TVS_HASBUTTONS | TVS_LINESATROOT | TVS_HASLINES | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_BORDER | WS_HSCROLL | WS_TABSTOP,6,6,170,130\r
+    PUSHBUTTON      "&>",IDC_PROPS_ADD,181,40,20,14\r
+    PUSHBUTTON      "&<",IDC_PROPS_DEL,181,60,20,14\r
+    PUSHBUTTON      "<<",IDC_PROPS_DELALL,181,80,20,14\r
+    CONTROL         "",IDC_PROPS_LISTVIEW, "SysListView32", LVS_REPORT | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 205,6,120,130\r
+    DEFPUSHBUTTON   "OK",IDOK,221,143,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,275,143,50,14\r
+END\r
+\r
 IDD_PLUGINS_SELECTPLUGIN DIALOGEX 0, 0, 318, 152\r
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Select Plugin"\r
@@ -3293,6 +3308,42 @@ BEGIN
     IDS_COLHDR_BINARY       NC_("DirView|ColumnHeader", "Binary")\r
     IDS_COLHDR_UNPACKER     "Unpacker"\r
     IDS_COLHDR_PREDIFFER    "Prediffer"\r
+    IDS_COLHDR_LEFT         "Left"\r
+    IDS_COLHDR_MIDDLE       "Middle"\r
+    IDS_COLHDR_RIGHT        "Right"\r
+    IDS_COLHDR_DIFF         "Diff"\r
+    IDS_COLHDR_LEFT_DUPLICATE "Left Duplicate Count"\r
+    IDS_COLHDR_RIGHT_DUPLICATE "Right Duplicate Count"\r
+    IDS_COLHDR_MIDDLE_DUPLICATE "Middle Duplicate Count"\r
+    IDS_COLHDR_MOVE         "Move"\r
+END\r
+\r
+// DIRECTORY DIFFING : PROPERTY CATEGORIES\r
+STRINGTABLE\r
+BEGIN\r
+    IDS_PRPCAT_SYSTEM       "System"\r
+    IDS_PRPCAT_AUDIO        "Audio"\r
+    IDS_PRPCAT_CALENDAR     "Calendar"\r
+    IDS_PRPCAT_COMMUNICATION "Communication"\r
+    IDS_PRPCAT_CONTACT      "Contact"\r
+    IDS_PRPCAT_DEVICES      "Devices"\r
+    IDS_PRPCAT_DOCUMENT     "Document"\r
+    IDS_PRPCAT_HOME         "Home"\r
+    IDS_PRPCAT_IMAGE        "Image"\r
+    IDS_PRPCAT_JOURNAL      "Journal"\r
+    IDS_PRPCAT_LINK         "Link"\r
+    IDS_PRPCAT_MEDIA        "Media"\r
+    IDS_PRPCAT_MESSAGE      "Message"\r
+    IDS_PRPCAT_MUSIC        "Music"\r
+    IDS_PRPCAT_NOTE         "Note"\r
+    IDS_PRPCAT_PHOTO        "Photo"\r
+    IDS_PRPCAT_RECORDEDTV   "RecordedTV"\r
+    IDS_PRPCAT_SEARCH       "Search"\r
+    IDS_PRPCAT_SECURITY     "Security"\r
+    IDS_PRPCAT_SOFTWARE     "Software"\r
+    IDS_PRPCAT_TASK         "Task"\r
+    IDS_PRPCAT_VIDEO        "Video"\r
+    IDS_PRPCAT_HASH         "Hash"\r
 END\r
 \r
 // DIRECTORY DIFFING : FILE COMPARISON RESULT, FULL & SHORTENED FORMS\r
@@ -3330,6 +3381,7 @@ BEGIN
     IDS_TEXT_FILES_DIFF     "Text files are different"\r
     IDS_IMAGE_FILES_SAME    "Image files are identical"\r
     IDS_IMAGE_FILES_DIFF    "Image files are different"\r
+    IDS_HASH_GROUP          "Group%d"\r
 END\r
 \r
 // DIRECTORY DIFFING : SUMMARY BAR\r