Merge branch 'master' into dev

Source commit: dcc7762ac7019d9db8d5e101e3c341ca744b2ebe

source/forms/Preferences.dfm

@@ -966,7 +966,7 @@ object PreferencesDialog: TPreferencesDialog
           Width = 389
           Height = 74
           Anchors = [akLeft, akTop, akRight]
-          Caption = 'Compare directory criterions'
+          Caption = 'Compare directory criteria'
           TabOrder = 2
           DesignSize = (
             389