5.4

1 files changed, 130 insertions, 172 deletions

diff --git a/BUILD/Languages/english_uk.lng b/BUILD/Languages/english_uk.lng
index abed9c59..751cf0be 100644
--- a/BUILD/Languages/english_uk.lng
+++ b/BUILD/Languages/english_uk.lng
@@ -7,8 +7,8 @@
 	<plural definition>n == 1 ? 0 : 1</plural definition>
 </header>
 
-<source>Searching for directory %x...</source>
-<target>Searching for directory %x...</target>
+<source>Searching for folder %x...</source>
+<target>Searching for folder %x...</target>
 
 <source>Show in Explorer</source>
 <target>Show in Explorer</target>
@@ -25,18 +25,21 @@
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Automated Synchronisation</target>
 
+<source>Error</source>
+<target>Error</target>
+
 <source>Select alternate comparison settings</source>
 <target>Select alternate comparison settings</target>
 
 <source>Select alternate synchronization settings</source>
 <target>Select alternate synchronisation settings</target>
 
-<source>No filter selected</source>
-<target>No filter selected</target>
-
 <source>Filter is active</source>
 <target>Filter is active</target>
 
+<source>No filter selected</source>
+<target>No filter selected</target>
+
 <source>Remove alternate settings</source>
 <target>Remove alternate settings</target>
 
@@ -55,9 +58,6 @@
 <source>About</source>
 <target>About</target>
 
-<source>Error</source>
-<target>Error</target>
-
 <source>Warning</source>
 <target>Warning</target>
 
@@ -73,8 +73,8 @@
 <source>Global settings</source>
 <target>Global settings</target>
 
-<source>Synchronization Preview</source>
-<target>Synchronisation Preview</target>
+<source>Summary</source>
+<target>Summary</target>
 
 <source>Find</source>
 <target>Find</target>
@@ -103,8 +103,8 @@
 <source>Browse</source>
 <target>Browse</target>
 
-<source>Invalid command line: %x</source>
-<target>Invalid command line: %x</target>
+<source>Invalid command line:</source>
+<target>Invalid command line:</target>
 
 <source>Info</source>
 <target>Info</target>
@@ -232,23 +232,23 @@
 <source>Cannot read the following XML elements:</source>
 <target>Cannot read the following XML elements:</target>
 
-<source>S&ave configuration...</source>
-<target>S&ave configuration...</target>
+<source>&Open...</source>
+<target>&Open...</target>
 
-<source>&Load configuration...</source>
-<target>&Load configuration...</target>
+<source>&Save...</source>
+<target>&Save...</target>
 
 <source>&Quit</source>
 <target>&Quit</target>
 
-<source>&File</source>
-<target>&File</target>
+<source>&Program</source>
+<target>&Program</target>
 
 <source>&Content</source>
 <target>&Content</target>
 
-<source>&About...</source>
-<target>&About...</target>
+<source>&About</source>
+<target>&About</target>
 
 <source>&Help</source>
 <target>&Help</target>
@@ -256,8 +256,8 @@
 <source>Usage:</source>
 <target>Usage:</target>
 
-<source>1. Select directories to monitor.</source>
-<target>1. Select directories to monitor.</target>
+<source>1. Select folders to watch.</source>
+<target>1. Select folders to watch.</target>
 
 <source>2. Enter a command line.</source>
 <target>2. Enter a command line.</target>
@@ -265,19 +265,11 @@
 <source>3. Press 'Start'.</source>
 <target>3. Press 'Start'.</target>
 
-<source>
-The command line is executed each time:
-- all directories become available (e.g. USB stick insert)
-- files within these directories or subdirectories are modified
-</source>
-<target>
-The command line is executed each time:
-- all directories become available (e.g. USB stick insert)
-- files within these directories or subdirectories are modified
-</target>
+<source>To get started just import a .ffs_batch file.</source>
+<target>To get started just import a .ffs_batch file.</target>
 
-<source>Directories to watch</source>
-<target>Directories to watch</target>
+<source>Folders to watch</source>
+<target>Folders to watch</target>
 
 <source>Add folder</source>
 <target>Add folder</target>
@@ -288,18 +280,35 @@ The command line is executed each time:
 <source>Select a folder</source>
 <target>Select a folder</target>
 
+<source>Delay [seconds]</source>
+<target>Delay [seconds]</target>
+
+<source>Idle time between last detected change and execution of command</source>
+<target>Idle time between last detected change and execution of command</target>
+
 <source>Command line</source>
 <target>Command line</target>
 
-<source>Minimum Idle Time [seconds]</source>
-<target>Minimum Idle Time [seconds]</target>
-
-<source>Idle time between detection of last change and execution of command line in seconds</source>
-<target>Idle time between detection of last change and execution of command line in seconds</target>
+<source>
+The command is triggered if:
+- files or subfolders change
+- new folders arrive (e.g. USB stick insert)
+</source>
+<target>
+The command is triggered if:
+- files or subfolders change
+- new folders arrive (e.g. USB stick insert)
+</target>
 
 <source>Start</source>
 <target>Start</target>
 
+<source>&Retry</source>
+<target>&Retry</target>
+
+<source>Cancel</source>
+<target>Cancel</target>
+
 <source>(Build: %x)</source>
 <target>(Build: %x)</target>
 
@@ -318,8 +327,8 @@ The command line is executed each time:
 <source>Waiting for missing directories...</source>
 <target>Waiting for missing directories...</target>
 
-<source>A directory input field is empty.</source>
-<target>A directory input field is empty.</target>
+<source>An input folder name is empty.</source>
+<target>An input folder name is empty.</target>
 
 <source>Logging</source>
 <target>Logging</target>
@@ -348,9 +357,6 @@ The command line is executed each time:
 <source>FreeFileSync configuration</source>
 <target>FreeFileSync configuration</target>
 
-<source>FreeFileSync Batch Job</source>
-<target>FreeFileSync Batch Job</target>
-
 <source>Batch execution</source>
 <target>Batch execution</target>
 
@@ -408,8 +414,8 @@ The command line is executed each time:
 <source><Symlink></source>
 <target><Symlink></target>
 
-<source><Directory></source>
-<target><Directory></target>
+<source><Folder></source>
+<target><Folder></target>
 
 <source>Full path</source>
 <target>Full path</target>
@@ -420,8 +426,8 @@ The command line is executed each time:
 <source>Relative path</source>
 <target>Relative path</target>
 
-<source>Directory</source>
-<target>Directory</target>
+<source>Base folder</source>
+<target>Base folder</target>
 
 <source>Size</source>
 <target>Size</target>
@@ -432,8 +438,11 @@ The command line is executed each time:
 <source>Extension</source>
 <target>Extension</target>
 
-<source>Comparison Result</source>
-<target>Comparison Result</target>
+<source>Action</source>
+<target>Action</target>
+
+<source>Category</source>
+<target>Category</target>
 
 <source>Drag && drop</source>
 <target>Drag && drop</target>
@@ -441,14 +450,14 @@ The command line is executed each time:
 <source>Close progress dialog</source>
 <target>Close progress dialog</target>
 
-<source>Shut down</source>
-<target>Shut down</target>
+<source>Standby</source>
+<target>Standby</target>
 
 <source>Log off</source>
 <target>Log off</target>
 
-<source>Standby</source>
-<target>Standby</target>
+<source>Shut down</source>
+<target>Shut down</target>
 
 <source>Hibernate</source>
 <target>Hibernate</target>
@@ -456,15 +465,12 @@ The command line is executed each time:
 <source>1. &Compare</source>
 <target>1. &Compare</target>
 
-<source>2. &Synchronize...</source>
-<target>2. &Synchronise...</target>
+<source>2. &Synchronize</source>
+<target>2. &Synchronise</target>
 
 <source>&New</source>
 <target>&New</target>
 
-<source>&Program</source>
-<target>&Program</target>
-
 <source>&Language</source>
 <target>&Language</target>
 
@@ -492,8 +498,8 @@ The command line is executed each time:
 <source>&Abort</source>
 <target>&Abort</target>
 
-<source>Synchronize...</source>
-<target>Synchronise...</target>
+<source>Synchronize</source>
+<target>Synchronise</target>
 
 <source>Start synchronization</source>
 <target>Start synchronisation</target>
@@ -507,12 +513,12 @@ The command line is executed each time:
 <source>Swap sides</source>
 <target>Swap sides</target>
 
-<source>Save current configuration to file</source>
-<target>Save current configuration to file</target>
-
 <source>Load configuration from file</source>
 <target>Load configuration from file</target>
 
+<source>Save current configuration to file</source>
+<target>Save current configuration to file</target>
+
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Last used configurations (press DEL to remove from list)</target>
 
@@ -522,14 +528,14 @@ The command line is executed each time:
 <source>Hide filtered or temporarily excluded files</source>
 <target>Hide filtered or temporarily excluded files</target>
 
-<source>Number of files and directories that will be created</source>
-<target>Number of files and directories that will be created</target>
+<source>Number of files and folders that will be created</source>
+<target>Number of files and folders that will be created</target>
 
 <source>Number of files that will be overwritten</source>
 <target>Number of files that will be overwritten</target>
 
-<source>Number of files and directories that will be deleted</source>
-<target>Number of files and directories that will be deleted</target>
+<source>Number of files and folders that will be deleted</source>
+<target>Number of files and folders that will be deleted</target>
 
 <source>Total amount of data that will be transferred</source>
 <target>Total amount of data that will be transferred</target>
@@ -552,8 +558,8 @@ The command line is executed each time:
 <source>Batch job</source>
 <target>Batch job</target>
 
-<source>Create a batch file and automate synchronization. To start in batch mode simply double-click this file or run command: FreeFileSync.exe SyncJob.ffs_batch. This can also be scheduled in your system's task planner.</source>
-<target>Create a batch file and automate synchronisation. To start in batch mode simply double-click this file or run command: FreeFileSync.exe SyncJob.ffs_batch. This can also be scheduled in your system's task planner.</target>
+<source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
+<target>Create a batch file to automate synchronisation. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</target>
 
 <source>Help</source>
 <target>Help</target>
@@ -579,21 +585,12 @@ The command line is executed each time:
 <source>Maximum number of log files:</source>
 <target>Maximum number of log files:</target>
 
-<source>Select log file directory:</source>
-<target>Select log file directory:</target>
+<source>Select folder to save log files:</source>
+<target>Select folder to save log files:</target>
 
 <source>Batch settings</source>
 <target>Batch settings</target>
 
-<source>&Save</source>
-<target>&Save</target>
-
-<source>&Load</source>
-<target>&Load</target>
-
-<source>Cancel</source>
-<target>Cancel</target>
-
 <source>Select variant:</source>
 <target>Select variant:</target>
 
@@ -618,29 +615,23 @@ The command line is executed each time:
 <source>Configuration</source>
 <target>Configuration</target>
 
-<source>Category</source>
-<target>Category</target>
-
-<source>Action</source>
-<target>Action</target>
-
-<source>File/folder exists on left side only</source>
-<target>File/folder exists on left side only</target>
+<source>Item exists on left side only</source>
+<target>Item exists on left side only</target>
 
-<source>File/folder exists on right side only</source>
-<target>File/folder exists on right side only</target>
+<source>Item exists on right side only</source>
+<target>Item exists on right side only</target>
 
-<source>Left file is newer</source>
-<target>Left file is newer</target>
+<source>Left side is newer</source>
+<target>Left side is newer</target>
 
-<source>Right file is newer</source>
-<target>Right file is newer</target>
+<source>Right side is newer</source>
+<target>Right side is newer</target>
 
-<source>Files have different content</source>
-<target>Files have different content</target>
+<source>Items have different content</source>
+<target>Items have different content</target>
 
-<source>Conflict/file cannot be categorized</source>
-<target>Conflict/file cannot be categorised</target>
+<source>Conflict/item cannot be categorized</source>
+<target>Conflict/item cannot be categorised</target>
 
 <source>OK</source>
 <target>OK</target>
@@ -717,9 +708,6 @@ is the same
 <source>&Ignore</source>
 <target>&Ignore</target>
 
-<source>&Retry</source>
-<target>&Retry</target>
-
 <source>Do not show this dialog again</source>
 <target>Do not show this dialogue again</target>
 
@@ -750,33 +738,6 @@ Only files that match all filter settings will be synchronised.
 Note: File names must be relative to base directories!
 </target>
 
-<source>Hints:</source>
-<target>Hints:</target>
-
-<source>1. Enter relative file or directory names separated by ';' or a new line.</source>
-<target>1. Enter relative file or directory names separated by ';' or a new line.</target>
-
-<source>2. Use wildcard characters '*' and '?'.</source>
-<target>2. Use wildcard characters '*' and '?'.</target>
-
-<source>3. Exclude files directly on main grid via context menu.</source>
-<target>3. Exclude files directly on main grid via context menu.</target>
-
-<source>Example</source>
-<target>Example</target>
-
-<source>
-Include: *.doc;*.zip;*.exe
-Exclude: \stuff\temp\*
-</source>
-<target>
-Include: *.doc;*.zip;*.exe
-Exclude: \stuff\temp\*
-</target>
-
-<source>Synchronize all .doc, .zip and .exe files except everything in subfolder "temp".</source>
-<target>Synchronise all .doc, .zip and .exe files except everything in subfolder "temp".</target>
-
 <source>Include</source>
 <target>Include</target>
 
@@ -798,8 +759,8 @@ Exclude: \stuff\temp\*
 <source>&Default</source>
 <target>&Default</target>
 
-<source>Transactional file copy</source>
-<target>Transactional file copy</target>
+<source>Fail-safe file copy</source>
+<target>Fail-safe file copy</target>
 
 <source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
 <target>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</target>
@@ -813,8 +774,8 @@ Exclude: \stuff\temp\*
 <source>Copy file access permissions</source>
 <target>Copy file access permissions</target>
 
-<source>Transfer file and directory permissions (Requires Administrator rights)</source>
-<target>Transfer file and directory permissions (Requires Administrator rights)</target>
+<source>Transfer file and folder permissions (Requires Administrator rights)</source>
+<target>Transfer file and folder permissions (Requires Administrator rights)</target>
 
 <source>Restore hidden dialogs</source>
 <target>Restore hidden dialogs</target>
@@ -1122,11 +1083,11 @@ Exclude: \stuff\temp\*
 <source>Integrate external applications into context menu. The following macros are available:</source>
 <target>Integrate external applications into context menu. The following macros are available:</target>
 
-<source>- full file or directory name</source>
-<target>- full file or directory name</target>
+<source>- full file or folder name</source>
+<target>- full file or folder name</target>
 
-<source>- directory part only</source>
-<target>- directory part only</target>
+<source>- folder part only</source>
+<target>- folder part only</target>
 
 <source>- Other side's counterpart to %name</source>
 <target>- Other side's counterpart to %name</target>
@@ -1170,8 +1131,8 @@ Exclude: \stuff\temp\*
 <source>Versioning</source>
 <target>Versioning</target>
 
-<source>Move files into a time-stamped subdirectory</source>
-<target>Move files into a time-stamped subdirectory</target>
+<source>Move files into a time-stamped subfolder</source>
+<target>Move files into a time-stamped subfolder</target>
 
 <source>Files</source>
 <target>Files</target>
@@ -1266,8 +1227,8 @@ Exclude: \stuff\temp\*
 <source>Cannot read directory %x.</source>
 <target>Cannot read directory %x.</target>
 
-<source>Endless loop.</source>
-<target>Endless loop.</target>
+<source>Detected endless directory recursion.</source>
+<target>Detected endless directory recursion.</target>
 
 <source>Cannot set privilege %x.</source>
 <target>Cannot set privilege %x.</target>
@@ -1293,14 +1254,11 @@ Exclude: \stuff\temp\*
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Setting default synchronisation directions: Old files will be overwritten with newer files.</target>
 
-<source>The file does not contain a valid configuration:</source>
-<target>The file does not contain a valid configuration:</target>
-
-<source>You can ignore this error to consider the directory as empty.</source>
-<target>You can ignore this error to consider the directory as empty.</target>
+<source>You can ignore this error to consider the folder as empty.</source>
+<target>You can ignore this error to consider the folder as empty.</target>
 
-<source>Cannot find directory %x.</source>
-<target>Cannot find directory %x.</target>
+<source>Cannot find folder %x.</source>
+<target>Cannot find folder %x.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Directories are dependent! Be careful when setting up synchronisation rules:</target>
@@ -1332,20 +1290,20 @@ Exclude: \stuff\temp\*
 <source>Both sides are equal</source>
 <target>Both sides are equal</target>
 
-<source>Files/folders differ in attributes only</source>
-<target>Files/folders differ in attributes only</target>
+<source>Items have different attributes</source>
+<target>Items have different attributes</target>
 
-<source>Copy new file/folder to left</source>
-<target>Copy new file/folder to left</target>
+<source>Copy new item to left</source>
+<target>Copy new item to left</target>
 
-<source>Copy new file/folder to right</source>
-<target>Copy new file/folder to right</target>
+<source>Copy new item to right</source>
+<target>Copy new item to right</target>
 
-<source>Delete left file/folder</source>
-<target>Delete left file/folder</target>
+<source>Delete left item</source>
+<target>Delete left item</target>
 
-<source>Delete right file/folder</source>
-<target>Delete right file/folder</target>
+<source>Delete right item</source>
+<target>Delete right item</target>
 
 <source>Move file on left</source>
 <target>Move file on left</target>
@@ -1353,20 +1311,20 @@ Exclude: \stuff\temp\*
 <source>Move file on right</source>
 <target>Move file on right</target>
 
-<source>Overwrite left file/folder with right one</source>
-<target>Overwrite left file/folder with right one</target>
+<source>Overwrite left item</source>
+<target>Overwrite left item</target>
 
-<source>Overwrite right file/folder with left one</source>
-<target>Overwrite right file/folder with left one</target>
+<source>Overwrite right item</source>
+<target>Overwrite right item</target>
 
 <source>Do nothing</source>
 <target>Do nothing</target>
 
-<source>Copy file attributes only to left</source>
-<target>Copy file attributes only to left</target>
+<source>Update attributes on left</source>
+<target>Update attributes on left</target>
 
-<source>Copy file attributes only to right</source>
-<target>Copy file attributes only to right</target>
+<source>Update attributes on right</source>
+<target>Update attributes on right</target>
 
 <source>Multiple...</source>
 <target>Multiple...</target>
@@ -1419,11 +1377,11 @@ Exclude: \stuff\temp\*
 <source>Updating attributes of %x</source>
 <target>Updating attributes of %x</target>
 
-<source>Target directory name must not be empty!</source>
-<target>Target directory name must not be empty!</target>
+<source>Target folder name must not be empty.</source>
+<target>Target folder name must not be empty.</target>
 
-<source>Directory for file versioning was not supplied!</source>
-<target>Directory for file versioning was not supplied!</target>
+<source>Folder name for file versioning must not be empty.</source>
+<target>Folder name for file versioning must not be empty.</target>
 
 <source>Source directory %x not found.</source>
 <target>Source directory %x not found.</target>
@@ -1452,8 +1410,8 @@ Exclude: \stuff\temp\*
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</target>
 
-<source>A directory will be modified which is part of multiple folder pairs! Please review synchronization settings!</source>
-<target>A directory will be modified which is part of multiple folder pairs! Please review synchronisation settings!</target>
+<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
+<target>A folder will be modified which is part of multiple folder pairs. Please review synchronisation settings.</target>
 
 <source>Processing folder pair:</source>
 <target>Processing folder pair:</target>