5.5

1 files changed, 99 insertions, 93 deletions

diff --git a/BUILD/Languages/english_uk.lng b/BUILD/Languages/english_uk.lng
index 751cf0be..bd0cd650 100644
--- a/BUILD/Languages/english_uk.lng
+++ b/BUILD/Languages/english_uk.lng
@@ -58,12 +58,6 @@
 <source>About</source>
 <target>About</target>
 
-<source>Warning</source>
-<target>Warning</target>
-
-<source>Question</source>
-<target>Question</target>
-
 <source>Confirm</source>
 <target>Confirm</target>
 
@@ -109,6 +103,9 @@
 <source>Info</source>
 <target>Info</target>
 
+<source>Warning</source>
+<target>Warning</target>
+
 <source>Fatal Error</source>
 <target>Fatal Error</target>
 
@@ -139,12 +136,6 @@
 <pluralform>%x Bytes</pluralform>
 </target>
 
-<source>Cannot read file %x.</source>
-<target>Cannot read file %x.</target>
-
-<source>Cannot write file %x.</source>
-<target>Cannot write file %x.</target>
-
 <source>Database file %x is incompatible.</source>
 <target>Database file %x is incompatible.</target>
 
@@ -154,9 +145,18 @@
 <source>Database file %x does not yet exist.</source>
 <target>Database file %x does not yet exist.</target>
 
+<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>
+
+<source>Cannot read file %x.</source>
+<target>Cannot read file %x.</target>
+
 <source>Database files do not share a common session.</source>
 <target>Database files do not share a common session.</target>
 
@@ -205,6 +205,9 @@
 <source>/sec</source>
 <target>/sec</target>
 
+<source>Cannot find file %x.</source>
+<target>Cannot find file %x.</target>
+
 <source>File %x does not contain a valid configuration.</source>
 <target>File %x does not contain a valid configuration.</target>
 
@@ -226,17 +229,14 @@
 <source>Volume name %x not part of file name %y!</source>
 <target>Volume name %x not part of file name %y!</target>
 
-<source>Cannot find file %x.</source>
-<target>Cannot find file %x.</target>
-
 <source>Cannot read the following XML elements:</source>
 <target>Cannot read the following XML elements:</target>
 
 <source>&Open...</source>
 <target>&Open...</target>
 
-<source>&Save...</source>
-<target>&Save...</target>
+<source>Save &As...</source>
+<target>Save &As...</target>
 
 <source>&Quit</source>
 <target>&Quit</target>
@@ -312,8 +312,8 @@ The command is triggered if:
 <source>(Build: %x)</source>
 <target>(Build: %x)</target>
 
-<source>RealtimeSync configuration</source>
-<target>RealtimeSync configuration</target>
+<source>All files</source>
+<target>All files</target>
 
 <source>&Restore</source>
 <target>&Restore</target>
@@ -327,8 +327,8 @@ The command is triggered if:
 <source>Waiting for missing directories...</source>
 <target>Waiting for missing directories...</target>
 
-<source>An input folder name is empty.</source>
-<target>An input folder name is empty.</target>
+<source>A folder input field is empty.</source>
+<target>A folder input field is empty.</target>
 
 <source>Logging</source>
 <target>Logging</target>
@@ -351,11 +351,8 @@ The command is triggered if:
 <source>Custom</source>
 <target>Custom</target>
 
-<source>FreeFileSync batch file</source>
-<target>FreeFileSync batch file</target>
-
-<source>FreeFileSync configuration</source>
-<target>FreeFileSync configuration</target>
+<source>FreeFileSync batch</source>
+<target>FreeFileSync batch</target>
 
 <source>Batch execution</source>
 <target>Batch execution</target>
@@ -393,18 +390,18 @@ The command is triggered if:
 <source>Unable to connect to sourceforge.net!</source>
 <target>Unable to connect to sourceforge.net!</target>
 
-<source>A newer version of FreeFileSync is available:</source>
-<target>A newer version of FreeFileSync is available:</target>
+<source>A new version of FreeFileSync is available:</source>
+<target>A new version of FreeFileSync is available:</target>
 
 <source>Download now?</source>
 <target>Download now?</target>
 
-<source>Information</source>
-<target>Information</target>
-
 <source>FreeFileSync is up to date!</source>
 <target>FreeFileSync is up to date!</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>
 
@@ -438,6 +435,12 @@ The command is triggered if:
 <source>Extension</source>
 <target>Extension</target>
 
+<source>Size:</source>
+<target>Size:</target>
+
+<source>Date:</source>
+<target>Date:</target>
+
 <source>Action</source>
 <target>Action</target>
 
@@ -471,6 +474,9 @@ The command is triggered if:
 <source>&New</source>
 <target>&New</target>
 
+<source>&Save</source>
+<target>&Save</target>
+
 <source>&Language</source>
 <target>&Language</target>
 
@@ -537,11 +543,8 @@ The command is triggered if:
 <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>
-
-<source>Operation:</source>
-<target>Operation:</target>
+<source>Total bytes to copy</source>
+<target>Total bytes to copy</target>
 
 <source>Items found:</source>
 <target>Elements found:</target>
@@ -549,11 +552,11 @@ The command is triggered if:
 <source>Speed:</source>
 <target>Speed:</target>
 
-<source>Remaining time:</source>
-<target>Remaining time:</target>
+<source>Time remaining:</source>
+<target>Time remaining:</target>
 
-<source>Elapsed time:</source>
-<target>Elapsed time:</target>
+<source>Time elapsed:</source>
+<target>Time elapsed:</target>
 
 <source>Batch job</source>
 <target>Batch job</target>
@@ -675,6 +678,15 @@ is the same
 <source>Source code written in C++ utilizing:</source>
 <target>Source code written in C++ utilising:</target>
 
+<source>If you like FreeFileSync</source>
+<target>If you like FreeFileSync</target>
+
+<source>Donate with PayPal</source>
+<target>Donate with PayPal</target>
+
+<source>Big thanks for localizing FreeFileSync goes out to:</source>
+<target>Big thanks for localising FreeFileSync goes out to:</target>
+
 <source>Feedback and suggestions are welcome</source>
 <target>Feedback and suggestions are welcome</target>
 
@@ -687,39 +699,9 @@ is the same
 <source>Email</source>
 <target>E-mail</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Big thanks for localising FreeFileSync goes out to:</target>
-
-<source>If you like FreeFileSync</source>
-<target>If you like FreeFileSync</target>
-
-<source>Donate with PayPal</source>
-<target>Donate with PayPal</target>
-
 <source>Published under the GNU General Public License</source>
 <target>Published under the GNU General Public Licence</target>
 
-<source>Ignore further errors</source>
-<target>Ignore further errors</target>
-
-<source>Hide further error messages during the current process</source>
-<target>Hide further error messages during the current process</target>
-
-<source>&Ignore</source>
-<target>&Ignore</target>
-
-<source>Do not show this dialog again</source>
-<target>Do not show this dialogue again</target>
-
-<source>&Switch</source>
-<target>&Switch</target>
-
-<source>&Yes</source>
-<target>&Yes</target>
-
-<source>&No</source>
-<target>&No</target>
-
 <source>Use Recycle Bin</source>
 <target>Use Recycle Bin</target>
 
@@ -792,6 +774,9 @@ Note: File names must be relative to base directories!
 <source>Statistics</source>
 <target>Statistics</target>
 
+<source>Do not show this dialog again</source>
+<target>Do not show this dialogue again</target>
+
 <source>Find what:</source>
 <target>Find what:</target>
 
@@ -870,8 +855,14 @@ Note: File names must be relative to base directories!
 <source>Never save changes</source>
 <target>Never save changes</target>
 
-<source>Save changes to current configuration?</source>
-<target>Save changes to current configuration?</target>
+<source>Do you want to save changes to %x?</source>
+<target>Do you want to save changes to %x?</target>
+
+<source>Save</source>
+<target>Save</target>
+
+<source>Don't Save</source>
+<target>Don't Save</target>
 
 <source>Configuration loaded!</source>
 <target>Configuration loaded!</target>
@@ -966,9 +957,6 @@ Note: File names must be relative to base directories!
 <source>All directories in sync!</source>
 <target>All directories in sync!</target>
 
-<source>Please run a Compare first before synchronizing!</source>
-<target>Please run a Compare first before synchronising!</target>
-
 <source>Comma separated list</source>
 <target>Comma separated list</target>
 
@@ -1014,6 +1002,24 @@ Note: File names must be relative to base directories!
 <pluralform>%x of %y rows in view</pluralform>
 </target>
 
+<source>Ignore further errors</source>
+<target>Ignore further errors</target>
+
+<source>&Ignore</source>
+<target>&Ignore</target>
+
+<source>&Switch</source>
+<target>&Switch</target>
+
+<source>Question</source>
+<target>Question</target>
+
+<source>&Yes</source>
+<target>&Yes</target>
+
+<source>&No</source>
+<target>&No</target>
+
 <source>Scanning...</source>
 <target>Scanning...</target>
 
@@ -1194,6 +1200,9 @@ Note: File names must be relative to base directories!
 <source>Cannot delete directory %x.</source>
 <target>Cannot delete directory %x.</target>
 
+<source>Cannot write file attributes of %x.</source>
+<target>Cannot write file attributes of %x.</target>
+
 <source>Cannot write modification time of %x.</source>
 <target>Cannot write modification time of %x.</target>
 
@@ -1218,9 +1227,6 @@ Note: File names must be relative to base directories!
 <source>Cannot copy symbolic link %x to %y.</source>
 <target>Cannot copy symbolic link %x to %y.</target>
 
-<source>Cannot write file attributes of %x.</source>
-<target>Cannot write file attributes of %x.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>Cannot copy file %x to %y.</target>
 
@@ -1245,11 +1251,8 @@ Note: File names must be relative to base directories!
 <source>No change since last synchronization!</source>
 <target>No change since last synchronisation!</target>
 
-<source>Filter settings have changed!</source>
-<target>Filter settings have changed!</target>
-
-<source>The file was not processed by last synchronization!</source>
-<target>The file was not processed by 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>
@@ -1377,14 +1380,14 @@ Note: File names must be relative to base directories!
 <source>Updating attributes of %x</source>
 <target>Updating attributes of %x</target>
 
-<source>Target folder name must not be empty.</source>
-<target>Target folder name must not be empty.</target>
+<source>Target folder input field must not be empty.</source>
+<target>Target folder input field must not be empty.</target>
 
-<source>Folder name for file versioning must not be empty.</source>
-<target>Folder name for file versioning 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 directory %x not found.</source>
-<target>Source directory %x not found.</target>
+<source>Source folder %x not found.</source>
+<target>Source folder %x not found.</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>Unresolved conflicts existing!</target>
@@ -1401,11 +1404,11 @@ Note: File names must be relative to base directories!
 <source>Not enough free disk space available in:</source>
 <target>Not enough free disk space available in:</target>
 
-<source>Free disk space required:</source>
-<target>Free disk space required:</target>
+<source>Required:</source>
+<target>Required:</target>
 
-<source>Free disk space available:</source>
-<target>Free disk space available:</target>
+<source>Available:</source>
+<target>Available:</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>
@@ -1416,6 +1419,9 @@ Note: File names must be relative to base directories!
 <source>Processing folder pair:</source>
 <target>Processing 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>