3.8

1 files changed, 47 insertions, 23 deletions

diff --git a/BUILD/Languages/english_uk.lng b/BUILD/Languages/english_uk.lng
index af174b6b..b5d0923a 100644
--- a/BUILD/Languages/english_uk.lng
+++ b/BUILD/Languages/english_uk.lng
@@ -6,10 +6,6 @@
  GB
  MB
  MB
- PB
- PB
- TB
- TB
  day(s)
  day(s)
  hour(s)
@@ -22,12 +18,24 @@
  sec
 %x / %y objects deleted successfully
 %x / %y objects deleted successfully
+%x Byte
+%x Byte
+%x GB
+%x GB
+%x MB
+%x MB
+%x PB
+%x PB
+%x TB
+%x TB
 %x directories
 %x directories
-%x files,
-%x files,
+%x files
+%x files
 %x is not a valid FreeFileSync batch file!
 %x is not a valid FreeFileSync batch file!
+%x kB
+%x kB
 %x of %y rows in view
 %x of %y rows in view
 %x of 1 row in view
@@ -90,6 +98,8 @@
 &Switch
 &Yes
 &Yes
+(Build: %x)
+(Build: %x)
 (Note that only FAT/FAT32 drives are affected by this problem!\nIn all other cases you can disable the setting \"ignore 1-hour difference\".)
 (Note that only FAT/FAT32 drives are affected by this problem!\nIn all other cases you can disable the setting \"ignore 1-hour difference\".)
 (Requires an Internet connection!)
@@ -126,8 +136,8 @@
 /sec
 1 directory
 1 directory
-1 file,
-1 file,
+1 file
+1 file
 1. &Compare
 1. &Compare
 1. Enter relative file or directory names separated by ';' or a new line.
@@ -150,6 +160,8 @@
 <Directory>
 <Last session>
 <Last session>
+<Symlink>
+<Symlink>
 <multiple selection>
 <multiple selection>
 A newer version of FreeFileSync is available:
@@ -196,8 +208,6 @@ Browse
 Browse
 Browse directory
 Browse directory
-Build:
-Build:
 Cannot determine sync-direction:
 Cannot determine sync-direction:
 Cannot find %x
@@ -272,10 +282,14 @@ Copy shared or locked files using Volume Shadow Copy Service
 Copy shared or locked files using Volume Shadow Copy Service
 Copy to clipboard\tCTRL+C
 Copy to clipboard\tCTRL+C
+Copying Symbolic Link %x overwriting %y
+Copying Symbolic Link %x overwriting %y
+Copying Symbolic Link %x to %y
+Copying Symbolic Link %x to %y
+Copying file %x overwriting %y
+Copying file %x overwriting %y
 Copying file %x to %y
 Copying file %x to %y
-Copying file %x to %y overwriting target
-Copying file %x to %y overwriting target
 Could not determine volume name for file:
 Could not determine volume name for file:
 Could not initialize directory monitoring:
@@ -320,6 +334,8 @@ Delete or overwrite files permanently
 Delete or overwrite files permanently
 Delete permanently
 Delete permanently
+Deleting Symbolic Link %x
+Deleting Symbolic Link %x
 Deleting file %x
 Deleting file %x
 Deleting folder %x
@@ -328,6 +344,8 @@ Deletion handling
 Deletion handling
 Description
 Description
+Direct
+Direct
 Directories are dependent! Be careful when setting up synchronization rules:
 Directories are dependent! Be careful when setting up synchronisation rules:
 Directories to watch
@@ -340,10 +358,10 @@ Do not show this dialog again
 Do not show this dialogue again
 Do nothing
 Do nothing
-Do you really want to delete the following objects(s)?
-Do you really want to delete the following objects(s)?
-Do you really want to move the following objects(s) to the Recycle Bin?
-Do you really want to move the following objects(s) to the Recycle Bin?
+Do you really want to delete the following object(s)?
+Do you really want to delete the following object(s)?
+Do you really want to move the following object(s) to the Recycle Bin?
+Do you really want to move the following object(s) to the Recycle Bin?
 Do you want FreeFileSync to automatically check for updates every week?
 Do you want FreeFileSync to automatically check for updates every week?
 Donate with PayPal
@@ -484,6 +502,8 @@ Find what:
 Find what:
 Folder Comparison and Synchronization
 Folder Comparison and Synchronisation
+Follow
+Follow
 Free disk space available:
 Free disk space available:
 FreeFileSync Batch Job
@@ -552,6 +572,8 @@ Identify and propagate changes on both sides using a database. Deletions and con
 Identify and propagate changes on both sides using a database. Deletions and conflicts are detected automatically.
 If you like FFS
 If you like FFS
+Ignore
+Ignore
 Ignore 1-hour file time difference
 Ignore 1-hour file time difference
 Ignore errors
@@ -560,8 +582,6 @@ Ignore subsequent errors
 Ignore subsequent errors
 Include
 Include
-Include Symbolic Links
-Include Symbolic Links
 Include all rows
 Include all rows
 Include temporarily
@@ -612,6 +632,8 @@ Move files into a time-stamped subdirectory
 Move files into a time-stamped subdirectory
 Moving %x to Recycle Bin
 Moving %x to Recycle Bin
+Moving Symbolic Link %x to user-defined directory %y
+Moving Symbolic Link %x to user-defined directory %y
 Moving file %x to user-defined directory %y
 Moving file %x to user-defined directory %y
 Moving folder %x to user-defined directory %y
@@ -682,8 +704,6 @@ Remove folder
 Remove folder
 Remove folder pair
 Remove folder pair
-Renaming file %x to %y
-Renaming file %x to %y
 Report translation error
 Report translation error
 Reset
@@ -715,7 +735,7 @@ Select variant:
 Set direction:
 Set direction:
 Setting default synchronization directions: Old files will be overwritten with newer files.
-Setting default synchronization directions: Old files will be overwritten with newer files.
+Setting default synchronisation directions: Old files will be overwritten with newer files.
 Show conflicts
 Show conflicts
 Show files that are different
@@ -776,6 +796,10 @@ Swap sides
 Swap sides
 Switching to FreeFileSync GUI modus...
 Switching to FreeFileSync GUI modus...
+Symbolic Link handling
+Symbolic Link handling
+Symlinks %x have the same date but a different target!
+Symlinks %x have the same date but a different target!
 Synchronization Preview
 Synchronisation Preview
 Synchronization aborted!
@@ -800,8 +824,8 @@ Target directory already existing!
 Target directory already existing!
 Target file already existing!
 Target file already existing!
-The command line is executed each time:\n- a directory becomes available (e.g. USB stick insert)\n- files within these directories or subdirectories are modified
-The command line is executed each time:\n- a directory becomes available (e.g. USB stick insert)\n- files within these directories or subdirectories are modified
+The command line is executed each time:\n- all directories become available (e.g. USB stick insert)\n- files within these directories or subdirectories are modified
+The command line is executed each time:\n- all directories become available (e.g. USB stick insert)\n- files within these directories or subdirectories are modified
 The file does not contain a valid configuration:
 The file does not contain a valid configuration:
 The file was not processed by last synchronization!