3.18

1 files changed, 68 insertions, 68 deletions

diff --git a/BUILD/Languages/english_uk.lng b/BUILD/Languages/english_uk.lng
index c323c26c..c2c776f9 100644
--- a/BUILD/Languages/english_uk.lng
+++ b/BUILD/Languages/english_uk.lng
@@ -17,8 +17,22 @@
 <target>RealtimeSync - Automated Synchronisation</target>
 <source>Browse</source>
 <target>Browse</target>
+<source>Invalid commandline: "%x"</source>
+<target>Invalid commandline: "%x"</target>
 <source>Error resolving symbolic link:</source>
 <target>Error resolving symbolic link:</target>
+<source>Show popup</source>
+<target>Show popup</target>
+<source>Show popup on errors or warnings</source>
+<target>Show popup on errors or warnings</target>
+<source>Ignore errors</source>
+<target>Ignore errors</target>
+<source>Hide all error and warning messages</source>
+<target>Hide all error and warning messages</target>
+<source>Exit instantly</source>
+<target>Exit instantly</target>
+<source>Abort synchronization immediately</source>
+<target>Abort synchronisation immediately</target>
 <source>Select alternate synchronization settings</source>
 <target>Select alternate synchronisation settings</target>
 <source>No filter selected</source>
@@ -121,14 +135,12 @@
 <target>Info</target>
 <source>Fatal Error</source>
 <target>Fatal Error</target>
+<source>Invalid FreeFileSync config file!</source>
+<target>Invalid FreeFileSync config file!</target>
 <source>File does not exist:</source>
 <target>File does not exist:</target>
 <source>Error parsing configuration file:</source>
 <target>Error parsing configuration file:</target>
-<source>Error writing file:</source>
-<target>Error writing file:</target>
-<source>Invalid FreeFileSync config file!</source>
-<target>Invalid FreeFileSync config file!</target>
 <source>/sec</source>
 <target>/sec</target>
 <source>
@@ -217,8 +229,6 @@ The command line is executed each time:
 <target>Monitoring active...</target>
 <source>Waiting for missing directories...</source>
 <target>Waiting for missing directories...</target>
-<source>Command line is empty!</source>
-<target>Command line is empty!</target>
 <source>Could not initialize directory monitoring:</source>
 <target>Could not initialise directory monitoring:</target>
 <source>A directory input field is empty.</source>
@@ -259,12 +269,18 @@ The command line is executed each time:
 <target>Error copying file:</target>
 <source>Error opening file:</source>
 <target>Error opening file:</target>
+<source>Error writing file:</source>
+<target>Error writing file:</target>
 <source>Error reading file:</source>
 <target>Error reading file:</target>
 <source>Endless loop when traversing directory:</source>
 <target>Endless loop when traversing directory:</target>
 <source>Error traversing directory:</source>
 <target>Error traversing directory:</target>
+<source>Windows Error Code %x:</source>
+<target>Windows Error Code %x:</target>
+<source>Linux Error Code %x:</source>
+<target>Linux Error Code %x:</target>
 <source>Error setting privilege:</source>
 <target>Error setting privilege:</target>
 <source>Error moving to Recycle Bin:</source>
@@ -289,18 +305,6 @@ The command line is executed each time:
 <target>%x%</target>
 <source>Could not read values for the following XML nodes:</source>
 <target>Could not read values for the following XML nodes:</target>
-<source>Show popup</source>
-<target>Show popup</target>
-<source>Show popup on errors or warnings</source>
-<target>Show popup on errors or warnings</target>
-<source>Ignore errors</source>
-<target>Ignore errors</target>
-<source>Hide all error and warning messages</source>
-<target>Hide all error and warning messages</target>
-<source>Exit instantly</source>
-<target>Exit instantly</target>
-<source>Abort synchronization immediately</source>
-<target>Abort synchronisation immediately</target>
 <source>Logging</source>
 <target>Logging</target>
 <source>FreeFileSync batch file</source>
@@ -405,8 +409,8 @@ The command line is executed each time:
 <target>Right</target>
 <source>Batch job</source>
 <target>Batch job</target>
-<source>Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.</source>
-<target>Assemble a batch file for automated synchronisation. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.</target>
+<source>Create a batch file for automated synchronization. To start in batch mode simply double-click the file or execute via command line: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.</source>
+<target>Create a batch file for automated synchronisation. To start in batch mode simply double-click the file or execute via command line: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.</target>
 <source>Help</source>
 <target>Help</target>
 <source>Configuration overview:</source>
@@ -473,18 +477,18 @@ The command line is executed each time:
 <target>Category</target>
 <source>Action</source>
 <target>Action</target>
-<source>Files/folders that exist on left side only</source>
-<target>Files/folders that exist on left side only</target>
-<source>Files/folders that exist on right side only</source>
-<target>Files/folders that exist on right side only</target>
-<source>Files that exist on both sides, left one is newer</source>
-<target>Files that exist on both sides, left one is newer</target>
-<source>Files that exist on both sides, right one is newer</source>
-<target>Files that exist on both sides, right one is newer</target>
-<source>Files that have different content</source>
-<target>Files that have different content</target>
-<source>Conflicts/files that cannot be categorized</source>
-<target>Conflicts/files that cannot be categorised</target>
+<source>File/folder exists on left side only</source>
+<target>File/folder exists on left side only</target>
+<source>File/folder exists on right side only</source>
+<target>File/folder exists on right side only</target>
+<source>Left file is newer</source>
+<target>Left file is newer</target>
+<source>Right file is newer</source>
+<target>Right file is newer</target>
+<source>Files have different content</source>
+<target>Files have different content</target>
+<source>Conflict/file cannot be categorized</source>
+<target>Conflict/file cannot be categorised</target>
 <source>Compare by...</source>
 <target>Compare by...</target>
 <source>
@@ -539,8 +543,8 @@ is the same
 <target>- exists left only</target>
 <source>- exists right only</source>
 <target>- exists right only</target>
-<source>- conflict</source>
-<target>- conflict</target>
+<source>- conflict (same date, different size)</source>
+<target>- conflict (same date, different size)</target>
 <source>Compare by "File content"</source>
 <target>Compare by "File content"</target>
 <source>
@@ -707,10 +711,8 @@ Transfer file and directory permissions
 <target><multiple selection></target>
 <source>D-Click</source>
 <target>D-Click</target>
-<source>Copy to clipboard	CTRL+C</source>
-<target>Copy to clipboard	CTRL+C</target>
-<source>Delete files	DEL</source>
-<target>Delete files	DEL</target>
+<source>Delete</source>
+<target>Delete</target>
 <source>Customize...</source>
 <target>Customise...</target>
 <source>Auto-adjust columns</source>
@@ -802,6 +804,8 @@ Transfer file and directory permissions
 <pluralform>%x objects deleted successfully!</pluralform>
 </source>
 <target>
+<pluralform>Object deleted successfully!</pluralform>
+<pluralform>%x objects deleted successfully!</pluralform>
 </target>
 <source>
 <pluralform>1 directory</pluralform>
@@ -851,14 +855,10 @@ Transfer file and directory permissions
 <target>file exists on both sides</target>
 <source>on one side only</source>
 <target>on one side only</target>
-<source>- left</source>
-<target>- left</target>
-<source>- right</source>
-<target>- right</target>
-<source>different</source>
-<target>different</target>
-<source>- conflict (same date, different size)</source>
-<target>- conflict (same date, different size)</target>
+<source>same date</source>
+<target>same date</target>
+<source>different date</source>
+<target>different date</target>
 <source>Inactive</source>
 <target>Inactive</target>
 <source>Second</source>
@@ -969,28 +969,28 @@ Transfer file and directory permissions
 <target>Generating file list...</target>
 <source>Multiple...</source>
 <target>Multiple...</target>
-<source>Files that are equal on both sides</source>
-<target>Files that are equal on both sides</target>
-<source>Equal files/folders that differ in attributes only</source>
-<target>Equal files/folders that differ in attributes only</target>
-<source>Copy from right to left</source>
-<target>Copy from right to left</target>
-<source>Copy from left to right</source>
-<target>Copy from left to right</target>
-<source>Delete files/folders existing on left side only</source>
-<target>Delete files/folders existing on left side only</target>
-<source>Delete files/folders existing on right side only</source>
-<target>Delete files/folders existing on right side only</target>
-<source>Copy from right to left overwriting</source>
-<target>Copy from right to left overwriting</target>
-<source>Copy from left to right overwriting</source>
-<target>Copy from left to right overwriting</target>
+<source>Both sides are equal</source>
+<target>Both sides are equal</target>
+<source>Files/folders differ in attributes only</source>
+<target>Files/folders differ in attributes only</target>
+<source>Copy new file/folder to left</source>
+<target>Copy new file/folder to left</target>
+<source>Copy new file/folder to right</source>
+<target>Copy new file/folder to right</target>
+<source>Delete left file/folder</source>
+<target>Delete left file/folder</target>
+<source>Delete right file/folder</source>
+<target>Delete right file/folder</target>
+<source>Overwrite left file/folder with right one</source>
+<target>Overwrite left file/folder with right one</target>
+<source>Overwrite right file/folder with left one</source>
+<target>Overwrite right file/folder with left one</target>
 <source>Do nothing</source>
 <target>Do nothing</target>
-<source>Copy attributes only from right to left</source>
-<target>Copy attributes only from right to left</target>
-<source>Copy attributes only from left to right</source>
-<target>Copy attributes only from left to right</target>
+<source>Copy file attributes only to left</source>
+<target>Copy file attributes only to left</target>
+<source>Copy file attributes only to right</source>
+<target>Copy file attributes only to right</target>
 <source>Deleting file %x</source>
 <target>Deleting file %x</target>
 <source>Deleting Symbolic Link %x</source>
@@ -1021,6 +1021,8 @@ Transfer file and directory permissions
 <target>Updating attributes of %x</target>
 <source>Source directory does not exist anymore:</source>
 <target>Source directory does not exist anymore:</target>
+<source>Generating database...</source>
+<target>Generating database...</target>
 <source>Nothing to synchronize according to configuration!</source>
 <target>Nothing to synchronise according to configuration!</target>
 <source>Target directory name must not be empty!</source>
@@ -1045,8 +1047,6 @@ Transfer file and directory permissions
 <target>A directory will be modified which is part of multiple folder pairs! Please review synchronisation settings!</target>
 <source>Processing folder pair:</source>
 <target>Processing folder pair:</target>
-<source>Generating database...</source>
-<target>Generating database...</target>
 <source>Error copying locked file %x!</source>
 <target>Error copying locked file %x!</target>
 <source>Data verification error: Source and target file have different content!</source>