PATCH: [ 954991 ] Add directory compare column descriptions

diff --git a/Src/DirColsDlg.cpp b/Src/DirColsDlg.cpp
index 05d7c09..cf9acb0 100644 (file)
--- a/Src/DirColsDlg.cpp
+++ b/Src/DirColsDlg.cpp
@@ -50,6 +50,8 @@ BEGIN_MESSAGE_MAP(CDirColsDlg, CDialog)
        ON_BN_CLICKED(IDC_REMOVE, OnRemove)
        ON_BN_CLICKED(IDC_COLDLG_DEFAULTS, OnDefaults)
        //}}AFX_MSG_MAP
+       ON_LBN_SELCHANGE(IDC_LIST_SHOW, OnLbnSelchangeListShow)
+       ON_LBN_SELCHANGE(IDC_LIST_HIDE, OnLbnSelchangeListHide)
 END_MESSAGE_MAP()
 
 /////////////////////////////////////////////////////////////////////////////
@@ -254,3 +256,49 @@ void CDirColsDlg::OnDefaults()
        m_list_hide.ResetContent();
        LoadDefLists();
 }
+
+/**
+ * @brief Update description when selected item changes.
+ */
+void CDirColsDlg::OnLbnSelchangeListShow()
+{
+       for (int i=0; i<m_list_show.GetCount(); ++i)
+       {
+               if (m_list_show.GetSel(i))
+               {
+                       int data = m_list_show.GetItemData(i);
+                       CString str;
+                       
+                       for (int j = 0; j < m_cols.GetSize(); j++)
+                       {
+                               if (m_cols.GetAt(j).log_col == data)
+                                       break;
+                       }
+                       GetDlgItem(IDC_COLDLG_DESC)->SetWindowText(m_cols[j].desc);
+                       break;
+               }
+       }
+}
+
+/**
+ * @brief Update description when selected item changes.
+ */
+void CDirColsDlg::OnLbnSelchangeListHide()
+{
+       for (int i=0; i<m_list_hide.GetCount(); ++i)
+       {
+               if (m_list_hide.GetSel(i))
+               {
+                       int data = m_list_hide.GetItemData(i);
+                       CString str;
+                       
+                       for (int j = 0; j < m_cols.GetSize(); j++)
+                       {
+                               if (m_cols.GetAt(j).log_col == data)
+                                       break;
+                       }
+                       GetDlgItem(IDC_COLDLG_DESC)->SetWindowText(m_cols[j].desc);
+                       break;
+               }
+       }
+}

diff --git a/Src/DirColsDlg.h b/Src/DirColsDlg.h
index 2a1bbee..428ad3f 100644 (file)
--- a/Src/DirColsDlg.h
+++ b/Src/DirColsDlg.h
@@ -26,20 +26,21 @@ class CDirColsDlg : public CDialog
 public:
        struct column {
                CString name;
+               CString desc;
                int log_col;
                int phy_col;
                column() : log_col(-1), phy_col(-1) { } /**< default constructor for use in CArray */
-               column(LPCTSTR sz, int log, int phy) : name(sz), log_col(log), phy_col(phy) { } 
+               column(LPCTSTR sz, LPCTSTR dsc, int log, int phy) : name(sz), desc(dsc), log_col(log), phy_col(phy) { } 
        };
        typedef CArray<column, column> ColumnArray;
 
 // Construction
 public:
        CDirColsDlg(CWnd* pParent = NULL);   // standard constructor
-       void AddColumn(CString name, int log, int phy=-1)
-               { column c(name, log, phy); m_cols.Add(c); }
+       void AddColumn(CString name, CString desc, int log, int phy=-1)
+               { column c(name, desc, log, phy); m_cols.Add(c); }
        void AddDefColumn(CString name, int log, int phy=-1)
-               { column c(name, log, phy); m_defCols.Add(c); }
+               { column c(name, _T(""), log, phy); m_defCols.Add(c); }
        const ColumnArray & GetColumns() const { return m_cols; }
 
 // Dialog Data
@@ -81,6 +82,8 @@ private:
        afx_msg void OnRemove();
        virtual void OnOK();
        afx_msg void OnDefaults();
+       afx_msg void OnLbnSelchangeListShow();
+       afx_msg void OnLbnSelchangeListHide();
        //}}AFX_MSG
        DECLARE_MESSAGE_MAP()
 };

diff --git a/Src/DirView.h b/Src/DirView.h
index 1295c48..8101145 100644 (file)
--- a/Src/DirView.h
+++ b/Src/DirView.h
@@ -170,6 +170,7 @@ private:
        int ColPhysToLog(int i) const { return m_invcolorder[i]; }
        int ColLogToPhys(int i) const { return m_colorder[i]; } /**< -1 if not displayed */
        CString GetColDisplayName(int col) const;
+       CString GetColDescription(int col) const;
        int GetColLogCount() const;
        void LoadColumnOrders();
        void ValidateColumnOrdering();

diff --git a/Src/DirViewColHandler.cpp b/Src/DirViewColHandler.cpp
index e40c83c..18cbce6 100644 (file)
--- a/Src/DirViewColHandler.cpp
+++ b/Src/DirViewColHandler.cpp
@@ -362,6 +362,17 @@ CString CDirView::GetColDisplayName(int col) const
 }
 
 /**
+ * @brief Return description of column
+ */
+CString CDirView::GetColDescription(int col) const
+{
+       const DirColInfo & colinfo = g_cols[col];
+       CString s;
+       s.LoadString(colinfo.idDesc);
+       return s;
+}
+
+/**
  * @brief Return total number of known columns
  */
 int CDirView::GetColLogCount() const
@@ -404,14 +415,14 @@ ToDoDeleteThisValidateColumnOrdering();
        for (int col=0; col<GetListCtrl().GetHeaderCtrl()->GetItemCount(); ++col)
        {
                int l = ColPhysToLog(col);
-               dlg.AddColumn(GetColDisplayName(l), l, col);
+               dlg.AddColumn(GetColDisplayName(l), GetColDescription(l), l, col);
        }
        // Now add all the columns not currently displayed
        for (int l=0; l<GetColLogCount(); ++l)
        {
                if (ColLogToPhys(l)==-1)
                {
-                       dlg.AddColumn(GetColDisplayName(l), l);
+                       dlg.AddColumn(GetColDisplayName(l), GetColDescription(l), l);
                }
        }
 

diff --git a/Src/DirViewColItems.cpp b/Src/DirViewColItems.cpp
index 1f2b5e8..0a656f9 100644 (file)
--- a/Src/DirViewColItems.cpp
+++ b/Src/DirViewColItems.cpp
@@ -372,27 +372,27 @@ static int ColEncodingSort(const CDiffContext *, const void *p, const void *q)
  */
 DirColInfo g_cols[] =
 {
-       { _T("Name"), IDS_COLHDR_FILENAME, -1, &ColFileNameGet, &ColFileNameSort, 0, 0, true },
-       { _T("Path"), IDS_COLHDR_DIR, -1, &ColPathGet, &ColNameSort, FIELD_OFFSET(DIFFITEM, sSubdir), 1, true },
-       { _T("Status"), IDS_COLHDR_RESULT, -1, &ColStatusGet, &ColStatusSort, 0, 2, true},
-       { _T("Lmtime"), IDS_COLHDR_LTIMEM, -1, &ColTimeGet, &ColTimeSort, FIELD_OFFSET(DIFFITEM, left.mtime), 3, false },
-       { _T("Rmtime"), IDS_COLHDR_RTIMEM, -1, &ColTimeGet, &ColTimeSort, FIELD_OFFSET(DIFFITEM, right.mtime), 4, false },
-       { _T("Lctime"), IDS_COLHDR_LTIMEC, -1, &ColTimeGet, &ColTimeSort, FIELD_OFFSET(DIFFITEM, left.ctime), -1, false },
-       { _T("Rctime"), IDS_COLHDR_RTIMEC, -1, &ColTimeGet, &ColTimeSort, FIELD_OFFSET(DIFFITEM, right.ctime), -1, false },
-       { _T("Ext"), IDS_COLHDR_EXTENSION, -1, &ColExtGet, &ColExtSort, FIELD_OFFSET(DIFFITEM, sfilename), 5, true },
-       { _T("Lsize"), IDS_COLHDR_LSIZE, -1, &ColSizeGet, &ColSizeSort, FIELD_OFFSET(DIFFITEM, left.size), -1, false },
-       { _T("Rsize"), IDS_COLHDR_RSIZE, -1, &ColSizeGet, &ColSizeSort, FIELD_OFFSET(DIFFITEM, right.size), -1, false },
-       { _T("Newer"), IDS_COLHDR_NEWER, -1, &ColNewerGet, &ColNewerSort, 0, -1, true },
-       { _T("Lversion"), IDS_COLHDR_LVERSION, -1, &ColNameGet, &ColNameSort, FIELD_OFFSET(DIFFITEM, left.version), -1, true },
-       { _T("Rversion"), IDS_COLHDR_RVERSION, -1, &ColNameGet, &ColNameSort, FIELD_OFFSET(DIFFITEM, right.version), -1, true },
-       { _T("StatusAbbr"), IDS_COLHDR_RESULT_ABBR, -1, &ColStatusAbbrGet, &ColStatusSort, 0, -1, true },
-       { _T("Binary"), IDS_COLHDR_BINARY, -1, &ColBinGet, &ColBinSort, 0, -1, true },
-       { _T("Lattr"), IDS_COLHDR_LATTRIBUTES, -1, &ColAttrGet, &ColAttrSort, FIELD_OFFSET(DIFFITEM, left.flags), -1, true },
-       { _T("Rattr"), IDS_COLHDR_RATTRIBUTES, -1, &ColAttrGet, &ColAttrSort, FIELD_OFFSET(DIFFITEM, right.flags), -1, true },
-       { _T("Lencoding"), IDS_COLHDR_LENCODING, -1, &ColEncodingGet, &ColEncodingSort, FIELD_OFFSET(DIFFITEM, left), -1, true },
-       { _T("Rencoding"), IDS_COLHDR_RENCODING, -1, &ColEncodingGet, &ColEncodingSort, FIELD_OFFSET(DIFFITEM, right), -1, true },
-       { _T("Sndiffs"), IDS_COLHDR_NDIFFS, -1, ColDiffsGet, ColDiffsSort, FIELD_OFFSET(DIFFITEM, ndiffs), -1, false },
-       { _T("Snsdiffs"), IDS_COLHDR_NSDIFFS, -1, ColDiffsGet, ColDiffsSort, FIELD_OFFSET(DIFFITEM, nsdiffs), -1, false },
+       { _T("Name"), IDS_COLHDR_FILENAME, IDS_COLDESC_FILENAME, &ColFileNameGet, &ColFileNameSort, 0, 0, true },
+       { _T("Path"), IDS_COLHDR_DIR, IDS_COLDESC_DIR, &ColPathGet, &ColNameSort, FIELD_OFFSET(DIFFITEM, sSubdir), 1, true },
+       { _T("Status"), IDS_COLHDR_RESULT, IDS_COLDESC_RESULT, &ColStatusGet, &ColStatusSort, 0, 2, true},
+       { _T("Lmtime"), IDS_COLHDR_LTIMEM, IDS_COLDESC_LTIMEM, &ColTimeGet, &ColTimeSort, FIELD_OFFSET(DIFFITEM, left.mtime), 3, false },
+       { _T("Rmtime"), IDS_COLHDR_RTIMEM, IDS_COLDESC_RTIMEM, &ColTimeGet, &ColTimeSort, FIELD_OFFSET(DIFFITEM, right.mtime), 4, false },
+       { _T("Lctime"), IDS_COLHDR_LTIMEC, IDS_COLDESC_LTIMEC, &ColTimeGet, &ColTimeSort, FIELD_OFFSET(DIFFITEM, left.ctime), -1, false },
+       { _T("Rctime"), IDS_COLHDR_RTIMEC, IDS_COLDESC_RTIMEC, &ColTimeGet, &ColTimeSort, FIELD_OFFSET(DIFFITEM, right.ctime), -1, false },
+       { _T("Ext"), IDS_COLHDR_EXTENSION, IDS_COLDESC_EXTENSION, &ColExtGet, &ColExtSort, FIELD_OFFSET(DIFFITEM, sfilename), 5, true },
+       { _T("Lsize"), IDS_COLHDR_LSIZE, IDS_COLDESC_LSIZE, &ColSizeGet, &ColSizeSort, FIELD_OFFSET(DIFFITEM, left.size), -1, false },
+       { _T("Rsize"), IDS_COLHDR_RSIZE, IDS_COLDESC_RSIZE, &ColSizeGet, &ColSizeSort, FIELD_OFFSET(DIFFITEM, right.size), -1, false },
+       { _T("Newer"), IDS_COLHDR_NEWER, IDS_COLDESC_NEWER, &ColNewerGet, &ColNewerSort, 0, -1, true },
+       { _T("Lversion"), IDS_COLHDR_LVERSION, IDS_COLDESC_LVERSION, &ColNameGet, &ColNameSort, FIELD_OFFSET(DIFFITEM, left.version), -1, true },
+       { _T("Rversion"), IDS_COLHDR_RVERSION, IDS_COLDESC_RVERSION, &ColNameGet, &ColNameSort, FIELD_OFFSET(DIFFITEM, right.version), -1, true },
+       { _T("StatusAbbr"), IDS_COLHDR_RESULT_ABBR, IDS_COLDESC_RESULT_ABBR, &ColStatusAbbrGet, &ColStatusSort, 0, -1, true },
+       { _T("Binary"), IDS_COLHDR_BINARY, IDS_COLDESC_BINARY, &ColBinGet, &ColBinSort, 0, -1, true },
+       { _T("Lattr"), IDS_COLHDR_LATTRIBUTES, IDS_COLDESC_LATTRIBUTES, &ColAttrGet, &ColAttrSort, FIELD_OFFSET(DIFFITEM, left.flags), -1, true },
+       { _T("Rattr"), IDS_COLHDR_RATTRIBUTES, IDS_COLDESC_RATTRIBUTES, &ColAttrGet, &ColAttrSort, FIELD_OFFSET(DIFFITEM, right.flags), -1, true },
+       { _T("Lencoding"), IDS_COLHDR_LENCODING, IDS_COLDESC_LENCODING, &ColEncodingGet, &ColEncodingSort, FIELD_OFFSET(DIFFITEM, left), -1, true },
+       { _T("Rencoding"), IDS_COLHDR_RENCODING, IDS_COLDESC_RENCODING, &ColEncodingGet, &ColEncodingSort, FIELD_OFFSET(DIFFITEM, right), -1, true },
+       { _T("Sndiffs"), IDS_COLHDR_NDIFFS, IDS_COLDESC_NDIFFS, ColDiffsGet, ColDiffsSort, FIELD_OFFSET(DIFFITEM, ndiffs), -1, false },
+       { _T("Snsdiffs"), IDS_COLHDR_NSDIFFS, IDS_COLDESC_NSDIFFS, ColDiffsGet, ColDiffsSort, FIELD_OFFSET(DIFFITEM, nsdiffs), -1, false },
 };
 
 /**

diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc
index 1b211c1..110fd90 100644 (file)
--- a/Src/Languages/Brazilian/MergeBrazilian.rc
+++ b/Src/Languages/Brazilian/MergeBrazilian.rc
@@ -684,7 +684,7 @@ BEGIN
                     WS_TABSTOP,WS_EX_STATICEDGE
 END
 
-IDD_DIRCOLS DIALOG  0, 0, 283, 143
+IDD_DIRCOLS DIALOGEX 0, 0, 283, 170
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Display Columns"
 FONT 8, "MS Sans Serif"
@@ -699,9 +699,10 @@ BEGIN
                     LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "<==",IDC_ADD,143,45,29,14
     PUSHBUTTON      "==>",IDC_REMOVE,143,63,29,14
-    PUSHBUTTON      "Defaults",IDC_COLDLG_DEFAULTS,7,122,50,14
-    DEFPUSHBUTTON   "OK",IDOK,172,122,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,226,122,50,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
 END
 
 IDD_SELECTUNPACKER DIALOG  0, 0, 293, 126
@@ -1571,6 +1572,37 @@ BEGIN
     IDS_ELAPSED_TIME        "Elapsed time: %ld ms"
 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."
+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."
+END
+
 // FILE COMPARISON RESULT : MESSAGES
 STRINGTABLE
 BEGIN

diff --git a/Src/Languages/Brazilian/resource.h b/Src/Languages/Brazilian/resource.h
index 2be12db..73508ff 100644 (file)
--- a/Src/Languages/Brazilian/resource.h
+++ b/Src/Languages/Brazilian/resource.h
@@ -200,6 +200,7 @@
 #define IDC_STATIC_TITLE_LEFT           1133
 #define IDC_STATIC_TITLE_RIGHT          1134
 #define IDC_SELECT_FILTER               1135
+#define IDC_COLDLG_DESC                 1136
 
 
 #define IDC_EDIT_WHOLE_WORD             8603
@@ -397,6 +398,28 @@
 
 #define IDS_ELAPSED_TIME                17744
 
+#define IDS_COLDESC_FILENAME            17760
+#define IDS_COLDESC_DIR                 17761
+#define IDS_COLDESC_RESULT              17762
+#define IDS_COLDESC_LTIMEM              17763
+#define IDS_COLDESC_RTIMEM              17764
+#define IDS_COLDESC_EXTENSION           17765
+#define IDS_COLDESC_LSIZE               17766
+#define IDS_COLDESC_RSIZE               17767
+#define IDS_COLDESC_LTIMEC              17768
+#define IDS_COLDESC_RTIMEC              17769
+#define IDS_COLDESC_NEWER               17770
+#define IDS_COLDESC_LVERSION            17771
+#define IDS_COLDESC_RVERSION            17772
+#define IDS_COLDESC_RESULT_ABBR         17773
+#define IDS_COLDESC_LATTRIBUTES         17774
+#define IDS_COLDESC_RATTRIBUTES         17775
+#define IDS_COLDESC_LENCODING           17776
+#define IDS_COLDESC_RENCODING           17777
+#define IDS_COLDESC_NDIFFS              17778
+#define IDS_COLDESC_NSDIFFS             17779
+#define IDS_COLDESC_BINARY              17780
+
 #define IDS_FILE_TO_ITSELF              18000
 #define IDS_FILESSAME                   18001
 #define IDS_FILEUNIQUE                  18002
@@ -669,7 +692,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        162
 #define _APS_NEXT_COMMAND_VALUE         33088
-#define _APS_NEXT_CONTROL_VALUE         1136
+#define _APS_NEXT_CONTROL_VALUE         1137
 #define _APS_NEXT_SYMED_VALUE           106
 #endif
 #endif

diff --git a/Src/Languages/Bulgarian/MergeBulgarian.rc b/Src/Languages/Bulgarian/MergeBulgarian.rc
index 60d834f..0ffaf8e 100644 (file)
--- a/Src/Languages/Bulgarian/MergeBulgarian.rc
+++ b/Src/Languages/Bulgarian/MergeBulgarian.rc
@@ -685,7 +685,7 @@ BEGIN
                     WS_TABSTOP,WS_EX_STATICEDGE
 END
 
-IDD_DIRCOLS DIALOG  0, 0, 283, 143
+IDD_DIRCOLS DIALOGEX 0, 0, 283, 170
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Ïîêàçâàé ãðàôèòå"
 FONT 8, "MS Sans Serif"
@@ -700,9 +700,10 @@ BEGIN
                     LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "<==",IDC_ADD,143,45,29,14
     PUSHBUTTON      "==>",IDC_REMOVE,143,63,29,14
-    PUSHBUTTON      "Defaults",IDC_COLDLG_DEFAULTS,7,122,50,14
-    DEFPUSHBUTTON   "Äîáðå",IDOK,172,122,50,14
-    PUSHBUTTON      "Ïðåêðàòè",IDCANCEL,226,122,50,14
+    EDITTEXT        IDC_COLDLG_DESC,7,122,269,22,ES_MULTILINE | ES_READONLY
+    PUSHBUTTON      "Defaults",IDC_COLDLG_DEFAULTS,7,149,50,14
+    DEFPUSHBUTTON   "Äîáðå",IDOK,172,149,50,14
+    PUSHBUTTON      "Ïðåêðàòè",IDCANCEL,226,149,50,14
 END
 
 IDD_SELECTUNPACKER DIALOG  0, 0, 293, 126
@@ -1458,6 +1459,37 @@ BEGIN
     IDS_ELAPSED_TIME        "Îñòàâàùî âðåìå: %ld ms"
 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."
+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."
+END
+
 // FILE COMPARISON RESULT : MESSAGES
 STRINGTABLE
 BEGIN

diff --git a/Src/Languages/Bulgarian/resource.h b/Src/Languages/Bulgarian/resource.h
index 2be12db..73508ff 100644 (file)
--- a/Src/Languages/Bulgarian/resource.h
+++ b/Src/Languages/Bulgarian/resource.h
@@ -200,6 +200,7 @@
 #define IDC_STATIC_TITLE_LEFT           1133
 #define IDC_STATIC_TITLE_RIGHT          1134
 #define IDC_SELECT_FILTER               1135
+#define IDC_COLDLG_DESC                 1136
 
 
 #define IDC_EDIT_WHOLE_WORD             8603
@@ -397,6 +398,28 @@
 
 #define IDS_ELAPSED_TIME                17744
 
+#define IDS_COLDESC_FILENAME            17760
+#define IDS_COLDESC_DIR                 17761
+#define IDS_COLDESC_RESULT              17762
+#define IDS_COLDESC_LTIMEM              17763
+#define IDS_COLDESC_RTIMEM              17764
+#define IDS_COLDESC_EXTENSION           17765
+#define IDS_COLDESC_LSIZE               17766
+#define IDS_COLDESC_RSIZE               17767
+#define IDS_COLDESC_LTIMEC              17768
+#define IDS_COLDESC_RTIMEC              17769
+#define IDS_COLDESC_NEWER               17770
+#define IDS_COLDESC_LVERSION            17771
+#define IDS_COLDESC_RVERSION            17772
+#define IDS_COLDESC_RESULT_ABBR         17773
+#define IDS_COLDESC_LATTRIBUTES         17774
+#define IDS_COLDESC_RATTRIBUTES         17775
+#define IDS_COLDESC_LENCODING           17776
+#define IDS_COLDESC_RENCODING           17777
+#define IDS_COLDESC_NDIFFS              17778
+#define IDS_COLDESC_NSDIFFS             17779
+#define IDS_COLDESC_BINARY              17780
+
 #define IDS_FILE_TO_ITSELF              18000
 #define IDS_FILESSAME                   18001
 #define IDS_FILEUNIQUE                  18002
@@ -669,7 +692,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        162
 #define _APS_NEXT_COMMAND_VALUE         33088
-#define _APS_NEXT_CONTROL_VALUE         1136
+#define _APS_NEXT_CONTROL_VALUE         1137
 #define _APS_NEXT_SYMED_VALUE           106
 #endif
 #endif

diff --git a/Src/Languages/Catalan/MergeCatalan.rc b/Src/Languages/Catalan/MergeCatalan.rc
index 2394f9d..4be7273 100644 (file)
--- a/Src/Languages/Catalan/MergeCatalan.rc
+++ b/Src/Languages/Catalan/MergeCatalan.rc
@@ -682,8 +682,8 @@ BEGIN
                     WS_TABSTOP,WS_EX_STATICEDGE
 END
 
-IDD_DIRCOLS DIALOG  0, 0, 283, 143
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
+IDD_DIRCOLS DIALOGEX 0, 0, 283, 170
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Visualització de columnes"
 FONT 8, "MS Sans Serif"
 BEGIN
@@ -697,9 +697,10 @@ BEGIN
                     LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
     PUSHBUTTON      "<<",IDC_ADD,141,45,29,13
     PUSHBUTTON      ">>",IDC_REMOVE,141,63,29,13
-    PUSHBUTTON      "Defaults",IDC_COLDLG_DEFAULTS,7,122,50,14
-    DEFPUSHBUTTON   "D'acord",IDOK,172,122,50,14
-    PUSHBUTTON      "Anul·la",IDCANCEL,226,122,50,14
+    EDITTEXT        IDC_COLDLG_DESC,7,122,269,22,ES_MULTILINE | ES_READONLY
+    PUSHBUTTON      "Defaults",IDC_COLDLG_DEFAULTS,7,149,50,14
+    DEFPUSHBUTTON   "D'acord",IDOK,172,149,50,14
+    PUSHBUTTON      "Anul·la",IDCANCEL,226,149,50,14
 END
 
 IDD_SELECTUNPACKER DIALOG  0, 0, 293, 126
@@ -1583,6 +1584,37 @@ BEGIN
     IDS_ELAPSED_TIME        "Elapsed time: %ld ms"
 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."
+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."
+END
+
 // FILE COMPARISON RESULT : MESSAGES
 STRINGTABLE
 BEGIN

diff --git a/Src/Languages/Catalan/resource.h b/Src/Languages/Catalan/resource.h
index 2be12db..73508ff 100644 (file)
--- a/Src/Languages/Catalan/resource.h
+++ b/Src/Languages/Catalan/resource.h
@@ -200,6 +200,7 @@
 #define IDC_STATIC_TITLE_LEFT           1133
 #define IDC_STATIC_TITLE_RIGHT          1134
 #define IDC_SELECT_FILTER               1135
+#define IDC_COLDLG_DESC                 1136
 
 
 #define IDC_EDIT_WHOLE_WORD             8603
@@ -397,6 +398,28 @@
 
 #define IDS_ELAPSED_TIME                17744
 
+#define IDS_COLDESC_FILENAME            17760
+#define IDS_COLDESC_DIR                 17761
+#define IDS_COLDESC_RESULT              17762
+#define IDS_COLDESC_LTIMEM              17763
+#define IDS_COLDESC_RTIMEM              17764
+#define IDS_COLDESC_EXTENSION           17765
+#define IDS_COLDESC_LSIZE               17766
+#define IDS_COLDESC_RSIZE               17767
+#define IDS_COLDESC_LTIMEC              17768
+#define IDS_COLDESC_RTIMEC              17769
+#define IDS_COLDESC_NEWER               17770
+#define IDS_COLDESC_LVERSION            17771
+#define IDS_COLDESC_RVERSION            17772
+#define IDS_COLDESC_RESULT_ABBR         17773
+#define IDS_COLDESC_LATTRIBUTES         17774
+#define IDS_COLDESC_RATTRIBUTES         17775
+#define IDS_COLDESC_LENCODING           17776
+#define IDS_COLDESC_RENCODING           17777
+#define IDS_COLDESC_NDIFFS              17778
+#define IDS_COLDESC_NSDIFFS             17779
+#define IDS_COLDESC_BINARY              17780
+
 #define IDS_FILE_TO_ITSELF              18000
 #define IDS_FILESSAME                   18001
 #define IDS_FILEUNIQUE                  18002
@@ -669,7 +692,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        162
 #define _APS_NEXT_COMMAND_VALUE         33088
-#define _APS_NEXT_CONTROL_VALUE         1136
+#define _APS_NEXT_CONTROL_VALUE         1137
 #define _APS_NEXT_SYMED_VALUE           106
 #endif
 #endif

diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
index 835a0b6..a2af90e 100644 (file)
--- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
+++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
@@ -671,8 +671,8 @@ BEGIN
                     WS_TABSTOP,WS_EX_STATICEDGE
 END
 
-IDD_DIRCOLS DIALOG  0, 0, 283, 143
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+IDD_DIRCOLS DIALOGEX 0, 0, 283, 170
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Display Columns"
 FONT 8, "MS Sans Serif"
 BEGIN
@@ -686,9 +686,10 @@ BEGIN
                     LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "<==",IDC_ADD,143,45,29,14
     PUSHBUTTON      "==>",IDC_REMOVE,143,63,29,14
-    PUSHBUTTON      "Defaults",IDC_COLDLG_DEFAULTS,7,122,50,14
-    DEFPUSHBUTTON   "OK",IDOK,172,122,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,226,122,50,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
 END
 
 IDD_SELECTUNPACKER DIALOG  0, 0, 293, 126
@@ -1441,6 +1442,37 @@ BEGIN
     IDS_ELAPSED_TIME        "Elapsed time: %ld ms"
 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."
+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."
+END
+
 // FILE COMPARISON RESULT : MESSAGES
 STRINGTABLE
 BEGIN

diff --git a/Src/Languages/ChineseSimplified/resource.h b/Src/Languages/ChineseSimplified/resource.h
index 2be12db..73508ff 100644 (file)
--- a/Src/Languages/ChineseSimplified/resource.h
+++ b/Src/Languages/ChineseSimplified/resource.h
@@ -200,6 +200,7 @@
 #define IDC_STATIC_TITLE_LEFT           1133
 #define IDC_STATIC_TITLE_RIGHT          1134
 #define IDC_SELECT_FILTER               1135
+#define IDC_COLDLG_DESC                 1136
 
 
 #define IDC_EDIT_WHOLE_WORD             8603
@@ -397,6 +398,28 @@
 
 #define IDS_ELAPSED_TIME                17744
 
+#define IDS_COLDESC_FILENAME            17760
+#define IDS_COLDESC_DIR                 17761
+#define IDS_COLDESC_RESULT              17762
+#define IDS_COLDESC_LTIMEM              17763
+#define IDS_COLDESC_RTIMEM              17764
+#define IDS_COLDESC_EXTENSION           17765
+#define IDS_COLDESC_LSIZE               17766
+#define IDS_COLDESC_RSIZE               17767
+#define IDS_COLDESC_LTIMEC              17768
+#define IDS_COLDESC_RTIMEC              17769
+#define IDS_COLDESC_NEWER               17770
+#define IDS_COLDESC_LVERSION            17771
+#define IDS_COLDESC_RVERSION            17772
+#define IDS_COLDESC_RESULT_ABBR         17773
+#define IDS_COLDESC_LATTRIBUTES         17774
+#define IDS_COLDESC_RATTRIBUTES         17775
+#define IDS_COLDESC_LENCODING           17776
+#define IDS_COLDESC_RENCODING           17777
+#define IDS_COLDESC_NDIFFS              17778
+#define IDS_COLDESC_NSDIFFS             17779
+#define IDS_COLDESC_BINARY              17780
+
 #define IDS_FILE_TO_ITSELF              18000
 #define IDS_FILESSAME                   18001
 #define IDS_FILEUNIQUE                  18002
@@ -669,7 +692,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        162
 #define _APS_NEXT_COMMAND_VALUE         33088
-#define _APS_NEXT_CONTROL_VALUE         1136
+#define _APS_NEXT_CONTROL_VALUE         1137
 #define _APS_NEXT_SYMED_VALUE           106
 #endif
 #endif

diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
index 606ce39..2abcfc5 100644 (file)
--- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
+++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
@@ -672,8 +672,8 @@ BEGIN
                     WS_TABSTOP,WS_EX_STATICEDGE
 END
 
-IDD_DIRCOLS DIALOG  0, 0, 283, 143
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+IDD_DIRCOLS DIALOGEX 0, 0, 283, 170
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Display Columns"
 FONT 8, "MS Sans Serif"
 BEGIN
@@ -687,9 +687,10 @@ BEGIN
                     LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "<==",IDC_ADD,143,45,29,14
     PUSHBUTTON      "==>",IDC_REMOVE,143,63,29,14
-    PUSHBUTTON      "Defaults",IDC_COLDLG_DEFAULTS,7,122,50,14
-    DEFPUSHBUTTON   "OK",IDOK,172,122,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,226,122,50,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
 END
 
 IDD_SELECTUNPACKER DIALOG  0, 0, 293, 126
@@ -1555,6 +1556,37 @@ BEGIN
     IDS_ELAPSED_TIME        "Elapsed time: %ld ms"
 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."
+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."
+END
+
 // FILE COMPARISON RESULT : MESSAGES
 STRINGTABLE
 BEGIN

diff --git a/Src/Languages/ChineseTraditional/resource.h b/Src/Languages/ChineseTraditional/resource.h
index 2be12db..73508ff 100644 (file)
--- a/Src/Languages/ChineseTraditional/resource.h
+++ b/Src/Languages/ChineseTraditional/resource.h
@@ -200,6 +200,7 @@
 #define IDC_STATIC_TITLE_LEFT           1133
 #define IDC_STATIC_TITLE_RIGHT          1134
 #define IDC_SELECT_FILTER               1135
+#define IDC_COLDLG_DESC                 1136
 
 
 #define IDC_EDIT_WHOLE_WORD             8603
@@ -397,6 +398,28 @@
 
 #define IDS_ELAPSED_TIME                17744
 
+#define IDS_COLDESC_FILENAME            17760
+#define IDS_COLDESC_DIR                 17761
+#define IDS_COLDESC_RESULT              17762
+#define IDS_COLDESC_LTIMEM              17763
+#define IDS_COLDESC_RTIMEM              17764
+#define IDS_COLDESC_EXTENSION           17765
+#define IDS_COLDESC_LSIZE               17766
+#define IDS_COLDESC_RSIZE               17767
+#define IDS_COLDESC_LTIMEC              17768
+#define IDS_COLDESC_RTIMEC              17769
+#define IDS_COLDESC_NEWER               17770
+#define IDS_COLDESC_LVERSION            17771
+#define IDS_COLDESC_RVERSION            17772
+#define IDS_COLDESC_RESULT_ABBR         17773
+#define IDS_COLDESC_LATTRIBUTES         17774
+#define IDS_COLDESC_RATTRIBUTES         17775
+#define IDS_COLDESC_LENCODING           17776
+#define IDS_COLDESC_RENCODING           17777
+#define IDS_COLDESC_NDIFFS              17778
+#define IDS_COLDESC_NSDIFFS             17779
+#define IDS_COLDESC_BINARY              17780
+
 #define IDS_FILE_TO_ITSELF              18000
 #define IDS_FILESSAME                   18001
 #define IDS_FILEUNIQUE                  18002
@@ -669,7 +692,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        162
 #define _APS_NEXT_COMMAND_VALUE         33088
-#define _APS_NEXT_CONTROL_VALUE         1136
+#define _APS_NEXT_CONTROL_VALUE         1137
 #define _APS_NEXT_SYMED_VALUE           106
 #endif
 #endif

diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc
index f982dc5..3a49b20 100644 (file)
--- a/Src/Languages/Czech/MergeCzech.rc
+++ b/Src/Languages/Czech/MergeCzech.rc
@@ -682,8 +682,8 @@ BEGIN
                     WS_TABSTOP,WS_EX_STATICEDGE
 END
 
-IDD_DIRCOLS DIALOG  0, 0, 283, 143
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+IDD_DIRCOLS DIALOGEX 0, 0, 283, 170
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Display Columns"
 FONT 8, "MS Sans Serif"
 BEGIN
@@ -697,9 +697,10 @@ BEGIN
                     LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "<==",IDC_ADD,143,45,29,14
     PUSHBUTTON      "==>",IDC_REMOVE,143,63,29,14
-    PUSHBUTTON      "Defaults",IDC_COLDLG_DEFAULTS,7,122,50,14
-    DEFPUSHBUTTON   "OK",IDOK,172,122,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,226,122,50,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
 END
 
 IDD_SELECTUNPACKER DIALOG  0, 0, 293, 126

diff --git a/Src/Languages/Czech/resource.h b/Src/Languages/Czech/resource.h
index 2be12db..73508ff 100644 (file)
--- a/Src/Languages/Czech/resource.h
+++ b/Src/Languages/Czech/resource.h
@@ -200,6 +200,7 @@
 #define IDC_STATIC_TITLE_LEFT           1133
 #define IDC_STATIC_TITLE_RIGHT          1134
 #define IDC_SELECT_FILTER               1135
+#define IDC_COLDLG_DESC                 1136
 
 
 #define IDC_EDIT_WHOLE_WORD             8603
@@ -397,6 +398,28 @@
 
 #define IDS_ELAPSED_TIME                17744
 
+#define IDS_COLDESC_FILENAME            17760
+#define IDS_COLDESC_DIR                 17761
+#define IDS_COLDESC_RESULT              17762
+#define IDS_COLDESC_LTIMEM              17763
+#define IDS_COLDESC_RTIMEM              17764
+#define IDS_COLDESC_EXTENSION           17765
+#define IDS_COLDESC_LSIZE               17766
+#define IDS_COLDESC_RSIZE               17767
+#define IDS_COLDESC_LTIMEC              17768
+#define IDS_COLDESC_RTIMEC              17769
+#define IDS_COLDESC_NEWER               17770
+#define IDS_COLDESC_LVERSION            17771
+#define IDS_COLDESC_RVERSION            17772
+#define IDS_COLDESC_RESULT_ABBR         17773
+#define IDS_COLDESC_LATTRIBUTES         17774
+#define IDS_COLDESC_RATTRIBUTES         17775
+#define IDS_COLDESC_LENCODING           17776
+#define IDS_COLDESC_RENCODING           17777
+#define IDS_COLDESC_NDIFFS              17778
+#define IDS_COLDESC_NSDIFFS             17779
+#define IDS_COLDESC_BINARY              17780
+
 #define IDS_FILE_TO_ITSELF              18000
 #define IDS_FILESSAME                   18001
 #define IDS_FILEUNIQUE                  18002
@@ -669,7 +692,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        162
 #define _APS_NEXT_COMMAND_VALUE         33088
-#define _APS_NEXT_CONTROL_VALUE         1136
+#define _APS_NEXT_CONTROL_VALUE         1137
 #define _APS_NEXT_SYMED_VALUE           106
 #endif
 #endif

diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc
index 377b87f..7a5aab6 100644 (file)
--- a/Src/Languages/Danish/MergeDanish.rc
+++ b/Src/Languages/Danish/MergeDanish.rc
@@ -680,8 +680,8 @@ BEGIN
                     WS_TABSTOP,WS_EX_STATICEDGE
 END
 
-IDD_DIRCOLS DIALOG  0, 0, 283, 143
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+IDD_DIRCOLS DIALOGEX 0, 0, 283, 170
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Display Columns"
 FONT 8, "MS Sans Serif"
 BEGIN
@@ -695,9 +695,10 @@ BEGIN
                     LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "<==",IDC_ADD,143,45,29,14
     PUSHBUTTON      "==>",IDC_REMOVE,143,63,29,14
-    PUSHBUTTON      "Defaults",IDC_COLDLG_DEFAULTS,7,122,50,14
-    DEFPUSHBUTTON   "OK",IDOK,172,122,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,226,122,50,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
 END
 
 IDD_SELECTUNPACKER DIALOG  0, 0, 293, 126
@@ -1360,6 +1361,7 @@ BEGIN
     IDS_FILTERFILE_NAMETITLE "Name"
     IDS_FILTERFILE_PATHTITLE "Location"
     IDS_FILTER_TITLE        "Filters"
+    IDS_FILTER_PREFIX       "[F] "
 END
 
 // VERSION CONTROL OPTIONS
@@ -1565,6 +1567,37 @@ BEGIN
     IDS_ELAPSED_TIME        "Elapsed time: %ld ms"
 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."
+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."
+END
+
 // FILE COMPARISON RESULT : MESSAGES
 STRINGTABLE
 BEGIN

diff --git a/Src/Languages/Danish/resource.h b/Src/Languages/Danish/resource.h
index 2be12db..73508ff 100644 (file)
--- a/Src/Languages/Danish/resource.h
+++ b/Src/Languages/Danish/resource.h
@@ -200,6 +200,7 @@
 #define IDC_STATIC_TITLE_LEFT           1133
 #define IDC_STATIC_TITLE_RIGHT          1134
 #define IDC_SELECT_FILTER               1135
+#define IDC_COLDLG_DESC                 1136
 
 
 #define IDC_EDIT_WHOLE_WORD             8603
@@ -397,6 +398,28 @@
 
 #define IDS_ELAPSED_TIME                17744
 
+#define IDS_COLDESC_FILENAME            17760
+#define IDS_COLDESC_DIR                 17761
+#define IDS_COLDESC_RESULT              17762
+#define IDS_COLDESC_LTIMEM              17763
+#define IDS_COLDESC_RTIMEM              17764
+#define IDS_COLDESC_EXTENSION           17765
+#define IDS_COLDESC_LSIZE               17766
+#define IDS_COLDESC_RSIZE               17767
+#define IDS_COLDESC_LTIMEC              17768
+#define IDS_COLDESC_RTIMEC              17769
+#define IDS_COLDESC_NEWER               17770
+#define IDS_COLDESC_LVERSION            17771
+#define IDS_COLDESC_RVERSION            17772
+#define IDS_COLDESC_RESULT_ABBR         17773
+#define IDS_COLDESC_LATTRIBUTES         17774
+#define IDS_COLDESC_RATTRIBUTES         17775
+#define IDS_COLDESC_LENCODING           17776
+#define IDS_COLDESC_RENCODING           17777
+#define IDS_COLDESC_NDIFFS              17778
+#define IDS_COLDESC_NSDIFFS             17779
+#define IDS_COLDESC_BINARY              17780
+
 #define IDS_FILE_TO_ITSELF              18000
 #define IDS_FILESSAME                   18001
 #define IDS_FILEUNIQUE                  18002
@@ -669,7 +692,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        162
 #define _APS_NEXT_COMMAND_VALUE         33088
-#define _APS_NEXT_CONTROL_VALUE         1136
+#define _APS_NEXT_CONTROL_VALUE         1137
 #define _APS_NEXT_SYMED_VALUE           106
 #endif
 #endif

diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc
index c208e8a..da26a98 100644 (file)
--- a/Src/Languages/Dutch/MergeDutch.rc
+++ b/Src/Languages/Dutch/MergeDutch.rc
@@ -683,8 +683,8 @@ BEGIN
                     WS_TABSTOP,WS_EX_STATICEDGE
 END
 
-IDD_DIRCOLS DIALOG  0, 0, 283, 143
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+IDD_DIRCOLS DIALOGEX 0, 0, 283, 170
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Display Columns"
 FONT 8, "MS Sans Serif"
 BEGIN
@@ -698,9 +698,10 @@ BEGIN
                     LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "<==",IDC_ADD,143,45,29,14
     PUSHBUTTON      "==>",IDC_REMOVE,143,63,29,14
-    PUSHBUTTON      "Defaults",IDC_COLDLG_DEFAULTS,7,122,50,14
-    DEFPUSHBUTTON   "OK",IDOK,172,122,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,226,122,50,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
 END
 
 IDD_SELECTUNPACKER DIALOG  0, 0, 293, 126
@@ -1570,6 +1571,37 @@ BEGIN
     IDS_ELAPSED_TIME        "Elapsed time: %ld ms"
 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."
+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."
+END
+
 // FILE COMPARISON RESULT : MESSAGES
 STRINGTABLE
 BEGIN

diff --git a/Src/Languages/Dutch/resource.h b/Src/Languages/Dutch/resource.h
index 2be12db..73508ff 100644 (file)
--- a/Src/Languages/Dutch/resource.h
+++ b/Src/Languages/Dutch/resource.h
@@ -200,6 +200,7 @@
 #define IDC_STATIC_TITLE_LEFT           1133
 #define IDC_STATIC_TITLE_RIGHT          1134
 #define IDC_SELECT_FILTER               1135
+#define IDC_COLDLG_DESC                 1136
 
 
 #define IDC_EDIT_WHOLE_WORD             8603
@@ -397,6 +398,28 @@
 
 #define IDS_ELAPSED_TIME                17744
 
+#define IDS_COLDESC_FILENAME            17760
+#define IDS_COLDESC_DIR                 17761
+#define IDS_COLDESC_RESULT              17762
+#define IDS_COLDESC_LTIMEM              17763
+#define IDS_COLDESC_RTIMEM              17764
+#define IDS_COLDESC_EXTENSION           17765
+#define IDS_COLDESC_LSIZE               17766
+#define IDS_COLDESC_RSIZE               17767
+#define IDS_COLDESC_LTIMEC              17768
+#define IDS_COLDESC_RTIMEC              17769
+#define IDS_COLDESC_NEWER               17770
+#define IDS_COLDESC_LVERSION            17771
+#define IDS_COLDESC_RVERSION            17772
+#define IDS_COLDESC_RESULT_ABBR         17773
+#define IDS_COLDESC_LATTRIBUTES         17774
+#define IDS_COLDESC_RATTRIBUTES         17775
+#define IDS_COLDESC_LENCODING           17776
+#define IDS_COLDESC_RENCODING           17777
+#define IDS_COLDESC_NDIFFS              17778
+#define IDS_COLDESC_NSDIFFS             17779
+#define IDS_COLDESC_BINARY              17780
+
 #define IDS_FILE_TO_ITSELF              18000
 #define IDS_FILESSAME                   18001
 #define IDS_FILEUNIQUE                  18002
@@ -669,7 +692,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        162
 #define _APS_NEXT_COMMAND_VALUE         33088
-#define _APS_NEXT_CONTROL_VALUE         1136
+#define _APS_NEXT_CONTROL_VALUE         1137
 #define _APS_NEXT_SYMED_VALUE           106
 #endif
 #endif

diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc
index e78c71c..9a11dcc 100644 (file)
--- a/Src/Languages/French/MergeFrench.rc
+++ b/Src/Languages/French/MergeFrench.rc
@@ -683,8 +683,8 @@ BEGIN
                     WS_TABSTOP,WS_EX_STATICEDGE
 END
 
-IDD_DIRCOLS DIALOG  0, 0, 283, 143
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+IDD_DIRCOLS DIALOGEX 0, 0, 283, 170
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Display Columns"
 FONT 8, "MS Sans Serif"
 BEGIN
@@ -698,9 +698,10 @@ BEGIN
                     LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "<==",IDC_ADD,143,45,29,14
     PUSHBUTTON      "==>",IDC_REMOVE,143,63,29,14
-    PUSHBUTTON      "Defaults",IDC_COLDLG_DEFAULTS,7,122,50,14
-    DEFPUSHBUTTON   "OK",IDOK,172,122,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,226,122,50,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
 END
 
 IDD_SELECTUNPACKER DIALOG  0, 0, 293, 126

diff --git a/Src/Languages/French/resource.h b/Src/Languages/French/resource.h
index 2be12db..73508ff 100644 (file)
--- a/Src/Languages/French/resource.h
+++ b/Src/Languages/French/resource.h
@@ -200,6 +200,7 @@
 #define IDC_STATIC_TITLE_LEFT           1133
 #define IDC_STATIC_TITLE_RIGHT          1134
 #define IDC_SELECT_FILTER               1135
+#define IDC_COLDLG_DESC                 1136
 
 
 #define IDC_EDIT_WHOLE_WORD             8603
@@ -397,6 +398,28 @@
 
 #define IDS_ELAPSED_TIME                17744
 
+#define IDS_COLDESC_FILENAME            17760
+#define IDS_COLDESC_DIR                 17761
+#define IDS_COLDESC_RESULT              17762
+#define IDS_COLDESC_LTIMEM              17763
+#define IDS_COLDESC_RTIMEM              17764
+#define IDS_COLDESC_EXTENSION           17765
+#define IDS_COLDESC_LSIZE               17766
+#define IDS_COLDESC_RSIZE               17767
+#define IDS_COLDESC_LTIMEC              17768
+#define IDS_COLDESC_RTIMEC              17769
+#define IDS_COLDESC_NEWER               17770
+#define IDS_COLDESC_LVERSION            17771
+#define IDS_COLDESC_RVERSION            17772
+#define IDS_COLDESC_RESULT_ABBR         17773
+#define IDS_COLDESC_LATTRIBUTES         17774
+#define IDS_COLDESC_RATTRIBUTES         17775
+#define IDS_COLDESC_LENCODING           17776
+#define IDS_COLDESC_RENCODING           17777
+#define IDS_COLDESC_NDIFFS              17778
+#define IDS_COLDESC_NSDIFFS             17779
+#define IDS_COLDESC_BINARY              17780
+
 #define IDS_FILE_TO_ITSELF              18000
 #define IDS_FILESSAME                   18001
 #define IDS_FILEUNIQUE                  18002
@@ -669,7 +692,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        162
 #define _APS_NEXT_COMMAND_VALUE         33088
-#define _APS_NEXT_CONTROL_VALUE         1136
+#define _APS_NEXT_CONTROL_VALUE         1137
 #define _APS_NEXT_SYMED_VALUE           106
 #endif
 #endif

diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc
index 569f228..101ea00 100644 (file)
--- a/Src/Languages/German/MergeGerman.rc
+++ b/Src/Languages/German/MergeGerman.rc
@@ -691,7 +691,7 @@ BEGIN
                     WS_TABSTOP,WS_EX_STATICEDGE
 END
 
-IDD_DIRCOLS DIALOG  0, 0, 283, 143
+IDD_DIRCOLS DIALOGEX 0, 0, 283, 170
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Spalten anpassen"
 FONT 8, "MS Sans Serif"
@@ -706,9 +706,10 @@ BEGIN
                     LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "<==",IDC_ADD,143,45,29,14
     PUSHBUTTON      "==>",IDC_REMOVE,143,63,29,14
-    PUSHBUTTON      "Vorgaben",IDC_COLDLG_DEFAULTS,7,122,50,14
-    DEFPUSHBUTTON   "OK",IDOK,172,122,50,14
-    PUSHBUTTON      "Abbruch",IDCANCEL,226,122,50,14
+    EDITTEXT        IDC_COLDLG_DESC,7,122,269,22,ES_MULTILINE | ES_READONLY
+    PUSHBUTTON      "Vorgaben",IDC_COLDLG_DEFAULTS,7,149,50,14
+    DEFPUSHBUTTON   "OK",IDOK,172,149,50,14
+    PUSHBUTTON      "Abbruch",IDCANCEL,226,149,50,14
 END
 
 IDD_SELECTUNPACKER DIALOG  0, 0, 293, 126
@@ -1572,6 +1573,37 @@ BEGIN
     IDS_ELAPSED_TIME        "Ausführungszeit: %ld ms"
 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."
+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."
+END
+
 // FILE COMPARISON RESULT : MESSAGES
 STRINGTABLE
 BEGIN

diff --git a/Src/Languages/German/resource.h b/Src/Languages/German/resource.h
index 2be12db..73508ff 100644 (file)
--- a/Src/Languages/German/resource.h
+++ b/Src/Languages/German/resource.h
@@ -200,6 +200,7 @@
 #define IDC_STATIC_TITLE_LEFT           1133
 #define IDC_STATIC_TITLE_RIGHT          1134
 #define IDC_SELECT_FILTER               1135
+#define IDC_COLDLG_DESC                 1136
 
 
 #define IDC_EDIT_WHOLE_WORD             8603
@@ -397,6 +398,28 @@
 
 #define IDS_ELAPSED_TIME                17744
 
+#define IDS_COLDESC_FILENAME            17760
+#define IDS_COLDESC_DIR                 17761
+#define IDS_COLDESC_RESULT              17762
+#define IDS_COLDESC_LTIMEM              17763
+#define IDS_COLDESC_RTIMEM              17764
+#define IDS_COLDESC_EXTENSION           17765
+#define IDS_COLDESC_LSIZE               17766
+#define IDS_COLDESC_RSIZE               17767
+#define IDS_COLDESC_LTIMEC              17768
+#define IDS_COLDESC_RTIMEC              17769
+#define IDS_COLDESC_NEWER               17770
+#define IDS_COLDESC_LVERSION            17771
+#define IDS_COLDESC_RVERSION            17772
+#define IDS_COLDESC_RESULT_ABBR         17773
+#define IDS_COLDESC_LATTRIBUTES         17774
+#define IDS_COLDESC_RATTRIBUTES         17775
+#define IDS_COLDESC_LENCODING           17776
+#define IDS_COLDESC_RENCODING           17777
+#define IDS_COLDESC_NDIFFS              17778
+#define IDS_COLDESC_NSDIFFS             17779
+#define IDS_COLDESC_BINARY              17780
+
 #define IDS_FILE_TO_ITSELF              18000
 #define IDS_FILESSAME                   18001
 #define IDS_FILEUNIQUE                  18002
@@ -669,7 +692,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        162
 #define _APS_NEXT_COMMAND_VALUE         33088
-#define _APS_NEXT_CONTROL_VALUE         1136
+#define _APS_NEXT_CONTROL_VALUE         1137
 #define _APS_NEXT_SYMED_VALUE           106
 #endif
 #endif

diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc
index e2ecd26..74c6982 100644 (file)
--- a/Src/Languages/Italian/MergeItalian.rc
+++ b/Src/Languages/Italian/MergeItalian.rc
@@ -681,8 +681,8 @@ BEGIN
                     WS_TABSTOP,WS_EX_STATICEDGE
 END
 
-IDD_DIRCOLS DIALOG  0, 0, 283, 143
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+IDD_DIRCOLS DIALOGEX 0, 0, 283, 170
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Display Columns"
 FONT 8, "MS Sans Serif"
 BEGIN
@@ -696,9 +696,10 @@ BEGIN
                     LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "<==",IDC_ADD,143,45,29,14
     PUSHBUTTON      "==>",IDC_REMOVE,143,63,29,14
-    PUSHBUTTON      "Defaults",IDC_COLDLG_DEFAULTS,7,122,50,14
-    DEFPUSHBUTTON   "OK",IDOK,172,122,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,226,122,50,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
 END
 
 IDD_SELECTUNPACKER DIALOG  0, 0, 293, 126

diff --git a/Src/Languages/Italian/resource.h b/Src/Languages/Italian/resource.h
index 2be12db..73508ff 100644 (file)
--- a/Src/Languages/Italian/resource.h
+++ b/Src/Languages/Italian/resource.h
@@ -200,6 +200,7 @@
 #define IDC_STATIC_TITLE_LEFT           1133
 #define IDC_STATIC_TITLE_RIGHT          1134
 #define IDC_SELECT_FILTER               1135
+#define IDC_COLDLG_DESC                 1136
 
 
 #define IDC_EDIT_WHOLE_WORD             8603
@@ -397,6 +398,28 @@
 
 #define IDS_ELAPSED_TIME                17744
 
+#define IDS_COLDESC_FILENAME            17760
+#define IDS_COLDESC_DIR                 17761
+#define IDS_COLDESC_RESULT              17762
+#define IDS_COLDESC_LTIMEM              17763
+#define IDS_COLDESC_RTIMEM              17764
+#define IDS_COLDESC_EXTENSION           17765
+#define IDS_COLDESC_LSIZE               17766
+#define IDS_COLDESC_RSIZE               17767
+#define IDS_COLDESC_LTIMEC              17768
+#define IDS_COLDESC_RTIMEC              17769
+#define IDS_COLDESC_NEWER               17770
+#define IDS_COLDESC_LVERSION            17771
+#define IDS_COLDESC_RVERSION            17772
+#define IDS_COLDESC_RESULT_ABBR         17773
+#define IDS_COLDESC_LATTRIBUTES         17774
+#define IDS_COLDESC_RATTRIBUTES         17775
+#define IDS_COLDESC_LENCODING           17776
+#define IDS_COLDESC_RENCODING           17777
+#define IDS_COLDESC_NDIFFS              17778
+#define IDS_COLDESC_NSDIFFS             17779
+#define IDS_COLDESC_BINARY              17780
+
 #define IDS_FILE_TO_ITSELF              18000
 #define IDS_FILESSAME                   18001
 #define IDS_FILEUNIQUE                  18002
@@ -669,7 +692,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        162
 #define _APS_NEXT_COMMAND_VALUE         33088
-#define _APS_NEXT_CONTROL_VALUE         1136
+#define _APS_NEXT_CONTROL_VALUE         1137
 #define _APS_NEXT_SYMED_VALUE           106
 #endif
 #endif

diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc
index b62a491..a14115a 100644 (file)
--- a/Src/Languages/Korean/MergeKorean.rc
+++ b/Src/Languages/Korean/MergeKorean.rc
@@ -645,8 +645,8 @@ BEGIN
                     WS_TABSTOP,WS_EX_STATICEDGE
 END
 
-IDD_DIRCOLS DIALOG  0, 0, 283, 143
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+IDD_DIRCOLS DIALOGEX 0, 0, 283, 170
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Display Columns"
 FONT 8, "MS Sans Serif"
 BEGIN
@@ -660,9 +660,10 @@ BEGIN
                     LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "<==",IDC_ADD,143,45,29,14
     PUSHBUTTON      "==>",IDC_REMOVE,143,63,29,14
-    PUSHBUTTON      "Defaults",IDC_COLDLG_DEFAULTS,7,122,50,14
-    DEFPUSHBUTTON   "OK",IDOK,172,122,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,226,122,50,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
 END
 
 IDD_SELECTUNPACKER DIALOG DISCARDABLE  0, 0, 293, 126
@@ -1531,6 +1532,37 @@ BEGIN
     IDS_ELAPSED_TIME        "Elapsed time: %ld ms"
 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."
+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."
+END
+
 // FILE COMPARISON RESULT : MESSAGES
 STRINGTABLE
 BEGIN

diff --git a/Src/Languages/Korean/resource.h b/Src/Languages/Korean/resource.h
index 2be12db..73508ff 100644 (file)
--- a/Src/Languages/Korean/resource.h
+++ b/Src/Languages/Korean/resource.h
@@ -200,6 +200,7 @@
 #define IDC_STATIC_TITLE_LEFT           1133
 #define IDC_STATIC_TITLE_RIGHT          1134
 #define IDC_SELECT_FILTER               1135
+#define IDC_COLDLG_DESC                 1136
 
 
 #define IDC_EDIT_WHOLE_WORD             8603
@@ -397,6 +398,28 @@
 
 #define IDS_ELAPSED_TIME                17744
 
+#define IDS_COLDESC_FILENAME            17760
+#define IDS_COLDESC_DIR                 17761
+#define IDS_COLDESC_RESULT              17762
+#define IDS_COLDESC_LTIMEM              17763
+#define IDS_COLDESC_RTIMEM              17764
+#define IDS_COLDESC_EXTENSION           17765
+#define IDS_COLDESC_LSIZE               17766
+#define IDS_COLDESC_RSIZE               17767
+#define IDS_COLDESC_LTIMEC              17768
+#define IDS_COLDESC_RTIMEC              17769
+#define IDS_COLDESC_NEWER               17770
+#define IDS_COLDESC_LVERSION            17771
+#define IDS_COLDESC_RVERSION            17772
+#define IDS_COLDESC_RESULT_ABBR         17773
+#define IDS_COLDESC_LATTRIBUTES         17774
+#define IDS_COLDESC_RATTRIBUTES         17775
+#define IDS_COLDESC_LENCODING           17776
+#define IDS_COLDESC_RENCODING           17777
+#define IDS_COLDESC_NDIFFS              17778
+#define IDS_COLDESC_NSDIFFS             17779
+#define IDS_COLDESC_BINARY              17780
+
 #define IDS_FILE_TO_ITSELF              18000
 #define IDS_FILESSAME                   18001
 #define IDS_FILEUNIQUE                  18002
@@ -669,7 +692,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        162
 #define _APS_NEXT_COMMAND_VALUE         33088
-#define _APS_NEXT_CONTROL_VALUE         1136
+#define _APS_NEXT_CONTROL_VALUE         1137
 #define _APS_NEXT_SYMED_VALUE           106
 #endif
 #endif

diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc
index 7742c7c..95006a8 100644 (file)
--- a/Src/Languages/Norwegian/MergeNorwegian.rc
+++ b/Src/Languages/Norwegian/MergeNorwegian.rc
@@ -681,8 +681,8 @@ BEGIN
                     WS_TABSTOP,WS_EX_STATICEDGE
 END
 
-IDD_DIRCOLS DIALOG  0, 0, 283, 143
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+IDD_DIRCOLS DIALOGEX 0, 0, 283, 170
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Display Columns"
 FONT 8, "MS Sans Serif"
 BEGIN
@@ -696,9 +696,10 @@ BEGIN
                     LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "<==",IDC_ADD,143,45,29,14
     PUSHBUTTON      "==>",IDC_REMOVE,143,63,29,14
-    PUSHBUTTON      "Defaults",IDC_COLDLG_DEFAULTS,7,122,50,14
-    DEFPUSHBUTTON   "OK",IDOK,172,122,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,226,122,50,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
 END
 
 IDD_SELECTUNPACKER DIALOG  0, 0, 293, 126
@@ -1567,6 +1568,37 @@ BEGIN
     IDS_ELAPSED_TIME        "Elapsed time: %ld ms"
 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."
+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."
+END
+
 // FILE COMPARISON RESULT : MESSAGES
 STRINGTABLE
 BEGIN

diff --git a/Src/Languages/Norwegian/resource.h b/Src/Languages/Norwegian/resource.h
index 2be12db..73508ff 100644 (file)
--- a/Src/Languages/Norwegian/resource.h
+++ b/Src/Languages/Norwegian/resource.h
@@ -200,6 +200,7 @@
 #define IDC_STATIC_TITLE_LEFT           1133
 #define IDC_STATIC_TITLE_RIGHT          1134
 #define IDC_SELECT_FILTER               1135
+#define IDC_COLDLG_DESC                 1136
 
 
 #define IDC_EDIT_WHOLE_WORD             8603
@@ -397,6 +398,28 @@
 
 #define IDS_ELAPSED_TIME                17744
 
+#define IDS_COLDESC_FILENAME            17760
+#define IDS_COLDESC_DIR                 17761
+#define IDS_COLDESC_RESULT              17762
+#define IDS_COLDESC_LTIMEM              17763
+#define IDS_COLDESC_RTIMEM              17764
+#define IDS_COLDESC_EXTENSION           17765
+#define IDS_COLDESC_LSIZE               17766
+#define IDS_COLDESC_RSIZE               17767
+#define IDS_COLDESC_LTIMEC              17768
+#define IDS_COLDESC_RTIMEC              17769
+#define IDS_COLDESC_NEWER               17770
+#define IDS_COLDESC_LVERSION            17771
+#define IDS_COLDESC_RVERSION            17772
+#define IDS_COLDESC_RESULT_ABBR         17773
+#define IDS_COLDESC_LATTRIBUTES         17774
+#define IDS_COLDESC_RATTRIBUTES         17775
+#define IDS_COLDESC_LENCODING           17776
+#define IDS_COLDESC_RENCODING           17777
+#define IDS_COLDESC_NDIFFS              17778
+#define IDS_COLDESC_NSDIFFS             17779
+#define IDS_COLDESC_BINARY              17780
+
 #define IDS_FILE_TO_ITSELF              18000
 #define IDS_FILESSAME                   18001
 #define IDS_FILEUNIQUE                  18002
@@ -669,7 +692,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        162
 #define _APS_NEXT_COMMAND_VALUE         33088
-#define _APS_NEXT_CONTROL_VALUE         1136
+#define _APS_NEXT_CONTROL_VALUE         1137
 #define _APS_NEXT_SYMED_VALUE           106
 #endif
 #endif

diff --git a/Src/Languages/Polish/MergePolish.rc b/Src/Languages/Polish/MergePolish.rc
index 6ae1f1d..c742a27 100644 (file)
--- a/Src/Languages/Polish/MergePolish.rc
+++ b/Src/Languages/Polish/MergePolish.rc
@@ -682,8 +682,8 @@ BEGIN
                     WS_TABSTOP,WS_EX_STATICEDGE
 END
 
-IDD_DIRCOLS DIALOG  0, 0, 283, 143
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+IDD_DIRCOLS DIALOGEX 0, 0, 283, 170
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Display Columns"
 FONT 8, "MS Sans Serif"
 BEGIN
@@ -697,9 +697,10 @@ BEGIN
                     LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "<==",IDC_ADD,143,45,29,14
     PUSHBUTTON      "==>",IDC_REMOVE,143,63,29,14
-    PUSHBUTTON      "Defaults",IDC_COLDLG_DEFAULTS,7,122,50,14
-    DEFPUSHBUTTON   "OK",IDOK,172,122,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,226,122,50,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
 END
 
 IDD_SELECTUNPACKER DIALOG  0, 0, 293, 126
@@ -1568,6 +1569,37 @@ BEGIN
     IDS_ELAPSED_TIME        "Elapsed time: %ld ms"
 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."
+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."
+END
+
 // FILE COMPARISON RESULT : MESSAGES
 STRINGTABLE
 BEGIN

diff --git a/Src/Languages/Polish/resource.h b/Src/Languages/Polish/resource.h
index 2be12db..73508ff 100644 (file)
--- a/Src/Languages/Polish/resource.h
+++ b/Src/Languages/Polish/resource.h
@@ -200,6 +200,7 @@
 #define IDC_STATIC_TITLE_LEFT           1133
 #define IDC_STATIC_TITLE_RIGHT          1134
 #define IDC_SELECT_FILTER               1135
+#define IDC_COLDLG_DESC                 1136
 
 
 #define IDC_EDIT_WHOLE_WORD             8603
@@ -397,6 +398,28 @@
 
 #define IDS_ELAPSED_TIME                17744
 
+#define IDS_COLDESC_FILENAME            17760
+#define IDS_COLDESC_DIR                 17761
+#define IDS_COLDESC_RESULT              17762
+#define IDS_COLDESC_LTIMEM              17763
+#define IDS_COLDESC_RTIMEM              17764
+#define IDS_COLDESC_EXTENSION           17765
+#define IDS_COLDESC_LSIZE               17766
+#define IDS_COLDESC_RSIZE               17767
+#define IDS_COLDESC_LTIMEC              17768
+#define IDS_COLDESC_RTIMEC              17769
+#define IDS_COLDESC_NEWER               17770
+#define IDS_COLDESC_LVERSION            17771
+#define IDS_COLDESC_RVERSION            17772
+#define IDS_COLDESC_RESULT_ABBR         17773
+#define IDS_COLDESC_LATTRIBUTES         17774
+#define IDS_COLDESC_RATTRIBUTES         17775
+#define IDS_COLDESC_LENCODING           17776
+#define IDS_COLDESC_RENCODING           17777
+#define IDS_COLDESC_NDIFFS              17778
+#define IDS_COLDESC_NSDIFFS             17779
+#define IDS_COLDESC_BINARY              17780
+
 #define IDS_FILE_TO_ITSELF              18000
 #define IDS_FILESSAME                   18001
 #define IDS_FILEUNIQUE                  18002
@@ -669,7 +692,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        162
 #define _APS_NEXT_COMMAND_VALUE         33088
-#define _APS_NEXT_CONTROL_VALUE         1136
+#define _APS_NEXT_CONTROL_VALUE         1137
 #define _APS_NEXT_SYMED_VALUE           106
 #endif
 #endif

diff --git a/Src/Languages/Russian/MergeRussian.rc b/Src/Languages/Russian/MergeRussian.rc
index d39f3aa..d375c70 100644 (file)
--- a/Src/Languages/Russian/MergeRussian.rc
+++ b/Src/Languages/Russian/MergeRussian.rc
@@ -698,7 +698,7 @@ BEGIN
                     WS_TABSTOP,WS_EX_STATICEDGE
 END
 
-IDD_DIRCOLS DIALOG  0, 0, 283, 143
+IDD_DIRCOLS DIALOGEX 0, 0, 283, 170
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Îòîáðàæàòü êîëîíêè"
 FONT 8, "MS Sans Serif"
@@ -713,9 +713,10 @@ BEGIN
                     LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "<==",IDC_ADD,143,45,29,14
     PUSHBUTTON      "==>",IDC_REMOVE,143,63,29,14
-    PUSHBUTTON      "Defaults",IDC_COLDLG_DEFAULTS,7,122,50,14
-    DEFPUSHBUTTON   "OK",IDOK,172,122,50,14
-    PUSHBUTTON      "Îòìåíû",IDCANCEL,226,122,50,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      "Îòìåíû",IDCANCEL,226,149,50,14
 END
 
 IDD_SELECTUNPACKER DIALOG  0, 0, 293, 126
@@ -1471,6 +1472,37 @@ BEGIN
     IDS_ELAPSED_TIME        "Èñòåêøåå âðåìÿ: %ld ìñ"
 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."
+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."
+END
+
 // FILE COMPARISON RESULT : MESSAGES
 STRINGTABLE
 BEGIN

diff --git a/Src/Languages/Russian/resource.h b/Src/Languages/Russian/resource.h
index 2be12db..73508ff 100644 (file)
--- a/Src/Languages/Russian/resource.h
+++ b/Src/Languages/Russian/resource.h
@@ -200,6 +200,7 @@
 #define IDC_STATIC_TITLE_LEFT           1133
 #define IDC_STATIC_TITLE_RIGHT          1134
 #define IDC_SELECT_FILTER               1135
+#define IDC_COLDLG_DESC                 1136
 
 
 #define IDC_EDIT_WHOLE_WORD             8603
@@ -397,6 +398,28 @@
 
 #define IDS_ELAPSED_TIME                17744
 
+#define IDS_COLDESC_FILENAME            17760
+#define IDS_COLDESC_DIR                 17761
+#define IDS_COLDESC_RESULT              17762
+#define IDS_COLDESC_LTIMEM              17763
+#define IDS_COLDESC_RTIMEM              17764
+#define IDS_COLDESC_EXTENSION           17765
+#define IDS_COLDESC_LSIZE               17766
+#define IDS_COLDESC_RSIZE               17767
+#define IDS_COLDESC_LTIMEC              17768
+#define IDS_COLDESC_RTIMEC              17769
+#define IDS_COLDESC_NEWER               17770
+#define IDS_COLDESC_LVERSION            17771
+#define IDS_COLDESC_RVERSION            17772
+#define IDS_COLDESC_RESULT_ABBR         17773
+#define IDS_COLDESC_LATTRIBUTES         17774
+#define IDS_COLDESC_RATTRIBUTES         17775
+#define IDS_COLDESC_LENCODING           17776
+#define IDS_COLDESC_RENCODING           17777
+#define IDS_COLDESC_NDIFFS              17778
+#define IDS_COLDESC_NSDIFFS             17779
+#define IDS_COLDESC_BINARY              17780
+
 #define IDS_FILE_TO_ITSELF              18000
 #define IDS_FILESSAME                   18001
 #define IDS_FILEUNIQUE                  18002
@@ -669,7 +692,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        162
 #define _APS_NEXT_COMMAND_VALUE         33088
-#define _APS_NEXT_CONTROL_VALUE         1136
+#define _APS_NEXT_CONTROL_VALUE         1137
 #define _APS_NEXT_SYMED_VALUE           106
 #endif
 #endif

diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc
index f570da9..734be84 100644 (file)
--- a/Src/Languages/Slovak/MergeSlovak.rc
+++ b/Src/Languages/Slovak/MergeSlovak.rc
@@ -682,8 +682,8 @@ BEGIN
                     WS_TABSTOP,WS_EX_STATICEDGE
 END
 
-IDD_DIRCOLS DIALOG  0, 0, 283, 143
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+IDD_DIRCOLS DIALOGEX 0, 0, 283, 170
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Display Columns"
 FONT 8, "MS Sans Serif"
 BEGIN
@@ -697,9 +697,10 @@ BEGIN
                     LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "<==",IDC_ADD,143,45,29,14
     PUSHBUTTON      "==>",IDC_REMOVE,143,63,29,14
-    PUSHBUTTON      "Defaults",IDC_COLDLG_DEFAULTS,7,122,50,14
-    DEFPUSHBUTTON   "OK",IDOK,172,122,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,226,122,50,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
 END
 
 IDD_SELECTUNPACKER DIALOG  0, 0, 293, 126
@@ -1568,6 +1569,37 @@ BEGIN
     IDS_ELAPSED_TIME        "Elapsed time: %ld ms"
 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."
+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."
+END
+
 // FILE COMPARISON RESULT : MESSAGES
 STRINGTABLE
 BEGIN

diff --git a/Src/Languages/Slovak/resource.h b/Src/Languages/Slovak/resource.h
index 2be12db..73508ff 100644 (file)
--- a/Src/Languages/Slovak/resource.h
+++ b/Src/Languages/Slovak/resource.h
@@ -200,6 +200,7 @@
 #define IDC_STATIC_TITLE_LEFT           1133
 #define IDC_STATIC_TITLE_RIGHT          1134
 #define IDC_SELECT_FILTER               1135
+#define IDC_COLDLG_DESC                 1136
 
 
 #define IDC_EDIT_WHOLE_WORD             8603
@@ -397,6 +398,28 @@
 
 #define IDS_ELAPSED_TIME                17744
 
+#define IDS_COLDESC_FILENAME            17760
+#define IDS_COLDESC_DIR                 17761
+#define IDS_COLDESC_RESULT              17762
+#define IDS_COLDESC_LTIMEM              17763
+#define IDS_COLDESC_RTIMEM              17764
+#define IDS_COLDESC_EXTENSION           17765
+#define IDS_COLDESC_LSIZE               17766
+#define IDS_COLDESC_RSIZE               17767
+#define IDS_COLDESC_LTIMEC              17768
+#define IDS_COLDESC_RTIMEC              17769
+#define IDS_COLDESC_NEWER               17770
+#define IDS_COLDESC_LVERSION            17771
+#define IDS_COLDESC_RVERSION            17772
+#define IDS_COLDESC_RESULT_ABBR         17773
+#define IDS_COLDESC_LATTRIBUTES         17774
+#define IDS_COLDESC_RATTRIBUTES         17775
+#define IDS_COLDESC_LENCODING           17776
+#define IDS_COLDESC_RENCODING           17777
+#define IDS_COLDESC_NDIFFS              17778
+#define IDS_COLDESC_NSDIFFS             17779
+#define IDS_COLDESC_BINARY              17780
+
 #define IDS_FILE_TO_ITSELF              18000
 #define IDS_FILESSAME                   18001
 #define IDS_FILEUNIQUE                  18002
@@ -669,7 +692,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        162
 #define _APS_NEXT_COMMAND_VALUE         33088
-#define _APS_NEXT_CONTROL_VALUE         1136
+#define _APS_NEXT_CONTROL_VALUE         1137
 #define _APS_NEXT_SYMED_VALUE           106
 #endif
 #endif

diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc
index 2a694b0..1813f6b 100644 (file)
--- a/Src/Languages/Spanish/MergeSpanish.rc
+++ b/Src/Languages/Spanish/MergeSpanish.rc
@@ -681,8 +681,8 @@ BEGIN
                     WS_TABSTOP,WS_EX_STATICEDGE
 END
 
-IDD_DIRCOLS DIALOG  0, 0, 283, 143
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+IDD_DIRCOLS DIALOGEX 0, 0, 283, 170
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Display Columns"
 FONT 8, "MS Sans Serif"
 BEGIN
@@ -696,9 +696,10 @@ BEGIN
                     LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "<==",IDC_ADD,143,45,29,14
     PUSHBUTTON      "==>",IDC_REMOVE,143,63,29,14
-    PUSHBUTTON      "Defaults",IDC_COLDLG_DEFAULTS,7,122,50,14
-    DEFPUSHBUTTON   "OK",IDOK,172,122,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,226,122,50,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
 END
 
 IDD_SELECTUNPACKER DIALOG  0, 0, 293, 126
@@ -1568,6 +1569,37 @@ BEGIN
     IDS_ELAPSED_TIME        "Elapsed time: %ld ms"
 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."
+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."
+END
+
 // FILE COMPARISON RESULT : MESSAGES
 STRINGTABLE
 BEGIN

diff --git a/Src/Languages/Spanish/resource.h b/Src/Languages/Spanish/resource.h
index 2be12db..73508ff 100644 (file)
--- a/Src/Languages/Spanish/resource.h
+++ b/Src/Languages/Spanish/resource.h
@@ -200,6 +200,7 @@
 #define IDC_STATIC_TITLE_LEFT           1133
 #define IDC_STATIC_TITLE_RIGHT          1134
 #define IDC_SELECT_FILTER               1135
+#define IDC_COLDLG_DESC                 1136
 
 
 #define IDC_EDIT_WHOLE_WORD             8603
@@ -397,6 +398,28 @@
 
 #define IDS_ELAPSED_TIME                17744
 
+#define IDS_COLDESC_FILENAME            17760
+#define IDS_COLDESC_DIR                 17761
+#define IDS_COLDESC_RESULT              17762
+#define IDS_COLDESC_LTIMEM              17763
+#define IDS_COLDESC_RTIMEM              17764
+#define IDS_COLDESC_EXTENSION           17765
+#define IDS_COLDESC_LSIZE               17766
+#define IDS_COLDESC_RSIZE               17767
+#define IDS_COLDESC_LTIMEC              17768
+#define IDS_COLDESC_RTIMEC              17769
+#define IDS_COLDESC_NEWER               17770
+#define IDS_COLDESC_LVERSION            17771
+#define IDS_COLDESC_RVERSION            17772
+#define IDS_COLDESC_RESULT_ABBR         17773
+#define IDS_COLDESC_LATTRIBUTES         17774
+#define IDS_COLDESC_RATTRIBUTES         17775
+#define IDS_COLDESC_LENCODING           17776
+#define IDS_COLDESC_RENCODING           17777
+#define IDS_COLDESC_NDIFFS              17778
+#define IDS_COLDESC_NSDIFFS             17779
+#define IDS_COLDESC_BINARY              17780
+
 #define IDS_FILE_TO_ITSELF              18000
 #define IDS_FILESSAME                   18001
 #define IDS_FILEUNIQUE                  18002
@@ -669,7 +692,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        162
 #define _APS_NEXT_COMMAND_VALUE         33088
-#define _APS_NEXT_CONTROL_VALUE         1136
+#define _APS_NEXT_CONTROL_VALUE         1137
 #define _APS_NEXT_SYMED_VALUE           106
 #endif
 #endif

diff --git a/Src/Languages/Swedish/MergeSwedish.rc b/Src/Languages/Swedish/MergeSwedish.rc
index ea317ab..27ffd21 100644 (file)
--- a/Src/Languages/Swedish/MergeSwedish.rc
+++ b/Src/Languages/Swedish/MergeSwedish.rc
@@ -681,8 +681,8 @@ BEGIN
                     WS_TABSTOP,WS_EX_STATICEDGE
 END
 
-IDD_DIRCOLS DIALOG  0, 0, 283, 143
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+IDD_DIRCOLS DIALOGEX 0, 0, 283, 170
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Visa kolumner"
 FONT 8, "MS Sans Serif"
 BEGIN
@@ -696,9 +696,10 @@ BEGIN
                     LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "<==",IDC_ADD,143,45,29,14
     PUSHBUTTON      "==>",IDC_REMOVE,143,63,29,14
-    PUSHBUTTON      "Standard",IDC_COLDLG_DEFAULTS,7,122,50,14
-    DEFPUSHBUTTON   "OK",IDOK,172,122,50,14
-    PUSHBUTTON      "Avbryt",IDCANCEL,226,122,50,14
+    EDITTEXT        IDC_COLDLG_DESC,7,122,269,22,ES_MULTILINE | ES_READONLY
+    PUSHBUTTON      "Standard",IDC_COLDLG_DEFAULTS,7,149,50,14
+    DEFPUSHBUTTON   "OK",IDOK,172,149,50,14
+    PUSHBUTTON      "Avbryt",IDCANCEL,226,149,50,14
 END
 
 IDD_SELECTUNPACKER DIALOG 0, 0, 293, 126
@@ -1567,6 +1568,37 @@ BEGIN
     IDS_ELAPSED_TIME        "Förfluten tid: %ld ms"
 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."
+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."
+END
+
 // FILE COMPARISON RESULT : MESSAGES
 STRINGTABLE
 BEGIN

diff --git a/Src/Languages/Swedish/resource.h b/Src/Languages/Swedish/resource.h
index 2be12db..73508ff 100644 (file)
--- a/Src/Languages/Swedish/resource.h
+++ b/Src/Languages/Swedish/resource.h
@@ -200,6 +200,7 @@
 #define IDC_STATIC_TITLE_LEFT           1133
 #define IDC_STATIC_TITLE_RIGHT          1134
 #define IDC_SELECT_FILTER               1135
+#define IDC_COLDLG_DESC                 1136
 
 
 #define IDC_EDIT_WHOLE_WORD             8603
@@ -397,6 +398,28 @@
 
 #define IDS_ELAPSED_TIME                17744
 
+#define IDS_COLDESC_FILENAME            17760
+#define IDS_COLDESC_DIR                 17761
+#define IDS_COLDESC_RESULT              17762
+#define IDS_COLDESC_LTIMEM              17763
+#define IDS_COLDESC_RTIMEM              17764
+#define IDS_COLDESC_EXTENSION           17765
+#define IDS_COLDESC_LSIZE               17766
+#define IDS_COLDESC_RSIZE               17767
+#define IDS_COLDESC_LTIMEC              17768
+#define IDS_COLDESC_RTIMEC              17769
+#define IDS_COLDESC_NEWER               17770
+#define IDS_COLDESC_LVERSION            17771
+#define IDS_COLDESC_RVERSION            17772
+#define IDS_COLDESC_RESULT_ABBR         17773
+#define IDS_COLDESC_LATTRIBUTES         17774
+#define IDS_COLDESC_RATTRIBUTES         17775
+#define IDS_COLDESC_LENCODING           17776
+#define IDS_COLDESC_RENCODING           17777
+#define IDS_COLDESC_NDIFFS              17778
+#define IDS_COLDESC_NSDIFFS             17779
+#define IDS_COLDESC_BINARY              17780
+
 #define IDS_FILE_TO_ITSELF              18000
 #define IDS_FILESSAME                   18001
 #define IDS_FILEUNIQUE                  18002
@@ -669,7 +692,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        162
 #define _APS_NEXT_COMMAND_VALUE         33088
-#define _APS_NEXT_CONTROL_VALUE         1136
+#define _APS_NEXT_CONTROL_VALUE         1137
 #define _APS_NEXT_SYMED_VALUE           106
 #endif
 #endif

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 0ea7ae5..9463d3d 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -683,7 +683,7 @@ BEGIN
                     WS_TABSTOP,WS_EX_STATICEDGE
 END
 
-IDD_DIRCOLS DIALOG  0, 0, 283, 143
+IDD_DIRCOLS DIALOGEX 0, 0, 283, 170
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Display Columns"
 FONT 8, "MS Sans Serif"
@@ -698,9 +698,10 @@ BEGIN
                     LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "<==",IDC_ADD,143,45,29,14
     PUSHBUTTON      "==>",IDC_REMOVE,143,63,29,14
-    PUSHBUTTON      "Defaults",IDC_COLDLG_DEFAULTS,7,122,50,14
-    DEFPUSHBUTTON   "OK",IDOK,172,122,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,226,122,50,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
 END
 
 IDD_SELECTUNPACKER DIALOG  0, 0, 293, 126
@@ -1453,6 +1454,37 @@ BEGIN
     IDS_ELAPSED_TIME        "Elapsed time: %ld ms"
 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."
+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."
+END
+
 // FILE COMPARISON RESULT : MESSAGES
 STRINGTABLE
 BEGIN

diff --git a/Src/readme.txt b/Src/readme.txt
index 10e5003..77fe3eb 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,6 +1,10 @@
 2004-05-20 Kimmo
  PATCH: [ 956893 ] Fix toolbar problem with XP themes and VC6
   Src: MainFrm.cpp Merge.cpp
+ PATCH: [ 954991 ] Add directory compare column descriptions
+  Src: DirColsDlg.cpp DirColsDlg.h DirView.h DirViewColHandler.cpp
+   DirViewColItems.cpp Merge.rc resource.h
+  Src/Languages: *.rc resource.h
 
 2004-05-18 Kimmo
  PATCH: [ 955408 ] Select first item in dir compare

diff --git a/Src/resource.h b/Src/resource.h
index 2be12db..73508ff 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -200,6 +200,7 @@
 #define IDC_STATIC_TITLE_LEFT           1133
 #define IDC_STATIC_TITLE_RIGHT          1134
 #define IDC_SELECT_FILTER               1135
+#define IDC_COLDLG_DESC                 1136
 
 
 #define IDC_EDIT_WHOLE_WORD             8603
@@ -397,6 +398,28 @@
 
 #define IDS_ELAPSED_TIME                17744
 
+#define IDS_COLDESC_FILENAME            17760
+#define IDS_COLDESC_DIR                 17761
+#define IDS_COLDESC_RESULT              17762
+#define IDS_COLDESC_LTIMEM              17763
+#define IDS_COLDESC_RTIMEM              17764
+#define IDS_COLDESC_EXTENSION           17765
+#define IDS_COLDESC_LSIZE               17766
+#define IDS_COLDESC_RSIZE               17767
+#define IDS_COLDESC_LTIMEC              17768
+#define IDS_COLDESC_RTIMEC              17769
+#define IDS_COLDESC_NEWER               17770
+#define IDS_COLDESC_LVERSION            17771
+#define IDS_COLDESC_RVERSION            17772
+#define IDS_COLDESC_RESULT_ABBR         17773
+#define IDS_COLDESC_LATTRIBUTES         17774
+#define IDS_COLDESC_RATTRIBUTES         17775
+#define IDS_COLDESC_LENCODING           17776
+#define IDS_COLDESC_RENCODING           17777
+#define IDS_COLDESC_NDIFFS              17778
+#define IDS_COLDESC_NSDIFFS             17779
+#define IDS_COLDESC_BINARY              17780
+
 #define IDS_FILE_TO_ITSELF              18000
 #define IDS_FILESSAME                   18001
 #define IDS_FILEUNIQUE                  18002
@@ -669,7 +692,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        162
 #define _APS_NEXT_COMMAND_VALUE         33088
-#define _APS_NEXT_CONTROL_VALUE         1136
+#define _APS_NEXT_CONTROL_VALUE         1137
 #define _APS_NEXT_SYMED_VALUE           106
 #endif
 #endif