5.19

1 files changed, 109 insertions, 55 deletions

diff --git a/BUILD/Languages/english_uk.lng b/BUILD/Languages/english_uk.lng
index d1fcab3d..753ccfd0 100644
--- a/BUILD/Languages/english_uk.lng
+++ b/BUILD/Languages/english_uk.lng
@@ -49,8 +49,14 @@
 <source>An exception occurred</source>
 <target>An exception occurred</target>
 
-<source>Cannot find file %x.</source>
-<target>Cannot find file %x.</target>
+<source>A directory path is expected after %x.</source>
+<target>A directory path is expected after %x.</target>
+
+<source>Syntax error</source>
+<target>Syntax error</target>
+
+<source>Cannot open file %x.</source>
+<target>Cannot open file %x.</target>
 
 <source>Error</source>
 <target>Error</target>
@@ -58,6 +64,36 @@
 <source>File %x does not contain a valid configuration.</source>
 <target>File %x does not contain a valid configuration.</target>
 
+<source>Unequal number of left and right directories specified.</source>
+<target>Unequal number of left and right directories specified.</target>
+
+<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
+<target>The config file must not contain settings at directory pair level when directories are set via command line.</target>
+
+<source>Warning</source>
+<target>Warning</target>
+
+<source>Directories cannot be set for more than one configuration file.</source>
+<target>Directories cannot be set for more than one configuration file.</target>
+
+<source>Syntax:</source>
+<target>Syntax:</target>
+
+<source>config files</source>
+<target>config files</target>
+
+<source>directory</source>
+<target>directory</target>
+
+<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
+<target>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</target>
+
+<source>Any number of alternative directories for at most one config file.</source>
+<target>Any number of alternative directories for at most one config file.</target>
+
+<source>Command line</source>
+<target>Command line</target>
+
 <source>A folder input field is empty.</source>
 <target>A folder input field is empty.</target>
 
@@ -215,12 +251,12 @@
 <target>Total time:</target>
 
 <source>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
 </source>
 <target>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
 </target>
 
 <source>%x MB</source>
@@ -242,12 +278,12 @@
 <target>Scanning:</target>
 
 <source>
-<pluralform>[1 Thread]</pluralform>
-<pluralform>[%x Threads]</pluralform>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
 </source>
 <target>
-<pluralform>[1 Thread]</pluralform>
-<pluralform>[%x Threads]</pluralform>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
 </target>
 
 <source>Encoding extended time information: %x</source>
@@ -256,6 +292,9 @@
 <source>/sec</source>
 <target>/sec</target>
 
+<source>%x items</source>
+<target>%x items</target>
+
 <source>Configuration file %x loaded partially only.</source>
 <target>Configuration file %x loaded partially only.</target>
 
@@ -280,8 +319,8 @@
 <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 is not part of file path %y.</source>
+<target>Volume name %x is not part of file path %y.</target>
 
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Abort requested: Waiting for current operation to finish...</target>
@@ -349,9 +388,6 @@
 <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>
 The command is triggered if:
 - files or subfolders change
@@ -375,9 +411,6 @@ The command is triggered if:
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Automated Synchronisation</target>
 
-<source>Warning</source>
-<target>Warning</target>
-
 <source>Build: %x</source>
 <target>Build: %x</target>
 
@@ -387,15 +420,21 @@ The command is triggered if:
 <source>All files</source>
 <target>All files</target>
 
+<source>Directory monitoring active</source>
+<target>Directory monitoring active</target>
+
+<source>Waiting until all directories are available...</source>
+<target>Waiting until all directories are available...</target>
+
 <source>&Restore</source>
 <target>&Restore</target>
 
+<source>&Show error</source>
+<target>&Show error</target>
+
 <source>&Exit</source>
 <target>&Exit</target>
 
-<source>Waiting for missing directories...</source>
-<target>Waiting for missing directories...</target>
-
 <source>Invalid command line:</source>
 <target>Invalid command line:</target>
 
@@ -405,14 +444,14 @@ The command is triggered if:
 <source>File time and size</source>
 <target>File time and size</target>
 
-<source> Two way </source>
-<target> Two way </target>
+<source>Two way</source>
+<target>Two way</target>
 
 <source>Mirror</source>
-<target>Mirror </target>
+<target>Mirror</target>
 
 <source>Update</source>
-<target>Update </target>
+<target>Update</target>
 
 <source>Custom</source>
 <target>Custom</target>
@@ -468,11 +507,8 @@ The command is triggered if:
 <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>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
+<target>The following folders are significantly different. Make sure you are matching the correct folders for synchronisation.</target>
 
 <source>Not enough free disk space available in:</source>
 <target>Not enough free disk space available in:</target>
@@ -520,7 +556,10 @@ The command is triggered if:
 <target>Press "Switch" to resolve issues in FreeFileSync main dialogue.</target>
 
 <source>Switching to FreeFileSync main dialog</source>
-<target>Switching to FreeFileSync main dialog</target>
+<target>Switching to FreeFileSync main dialogue</target>
+
+<source>Retrying operation after error:</source>
+<target>Retrying operation after error:</target>
 
 <source>A new version of FreeFileSync is available:</source>
 <target>A new version of FreeFileSync is available:</target>
@@ -717,6 +756,9 @@ The command is triggered if:
 <source>Synchronizing...</source>
 <target>Synchronising...</target>
 
+<source>Minimize to notification area</source>
+<target>Minimize to notification area</target>
+
 <source>On completion</source>
 <target>On completion</target>
 
@@ -726,6 +768,15 @@ The command is triggered if:
 <source>&Pause</source>
 <target>&Pause</target>
 
+<source>Variant</source>
+<target>Variant</target>
+
+<source>Statistics</source>
+<target>Statistics</target>
+
+<source>Don't show this dialog again</source>
+<target>Don't show this dialogue again</target>
+
 <source>Select a variant</source>
 <target>Select a variant</target>
 
@@ -933,15 +984,6 @@ Note: File names must be relative to base directories.
 <source>&Default</source>
 <target>&Default</target>
 
-<source>Variant</source>
-<target>Variant</target>
-
-<source>Statistics</source>
-<target>Statistics</target>
-
-<source>Don't show this dialog again</source>
-<target>Don't show this dialogue again</target>
-
 <source>Find what:</source>
 <target>Find what:</target>
 
@@ -951,15 +993,15 @@ Note: File names must be relative to base directories.
 <source>&Find next</source>
 <target>&Find next</target>
 
+<source>Start synchronization</source>
+<target>Start synchronisation</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>
 
@@ -994,6 +1036,24 @@ Note: File names must be relative to base directories.
 <target>Compare both sides</target>
 
 <source>
+<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</target>
+
+<source>Confirm</source>
+<target>Confirm</target>
+
+<source>&Execute</source>
+<target>&Execute</target>
+
+<source>&Don't show this dialog again</source>
+<target>&Don't show this dialogue again</target>
+
+<source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
 </source>
@@ -1134,8 +1194,8 @@ Note: File names must be relative to base directories.
 <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>Comma-separated values</source>
+<target>Comma-separated values</target>
 
 <source>File list exported</source>
 <target>File list exported</target>
@@ -1188,14 +1248,11 @@ Note: File names must be relative to base directories.
 <source>Completed</source>
 <target>Completed</target>
 
-<source>Continue</source>
-<target>Continue</target>
+<source>&Continue</source>
+<target>&Continue</target>
 
-<source>Pause</source>
-<target>Pause</target>
-
-<source>Logging</source>
-<target>Logging</target>
+<source>Log</source>
+<target>Log</target>
 
 <source>Cannot find %x</source>
 <target>Cannot find %x</target>
@@ -1290,9 +1347,6 @@ Note: File names must be relative to base directories.
 <source>Append a timestamp to each file name</source>
 <target>Append a timestamp to each file name</target>
 
-<source>Folder</source>
-<target>Folder</target>
-
 <source>File</source>
 <target>File</target>