OSDN Git Service

Update & synchronize translations: ChineseTraditional Czech Danish Dutch
authorPerry Rapp <elsapo@users.sourceforge.net>
Wed, 14 Dec 2005 02:38:26 +0000 (02:38 +0000)
committerPerry Rapp <elsapo@users.sourceforge.net>
Wed, 14 Dec 2005 02:38:26 +0000 (02:38 +0000)
  Src/Languages:
  ChineseTraditional: MergeChineseTraditional.rc
  Czech: MergeCzech.rc
  Danish: MergeDanish.rc
  Dutch: MergeDutch.rc

Src/Changes.txt
Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
Src/Languages/Czech/MergeCzech.rc
Src/Languages/Danish/MergeDanish.rc
Src/Languages/Dutch/MergeDutch.rc

index a05d17d..5c911e5 100644 (file)
@@ -1,3 +1,11 @@
+2005-12-14 Perry
+ Update & synchronize translations: ChineseTraditional Czech Danish Dutch
+  Src/Languages:
+  ChineseTraditional: MergeChineseTraditional.rc
+  Czech: MergeCzech.rc
+  Danish: MergeDanish.rc
+  Dutch: MergeDutch.rc
+
 2005-12-13 Perry
  PATCH: [ 1379894 ] Fix handling of unknown encoding
   Src: MainFrm.cpp
index 71851be..4521b70 100644 (file)
@@ -138,6 +138,10 @@ BEGIN
     BEGIN
         MENUITEM "&Filters...",                 ID_TOOLS_FILTERS
         MENUITEM "&Generate Patch...",          ID_TOOLS_GENERATEPATCH
+        POPUP "&Advanced"
+        BEGIN
+            MENUITEM "&Load Config...",         ID_TOOLS_LOADCONFIG
+        END
     END
     POPUP "&Plugins"
     BEGIN
@@ -237,6 +241,10 @@ BEGIN
         MENUITEM "&Filters...",                 ID_TOOLS_FILTERS
         MENUITEM "&Generate Patch...",          ID_TOOLS_GENERATEPATCH
         MENUITEM "Generate &Report...",         ID_TOOLS_GENERATEREPORT
+        POPUP "&Advanced"
+        BEGIN
+            MENUITEM "&Load Config...",         ID_TOOLS_LOADCONFIG
+        END
     END
     POPUP "&Plugins"
     BEGIN
@@ -331,7 +339,8 @@ BEGIN
         MENUITEM SEPARATOR
         POPUP "¶i¶¥"
         BEGIN
-            MENUITEM "½Æ»s³s¦P¦C¸¹(&C)\tCtrl+Shift+C", ID_EDIT_COPY_LINENUMBERS
+            MENUITEM "½Æ»s³s¦P¦C¸¹(&C)\tCtrl+Shift+C",
+                                                ID_EDIT_COPY_LINENUMBERS
         END
         MENUITEM "²¾¦Ü(&G)...\tCtrl+G",         ID_EDIT_WMGOTO
         MENUITEM SEPARATOR
@@ -379,6 +388,10 @@ BEGIN
     BEGIN
         MENUITEM "ÂoÃè(&F)...",                 ID_TOOLS_FILTERS
         MENUITEM "²£¥Í¸É¤B(&G)...",             ID_TOOLS_GENERATEPATCH
+        POPUP "&Advanced"
+        BEGIN
+            MENUITEM "&Load Config...",         ID_TOOLS_LOADCONFIG
+        END
     END
     POPUP "¥~±¾(&P)"
     BEGIN
@@ -593,16 +606,18 @@ CAPTION "
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     RTEXT           "¥ªÃä(&L):",IDC_STATIC,13,24,40,8
-    COMBOBOX        IDC_LEFT_COMBO,56,22,182,94,CBS_DROPDOWN | CBS_AUTOHSCROLL |
-                    WS_VSCROLL | WS_TABSTOP,WS_EX_ACCEPTFILES
+    COMBOBOX        IDC_LEFT_COMBO,56,22,182,94,CBS_DROPDOWN |
+                    CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP,
+                    WS_EX_ACCEPTFILES
     PUSHBUTTON      "ÂsÄý(&B)...",IDC_LEFT_BUTTON,242,22,50,12
     RTEXT           "¥kÃä(&R):",IDC_STATIC,13,40,40,8
-    COMBOBOX        IDC_RIGHT_COMBO,56,38,182,95,CBS_DROPDOWN | CBS_AUTOHSCROLL |
-                    WS_VSCROLL | WS_TABSTOP,WS_EX_ACCEPTFILES
+    COMBOBOX        IDC_RIGHT_COMBO,56,38,182,95,CBS_DROPDOWN |
+                    CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP,
+                    WS_EX_ACCEPTFILES
     PUSHBUTTON      "ÂsÄý(&W)...",IDC_RIGHT_BUTTON,242,38,50,12
     RTEXT           "ÂoÃè(&F):",IDC_STATIC,13,56,40,8
-    COMBOBOX        IDC_EXT_COMBO,56,54,182,95,CBS_DROPDOWN | CBS_AUTOHSCROLL |
-                    WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_EXT_COMBO,56,54,182,95,CBS_DROPDOWN |
+                    CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "¿ï¨ú...",IDC_SELECT_FILTER,242,54,50,12
     RTEXT           "¸Ñ«Ê¥](&U):",IDC_STATIC,13,72,40,8
     EDITTEXT        IDC_UNPACKER_EDIT,56,70,181,12,ES_AUTOHSCROLL |
@@ -613,7 +628,9 @@ BEGIN
     LTEXT           "ª¬ºA:",IDC_OPEN_STATUS,15,102,182,8
     DEFPUSHBUTTON   "½T©w",IDOK,306,11,50,14
     PUSHBUTTON      "¨ú®ø",IDCANCEL,306,28,50,14
-    GROUPBOX        "­n¤ñ¹ïªºÀɮשθê®Æ§¨",IDC_FILES_DIRS_GROUP,7,7,292,111
+    GROUPBOX        "­n¤ñ¹ïªºÀɮשθê®Æ§¨",IDC_FILES_DIRS_GROUP,7,
+                    7,292,111
+    PUSHBUTTON      "Save project",IDC_SAVEPROJECT,306,56,50,14
 END
 
 IDD_VSS DIALOGEX 0, 0, 257, 166
@@ -651,7 +668,7 @@ BEGIN
     LTEXT           "ª©¥»¨t²Î(&V)",IDC_STATIC,7,7,221,10
     COMBOBOX        IDC_VER_SYS,7,18,166,98,CBS_DROPDOWNLIST | WS_VSCROLL |
                     WS_TABSTOP
-    LTEXT           "cleartool.exe ¸ô®|(&P):",IDC_SCROLL_CHECK,7,37,221,10
+    LTEXT           "cleartool.exe ¸ô®|(&P):",IDC_VSS_L1,7,37,221,10
     EDITTEXT        IDC_PATH_EDIT,7,48,166,14,ES_AUTOHSCROLL
     PUSHBUTTON      "ÂsÄý(&B)...",IDC_BROWSE_BUTTON,178,48,50,14
 END
@@ -661,12 +678,13 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
 CAPTION "¤@¯ë"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    CONTROL         "³Æ¥÷­ì©lªºÀÉ®×(&B)",IDC_BACKUP_CHECK,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,7,83,10
-    CONTROL         "¦Û°Ê¦a±²°Ê¨ì²Ä¤@­Ó¤£¦P(&S)",IDC_SCROLL_CHECK,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,17,129,10
-    CONTROL         "°±¥Î¤Þ¤Hª`¥Øªº¿Ã¹õ(&D)",IDC_DISABLE_SPLASH,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,27,100,10
+    CONTROL         "³Æ¥÷­ì©lªºÀÉ®×(&B)",IDC_BACKUP_CHECK,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,7,83,10
+    CONTROL         "¦Û°Ê¦a±²°Ê¨ì²Ä¤@­Ó¤£¦P(&S)",
+                    IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
+                    17,129,10
+    CONTROL         "°±¥Î¤Þ¤Hª`¥Øªº¿Ã¹õ(&D)",IDC_DISABLE_SPLASH,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,27,100,10
     CONTROL         "«ö¤U ESC ®ÉÃö³¬µøµ¡(&O)",IDC_ESC_CLOSES_WINDOW,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
     CONTROL         "¦b¶}±Ò¹ï¸Ü²°¦Û°Ê¦aÅçÃÒ¸ô®|",
@@ -693,8 +711,8 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     PUSHBUTTON      "½T©w",IDOK,154,16,52,14
     PUSHBUTTON      "¨ú®ø",IDCANCEL,154,33,52,14
-    LISTBOX         IDC_LANGUAGE_LIST,5,16,141,89,LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
-                    WS_TABSTOP | LBS_SORT
+    LISTBOX         IDC_LANGUAGE_LIST,5,16,141,89,LBS_NOINTEGRALHEIGHT |
+                    WS_VSCROLL | WS_TABSTOP | LBS_SORT
     LTEXT           "¥i¥Îªº»y¨¥:",IDC_STATIC,7,7,140,8
 END
 
@@ -707,16 +725,17 @@ BEGIN
     LTEXT           "­n§ä¤°»ò(&N):",IDC_STATIC,7,9,50,8
     COMBOBOX        IDC_EDIT_FINDTEXT,59,7,160,65,CBS_DROPDOWN |
                     CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "¥þ¦r«÷¼g¶·¬Û²Å(&W)",IDC_EDIT_WHOLE_WORD,"Button",BS_AUTOCHECKBOX |
-                    WS_GROUP | WS_TABSTOP,7,27,135,10
-    CONTROL         "¤j¤p¼g¶·¬Û²Å(&C)",IDC_EDIT_MATCH_CASE,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,37,135,10
-    CONTROL         "¤@¯ë¹Bºâ¦¡(&E)",IDC_EDIT_REGEXP,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,47,135,10
+    CONTROL         "¥þ¦r«÷¼g¶·¬Û²Å(&W)",IDC_EDIT_WHOLE_WORD,"Button",
+                    BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,27,135,10
+    CONTROL         "¤j¤p¼g¶·¬Û²Å(&C)",IDC_EDIT_MATCH_CASE,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,37,135,10
+    CONTROL         "¤@¯ë¹Bºâ¦¡(&E)",IDC_EDIT_REGEXP,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,47,135,10
     GROUPBOX        "¤è¦V",IDC_STATIC,148,23,70,36,WS_GROUP
-    CONTROL         "¤W²¾(&U)",IDC_EDIT_DIRECTION_UP,"Button",BS_AUTORADIOBUTTON | WS_GROUP,
-                    154,34,57,10
-    CONTROL         "¤U²¾(&D)",IDC_EDIT_DIRECTION_DOWN,"Button",BS_AUTORADIOBUTTON,154,44,57,10
+    CONTROL         "¤W²¾(&U)",IDC_EDIT_DIRECTION_UP,"Button",BS_AUTORADIOBUTTON |
+                    WS_GROUP, 154,34,57,10
+    CONTROL         "¤U²¾(&D)",IDC_EDIT_DIRECTION_DOWN,"Button",
+                    BS_AUTORADIOBUTTON,154,44,57,10
     DEFPUSHBUTTON   "§ä¤U¤@­Ó(&F)",IDOK,226,7,50,14,WS_GROUP
     PUSHBUTTON      "¨ú®ø",IDCANCEL,226,24,50,14
 END
@@ -733,19 +752,19 @@ BEGIN
     LTEXT           "¨ú¥N¥H(&P):",IDC_STATIC,7,24,65,8
     COMBOBOX        IDC_EDIT_REPLACE_WITH,75,22,165,66,CBS_DROPDOWN |
                     CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "¥þ¦r«÷¼g¶·¬Û²Å(&W)",IDC_EDIT_WHOLE_WORD,"Button",BS_AUTOCHECKBOX |
-                    WS_GROUP | WS_TABSTOP,7,44,135,10
-    CONTROL         "¤j¤p¼g¶·¬Û²Å(&C)",IDC_EDIT_MATCH_CASE,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,54,135,10
-    CONTROL         "¤@¯ë¹Bºâ¦¡(&E)",IDC_EDIT_REGEXP,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,64,135,10
+    CONTROL         "¥þ¦r«÷¼g¶·¬Û²Å(&W)",IDC_EDIT_WHOLE_WORD,"Button",
+                    BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,44,135,10
+    CONTROL         "¤j¤p¼g¶·¬Û²Å(&C)",IDC_EDIT_MATCH_CASE,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,54,135,10
+    CONTROL         "¤@¯ë¹Bºâ¦¡(&E)",IDC_EDIT_REGEXP,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,64,135,10
     CONTROL         "¤£­n¥]»qÀÉ®×µ²§ô(&D)",IDC_EDIT_SCOPE_DONT_WRAP,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,74,135,10
     GROUPBOX        "¨ú¥N¦b",IDC_STATIC,149,40,90,36,WS_GROUP
-    CONTROL         "¿ï¨ú(&S)",IDC_EDIT_SCOPE_SELECTION,"Button",BS_AUTORADIOBUTTON | WS_GROUP,
-                    154,51,80,10
-    CONTROL         "¾ã­ÓÀÉ®×(&O)",IDC_EDIT_SCOPE_WHOLE_FILE,"Button",BS_AUTORADIOBUTTON,154,61,
-                    80,10
+    CONTROL         "¿ï¨ú(&S)",IDC_EDIT_SCOPE_SELECTION,"Button",
+                    BS_AUTORADIOBUTTON | WS_GROUP,154,51,80,10
+    CONTROL         "¾ã­ÓÀÉ®×(&O)",IDC_EDIT_SCOPE_WHOLE_FILE,"Button",
+                    BS_AUTORADIOBUTTON,154,61,80,10
     DEFPUSHBUTTON   "§ä¤U¤@­Ó(&F)",IDC_EDIT_SKIP,247,7,50,14,WS_GROUP
     PUSHBUTTON      "¨ú¥N(&R)",IDC_EDIT_REPLACE,247,24,50,14
     PUSHBUTTON      "¥þ³¡¨ú¥N(&A)",IDC_EDIT_REPLACE_ALL,247,41,50,14
@@ -775,11 +794,13 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "¦CÂoÃè"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    CONTROL         "©¿²¤¦C²Å¦X¤U¦Cªº¼Ë¦¡",IDC_IGNOREREGEXP,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,7,221,15
-    LTEXT           "¤@¯ë¹Bºâ¦¡ (¨C¦C¤@­Ó):",IDC_STATIC,7,28,221,8
-    EDITTEXT        IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE | ES_AUTOHSCROLL |
-                    ES_WANTRETURN
+    CONTROL         "©¿²¤¦C²Å¦X¤U¦Cªº¼Ë¦¡",
+                    IDC_IGNOREREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
+                    7,221,15
+    LTEXT           "¤@¯ë¹Bºâ¦¡ (¨C¦C¤@­Ó):",IDC_STATIC,7,28,
+                    221,8
+    EDITTEXT        IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE |
+                    ES_AUTOHSCROLL | ES_WANTRETURN
 END
 
 IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 196
@@ -788,11 +809,13 @@ CAPTION "
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     RTEXT           "¤£¦P:",IDC_STATIC,7,29,90,8
-    CONTROL         "¤£¦P",IDC_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,113,29,17,
-                    14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE
+    CONTROL         "¤£¦P",IDC_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW |
+                    WS_TABSTOP,113,29,17,14,WS_EX_TRANSPARENT |
+                    WS_EX_CLIENTEDGE
     RTEXT           "¿ï¨úªº¤£¦P:",IDC_STATIC,7,49,90,8
-    CONTROL         "¤£¦P",IDC_SEL_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,113,49,17,
-                    14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE
+    CONTROL         "¤£¦P",IDC_SEL_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW |
+                    WS_TABSTOP,113,49,17,14,WS_EX_TRANSPARENT |
+                    WS_EX_CLIENTEDGE
     CTEXT           "­I´º",IDC_STATIC,96,15,50,8
     CTEXT           "¤w§R°£",IDC_STATIC,145,15,38,8
     CONTROL         "¤£¦P",IDC_DIFFERENCE_DELETED_COLOR,"Button",BS_OWNERDRAW |
@@ -862,7 +885,8 @@ CAPTION "Dialog"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "½T©w",IDOK,106,136,50,14
-    EDITTEXT        IDC_EDIT1,7,7,264,123,ES_MULTILINE | ES_READONLY | WS_VSCROLL
+    EDITTEXT        IDC_EDIT1,7,7,264,123,ES_MULTILINE | ES_READONLY |
+                    WS_VSCROLL
 END
 
 IDD_PROPPAGE_REGISTRY DIALOGEX 0, 0, 235, 156
@@ -1037,12 +1061,12 @@ BEGIN
                     WS_GROUP,14,19,206,10
     CONTROL         "©¿²¤ªÅ¥Õ©M¸õ®æ§ó§ï(&H)",IDC_WHITE_CHANGE,"Button",
                     BS_AUTORADIOBUTTON,14,30,206,10
-    CONTROL         "©¿²¤©Ò¦³ªÅ¥Õ©M¸õ®æ(&A)",IDC_ALL_WHITE,"Button",
-                    BS_AUTORADIOBUTTON,14,41,206,10
-    CONTROL         "©¿²¤ªÅ¥Õ¦C(&K)",IDC_IGNBLANKS_CHECK,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,60,221,10
-    CONTROL         "©¿²¤¤j¤p¼g(&C)",IDC_IGNCASE_CHECK,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,70,221,10
+    CONTROL         "©¿²¤©Ò¦³ªÅ¥Õ©M¸õ®æ(&A)",IDC_ALL_WHITE,"Button",BS_AUTORADIOBUTTON,
+                    14,41,206,10
+    CONTROL         "©¿²¤ªÅ¥Õ¦C(&K)",IDC_IGNBLANKS_CHECK,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,60,221,10
+    CONTROL         "©¿²¤¤j¤p¼g(&C)",IDC_IGNCASE_CHECK,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,70,221,10
     CONTROL         "©¿²¤´«¦æ¤£¦P(DOS/UNIX/MAC)(&R)",
                     IDC_EOL_SENSITIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
                     7,80,221,10
@@ -1110,7 +1134,7 @@ END
 
 IDD_SAVECLOSING DIALOGEX 0, 0, 262, 154
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
-    WS_SYSMENU
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "­nÀx¦s­×§ïªºÀɮ׶Ü?"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -1432,119 +1456,6 @@ END
 
 /////////////////////////////////////////////////////////////////////////////
 //
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE
-BEGIN
-    IDD_ABOUTBOX, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 216
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 115
-    END
-
-    IDD_OPEN, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 349
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 108
-    END
-
-    IDD_VSS, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 251
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 141
-    END
-
-    IDD_PROP_VSS, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 252
-        VERTGUIDE, 85
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 150
-    END
-
-    IDD_PROPPAGE_LARGE, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 228
-        VERTGUIDE, 128
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 149
-    END
-
-    IDD_CLEARCASE, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 272
-        VERTGUIDE, 18
-        VERTGUIDE, 35
-        VERTGUIDE, 244
-        VERTGUIDE, 261
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 104
-    END
-
-    IDD_PROPSYNTAX, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 228
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 149
-    END
-
-    IDD_PROPPAGE_FILTER, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 228
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 149
-    END
-
-    IDD_PROPPAGE_COLORS, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 228
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 149
-    END
-
-    IDD_EDITOR_HEADERBAR, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 366
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 4
-    END
-
-    IDD_DIRCOLS, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 266
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 155
-    END
-
-    IDD_GENERATE_PATCH, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 333
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 173
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
 // Toolbar
 //
 
@@ -1674,7 +1585,7 @@ END
 
 STRINGTABLE
 BEGIN
-    ID_FILE_MRU_FIRST       "¶}±Ò³o­Ó¤å¥ó"
+    ID_FILE_MRU_FILE1       "¶}±Ò³o­Ó¤å¥ó"
     ID_FILE_MRU_FILE2       "¶}±Ò³o­Ó¤å¥ó"
     ID_FILE_MRU_FILE3       "¶}±Ò³o­Ó¤å¥ó"
     ID_FILE_MRU_FILE4       "¶}±Ò³o­Ó¤å¥ó"
index c0f3a4e..7a30d75 100644 (file)
@@ -138,6 +138,10 @@ BEGIN
     BEGIN
         MENUITEM "&Filters...",                 ID_TOOLS_FILTERS
         MENUITEM "&Generate Patch...",          ID_TOOLS_GENERATEPATCH
+        POPUP "&Advanced"
+        BEGIN
+            MENUITEM "&Load Config...",         ID_TOOLS_LOADCONFIG
+        END
     END
     POPUP "&Plugins"
     BEGIN
@@ -237,6 +241,10 @@ BEGIN
         MENUITEM "&Filters...",                 ID_TOOLS_FILTERS
         MENUITEM "&Generate Patch...",          ID_TOOLS_GENERATEPATCH
         MENUITEM "Generate &Report...",         ID_TOOLS_GENERATEREPORT
+        POPUP "&Advanced"
+        BEGIN
+            MENUITEM "&Load Config...",         ID_TOOLS_LOADCONFIG
+        END
     END
     POPUP "&Plugins"
     BEGIN
@@ -380,6 +388,10 @@ BEGIN
     BEGIN
         MENUITEM "&Filters...",                 ID_TOOLS_FILTERS
         MENUITEM "&Generate Patch...",          ID_TOOLS_GENERATEPATCH
+        POPUP "&Advanced"
+        BEGIN
+            MENUITEM "&Load Config...",         ID_TOOLS_LOADCONFIG
+        END
     END
     POPUP "&Plugins"
     BEGIN
@@ -580,8 +592,7 @@ BEGIN
     LTEXT           "Verze 1.0",IDC_VERSION,63,23,153,8,SS_NOPREFIX
     LTEXT           "(Private Build)",IDC_PRIVATEBUILD,63,33,153,8
     LTEXT           "V\9aechna práva vyhrazena.",IDC_STATIC,7,60,170,8
-    LTEXT           "Nav\9ativte www stránku programu WinMerge!",IDC_WWW,7,79,
-                    209,8
+    LTEXT           "Nav\9ativte www stránku programu WinMerge!",IDC_WWW,7,79,209,8
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,95,209,1
     LTEXT           "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8
     DEFPUSHBUTTON   "OK",IDOK,166,103,50,14
@@ -617,8 +628,8 @@ BEGIN
     LTEXT           "Status:",IDC_OPEN_STATUS,15,102,182,8
     DEFPUSHBUTTON   "OK",IDOK,306,11,50,14
     PUSHBUTTON      "Storno",IDCANCEL,306,28,50,14
-    GROUPBOX        "Soubory nebo adresáre pro porovnání",IDC_FILES_DIRS_GROUP,7,7,292,
-                    111
+    GROUPBOX        "Soubory nebo adresáre pro porovnání",IDC_FILES_DIRS_GROUP,7,
+                    7,292,111
     PUSHBUTTON      "Save project",IDC_SAVEPROJECT,306,56,50,14
 END
 
@@ -669,8 +680,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     CONTROL         "&Zálohovat originální soubory",IDC_BACKUP_CHECK,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
-    CONTROL         "Automatický &skok na první rozdíl",IDC_SCROLL_CHECK,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,17,206,10
+    CONTROL         "Automatický &skok na první rozdíl",
+                    IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
+                    17,206,10
     CONTROL         "&Disable Splash Screen",IDC_DISABLE_SPLASH,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
     CONTROL         "Cl&ose windows with ESC",IDC_ESC_CLOSES_WINDOW,"Button",
index dd3a080..177508d 100644 (file)
@@ -138,6 +138,10 @@ BEGIN
     BEGIN
         MENUITEM "&Filtre...",                 ID_TOOLS_FILTERS
         MENUITEM "&Generer en Patch...",          ID_TOOLS_GENERATEPATCH
+        POPUP "&Advanced"
+        BEGIN
+            MENUITEM "&Load Config...",         ID_TOOLS_LOADCONFIG
+        END
     END
     POPUP "&Plugins"
     BEGIN
@@ -237,6 +241,10 @@ BEGIN
         MENUITEM "&Filtre...",                 ID_TOOLS_FILTERS
         MENUITEM "&Generer en Patch...",          ID_TOOLS_GENERATEPATCH
         MENUITEM "Generate &Report...",         ID_TOOLS_GENERATEREPORT
+        POPUP "&Advanced"
+        BEGIN
+            MENUITEM "&Load Config...",         ID_TOOLS_LOADCONFIG
+        END
     END
     POPUP "&Plugins"
     BEGIN
@@ -380,6 +388,10 @@ BEGIN
     BEGIN
         MENUITEM "&Filtre...",                 ID_TOOLS_FILTERS
         MENUITEM "&Generer en Patch...",          ID_TOOLS_GENERATEPATCH
+        POPUP "&Advanced"
+        BEGIN
+            MENUITEM "&Load Config...",         ID_TOOLS_LOADCONFIG
+        END
     END
     POPUP "&Plugins"
     BEGIN
@@ -715,8 +727,8 @@ BEGIN
                     CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Sammenlign &hele ordet",IDC_EDIT_WHOLE_WORD,"Button",
                     BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,27,135,10
-    CONTROL         "Sammenlign store/små &bogstaver",IDC_EDIT_MATCH_CASE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,135,10
+    CONTROL         "Sammenlign store/små &bogstaver",IDC_EDIT_MATCH_CASE,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,37,135,10
     CONTROL         "Regulært &udtryk",IDC_EDIT_REGEXP,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,47,135,10
     GROUPBOX        "Retning",IDC_STATIC,148,23,70,36,WS_GROUP
@@ -742,8 +754,8 @@ BEGIN
                     CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Sammenlign &hele ordet",IDC_EDIT_WHOLE_WORD,"Button",
                     BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,44,135,10
-    CONTROL         "&Sammenlign store/små bogstaver",IDC_EDIT_MATCH_CASE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,54,135,10
+    CONTROL         "&Sammenlign store/små bogstaver",IDC_EDIT_MATCH_CASE,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,54,135,10
     CONTROL         "Regulært &udtryk",IDC_EDIT_REGEXP,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,64,135,10
     CONTROL         "&Begynd ikke forfra efter enden af filen",IDC_EDIT_SCOPE_DONT_WRAP,"Button",
@@ -785,7 +797,8 @@ BEGIN
     CONTROL         "Ignorer linjer der følger det følgende mønster",
                     IDC_IGNOREREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
                     7,221,15
-    LTEXT           "Regulære udtryk (et pr linje):",IDC_STATIC,7,28,221,8
+    LTEXT           "Regulære udtryk (et pr linje):",IDC_STATIC,7,28,
+                    221,8
     EDITTEXT        IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE |
                     ES_AUTOHSCROLL | ES_WANTRETURN
 END
@@ -1044,12 +1057,12 @@ CAPTION "Sammenlign"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     GROUPBOX        "Mellemrum",IDC_STATIC,7,7,221,50
-    CONTROL         "&Sammenlign",IDC_WHITESPACE,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP,14,19,206,10
+    CONTROL         "&Sammenlign",IDC_WHITESPACE,"Button",BS_AUTORADIOBUTTON |
+                    WS_GROUP,14,19,206,10
     CONTROL         "&Ignorer ændringer",IDC_WHITE_CHANGE,"Button",
                     BS_AUTORADIOBUTTON,14,30,206,10
-    CONTROL         "I&gnorer alle",IDC_ALL_WHITE,"Button",
-                    BS_AUTORADIOBUTTON,14,41,206,10
+    CONTROL         "I&gnorer alle",IDC_ALL_WHITE,"Button",BS_AUTORADIOBUTTON,
+                    14,41,206,10
     CONTROL         "Ignorer blan&ke linjer",IDC_IGNBLANKS_CHECK,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,60,221,10
     CONTROL         "Ignorer store/små &bogstaver",IDC_IGNCASE_CHECK,"Button",
@@ -1121,7 +1134,7 @@ END
 
 IDD_SAVECLOSING DIALOGEX 0, 0, 262, 154
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
-    WS_SYSMENU
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Gem ændrede filer?"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -1988,7 +2001,7 @@ BEGIN
                             "Flyt den valgte fil på højre side til udvalgt mappe"
 END
 
-// DIRECTORY DIFFING : COLUMN TITLES
+// DIRECTORY DIFFING : COLUMN TITLES #1
 STRINGTABLE
 BEGIN
     IDS_COLHDR_FILENAME     "Filnavn"
@@ -1999,6 +2012,13 @@ BEGIN
     IDS_COLHDR_EXTENSION    "Extension"
     IDS_COLHDR_LSIZE        "Venstre størrelse"
     IDS_COLHDR_RSIZE        "Højre størrelse"
+    IDS_COLHDR_RSIZE_SHORT  "Right Size (Short)"
+    IDS_COLHDR_LSIZE_SHORT  "Left Size (Short)"
+END
+
+// DIRECTORY DIFFING : COLUMN TITLES #2
+STRINGTABLE
+BEGIN
     IDS_COLHDR_LTIMEC       "Venstre oprettelsesdato"
     IDS_COLHDR_RTIMEC       "Højre oprettelsesdato"
     IDS_COLHDR_NEWER        "Nyeste fil"
@@ -2009,7 +2029,7 @@ BEGIN
     IDS_COLHDR_RATTRIBUTES  "Højre attributter"
 END
 
-// DIRECTORY DIFFING : COLUMN TITLES (2)
+// DIRECTORY DIFFING : COLUMN TITLES #3
 STRINGTABLE
 BEGIN
     IDS_COLHDR_LENCODING    "Venstre Encoding"
@@ -2044,7 +2064,7 @@ BEGIN
     IDS_STATUS_SELITEMS     "%1 elementer valgt"
 END
 
-// DIRECTORY DIFFING : COLUMN DESCRIPTIONS
+// DIRECTORY DIFFING : COLUMN DESCRIPTIONS#1
 STRINGTABLE
 BEGIN
     IDS_COLDESC_FILENAME    "Filnavn eller mappenavn."
@@ -2055,6 +2075,13 @@ BEGIN
     IDS_COLDESC_EXTENSION   "Filens extension."
     IDS_COLDESC_LSIZE       "Venstre filstørrelse i bytes."
     IDS_COLDESC_RSIZE       "Højre filstørrelse i bytes."
+    IDS_COLDESC_LSIZE_SHORT "Left file size abbreviated."
+    IDS_COLDESC_RSIZE_SHORT "Right file size abbreviated."
+END
+
+// DIRECTORY DIFFING : COLUMN DESCRIPTIONS#2
+STRINGTABLE
+BEGIN
     IDS_COLDESC_LTIMEC      "Venstre side oprettelsesdato."
     IDS_COLDESC_RTIMEC      "Højre side oprettelsesdato."
     IDS_COLDESC_NEWER       "Fortæller hvilken side har den nyeste ændringsdato."
index 99dd1de..9b1bd91 100644 (file)
@@ -138,6 +138,10 @@ BEGIN
     BEGIN
         MENUITEM "&Filters...",                 ID_TOOLS_FILTERS
         MENUITEM "&Generate Patch...",          ID_TOOLS_GENERATEPATCH
+        POPUP "&Advanced"
+        BEGIN
+            MENUITEM "&Load Config...",         ID_TOOLS_LOADCONFIG
+        END
     END
     POPUP "&Plugins"
     BEGIN
@@ -197,8 +201,7 @@ BEGIN
         MENUITEM "Toon &Identieke bestanden",   ID_OPTIONS_SHOWIDENTICAL
         MENUITEM "Toon &Niet gelijke bestanden", ID_OPTIONS_SHOWDIFFERENT
         MENUITEM "Toon &Unieke Bestanden (links)", ID_OPTIONS_SHOWUNIQUELEFT
-        MENUITEM "Toon &Unieke Bestanden (rechts)",
-                                                ID_OPTIONS_SHOWUNIQUERIGHT
+        MENUITEM "Toon &Unieke Bestanden (rechts)", ID_OPTIONS_SHOWUNIQUERIGHT
         MENUITEM "S&how Binary Files",          ID_OPTIONS_SHOWBINARIES
         MENUITEM "Show S&kipped Files",         ID_OPTIONS_SHOWSKIPPED
         MENUITEM SEPARATOR
@@ -238,6 +241,10 @@ BEGIN
         MENUITEM "&Filters...",                 ID_TOOLS_FILTERS
         MENUITEM "&Generate Patch...",          ID_TOOLS_GENERATEPATCH
         MENUITEM "Generate &Report...",         ID_TOOLS_GENERATEREPORT
+        POPUP "&Advanced"
+        BEGIN
+            MENUITEM "&Load Config...",         ID_TOOLS_LOADCONFIG
+        END
     END
     POPUP "&Plugins"
     BEGIN
@@ -381,6 +388,10 @@ BEGIN
     BEGIN
         MENUITEM "&Filters...",                 ID_TOOLS_FILTERS
         MENUITEM "&Generate Patch...",          ID_TOOLS_GENERATEPATCH
+        POPUP "&Advanced"
+        BEGIN
+            MENUITEM "&Load Config...",         ID_TOOLS_LOADCONFIG
+        END
     END
     POPUP "&Plug-ins"
     BEGIN
@@ -504,7 +515,7 @@ IDR_POPUP_LOCATIONBAR MENU
 BEGIN
     POPUP "_POPUP_"
     BEGIN
-        MENUITEM "G&a naar verschil"                   ID_LOCBAR_GOTODIFF
+        MENUITEM "G&a naar verschil",                   ID_LOCBAR_GOTODIFF
         MENUITEM "&Ga naar...",                    ID_EDIT_WMGOTO
         MENUITEM SEPARATOR
         MENUITEM "Gee&n verplaatste blokken",            ID_DISPLAY_MOVED_NONE
@@ -617,8 +628,8 @@ BEGIN
     LTEXT           "Status:",IDC_OPEN_STATUS,15,102,182,8
     DEFPUSHBUTTON   "OK",IDOK,306,11,50,14
     PUSHBUTTON      "Annuleren",IDCANCEL,306,28,50,14
-    GROUPBOX        "Bestanden of mappen om te vergelijken",IDC_FILES_DIRS_GROUP,7,7,
-                    292,111
+    GROUPBOX        "Bestanden of mappen om te vergelijken",IDC_FILES_DIRS_GROUP,7,
+                    7,292,111
     PUSHBUTTON      "Save project",IDC_SAVEPROJECT,306,56,50,14
 END
 
@@ -670,8 +681,8 @@ BEGIN
     CONTROL         "&Reservekopie orginele bestand",IDC_BACKUP_CHECK,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,7,114,10
     CONTROL         "&Automatisch naar eerste verschil gaan",
-                    IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
-                    7,17,136,10
+                    IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
+                    17,136,10
     CONTROL         "Splash Screen uitscha&kelen",IDC_DISABLE_SPLASH,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,27,87,10
     CONTROL         "Vensters met ESC sl&uiten",IDC_ESC_CLOSES_WINDOW,"Button",
@@ -1054,9 +1065,8 @@ BEGIN
                     14,41,206,10
     CONTROL         "Lege regels negeren",IDC_IGNBLANKS_CHECK,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,60,221,10
-    CONTROL         "N&iet hoofdlettergevoelig",
-                    IDC_IGNCASE_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
-                    7,70,221,10
+    CONTROL         "N&iet hoofdlettergevoelig",IDC_IGNCASE_CHECK,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,70,221,10
     CONTROL         "&Regeleindeverschillen (DOS/UNIX/MAC) negeren",
                     IDC_EOL_SENSITIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
                     7,80,221,10
@@ -1124,7 +1134,7 @@ END
 
 IDD_SAVECLOSING DIALOGEX 0, 0, 262, 154
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
-    WS_SYSMENU
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Gewijzigde bestanden opslaan?"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -1449,119 +1459,6 @@ END
 
 /////////////////////////////////////////////////////////////////////////////
 //
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE
-BEGIN
-    IDD_ABOUTBOX, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 216
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 115
-    END
-
-    IDD_OPEN, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 349
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 108
-    END
-
-    IDD_VSS, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 251
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 141
-    END
-
-    IDD_PROP_VSS, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 252
-        VERTGUIDE, 85
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 150
-    END
-
-    IDD_PROPPAGE_LARGE, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 263
-        VERTGUIDE, 125
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 149
-    END
-
-    IDD_CLEARCASE, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 272
-        VERTGUIDE, 18
-        VERTGUIDE, 35
-        VERTGUIDE, 244
-        VERTGUIDE, 261
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 104
-    END
-
-    IDD_PROPSYNTAX, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 228
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 149
-    END
-
-    IDD_PROPPAGE_FILTER, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 228
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 149
-    END
-
-    IDD_PROPPAGE_COLORS, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 228
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 149
-    END
-
-    IDD_EDITOR_HEADERBAR, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 366
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 4
-    END
-
-    IDD_DIRCOLS, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 266
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 155
-    END
-
-    IDD_GENERATE_PATCH, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 333
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 173
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
 // Toolbar
 //
 
@@ -1797,7 +1694,7 @@ BEGIN
     IDC_STATIC_TITLE_RIGHT  "Klik rechts op het pad om het te kopiëren"
 END
 
-// IDS_MESSAGEBOX_OK SYNCHRO
+// "DO NOT SHOW AGAIN" MESSAGEBOXES
 STRINGTABLE
 BEGIN
     IDS_MESSAGEBOX_OK       "OK"
@@ -2036,6 +1933,7 @@ BEGIN
     ID_DIR_DEL_LEFT         "Geselecteerde item aan de linker kant verwijderen"
     ID_DIR_DEL_RIGHT        "Geselecteerde item aan de rechter kant verwijderen"
     ID_DIR_DEL_BOTH         "Geselecteerde item(s) aan beide kanten verwijderen"
+    ID_DIR_HIDE_FILENAMES   "Hide selected item(s) (on the fly filter)"
     IDS_COPY_TO_LEFT        "Van rechts naar links (%1)"
     IDS_COPY_TO_RIGHT       "Van links naar rechts (%1)"
     IDS_COPY_TO_LEFT2       "Van rechts naar links (%1 van %2)"
@@ -2044,7 +1942,6 @@ BEGIN
     IDS_COPY_RIGHT_TO       "Van rechts naar... (%1)"
     IDS_COPY_LEFT_TO2       "Van links naar... (%1 van %2)"
     IDS_COPY_RIGHT_TO2      "Van rechts naar... (%1 van %2)"
-
 END
 
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)  (2)
@@ -2107,7 +2004,7 @@ BEGIN
                             "Geselecteerd bestand van rechts naar door gebruiker gedefinieerde map verplaatsen"
 END
 
-// DIRECTORY DIFFING : COLUMN TITLES
+// DIRECTORY DIFFING : COLUMN TITLES #1
 STRINGTABLE
 BEGIN
     IDS_COLHDR_FILENAME     "Bestandsnaam"
@@ -2118,6 +2015,13 @@ BEGIN
     IDS_COLHDR_EXTENSION    "Extensie"
     IDS_COLHDR_LSIZE        "Grootte links"
     IDS_COLHDR_RSIZE        "Grootte rechts"
+    IDS_COLHDR_RSIZE_SHORT  "Right Size (Short)"
+    IDS_COLHDR_LSIZE_SHORT  "Left Size (Short)"
+END
+
+// DIRECTORY DIFFING : COLUMN TITLES #2
+STRINGTABLE
+BEGIN
     IDS_COLHDR_LTIMEC       "Aanmaaktijd links"
     IDS_COLHDR_RTIMEC       "Aanmaaktijd rechts"
     IDS_COLHDR_NEWER        "Nieuwer bestand"
@@ -2128,7 +2032,7 @@ BEGIN
     IDS_COLHDR_RATTRIBUTES  "Attributen rechts"
 END
 
-// DIRECTORY DIFFING : COLUMN TITLES (2)
+// DIRECTORY DIFFING : COLUMN TITLES #3
 STRINGTABLE
 BEGIN
     IDS_COLHDR_LENCODING    "Tekenset links"
@@ -2163,7 +2067,7 @@ BEGIN
     IDS_STATUS_SELITEMS     "%1 items geselecteerd"
 END
 
-// DIRECTORY DIFFING : COLUMN DESCRIPTIONS
+// DIRECTORY DIFFING : COLUMN DESCRIPTIONS#1
 STRINGTABLE
 BEGIN
     IDS_COLDESC_FILENAME    "Bestandsnaam of mapnaam."
@@ -2174,6 +2078,13 @@ BEGIN
     IDS_COLDESC_EXTENSION   "Bestandsextensie."
     IDS_COLDESC_LSIZE       "Bestandsgrootte in bytes voor linker zijde."
     IDS_COLDESC_RSIZE       "Bestandsgrootte in bytes voor rechter zijde."
+    IDS_COLDESC_LSIZE_SHORT "Left file size abbreviated."
+    IDS_COLDESC_RSIZE_SHORT "Right file size abbreviated."
+END
+
+// DIRECTORY DIFFING : COLUMN DESCRIPTIONS#2
+STRINGTABLE
+BEGIN
     IDS_COLDESC_LTIMEC      "Aanmaaktijdstip linker zijde."
     IDS_COLDESC_RTIMEC      "Aanmaaktijdstip rechter zijde."
     IDS_COLDESC_NEWER       "Geeft aan welke zijde het recentst gewijzigd is."
@@ -2739,9 +2650,9 @@ END
 #define _AFX_NO_TRACKER_RESOURCES
 #define _AFX_NO_PROPERTY_RESOURCES
 
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NLD)
 #ifdef _WIN32
-LANGUAGE 9, 1
+LANGUAGE LANG_DUTCH, SUBLANG_DUTCH
 #pragma code_page(1252)
 #endif
 #include "res\Merge.rc2"  // non-Microsoft Visual C++ edited resources