Index: src/ch/resource.h
===================================================================
diff -u -rd5c3edd0d167db9b5d47d04248820fda49499a5e -ref313208b7c4a113907f2f72ee0b73406081501d
--- src/ch/resource.h	(.../resource.h)	(revision d5c3edd0d167db9b5d47d04248820fda49499a5e)
+++ src/ch/resource.h	(.../resource.h)	(revision ef313208b7c4a113907f2f72ee0b73406081501d)
@@ -29,8 +29,6 @@
 #define IDI_QUESTION_ICON               163
 #define IDD_FEEDBACK_DSTFILE_DIALOG     167
 #define IDD_FEEDBACK_FILE_ERROR_DIALOG  167
-#define IDR_POPUP_TOOLBAR               170
-#define IDD_FEEDBACK_NOTENOUGHPLACE_DIALOG 173
 #define IDD_FEEDBACK_NOTENOUGHSPACE_DIALOG 173
 #define IDI_INFO_ICON                   175
 #define IDI_ERR_ICON                    176
@@ -158,7 +156,6 @@
 #define IDC_LANMULTIPLIER_COMBO         1144
 #define IDC_ONLYDEFAULT_CHECK           1145
 #define IDC_TIME_PROGRESS               1146
-#define IDC_ERRORS_EDIT                 1147
 #define IDC_FILTER_COMBO                1149
 #define IDC_FILTER_CHECK                1150
 #define IDC_SIZE_CHECK                  1151
@@ -330,53 +327,6 @@
 #define IDS_UNREGISTEROK_STRING         6003
 #define IDS_UNREGISTERERR_STRING        6004
 #define IDS_CRASH_STRING                6006
-#define IDS_OTFSEARCHINGFORFILES_STRING 7000
-#define IDS_OTFMISSINGCLIPBOARDINPUT_STRING 7001
-#define IDS_OTFADDINGCLIPBOARDFILE_STRING 7002
-#define IDS_OTFADDEDFOLDER_STRING       7003
-#define IDS_OTFRECURSINGFOLDER_STRING   7004
-#define IDS_OTFADDINGKILLREQEST_STRING  7005
-#define IDS_OTFADDEDFILE_STRING         7006
-#define IDS_OTFSEARCHINGFINISHED_STRING 7007
-#define IDS_OTFDELETINGFILES_STRING     7008
-#define IDS_OTFDELETINGKILLREQUEST_STRING 7009
-#define IDS_OTFDELETINGERROR_STRING     7010
-#define IDS_OTFDELETINGFINISHED_STRING  7011
-#define IDS_OTFPRECHECKCANCELREQUEST_STRING 7012
-#define IDS_OTFOPENINGERROR_STRING      7013
-#define IDS_OTFOPENINGCANCELREQUEST_STRING 7014
-#define IDS_OTFOPENINGWAITREQUEST_STRING 7015
-#define IDS_OTFOPENINGRETRY_STRING      7016
-#define IDS_OTFDESTOPENINGERROR_STRING  7017
-#define IDS_OTFDESTOPENINGRETRY_STRING  7018
-#define IDS_OTFDESTOPENINGCANCELREQUEST_STRING 7019
-#define IDS_OTFDESTOPENINGWAITREQUEST_STRING 7020
-#define IDS_OTFMOVINGPOINTERSERROR_STRING 7021
-#define IDS_OTFRESTORINGPOINTERSERROR_STRING 7022
-#define IDS_OTFSETTINGZEROSIZEERROR_STRING 7023
-#define IDS_OTFCOPYINGKILLREQUEST_STRING 7024
-#define IDS_OTFCHANGINGBUFFERSIZE_STRING 7025
-#define IDS_OTFREADINGERROR_STRING      7026
-#define IDS_OTFWRITINGERROR_STRING      7027
-#define IDS_OTFCAUGHTEXCEPTIONCCF_STRING 7028
-#define IDS_OTFPROCESSINGFILES_STRING   7029
-#define IDS_OTFPROCESSINGFILESDATA_STRING 7030
-#define IDS_OTFPROCESSINGKILLREQUEST_STRING 7031
-#define IDS_OTFMOVEFILEERROR_STRING     7032
-#define IDS_OTFCREATEDIRECTORYERROR_STRING 7033
-#define IDS_OTFPROCESSINGFINISHED_STRING 7034
-#define IDS_OTFTHREADSTART_STRING       7035
-#define IDS_OTFWAITINGFINISHED_STRING   7036
-#define IDS_OTFWAITINGKILLREQUEST_STRING 7037
-#define IDS_OTFTHREADFINISHED_STRING    7038
-#define IDS_OTFCAUGHTEXCEPTIONMAIN_STRING 7039
-#define IDS_OTFCHECKINGSPACE_STRING     7040
-#define IDS_OTFNOTENOUGHFREESPACE_STRING 7041
-#define IDS_OTFFREESPACECANCELREQUEST_STRING 7042
-#define IDS_OTFFREESPACERETRYING_STRING 7043
-#define IDS_OTFFREESPACEIGNORE_STRING   7044
-#define IDS_OTFSHRINKERROR_STRING       7045
-#define IDS_OTFEXTMOVEFILEERROR_STRING  7046
 #define IDS_PROGRAM_STRING              8000
 #define IDS_CLIPBOARDMONITORING_STRING  8001
 #define IDS_CLIPBOARDINTERVAL_STRING    8002
@@ -442,13 +392,13 @@
 #define IDS_CFGSHCMTOSPECIAL_STRING     8062
 #define IDS_CFGSHSHOWFREESPACE_STRING   8063
 #define IDS_CFGSHSHOWICONS_STRING       8064
-#define IDS_CFGSHOVERRIDEDRAG_STRING    8065
+#define IDS_CFGSHINTERCEPTDRAG_STRING    8065
 #define IDS_CFGSHORTCUTS_STRING         8066
 #define IDS_CFGRECENT_STRING            8067
 #define IDS_CFGSHELL_STRING             8068
 #define IDS_CFGSCCOUNT_STRING           8069
 #define IDS_CFGRPCOUNT_STRING           8070
-#define IDS_CFGOVERRIDEDEFACTION_STRING 8071
+#define IDS_CFGINTERCEPTKEYACTION_STRING 8071
 #define IDS_CFGPRIORITYCLASS_STRING     8072
 #define IDS_CFGDISABLEPRIORITYBOOST_STRING 8073
 #define IDS_BOOLTEXT_STRING             8074
@@ -459,20 +409,22 @@
 #define IDS_FORCESHUTDOWNVALUES_STRING  8079
 #define IDS_CFGFDSHORTCUTSSTYLES_STRING 8080
 #define IDS_CFGPRIORITYCLASSITEMS_STRING 8081
-#define IDS_CFGACTIONS_STRING           8082
 #define IDS_PLUGSFOLDER_STRING          8083
 #define IDS_PLUGSFOLDERCHOOSE_STRING    8084
 #define IDS_CFGLOGFILE_STRING           8085
 #define IDS_CFGENABLELOGGING_STRING     8086
-#define IDS_CFGLIMITATION_STRING        8087
 #define IDS_CFGMAXLIMIT_STRING          8088
-#define IDS_CFGLOGPRECISELIMITING_STRING 8089
-#define IDS_CFGTRUNCBUFFERSIZE_STRING   8090
 #define IDS_CFGHELPDIR_STRING           8091
 #define IDS_CFGHELPDIRCHOOSE_STRING     8092
 #define IDS_LANGUAGESFOLDER_STRING      8093
 #define IDS_LANGSFOLDERCHOOSE_STRING    8094
 #define IDS_ABOUT_LANGUAGE_STRING       8095
+#define IDS_CFGINTERCEPTCONTEXTMENU_STRING 8096
+#define IDS_CFG_CHECK_FOR_UPDATES_FREQUENCY 8097
+#define IDS_CFG_UPDATE_CHECK_FOR_BETA 8098
+#define IDS_CFGLOGLEVEL				  8099
+#define IDS_CFGLOGLEVEL_VALUES		  8100
+#define IDS_UPDATE_FREQUENCIES			8101
 #define IDS_MENUCOPY_STRING             9000
 #define IDS_MENUMOVE_STRING             9001
 #define IDS_MENUCOPYMOVESPECIAL_STRING  9002
@@ -534,6 +486,7 @@
 #define IDS_TITLEMOVE_STRING            13501
 #define IDS_TITLEUNKNOWNOPERATION_STRING 13502
 #define IDS_MAINBROWSETEXT_STRING       13503
+#define IDS_INFO_TWO_FILE_STRING		13504
 #define IDS_ABTNOTHANX_STRING           14000
 #define IDS_ABOUTVERSION_STRING         14001
 #define IDS_BUFFERSIZEZERO_STRING       14500
@@ -561,6 +514,7 @@
 #define IDS_EMPTYFILTER_STRING          15021
 #define IDS_FLTALLFILTER_STRING         15022
 #define IDS_IMPORTREPORT_STRING         15023
+#define IDS_IMPORTERROR_STRING          15024
 #define IDS_NERPATH_STRING              16500
 #define IDS_DATECREATED_STRING          18000
 #define IDS_DATELASTWRITE_STRING        18001
@@ -579,7 +533,6 @@
 #define IDS_EMPTYDESTINATIONTEXT_STRING 21506
 #define IDS_EMPTYBUFFERSIZETEXT_STRING  21507
 #define IDS_EMPTYPRIORITYTEXT_STRING    21508
-#define IDS_EMPTYERRORTEXT_STRING       21509
 #define IDS_EMPTYPROCESSEDTEXT_STRING   21510
 #define IDS_EMPTYTRANSFERTEXT_STRING    21511
 #define IDS_EMPTYTIMETEXT_STRING        21512