5.16

1 files changed, 94 insertions, 106 deletions

diff --git a/BUILD/Languages/english_uk.lng b/BUILD/Languages/english_uk.lng
index 93340c36..43cf6f51 100644
--- a/BUILD/Languages/english_uk.lng
+++ b/BUILD/Languages/english_uk.lng
@@ -115,14 +115,11 @@
 <source>Cannot resolve symbolic link %x.</source>
 <target>Cannot resolve symbolic link %x.</target>
 
-<source>%x MB</source>
-<target>%x MB</target>
-
-<source>%x KB</source>
-<target>%x KB</target>
+<source>Cannot determine final path for %x.</source>
+<target>Cannot determine final path for %x.</target>
 
-<source>%x GB</source>
-<target>%x GB</target>
+<source>Cannot find system function %x.</source>
+<target>Cannot find system function %x.</target>
 
 <source>
 <pluralform>1 Byte</pluralform>
@@ -133,6 +130,15 @@
 <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>Database file %x is incompatible.</source>
 <target>Database file %x is incompatible.</target>
 
@@ -169,9 +175,6 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Waiting while directory is locked (%x)...</target>
 
-<source>Creating file %x</source>
-<target>Creating file %x</target>
-
 <source>
 <pluralform>1 sec</pluralform>
 <pluralform>%x sec</pluralform>
@@ -181,15 +184,15 @@
 <pluralform>%x sec</pluralform>
 </target>
 
+<source>Creating file %x</source>
+<target>Creating file %x</target>
+
 <source>Error parsing file %x, row %y, column %z.</source>
 <target>Error parsing file %x, row %y, column %z.</target>
 
 <source>Scanning:</source>
 <target>Scanning:</target>
 
-<source>Encoding extended time information: %x</source>
-<target>Encoding extended time information: %x</target>
-
 <source>
 <pluralform>[1 Thread]</pluralform>
 <pluralform>[%x Threads]</pluralform>
@@ -199,6 +202,9 @@
 <pluralform>[%x Threads]</pluralform>
 </target>
 
+<source>Encoding extended time information: %x</source>
+<target>Encoding extended time information: %x</target>
+
 <source>/sec</source>
 <target>/sec</target>
 
@@ -411,12 +417,12 @@ The command is triggered if:
 <source>Date:</source>
 <target>Date:</target>
 
-<source>Action</source>
-<target>Action</target>
-
 <source>Category</source>
 <target>Category</target>
 
+<source>Action</source>
+<target>Action</target>
+
 <source>Drag && drop</source>
 <target>Drag && drop</target>
 
@@ -792,12 +798,6 @@ Note: File names must be relative to base directories!
 <source>&Find next</source>
 <target>&Find next</target>
 
-<source>Operation aborted!</source>
-<target>Operation aborted!</target>
-
-<source>Main bar</source>
-<target>Main bar</target>
-
 <source>Folder pairs</source>
 <target>Folder pairs</target>
 
@@ -807,6 +807,9 @@ Note: File names must be relative to base directories!
 <source>Configuration</source>
 <target>Configuration</target>
 
+<source>Main bar</source>
+<target>Main bar</target>
+
 <source>Filter files</source>
 <target>Filter files</target>
 
@@ -822,6 +825,33 @@ Note: File names must be relative to base directories!
 <source>Compare both sides</source>
 <target>Compare both sides</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</target>
+
+<source>
+<pluralform>%y of 1 row in view</pluralform>
+<pluralform>%y of %x rows in view</pluralform>
+</source>
+<target>
+<pluralform>%y of 1 row in view</pluralform>
+<pluralform>%y of %x rows in view</pluralform>
+</target>
+
 <source>Set direction:</source>
 <target>Set direction:</target>
 
@@ -936,48 +966,21 @@ 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>All folders are in sync!</source>
 <target>All folders are in sync!</target>
 
 <source>Comma separated list</source>
 <target>Comma separated list</target>
 
-<source>Legend</source>
-<target>Legend</target>
-
 <source>File list exported!</source>
 <target>File list exported!</target>
 
 <source>Searching for program updates...</source>
 <target>Searching for program updates...</target>
 
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</target>
-
-<source>
-<pluralform>%x of 1 row in view</pluralform>
-<pluralform>%x of %y rows in view</pluralform>
-</source>
-<target>
-<pluralform>%x of 1 row in view</pluralform>
-<pluralform>%x of %y rows in view</pluralform>
-</target>
-
 <source>Ignore further errors</source>
 <target>Ignore further errors</target>
 
@@ -1059,6 +1062,24 @@ Note: File names must be relative to base directories!
 <source>Filter</source>
 <target>Filter</target>
 
+<source>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+</source>
+<target>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+</target>
+
+<source>
+<pluralform>Do you really want to delete the following item?</pluralform>
+<pluralform>Do you really want to delete the following %x items?</pluralform>
+</source>
+<target>
+<pluralform>Do you really want to delete the following item?</pluralform>
+<pluralform>Do you really want to delete the following %x items?</pluralform>
+</target>
+
 <source>Direct</source>
 <target>Direct</target>
 
@@ -1086,39 +1107,21 @@ Note: File names must be relative to base directories!
 <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 item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
-</source>
-<target>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
-</target>
-
-<source>
-<pluralform>Do you really want to delete the following item?</pluralform>
-<pluralform>Do you really want to delete the following %x items?</pluralform>
-</source>
-<target>
-<pluralform>Do you really want to delete the following item?</pluralform>
-<pluralform>Do you really want to delete the following %x items?</pluralform>
-</target>
-
 <source>Leave as unresolved conflict</source>
 <target>Leave as unresolved conflict</target>
 
-<source>Time stamp</source>
-<target>Time stamp</target>
-
-<source>Append a timestamp to each file name</source>
-<target>Append a timestamp to each file name</target>
-
 <source>Replace</source>
 <target>Replace</target>
 
 <source>Move files and replace if existing</source>
 <target>Move files and replace if existing</target>
 
+<source>Time stamp</source>
+<target>Time stamp</target>
+
+<source>Append a timestamp to each file name</source>
+<target>Append a timestamp to each file name</target>
+
 <source>Folder</source>
 <target>Folder</target>
 
@@ -1131,6 +1134,9 @@ Note: File names must be relative to base directories!
 <source>Files</source>
 <target>Files</target>
 
+<source>Items</source>
+<target>Items</target>
+
 <source>Percentage</source>
 <target>Percentage</target>
 
@@ -1158,9 +1164,6 @@ Note: File names must be relative to base directories!
 <source>Cannot write modification time of %x.</source>
 <target>Cannot write modification time of %x.</target>
 
-<source>Cannot find system function %x.</source>
-<target>Cannot find system function %x.</target>
-
 <source>Cannot read security context of %x.</source>
 <target>Cannot read security context of %x.</target>
 
@@ -1176,8 +1179,8 @@ Note: File names must be relative to base directories!
 <source>Cannot create directory %x.</source>
 <target>Cannot create directory %x.</target>
 
-<source>Cannot copy symbolic link %x to %y.</source>
-<target>Cannot copy symbolic link %x to %y.</target>
+<source>Cannot create symbolic link %x.</source>
+<target>Cannot create symbolic link %x.</target>
 
 <source>Cannot copy file %x to %y.</source>
 <target>Cannot copy file %x to %y.</target>
@@ -1191,18 +1194,12 @@ Note: File names must be relative to base directories!
 <source>Cannot enumerate directory %x.</source>
 <target>Cannot enumerate directory %x.</target>
 
-<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>
@@ -1287,18 +1284,12 @@ Note: File names must be relative to base directories!
 <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.</source>
-<target>You can ignore this error to consider each folder as empty.</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>Start comparison</source>
-<target>Start comparison</target>
-
-<source>Calculating sync directions...</source>
-<target>Calculating sync directions...</target>
-
 <source>Conflict detected:</source>
 <target>Conflict detected:</target>
 
@@ -1311,18 +1302,21 @@ Note: File names must be relative to base directories!
 <source>Items differ in attributes only</source>
 <target>Items differ in attributes only</target>
 
-<source>Symbolic links %x have the same date but a different target.</source>
-<target>Symbolic links %x have the same date but a different target.</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>Comparing files by content failed.</source>
-<target>Comparing files by content failed.</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>
 
@@ -1428,12 +1422,6 @@ 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>