5.17

1 files changed, 439 insertions, 451 deletions

diff --git a/BUILD/Languages/english_uk.lng b/BUILD/Languages/english_uk.lng
index 43cf6f51..d1fcab3d 100644
--- a/BUILD/Languages/english_uk.lng
+++ b/BUILD/Languages/english_uk.lng
@@ -1,143 +1,164 @@
 <header>
-	<language name>English (UK)</language name>
+	<language>English (UK)</language>
 	<translator>Robert Readman</translator>
 	<locale>en_GB</locale>
-	<flag file>england.png</flag file>
-	<plural forms>2</plural forms>
-	<plural definition>n == 1 ? 0 : 1</plural definition>
+	<flag_image>flag_england.png</flag_image>
+	<plural_form_count>2</plural_form_count>
+	<plural_definition>n == 1 ? 0 : 1</plural_definition>
 </header>
 
-<source>Searching for folder %x...</source>
-<target>Searching for folder %x...</target>
+<source>Both sides have changed since last synchronization.</source>
+<target>Both sides have changed since last synchronisation.</target>
 
-<source>Items processed:</source>
-<target>Elements processed:</target>
+<source>Cannot determine sync-direction:</source>
+<target>Cannot determine sync-direction:</target>
 
-<source>Items remaining:</source>
-<target>Elements remaining:</target>
+<source>No change since last synchronization.</source>
+<target>No change since last synchronisation.</target>
 
-<source>Total time:</source>
-<target>Total time:</target>
+<source>The database entry is not in sync considering current settings.</source>
+<target>The database entry is not in sync considering current settings.</target>
 
-<source>Cannot set directory lock for %x.</source>
-<target>Cannot set directory lock for %x.</target>
+<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>Show in Explorer</source>
-<target>Show in Explorer</target>
+<source>Checking recycle bin availability for folder %x...</source>
+<target>Checking recycle bin availability for folder %x...</target>
 
-<source>Open with default application</source>
-<target>Open with default application</target>
+<source>Moving file %x to recycle bin</source>
+<target>Moving file %x to recycle bin</target>
 
-<source>Browse directory</source>
-<target>Browse directory</target>
+<source>Moving folder %x to recycle bin</source>
+<target>Moving folder %x to recycle bin</target>
 
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Abort requested: Waiting for current operation to finish...</target>
+<source>Moving symbolic link %x to recycle bin</source>
+<target>Moving symbolic link %x to recycle bin</target>
 
-<source>Failure to create timestamp for versioning:</source>
-<target>Failure to create time stamp for versioning:</target>
+<source>Deleting file %x</source>
+<target>Deleting file %x</target>
 
-<source>RealtimeSync - Automated Synchronization</source>
-<target>RealtimeSync - Automated Synchronisation</target>
+<source>Deleting folder %x</source>
+<target>Deleting folder %x</target>
+
+<source>Deleting symbolic link %x</source>
+<target>Deleting symbolic link %x</target>
+
+<source>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<target>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</target>
+
+<source>An exception occurred</source>
+<target>An exception occurred</target>
+
+<source>Cannot find file %x.</source>
+<target>Cannot find file %x.</target>
 
 <source>Error</source>
 <target>Error</target>
 
-<source>Selected variant:</source>
-<target>Selected variant:</target>
+<source>File %x does not contain a valid configuration.</source>
+<target>File %x does not contain a valid configuration.</target>
 
-<source>Select alternate comparison settings</source>
-<target>Select alternate comparison settings</target>
+<source>A folder input field is empty.</source>
+<target>A folder input field is empty.</target>
 
-<source>Select alternate synchronization settings</source>
-<target>Select alternate synchronisation settings</target>
+<source>The corresponding folder will be considered as empty.</source>
+<target>The corresponding folder will be considered as empty.</target>
 
-<source>Filter is active</source>
-<target>Filter is active</target>
+<source>Cannot find the following folders:</source>
+<target>Cannot find the following folders:</target>
 
-<source>No filter selected</source>
-<target>No filter selected</target>
+<source>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization.</source>
+<target>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronisation.</target>
 
-<source>Remove alternate settings</source>
-<target>Remove alternate settings</target>
+<source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source>
+<target>The following folders have dependent paths. Be careful when setting up synchronisation rules:</target>
 
-<source>Clear filter settings</source>
-<target>Clear filter settings</target>
+<source>File %x has an invalid date.</source>
+<target>File %x has an invalid date.</target>
 
-<source>Copy</source>
-<target>Copy</target>
+<source>Date:</source>
+<target>Date:</target>
 
-<source>Paste</source>
-<target>Paste</target>
+<source>Files %x have the same date but a different size.</source>
+<target>Files %x have the same date but a different size.</target>
 
-<source>Save as batch job</source>
-<target>Save as batch job</target>
+<source>Size:</source>
+<target>Size:</target>
 
-<source>Comparison settings</source>
-<target>Comparison settings</target>
+<source>Items differ in attributes only</source>
+<target>Items differ in attributes only</target>
 
-<source>Synchronization settings</source>
-<target>Synchronisation settings</target>
+<source>Resolving symbolic link %x</source>
+<target>Resolving symbolic link %x</target>
 
-<source>About</source>
-<target>About</target>
+<source>Comparing content of files %x</source>
+<target>Comparing content of files %x</target>
 
-<source>Confirm</source>
-<target>Confirm</target>
+<source>Generating file list...</source>
+<target>Generating file list...</target>
 
-<source>Configure filter</source>
-<target>Configure filter</target>
+<source>Starting comparison</source>
+<target>Starting comparison</target>
 
-<source>Global settings</source>
-<target>Global settings</target>
+<source>Calculating sync directions...</source>
+<target>Calculating sync directions...</target>
 
-<source>Find</source>
-<target>Find</target>
+<source>Out of memory.</source>
+<target>Out of memory.</target>
 
-<source>Select time span</source>
-<target>Select time span</target>
+<source>Item exists on left side only</source>
+<target>Item exists on left side only</target>
 
-<source>Invalid command line:</source>
-<target>Invalid command line:</target>
+<source>Item exists on right side only</source>
+<target>Item exists on right side only</target>
 
-<source>Info</source>
-<target>Info</target>
+<source>Left side is newer</source>
+<target>Left side is newer</target>
 
-<source>Warning</source>
-<target>Warning</target>
+<source>Right side is newer</source>
+<target>Right side is newer</target>
 
-<source>Fatal Error</source>
-<target>Fatal Error</target>
+<source>Items have different content</source>
+<target>Items have different content</target>
 
-<source>Error Code %x:</source>
-<target>Error Code %x:</target>
+<source>Both sides are equal</source>
+<target>Both sides are equal</target>
 
-<source>Cannot resolve symbolic link %x.</source>
-<target>Cannot resolve symbolic link %x.</target>
+<source>Conflict/item cannot be categorized</source>
+<target>Conflict/item cannot be categorised</target>
 
-<source>Cannot determine final path for %x.</source>
-<target>Cannot determine final path for %x.</target>
+<source>Copy new item to left</source>
+<target>Copy new item to left</target>
 
-<source>Cannot find system function %x.</source>
-<target>Cannot find system function %x.</target>
+<source>Copy new item to right</source>
+<target>Copy new item to right</target>
 
-<source>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
-</source>
-<target>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
-</target>
+<source>Delete left item</source>
+<target>Delete left item</target>
 
-<source>%x MB</source>
-<target>%x MB</target>
+<source>Delete right item</source>
+<target>Delete right item</target>
 
-<source>%x KB</source>
-<target>%x KB</target>
+<source>Move file on left</source>
+<target>Move file on left</target>
 
-<source>%x GB</source>
-<target>%x GB</target>
+<source>Move file on right</source>
+<target>Move file on right</target>
+
+<source>Overwrite left item</source>
+<target>Overwrite left item</target>
+
+<source>Overwrite right item</source>
+<target>Overwrite right item</target>
+
+<source>Do nothing</source>
+<target>Do nothing</target>
+
+<source>Update attributes on left</source>
+<target>Update attributes on left</target>
+
+<source>Update attributes on right</source>
+<target>Update attributes on right</target>
 
 <source>Database file %x is incompatible.</source>
 <target>Database file %x is incompatible.</target>
@@ -151,9 +172,6 @@
 <source>Database file is corrupt:</source>
 <target>Database file is corrupt:</target>
 
-<source>Out of memory!</source>
-<target>Out of memory!</target>
-
 <source>Cannot write file %x.</source>
 <target>Cannot write file %x.</target>
 
@@ -163,8 +181,8 @@
 <source>Database files do not share a common session.</source>
 <target>Database files do not share a common session.</target>
 
-<source>An exception occurred!</source>
-<target>An exception occurred!</target>
+<source>Searching for folder %x...</source>
+<target>Searching for folder %x...</target>
 
 <source>Cannot read file attributes of %x.</source>
 <target>Cannot read file attributes of %x.</target>
@@ -187,9 +205,39 @@
 <source>Creating file %x</source>
 <target>Creating file %x</target>
 
+<source>Items processed:</source>
+<target>Elements processed:</target>
+
+<source>Items remaining:</source>
+<target>Elements remaining:</target>
+
+<source>Total time:</source>
+<target>Total time:</target>
+
+<source>
+<pluralform>1 Byte</pluralform>
+<pluralform>%x Bytes</pluralform>
+</source>
+<target>
+<pluralform>1 Byte</pluralform>
+<pluralform>%x Bytes</pluralform>
+</target>
+
+<source>%x MB</source>
+<target>%x MB</target>
+
+<source>%x KB</source>
+<target>%x KB</target>
+
+<source>%x GB</source>
+<target>%x GB</target>
+
 <source>Error parsing file %x, row %y, column %z.</source>
 <target>Error parsing file %x, row %y, column %z.</target>
 
+<source>Cannot set directory lock for %x.</source>
+<target>Cannot set directory lock for %x.</target>
+
 <source>Scanning:</source>
 <target>Scanning:</target>
 
@@ -208,12 +256,18 @@
 <source>/sec</source>
 <target>/sec</target>
 
-<source>File %x does not contain a valid configuration.</source>
-<target>File %x does not contain a valid configuration.</target>
-
 <source>Configuration file %x loaded partially only.</source>
 <target>Configuration file %x loaded partially only.</target>
 
+<source>Show in Explorer</source>
+<target>Show in Explorer</target>
+
+<source>Open with default application</source>
+<target>Open with default application</target>
+
+<source>Browse directory</source>
+<target>Browse directory</target>
+
 <source>Cannot access Volume Shadow Copy Service.</source>
 <target>Cannot access Volume Shadow Copy Service.</target>
 
@@ -223,18 +277,21 @@
 <source>Cannot load file %x.</source>
 <target>Cannot load file %x.</target>
 
-<source>Path %x does not contain a volume name.</source>
-<target>Path %x does not contain a volume name.</target>
+<source>Cannot determine volume name for %x.</source>
+<target>Cannot determine volume name for %x.</target>
 
-<source>Volume name %x not part of file name %y!</source>
-<target>Volume name %x not part of file name %y!</target>
+<source>Volume name %x not part of file name %y.</source>
+<target>Volume name %x not part of file name %y.</target>
+
+<source>Abort requested: Waiting for current operation to finish...</source>
+<target>Abort requested: Waiting for current operation to finish...</target>
+
+<source>Failure to create timestamp for versioning:</source>
+<target>Failure to create time stamp for versioning:</target>
 
 <source>Cannot read the following XML elements:</source>
 <target>Cannot read the following XML elements:</target>
 
-<source>Cannot find file %x.</source>
-<target>Cannot find file %x.</target>
-
 <source>&Open...</source>
 <target>&Open...</target>
 
@@ -315,9 +372,18 @@ The command is triggered if:
 <source>Cancel</source>
 <target>Cancel</target>
 
+<source>RealtimeSync - Automated Synchronization</source>
+<target>RealtimeSync - Automated Synchronisation</target>
+
+<source>Warning</source>
+<target>Warning</target>
+
 <source>Build: %x</source>
 <target>Build: %x</target>
 
+<source>About</source>
+<target>About</target>
+
 <source>All files</source>
 <target>All files</target>
 
@@ -327,29 +393,125 @@ The command is triggered if:
 <source>&Exit</source>
 <target>&Exit</target>
 
-<source>Monitoring active...</source>
-<target>Monitoring active...</target>
-
 <source>Waiting for missing directories...</source>
 <target>Waiting for missing directories...</target>
 
-<source>A folder input field is empty.</source>
-<target>A folder input field is empty.</target>
+<source>Invalid command line:</source>
+<target>Invalid command line:</target>
+
+<source>File content</source>
+<target>File content</target>
+
+<source>File time and size</source>
+<target>File time and size</target>
+
+<source> Two way </source>
+<target> Two way </target>
+
+<source>Mirror</source>
+<target>Mirror </target>
+
+<source>Update</source>
+<target>Update </target>
+
+<source>Custom</source>
+<target>Custom</target>
 
-<source>Synchronization aborted!</source>
-<target>Synchronisation aborted!</target>
+<source>Multiple...</source>
+<target>Multiple...</target>
 
-<source>Synchronization completed with errors!</source>
-<target>Synchronisation completed with errors!</target>
+<source>Moving file %x to %y</source>
+<target>Moving file %x to %y</target>
 
-<source>Synchronization completed with warnings.</source>
-<target>Synchronization completed with warnings.</target>
+<source>Moving folder %x to %y</source>
+<target>Moving folder %x to %y</target>
 
-<source>Nothing to synchronize!</source>
-<target>Nothing to synchronise!</target>
+<source>Moving symbolic link %x to %y</source>
+<target>Moving symbolic link %x to %y</target>
 
-<source>Synchronization completed successfully.</source>
-<target>Synchronisation completed successfully.</target>
+<source>Removing old versions...</source>
+<target>Removing old versions...</target>
+
+<source>Creating symbolic link %x</source>
+<target>Creating symbolic link %x</target>
+
+<source>Creating folder %x</source>
+<target>Creating folder %x</target>
+
+<source>Overwriting file %x</source>
+<target>Overwriting file %x</target>
+
+<source>Overwriting symbolic link %x</source>
+<target>Overwriting symbolic link %x</target>
+
+<source>Verifying file %x</source>
+<target>Verifying file %x</target>
+
+<source>Updating attributes of %x</source>
+<target>Updating attributes of %x</target>
+
+<source>Cannot find %x.</source>
+<target>Cannot find %x.</target>
+
+<source>Target folder %x already existing.</source>
+<target>Target folder %x already existing.</target>
+
+<source>Target folder input field must not be empty.</source>
+<target>Target folder input field must not be empty.</target>
+
+<source>Folder input field for versioning must not be empty.</source>
+<target>Folder input field for versioning must not be empty.</target>
+
+<source>Source folder %x not found.</source>
+<target>Source folder %x not found.</target>
+
+<source>The following items have unresolved conflicts and will not be synchronized:</source>
+<target>The following items have unresolved conflicts and will not be synchronised:</target>
+
+<source>Significant difference detected:</source>
+<target>Significant difference detected:</target>
+
+<source>More than 50% of the total number of files will be copied or deleted.</source>
+<target>More than 50% of the total number of files will be copied or deleted.</target>
+
+<source>Not enough free disk space available in:</source>
+<target>Not enough free disk space available in:</target>
+
+<source>Required:</source>
+<target>Required:</target>
+
+<source>Available:</source>
+<target>Available:</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>Synchronizing folder pair:</source>
+<target>Synchronising folder pair:</target>
+
+<source>Generating database...</source>
+<target>Generating database...</target>
+
+<source>Creating Volume Shadow Copy for %x...</source>
+<target>Creating Volume Shadow Copy for %x...</target>
+
+<source>Data verification error: %x and %y have different content.</source>
+<target>Data verification error: %x and %y have different content.</target>
+
+<source>Synchronization aborted</source>
+<target>Synchronisation aborted</target>
+
+<source>Synchronization completed with errors</source>
+<target>Synchronisation completed with errors</target>
+
+<source>Synchronization completed with warnings</source>
+<target>Synchronization completed with warnings</target>
+
+<source>Nothing to synchronize</source>
+<target>Nothing to synchronise</target>
+
+<source>Synchronization completed successfully</source>
+<target>Synchronisation completed successfully</target>
 
 <source>Saving log file %x...</source>
 <target>Saving log file %x...</target>
@@ -357,8 +519,8 @@ The command is triggered if:
 <source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
 <target>Press "Switch" to resolve issues in FreeFileSync main dialogue.</target>
 
-<source>Switching to FreeFileSync main dialog...</source>
-<target>Switching to FreeFileSync main dialogue...</target>
+<source>Switching to FreeFileSync main dialog</source>
+<target>Switching to FreeFileSync main dialog</target>
 
 <source>A new version of FreeFileSync is available:</source>
 <target>A new version of FreeFileSync is available:</target>
@@ -366,29 +528,29 @@ The command is triggered if:
 <source>Download now?</source>
 <target>Download now?</target>
 
-<source>FreeFileSync is up to date!</source>
-<target>FreeFileSync is up to date!</target>
+<source>New version found</source>
+<target>New version found</target>
 
-<source>Information</source>
-<target>Information</target>
+<source>&Download</source>
+<target>&Download</target>
 
-<source>Unable to connect to sourceforge.net!</source>
-<target>Unable to connect to sourceforge.net!</target>
+<source>FreeFileSync is up to date.</source>
+<target>FreeFileSync is up to date.</target>
 
-<source>Current FreeFileSync version number was not found online! Do you want to check manually?</source>
-<target>Current FreeFileSync version number was not found online! Do you want to check manually?</target>
+<source>Information</source>
+<target>Information</target>
 
-<source>Do you want FreeFileSync to automatically check for updates every week?</source>
-<target>Do you want FreeFileSync to automatically check for updates every week?</target>
+<source>Unable to connect to sourceforge.net.</source>
+<target>Unable to connect to sourceforge.net.</target>
 
-<source>(Requires an Internet connection!)</source>
-<target>(Requires an Internet connection!)</target>
+<source>Cannot find current FreeFileSync version number online. Do you want to check manually?</source>
+<target>Cannot find current FreeFileSync version number online. Do you want to check manually?</target>
 
-<source><Symlink></source>
-<target><Symlink></target>
+<source>Symlink</source>
+<target>Symlink</target>
 
-<source><Folder></source>
-<target><Folder></target>
+<source>Folder</source>
+<target>Folder</target>
 
 <source>Full path</source>
 <target>Full path</target>
@@ -411,12 +573,6 @@ The command is triggered if:
 <source>Extension</source>
 <target>Extension</target>
 
-<source>Size:</source>
-<target>Size:</target>
-
-<source>Date:</source>
-<target>Date:</target>
-
 <source>Category</source>
 <target>Category</target>
 
@@ -441,6 +597,33 @@ The command is triggered if:
 <source>Hibernate</source>
 <target>Hibernate</target>
 
+<source>Selected variant:</source>
+<target>Selected variant:</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>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>
+
+<source>Clear filter settings</source>
+<target>Clear filter settings</target>
+
+<source>Copy</source>
+<target>Copy</target>
+
+<source>Paste</source>
+<target>Paste</target>
+
 <source>&New</source>
 <target>&New</target>
 
@@ -459,14 +642,14 @@ The command is triggered if:
 <source>&Language</source>
 <target>&Language</target>
 
-<source>&Global settings...</source>
-<target>&Global settings...</target>
-
 <source>&Export file list...</source>
 <target>&Export file list...</target>
 
-<source>&Advanced</source>
-<target>&Advanced</target>
+<source>&Global settings...</source>
+<target>&Global settings...</target>
+
+<source>&Tools</source>
+<target>&Tools</target>
 
 <source>&Check now</source>
 <target>&Check now</target>
@@ -474,12 +657,18 @@ The command is triggered if:
 <source>Check &automatically once a week</source>
 <target>Check &automatically once a week</target>
 
-<source>Check for new version</source>
-<target>Check for new version</target>
+<source>Check for new &version</source>
+<target>Check for new &version</target>
 
 <source>Compare</source>
 <target>Compare</target>
 
+<source>Comparison settings</source>
+<target>Comparison settings</target>
+
+<source>Synchronization settings</source>
+<target>Synchronisation settings</target>
+
 <source>Synchronize</source>
 <target>Synchronise</target>
 
@@ -492,6 +681,9 @@ The command is triggered if:
 <source>Swap sides</source>
 <target>Swap sides</target>
 
+<source>Save as batch job</source>
+<target>Save as batch job</target>
+
 <source>Hide excluded items</source>
 <target>Hide excluded items</target>
 
@@ -534,53 +726,8 @@ The command is triggered if:
 <source>&Pause</source>
 <target>&Pause</target>
 
-<source>Batch job</source>
-<target>Batch job</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>
-
-<source>Error handling</source>
-<target>Error handling</target>
-
-<source>Ignore</source>
-<target>Ignore</target>
-
-<source>Hide all error and warning messages</source>
-<target>Hide all error and warning messages</target>
-
-<source>Pop-up</source>
-<target>Pop-up</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Show pop-up on errors or warnings</target>
-
-<source>Exit</source>
-<target>Exit</target>
-
-<source>Abort synchronization on first error</source>
-<target>Abort synchronisation on first error</target>
-
-<source>Show progress dialog</source>
-<target>Show progress dialogue</target>
-
-<source>Save log</source>
-<target>Save log</target>
-
-<source>Select folder to save log files</source>
-<target>Select folder to save log files</target>
-
-<source>Limit</source>
-<target>Limit</target>
-
-<source>Limit maximum number of log files</source>
-<target>Limit maximum number of log files</target>
-
-<source>Select variant</source>
-<target>Select variant</target>
+<source>Select a variant</source>
+<target>Select a variant</target>
 
 <source>
 Files are found equal if
@@ -595,9 +742,6 @@ Files are found equal if
 are the same
 </target>
 
-<source>File time and size</source>
-<target>File time and size</target>
-
 <source>
 Files are found equal if
      - file content
@@ -609,39 +753,42 @@ Files are found equal if
 is the same
 </target>
 
-<source>File content</source>
-<target>File content</target>
-
 <source>Symbolic Link handling</source>
 <target>Symbolic Link handling</target>
 
+<source>Help</source>
+<target>Help</target>
+
 <source>OK</source>
 <target>OK</target>
 
-<source><- Two way -></source>
-<target><- Two way -></target>
-
 <source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
 <target>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</target>
 
-<source>Mirror ->></source>
-<target>Mirror ->></target>
-
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
 <target>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronisation.</target>
 
-<source>Update -></source>
-<target>Update -></target>
-
 <source>Copy new or updated files to right folder.</source>
 <target>Copy new or updated files to right folder.</target>
 
-<source>Custom</source>
-<target>Custom</target>
-
 <source>Configure your own synchronization rules.</source>
 <target>Configure your own synchronisation rules.</target>
 
+<source>Error handling</source>
+<target>Error handling</target>
+
+<source>Ignore</source>
+<target>Ignore</target>
+
+<source>Hide all error and warning messages</source>
+<target>Hide all error and warning messages</target>
+
+<source>Pop-up</source>
+<target>Pop-up</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Show pop-up on errors or warnings</target>
+
 <source>Deletion handling</source>
 <target>Deletion handling</target>
 
@@ -666,23 +813,32 @@ is the same
 <source>Naming convention:</source>
 <target>Naming convention:</target>
 
-<source>Item exists on left side only</source>
-<target>Item exists on left side only</target>
+<source>Batch job</source>
+<target>Batch job</target>
 
-<source>Item exists on right side only</source>
-<target>Item exists on right side only</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>Left side is newer</source>
-<target>Left side is newer</target>
+<source>Exit</source>
+<target>Exit</target>
 
-<source>Right side is newer</source>
-<target>Right side is newer</target>
+<source>Abort synchronization on first error</source>
+<target>Abort synchronisation on first error</target>
 
-<source>Items have different content</source>
-<target>Items have different content</target>
+<source>Show progress dialog</source>
+<target>Show progress dialogue</target>
 
-<source>Conflict/item cannot be categorized</source>
-<target>Conflict/item cannot be categorised</target>
+<source>Save log</source>
+<target>Save log</target>
+
+<source>Select folder to save log files</source>
+<target>Select folder to save log files</target>
+
+<source>Limit</source>
+<target>Limit</target>
+
+<source>Limit maximum number of log files</source>
+<target>Limit maximum number of log files</target>
 
 <source>Source code written in C++ using:</source>
 <target>Source code written in C++ using:</target>
@@ -702,9 +858,6 @@ is the same
 <source>Homepage</source>
 <target>Homepage</target>
 
-<source>FreeFileSync at Sourceforge</source>
-<target>FreeFileSync at Sourceforge</target>
-
 <source>Email</source>
 <target>E-mail</target>
 
@@ -719,11 +872,11 @@ is the same
 
 <source>
 Only files that match all filter settings will be synchronized.
-Note: File names must be relative to base directories!
+Note: File names must be relative to base directories.
 </source>
 <target>
 Only files that match all filter settings will be synchronised.
-Note: File names must be relative to base directories!
+Note: File names must be relative to base directories.
 </target>
 
 <source>Include</source>
@@ -747,6 +900,9 @@ Note: File names must be relative to base directories!
 <source>&Clear</source>
 <target>&Clear</target>
 
+<source>Global settings</source>
+<target>Global settings</target>
+
 <source>Fail-safe file copy</source>
 <target>Fail-safe file copy</target>
 
@@ -777,9 +933,6 @@ Note: File names must be relative to base directories!
 <source>&Default</source>
 <target>&Default</target>
 
-<source>Start synchronization</source>
-<target>Start synchronisation</target>
-
 <source>Variant</source>
 <target>Variant</target>
 
@@ -798,6 +951,21 @@ Note: File names must be relative to base directories!
 <source>&Find next</source>
 <target>&Find next</target>
 
+<source>Delete</source>
+<target>Delete</target>
+
+<source>Configure filter</source>
+<target>Configure filter</target>
+
+<source>Start synchronization</source>
+<target>Start synchronisation</target>
+
+<source>Find</source>
+<target>Find</target>
+
+<source>Select time span</source>
+<target>Select time span</target>
+
 <source>Folder pairs</source>
 <target>Folder pairs</target>
 
@@ -864,11 +1032,8 @@ Note: File names must be relative to base directories!
 <source>Exclude via filter:</source>
 <target>Exclude via filter:</target>
 
-<source><multiple selection></source>
-<target><multiple selection></target>
-
-<source>Delete</source>
-<target>Delete</target>
+<source>multiple selection</source>
+<target>multiple selection</target>
 
 <source>Include all</source>
 <target>Include all</target>
@@ -897,14 +1062,14 @@ Note: File names must be relative to base directories!
 <source>Show "%x"</source>
 <target>Show "%x"</target>
 
-<source><Last session></source>
-<target><Last session></target>
+<source>Last session</source>
+<target>Last session</target>
 
 <source>Folder Comparison and Synchronization</source>
 <target>Folder Comparison and Synchronisation</target>
 
-<source>Configuration saved!</source>
-<target>Configuration saved!</target>
+<source>Configuration saved</source>
+<target>Configuration saved</target>
 
 <source>FreeFileSync batch</source>
 <target>FreeFileSync batch</target>
@@ -918,9 +1083,6 @@ Note: File names must be relative to base directories!
 <source>Never save changes</source>
 <target>Never save changes</target>
 
-<source>Configuration loaded!</source>
-<target>Configuration loaded!</target>
-
 <source>Show files that exist on left side only</source>
 <target>Show files that exist on left side only</target>
 
@@ -966,17 +1128,17 @@ Note: File names must be relative to base directories!
 <source>Set as default</source>
 <target>Set as default</target>
 
-<source>Operation aborted!</source>
-<target>Operation aborted!</target>
+<source>Operation aborted</source>
+<target>Operation aborted</target>
 
-<source>All folders are in sync!</source>
-<target>All folders are in sync!</target>
+<source>All folders are in sync</source>
+<target>All folders are in sync</target>
 
 <source>Comma separated list</source>
 <target>Comma separated list</target>
 
-<source>File list exported!</source>
-<target>File list exported!</target>
+<source>File list exported</source>
+<target>File list exported</target>
 
 <source>Searching for program updates...</source>
 <target>Searching for program updates...</target>
@@ -987,6 +1149,9 @@ Note: File names must be relative to base directories!
 <source>&Ignore</source>
 <target>&Ignore</target>
 
+<source>Fatal Error</source>
+<target>Fatal Error</target>
+
 <source>Don't show this warning again</source>
 <target>Don't show this warning again</target>
 
@@ -1008,6 +1173,9 @@ Note: File names must be relative to base directories!
 <source>Comparing content...</source>
 <target>Comparing content...</target>
 
+<source>Info</source>
+<target>Info</target>
+
 <source>Paused</source>
 <target>Paused</target>
 
@@ -1182,12 +1350,18 @@ Note: File names must be relative to base directories!
 <source>Cannot create symbolic link %x.</source>
 <target>Cannot create symbolic link %x.</target>
 
+<source>Cannot find system function %x.</source>
+<target>Cannot find system function %x.</target>
+
 <source>Cannot copy file %x to %y.</source>
 <target>Cannot copy file %x to %y.</target>
 
 <source>Type of item %x is not supported:</source>
 <target>Type of item %x is not supported:</target>
 
+<source>Cannot resolve symbolic link %x.</source>
+<target>Cannot resolve symbolic link %x.</target>
+
 <source>Cannot open directory %x.</source>
 <target>Cannot open directory %x.</target>
 
@@ -1227,6 +1401,9 @@ Note: File names must be relative to base directories!
 <pluralform>%x days</pluralform>
 </target>
 
+<source>Failed to register to receive system messages.</source>
+<target>Failed to register to receive system messages.</target>
+
 <source>Cannot set privilege %x.</source>
 <target>Cannot set privilege %x.</target>
 
@@ -1236,201 +1413,12 @@ Note: File names must be relative to base directories!
 <source>Cannot change process I/O priorities.</source>
 <target>Cannot change process I/O priorities.</target>
 
-<source>Unable to move %x to the Recycle Bin!</source>
-<target>Unable to move %x to the Recycle Bin!</target>
-
-<source>Both sides have changed since last synchronization!</source>
-<target>Both sides have changed since last synchronisation!</target>
-
-<source>Cannot determine sync-direction:</source>
-<target>Cannot determine sync-direction:</target>
-
-<source>No change since last synchronization!</source>
-<target>No change since last synchronisation!</target>
-
-<source>The corresponding database entries are not in sync considering current settings.</source>
-<target>The corresponding database entries are not in sync considering current settings.</target>
-
-<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>Checking recycle bin availability for folder %x...</source>
-<target>Checking recycle bin availability for folder %x...</target>
-
-<source>Moving file %x to recycle bin</source>
-<target>Moving file %x to recycle bin</target>
-
-<source>Moving folder %x to recycle bin</source>
-<target>Moving folder %x to recycle bin</target>
-
-<source>Moving symbolic link %x to recycle bin</source>
-<target>Moving symbolic link %x to recycle bin</target>
-
-<source>Deleting file %x</source>
-<target>Deleting file %x</target>
-
-<source>Deleting folder %x</source>
-<target>Deleting folder %x</target>
-
-<source>Deleting symbolic link %x</source>
-<target>Deleting symbolic link %x</target>
-
-<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>The corresponding folder will be considered as empty.</source>
-<target>The corresponding folder will be considered as empty.</target>
-
-<source>Cannot find the following folders:</source>
-<target>Cannot find the following folders:</target>
-
-<source>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization.</source>
-<target>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronisation.</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>
-
-<source>Conflict detected:</source>
-<target>Conflict detected:</target>
-
-<source>File %x has an invalid date!</source>
-<target>File %x has an invalid date!</target>
-
-<source>Files %x have the same date but a different size!</source>
-<target>Files %x have the same date but a different size!</target>
-
-<source>Items differ in attributes only</source>
-<target>Items differ in attributes only</target>
-
-<source>Resolving symbolic link %x</source>
-<target>Resolving symbolic link %x</target>
-
-<source>Comparing content of files %x</source>
-<target>Comparing content of files %x</target>
-
-<source>Generating file list...</source>
-<target>Generating file list...</target>
-
-<source>Start comparison</source>
-<target>Start comparison</target>
-
-<source>Calculating sync directions...</source>
-<target>Calculating sync directions...</target>
-
-<source>Both sides are equal</source>
-<target>Both sides are equal</target>
-
-<source>Copy new item to left</source>
-<target>Copy new item to left</target>
-
-<source>Copy new item to right</source>
-<target>Copy new item to right</target>
-
-<source>Delete left item</source>
-<target>Delete left item</target>
-
-<source>Delete right item</source>
-<target>Delete right item</target>
-
-<source>Move file on left</source>
-<target>Move file on left</target>
-
-<source>Move file on right</source>
-<target>Move file on right</target>
-
-<source>Overwrite left item</source>
-<target>Overwrite left item</target>
-
-<source>Overwrite right item</source>
-<target>Overwrite right item</target>
+<source>Unable to move %x to the Recycle Bin.</source>
+<target>Unable to move %x to the Recycle Bin.</target>
 
-<source>Do nothing</source>
-<target>Do nothing</target>
-
-<source>Update attributes on left</source>
-<target>Update attributes on left</target>
-
-<source>Update attributes on right</source>
-<target>Update attributes on right</target>
-
-<source>Multiple...</source>
-<target>Multiple...</target>
-
-<source>Moving file %x to %y</source>
-<target>Moving file %x to %y</target>
-
-<source>Moving folder %x to %y</source>
-<target>Moving folder %x to %y</target>
-
-<source>Moving symbolic link %x to %y</source>
-<target>Moving symbolic link %x to %y</target>
-
-<source>Removing old versions...</source>
-<target>Removing old versions...</target>
-
-<source>Creating symbolic link %x</source>
-<target>Creating symbolic link %x</target>
-
-<source>Creating folder %x</source>
-<target>Creating folder %x</target>
-
-<source>Overwriting file %x</source>
-<target>Overwriting file %x</target>
-
-<source>Overwriting symbolic link %x</source>
-<target>Overwriting symbolic link %x</target>
-
-<source>Verifying file %x</source>
-<target>Verifying file %x</target>
-
-<source>Updating attributes of %x</source>
-<target>Updating attributes of %x</target>
-
-<source>Cannot find %x.</source>
-<target>Cannot find %x.</target>
-
-<source>Target folder %x already existing.</source>
-<target>Target folder %x already existing.</target>
-
-<source>Target folder input field must not be empty.</source>
-<target>Target folder input field must not be empty.</target>
-
-<source>Folder input field for versioning must not be empty.</source>
-<target>Folder input field for versioning must not be empty.</target>
-
-<source>Source folder %x not found.</source>
-<target>Source folder %x not found.</target>
-
-<source>The following items have unresolved conflicts and will not be synchronized:</source>
-<target>The following items have unresolved conflicts and will not be synchronised:</target>
-
-<source>Significant difference detected:</source>
-<target>Significant difference detected:</target>
-
-<source>More than 50% of the total number of files will be copied or deleted!</source>
-<target>More than 50% of the total number of files will be copied or deleted!</target>
-
-<source>Not enough free disk space available in:</source>
-<target>Not enough free disk space available in:</target>
-
-<source>Required:</source>
-<target>Required:</target>
-
-<source>Available:</source>
-<target>Available:</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>Synchronizing folder pair:</source>
-<target>Synchronising folder pair:</target>
-
-<source>Generating database...</source>
-<target>Generating database...</target>
-
-<source>Creating Volume Shadow Copy for %x...</source>
-<target>Creating Volume Shadow Copy for %x...</target>
+<source>Cannot determine final path for %x.</source>
+<target>Cannot determine final path for %x.</target>
 
-<source>Data verification error: Source and target file have different content!</source>
-<target>Data verification error: Source and target file have different content!</target>
+<source>Error Code %x:</source>
+<target>Error Code %x:</target>