3.5

3 files changed, 951 insertions, 71 deletions

diff --git a/BUILD/Languages/english_uk.lng b/BUILD/Languages/english_uk.lng
new file mode 100644
index 00000000..ff59c909
--- /dev/null
+++ b/BUILD/Languages/english_uk.lng
@@ -0,0 +1,888 @@
+  MinGW \t- Windows port of GNU Compiler Collection\n  wxWidgets \t- Open-Source GUI framework\n  wxFormBuilder\t- wxWidgets GUI-builder\n  CodeBlocks \t- Open-Source IDE
+  MinGW \t- Windows port of GNU Compiler Collection\n  wxWidgets \t- Open-Source GUI framework\n  wxFormBuilder\t- wxWidgets GUI-builder\n  CodeBlocks \t- Open-Source IDE
+ Byte
+ Byte
+ GB
+ GB
+ MB
+ MB
+ PB
+ PB
+ TB
+ TB
+ day(s)
+ day(s)
+ hour(s)
+ hour(s)
+ kB
+ kB
+ min
+ min
+ sec
+ sec
+%x / %y objects deleted successfully
+%x / %y objects deleted successfully
+%x Percent
+%x Percent
+%x directories
+%x directories
+%x files,
+%x files,
+%x is not a valid FreeFileSync batch file!
+%x is not a valid FreeFileSync batch file!
+%x of %y rows in view
+%x of %y rows in view
+%x of 1 row in view
+%x of 1 row in view
+&Abort
+&Abort
+&About...
+&About...
+&Advanced
+&Advanced
+&Cancel
+&Cancel
+&Check for new version
+&Check for new version
+&Content
+&Content
+&Create batch job...
+&Create batch job...
+&Default
+&Default
+&Exit
+&Exit
+&Export file list...
+&Export file list...
+&File
+&File
+&Find next
+&Find next
+&Global settings...
+&Global settings...
+&Help
+&Help
+&Ignore
+&Ignore
+&Language
+&Language
+&Load
+&Load
+&Load configuration...
+&Load configuration...
+&New
+&New
+&No
+&No
+&OK
+&OK
+&Pause
+&Pause
+&Quit
+&Quit
+&Restore
+&Restore
+&Retry
+&Retry
+&Save
+&Save
+&Yes
+&Yes
+(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!)
+(Requires an Internet connection!)
+,
+,
+- Other side's counterpart to %dir
+- Other side's counterpart to %dir
+- Other side's counterpart to %name
+- Other side's counterpart to %name
+- conflict
+- conflict
+- conflict (same date, different size)
+- conflict (same date, different size)
+- different
+- different
+- directory part only
+- directory part only
+- equal
+- equal
+- exists left only
+- exists left only
+- exists right only
+- exists right only
+- full file or directory name
+- full file or directory name
+- left
+- left
+- left newer
+- left newer
+- right
+- right
+- right newer
+- right newer
+-Open-Source file synchronization-
+-Open-Source file synchronisation-
+.
+.
+/sec
+/sec
+1 directory
+1 directory
+1 file,
+1 file,
+1. &Compare
+1. &Compare
+1. Enter relative file or directory names separated by ';' or a new line.
+1. Enter relative file or directory names separated by ';' or a new line.
+1. Select directories to monitor.
+1. Select directories to monitor.
+2. &Synchronize...
+2. &Synchronise...
+2. Enter a command line.
+2. Enter a command line.
+2. Use wildcard characters '*' and '?'.
+2. Use wildcard characters '*' and '?'.
+3. Exclude files directly on main grid via context menu.
+3. Exclude files directly on main grid via context menu.
+3. Press 'Start'.
+3. Press 'Start'.
+<Automatic>
+<Automatic>
+<Directory>
+<Directory>
+<Last session>
+<Last session>
+<multiple selection>
+<multiple selection>
+A newer version of FreeFileSync is available:
+A newer version of FreeFileSync is available:
+Abort requested: Waiting for current operation to finish...
+Abort requested: Waiting for current operation to finish...
+Abort synchronization immediately
+Abort synchronisation immediately
+Aborted
+Aborted
+About
+About
+Action
+Action
+Activate filter
+Activate filter
+Add folder
+Add folder
+Add folder pair
+Add folder pair
+All directories in sync!
+All directories in sync!
+An exception occured!
+An exception occured!
+As a result the files are separated into the following categories:
+As a result the files are separated into the following categories:
+As the name suggests, two files which share the same name are marked as equal if and only if they have the same content. This option is useful for consistency checks rather than backup operations. Therefore the file times are not taken into account at all.\n\nWith this option enabled the decision tree is smaller:
+As the name suggests, two files which share the same name are marked as equal if and only if they have the same content. This option is useful for consistency checks rather than backup operations. Therefore the file times are not taken into account at all.\n\nWith this option enabled the decision tree is smaller:
+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.
+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.
+At least one directory input field is empty.
+At least one directory input field is empty.
+Auto-adjust columns
+Auto-adjust columns
+Automatic mode
+Automatic mode
+Batch execution
+Batch execution
+Batch file created successfully!
+Batch file created successfully!
+Batch job
+Batch job
+Big thanks for localizing FreeFileSync goes out to:
+Big thanks for localising FreeFileSync goes out to:
+Both sides have changed since last synchronization!
+Both sides have changed since last synchronisation!
+Browse
+Browse
+Build:
+Build:
+Cannot determine sync-direction:
+Cannot determine sync-direction:
+Cannot find %x
+Cannot find %x
+Category
+Category
+Comma separated list
+Comma separated list
+Command line
+Command line
+Command line is empty!
+Command line is empty!
+Compare
+Compare
+Compare both sides
+Compare both sides
+Compare by \"File content\"
+Compare by \"File content\"
+Compare by \"File size and date\"
+Compare by \"File size and date\"
+Compare by...
+Compare by...
+Comparing content
+Comparing content
+Comparing content of files %x
+Comparing content of files %x
+Comparing content...
+Comparing content...
+Comparing files by content failed.
+Comparing files by content failed.
+Comparison Result
+Comparison Result
+Comparison settings
+Comparison settings
+Completed
+Completed
+Configuration
+Configuration
+Configuration loaded!
+Configuration loaded!
+Configuration overview:
+Configuration overview:
+Configuration saved!
+Configuration saved!
+Configure filter
+Configure filter
+Configure your own synchronization rules.
+Configure your own synchronisation rules.
+Confirm
+Confirm
+Conflict detected:
+Conflict detected:
+Conflicts/files that cannot be categorized
+Conflicts/files that cannot be categorised
+Continue
+Continue
+Conversion error:
+Conversion error:
+Copy from left to right
+Copy from left to right
+Copy from left to right overwriting
+Copy from left to right overwriting
+Copy from right to left
+Copy from right to left
+Copy from right to left overwriting
+Copy from right to left overwriting
+Copy locked files
+Copy locked files
+Copy new or updated files to right folder.
+Copy new or updated files to right folder.
+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 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:
+Could not initialise directory monitoring:
+Could not load a required DLL:
+Could not load a required DLL:
+Could not read values for the following XML nodes:
+Could not read values for the following XML nodes:
+Create a batch job
+Create a batch job
+Creating folder %x
+Creating folder %x
+Current operation:
+Current operation:
+Custom
+Custom
+Customize columns
+Customise columns
+Customize...
+Customise...
+D-Click
+D-Click
+DECISION TREE
+DECISION TREE
+Data remaining:
+Data remaining:
+Data transferred:
+Data transferred:
+Data verification error: Source and target file have different content!
+Data verification error: Source and target file have different content!
+Date
+Date
+Delay
+Delay
+Delay between detection of changes and execution of command line in seconds
+Delay between detection of changes and execution of command line in seconds
+Delete files/folders existing on left side only
+Delete files/folders existing on left side only
+Delete files/folders existing on right side only
+Delete files/folders existing on right side only
+Delete files\tDEL
+Delete files\tDEL
+Delete on both sides
+Delete on both sides
+Delete on both sides even if the file is selected on one side only
+Delete on both sides even if the file is selected on one side only
+Delete or overwrite files permanently
+Delete or overwrite files permanently
+Delete permanently
+Delete permanently
+Deleting file %x
+Deleting file %x
+Deleting folder %x
+Deleting folder %x
+Deletion handling
+Deletion handling
+Description
+Description
+Directories are dependent! Be careful when setting up synchronization rules:
+Directories are dependent! Be careful when setting up synchronisation rules:
+Directories to watch
+Directories to watch
+Directory
+Directory
+Directory does not exist:
+Directory does not exist:
+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 want FreeFileSync to automatically check for updates every week?
+Do you want FreeFileSync to automatically check for updates every week?
+Donate with PayPal
+Donate with PayPal
+Download now?
+Download now?
+Drag && drop
+Drag && drop
+Email
+E-mail
+Enable filter to exclude files from synchronization
+Enable filter to exclude files from synchronisation
+Endless loop when traversing directory:
+Endless loop when traversing directory:
+Error
+Error
+Error changing modification time:
+Error changing modification time:
+Error copying file:
+Error copying file:
+Error copying locked file %x!
+Error copying locked file %x!
+Error copying symbolic link:
+Error copying symbolic link:
+Error creating directory:
+Error creating directory:
+Error deleting directory:
+Error deleting directory:
+Error deleting file:
+Error deleting file:
+Error handling
+Error handling
+Error loading library function:
+Error loading library function:
+Error moving directory:
+Error moving directory:
+Error moving file:
+Error moving file:
+Error moving to Recycle Bin:
+Error moving to Recycle Bin:
+Error opening file:
+Error opening file:
+Error parsing configuration file:
+Error parsing configuration file:
+Error reading file attributes:
+Error reading file attributes:
+Error reading file:
+Error reading file:
+Error reading from synchronization database:
+Error reading from synchronisation database:
+Error resolving symbolic link:
+Error resolving symbolic link:
+Error starting Volume Shadow Copy Service!
+Error starting Volume Shadow Copy Service!
+Error traversing directory:
+Error traversing directory:
+Error when monitoring directories.
+Error when monitoring directories.
+Error writing file attributes:
+Error writing file attributes:
+Error writing file:
+Error writing file:
+Error writing to synchronization database:
+Error writing to synchronisation database:
+Example
+Example
+Exclude
+Exclude
+Exclude all rows
+Exclude all rows
+Exclude temporarily
+Exclude temporarily
+Exclude via filter:
+Exclude via filter:
+Exit instantly
+Exit instantly
+Extension
+Extension
+External applications
+External applications
+Fatal Error
+Fatal Error
+Feedback and suggestions are welcome at:
+Feedback and suggestions are welcome at:
+File %x has an invalid date!
+File %x has an invalid date!
+File already exists. Overwrite?
+File already exists. Overwrite?
+File content
+File content
+File does not exist:
+File does not exist:
+File list exported!
+File list exported!
+File size and date
+File size and date
+Filename
+Filename
+Files %x have a file time difference of less than 1 hour!\n\nIt's not safe to decide which one is newer due to Daylight Saving Time issues.
+Files %x have a file time difference of less than 1 hour!\n\nIt's not safe to decide which one is newer due to Daylight Saving Time issues.
+Files %x have the same date but a different size!
+Files %x have the same date but a different size!
+Files are found equal if\n     - file content\nis the same
+Files are found equal if\n     - file content\nis the same
+Files are found equal if\n     - filesize\n     - last write time and date\nare the same
+Files are found equal if\n     - filesize\n     - last write time and date\nare the same
+Files remaining:
+Files remaining:
+Files that are equal on both sides
+Files that are equal on both sides
+Files that exist on both sides and have different content
+Files that exist on both sides and have different content
+Files that exist on both sides, left one is newer
+Files that exist on both sides, left one is newer
+Files that exist on both sides, right one is newer
+Files that exist on both sides, right one is newer
+Files/folders found:
+Files/folders found:
+Files/folders processed:
+Files/folders processed:
+Files/folders remaining:
+Files/folders remaining:
+Files/folders that exist on left side only
+Files/folders that exist on left side only
+Files/folders that exist on right side only
+Files/folders that exist on right side only
+Filter
+Filter
+Filter files
+Filter files
+Filter has been selected
+Filter has been selected
+Filter settings have changed!
+Filter settings have changed!
+Filter view
+Filter view
+Filtering is deactivated
+Filtering is deactivated
+Find
+Find
+Find what:
+Find what:
+Folder Comparison and Synchronization
+Folder Comparison and Synchronisation
+Free disk space available:
+Free disk space available:
+FreeFileSync - Folder Comparison and Synchronization
+FreeFileSync - Folder Comparison and Synchronisation
+FreeFileSync Batch Job
+FreeFileSync Batch Job
+FreeFileSync at Sourceforge
+FreeFileSync at Sourceforge
+FreeFileSync batch file
+FreeFileSync batch file
+FreeFileSync configuration
+FreeFileSync configuration
+FreeFileSync is up to date!
+FreeFileSync is up to date!
+Full path
+Full path
+Generating database...
+Generating database...
+Generating file list...
+Generating file list...
+Global filter
+Global filter
+Global settings
+Global settings
+Help
+Help
+Hidden dialogs:
+Hidden dialogues:
+Hide all error and warning messages
+Hide all error and warning messages
+Hide conflicts
+Hide conflicts
+Hide excluded items
+Hide excluded items
+Hide files that are different
+Hide files that are different
+Hide files that are equal
+Hide files that are equal
+Hide files that are newer on left
+Hide files that are newer on left
+Hide files that are newer on right
+Hide files that are newer on right
+Hide files that exist on left side only
+Hide files that exist on left side only
+Hide files that exist on right side only
+Hide files that exist on right side only
+Hide files that will be created on the left side
+Hide files that will be created on the left side
+Hide files that will be created on the right side
+Hide files that will be created on the right side
+Hide files that will be deleted on the left side
+Hide files that will be deleted on the left side
+Hide files that will be deleted on the right side
+Hide files that will be deleted on the right side
+Hide files that will be overwritten on left side
+Hide files that will be overwritten on left side
+Hide files that will be overwritten on right side
+Hide files that will be overwritten on right side
+Hide files that won't be copied
+Hide files that won't be copied
+Hide filtered or temporarily excluded files
+Hide filtered or temporarily excluded files
+Hide further error messages during the current process
+Hide further error messages during the current process
+Hints:
+Hints:
+Homepage
+Homepage
+Identify and propagate changes on both sides using a database. Deletions and conflicts are detected automatically.
+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 1-hour file time difference
+Ignore 1-hour file time difference
+Ignore errors
+Ignore errors
+Ignore subsequent errors
+Ignore subsequent errors
+Ignore this error, retry or abort synchronization?
+Ignore this error, retry or abort synchronisation?
+Ignore this error, retry or abort?
+Ignore this error, retry or abort?
+Include
+Include
+Include all rows
+Include all rows
+Include temporarily
+Include temporarily
+Include: *.doc;*.zip;*.exe\nExclude: \\stuff\\temp\\*
+Include: *.doc;*.zip;*.exe\nExclude: \\stuff\\temp\\*
+Incompatible synchronization database format:
+Incompatible synchronisation database format:
+Info
+Info
+Information
+Information
+Initial synchronization:
+Initial synchronisation:
+Integrate external applications into context menu. The following macros are available:
+Integrate external applications into context menu. The following macros are available:
+Last synchronization not completed!
+Last synchronisation not completed!
+Leave as unresolved conflict
+Leave as unresolved conflict
+Left
+Left
+Legend
+Legend
+Load configuration from file
+Load configuration from file
+Load configuration history (press DEL to delete items)
+Load configuration history (press DEL to delete items)
+Local filter
+Local filter
+Log-messages:
+Log-messages:
+Logging
+Logging
+Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.
+Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.
+Match case
+Match case
+Mirror ->>
+Mirror ->>
+Mirror backup of left folder: Right folder will be overwritten and exactly match left folder after synchronization.
+Mirror backup of left folder: Right folder will be overwritten and exactly match left folder after synchronisation.
+Monitoring active...
+Monitoring active...
+More than 50% of the total number of files will be copied or deleted!
+More than 50% of the total number of files will be copied or deleted!
+Move column down
+Move column down
+Move column up
+Move column up
+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 file %x to user-defined directory %y
+Moving file %x to user-defined directory %y
+Moving folder %x to user-defined directory %y
+Moving folder %x to user-defined directory %y
+Multiple...
+Multiple...
+No change since last synchronization!
+No change since last synchronisation!
+No filter selected
+No filter selected
+Not enough free disk space available in:
+Not enough free disk space available in:
+Nothing to synchronize according to configuration!
+Nothing to synchronise according to configuration!
+Number of files and directories that will be created
+Number of files and directories that will be created
+Number of files and directories that will be deleted
+Number of files and directories that will be deleted
+Number of files that will be overwritten
+Number of files that will be overwritten
+One of the FreeFileSync database entries within the following file is not yet existing:
+One of the FreeFileSync database entries within the following file is not yet existing:
+One of the FreeFileSync database files is not yet existing:
+One of the FreeFileSync database files is not yet existing:
+Only files/directories that pass filtering will be selected for synchronization. The filter will be applied to the name relative(!) to the base synchronization directories.
+Only files/directories that pass filtering will be selected for synchronisation. The filter will be applied to the name relative(!) to the base synchronisation directories.
+Open directly
+Open directly
+Open with Explorer
+Open with Explorer
+Open with Konqueror
+Open with Konqueror
+Operation aborted!
+Operation aborted!
+Operation:
+Operation:
+Overview
+Overview
+Pause
+Pause
+Paused
+Paused
+Please run a Compare first before synchronizing!
+Please run a Compare first before synchronising!
+Processing folder pair:
+Processing folder pair:
+Published under the GNU General Public License:
+Published under the GNU General Public Licence:
+Question
+Question
+Quit
+Quit
+Re-enable all hidden dialogs?
+Re-enable all hidden dialogues?
+RealtimeSync - Automated Synchronization
+RealtimeSync - Automated Synchronisation
+RealtimeSync configuration
+RealtimeSync configuration
+Recycle Bin not yet supported for this system!
+Recycle Bin not yet supported for this system!
+Relative path
+Relative path
+Remove alternate settings
+Remove alternate settings
+Remove folder
+Remove folder
+Remove folder pair
+Remove folder pair
+Remove local filter settings
+Remove local filter settings
+Renaming file %x to %y
+Renaming file %x to %y
+Report translation error
+Report translation error
+Reset
+Reset
+Right
+Right
+Run minimized and write status information to a logfile
+Run minimised and write status information to a logfile
+S&ave configuration...
+S&ave configuration...
+S&witch view
+S&witch view
+Save changes to current configuration?
+Save changes to current configuration?
+Save current configuration to file
+Save current configuration to file
+Scanning...
+Scanning...
+Scanning:
+Scanning:
+Select a folder
+Select a folder
+Select alternate synchronization settings
+Select alternate synchronisation settings
+Select logfile directory:
+Select logfile directory:
+Select variant:
+Select variant:
+Set direction:
+Set direction:
+Setting default synchronization directions: Old files will be overwritten by newer files.
+Setting default synchronisation directions: Old files will be overwritten by newer files.
+Show conflicts
+Show conflicts
+Show files that are different
+Show files that are different
+Show files that are equal
+Show files that are equal
+Show files that are newer on left
+Show files that are newer on left
+Show files that are newer on right
+Show files that are newer on right
+Show files that exist on left side only
+Show files that exist on left side only
+Show files that exist on right side only
+Show files that exist on right side only
+Show files that will be created on the left side
+Show files that will be created on the left side
+Show files that will be created on the right side
+Show files that will be created on the right side
+Show files that will be deleted on the left side
+Show files that will be deleted on the left side
+Show files that will be deleted on the right side
+Show files that will be deleted on the right side
+Show files that will be overwritten on left side
+Show files that will be overwritten on left side
+Show files that will be overwritten on right side
+Show files that will be overwritten on right side
+Show files that won't be copied
+Show files that won't be copied
+Show hidden dialogs
+Show hidden dialogues
+Show popup
+Show popup
+Show popup on errors or warnings
+Show popup on errors or warnings
+Significant difference detected:
+Significant difference detected:
+Silent mode
+Silent mode
+Size
+Size
+Source code written completely in C++ utilizing:
+Source code written completely in C++ utilising:
+Source directory does not exist anymore:
+Source directory does not exist anymore:
+Speed:
+Speed:
+Start
+Start
+Start synchronization
+Start synchronisation
+Statistics
+Statistics
+Stop
+Stop
+Swap sides
+Swap sides
+Synchronization Preview
+Synchronisation Preview
+Synchronization aborted!
+Synchronisation aborted!
+Synchronization completed successfully!
+Synchronisation completed successfully!
+Synchronization completed with errors!
+Synchronisation completed with errors!
+Synchronization settings
+Synchronisation settings
+Synchronization status
+Synchronisation status
+Synchronize all .doc, .zip and .exe files except everything in subfolder \"temp\".
+Synchronise all .doc, .zip and .exe files except everything in subfolder \"temp\".
+Synchronize both sides using a database. Deletions are detected automatically
+Synchronise both sides using a database. Deletions are detected automatically
+Synchronize...
+Synchronise...
+Synchronizing...
+Synchronising...
+System out of memory!
+System out of memory!
+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 file does not contain a valid configuration:
+The file does not contain a valid configuration:
+This variant evaluates two equally named files as being equal when they have the same file size AND the same last write date and time.
+This variant evaluates two equally named files as being equal when they have the same file size AND the same last write date and time.
+Time
+Time
+Time elapsed:
+Time elapsed:
+Time remaining:
+Time remaining:
+Total amount of data that will be transferred
+Total amount of data that will be transferred
+Total required free disk space:
+Total required free disk space:
+Total time:
+Total time:
+Treat file times that differ by exactly +/- 1 hour as equal, less than 1 hour as conflict in order to handle Daylight Saving Time changes
+Treat file times that differ by exactly +/- 1 hour as equal, less than 1 hour as conflict in order to handle Daylight Saving Time changes
+Unable to connect to sourceforge.net!
+Unable to connect to sourceforge.net!
+Unable to create logfile!
+Unable to create logfile!
+Unresolved conflicts existing!
+Unresolved conflicts existing!
+Update ->
+Update ->
+Usage:
+Usage:
+Use Recycle Bin
+Use Recycle Bin
+Use Recycle Bin when deleting or overwriting files
+Use Recycle Bin when deleting or overwriting files
+User-defined directory
+User-defined directory
+User-defined directory for deletion was not specified!
+User-defined directory for deletion was not specified!
+Variant
+Variant
+Verifying file %x
+Verifying file %x
+Volume name %x not part of filename %y!
+Volume name %x not part of filename %y!
+Warning
+Warning
+Warning: Synchronization failed for %x item(s):
+Warning: Synchronisation failed for %x item(s):
+When the comparison is started with this option set the following decision tree is processed:
+When the comparison is started with this option set the following decision tree is processed:
+You can ignore conflicts and continue synchronization.
+You can ignore conflicts and continue synchronisation.
+You can ignore the error to consider not existing directories as empty.
+You can ignore the error to consider not existing directories as empty.
+You may try to synchronize remaining items again (WITHOUT having to re-compare)!
+You may try to synchronise remaining items again (WITHOUT having to re-compare)!
+different
+different
+file exists on both sides
+file exists on both sides
+on one side only
+on one side only
diff --git a/BUILD/Languages/german.lng b/BUILD/Languages/german.lng
index 0c8a3616..b6d8b800 100644
--- a/BUILD/Languages/german.lng
+++ b/BUILD/Languages/german.lng
@@ -22,8 +22,6 @@
  Sek.
 %x / %y objects deleted successfully
 %x von %y Objekten erfolgreich gelöscht
-%x Percent
-%x Prozent
 %x directories
 %x Verzeichnisse
 %x files,
@@ -34,6 +32,8 @@
 %x von %y Zeilen zur Ansicht
 %x of 1 row in view
 %x von 1 Zeile zur Ansicht
+%x%
+
 &Abort
 &Abbrechen
 &About...
@@ -92,8 +92,6 @@ Konfiguration &laden...
 (Achtung: Nur FAT/FAT32 Laufwerke sind von diesem Problem betroffen!\nIn allen anderen Fällen kann die Einstellung \"Zeitunterschied von einer Stunde ignorieren\" deaktiviert werden.)
 (Requires an Internet connection!)
 (Eine Internetverbindung wird benötigt!)
-,
-.
 - Other side's counterpart to %dir
 - Entsprechung der anderen Seite zu %dir
 - Other side's counterpart to %name
@@ -124,8 +122,6 @@ Konfiguration &laden...
 - rechts neuer
 -Open-Source file synchronization-
 -Open-Source Datei-Synchronisation-
-.
-,
 /sec
 /s
 1 directory
@@ -466,12 +462,14 @@ Files remaining:
 Verbleibende Dateien:
 Files that are equal on both sides
 Auf beiden Seiten gleiche Dateien
-Files that exist on both sides and have different content
-Auf beiden Seiten existierende Dateien mit unterschiedlichem Inhalt
 Files that exist on both sides, left one is newer
 Auf beiden Seiten existierende Dateien; linke Datei ist neuer
 Files that exist on both sides, right one is newer
 Auf beiden Seiten existierende Dateien; rechte Datei ist neuer
+Files that exist on both sides and have different content
+Auf beiden Seiten existierende Dateien mit unterschiedlichem Inhalt
+Files that have different content
+
 Files/folders found:
 Gefundene Dateien/Ordner:
 Files/folders processed:
diff --git a/BUILD/Languages/portuguese.lng b/BUILD/Languages/portuguese.lng
index 30ea57f6..d9176ab3 100644
--- a/BUILD/Languages/portuguese.lng
+++ b/BUILD/Languages/portuguese.lng
@@ -22,8 +22,6 @@
  seg
 %x / %y objects deleted successfully
 %x / %y objectos eliminados com sucesso
-%x Percent
-%x Por cento
 %x directories
 %x pastas
 %x files,
@@ -34,6 +32,8 @@
 %x de %y ficheiros
 %x of 1 row in view
 %x de 1 linha
+%x%
+
 &Abort
 &Abortar
 &About...
@@ -45,7 +45,7 @@
 &Check for new version
 &Procurar actualizações
 &Content
-
+&Conteúdo
 &Create batch job...
 &Criar um ficheiro batch...
 &Default
@@ -57,7 +57,7 @@
 &File
 &Ficheiro
 &Find next
-
+&Procurar seguinte
 &Global settings...
 &Opções......
 &Help
@@ -91,9 +91,7 @@
 (Note that only FAT/FAT32 drives are affected by this problem!\nIn all other cases you can disable the setting \"ignore 1-hour difference\".)
 (Apenas as drives FAT/FAT32 são afectadas por este problema! \nPara todas as outras situações pode desactivar a opção \"ignorar diferença de 1 hora\".)
 (Requires an Internet connection!)
-
-,
- 
+(Necessita acesso à Internet!)
 - Other side's counterpart to %dir
 - Contrapartida de %dir
 - Other side's counterpart to %name
@@ -122,10 +120,6 @@
 - direita
 - right newer
 - mais novo à direita
--Open-Source file synchronization-
--Sincronização open-source de ficheiros-
-.
-,
 /sec
 /seg
 1 directory
@@ -137,17 +131,17 @@
 1. Enter relative file or directory names separated by ';' or a new line.
 1. Inserir caminho(s) do(s) ficheiro(s) ou pasta(s) separados por ';' ou numa nova linha.
 1. Select directories to monitor.
-
+1. Seleccionar directórios a monitorizar.
 2. &Synchronize...
 2. &Sincronizar...
 2. Enter a command line.
-
+2. Insira linha de comando.
 2. Use wildcard characters '*' and '?'.
 2. Usar '*' e '?' como caracteres de procura.
 3. Exclude files directly on main grid via context menu.
 3. Excluir ficheiros directamente da grelha através do menu de contexto.
 3. Press 'Start'.
-
+3. Pressione 'Iniciar'.
 <Automatic>
 <Automático>
 <Directory>
@@ -161,7 +155,7 @@ Mais recente versão do FreeFileSync disponível:
 Abort requested: Waiting for current operation to finish...
 Abortar pedido: À espera do fim da operação...
 Abort synchronization immediately
-
+Abortar sincronização imediatamente
 Aborted
 Abortado
 About
@@ -169,13 +163,13 @@ Sobre
 Action
 Acção
 Activate filter
-
+Activar filtro
 Add folder
 Adicionar pasta
 Add folder pair
 Adicionar um par de pastas
 All directories in sync!
-
+Todas as pastas sincronizadas!
 An exception occured!
 Ocorreu uma excepção!
 As a result the files are separated into the following categories:
@@ -185,7 +179,7 @@ Como o nome sugere, dois ficheiros com o mesmo nome são assinalados iguais se e
 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.
 Criar um batch para sincronização automática. Para iniciar o modo batch, passar o nome do ficheiro para o executável do FreeFileSync: FreeFileSync.exe <ficheiro batch>. Também pode ser calendarizado no programador de tarefas.
 At least one directory input field is empty.
-
+Pelo menos um dos campos está vazio.
 Auto-adjust columns
 Auto ajustar colunas
 Automatic mode
@@ -205,9 +199,9 @@ Procurar
 Build:
 Criado:
 Cannot determine sync-direction:
-
+Não é possível saber a direcção de sincronização:
 Cannot find %x
-
+Não é possível descobrir %x
 Category
 Categoria
 Comma separated list
@@ -215,7 +209,7 @@ Lista de itens separados por virgula
 Command line
 Linha de comandos
 Command line is empty!
-
+Linha de comandos vazia!
 Compare
 Comparar
 Compare both sides
@@ -271,11 +265,11 @@ Copiar da direita para a esquerda
 Copy from right to left overwriting
 Copiar da direita para a esquerda com sobreposição
 Copy locked files
-
+Copiar ficheiros bloqueados
 Copy new or updated files to right folder.
 Copiar ficheiros novos ou actualizados para a direita
 Copy shared or locked files using Volume Shadow Copy Service
-
+Copiar ficheiros partilhados ou bloqueados usando o serviço Volume Shadow Copy
 Copy to clipboard\tCTRL+C
 Copiar para a Área de transferência\tCTRL+C
 Copying file %x to %y
@@ -287,7 +281,7 @@ Não é possível determinar o nome do volume para o ficheiro:
 Could not initialize directory monitoring:
 Não é possível iniciar monitorização do directório:
 Could not load a required DLL:
-
+Não foi possível carregar a DLL:
 Could not read values for the following XML nodes:
 Não foi possível ler os valores dos seguintes nós XML:
 Create a batch job
@@ -309,7 +303,7 @@ DECISION TREE
 Data remaining:
 Dados em falta:
 Data transferred:
-
+Dados transferidos:
 Data verification error: Source and target file have different content!
 Erro na verificação de dados: ficheiro fonte e de destino têm conteúdo diferente!
 Date
@@ -379,7 +373,7 @@ Erro ao copiar ficheiro:
 Error copying locked file %x!
 Erro ao copiar ficheiro bloqueado %x!
 Error copying symbolic link:
-
+Erro ao copiar o link:
 Error creating directory:
 Erro ao criar a pasta:
 Error deleting directory:
@@ -425,19 +419,19 @@ Exemplo
 Exclude
 Excluir
 Exclude all rows
-
+Excluir todas linhas
 Exclude temporarily
 Excluir temporariamente
 Exclude via filter:
 Excluir por filtro:
 Exit instantly
-
+Sair imediatamente
 Extension
-
+Extensão
 External applications
 Aplicações externas
 Fatal Error
-
+Erro fatal
 Feedback and suggestions are welcome at:
 Comentários e sugestões são benvindos em:
 File %x has an invalid date!
@@ -475,7 +469,7 @@ Ficheiros existentes dos dois lados, à direita é mais recente
 Files/folders found:
 Ficheiros/pastas encontrados:
 Files/folders processed:
-
+Ficheiros/pastas processados:
 Files/folders remaining:
 Ficheiros/pastas restantes:
 Files/folders that exist on left side only
@@ -487,17 +481,17 @@ Filtro
 Filter files
 Filtrar ficheiros
 Filter has been selected
-
+Filtro seleccionado
 Filter settings have changed!
-
+Opções de filtro alteradas!
 Filter view
 Filtrar vista
 Filtering is deactivated
-
+Filtragem desactivada
 Find
-
+Procurar
 Find what:
-
+Procurar:
 Folder Comparison and Synchronization
 Comparação e Sincronização de pastas
 Free disk space available:
@@ -521,7 +515,7 @@ A gerar base de dados...
 Generating file list...
 A gerar lista ficheiros...
 Global filter
-
+Filtro global
 Global settings
 Opções
 Help
@@ -533,7 +527,7 @@ Ocultar todas as mensagens de erro ou aviso
 Hide conflicts
 Ocultar conflitos
 Hide excluded items
-
+Ocultar itens excluidos
 Hide files that are different
 Ocultar ficheiros diferentes
 Hide files that are equal
@@ -561,7 +555,7 @@ Ocultar ficheiros a ser substituidos do lado direito
 Hide files that won't be copied
 Ocultar ficheiros que não serão copiados
 Hide filtered or temporarily excluded files
-
+Ocultar ficheiros filtrados ou temporariamente excluidos
 Hide further error messages during the current process
 Ocultar próximas mensagens de erro durante este processo
 Hints:
@@ -569,7 +563,7 @@ Dicas:
 Homepage
 Site
 Identify and propagate changes on both sides using a database. Deletions and conflicts are detected automatically.
-
+Identificar e propagar as mudanças usando base de dados. Eliminações e conflitos serão detectados automaticamente.
 If you like FFS
 Se gosta do FreeFileSync
 Ignore 1-hour file time difference
@@ -585,7 +579,7 @@ Ignorar erro, tentar de novo ou abortar?
 Include
 Incluir
 Include all rows
-
+Incluir todas as linhas
 Include temporarily
 Incluir temporariamente
 Include: *.doc;*.zip;*.exe\nExclude: \\stuff\\temp\\*
@@ -601,7 +595,7 @@ Sincronização inicial:
 Integrate external applications into context menu. The following macros are available:
 Integrar aplicações externas no menu de contexto. As seguintes macros estão disponíveis:
 Last synchronization not completed!
-
+Última sincronização incompleta!
 Leave as unresolved conflict
 Deixar como conflito
 Left
@@ -613,13 +607,13 @@ Carregar configuração do ficheiro
 Load configuration history (press DEL to delete items)
 Carregar histórico de configuração (pressione DEL para apagar itens)
 Local filter
-
+Filtro local
 Log-messages:
 Log de mensagens:
 Logging
 A escrever em log
 Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.
-
+Fazer cópias fantasma em WOW64 não é suportado. Por favor usar a versão 64-bit.
 Match case
 
 Mirror ->>
@@ -627,7 +621,7 @@ Espelhar ->>
 Mirror backup of left folder: Right folder will be overwritten and exactly match left folder after synchronization.
 Espelhar pasta da esquerda: A pasta da direita vai ser sobreposta e uma cópia exacta da pasta esquerda após sincronização.
 Monitoring active...
-
+Monitorizar activo...
 More than 50% of the total number of files will be copied or deleted!
 Mais de 50% dos ficheiros vai ser copiado ou apagado!
 Move column down
@@ -635,7 +629,7 @@ Mover coluna para baixo
 Move column up
 Mover coluna para cima
 Move files into a time-stamped subdirectory
-
+Mover ficheiros para uma pasta com a data
 Moving %x to Recycle Bin
 A mover %x para a Reciclagem
 Moving file %x to user-defined directory %y
@@ -645,9 +639,9 @@ A mover pasta %x para o directório %y
 Multiple...
 Multiplo...
 No change since last synchronization!
-
+Não há alterações desde a sincronização!
 No filter selected
-
+Nenhum filtro seleccionado
 Not enough free disk space available in:
 Não há espaço livre suficiente em:
 Nothing to synchronize according to configuration!
@@ -659,9 +653,9 @@ Número de itens a ser eliminados
 Number of files that will be overwritten
 Número de ficheiros substituidos
 One of the FreeFileSync database entries within the following file is not yet existing:
-
+Uma das entradas da base de dados dentro do seguinte ficheiro não existe:
 One of the FreeFileSync database files is not yet existing:
-
+Um dos ficheiros da base de dados não existe:
 Only files/directories that pass filtering will be selected for synchronization. The filter will be applied to the name relative(!) to the base synchronization directories.
 Apenas ficheiros/directórios que passem o filtro serão seleccionados para sincronização. O filtro será aplicado ao nome relativo(!) ao directório base de sincronização.
 Open directly
@@ -681,9 +675,9 @@ Pausa
 Paused
 Em pausa
 Please run a Compare first before synchronizing!
-
+Use Comparar antes da primeira sincronização!
 Processing folder pair:
-
+A processar o par do directorio:
 Published under the GNU General Public License:
 Publicado sobre GNU General Public License:
 Question
@@ -697,7 +691,7 @@ RealtimeSync - Sincronização Automática
 RealtimeSync configuration
 Configuração do RealtimeSync
 Recycle Bin not yet supported for this system!
-
+Reciclagem não é suportada para este sistema!
 Relative path
 Caminho
 Remove alternate settings
@@ -707,9 +701,9 @@ Remover pasta(s)
 Remove folder pair
 Remover o par de pastas
 Remove local filter settings
-
+Remover as opções de filtro local
 Renaming file %x to %y
-
+Mudar o nome de %x para %y
 Report translation error
 Informar um erro de tradução
 Reset
@@ -717,7 +711,7 @@ Reiniciar
 Right
 Direita
 Run minimized and write status information to a logfile
-
+Minimizar o programa e enviar status para um ficheiro log
 S&ave configuration...
 G&uardar a configuração...
 S&witch view
@@ -725,7 +719,7 @@ S&witch view
 Save changes to current configuration?
 Guardar alterações à configuração?
 Save current configuration to file
-Guardar o corrente ficheiro de configuração
+Guardar o actual ficheiro de configuração
 Scanning...
 A pesquisar...
 Scanning:
@@ -739,9 +733,9 @@ Seleccione directório para ficheiro log:
 Select variant:
 Seleccione uma variante:
 Set direction:
-
+Escolher direcção:
 Setting default synchronization directions: Old files will be overwritten by newer files.
-
+Escolher direcção de sincronização por defeito: Os ficheiros antigos serão substituídos pelos novos.
 Show conflicts
 Mostrar conflitos
 Show files that are different
@@ -825,7 +819,7 @@ Directório de destino já existe!
 Target file already existing!
 Ficheiro de destino já existe!
 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
-
+Linha de comnados a executar sempre que: \n- um directorio fica disponível (i.e. pen USB)\n- ficheiros dentro deste directórios ou sub-directórios forem alterados
 The file does not contain a valid configuration:
 O ficheiro não contém uma configuração válida:
 This variant evaluates two equally named files as being equal when they have the same file size AND the same last write date and time.
@@ -849,11 +843,11 @@ Não é possível ligar a sourceforge.net!
 Unable to create logfile!
 Não é possível criar ficheiro log!
 Unresolved conflicts existing!
-
+Existem conflitos por resolver!
 Update ->
 Actualizar ->
 Usage:
-
+Uso:
 Use Recycle Bin
 Utilizar Reciclagem
 Use Recycle Bin when deleting or overwriting files
@@ -875,7 +869,7 @@ Atenção: A sincronização falhou para %x item(s):
 When the comparison is started with this option set the following decision tree is processed:
 Usar a seguinte árvore de decisão quando inicia com estas opções de comparação:
 You can ignore conflicts and continue synchronization.
-
+Pode ignorar os conflitos e continuar a sincronização.
 You can ignore the error to consider not existing directories as empty.
 Pode ignorar o erro para considerar directórios não existentes como vazios.
 You may try to synchronize remaining items again (WITHOUT having to re-compare)!