5.11

1 files changed, 150 insertions, 123 deletions

diff --git a/BUILD/Languages/english_uk.lng b/BUILD/Languages/english_uk.lng
index 4d6a5611..35ee5f16 100644
--- a/BUILD/Languages/english_uk.lng
+++ b/BUILD/Languages/english_uk.lng
@@ -31,6 +31,9 @@
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Abort requested: Waiting for current operation to finish...</target>
 
+<source>Failure to create time stamp for versioning:</source>
+<target>Failure to create time stamp for versioning:</target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Automated Synchronisation</target>
 
@@ -55,8 +58,8 @@
 <source>Clear filter settings</source>
 <target>Clear filter settings</target>
 
-<source>Create a batch job</source>
-<target>Create a batch job</target>
+<source>Save as batch job</source>
+<target>Save as batch job</target>
 
 <source>Comparison settings</source>
 <target>Comparison settings</target>
@@ -76,9 +79,6 @@
 <source>Global settings</source>
 <target>Global settings</target>
 
-<source>Summary</source>
-<target>Summary</target>
-
 <source>Find</source>
 <target>Find</target>
 
@@ -271,8 +271,8 @@
 <source>Select a folder</source>
 <target>Select a folder</target>
 
-<source>Delay [seconds]</source>
-<target>Delay [seconds]</target>
+<source>Idle time [seconds]</source>
+<target>Idle time [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>
@@ -321,38 +321,23 @@ The command is triggered if:
 <source>A folder input field is empty.</source>
 <target>A folder input field is empty.</target>
 
-<source>File time and size</source>
-<target>File time and size</target>
-
-<source>File content</source>
-<target>File content</target>
-
-<source><Automatic></source>
-<target><Automatic></target>
-
-<source>Mirror ->></source>
-<target>Mirror ->></target>
-
-<source>Update -></source>
-<target>Update -></target>
-
-<source>Custom</source>
-<target>Custom</target>
-
-<source>FreeFileSync batch</source>
-<target>FreeFileSync batch</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>Synchronization completed successfully.</source>
+<target>Synchronisation completed successfully.</target>
+
+<source>Saving log file %x...</source>
+<target>Saving log file %x...</target>
 
 <source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
 <target>Press "Switch" to resolve issues in FreeFileSync main dialogue.</target>
@@ -360,9 +345,6 @@ The command is triggered if:
 <source>Switching to FreeFileSync main dialog...</source>
 <target>Switching to FreeFileSync main dialogue...</target>
 
-<source>Unable to connect to sourceforge.net!</source>
-<target>Unable to connect to sourceforge.net!</target>
-
 <source>A new version of FreeFileSync is available:</source>
 <target>A new version of FreeFileSync is available:</target>
 
@@ -375,6 +357,12 @@ The command is triggered if:
 <source>Information</source>
 <target>Information</target>
 
+<source>Unable to connect to sourceforge.net!</source>
+<target>Unable to connect to sourceforge.net!</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>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>
 
@@ -438,27 +426,27 @@ The command is triggered if:
 <source>Hibernate</source>
 <target>Hibernate</target>
 
-<source>1. &Compare</source>
-<target>1. &Compare</target>
-
-<source>2. &Synchronize</source>
-<target>2. &Synchronise</target>
-
 <source>&New</source>
 <target>&New</target>
 
 <source>&Save</source>
 <target>&Save</target>
 
+<source>Save as &batch job...</source>
+<target>Save as &batch job...</target>
+
+<source>1. &Compare</source>
+<target>1. &Compare</target>
+
+<source>2. &Synchronize</source>
+<target>2. &Synchronise</target>
+
 <source>&Language</source>
 <target>&Language</target>
 
 <source>&Global settings...</source>
 <target>&Global settings...</target>
 
-<source>&Create batch job...</source>
-<target>&Create batch job...</target>
-
 <source>&Export file list...</source>
 <target>&Export file list...</target>
 
@@ -492,17 +480,17 @@ The command is triggered if:
 <source>Swap sides</source>
 <target>Swap sides</target>
 
-<source>Load configuration from file</source>
-<target>Load configuration from file</target>
+<source>Open</source>
+<target>Open</target>
 
-<source>Save current configuration to file</source>
-<target>Save current configuration to file</target>
+<source>Save</source>
+<target>Save</target>
 
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Last used configurations (press DEL to remove from list)</target>
 
-<source>Show excluded items</source>
-<target>Show excluded items</target>
+<source>Hide excluded items</source>
+<target>Hide excluded items</target>
 
 <source>Show filtered or temporarily excluded files</source>
 <target>Show filtered or temporarily excluded files</target>
@@ -540,15 +528,6 @@ The command is triggered if:
 <source>Help</source>
 <target>Help</target>
 
-<source>Filter files</source>
-<target>Filter files</target>
-
-<source>Left</source>
-<target>Left</target>
-
-<source>Right</source>
-<target>Right</target>
-
 <source>Error handling</source>
 <target>Error handling</target>
 
@@ -570,14 +549,14 @@ The command is triggered if:
 <source>Abort synchronization on first error</source>
 <target>Abort synchronisation on first error</target>
 
-<source>On completion:</source>
-<target>On completion:</target>
+<source>On completion</source>
+<target>On completion</target>
 
 <source>Show progress dialog</source>
 <target>Show progress dialogue</target>
 
-<source>Generate log file</source>
-<target>Generate log file</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>
@@ -588,11 +567,8 @@ The command is triggered if:
 <source>Limit maximum number of log files</source>
 <target>Limit maximum number of log files</target>
 
-<source>Batch settings</source>
-<target>Batch settings</target>
-
-<source>Compare by...</source>
-<target>Compare by...</target>
+<source>Select variant</source>
+<target>Select variant</target>
 
 <source>
 Files are found equal if
@@ -607,6 +583,9 @@ 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
@@ -618,24 +597,36 @@ 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>OK</source>
 <target>OK</target>
 
-<source>Select variant:</source>
-<target>Select variant:</target>
+<source><- Two way -></source>
+<target><- Two way -></target>
 
 <source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
 <target>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</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>
 
@@ -651,8 +642,8 @@ is the same
 <source>Recycle Bin</source>
 <target>Recycle Bin</target>
 
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Use Recycle Bin when deleting or overwriting files</target>
+<source>Use Recycle Bin for deleted and overwritten files</source>
+<target>Use Recycle Bin for deleted and overwritten files</target>
 
 <source>Versioning</source>
 <target>Versioning</target>
@@ -660,8 +651,8 @@ is the same
 <source>Move time-stamped files into specified folder</source>
 <target>Move time-stamped files into specified folder</target>
 
-<source>Limit maximum number of versions per file</source>
-<target>Limit maximum number of versions per file</target>
+<source>Naming convention:</source>
+<target>Naming convention:</target>
 
 <source>Configuration</source>
 <target>Configuration</target>
@@ -810,6 +801,9 @@ Note: File names must be relative to base directories!
 <source>Overview</source>
 <target>Overview</target>
 
+<source>Filter files</source>
+<target>Filter files</target>
+
 <source>Select view</source>
 <target>Select view</target>
 
@@ -861,9 +855,15 @@ Note: File names must be relative to base directories!
 <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>FreeFileSync batch</source>
+<target>FreeFileSync batch</target>
+
 <source>Never save changes</source>
 <target>Never save changes</target>
 
@@ -876,9 +876,6 @@ Note: File names must be relative to base directories!
 <source>Configuration loaded!</source>
 <target>Configuration loaded!</target>
 
-<source>Folder Comparison and Synchronization</source>
-<target>Folder Comparison and Synchronisation</target>
-
 <source>Hide files that exist on left side only</source>
 <target>Hide files that exist on left side only</target>
 
@@ -1035,6 +1032,9 @@ Note: File names must be relative to base directories!
 <source>Comparing content...</source>
 <target>Comparing content...</target>
 
+<source>Copy</source>
+<target>Copy</target>
+
 <source>Paused</source>
 <target>Paused</target>
 
@@ -1107,14 +1107,14 @@ Note: File names must be relative to base directories!
 <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>
+<source>- Other side's counterpart to %item_path%</source>
+<target>- Other side's counterpart to %item_path%</target>
 
-<source>- Other side's counterpart to %dir</source>
-<target>- Other side's counterpart to %dir</target>
+<source>- Other side's counterpart to %item_folder%</source>
+<target>- Other side's counterpart to %item_folder%</target>
 
-<source>Make hidden dialogs and warning messages visible again?</source>
-<target>Make hidden dialogues and warning messages visible again?</target>
+<source>Make hidden warnings and dialogs visible again?</source>
+<target>Make hidden warnings and dialogues visible again?</target>
 
 <source>
 <pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
@@ -1137,47 +1137,29 @@ Note: File names must be relative to base directories!
 <source>Leave as unresolved conflict</source>
 <target>Leave as unresolved conflict</target>
 
-<source>Files</source>
-<target>Files</target>
+<source>Replace</source>
+<target>Replace</target>
 
-<source>Percentage</source>
-<target>Percentage</target>
+<source>Move files and replace if existing</source>
+<target>Move files and replace if existing</target>
 
-<source>%x TB</source>
-<target>%x TB</target>
+<source>Append a timestamp to each file name</source>
+<target>Append a timestamp to each file name</target>
 
-<source>%x PB</source>
-<target>%x PB</target>
+<source>Folder</source>
+<target>Folder</target>
 
-<source>%x%</source>
-<target>%x%</target>
+<source>File</source>
+<target>File</target>
 
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</target>
+<source>YYYY-MM-DD hhmmss</source>
+<target>YYYY-MM-DD hhmmss</target>
 
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</target>
+<source>Files</source>
+<target>Files</target>
 
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</target>
+<source>Percentage</source>
+<target>Percentage</target>
 
 <source>Cannot monitor directory %x.</source>
 <target>Cannot monitor directory %x.</target>
@@ -1227,6 +1209,9 @@ Note: File names must be relative to base directories!
 <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 open directory %x.</source>
 <target>Cannot open directory %x.</target>
 
@@ -1236,6 +1221,42 @@ Note: File names must be relative to base directories!
 <source>Detected endless directory recursion.</source>
 <target>Detected endless directory recursion.</target>
 
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</target>
+
 <source>Cannot set privilege %x.</source>
 <target>Cannot set privilege %x.</target>
 
@@ -1365,6 +1386,9 @@ Note: File names must be relative to base directories!
 <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 file %x</source>
 <target>Creating file %x</target>
 
@@ -1386,6 +1410,9 @@ Note: File names must be relative to base directories!
 <source>Updating attributes of %x</source>
 <target>Updating attributes of %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>
 
@@ -1395,11 +1422,8 @@ Note: File names must be relative to base directories!
 <source>Source folder %x not found.</source>
 <target>Source folder %x not found.</target>
 
-<source>Unresolved conflicts existing!</source>
-<target>Unresolved conflicts existing!</target>
-
-<source>You can ignore conflicts and continue synchronization.</source>
-<target>You can ignore conflicts and continue synchronisation.</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>
@@ -1419,12 +1443,15 @@ Note: File names must be relative to base directories!
 <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>Left</source>
+<target>Left</target>
+
+<source>Right</source>
+<target>Right</target>
+
 <source>Synchronizing folder pair:</source>
 <target>Synchronising folder pair:</target>
 
-<source>Target folder %x already existing.</source>
-<target>Target folder %x already existing.</target>
-
 <source>Generating database...</source>
 <target>Generating database...</target>