l10n effects of patch#781529: new popup menu, new dialog, alter existing col header...

diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc
index 6adf0f8..ad8a542 100644 (file)
--- a/Src/Languages/Czech/MergeCzech.rc
+++ b/Src/Languages/Czech/MergeCzech.rc
@@ -175,7 +175,7 @@ END
 
 IDR_POPUP_DIRVIEW MENU DISCARDABLE
 BEGIN
-    POPUP "_POPUP_"
+    POPUP "_ITEM_POPUP_"
     BEGIN
         MENUITEM "Kopírovat soubor vlevo",      ID_DIR_COPY_FILE_TO_LEFT
         MENUITEM "Kopírovat soubor vpravo",     ID_DIR_COPY_FILE_TO_RIGHT
@@ -188,6 +188,10 @@ BEGIN
         MENUITEM "Open right",                  ID_DIR_OPEN_RIGHT
         MENUITEM "Open right with...",          ID_DIR_OPEN_RIGHT_WITH
     END
+    POPUP "_HDR_POPUP_"
+    BEGIN
+        MENUITEM "Edit columns",                ID_EDIT_COLUMNS
+    END
 END
 
 IDR_POPUP_EDITOR_HEADERBAR MENU DISCARDABLE
@@ -525,6 +529,25 @@ BEGIN
                     WS_TABSTOP,WS_EX_STATICEDGE
 END
 
+IDD_DIRCOLS DIALOG DISCARDABLE  0, 0, 273, 162
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Display Columns"
+FONT 8, "MS Sans Serif"
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,141,129,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,81,129,50,14
+    GROUPBOX        "Show columns",IDC_GROUP_SHOW,7,17,124,100
+    LISTBOX         IDC_LIST_SHOW,42,31,83,79,LBS_NOINTEGRALHEIGHT | 
+                    LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "&Up",IDC_UP,13,43,23,13
+    PUSHBUTTON      "&Down",IDC_DOWN,13,67,23,13
+    GROUPBOX        "Hide columns",IDC_GROUP_HIDE,181,17,85,103
+    LISTBOX         IDC_LIST_HIDE,192,31,66,79,LBS_NOINTEGRALHEIGHT | 
+                    LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "<==",IDC_ADD,141,41,29,11
+    PUSHBUTTON      "==>",IDC_REMOVE,141,76,29,11
+END
+
 
 #ifndef _MAC
 /////////////////////////////////////////////////////////////////////////////
@@ -955,9 +978,9 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_FILENAME_HEADER     "Jméno souboru"
-    IDS_DIR_HEADER          "Adresáø"
-    IDS_RESULT_HEADER       "Výsledek porovnání"
+    IDS_COLHDR_FILENAME     "Jméno souboru"
+    IDS_COLHDR_DIR          "Adresáø"
+    IDS_COLHDR_RESULT       "Výsledek porovnání"
     IDS_FILE_COMPARISON_TITLE "Porovnání souborù"
     IDS_DIFF_NUMBER_STATUS_FMT "Difference %1 of %2"
     IDS_NO_DIFF_SEL_FMT     "%1 Differences Found"
@@ -967,9 +990,9 @@ BEGIN
     IDS_VSS_RUN_ERROR       "Error executing versioning system command."
     IDS_DIFF_OPEN_NO_SET_PROPS
                             "Modifications have been made to the current file comparison session.  Some settings may not take place until the current file comparison is restarted."
-    IDS_LTIME_HEADER        "Left Date"
-    IDS_RTIME_HEADER        "Right Date"
-    IDS_EXTENSION_HEADER    "Extension"
+    IDS_COLHDR_LTIMEM       "Left Date"
+    IDS_COLHDR_RTIMEM       "Right Date"
+    IDS_COLHDR_EXTENSION    "Extension"
     IDS_CONFIRM_DELETE_ITEMS
                             "Are you sure you want to delete %1 of %2 selected item(s) ?"
     IDS_DEL_LEFT_FMT        "Delete left side %1 of %2 selected item(s)"
@@ -984,6 +1007,7 @@ BEGIN
     IDS_COPY_TO_LEFT        "Copy to left side %1 of %2 selected item(s)"
     IDS_DEL_BOTH_FMT        "Delete both sides %1 of %2 selected item(s)"
     IDS_COPY_TO_RIGHT       "Copy to right side %1 of %2 selected item(s)"
+    IDS_COLHDR_LSIZE        "Left Size"
     IDS_DELETE_DIR_FAILED   "Delete directory %1 failed: %s"
     IDS_COPY_FILE_FAILED    "Copying file %1 failed: %2"
     IDS_COPY_DIR_FAILED     "Copying directory %1 failed: %2"
@@ -1017,6 +1041,12 @@ BEGIN
     IDS_STATUS_COPYALL2L    "Copying All to Left"
     IDS_STATUS_COPYALL2R    "Copying All to Right"
     IDS_PROGRAMFILES        "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
+    IDS_COLHDR_RSIZE        "Right Size"
+    IDS_COLHDR_LTIMEC       "Left Creation Time"
+    IDS_COLHDR_RTIMEC       "Right Creation Time"
+    IDS_COLHDR_NEWER        "Newer File"
+    IDS_COLHDR_LVERSION     "Left File Version"
+    IDS_COLHDR_RVERSION     "Right File Version"
 END
 
 STRINGTABLE DISCARDABLE
@@ -1033,6 +1063,17 @@ BEGIN
     IDC_STATIC_TITLE_RIGHT  "Right click on the path to copy"
 END
 
+STRINGTABLE DISCARDABLE 
+BEGIN
+    IDS_LEFTONLY            "Left Only"
+    IDS_RIGHTONLY           "Right Only"
+    IDS_COLHDR_RESULT_ABBR  "Short Result"
+    IDS_COLHDR_LATTRIBUTES  "Left Attributes"
+    IDS_COLHDR_RATTRIBUTES  "Right Attributes"
+    IDS_FILE_SKIPPED        "File skipped"
+    IDS_DIR_SKIPPED         "Directory skipped"
+END
+
 #endif    // Czech resources
 /////////////////////////////////////////////////////////////////////////////
 

diff --git a/Src/Languages/Czech/resource.h b/Src/Languages/Czech/resource.h
index a7810b7..01b8c1c 100644 (file)
--- a/Src/Languages/Czech/resource.h
+++ b/Src/Languages/Czech/resource.h
@@ -24,6 +24,7 @@
 #define IDD_PROPPAGE_REGISTRY           113
 #define IDD_EDITOR_HEADERBAR            114
 #define IDR_POPUP_EDITOR_HEADERBAR      115
+#define IDD_DIRCOLS                     117
 #define IDS_VERSION_FMT                 130
 #define IDS_ALLFILES                    131
 #define IDS_CONFIRM_ALL_LEFT            132
@@ -55,9 +56,9 @@
 #define IDS_SAVEVSS_FMT                 157
 #define IDS_VSSERROR                    158
 #define IDS_NOPROJECT                   159
-#define IDS_FILENAME_HEADER             160
-#define IDS_DIR_HEADER                  161
-#define IDS_RESULT_HEADER               162
+#define IDS_COLHDR_FILENAME             160
+#define IDS_COLHDR_DIR                  161
+#define IDS_COLHDR_RESULT               162
 #define IDS_FILE_COMPARISON_TITLE       163
 #define IDS_DIFF_NUMBER_STATUS_FMT      164
 #define IDS_NO_DIFF_SEL                 165
@@ -67,9 +68,9 @@
 #define IDS_VSS_CMD                     168
 #define IDS_VSS_RUN_ERROR               169
 #define IDS_DIFF_OPEN_NO_SET_PROPS      170
-#define IDS_LTIME_HEADER                171
-#define IDS_RTIME_HEADER                172
-#define IDS_EXTENSION_HEADER            173
+#define IDS_COLHDR_LTIMEM               171
+#define IDS_COLHDR_RTIMEM               172
+#define IDS_COLHDR_EXTENSION            173
 #define IDS_CONFIRM_DELETE_ITEMS        174
 #define IDS_DEL_LEFT_FMT                175
 #define IDS_DEL_RIGHT_FMT               176
@@ -82,6 +83,7 @@
 #define IDS_DEL_BOTH_FMT                181
 #define IDS_COPY_TO_RIGHT               182
 #define IDS_COPY_TO_RIGHT_MAIN          183
+#define IDS_COLHDR_LSIZE                183
 #define IDS_DELETE_DIR_FAILED           184
 #define IDS_COPY_FILE_FAILED            185
 #define IDS_COPY_DIR_FAILED             186
@@ -100,8 +102,21 @@
 #define IDS_STATUS_COPYALL2L            199
 #define IDS_STATUS_COPYALL2R            200
 #define IDS_PROGRAMFILES                201
+#define IDS_COLHDR_RSIZE                202
+#define IDS_COLHDR_LTIMEC               203
+#define IDS_COLHDR_RTIMEC               204
+#define IDS_COLHDR_NEWER                205
+#define IDS_COLHDR_LVERSION             206
+#define IDS_COLHDR_RVERSION             207
+#define IDS_LEFTONLY                    208
+#define IDS_RIGHTONLY                   209
+#define IDS_COLHDR_RESULT_ABBR          210
+#define IDS_COLHDR_LATTRIBUTES          211
+#define IDS_COLHDR_RATTRIBUTES          212
 #define IDB_EQUAL                       213
+#define IDS_FILE_SKIPPED                213
 #define IDB_NOTEQUAL                    214
+#define IDS_DIR_SKIPPED                 214
 #define IDB_RFOLDER                     215
 #define IDB_UNKNOWN                     216
 #define IDB_BINARYSAME                  217
@@ -167,6 +182,14 @@
 #define IDC_WINMERGE_PATH_SAVE          1047
 #define IDC_STATIC_TITLE_LEFT           1048
 #define IDC_STATIC_TITLE_RIGHT          1049
+#define IDC_GROUP_SHOW                  1053
+#define IDC_LIST_SHOW                   1054
+#define IDC_UP                          1055
+#define IDC_DOWN                        1056
+#define IDC_GROUP_HIDE                  1057
+#define IDC_LIST_HIDE                   1058
+#define IDC_ADD                         1059
+#define IDC_REMOVE                      1060
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO            8503
@@ -366,16 +389,17 @@
 #define ID_EDIT_FIND_PREVIOUS           32820
 #define ID_SHOWLINEDIFF                 32821
 #define ID_EDITOR_COPY_PATH             32822
+#define ID_EDIT_COLUMNS                 32822
 #define ID_EDITOR_COPY_FILENAME         32823
 
 // Next default values for new objects
-//
+// 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        116
-#define _APS_NEXT_COMMAND_VALUE         32822
-#define _APS_NEXT_CONTROL_VALUE         1050
+#define _APS_NEXT_RESOURCE_VALUE        118
+#define _APS_NEXT_COMMAND_VALUE         32823
+#define _APS_NEXT_CONTROL_VALUE         1061
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif

diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc
index 6c7feb7..6af89a5 100644 (file)
--- a/Src/Languages/Danish/MergeDanish.rc
+++ b/Src/Languages/Danish/MergeDanish.rc
@@ -175,7 +175,7 @@ END
 
 IDR_POPUP_DIRVIEW MENU DISCARDABLE
 BEGIN
-    POPUP "_POPUP_"
+    POPUP "_ITEM_POPUP_"
     BEGIN
         MENUITEM "Kopier fil til venstre",      ID_DIR_COPY_FILE_TO_LEFT
         MENUITEM "Kopier fil til højre",        ID_DIR_COPY_FILE_TO_RIGHT
@@ -188,6 +188,10 @@ BEGIN
         MENUITEM "Åben højre",                  ID_DIR_OPEN_RIGHT
         MENUITEM "Åben højre med...",           ID_DIR_OPEN_RIGHT_WITH
     END
+    POPUP "_HDR_POPUP_"
+    BEGIN
+        MENUITEM "Edit columns",                ID_EDIT_COLUMNS
+    END
 END
 
 IDR_POPUP_EDITOR_HEADERBAR MENU DISCARDABLE
@@ -523,6 +527,25 @@ BEGIN
                     WS_TABSTOP,WS_EX_STATICEDGE
 END
 
+IDD_DIRCOLS DIALOG DISCARDABLE  0, 0, 273, 162
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Display Columns"
+FONT 8, "MS Sans Serif"
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,141,129,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,81,129,50,14
+    GROUPBOX        "Show columns",IDC_GROUP_SHOW,7,17,124,100
+    LISTBOX         IDC_LIST_SHOW,42,31,83,79,LBS_NOINTEGRALHEIGHT | 
+                    LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "&Up",IDC_UP,13,43,23,13
+    PUSHBUTTON      "&Down",IDC_DOWN,13,67,23,13
+    GROUPBOX        "Hide columns",IDC_GROUP_HIDE,181,17,85,103
+    LISTBOX         IDC_LIST_HIDE,192,31,66,79,LBS_NOINTEGRALHEIGHT | 
+                    LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "<==",IDC_ADD,141,41,29,11
+    PUSHBUTTON      "==>",IDC_REMOVE,141,76,29,11
+END
+
 
 #ifndef _MAC
 /////////////////////////////////////////////////////////////////////////////
@@ -954,9 +977,9 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_FILENAME_HEADER     "Filnavn"
-    IDS_DIR_HEADER          "Mappe"
-    IDS_RESULT_HEADER       "Resultat af sammenligning"
+    IDS_COLHDR_FILENAME     "Filnavn"
+    IDS_COLHDR_DIR          "Mappe"
+    IDS_COLHDR_RESULT       "Resultat af sammenligning"
     IDS_FILE_COMPARISON_TITLE "Filsammenligning"
     IDS_DIFF_NUMBER_STATUS_FMT "Forskel %1 af %2"
     IDS_NO_DIFF_SEL_FMT     "%1 forskelle fundet"
@@ -966,9 +989,9 @@ BEGIN
     IDS_VSS_RUN_ERROR       "Fejl under udførelse af versionsstyringssystem kommando."
     IDS_DIFF_OPEN_NO_SET_PROPS
                             "Der er lavet ændringer i nogle indstillinger, der kan have indflydelse på allerede åbne vinduer. Nogle af disse indstillinger virker muligvis ikke før vinduerne er genåbnet."
-    IDS_LTIME_HEADER        "Venstre dato"
-    IDS_RTIME_HEADER        "Højre dato"
-    IDS_EXTENSION_HEADER    "Extension"
+    IDS_COLHDR_LTIMEM       "Venstre dato"
+    IDS_COLHDR_RTIMEM       "Højre dato"
+    IDS_COLHDR_EXTENSION    "Extension"
     IDS_CONFIRM_DELETE_ITEMS
                             "Er du sikker på du vil slette %1 af %2 valgte element(er)?"
     IDS_DEL_LEFT_FMT        "Slet venstre side %1 af %2 valgte element(er)"
@@ -983,6 +1006,7 @@ BEGIN
     IDS_COPY_TO_LEFT        "Kopier til venstre side %1 af %2 valgte element(er)"
     IDS_DEL_BOTH_FMT        "Slet begge sider %1 af %2 valgte element(er)"
     IDS_COPY_TO_RIGHT       "Kopier til højre side %1 af %2 valgte element(er)"
+    IDS_COLHDR_LSIZE        "Left Size"
     IDS_DELETE_DIR_FAILED   "Slet mappen %1 fejlede: %s"
     IDS_COPY_FILE_FAILED    "Kopiering af filen %1 fejlede: %2"
     IDS_COPY_DIR_FAILED     "Kopiering af mappen %1 fejlede: %2"
@@ -1013,6 +1037,12 @@ BEGIN
     IDS_STATUS_COPYALL2L    "Kopierer alt til venstre"
     IDS_STATUS_COPYALL2R    "Kopierer alt til højre"
     IDS_PROGRAMFILES        "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
+    IDS_COLHDR_RSIZE        "Right Size"
+    IDS_COLHDR_LTIMEC       "Left Creation Time"
+    IDS_COLHDR_RTIMEC       "Right Creation Time"
+    IDS_COLHDR_NEWER        "Newer File"
+    IDS_COLHDR_LVERSION     "Left File Version"
+    IDS_COLHDR_RVERSION     "Right File Version"
 END
 
 STRINGTABLE DISCARDABLE
@@ -1029,6 +1059,17 @@ BEGIN
     IDC_STATIC_TITLE_RIGHT  "Right click on the path to copy"
 END
 
+STRINGTABLE DISCARDABLE 
+BEGIN
+    IDS_LEFTONLY            "Left Only"
+    IDS_RIGHTONLY           "Right Only"
+    IDS_COLHDR_RESULT_ABBR  "Short Result"
+    IDS_COLHDR_LATTRIBUTES  "Left Attributes"
+    IDS_COLHDR_RATTRIBUTES  "Right Attributes"
+    IDS_FILE_SKIPPED        "File skipped"
+    IDS_DIR_SKIPPED         "Directory skipped"
+END
+
 #endif    // Danish resources
 /////////////////////////////////////////////////////////////////////////////
 

diff --git a/Src/Languages/Danish/resource.h b/Src/Languages/Danish/resource.h
index a7810b7..01b8c1c 100644 (file)
--- a/Src/Languages/Danish/resource.h
+++ b/Src/Languages/Danish/resource.h
@@ -24,6 +24,7 @@
 #define IDD_PROPPAGE_REGISTRY           113
 #define IDD_EDITOR_HEADERBAR            114
 #define IDR_POPUP_EDITOR_HEADERBAR      115
+#define IDD_DIRCOLS                     117
 #define IDS_VERSION_FMT                 130
 #define IDS_ALLFILES                    131
 #define IDS_CONFIRM_ALL_LEFT            132
@@ -55,9 +56,9 @@
 #define IDS_SAVEVSS_FMT                 157
 #define IDS_VSSERROR                    158
 #define IDS_NOPROJECT                   159
-#define IDS_FILENAME_HEADER             160
-#define IDS_DIR_HEADER                  161
-#define IDS_RESULT_HEADER               162
+#define IDS_COLHDR_FILENAME             160
+#define IDS_COLHDR_DIR                  161
+#define IDS_COLHDR_RESULT               162
 #define IDS_FILE_COMPARISON_TITLE       163
 #define IDS_DIFF_NUMBER_STATUS_FMT      164
 #define IDS_NO_DIFF_SEL                 165
@@ -67,9 +68,9 @@
 #define IDS_VSS_CMD                     168
 #define IDS_VSS_RUN_ERROR               169
 #define IDS_DIFF_OPEN_NO_SET_PROPS      170
-#define IDS_LTIME_HEADER                171
-#define IDS_RTIME_HEADER                172
-#define IDS_EXTENSION_HEADER            173
+#define IDS_COLHDR_LTIMEM               171
+#define IDS_COLHDR_RTIMEM               172
+#define IDS_COLHDR_EXTENSION            173
 #define IDS_CONFIRM_DELETE_ITEMS        174
 #define IDS_DEL_LEFT_FMT                175
 #define IDS_DEL_RIGHT_FMT               176
@@ -82,6 +83,7 @@
 #define IDS_DEL_BOTH_FMT                181
 #define IDS_COPY_TO_RIGHT               182
 #define IDS_COPY_TO_RIGHT_MAIN          183
+#define IDS_COLHDR_LSIZE                183
 #define IDS_DELETE_DIR_FAILED           184
 #define IDS_COPY_FILE_FAILED            185
 #define IDS_COPY_DIR_FAILED             186
@@ -100,8 +102,21 @@
 #define IDS_STATUS_COPYALL2L            199
 #define IDS_STATUS_COPYALL2R            200
 #define IDS_PROGRAMFILES                201
+#define IDS_COLHDR_RSIZE                202
+#define IDS_COLHDR_LTIMEC               203
+#define IDS_COLHDR_RTIMEC               204
+#define IDS_COLHDR_NEWER                205
+#define IDS_COLHDR_LVERSION             206
+#define IDS_COLHDR_RVERSION             207
+#define IDS_LEFTONLY                    208
+#define IDS_RIGHTONLY                   209
+#define IDS_COLHDR_RESULT_ABBR          210
+#define IDS_COLHDR_LATTRIBUTES          211
+#define IDS_COLHDR_RATTRIBUTES          212
 #define IDB_EQUAL                       213
+#define IDS_FILE_SKIPPED                213
 #define IDB_NOTEQUAL                    214
+#define IDS_DIR_SKIPPED                 214
 #define IDB_RFOLDER                     215
 #define IDB_UNKNOWN                     216
 #define IDB_BINARYSAME                  217
@@ -167,6 +182,14 @@
 #define IDC_WINMERGE_PATH_SAVE          1047
 #define IDC_STATIC_TITLE_LEFT           1048
 #define IDC_STATIC_TITLE_RIGHT          1049
+#define IDC_GROUP_SHOW                  1053
+#define IDC_LIST_SHOW                   1054
+#define IDC_UP                          1055
+#define IDC_DOWN                        1056
+#define IDC_GROUP_HIDE                  1057
+#define IDC_LIST_HIDE                   1058
+#define IDC_ADD                         1059
+#define IDC_REMOVE                      1060
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO            8503
@@ -366,16 +389,17 @@
 #define ID_EDIT_FIND_PREVIOUS           32820
 #define ID_SHOWLINEDIFF                 32821
 #define ID_EDITOR_COPY_PATH             32822
+#define ID_EDIT_COLUMNS                 32822
 #define ID_EDITOR_COPY_FILENAME         32823
 
 // Next default values for new objects
-//
+// 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        116
-#define _APS_NEXT_COMMAND_VALUE         32822
-#define _APS_NEXT_CONTROL_VALUE         1050
+#define _APS_NEXT_RESOURCE_VALUE        118
+#define _APS_NEXT_COMMAND_VALUE         32823
+#define _APS_NEXT_CONTROL_VALUE         1061
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif

diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc
index 103786b..ffa4e97 100644 (file)
--- a/Src/Languages/Dutch/MergeDutch.rc
+++ b/Src/Languages/Dutch/MergeDutch.rc
@@ -176,7 +176,7 @@ END
 
 IDR_POPUP_DIRVIEW MENU DISCARDABLE
 BEGIN
-    POPUP "_POPUP_"
+    POPUP "_ITEM_POPUP_"
     BEGIN
         MENUITEM "Kopieer bestand naar links",  ID_DIR_COPY_FILE_TO_LEFT
         MENUITEM "Kopieer bestand naar rechts", ID_DIR_COPY_FILE_TO_RIGHT
@@ -189,6 +189,10 @@ BEGIN
         MENUITEM "Open right",                  ID_DIR_OPEN_RIGHT
         MENUITEM "Open right with...",          ID_DIR_OPEN_RIGHT_WITH
     END
+    POPUP "_HDR_POPUP_"
+    BEGIN
+        MENUITEM "Edit columns",                ID_EDIT_COLUMNS
+    END
 END
 
 IDR_POPUP_EDITOR_HEADERBAR MENU DISCARDABLE
@@ -527,6 +531,25 @@ BEGIN
                     WS_TABSTOP,WS_EX_STATICEDGE
 END
 
+IDD_DIRCOLS DIALOG DISCARDABLE  0, 0, 273, 162
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Display Columns"
+FONT 8, "MS Sans Serif"
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,141,129,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,81,129,50,14
+    GROUPBOX        "Show columns",IDC_GROUP_SHOW,7,17,124,100
+    LISTBOX         IDC_LIST_SHOW,42,31,83,79,LBS_NOINTEGRALHEIGHT | 
+                    LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "&Up",IDC_UP,13,43,23,13
+    PUSHBUTTON      "&Down",IDC_DOWN,13,67,23,13
+    GROUPBOX        "Hide columns",IDC_GROUP_HIDE,181,17,85,103
+    LISTBOX         IDC_LIST_HIDE,192,31,66,79,LBS_NOINTEGRALHEIGHT | 
+                    LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "<==",IDC_ADD,141,41,29,11
+    PUSHBUTTON      "==>",IDC_REMOVE,141,76,29,11
+END
+
 
 #ifndef _MAC
 /////////////////////////////////////////////////////////////////////////////
@@ -961,9 +984,9 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_FILENAME_HEADER     "Bestandsnaam"
-    IDS_DIR_HEADER          "Map"
-    IDS_RESULT_HEADER       "Vergelijkings resultaat"
+    IDS_COLHDR_FILENAME     "Bestandsnaam"
+    IDS_COLHDR_DIR          "Map"
+    IDS_COLHDR_RESULT       "Vergelijkings resultaat"
     IDS_FILE_COMPARISON_TITLE "Restultaten bestandsvergelijking"
     IDS_DIFF_NUMBER_STATUS_FMT "Difference %1 of %2"
     IDS_NO_DIFF_SEL_FMT     "%1 Differences Found"
@@ -973,9 +996,9 @@ BEGIN
     IDS_VSS_RUN_ERROR       "Error executing versioning system command."
     IDS_DIFF_OPEN_NO_SET_PROPS
                             "Modifications have been made to the current file comparison session.  Some settings may not take place until the current file comparison is restarted."
-    IDS_LTIME_HEADER        "Left Date"
-    IDS_RTIME_HEADER        "Right Date"
-    IDS_EXTENSION_HEADER    "Extension"
+    IDS_COLHDR_LTIMEM       "Left Date"
+    IDS_COLHDR_RTIMEM       "Right Date"
+    IDS_COLHDR_EXTENSION    "Extension"
     IDS_CONFIRM_DELETE_ITEMS
                             "Are you sure you want to delete %1 of %2 selected item(s) ?"
     IDS_DEL_LEFT_FMT        "Delete left side %1 of %2 selected item(s)"
@@ -990,6 +1013,7 @@ BEGIN
     IDS_COPY_TO_LEFT        "Copy to left side %1 of %2 selected item(s)"
     IDS_DEL_BOTH_FMT        "Delete both sides %1 of %2 selected item(s)"
     IDS_COPY_TO_RIGHT       "Copy to right side %1 of %2 selected item(s)"
+    IDS_COLHDR_LSIZE        "Left Size"
     IDS_DELETE_DIR_FAILED   "Delete directory %1 failed: %s"
     IDS_COPY_FILE_FAILED    "Copying file %1 failed: %2"
     IDS_COPY_DIR_FAILED     "Copying directory %1 failed: %2"
@@ -1023,6 +1047,12 @@ BEGIN
     IDS_STATUS_COPYALL2L    "Copying All to Left"
     IDS_STATUS_COPYALL2R    "Copying All to Right"
     IDS_PROGRAMFILES        "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
+    IDS_COLHDR_RSIZE        "Right Size"
+    IDS_COLHDR_LTIMEC       "Left Creation Time"
+    IDS_COLHDR_RTIMEC       "Right Creation Time"
+    IDS_COLHDR_NEWER        "Newer File"
+    IDS_COLHDR_LVERSION     "Left File Version"
+    IDS_COLHDR_RVERSION     "Right File Version"
 END
 
 STRINGTABLE DISCARDABLE
@@ -1039,6 +1069,17 @@ BEGIN
     IDC_STATIC_TITLE_RIGHT  "Right click on the path to copy"
 END
 
+STRINGTABLE DISCARDABLE 
+BEGIN
+    IDS_LEFTONLY            "Left Only"
+    IDS_RIGHTONLY           "Right Only"
+    IDS_COLHDR_RESULT_ABBR  "Short Result"
+    IDS_COLHDR_LATTRIBUTES  "Left Attributes"
+    IDS_COLHDR_RATTRIBUTES  "Right Attributes"
+    IDS_FILE_SKIPPED        "File skipped"
+    IDS_DIR_SKIPPED         "Directory skipped"
+END
+
 #endif    // Dutch (Netherlands) resources
 /////////////////////////////////////////////////////////////////////////////
 

diff --git a/Src/Languages/Dutch/resource.h b/Src/Languages/Dutch/resource.h
index a7810b7..01b8c1c 100644 (file)
--- a/Src/Languages/Dutch/resource.h
+++ b/Src/Languages/Dutch/resource.h
@@ -24,6 +24,7 @@
 #define IDD_PROPPAGE_REGISTRY           113
 #define IDD_EDITOR_HEADERBAR            114
 #define IDR_POPUP_EDITOR_HEADERBAR      115
+#define IDD_DIRCOLS                     117
 #define IDS_VERSION_FMT                 130
 #define IDS_ALLFILES                    131
 #define IDS_CONFIRM_ALL_LEFT            132
@@ -55,9 +56,9 @@
 #define IDS_SAVEVSS_FMT                 157
 #define IDS_VSSERROR                    158
 #define IDS_NOPROJECT                   159
-#define IDS_FILENAME_HEADER             160
-#define IDS_DIR_HEADER                  161
-#define IDS_RESULT_HEADER               162
+#define IDS_COLHDR_FILENAME             160
+#define IDS_COLHDR_DIR                  161
+#define IDS_COLHDR_RESULT               162
 #define IDS_FILE_COMPARISON_TITLE       163
 #define IDS_DIFF_NUMBER_STATUS_FMT      164
 #define IDS_NO_DIFF_SEL                 165
@@ -67,9 +68,9 @@
 #define IDS_VSS_CMD                     168
 #define IDS_VSS_RUN_ERROR               169
 #define IDS_DIFF_OPEN_NO_SET_PROPS      170
-#define IDS_LTIME_HEADER                171
-#define IDS_RTIME_HEADER                172
-#define IDS_EXTENSION_HEADER            173
+#define IDS_COLHDR_LTIMEM               171
+#define IDS_COLHDR_RTIMEM               172
+#define IDS_COLHDR_EXTENSION            173
 #define IDS_CONFIRM_DELETE_ITEMS        174
 #define IDS_DEL_LEFT_FMT                175
 #define IDS_DEL_RIGHT_FMT               176
@@ -82,6 +83,7 @@
 #define IDS_DEL_BOTH_FMT                181
 #define IDS_COPY_TO_RIGHT               182
 #define IDS_COPY_TO_RIGHT_MAIN          183
+#define IDS_COLHDR_LSIZE                183
 #define IDS_DELETE_DIR_FAILED           184
 #define IDS_COPY_FILE_FAILED            185
 #define IDS_COPY_DIR_FAILED             186
@@ -100,8 +102,21 @@
 #define IDS_STATUS_COPYALL2L            199
 #define IDS_STATUS_COPYALL2R            200
 #define IDS_PROGRAMFILES                201
+#define IDS_COLHDR_RSIZE                202
+#define IDS_COLHDR_LTIMEC               203
+#define IDS_COLHDR_RTIMEC               204
+#define IDS_COLHDR_NEWER                205
+#define IDS_COLHDR_LVERSION             206
+#define IDS_COLHDR_RVERSION             207
+#define IDS_LEFTONLY                    208
+#define IDS_RIGHTONLY                   209
+#define IDS_COLHDR_RESULT_ABBR          210
+#define IDS_COLHDR_LATTRIBUTES          211
+#define IDS_COLHDR_RATTRIBUTES          212
 #define IDB_EQUAL                       213
+#define IDS_FILE_SKIPPED                213
 #define IDB_NOTEQUAL                    214
+#define IDS_DIR_SKIPPED                 214
 #define IDB_RFOLDER                     215
 #define IDB_UNKNOWN                     216
 #define IDB_BINARYSAME                  217
@@ -167,6 +182,14 @@
 #define IDC_WINMERGE_PATH_SAVE          1047
 #define IDC_STATIC_TITLE_LEFT           1048
 #define IDC_STATIC_TITLE_RIGHT          1049
+#define IDC_GROUP_SHOW                  1053
+#define IDC_LIST_SHOW                   1054
+#define IDC_UP                          1055
+#define IDC_DOWN                        1056
+#define IDC_GROUP_HIDE                  1057
+#define IDC_LIST_HIDE                   1058
+#define IDC_ADD                         1059
+#define IDC_REMOVE                      1060
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO            8503
@@ -366,16 +389,17 @@
 #define ID_EDIT_FIND_PREVIOUS           32820
 #define ID_SHOWLINEDIFF                 32821
 #define ID_EDITOR_COPY_PATH             32822
+#define ID_EDIT_COLUMNS                 32822
 #define ID_EDITOR_COPY_FILENAME         32823
 
 // Next default values for new objects
-//
+// 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        116
-#define _APS_NEXT_COMMAND_VALUE         32822
-#define _APS_NEXT_CONTROL_VALUE         1050
+#define _APS_NEXT_RESOURCE_VALUE        118
+#define _APS_NEXT_COMMAND_VALUE         32823
+#define _APS_NEXT_CONTROL_VALUE         1061
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif

diff --git a/Src/readme.txt b/Src/readme.txt
index 997543f..edff623 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,7 @@
+2003-08-27 Perry
+ l10n effects of patch#781529: new popup menu, new dialog, alter existing col header strings
+  Languages: Czech, Danish, Dutch
+
 2003-08-27 Kimmo
  PATCH: [ 784302 ] Implement Read-only for files and dirs
   Only background changes, no UI changes
@@ -13,7 +17,7 @@
 2003-08-26 Perry
  Implement fix for BUG#794514: 'Comparison Summary' not updated properly
   WinMerge: DirDoc.cpp
- i18n effects of patch#781529: new popup menu, new dialog, alter existing col header strings
+ l10n effects of patch#781529: new popup menu, new dialog, alter existing col header strings
   Languages: Brazilian, ChineseSimplified, ChineseTraditional
   
 2003-08-25 Laoran