summaryrefslogtreecommitdiff
path: root/BUILD
diff options
context:
space:
mode:
authorDaniel Wilhelm <daniel@wili.li>2014-04-18 17:28:01 +0200
committerDaniel Wilhelm <daniel@wili.li>2014-04-18 17:28:01 +0200
commitfe9eb89ebc1b3c33cbac00a3fa095a14faef9113 (patch)
tree8a3bb620a9acb83fe0057061a86e8f2cb91a9fe1 /BUILD
parent5.21 (diff)
downloadFreeFileSync-fe9eb89ebc1b3c33cbac00a3fa095a14faef9113.tar.gz
FreeFileSync-fe9eb89ebc1b3c33cbac00a3fa095a14faef9113.tar.bz2
FreeFileSync-fe9eb89ebc1b3c33cbac00a3fa095a14faef9113.zip
5.22
Diffstat (limited to 'BUILD')
-rw-r--r--BUILD/Changelog.txt324
-rw-r--r--BUILD/FreeFileSync.chmbin434161 -> 416035 bytes
-rw-r--r--BUILD/Help/FreeFileSync.hhc36
-rw-r--r--BUILD/Help/FreeFileSync.hhp18
-rw-r--r--BUILD/Help/html/Batch Scripting.html85
-rw-r--r--BUILD/Help/html/Command line.html53
-rw-r--r--BUILD/Help/html/Comparison Settings.html17
-rw-r--r--BUILD/Help/html/Daylight Saving Time.html29
-rw-r--r--BUILD/Help/html/Exclude Items.html34
-rw-r--r--BUILD/Help/html/Expert settings.html37
-rw-r--r--BUILD/Help/html/External Applications.html58
-rw-r--r--BUILD/Help/html/FreeFileSync.html10
-rw-r--r--BUILD/Help/html/Macros.html30
-rw-r--r--BUILD/Help/html/RealtimeSync.html166
-rw-r--r--BUILD/Help/html/Run as Service.html50
-rw-r--r--BUILD/Help/html/Schedule a Batch Job.html112
-rw-r--r--BUILD/Help/html/Synchronize with FTP.html24
-rw-r--r--BUILD/Help/html/Variable Drive Letters.html44
-rw-r--r--BUILD/Help/html/Versioning.html28
-rw-r--r--BUILD/Help/html/Volume Shadow Copy.html27
-rw-r--r--BUILD/Help/img/CmpSettings.pngbin21974 -> 16851 bytes
-rw-r--r--BUILD/Help/img/CompareButton.pngbin3738 -> 4438 bytes
-rw-r--r--BUILD/Help/img/MainDialog.pngbin65805 -> 69246 bytes
-rw-r--r--BUILD/Help/img/RealtimeSync.pngbin31399 -> 24081 bytes
-rw-r--r--BUILD/Help/img/SetupBatch.pngbin30294 -> 19598 bytes
-rw-r--r--BUILD/Help/img/SynchronizeButton.pngbin4324 -> 4943 bytes
-rw-r--r--BUILD/Help/img/WatchUsbInsert.pngbin30701 -> 32665 bytes
-rw-r--r--BUILD/Languages/arabic.lng823
-rw-r--r--BUILD/Languages/chinese_simple.lng632
-rw-r--r--BUILD/Languages/chinese_traditional.lng568
-rw-r--r--BUILD/Languages/croatian.lng608
-rw-r--r--BUILD/Languages/czech.lng552
-rw-r--r--BUILD/Languages/danish.lng541
-rw-r--r--BUILD/Languages/dutch.lng660
-rw-r--r--BUILD/Languages/english_uk.lng496
-rw-r--r--BUILD/Languages/finnish.lng601
-rw-r--r--BUILD/Languages/french.lng576
-rw-r--r--BUILD/Languages/german.lng560
-rw-r--r--BUILD/Languages/greek.lng646
-rw-r--r--BUILD/Languages/hebrew.lng541
-rw-r--r--BUILD/Languages/hungarian.lng646
-rw-r--r--BUILD/Languages/italian.lng598
-rw-r--r--BUILD/Languages/japanese.lng567
-rw-r--r--BUILD/Languages/korean.lng620
-rw-r--r--BUILD/Languages/outdated/lithuanian.lng (renamed from BUILD/Languages/lithuanian.lng)599
-rw-r--r--BUILD/Languages/outdated/norwegian.lng588
-rw-r--r--BUILD/Languages/polish.lng579
-rw-r--r--BUILD/Languages/portuguese.lng637
-rw-r--r--BUILD/Languages/portuguese_br.lng518
-rw-r--r--BUILD/Languages/romanian.lng628
-rw-r--r--BUILD/Languages/russian.lng845
-rw-r--r--BUILD/Languages/scottish_gaelic.lng605
-rw-r--r--BUILD/Languages/serbian.lng880
-rw-r--r--BUILD/Languages/slovenian.lng620
-rw-r--r--BUILD/Languages/spanish.lng646
-rw-r--r--BUILD/Languages/swedish.lng566
-rw-r--r--BUILD/Languages/turkish.lng663
-rw-r--r--BUILD/Languages/ukrainian.lng573
-rw-r--r--BUILD/Resources.zipbin267554 -> 260187 bytes
59 files changed, 10618 insertions, 9746 deletions
diff --git a/BUILD/Changelog.txt b/BUILD/Changelog.txt
index 8582e2b4..8f8006d6 100644
--- a/BUILD/Changelog.txt
+++ b/BUILD/Changelog.txt
@@ -1,5 +1,25 @@
-FreeFileSync 5.21
------------------
+FreeFileSync 5.22 [2013-10-01]
+------------------------------
+New options for automatic retry after error
+Improved compliance with Windows User Experience guidelines
+Harmonized popup dialog layouts
+Correctly show program menu when main dialog receives focus (OS X)
+Revised configuration dialog layouts and designs
+Fixed crash on startup for CPUs without SSE2 support (Windows XP)
+Work around wxWidgets bug for sorted list boxes (Linux)
+Updated and revised help file
+Early parameter validation for filter and sync config dialogs
+Fixed followed directory symlinks being incorrectly excluded
+Automatically calculate best initial message box size
+Progress graph and status icons support high contrast color schemes
+Include directory child-elements when manually setting filter
+Allow manual filter for short name on overview panel
+Don't treat file drops on directory input fields as URI (Linux)
+Updated translation files
+
+
+FreeFileSync 5.21 [2013-09-02]
+------------------------------
Detect moved/renamed files in mirror and custom variants
New database format for two way variant: old database files are converted automatically
Support double-clicking ffs_gui/ffs_batch files (OS X)
@@ -15,7 +35,7 @@ Always remove .ffs_tmp files permanently
Fixed layout for buttons with text and graphics for RTL languages (Arabic, Hebrew)
Revised file filter parser: new syntax for excluding items in subdirectories
Improved configuration merge algorithm
-Fixed crash when showing help due to wxWigets 64-bit bug in help component (Windows 8)
+Fixed crash when showing help due to wxWidgets 64-bit bug in help component (Windows 8)
Avoid progress dialog graph flicker during resize when too few samples are available
Progress status when deleting files not greyed out anymore
Increased time-out to 20 seconds when checking for directory existence
@@ -25,13 +45,13 @@ Consistently set batch error codes during startup phase
Updated translation files
-FreeFileSync 5.20
------------------
-Fixed crash on startup due to wxWigets 64-bit bug in font enumeration (Windows 8)
+FreeFileSync 5.20 [2013-08-03]
+------------------------------
+Fixed crash on startup due to wxWidgets 64-bit bug in font enumeration (Windows 8)
-FreeFileSync 5.19
------------------
+FreeFileSync 5.19 [2013-08-02]
+------------------------------
Redesigned progress dialog including new items graph
New command line syntax: set directory names of a .ffs_gui/.ffs_batch externally
Explicit button on progress dialog to minimize to systray
@@ -53,13 +73,13 @@ Show a blinking system tray icon on errors instead of a modal dialog in Realtime
Added installation size for Windows' Add/Remove Programs
-FreeFileSync 5.18
------------------
+FreeFileSync 5.18 [2013-07-02]
+------------------------------
Work around boost 1.54 bug "The procedure entry point GetTickCount64 could not be located in the dynamic link library KERNEL32.dll" (Windows XP)
-FreeFileSync 5.17
------------------
+FreeFileSync 5.17 [2013-07-02]
+------------------------------
Consider target file when updating followed file symlinks
Support moving files to recycle bin contained in followed directory symlinks
Move instead of copy updated files into versioning directory
@@ -88,8 +108,8 @@ Log error message upon retry as type info only
Updated translation files
-FreeFileSync 5.16
------------------
+FreeFileSync 5.16 [2013-06-01]
+------------------------------
Integrated both category and sync action view into middle grid
Condensed folder pair display names on overview panel
Consider symlinks and junctions when copying locked files (Windows Vista)
@@ -120,8 +140,8 @@ Systematically resolved translation bugs
Added Serbian language
-FreeFileSync 5.15
------------------
+FreeFileSync 5.15 [2013-05-01]
+------------------------------
New menu option to activate/deactivate automatic update checking
Show status message while checking for program updates
Faster start up times through asynchronous config file checking
@@ -151,8 +171,8 @@ New help file topic "Expert Settings"
Updated translation files
-FreeFileSync 5.14
------------------
+FreeFileSync 5.14 [2013-03-31]
+------------------------------
Do not process child elements when parent directory creation fails
Start comparison after pressing Enter in directory input fields
Lead grid is determined via keyboard input instead of input focus change
@@ -177,8 +197,8 @@ Fit grid row label to match wide font sizes
Added macros %csidl_Downloads%, %csidl_PublicDownloads%, %csidl_QuickLaunch% (Windows Vista and later)
-FreeFileSync 5.13
------------------
+FreeFileSync 5.13 [2013-03-06]
+------------------------------
Prepared support for new build on Mac OS X
Time out for not existing directories after 10 seconds
Check directory existence in parallel
@@ -192,8 +212,8 @@ More polished user interfaces
Fixed time stamp not being set on NFS/Samba shares (Linux)
-FreeFileSync 5.12
------------------
+FreeFileSync 5.12 [2013-02-04]
+------------------------------
Dynamic statistics adjustment during synchronization
Allow to save active view filter settings as default (context menu)
Stay responsive while checking recycle bin existence on slow disks
@@ -208,8 +228,8 @@ Use full time window of sync phase when calculating overall speed
Added Arabic language
-FreeFileSync 5.11
------------------
+FreeFileSync 5.11 [2013-01-06]
+------------------------------
New file versioning scheme: move to folder replacing existing files
Fixed high CPU consumption after longer syncs
Improved .ffs_batch configuration file handling
@@ -228,8 +248,8 @@ Updated help file
Updated translation files
-FreeFileSync 5.10
------------------
+FreeFileSync 5.10 [2012-12-03]
+------------------------------
Show synchronization log as a grid in results dialog
Improved grid scrolling performance (most noticeable on Linux)
Allow grid selection starting from outside of the grid
@@ -248,8 +268,8 @@ Copy file access permissions by default (Linux)
Fixed unexpected "File or Directory not existing" error during file copy (Linux)
-FreeFileSync 5.9
-----------------
+FreeFileSync 5.9 [2012-11-03]
+-----------------------------
Scroll grid under mouse cursor
Move files directly to recycle bin without parent "FFS 2012-05-15 131513" temporary folders
Offer $HOME directory alias in directory drop down list (Linux)
@@ -265,8 +285,8 @@ New sync completion sound
Fixed sync completion sound not playing (Ubuntu)
-FreeFileSync 5.8
-----------------
+FreeFileSync 5.8 [2012-10-01]
+-----------------------------
New icon theme
Dynamic save button and dialog title show unsaved configuration
Exclude all folders if file size or time span filters are active
@@ -280,8 +300,8 @@ Disabled UAC virtualization for 32-bit user-mode process
Descriptive error message when setting invalid dates on FAT volumes
-FreeFileSync 5.7
-----------------
+FreeFileSync 5.7 [2012-09-04]
+-----------------------------
Modern directory selection dialog (Windows Vista and later)
New file versioning scheme appending revision number to files
New sync option to limit number of versions per file
@@ -298,8 +318,8 @@ Harmonized external application macros: %item_path%, %item_folder%, %item2_path%
Updated translation files
-FreeFileSync 5.6
-----------------
+FreeFileSync 5.6 [2012-08-02]
+-----------------------------
Resize left and right grids equally
Allow to move middle grid position via mouse
Automatically resize file name columns
@@ -315,8 +335,8 @@ More detailed tool tip describing items that differ in attributes only
Added Scottish Gaelic translation
-FreeFileSync 5.5
-----------------
+FreeFileSync 5.5 [2012-07-01]
+-----------------------------
New database format for <automatic> variant: old database files are converted automatically
Tuned performance for <automatic> variant when saving database for millions of files: > 95% faster
Support partial database updates for <automatic> variant respecting current filter
@@ -337,8 +357,8 @@ Consider both global and local filter when estimating whether folder could conta
Updated translation files
-FreeFileSync 5.4
-----------------
+FreeFileSync 5.4 [2012-06-01]
+-----------------------------
Copy all NTFS extended attributes
Improved statistics panel
Improved main grid
@@ -364,8 +384,8 @@ Support Arch Linux (Chakra)
Updated translation files
-FreeFileSync 5.3
-----------------
+FreeFileSync 5.3 [2012-05-02]
+-----------------------------
Show which processes lock a file during synchronization (Windows Vista and later)
Use unbuffered copy to speed up copying large files (Windows Vista and later)
Preserve NTFS sparse files
@@ -389,13 +409,13 @@ Added Norwegian translation
Updated translation files
-FreeFileSync 5.2
-----------------
+FreeFileSync 5.2 [2012-04-01]
+-----------------------------
Fixed runtime error "Error comparing strings! (LCMapString)" (Windows 2000, XP only)
-FreeFileSync 5.1
-----------------
+FreeFileSync 5.1 [2012-03-31]
+-----------------------------
New category for time span filter: last x days
Fixed "Error loading library function: GetVolumeInformationByHandleW" if NTFS permissions are copied
Fixed command line issues: allow config name without extension, allow multiple directories instead of a config file
@@ -430,16 +450,16 @@ All executables digitally signed
Updated translation files
-FreeFileSync 5.0
-----------------
+FreeFileSync 5.0 [2012-01-30]
+-----------------------------
New grid control
New tree control
Revised Right to Left layout for Hebrew
Updated translation files
-FreeFileSync 4.6
-----------------
+FreeFileSync 4.6 [2011-12-25]
+-----------------------------
Execute user-defined command after synchronization
Option to automatically close synchronization progress dialog
Automatically adjust statistics during sync if changes happened after comparison
@@ -457,21 +477,21 @@ Save settings before forced exit due to shutdown or log off
Updated translation files
-FreeFileSync 4.5
-----------------
+FreeFileSync 4.5 [2011-11-25]
+-----------------------------
Fixed "Windows Error Code 50: The request is not supported"
Fixed "Windows Error Code 124: The system call level is not correct"
Fixed config load performance problem if network drive is not reachable
Support traversing truly empty directories (no ., ..) (Windows)
-FreeFileSync 4.4
-----------------
+FreeFileSync 4.4 [2011-11-22]
+-----------------------------
Fixed error copying files containing alternate data streams (Windows)
-FreeFileSync 4.3
-----------------
+FreeFileSync 4.3 [2011-11-20]
+-----------------------------
Detection of moved and renamed files
New database format for <Automatic> mode: a full sync is suggested before upgrading
Fixed overwrite symlink with regular file
@@ -482,8 +502,8 @@ Added Croatian language
Updated translation files
-FreeFileSync 4.2
-----------------
+FreeFileSync 4.2 [2011-11-02]
+-----------------------------
Implemented workaround for compiler bug leading to uncaught exceptions (Windows 32 bit)
Shadow Copy Service: Native support for Windows7/Server 2008
Fixed reference by volume name parsing issue
@@ -496,8 +516,8 @@ Honor DACL/SACL inheritance flags when copying NTFS permissions (Windows)
New option in GlobalSettings.xml: "RunWithBackgroundPriority" (Windows Vista and later)
-FreeFileSync 4.1
-----------------
+FreeFileSync 4.1 [2011-10-09]
+-----------------------------
Improved synchronization progress dialog
Show all available aliases in directory history list
Show password prompt when connecting to mapped network share
@@ -510,8 +530,8 @@ Allow passing multiple configurations via command line
Allow passing multiple directory names via command line
-FreeFileSync 4.0
-----------------
+FreeFileSync 4.0 [2011-09-25]
+-----------------------------
Thumbnail list view
Option to specify comparison settings at folder pair level
Correctly update parent-child relationship when changing sync directions
@@ -542,15 +562,15 @@ Updated help file
Updated translation files
-FreeFileSync 3.21
------------------
+FreeFileSync 3.21 [2011-08-19]
+------------------------------
Fixed deleting to user-defined directory
Fixed crash when using include filter
New global option to disable transactional file copy
-FreeFileSync 3.20
------------------
+FreeFileSync 3.20 [2011-08-11]
+------------------------------
Scan multiple directories in parallel
Automatically resolve disconnected network maps
Fixed temporal hang when dropping large files on main dialog
@@ -561,8 +581,8 @@ Support for Ubuntu Unity Launcher (Linux)
RealtimeSync: Failure notification if command line is invalid (Linux)
-FreeFileSync 3.19
------------------
+FreeFileSync 3.19 [2011-07-23]
+------------------------------
Exclude sub directories from synchronization which cannot be accessed during comparison
Warning if Recycle Bin is not available instead of deleting silently (Windows)
Adapted log message if missing recycler leads to permanent deletion (Windows)
@@ -583,8 +603,8 @@ Restrict maximum number of visible folder pairs to 6 (configurable via GlobalSet
New macros: %day%, %hour%, %min%, %sec%
-FreeFileSync 3.18
------------------
+FreeFileSync 3.18 [2011-07-03]
+------------------------------
Launcher running synchronously and returning application error code
Fixed sort by file extension
Fixed drag and drop of SAMBA network folder
@@ -598,8 +618,8 @@ Added Danish language
Updated translation files
-FreeFileSync 3.17
------------------
+FreeFileSync 3.17 [2011-05-20]
+------------------------------
Filter files by size
Filter latest files by time span
Launcher automatically selecting 32/64 bit executable on start up
@@ -624,14 +644,14 @@ Added Ukrainian language
Updated translation files
-FreeFileSync 3.16
------------------
+FreeFileSync 3.16 [2011-04-21]
+------------------------------
Fixed file copy issues on SAMBA shares
Small GUI fixes
-FreeFileSync 3.15
------------------
+FreeFileSync 3.15 [2011-04-19]
+------------------------------
Overwriting a file as fully transactional operation
Optimized synchronization speed (non-cached volumes, e.g. memory sticks in particular)
Volumes can be specified by name: [<volume-name>]\<path> (use case: variable drive letters, RealtimeSync)
@@ -650,8 +670,8 @@ More tolerant file move: ignore existing files (user-defined deletion directory)
Added macro %weekday%
-FreeFileSync 3.14
------------------
+FreeFileSync 3.14 [2011-03-20]
+------------------------------
New keyboard shortcuts: F5: compare F6: synchronize
Skip to next folder pair if fatal error occurred (instead of abort)
Reload last selected configuration on start up
@@ -670,8 +690,8 @@ Many small GUI/usability fixes
Added Korean translation
-FreeFileSync 3.13
------------------
+FreeFileSync 3.13 [2011-01-16]
+------------------------------
Implemented Advanced User Interface to allow user specified layout customizations
Process case sensitive file/directory/symlink names
Synchronize name/attributes only avoiding full copy if appropriate
@@ -695,8 +715,8 @@ Added privilege to access restricted symlink content
Added Greek translation
-FreeFileSync 3.12
------------------
+FreeFileSync 3.12 [2010-11-28]
+------------------------------
Allow empty folder pairs without complaining
Automatically exclude database and lock files from all (sub-)directories (not only from base)
Resize grid columns on both sides in parallel
@@ -718,14 +738,14 @@ Handle empty tool tips correctly (Linux)
Updated translation files
-FreeFileSync 3.11
------------------
+FreeFileSync 3.11 [2010-09-20]
+------------------------------
Fixed migration issue: reasonable default value for number of folder pairs
Better message box background color
-FreeFileSync 3.10
------------------
+FreeFileSync 3.10 [2010-09-19]
+------------------------------
Automatically solve daylight saving time and time zone shift issues on FAT/FAT32 (finally)
Instantly resolve abandoned directory locks associated with local computer
Show expanded directory name as tool tip and label text (resolves macros and relative paths)
@@ -746,8 +766,8 @@ Further GUI enhancements/polishment/standard conformance
Updated translation files
-FreeFileSync 3.9
-----------------
+FreeFileSync 3.9 [2010-08-10]
+-----------------------------
Advanced locking strategy to allow multiple processes synchronize the same directories (e.g. via network share)
Merge multiple *.ffs_batch, *.ffs_gui files or combinations of both via drag & drop
Copy file and folder permissions (requires admin rights):
@@ -765,8 +785,8 @@ Moved settings "file time tolerance" and "verify copied files" to GlobalSettings
Updated translation files
-FreeFileSync 3.8
-----------------
+FreeFileSync 3.8 [2010-06-20]
+-----------------------------
New options handling Symlinks: ignore/direct/follow => warning: new database format for <Automatic> mode
Fixed crash when starting sync for Windows XP SP2
Prevent tool tip from stealing focus
@@ -781,8 +801,8 @@ Adjusted auto-updater web-address
Updated translation files
-FreeFileSync 3.7
-----------------
+FreeFileSync 3.7 [2010-05-16]
+-----------------------------
RealtimeSync: Trigger command line only if all directories are existing
Allow for drag and drop of very large files
Batch modus: New "Switch" button opens GUI modus when warnings occur
@@ -800,13 +820,13 @@ A lot of small GUI fixes
Updated translation files
-FreeFileSync 3.6
-----------------
+FreeFileSync 3.6 [2010-03-31]
+-----------------------------
Fixed occasional crash when starting FreeFileSync
-FreeFileSync 3.5
-----------------
+FreeFileSync 3.5 [2010-03-27]
+-----------------------------
Allow <Automatic> mode syncs between 32 bit, 64 bit, Windows and Linux builds
Show progess indicator in window title
Support for progess indicator in Windows 7 Superbar
@@ -819,8 +839,8 @@ Allow aborting all operations via Escape key
Added British English translation
-FreeFileSync 3.4
-----------------
+FreeFileSync 3.4 [2010-03-04]
+-----------------------------
Performance: Reduced Recycle Bin access time by 90%
Recycle Bin support for Linux
Performance: Reduced binary comparison sequential read time (by up to 75% for CD/DVD access)
@@ -841,8 +861,8 @@ Updated translation files
New Linux .deb package: ppa:freefilesync/ffs
-FreeFileSync 3.3
-----------------
+FreeFileSync 3.3 [2010-02-02]
+-----------------------------
New installer package for portable/local/32/64-bit versions
Built-in support for very long filenames: apply \\?\-prefix automatically
New button for synchronization preview: show equal files
@@ -861,8 +881,8 @@ Added Swedish translation
Updated translation files
-FreeFileSync 3.2
-----------------
+FreeFileSync 3.2 [2009-12-13]
+-----------------------------
Native Windows 64-Bit version (including Volume Shadow Copy Service)
Harmonized filter handling: global and local file filters
Unified handling of first folder pair: all pairs now semantically equal
@@ -882,8 +902,8 @@ Added Finnish translation
Updated translation files
-FreeFileSync 3.1
-----------------
+FreeFileSync 3.1 [2009-10-26]
+-----------------------------
Support for multiple data sources in Automatic mode
Copy file and folder create/access/modification times when synchronizing
Progress dialog can be minimized to systray (Batch and GUI mode)
@@ -891,8 +911,8 @@ Allow switching between silent/non-silent batch mode interactively
Some GUI improvements
-FreeFileSync 3.0
-----------------
+FreeFileSync 3.0 [2009-10-15]
+-----------------------------
New synchronization mode: <Automatic>
Consolidated batch mode error handling
Fixed crash when comparing multiple pairs by content
@@ -909,8 +929,8 @@ Added Turkish translation
Updated translation files
-FreeFileSync 2.3
-----------------
+FreeFileSync 2.3 [2009-09-27]
+-----------------------------
New filter and sync configuration at folder pair level
Improved sorting: sort across multiple folder pairs
stable sorting in middle grid
@@ -934,8 +954,8 @@ Added Traditional Chinese translation
Updated translation files
-FreeFileSync 2.2
-----------------
+FreeFileSync 2.2 [2009-08-16]
+-----------------------------
New user-defined recycle bin directory
Possibility to create synchronization directories automatically (if not existing)
Support for relative directory names (e.g. \foo, ..\bar) respecting current working directory
@@ -960,14 +980,14 @@ Added Czech translation
Updated translation files
-FreeFileSync 2.1
-----------------
+FreeFileSync 2.1 [2009-07-03]
+-----------------------------
Fixed bug that could cause FreeFileSync to crash after synchronization
Compiled with MS Visual C++ 2008 using static runtime library
-FreeFileSync 2.0
-----------------
+FreeFileSync 2.0 [2009-06-30]
+-----------------------------
Copy locked files using Windows Volume Shadow Copy
Load file icons asynchronously for maximum display performance
Handle include filter correctly when comparing
@@ -990,8 +1010,8 @@ Added Russian translation
Updated translation files
-FreeFileSync 1.19
------------------
+FreeFileSync 1.19 [2009-06-01]
+------------------------------
New synchronization preview
Sync-direction can be adapted manually
New category type "conflict"
@@ -1010,8 +1030,8 @@ File icon display configurable via grid column context menu
Updated translation files
-FreeFileSync 1.18
------------------
+FreeFileSync 1.18 [2009-05-10]
+------------------------------
Linux build officially released: all major problems solved!
New statistic: remaining time
New statistic: bytes per second
@@ -1035,8 +1055,8 @@ Added Brazilian Portuguese translation
Updated translation files
-FreeFileSync 1.17
------------------
+FreeFileSync 1.17 [2009-04-05]
+------------------------------
Full support for Windows/Linux symbolic links:
- traverse, copy, delete symbolic links
- handle broken symbolic links
@@ -1066,8 +1086,8 @@ Added Spanish translation
Updated translation files
-FreeFileSync 1.16
------------------
+FreeFileSync 1.16 [2009-03-13]
+------------------------------
Support for \\?\ path prefix for unrestricted path length (directory names > 255 characters) (windows only)
Copy files even if target folder does not exist
Fixed occasional error when switching languages
@@ -1096,8 +1116,8 @@ Usability improvements:
Updated translation files
-FreeFileSync 1.15
------------------
+FreeFileSync 1.15 [2009-02-22]
+------------------------------
Fixed performance bottleneck in batch mode (non-silent)
Improved performance of comparison by another 10%
Configure column settings by right-click context menu
@@ -1119,8 +1139,8 @@ Added Italian translation
Updated translation files
-FreeFileSync 1.14
------------------
+FreeFileSync 1.14 [2009-02-01]
+------------------------------
Massive performance improvements:
- comprehensive analysis and optimization of comparison functionality
- new, fast directory traversing algorithm
@@ -1136,8 +1156,8 @@ Added Chinese translation
Updated translation files
-FreeFileSync 1.13
------------------
+FreeFileSync 1.13 [2009-01-06]
+------------------------------
Automatically detect daylight saving time (DST) change for FAT/FAT32 drives
Added directory dependency check when synchronizing multiple folder pairs
New synchronization option: "update"
@@ -1147,8 +1167,8 @@ Further GUI improvements
Updated translation files
-FreeFileSync 1.12
------------------
+FreeFileSync 1.12 [2008-12-23]
+------------------------------
Significantly improved speed of all sorting algorithms
Keep sorting sequence when adding or removing rows
'Sort by relative path' secondarily sorts by filename and respects folders
@@ -1163,8 +1183,8 @@ Added Dutch translation
Updated translation files
-FreeFileSync 1.11
------------------
+FreeFileSync 1.11 [2008-11-23]
+------------------------------
Support for multiple folder pairs
Optimized performance of multiple pairs to scan each folder just once
Enhanced batch file format
@@ -1173,8 +1193,8 @@ Reworked file filter dialog
Updated translation files
-FreeFileSync 1.10
------------------
+FreeFileSync 1.10 [2008-11-09]
+------------------------------
Transformed configuration file format to XML
Exchanged batch files with shell links for full Unicode support (Windows-only)
Improved filter usage: ignore leading/trailing white-space, upper/lower-case (Windows-only) chars
@@ -1186,8 +1206,8 @@ Added Japanese translation
Updated translation files
-FreeFileSync 1.9
-----------------
+FreeFileSync 1.9 [2008-10-26]
+-----------------------------
Fixed wxWidgets multithreading issue that could cause synchronization to hang occasionally
Fixed issue with %1 parameter
Fixed issue with recycle bin usage in unicode mode
@@ -1197,8 +1217,8 @@ Transformed language files to Unicode (UTF-8)
Delete elements in configuration history list via DELETE key
-FreeFileSync 1.8
-----------------
+FreeFileSync 1.8 [2008-10-19]
+-----------------------------
Enhanced status bar information
Enhanced log file information
Enhanced progress information
@@ -1208,8 +1228,8 @@ Added French translation
Updated German translation
-FreeFileSync 1.7
-----------------
+FreeFileSync 1.7 [2008-10-12]
+-----------------------------
Display only those view filter buttons that are actually needed
Compare by size and date: last write time may differ by up to 2 seconds (NTFS vs FAT32)
Fixed minor issue with trailing path separator when creating batch jobs
@@ -1218,8 +1238,8 @@ Further improved Unicode compliance
Updated German translation
-FreeFileSync 1.6
-----------------
+FreeFileSync 1.6 [2008-10-05]
+-----------------------------
Significantly improved speed of filtering files and view (< 10 ms for > 200.000 rows(!))
Fixed minor grid mis-alignment under some special conditions
Enhanced status bar with centered texts
@@ -1234,8 +1254,8 @@ UI-option to create sync jobs (batch files) for automated synchronization
Updated German translation
-FreeFileSync 1.5
-----------------
+FreeFileSync 1.5 [2008-09-21]
+-----------------------------
Improved speed of comparison by file content
Simplified and optimized calculation of accumulated file sizes
Added right-click context menu to main dialog
@@ -1245,8 +1265,8 @@ Solved possible issue with different file time precisions in multi-OS environmen
Updated German translation
-FreeFileSync 1.4
-----------------
+FreeFileSync 1.4 [2008-09-14]
+-----------------------------
Implemented generic multithreading class to keep "compare by content" and "file synchronization" responsive
Added status bar when comparing files (with additional status information for "compare by content")
Some further speed optimizations
@@ -1257,8 +1277,8 @@ Added "remaining files" as sync-progress information
Updated German translation
-FreeFileSync 1.3
-----------------
+FreeFileSync 1.3 [2008-09-07]
+-----------------------------
Maintain and load different configurations by drag&drop, load-button or command line
New function to delete files (or move them to recycle bin) manually on the UI (without having to re-compare):
Deleting folders results in deletion of all dependent files, subfolders on UI grid (also no re-compare needed)
@@ -1272,8 +1292,8 @@ Updated sources to become more Linux and Unicode friendly
Updated German translation
-FreeFileSync 1.2
-----------------
+FreeFileSync 1.2 [2008-08-31]
+-----------------------------
New progress indicator and status information when synchronizing:
->available for command line mode and UI mode: Status update and final error report
New progress information when comparing directories
@@ -1292,8 +1312,8 @@ Added different return values when used in command line mode to report success o
Updated German translation
-FreeFileSync 1.1
-----------------
+FreeFileSync 1.1 [2008-08-24]
+-----------------------------
Some further speed optimizations (sorting)
Written custom wxGrid class to avoid mapping of data to UI: huge performance increase (especially with formatted grids > 100000 items)
Filter files to include/exclude them from synchronization
@@ -1306,6 +1326,6 @@ Prepared code to support unicode in some future version
Updated German translation
-FreeFileSync 1.0
-----------------
+FreeFileSync 1.0 [2008-08-10]
+-----------------------------
Initial release
diff --git a/BUILD/FreeFileSync.chm b/BUILD/FreeFileSync.chm
index 5519353b..353494e5 100644
--- a/BUILD/FreeFileSync.chm
+++ b/BUILD/FreeFileSync.chm
Binary files differ
diff --git a/BUILD/Help/FreeFileSync.hhc b/BUILD/Help/FreeFileSync.hhc
index d3c318d1..1902cb14 100644
--- a/BUILD/Help/FreeFileSync.hhc
+++ b/BUILD/Help/FreeFileSync.hhc
@@ -20,44 +20,44 @@
<param name="Local" value="html\FreeFileSync.html">
</OBJECT>
<LI> <OBJECT type="text/sitemap">
- <param name="Name" value="Command line">
- <param name="Local" value="html\Command line.html">
+ <param name="Name" value="Command Line Usage">
+ <param name="Local" value="html\Command Line.html">
</OBJECT>
<LI> <OBJECT type="text/sitemap">
- <param name="Name" value="Comparison settings">
- <param name="Local" value="html\Comparison settings.html">
+ <param name="Name" value="Comparison Settings">
+ <param name="Local" value="html\Comparison Settings.html">
</OBJECT>
<LI> <OBJECT type="text/sitemap">
- <param name="Name" value="Daylight saving time">
- <param name="Local" value="html\Daylight saving time.html">
+ <param name="Name" value="Daylight Saving Time">
+ <param name="Local" value="html\Daylight Saving Time.html">
</OBJECT>
<LI> <OBJECT type="text/sitemap">
- <param name="Name" value="Exclude items">
- <param name="Local" value="html\Exclude items.html">
+ <param name="Name" value="Exclude Items">
+ <param name="Local" value="html\Exclude Items.html">
</OBJECT>
<LI> <OBJECT type="text/sitemap">
- <param name="Name" value="Expert settings">
- <param name="Local" value="html\Expert settings.html">
+ <param name="Name" value="Expert Settings">
+ <param name="Local" value="html\Expert Settings.html">
</OBJECT>
<LI> <OBJECT type="text/sitemap">
- <param name="Name" value="External applications">
- <param name="Local" value="html\External applications.html">
+ <param name="Name" value="External Applications">
+ <param name="Local" value="html\External Applications.html">
</OBJECT>
<LI> <OBJECT type="text/sitemap">
<param name="Name" value="Macros">
<param name="Local" value="html\Macros.html">
</OBJECT>
<LI> <OBJECT type="text/sitemap">
- <param name="Name" value="Schedule a batch job">
- <param name="Local" value="html\Schedule a batch job.html">
+ <param name="Name" value="Schedule a Batch Job">
+ <param name="Local" value="html\Schedule a Batch Job.html">
</OBJECT>
<LI> <OBJECT type="text/sitemap">
<param name="Name" value="Synchronize with FTP">
<param name="Local" value="html\Synchronize with FTP.html">
</OBJECT>
<LI> <OBJECT type="text/sitemap">
- <param name="Name" value="Variable drive letters">
- <param name="Local" value="html\Variable drive letters.html">
+ <param name="Name" value="Variable Drive Letters">
+ <param name="Local" value="html\Variable Drive Letters.html">
</OBJECT>
<LI> <OBJECT type="text/sitemap">
<param name="Name" value="Versioning">
@@ -79,8 +79,8 @@
<param name="Local" value="html\RealtimeSync.html">
</OBJECT>
<LI> <OBJECT type="text/sitemap">
- <param name="Name" value="Run as service">
- <param name="Local" value="html\Run as service.html">
+ <param name="Name" value="Run as Service">
+ <param name="Local" value="html\Run as Service.html">
</OBJECT>
</UL>
<LI> <OBJECT type="text/sitemap">
diff --git a/BUILD/Help/FreeFileSync.hhp b/BUILD/Help/FreeFileSync.hhp
index 713fab68..a9f19ebc 100644
--- a/BUILD/Help/FreeFileSync.hhp
+++ b/BUILD/Help/FreeFileSync.hhp
@@ -12,19 +12,19 @@ Title=FreeFileSync - Help
[FILES]
html\FreeFileSync.html
html\Versioning.html
-html\Command line.html
-html\Expert settings.html
-html\Comparison settings.html
-html\Daylight Saving time.html
-html\Exclude items.html
-html\External applications.html
+html\Command Line.html
+html\Expert Settings.html
+html\Comparison Settings.html
+html\Daylight Saving Time.html
+html\Exclude Items.html
+html\External Applications.html
html\Macros.html
-html\Schedule a batch job.html
+html\Schedule a Batch Job.html
html\Synchronize with FTP.html
-html\Variable drive letters.html
+html\Variable Drive Letters.html
html\Volume Shadow Copy.html
html\RealtimeSync.html
-html\Run as service.html
+html\Run as Service.html
html\Links.html
[INFOTYPES]
diff --git a/BUILD/Help/html/Batch Scripting.html b/BUILD/Help/html/Batch Scripting.html
deleted file mode 100644
index 6a3ce4b8..00000000
--- a/BUILD/Help/html/Batch Scripting.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD>
- <META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=windows-1252">
- <TITLE></TITLE>
- <META NAME="GENERATOR" CONTENT="OpenOffice.org 3.4.1 (Win32)">
- <META NAME="CREATED" CONTENT="20091206;16574000">
- <META NAME="CHANGED" CONTENT="20130206;19571611">
- <META NAME="Info 1" CONTENT="">
- <META NAME="Info 2" CONTENT="">
- <META NAME="Info 3" CONTENT="">
- <META NAME="Info 4" CONTENT="">
- <STYLE TYPE="text/css">
- <!--
- @page { margin: 2cm }
- P { margin-bottom: 0.21cm }
- H2.cjk { font-family: "SimSun" }
- H2.ctl { font-family: "Mangal" }
- -->
- </STYLE>
-</HEAD>
-<BODY LANG="en-US" DIR="LTR">
-<H2 CLASS="western"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4 STYLE="font-size: 15pt">Batch
-scripting</FONT></FONT></H2>
-<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">FreeFileSync
-can be called from command line and supports integration into batch
-scripts. This section gives some general hints and examples for
-Windows <FONT FACE="Courier New, monospace">*.cmd</FONT> and <FONT FACE="Courier New, monospace">*.bat</FONT>
-scripts.</FONT></P>
-
-<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">When
-FreeFileSync is started in batch mode (a <FONT FACE="Courier New, monospace">*.ffs_batch</FONT>
-file is passed as argument) it returns one of the following status
-codes:</FONT></P>
-
-<P STYLE="margin-left: 1.32cm; margin-bottom: 0cm"><SPAN ID="Rahmen6" DIR="LTR" STYLE="float: left; width: 80%; border: none; padding: 0cm; background: #e6e6e6">
- <P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm">
-<FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-style: normal"><B>Return
- Codes</B></SPAN><SPAN STYLE="font-style: normal"><BR>0 -
- Synchronization completed successfully<BR>1 - Synchronization
- completed with warnings<BR>2 - Synchronization completed with
- errors<BR>3 - Synchronization was aborted</SPAN></FONT> </P>
-</SPAN><BR CLEAR=LEFT><BR>
-</P>
-
-<P STYLE="margin-bottom: 0cm; font-weight: normal"><FONT FACE="Tahoma, sans-serif">Now
-you can check if synchronization was successful from a script:</FONT></P>
-<P STYLE="margin-left: 1.32cm; margin-bottom: 0cm"><SPAN ID="Rahmen6" DIR="LTR" STYLE="float: left; width: 80%; border: none; padding: 0cm; background: #e6e6e6">
- <P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm">
- <FONT FACE="Tahoma, sans-serif"><FONT FACE="Courier New, monospace">&quot;C:\Program
- Files\FreeFileSync\FreeFileSync.exe&quot; &quot;H:\some
- folder\SyncJob.ffs_batch&quot;<BR>if errorlevel 1 (<BR>&nbsp;&nbsp;</FONT><FONT COLOR="#808080"><FONT FACE="Courier New, monospace"><I><B>::if
- return code is 1 or greater, something went wrong, add special
- treatment here<BR>&nbsp;&nbsp;</B></I></FONT></FONT><FONT COLOR="#000000"><FONT FACE="Courier New, monospace"><SPAN STYLE="font-style: normal"><SPAN STYLE="font-weight: normal">echo
- Errors occurred during synchronization...</SPAN></SPAN></FONT></FONT><FONT COLOR="#808080"><FONT FACE="Courier New, monospace"><I><B><BR>&nbsp;&nbsp;</B></I></FONT></FONT><FONT FACE="Courier New, monospace">pause<BR>)</FONT></FONT></P>
-</SPAN><BR CLEAR=LEFT><BR>
-</P>
-<P STYLE="margin-left: 1.32cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Instead
-of displaying &quot;An error occurred!&quot; you can also send an
-email notification (using a third party tool).</FONT>
-</P>
-<P STYLE="margin-bottom: 0cm"><BR>
-</P>
-<P STYLE="margin-left: 1.32cm; margin-bottom: 0cm"><SPAN ID="Rahmen3" DIR="LTR" STYLE="float: left; width: 80%; border: 1px solid #000080; padding: 0.05cm; background: #ccccff">
- <P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm">
- <FONT FACE="Tahoma, sans-serif"><B>Attention<BR></B>Make sure your
- script is not blocked by a popup dialog. Consider the following
- options when setting up a FreeFileSync batch job:</FONT></P>
- <LI><P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Disable
- checkbox <SPAN STYLE="font-style: normal"><B>Show progress dialog</B></SPAN>
- or have <B>On completion</B> automatically close the results dialog
- after synchronization.</FONT></P>
- <LI><P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">Set
- e</SPAN></FONT><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-style: normal"><SPAN STYLE="font-weight: normal">rror
- handling</SPAN></SPAN></FONT> <FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">to
- </SPAN></FONT><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-style: normal"><B>Exit
- instantly</B></SPAN></FONT> <FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">or
- </SPAN></FONT><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-style: normal"><B>Ignore
- errors</B></SPAN></FONT><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">.</SPAN></FONT></P>
-</SPAN><BR CLEAR=LEFT><BR>
-</P>
-<P STYLE="margin-bottom: 0cm"><BR>
-</P>
-</BODY>
-</HTML> \ No newline at end of file
diff --git a/BUILD/Help/html/Command line.html b/BUILD/Help/html/Command line.html
index 3768d036..56d6ce13 100644
--- a/BUILD/Help/html/Command line.html
+++ b/BUILD/Help/html/Command line.html
@@ -20,25 +20,23 @@
</STYLE>
</HEAD>
<BODY LANG="en-US" DIR="LTR">
-<H2 CLASS="western"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4 STYLE="font-size: 15pt">Command
-line</FONT></FONT></H2>
+<H2 CLASS="western"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4 STYLE="font-size: 15pt">Command Line Usage</FONT></FONT></H2>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">FreeFileSync
enables additional synchronization scenarios via a command line interface. To get a syntax overview, open the console, go to the directory where FreeFileSync is installed and type:</FONT></P>
<P STYLE="margin-left: 1.32cm; margin-bottom: 0cm"><SPAN ID="Rahmen4" DIR="LTR" STYLE="float: left; width: 80%; height: 0.04cm; border: none; padding: 0cm; background: #e6e6e6">
- <P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><FONT FACE="Courier New, monospace">FreeFileSync
- -h</FONT></FONT></P>
+ <P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Courier New, monospace">FreeFileSync
+ -h</FONT></P>
</SPAN><BR CLEAR=LEFT><BR>
</P>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>1.
Run a FreeFileSync batch job</B></FONT></P>
-<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">In order to start synchronization in batch mode, supply the path of a
-<FONT FACE="Courier New, monospace">*.ffs_batch</FONT>
-configuration as the first argument for FreeFileSync.exe:</FONT></P>
+<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">In order to start synchronization in batch mode, supply the path of a ffs_batch
+configuration file as the first argument for FreeFileSync.exe:</FONT></P>
<P STYLE="margin-left: 1.32cm; margin-bottom: 0cm"><SPAN ID="Rahmen1" DIR="LTR" STYLE="float: left; width: 80%; height: 0.04cm; border: none; padding: 0cm; background: #e6e6e6">
- <P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><FONT FACE="Courier New, monospace">FreeFileSync
- &quot;D:\Backup </FONT><FONT FACE="Courier New, monospace">Projects</FONT><FONT FACE="Courier New, monospace">.ffs_batch&quot;</FONT></FONT></P>
+ <P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Courier New, monospace">FreeFileSync
+ &quot;D:\Backup Projects.ffs_batch&quot;</FONT></P>
</SPAN><BR CLEAR=LEFT><BR>
</P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">After
@@ -52,18 +50,18 @@ synchronization one of the following status codes is returned:</FONT></P>
</P>
</SPAN><BR CLEAR=LEFT><BR>
</P>
-<P STYLE="margin-bottom: 0cm; font-weight: normal"><FONT FACE="Tahoma, sans-serif">You
-can evaluate these codes from a script (e.g. a <FONT FACE="Courier New, monospace">*.cmd</FONT>
-or <FONT FACE="Courier New, monospace">*.bat</FONT> file on Windows)
+<P STYLE="margin-bottom: 0cm; font-weight: normal"><FONT FACE="Tahoma, sans-serif">
+You can evaluate these codes from a script (e.g. a cmd or bat file on Windows)
and check if synchronization completed successfully:</FONT></P>
<P STYLE="margin-left: 1.32cm; margin-bottom: 0cm"><SPAN ID="Rahmen6" DIR="LTR" STYLE="float: left; width: 80%; height: 0.04cm; border: none; padding: 0cm; background: #e6e6e6">
- <P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><FONT FACE="Courier New, monospace">&quot;C:\Program
- Files\FreeFileSync\FreeFileSync.exe&quot; &quot;D:\Backup
- </FONT><FONT FACE="Courier New, monospace">Projects</FONT><FONT FACE="Courier New, monospace">.ffs_batch&quot;<BR>if
- errorlevel 1 (<BR>&nbsp;&nbsp;</FONT><FONT COLOR="#808080"><FONT FACE="Courier New, monospace"><I><B>::if
- return code is 1 or greater, something went wrong, add special
- treatment here<BR>&nbsp;&nbsp;</B></I></FONT></FONT><SPAN STYLE="font-variant: normal"><FONT COLOR="#000000"><FONT FACE="Courier New, monospace"><SPAN STYLE="font-style: normal"><SPAN STYLE="font-weight: normal">echo
- Errors occurred during synchronization...</SPAN></SPAN></FONT></FONT></SPAN><FONT COLOR="#808080"><FONT FACE="Courier New, monospace"><I><B><BR>&nbsp;&nbsp;</B></I></FONT></FONT><FONT FACE="Courier New, monospace">pause<BR>)</FONT></FONT></P>
+ <P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Courier New, monospace">&quot;C:\Program
+ Files\FreeFileSync\FreeFileSync.exe&quot; &quot;D:\Backup Projects.ffs_batch&quot;<BR>
+ if errorlevel 1 (<BR>
+ &nbsp;&nbsp;<FONT COLOR="#808080"><I><B>::if return code is 1 or greater, something went wrong, add special treatment here<BR>
+ &nbsp;&nbsp;</B></I></FONT>echo Errors occurred during synchronization...<BR>
+ &nbsp;&nbsp;pause<BR>
+ )</FONT>
+ </P>
</SPAN><BR CLEAR=LEFT><BR>
</P>
<P STYLE="margin-left: 1.32cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Instead
@@ -87,7 +85,7 @@ email notification (using a third party tool).</FONT>
</P>
<LI><P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm">
- <FONT FACE="Tahoma, sans-serif">Set error handling to <B>Exit instantly</B> or <B>Ignore errors</B>.</FONT>
+ <FONT FACE="Tahoma, sans-serif">Set error handling to <B>Stop</B> or <B>Ignore</B>.</FONT>
</P>
</SPAN><BR CLEAR=LEFT><BR>
@@ -97,22 +95,16 @@ email notification (using a third party tool).</FONT>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>2.
Start a FreeFileSync GUI configuration</B></FONT></P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">If you
-pass a <FONT FACE="Courier New, monospace">*.ffs_gui</FONT>
-file, FreeFileSync will start in GUI mode and immediately start
-comparison (but only if all directories exist):</FONT></P>
+pass a ffs_gui file, FreeFileSync will start in GUI mode and immediately start comparison (but only if all directories exist):</FONT></P>
<P STYLE="margin-left: 1.32cm; margin-bottom: 0cm"><SPAN ID="Rahmen2" DIR="LTR" STYLE="float: left; width: 80%; height: 0.04cm; border: none; padding: 0cm; background: #e6e6e6">
- <P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Courier New, monospace">FreeFileSync
- &quot;D:\Manual Backup.ffs_gui&quot;</FONT></P>
+ <P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Courier New, monospace">FreeFileSync &quot;D:\Manual Backup.ffs_gui&quot;</FONT></P>
</SPAN><BR CLEAR=LEFT><BR>
</P>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>3.
Customize an existing configuration</B></FONT></P>
-<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">You can
-replace the directories of a given <FONT FACE="Courier New, monospace">*.ffs_gui
-</FONT>or <FONT FACE="Courier New, monospace">*.ffs_batch
-</FONT>configuration by using the <FONT FACE="Courier New, monospace">-leftdir</FONT>
+<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">You can replace the directories of a given ffs_gui or ffs_batch configuration file by using the <FONT FACE="Courier New, monospace">-leftdir</FONT>
and <FONT FACE="Courier New, monospace">-rightdir</FONT> parameters:</FONT></P>
<P STYLE="margin-left: 1.32cm; margin-bottom: 0cm"><SPAN ID="Rahmen5" DIR="LTR" STYLE="float: left; width: 80%; height: 0.04cm; border: none; padding: 0cm; background: #e6e6e6">
<P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm">
@@ -121,8 +113,7 @@ and <FONT FACE="Courier New, monospace">-rightdir</FONT> parameters:</FONT></P>
</P>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
-<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>4.
-Merge multiple configurations</B></FONT></P>
+<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>4. Merge multiple configurations</B></FONT></P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">When
more than one configuration file is provided, FreeFileSync will merge
everything into a single configuration with multiple folder pairs and
diff --git a/BUILD/Help/html/Comparison Settings.html b/BUILD/Help/html/Comparison Settings.html
index af17c5c3..132cb15e 100644
--- a/BUILD/Help/html/Comparison Settings.html
+++ b/BUILD/Help/html/Comparison Settings.html
@@ -24,11 +24,9 @@
</STYLE>
</HEAD>
<BODY LANG="en-US" DIR="LTR">
-<H2 CLASS="western"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4 STYLE="font-size: 15pt">Comparison
-settings</FONT></FONT></H2>
-<P STYLE="margin-bottom: 0cm"><IMG SRC="../img/CmpSettings.png" NAME="Grafik1" ALIGN=BOTTOM WIDTH=219 HEIGHT=267 BORDER=0></P>
-<H3 CLASS="western" STYLE="page-break-after: avoid"><FONT FACE="Tahoma, sans-serif">I.
-Compare by &quot;File time and size&quot;</FONT></H3>
+<H2 CLASS="western"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4 STYLE="font-size: 15pt">Comparison Settings</FONT></FONT></H2>
+<P STYLE="margin-bottom: 0cm"><IMG SRC="../img/CmpSettings.png" NAME="Grafik1" ALIGN=BOTTOM BORDER=0></P>
+<H3 CLASS="western" STYLE="page-break-after: avoid"><FONT FACE="Tahoma, sans-serif">I. Compare by <i>File time and size</i></FONT></H3>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">This
variant considers two files with the same name as equal when both
modification time <B>and</B> file size match. The following
@@ -66,8 +64,7 @@ categories are distinguished:</FONT></P>
</OL>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
-<H3 CLASS="western" STYLE="page-break-after: avoid"><FONT FACE="Tahoma, sans-serif">II.
-Compare by &quot;File content&quot;</FONT></H3>
+<H3 CLASS="western" STYLE="page-break-after: avoid"><FONT FACE="Tahoma, sans-serif">II. Compare by <i>File content</i></FONT></H3>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Two
files with the same name are marked as equal if and only if they have
the same content. This option is more useful for consistency checks
@@ -96,10 +93,8 @@ modification time is not taken into account at all.</FONT></P>
</OL>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
-<H3 CLASS="western"><FONT FACE="Tahoma, sans-serif">Symbolic link
-handling</FONT></H3>
-<P STYLE="margin-bottom: 0cm"><BR>
-</P>
+<H3 CLASS="western"><FONT FACE="Tahoma, sans-serif">Symbolic Link Handling</FONT></H3>
+<BR>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">FreeFileSync
offers three options to configure handling of symbolic links (also
called symlinks or soft links):</FONT></P>
diff --git a/BUILD/Help/html/Daylight Saving Time.html b/BUILD/Help/html/Daylight Saving Time.html
index 126ab928..8cc5601c 100644
--- a/BUILD/Help/html/Daylight Saving Time.html
+++ b/BUILD/Help/html/Daylight Saving Time.html
@@ -20,27 +20,26 @@
</STYLE>
</HEAD>
<BODY LANG="en-US" DIR="LTR">
-<H2 CLASS="western"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4 STYLE="font-size: 15pt"><SPAN STYLE="font-style: normal">Daylight
-saving time </SPAN><SPAN STYLE="font-style: normal"><SPAN STYLE="font-weight: normal">(Windows)</SPAN></SPAN></FONT></FONT></H2>
+<H2 CLASS="western"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4 STYLE="font-size: 15pt"><SPAN STYLE="font-style: normal">Daylight Saving Time </SPAN><SPAN STYLE="font-style: normal"><SPAN STYLE="font-weight: normal">(Windows)</SPAN></SPAN></FONT></FONT></H2>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">A
-common problem synchronization software has to deal with are +-1 hour
+common problem synchronization software has to handle are +-1 hour
file time shifts after a Daylight Saving Time (DST) switch has
occurred. This can be observed for example when a FAT-formatted
-volume is compared against an NTFS volume as frequently happens with
-USB memory sticks. Files that previously appeared to be in sync are
-now shown with a one hour modification time offset, although they
-have not been modified by the user or by other means.</FONT></P>
+volume is compared against an NTFS volume as is the case when synchronizing a local disk against a
+USB memory stick. Files that previously appeared to be in sync are
+now shown with an one hour modification time offset, although they
+have not been modified by the user or the operating system.</FONT></P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">The
-reason for this strange behavior lies in the way NTFS and FAT drives
+reason for this behavior lies in the way NTFS and FAT drives
store file times: NTFS stores time in UTC format, while FAT uses
local time.</FONT></P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">When
-times stored in these two different formats are compared, one format
-has to be converted into the other first. In both cases Windows uses
-the current DST status as well as current time zone information for
+times of these two different formats are compared, one format
+has to be converted into the other first. In either way Windows uses
+the current DST status as well as the current time zone for
its calculations. Consequently the result of this comparison is
dependent from current system settings and in particular file times
-that used to be the same can show up as different after a DST switch.</FONT></P>
+that used to be the same can show up as different after a DST switch or when the time zone is changed.</FONT></P>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">For a
@@ -49,8 +48,8 @@ detailed discussion about this issue refer to:
<P STYLE="margin-bottom: 0cm"><BR>
</P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Solution:</B></FONT></P>
-<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Luckily
-FreeFileSync users need not to worry about this issue. Each file on a
+<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">
+FreeFileSync automatically handles this problem by adding the missing time information. Each file on a
FAT volume automatically gets additional meta data encoded in its
creation date that enables a correct file time calculation. This not
only solves all DST issues but also time shifts that occur due to
@@ -62,7 +61,7 @@ travel between different time zones.</FONT></P>
<LI><P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">In
order for FreeFileSync to start handling DST and timezone
differences, an initial full synchronization is required.
- Subsequent syncs will never show a time difference again.</FONT></P>
+ Subsequent syncs will then never show a time difference again for unchanged files.</FONT></P>
<LI><P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm; font-style: normal">
<FONT FACE="Tahoma, sans-serif">If a FAT volume is scanned the
first time by FreeFileSync this will take longer than usual since
diff --git a/BUILD/Help/html/Exclude Items.html b/BUILD/Help/html/Exclude Items.html
index 22d46b78..d14055fd 100644
--- a/BUILD/Help/html/Exclude Items.html
+++ b/BUILD/Help/html/Exclude Items.html
@@ -21,11 +21,10 @@
</STYLE>
</HEAD>
<BODY LANG="en-US" DIR="LTR">
-<H2 CLASS="western"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4 STYLE="font-size: 15pt">Exclude
-items</FONT></FONT></H2>
+<H2 CLASS="western"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4 STYLE="font-size: 15pt">Exclude Items</FONT></FONT></H2>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Files
and directories are only considered for synchronization if they pass
-the filter. They have to match <B>at least one</B> entry in the
+all filter rules. They have to match <B>at least one</B> entry in the
include list and <B>none</B> of the entries in the exclude list:</FONT></P>
<P STYLE="margin-left: 1.32cm; margin-bottom: 0cm"><SPAN ID="Rahmen2" DIR="LTR" STYLE="float: left; width: 80%; border: none; padding: 0cm; background: #e6e6e6">
@@ -41,9 +40,8 @@ include list and <B>none</B> of the entries in the exclude list:</FONT></P>
</P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Example:</B></FONT>
-<FONT FACE="Tahoma, sans-serif">Exclude items for mirror-sync from
-</FONT><FONT FACE="Courier New, monospace">C:\Source</FONT> <FONT FACE="Tahoma, sans-serif">to
-</FONT><FONT FACE="Courier New, monospace">D:\Target</FONT></P>
+<FONT FACE="Tahoma, sans-serif">Exclude items for mirror-sync from <FONT FACE="Courier New, monospace">C:\Source</FONT> to <FONT FACE="Courier New, monospace">D:\Target</FONT></FONT>
+</P>
<P STYLE="margin-left: 1.32cm; margin-bottom: 0cm"><SPAN ID="Rahmen1" DIR="LTR" STYLE="float: left; width: 80%; border: none; padding: 0cm; background: #e6e6e6">
<TABLE DIR="LTR" WIDTH=100% CELLPADDING=0 CELLSPACING=0>
@@ -67,16 +65,15 @@ include list and <B>none</B> of the entries in the exclude list:</FONT></P>
<TR>
<TD WIDTH=65% STYLE="border-top: none; border-bottom: 1px solid #000000; border-left: none; border-right: none; padding-top: 0cm; padding-bottom: 0.05cm; padding-left: 0cm; padding-right: 0cm">
<P ALIGN=LEFT STYLE="margin-left: 0.79cm"><FONT FACE="Tahoma, sans-serif">Single folder
- <FONT FACE="Courier New, monospace">C:\Source\subfolder</FONT></FONT></P>
+ <FONT FACE="Courier New, monospace">C:\Source\SubFolder</FONT></FONT></P>
</TD>
<TD WIDTH=35% STYLE="border-top: none; border-bottom: 1px solid #000000; border-left: 1px solid #000000; border-right: none; padding-top: 0cm; padding-bottom: 0.05cm; padding-left: 0.05cm; padding-right: 0cm">
- <P ALIGN=LEFT STYLE="margin-left: 0.79cm"><FONT FACE="Courier New, monospace">\subfolder\</FONT></P>
+ <P ALIGN=LEFT STYLE="margin-left: 0.79cm"><FONT FACE="Courier New, monospace">\SubFolder\</FONT></P>
</TD>
</TR>
<TR>
<TD WIDTH=65% STYLE="border-top: none; border-bottom: 1px solid #000000; border-left: none; border-right: none; padding-top: 0cm; padding-bottom: 0.05cm; padding-left: 0cm; padding-right: 0cm">
- <P ALIGN=LEFT STYLE="margin-left: 0.79cm"><FONT FACE="Tahoma, sans-serif">All files (and
- folders) named <FONT FACE="Courier New, monospace">thumbs.db</FONT>
+ <P ALIGN=LEFT STYLE="margin-left: 0.79cm"><FONT FACE="Tahoma, sans-serif">All files (and folders) named <FONT FACE="Courier New, monospace">thumbs.db</FONT>
</FONT>
</P>
</TD>
@@ -86,19 +83,15 @@ include list and <B>none</B> of the entries in the exclude list:</FONT></P>
</TR>
<TR>
<TD WIDTH=65% STYLE="border-top: none; border-bottom: 1px solid #000000; border-left: none; border-right: none; padding-top: 0cm; padding-bottom: 0.05cm; padding-left: 0cm; padding-right: 0cm">
- <P ALIGN=LEFT STYLE="margin-left: 0.79cm"><FONT FACE="Tahoma, sans-serif">All <FONT FACE="Courier New, monospace">*.tmp</FONT>
- files located in <FONT FACE="Courier New, monospace">subfolder</FONT>
- only</FONT></P>
+ <P ALIGN=LEFT STYLE="margin-left: 0.79cm"><FONT FACE="Tahoma, sans-serif">All <FONT FACE="Courier New, monospace">*.tmp</FONT> files located in <FONT FACE="Courier New, monospace">SubFolder</FONT> only</FONT></P>
</TD>
<TD WIDTH=35% STYLE="border-top: none; border-bottom: 1px solid #000000; border-left: 1px solid #000000; border-right: none; padding-top: 0cm; padding-bottom: 0.05cm; padding-left: 0.05cm; padding-right: 0cm">
- <P ALIGN=LEFT STYLE="margin-left: 0.79cm"><FONT FACE="Courier New, monospace">\subfolder\*.tmp</FONT></P>
+ <P ALIGN=LEFT STYLE="margin-left: 0.79cm"><FONT FACE="Courier New, monospace">\SubFolder\*.tmp</FONT></P>
</TD>
</TR>
<TR>
<TD WIDTH=65% STYLE="border-top: none; border-bottom: 1px solid #000000; border-left: none; border-right: none; padding-top: 0cm; padding-bottom: 0.05cm; padding-left: 0cm; padding-right: 0cm">
- <P ALIGN=LEFT STYLE="margin-left: 0.79cm"><FONT FACE="Tahoma, sans-serif">Files and folders
- containing <FONT FACE="Courier New, monospace">temp</FONT>
- somewhere in their path</FONT></P>
+ <P ALIGN=LEFT STYLE="margin-left: 0.79cm"><FONT FACE="Tahoma, sans-serif">Files and folders containing <FONT FACE="Courier New, monospace">temp</FONT> somewhere in their path</FONT></P>
</TD>
<TD WIDTH=35% STYLE="border-top: none; border-bottom: 1px solid #000000; border-left: 1px solid #000000; border-right: none; padding-top: 0cm; padding-bottom: 0.05cm; padding-left: 0.05cm; padding-right: 0cm">
<P ALIGN=LEFT STYLE="margin-left: 0.79cm"><FONT FACE="Courier New, monospace">*temp*</FONT></P>
@@ -124,8 +117,7 @@ include list and <B>none</B> of the entries in the exclude list:</FONT></P>
</TR>
<TR>
<TD WIDTH=65% STYLE="border: none; padding: 0cm">
- <P ALIGN=LEFT STYLE="margin-left: 0.79cm"><FONT FACE="Tahoma, sans-serif">Exclude only *.txt files
-located in subdirectories of base directories</FONT></P>
+ <P ALIGN=LEFT STYLE="margin-left: 0.79cm"><FONT FACE="Tahoma, sans-serif">Exclude only <FONT FACE="Courier New, monospace">*.txt</FONT> files located in subdirectories of base directories</FONT></P>
</TD>
<TD WIDTH=35% STYLE="border-top: none; border-bottom: none; border-left: 1px solid #000000; border-right: none; padding-top: 0cm; padding-bottom: 0cm; padding-left: 0.05cm; padding-right: 0cm">
<P ALIGN=LEFT STYLE="margin-left: 0.79cm"><FONT FACE="Courier New, monospace">\*\*.txt</FONT></P>
@@ -137,7 +129,7 @@ located in subdirectories of base directories</FONT></P>
</SPAN><BR CLEAR=LEFT><BR>
</P>
-
+<BR>
<P STYLE="margin-left: 1.32cm; margin-bottom: 0cm"><SPAN ID="Rahmen4" DIR="LTR" STYLE="float: left; width: 80%; border: 1px solid #000080; padding: 0.05cm; background: #ccccff">
<P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Note</B></FONT></P>
<LI><P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">For
@@ -146,7 +138,7 @@ located in subdirectories of base directories</FONT></P>
<LI><P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm; font-variant: normal; font-style: normal">
<FONT FACE="Tahoma, sans-serif">A filter phrase is compared against
both file and directory paths. If you want to consider directories
- only, you can give a hint by appending a path separator (<FONT FACE="Courier New, monospace"><B>\</B></FONT>).</FONT></P>
+ only, you can give a hint by appending a path separator (<B>\</B>).</FONT></P>
</SPAN><BR CLEAR=LEFT><BR>
</P>
<P STYLE="margin-bottom: 0cm"><BR>
diff --git a/BUILD/Help/html/Expert settings.html b/BUILD/Help/html/Expert settings.html
index 32064162..b0ffb459 100644
--- a/BUILD/Help/html/Expert settings.html
+++ b/BUILD/Help/html/Expert settings.html
@@ -21,25 +21,25 @@
</STYLE>
</HEAD>
<BODY LANG="en-US" DIR="LTR">
-<H2 CLASS="western"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4 STYLE="font-size: 15pt">Expert
-settings</FONT></FONT></H2>
+<H2 CLASS="western"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4 STYLE="font-size: 15pt">Expert Settings</FONT></FONT></H2>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">FreeFileSync
has a number of special purpose settings that can only be accessed
-directly via the global configuration file &quot;<FONT FACE="Courier New, monospace">GlobalSettings.xml</FONT>&quot;.
-To locate this file enter &quot;<FONT FACE="Courier New, monospace">%appdata%\FreeFileSync</FONT>&quot;
-in the Windows Explorer address bar or go to the FreeFileSync
+directly via the global configuration file <FONT FACE="Courier New, monospace">GlobalSettings.xml</FONT>.
+To locate this file enter <FONT FACE="Courier New, monospace">%appdata%\FreeFileSync</FONT> in the Windows Explorer address bar or go to the FreeFileSync
installation folder if you are using the portable installation.</FONT></P>
-<P STYLE="margin-bottom: 0cm"><BR>
-</P>
-<P STYLE="margin-left: 1.32cm; margin-bottom: 0cm"><SPAN ID="Rahmen6" DIR="LTR" STYLE="float: left; width: 80%; height: 0.04cm; border: none; padding: 0cm; background: #e6e6e6">
- <P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Courier New, monospace">&lt;?xml
- version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;<BR>&lt;FreeFileSync
- XmlType=&quot;GLOBAL&quot;&gt;<BR>&nbsp;&nbsp;&nbsp;&nbsp;&lt;Shared&gt;<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;<B>FileTimeTolerance</B>
- Seconds=&quot;2&quot;/&gt;<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;<B>RunWithBackgroundPriority</B>
- Enabled=&quot;false&quot;/&gt;<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;<B>LockDirectoriesDuringSync</B>
- Enabled=&quot;true&quot;/&gt;<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;<B>VerifyCopiedFiles</B>
- Enabled=&quot;false&quot;/&gt;<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;<B>LastSyncsLogSizeMax</B>
- Bytes=&quot;100000&quot;/&gt;</FONT></P>
+
+<P STYLE="margin-left: 1.32cm; margin-bottom: 0cm"><SPAN ID="Rahmen6" DIR="LTR" STYLE="float: left; width: 80%; border: none; padding: 0cm; background: #e6e6e6">
+ <P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm">
+ <FONT FACE="Courier New, monospace">
+ &lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;<BR>
+ &lt;FreeFileSync XmlType=&quot;GLOBAL&quot;&gt;<BR>
+ &nbsp;&nbsp;&nbsp;&nbsp;&lt;Shared&gt;<BR>
+ &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;<B>FileTimeTolerance</B> Seconds=&quot;2&quot;/&gt;<BR>
+ &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;<B>RunWithBackgroundPriority</B> Enabled=&quot;false&quot;/&gt;<BR>
+ &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;<B>LockDirectoriesDuringSync</B> Enabled=&quot;true&quot;/&gt;<BR>
+ &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;<B>VerifyCopiedFiles</B> Enabled=&quot;false&quot;/&gt;<BR>
+ &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;<B>LastSyncsLogSizeMax</B> Bytes=&quot;100000&quot;/&gt;
+ </FONT></P>
</SPAN><BR CLEAR=LEFT><BR>
</P>
<P STYLE="margin-bottom: 0cm"><BR>
@@ -66,7 +66,7 @@ significantly slower synchronization speed.</FONT></P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>LockDirectoriesDuringSync:</B></FONT><BR><FONT FACE="Tahoma, sans-serif">In
order to avoid race conditions of multiple FreeFileSync instances
writing to the same folder at the same time, accesses are serialized
-by lock files (&quot;</FONT><FONT FACE="Courier New, monospace">sync.ffs_lock</FONT><FONT FACE="Tahoma, sans-serif">&quot;).
+by lock files (<FONT FACE="Courier New, monospace">sync.ffs_lock</FONT>).
This allows to operate FreeFileSync with an arbitrary number of users
in a network out of the box.</FONT></P>
<P STYLE="margin-bottom: 0cm"><BR>
@@ -83,8 +83,7 @@ destination successfully?</FONT></A></P>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>LastSyncsLogSizeMax:<BR></B></FONT><FONT FACE="Tahoma, sans-serif">The
-progress logs of the most recent synchronizations (for both GUI and
-batch jobs) are collected automatically in the file &quot;</FONT><FONT FACE="Courier New, monospace">LastSyncs.log</FONT><FONT FACE="Tahoma, sans-serif">&quot;.
+progress logs of the most recent synchronizations (for both GUI and batch jobs) are collected automatically in the file <FONT FACE="Courier New, monospace">LastSyncs.log</FONT>.
The maximum size of this log file can be set here.</FONT></P>
</BODY>
</HTML> \ No newline at end of file
diff --git a/BUILD/Help/html/External Applications.html b/BUILD/Help/html/External Applications.html
index 74e5fd0a..e4ccdbaf 100644
--- a/BUILD/Help/html/External Applications.html
+++ b/BUILD/Help/html/External Applications.html
@@ -20,33 +20,25 @@
</STYLE>
</HEAD>
<BODY LANG="en-US" DIR="LTR">
-<H2 CLASS="western"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4 STYLE="font-size: 15pt">External
-applications</FONT></FONT></H2>
-<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">By
-default FreeFileSync opens the operating system's file browser on
-each mouse double-click by invoking &quot;</FONT><FONT FACE="Courier New, monospace">explorer
-/select, &quot;%item_path%&quot;</FONT><FONT FACE="Tahoma, sans-serif">&quot;
-on Windows and &quot;</FONT><FONT FACE="Courier New, monospace">xdg-open
-&quot;%item_folder%&quot;</FONT><FONT FACE="Tahoma, sans-serif">&quot;
-on Linux.</FONT></P>
-<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">However
-you may integrate other external applications into FreeFileSync:
-navigate to </FONT><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-style: normal"><B>Menu
-&rarr; Advanced &rarr; Global settings: External Applications</B></SPAN></FONT>
-<FONT FACE="Tahoma, sans-serif">and add or replace a command. The
-first entry is executed when double-clicking a row or pressing ENTER
-on main grid while all other entries can only be accessed via the
-context menu shown after a right-click. The following internal macros
-are available:</FONT></P>
+<H2 CLASS="western"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4 STYLE="font-size: 15pt">External Applications</FONT></FONT></H2>
+<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">
+When you double-click on one of the rows on the main dialog, FreeFileSync opens the operating system's file browser by default. On Windows it calls <FONT FACE="Courier New, monospace">explorer /select, &quot;%item_path%&quot;</FONT>, on Linux <FONT FACE="Courier New, monospace">xdg-open &quot;%item_folder%&quot;</FONT> and on OS X <FONT FACE="Courier New, monospace">open -R &quot;%item_path%&quot;</FONT>.
+</FONT>
+</P>
+<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">You can customize this behavior and integrate other external applications into FreeFileSync:
+Navigate to </FONT><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-style: normal"><B>Menu
+&rarr; Tools &rarr; Global settings: Customize context menu</B></SPAN></FONT>
+<FONT FACE="Tahoma, sans-serif">and add or replace a command. The first entry is executed when double-clicking a row on main grid or pressing ENTER while all other entries can be accessed via the
+context menu shown after a right mouse click. The following macros
+can be used:</FONT></P>
<P STYLE="margin-left: 1.32cm; margin-bottom: 0cm"><SPAN ID="Rahmen3" DIR="LTR" STYLE="float: left; width: 80%; border: none; padding: 0cm; background: #e6e6e6">
<P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm">
- <FONT FACE="Courier New, monospace">%item_path%&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;-
- <FONT FACE="Tahoma, sans-serif">full file or folder
- name</FONT><BR>%item_folder% &nbsp;&nbsp;- <FONT FACE="Tahoma, sans-serif">folder
- part only</FONT><BR>%item2_path%&nbsp;&nbsp;&nbsp;&nbsp;-
- <FONT FACE="Tahoma, sans-serif">Counterpart of %item_path% on the
- opposite grid</FONT><BR>%item2_folder%&nbsp;&nbsp;- <FONT FACE="Tahoma, sans-serif">Counterpart
- of %item_folder% on the opposite grid</FONT></FONT></P>
+ <FONT FACE="Courier New, monospace">
+ %item_path%&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- <FONT FACE="Tahoma, sans-serif">full file or folder name</FONT><BR>
+ %item_folder% &nbsp;&nbsp;- <FONT FACE="Tahoma, sans-serif">folder part only</FONT><BR>
+ %item2_path%&nbsp;&nbsp;&nbsp;&nbsp;- <FONT FACE="Tahoma, sans-serif">Counterpart of %item_path% on the opposite grid</FONT><BR>
+ %item2_folder%&nbsp;&nbsp;- <FONT FACE="Tahoma, sans-serif">Counterpart of %item_folder% on the opposite grid</FONT>
+ </FONT></P>
</SPAN><BR CLEAR=LEFT><BR>
</P>
<P STYLE="margin-bottom: 0cm"><BR>
@@ -57,21 +49,15 @@ are available:</FONT></P>
visual difference tool:<BR><FONT FACE="Courier New, monospace">&quot;C:\Program
Files\WinMerge\WinMergeU.exe&quot; &quot;%item_path%&quot;
&quot;%item2_path%&quot;<BR>&nbsp;</FONT></FONT></P>
- <LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Show
- file in Windows Explorer:<BR><FONT FACE="Courier New, monospace">explorer
+ <LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Show file in Windows Explorer:<BR><FONT FACE="Courier New, monospace">explorer
/select, &quot;%item_path%&quot;<BR>&nbsp;</FONT></FONT></P>
- <LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Open
- file in associated application:</FONT><BR><FONT FACE="Courier New, monospace">cmd
- /c start &quot;&quot; &quot;%item_path%&quot; </FONT><FONT FACE="Tahoma, sans-serif">or
- simply</FONT> <FONT FACE="Courier New, monospace">&quot;%item_path%&quot;</FONT><FONT FACE="Tahoma, sans-serif"><BR>&nbsp;</FONT></P>
- <LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Open
- console dialog:<BR><FONT FACE="Courier New, monospace">cmd /k cd /D
- &quot;%item_folder%&quot;<BR>&nbsp;</FONT></FONT></P>
+ <LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Open file in associated application:</FONT><BR><FONT FACE="Courier New, monospace">cmd
+ /c start &quot;&quot; &quot;%item_path%&quot; </FONT><FONT FACE="Tahoma, sans-serif">or simply</FONT> <FONT FACE="Courier New, monospace">&quot;%item_path%&quot;</FONT><FONT FACE="Tahoma, sans-serif"><BR>&nbsp;</FONT></P>
+ <LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Open console dialog:<BR><FONT FACE="Courier New, monospace">cmd /k cd /D &quot;%item_folder%&quot;<BR>&nbsp;</FONT></FONT></P>
</UL>
<P STYLE="margin-left: 1.32cm; margin-bottom: 0cm"><SPAN ID="Rahmen1" DIR="LTR" STYLE="float: left; width: 80%; border: 1px solid #000080; padding: 0.05cm; background: #ccccff">
<P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm">
- <FONT FACE="Tahoma, sans-serif"><B>Note</B><BR>Don't forget to use
- quotation marks if file names contain spaces!</FONT></P>
+ <FONT FACE="Tahoma, sans-serif"><B>Note</B><BR>You need to protect macros with quotation marks if they can resolve to a file path with space characters.</FONT></P>
</SPAN><BR CLEAR=LEFT><BR>
</P>
</BODY>
diff --git a/BUILD/Help/html/FreeFileSync.html b/BUILD/Help/html/FreeFileSync.html
index e22a47c0..2812f282 100644
--- a/BUILD/Help/html/FreeFileSync.html
+++ b/BUILD/Help/html/FreeFileSync.html
@@ -27,17 +27,17 @@ Comparison and Synchronization</SPAN></I></FONT></H3>
<H3 CLASS="western" ALIGN=LEFT>Usage:</H3>
<OL>
<LI VALUE=1><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Choose
- left and right directories.<BR></FONT><IMG SRC="../img/SourceTarget.png" NAME="Grafik4" ALIGN=TEXTTOP WIDTH=426 HEIGHT=50 BORDER=0></P>
+ left and right directories.<BR></FONT><IMG SRC="../img/SourceTarget.png" NAME="Grafik4" ALIGN=TEXTTOP BORDER=0></P>
<P STYLE="margin-bottom: 0cm">&nbsp;</P>
<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-style: normal"><B>Compare</B></SPAN></FONT><FONT FACE="Tahoma, sans-serif">
- them.<BR></FONT><IMG SRC="../img/CompareButton.png" NAME="Grafik1" ALIGN=BOTTOM WIDTH=178 HEIGHT=44 BORDER=0></P>
+ them.<BR></FONT><IMG SRC="../img/CompareButton.png" NAME="Grafik1" ALIGN=BOTTOM BORDER=0></P>
<P STYLE="margin-bottom: 0cm">&nbsp;</P>
<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Select
- synchronization settings.<BR></FONT><IMG SRC="../img/SyncConfigButton.png" NAME="Grafik3" ALIGN=BOTTOM WIDTH=44 HEIGHT=44 BORDER=0></P>
+ synchronization settings.<BR></FONT><IMG SRC="../img/SyncConfigButton.png" NAME="Grafik3" ALIGN=BOTTOM BORDER=0></P>
<P STYLE="margin-bottom: 0cm">&nbsp;</P>
<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Press
</FONT><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-style: normal"><B>Synchronize</B></SPAN></FONT><FONT FACE="Tahoma, sans-serif">
- to begin synchronization.<BR></FONT><IMG SRC="../img/SynchronizeButton.png" NAME="Grafik2" ALIGN=BOTTOM WIDTH=178 HEIGHT=44 BORDER=0></P>
+ to begin synchronization.<BR></FONT><IMG SRC="../img/SynchronizeButton.png" NAME="Grafik2" ALIGN=BOTTOM BORDER=0></P>
</OL>
<P STYLE="margin-bottom: 0cm; border-top: none; border-bottom: 1px solid #000000; border-left: none; border-right: none; padding-top: 0cm; padding-bottom: 0.07cm; padding-left: 0cm; padding-right: 0cm">
<BR>
@@ -47,7 +47,7 @@ Comparison and Synchronization</SPAN></I></FONT></H3>
<H3 CLASS="western" STYLE="page-break-before: always"><FONT FACE="Tahoma, sans-serif">Main
Dialog Overview</FONT></H3>
<OL>
- <P STYLE="margin-bottom: 0cm"><IMG SRC="../img/MainDialog.png" NAME="Grafik5" ALIGN=BOTTOM WIDTH=671 HEIGHT=428 BORDER=0></P>
+ <P STYLE="margin-bottom: 0cm"><IMG SRC="../img/MainDialog.png" NAME="Grafik5" ALIGN=BOTTOM BORDER=0></P>
</OL>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
diff --git a/BUILD/Help/html/Macros.html b/BUILD/Help/html/Macros.html
index c93b2373..d9d34a65 100644
--- a/BUILD/Help/html/Macros.html
+++ b/BUILD/Help/html/Macros.html
@@ -107,34 +107,26 @@ E.g. <FONT FACE="Courier New, monospace">csidl_MyMusic</FONT> &rarr;
</P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Hint:</B></FONT></P>
-<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">You can
-add a great amount of flexibility to batch synchronization
-(*.ffs_batch) by creating new temporary environment variables in a
-*.bat/*.cmd file that are evaluated by FreeFileSync at runtime!</FONT></P>
+<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">You can add a great amount of flexibility to a ffs_batch configuration file
+ by creating new temporary environment variables in a bat or cmd file that are evaluated by FreeFileSync at runtime.</FONT></P>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Example:</B>
-The FreeFileSync batch file <FONT FACE="Courier New, monospace">C:\SyncJob.ffs_batch
-</FONT>contains macro <FONT FACE="Courier New, monospace">%MyVar%
-</FONT>instead of an absolute target folder and is invoked by a *.cmd
-file:</FONT></P>
+The FreeFileSync batch file <FONT FACE="Courier New, monospace">C:\SyncJob.ffs_batch</FONT> contains macro <FONT FACE="Courier New, monospace">%MyVar%</FONT> instead of an absolute target folder and is invoked by a cmd file:</FONT>
+</P>
<P STYLE="margin-left: 1.32cm; margin-bottom: 0cm"><SPAN ID="Rahmen5" DIR="LTR" STYLE="float: left; width: 80%; height: 0.14cm; border: none; padding: 0cm; background: #e6e6e6">
- <P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><FONT FACE="Courier New, monospace">set
- MyVar=C:\Target<BR>&quot;C:\Program
- files\FreeFileSync\FreeFileSync.exe&quot;
- C:\SyncJob.ffs_batch<BR></FONT><FONT COLOR="#808080"><FONT FACE="Courier New, monospace"><I><B>::%MyVar%
- is resolved as C:\Target during synchronization</B></I></FONT></FONT></FONT></P>
+ <P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Courier New, monospace">set
+ MyVar=C:\Target<BR>&quot;C:\Program files\FreeFileSync\FreeFileSync.exe&quot; C:\SyncJob.ffs_batch<BR>
+ <FONT COLOR="#808080"><I><B>::%MyVar% is resolved as C:\Target during synchronization</B></I></FONT></FONT>
+</P>
</SPAN><BR CLEAR=LEFT><BR>
</P>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
<P><SPAN ID="Rahmen3" DIR="LTR" STYLE="float: left; width: 80%; height: 0.14cm; border: 1px solid #000080; padding: 0.05cm; background: #ccccff">
- <P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Note</B><BR>Temporary
- environment variables created with the &quot;<FONT FACE="Courier New, monospace">set</FONT>&quot;
- command are only valid if the batch job is started by calling the
- executable directly! Using &quot;<FONT FACE="Courier New, monospace">start
- /wait</FONT>&quot; or relying on Shell Execute creates a new
- program context without these temporal variables.</FONT></P>
+ <P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Note</B><BR>
+ Temporary environment variables created with the <FONT FACE="Courier New, monospace">set</FONT> command are only valid if the synchronization is started by calling the
+ FreeFileSync executable directly. Using <FONT FACE="Courier New, monospace">start /wait</FONT> creates a new program context without these temporal variables.</FONT></P>
</SPAN><BR CLEAR=LEFT>
</P>
</BODY>
diff --git a/BUILD/Help/html/RealtimeSync.html b/BUILD/Help/html/RealtimeSync.html
index d765c818..e9eae9cf 100644
--- a/BUILD/Help/html/RealtimeSync.html
+++ b/BUILD/Help/html/RealtimeSync.html
@@ -22,117 +22,110 @@
</STYLE>
</HEAD>
<BODY LANG="en-US" DIR="LTR">
-<H3 CLASS="western" ALIGN=CENTER><IMG SRC="../img/RTS_logo.png" NAME="Grafik6" ALIGN=ABSMIDDLE WIDTH=269 HEIGHT=59 BORDER=0><FONT SIZE=4 STYLE="font-size: 16pt"><BR></FONT><FONT SIZE=3><I><SPAN STYLE="font-weight: normal">Automated
-Synchronization</SPAN></I></FONT></H3>
-<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">RealtimeSync
-is a small tool which executes a command line each time it detects
-changes in one of the monitored directories </FONT><SPAN STYLE="font-variant: normal"><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-style: normal"><B>or</B></SPAN></FONT></SPAN>
-<FONT FACE="Tahoma, sans-serif">a directory becomes available (e. g.
-insert of a USB-stick). Usually this command line will simply trigger
+<H3 CLASS="western" ALIGN=CENTER><IMG SRC="../img/RTS_logo.png" NAME="Grafik6" ALIGN=ABSMIDDLE WIDTH=269 HEIGHT=59 BORDER=0><FONT SIZE=4 STYLE="font-size: 16pt"><BR></FONT><FONT SIZE=3><I><SPAN STYLE="font-weight: normal">Automated Synchronization</SPAN></I></FONT></H3>
+<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">
+The primary purpose of RealtimeSync is to execute a command line each time a directory becomes
+available (e. g. insert of a USB-stick) <b>or</b> when it detects changes in one of the monitored directories. Usually this command line will trigger
a FreeFileSync batch job.</FONT></P>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Example:</B></FONT>
<FONT FACE="Tahoma, sans-serif">Real time synchronization - in
combination with FreeFileSync</FONT></P>
-<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Start
-RealtimeSync.exe located in FreeFileSync's installation directory.
-Then specify all folders that shall be monitored. Instead of doing
-this manually you can import a </FONT><FONT FACE="Courier New, monospace">*.ffs_batch</FONT>
-<FONT FACE="Tahoma, sans-serif">file via </FONT><SPAN STYLE="font-variant: normal"><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-style: normal"><B>Menu
-&rarr; Program &rarr; Open</B></SPAN></FONT></SPAN><FONT FACE="Tahoma, sans-serif">.
-This not only extracts all directories relevant for synchronization
-but also sets up the command line to execute the </FONT><FONT FACE="Courier New, monospace">*.ffs_batch</FONT>
-<FONT FACE="Tahoma, sans-serif">file each time changes are detected.
-Now press </FONT><SPAN STYLE="font-variant: normal"><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-style: normal"><B>Start</B></SPAN></FONT></SPAN>
-<FONT FACE="Tahoma, sans-serif">to begin monitoring.</FONT></P>
+<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Start RealtimeSync.exe located in FreeFileSync's installation directory and
+enter all folders you want to monitor. Instead of doing this manually you can import a ffs_batch
+file via <B>Menu &rarr; Program &rarr; Open</B>. This not only extracts all directories relevant for synchronization
+but also sets up the command line to execute the ffs_batch file each time changes are detected.
+Now press <B>Start</B> to begin monitoring.</FONT></P>
<UL>
- <P STYLE="margin-bottom: 0cm"><IMG SRC="../img/RealtimeSync.png" NAME="Grafik3" ALIGN=MIDDLE WIDTH=461 HEIGHT=388 BORDER=0></P>
+ <P STYLE="margin-bottom: 0cm"><IMG SRC="../img/RealtimeSync.png" NAME="Grafik3" ALIGN=MIDDLE BORDER=0></P>
</UL>
-<P STYLE="margin-bottom: 0cm"><BR>
-</P>
-<SPAN ID="Rahmen1" DIR="LTR" STYLE="float: left; width: 80%; height: 0.04cm; border: 1px solid #000080; padding: 0.05cm; background: #ccccff">
- <P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Note</B></FONT></P>
+<BR>
+
+<P STYLE="margin-left: 1.32cm; margin-bottom: 0cm"><SPAN ID="Rahmen2" DIR="LTR" STYLE="float: left; width: 80%; height: 0.04cm; border: 1px solid #000080; padding: 0.05cm; background: #ccccff">
+ <P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">
+ <B>Note</B></FONT></P>
<LI><P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">The
command should </FONT><FONT FACE="Tahoma, sans-serif"><B>not</B></FONT>
- <FONT FACE="Tahoma, sans-serif"><B>block</B></FONT> <FONT FACE="Tahoma, sans-serif">progress.
- Make sure the FreeFileSync batch job does not show any popup
- dialogs. See notes in <A HREF="Batch%20scripting.html">Batch
- Scripting</A>.</FONT><SPAN STYLE="text-decoration: none"><FONT FACE="Tahoma, sans-serif"><BR>&nbsp;</FONT></SPAN></P>
+ <FONT FACE="Tahoma, sans-serif"><B>block</B></FONT> <FONT FACE="Tahoma, sans-serif">progress. If you call a FreeFileSync batch job, make sure it does not show any popup
+ windows. See notes in <A HREF="Command%20line.html">Command Line Usage</A>.</FONT><BR>&nbsp;</P>
- <LI><P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">The
- settings dialog can be skipped by passing a RealtimeSync
- configuration file (<FONT FACE="Courier New, monospace">*.ffs_real</FONT>)
- <B>or</B> a FreeFileSync batch file (<FONT FACE="Courier New, monospace">*.ffs_batch</FONT>)
- as first command line argument to RealtimeSync.exe. This can be
- integrated into the operating system's auto start
- facility:<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<FONT FACE="Courier New, monospace">&quot;C:\Program
- Files\FreeFileSync\RealtimeSync.exe&quot; &quot;</FONT><FONT FACE="Courier New, monospace">D</FONT><FONT FACE="Courier New, monospace">:\</FONT><FONT FACE="Courier New, monospace">Backup
- Projects</FONT><FONT FACE="Courier New, monospace">.ffs_real&quot;<BR></FONT>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<FONT FACE="Courier New, monospace">&quot;C:\Program
- Files\FreeFileSync\RealtimeSync.exe&quot; &quot;</FONT><FONT FACE="Courier New, monospace">D</FONT><FONT FACE="Courier New, monospace">:\</FONT><FONT FACE="Courier New, monospace">Backup
- Projects</FONT><FONT FACE="Courier New, monospace">.ffs_batch&quot;</FONT><BR>&nbsp;</FONT></P>
+ <LI><P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">
+ RealtimeSync will skip showing the main dialog and begin monitoring immediately if you pass a ffs_real configuration file <B>or</B> a FreeFileSync ffs_batch file
+ as first command line argument to RealtimeSync.exe. This helps you integrate RealtimeSync into your operating system's auto start:<BR>
+ &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<FONT FACE="Courier New, monospace">&quot;C:\Program Files\FreeFileSync\RealtimeSync.exe&quot; &quot;D:\Backup Projects.ffs_real&quot;</FONT><BR>
+ &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<FONT FACE="Courier New, monospace">&quot;C:\Program Files\FreeFileSync\RealtimeSync.exe&quot; &quot;D:\Backup Projects.ffs_batch&quot;</FONT><BR>&nbsp;
+ </FONT>
+ </P>
- <LI><P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Using
- RealtimeSync is not restricted to starting FreeFileSync. It can
- also be used in other scenarios, like sending an email whenever a
- certain directory is modified.</FONT></P>
-</SPAN><BR CLEAR=LEFT><BR>
-
-<P STYLE="margin-bottom: 0cm"><BR>
+ <LI><P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">
+ RealtimeSync is not tied to starting FreeFileSync. It can also be used in other scenarios, like sending an email whenever a certain directory is modified.</FONT></P>
+</SPAN><BR CLEAR=LEFT>
</P>
+
+<BR>
+<BR>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Example:</B></FONT>
-<FONT FACE="Tahoma, sans-serif">Automatic synchronization when USB
+<FONT FACE="Tahoma, sans-serif">Automatic synchronization when a USB
stick is inserted</FONT></P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Save a
-ffs_batch configuration into the USB stick's root directory and have
-it called when the stick is mounted. Then configure RealtimeSync as
-shown in the following:</FONT></P>
+ffs_batch configuration in the USB stick's root directory, e.g. <FONT FACE="Courier New, monospace">H:\</FONT>, to let RealtimeSync call it when the stick is mounted. Configure RealtimeSync as follows:</FONT></P>
<UL>
- <P><IMG SRC="../img/WatchUsbInsert.png" NAME="Grafik2" ALIGN=BOTTOM WIDTH=437 HEIGHT=362 BORDER=0></P>
+ <P><IMG SRC="../img/WatchUsbInsert.png" NAME="Grafik2" ALIGN=BOTTOM BORDER=0>
+ <BR></P>
</UL>
-<P STYLE="margin-bottom: 0cm"><BR>
-</P>
-<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Whenever
-directory &quot;</FONT><FONT FACE="Courier New, monospace">H:\Data</FONT><FONT FACE="Tahoma, sans-serif">&quot;
-becomes available, the command line executes and starts the batch job
-on the stick. Additionally it also starts the batch job each time
-files are modified in &quot;</FONT><FONT FACE="Courier New, monospace">H:\Data</FONT><FONT FACE="Tahoma, sans-serif">&quot;.
-</FONT>
-</P>
-<P STYLE="margin-bottom: 0cm"><BR>
+
+<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Whenever directory <FONT FACE="Courier New, monospace">H:\Data</FONT> becomes available, RealtimeSync executes the command line which starts the batch job located
+on the stick. RealtimeSync will also trigger each time files are modified in <FONT FACE="Courier New, monospace">H:\Data</FONT>.</FONT>
</P>
+<BR>
<P STYLE="margin-left: 1.32cm; margin-bottom: 0cm"><SPAN ID="Rahmen2" DIR="LTR" STYLE="float: left; width: 80%; height: 0.04cm; border: 1px solid #000080; padding: 0.05cm; background: #ccccff">
- <P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Note<BR></B></FONT><FONT FACE="Tahoma, sans-serif">The
- full path of the last changed file and the action that triggered the
- change notification (create, update or delete) are </FONT><SPAN STYLE="text-decoration: none"><FONT FACE="Tahoma, sans-serif">written
- to the environment variables </FONT></SPAN><SPAN STYLE="text-decoration: none"><FONT FACE="Courier New, monospace"><B>%change_path%</B></FONT></SPAN><SPAN STYLE="text-decoration: none">
- </SPAN><SPAN STYLE="text-decoration: none"><FONT FACE="Tahoma, sans-serif">and
- </FONT></SPAN><SPAN STYLE="text-decoration: none"><FONT FACE="Courier New, monospace"><B>%change_action%</B></FONT></SPAN><SPAN STYLE="text-decoration: none"><FONT FACE="Courier New, monospace">.</FONT></SPAN></P>
-</SPAN><BR CLEAR=LEFT><BR>
+ <P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm">
+ <FONT FACE="Tahoma, sans-serif">
+ <B>Note</B><BR>
+ The full path of the last changed file and the action that triggered the
+ change notification (create, update or delete) are written
+ to the environment variables <B>%change_path%</B> and <B>%change_action%</B>.
+ </FONT>
+ </P>
+</SPAN><BR CLEAR=LEFT>
</P>
-<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Example:</B></FONT>
-<FONT FACE="Tahoma, sans-serif">Show names of changed files or
-directories. (Windows)</FONT></P>
+<BR>
+<BR>
+<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Example:</B>
+Log names of changed files and directories (Windows)</FONT></P>
+
<P STYLE="margin-left: 1.32cm; margin-bottom: 0cm"><SPAN ID="Rahmen4" DIR="LTR" STYLE="float: left; width: 80%; height: 0.04cm; border: none; padding: 0cm; background: #e6e6e6">
- <P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Courier New, monospace"><FONT FACE="Tahoma, sans-serif">Show
- which file or directory has triggered a change. Enter command
- line:</FONT><BR>&nbsp;&nbsp;&nbsp;&nbsp;cmd /c echo %change_action%
- &quot;%change_path%&quot; &amp; pause<BR><BR><FONT FACE="Tahoma, sans-serif">Write
- a list of all changes to a logfile:</FONT><BR>&nbsp;&nbsp;&nbsp;&nbsp;cmd
- /c echo %change_action% &quot;%change_path%&quot; &gt;&gt;
- c:\log.txt</FONT></P>
+ <P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm">
+
+ <FONT FACE="Tahoma, sans-serif">Show which file or directory has triggered a change. Enter command
+ line:</FONT><BR>
+
+ <FONT FACE="Courier New, monospace">
+ &nbsp;&nbsp;&nbsp;&nbsp;cmd /c echo %change_action%
+ &quot;%change_path%&quot; &amp; pause<BR><BR>
+ </FONT>
+
+ <FONT FACE="Tahoma, sans-serif">Write a list of all changes to a log file:</FONT><BR>
+
+ <FONT FACE="Courier New, monospace">
+ &nbsp;&nbsp;&nbsp;&nbsp;cmd /c echo %change_action% &quot;%change_path%&quot; &gt;&gt; C:\log.txt
+ </FONT>
+ </P>
</SPAN><BR CLEAR=LEFT><BR>
</P>
+
<P STYLE="margin-left: 1.32cm; margin-bottom: 0cm"><SPAN ID="Rahmen5" DIR="LTR" STYLE="float: left; width: 80%; height: 0.04cm; border: 1px solid #000080; padding: 0.05cm; background: #ccccff">
- <P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Note<BR></B></FONT><FONT FACE="Tahoma, sans-serif">During
- execution of a Windows Batch file (*.bat/*.cmd) a black console
- window is shown. You can hide it using the Visual Basic script
- &quot;HideConsole.vbs&quot; located in FreeFileSync's installation
- directory:</FONT></P>
- <P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Courier New, monospace"><B>wscript
- &quot;C:\Program files\FreeFileSync\HideConsole.vbs&quot;
- C:\MyBatchFile.cmd</B></FONT></P>
+ <P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm">
+ <FONT FACE="Tahoma, sans-serif">
+ <b>Note</b><br>
+ When RealtimeSync executes a Windows batch file (bat or cmd) a black console window is shown. You can hide it using the Visual Basic script
+ <FONT FACE="Courier New, monospace">HideConsole.vbs</FONT> located in FreeFileSync's installation directory:
+ </FONT><br><br>
+
+ <FONT FACE="Courier New, monospace">wscript &quot;C:\Program files\FreeFileSync\HideConsole.vbs&quot; C:\MyBatchFile.cmd</FONT>
+ </P>
</SPAN><BR CLEAR=LEFT><BR>
</P>
<P STYLE="margin-bottom: 0cm"><BR>
@@ -141,7 +134,8 @@ directories. (Windows)</FONT></P>
<UL>
<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">If
multiple changes happen at the same time, only the name of the first
- file is written to variable &quot;changed_file&quot;.</FONT></P>
+ file is written to variable <b>%changed_file%</b>.</FONT></P>
+
<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">While
RealtimeSync is executing the command line, monitoring is inactive
and changes occurring during this time are lost. </FONT>
diff --git a/BUILD/Help/html/Run as Service.html b/BUILD/Help/html/Run as Service.html
index d04d8115..39ee6ba6 100644
--- a/BUILD/Help/html/Run as Service.html
+++ b/BUILD/Help/html/Run as Service.html
@@ -20,46 +20,38 @@
</STYLE>
</HEAD>
<BODY LANG="en-US" DIR="LTR">
-<H2 CLASS="western"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4 STYLE="font-size: 15pt">Run
-as service <SPAN STYLE="font-weight: normal">(Windows)</SPAN></FONT></FONT></H2>
-<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">RealtimeSync
-is designed as a background process which does not need further
-attention once it is running. Depending on your requirements there
-are a number of ways to start it together with the operating system.
-Generally the goal is to execute a command line like the following:
-</FONT><SPAN STYLE="font-variant: normal"><FONT FACE="Courier New, monospace"><SPAN STYLE="font-style: normal"><SPAN STYLE="font-weight: normal">&lt;installation
-folder&gt;\RealtimeSync.exe &lt;path to *.ffs_real or *.ffs_batch
-file&gt;</SPAN></SPAN></FONT></SPAN></P>
-<P STYLE="margin-bottom: 0cm"><BR>
+<H2 CLASS="western"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4 STYLE="font-size: 15pt">Run as Service <SPAN STYLE="font-weight: normal">(Windows)</SPAN></FONT></FONT></H2>
+<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">
+ RealtimeSync is designed to run as a background process which does not need further
+ attention. Depending on your requirements there are a number of ways you can start it automatically.
+ Generally the goal is to execute a command line like:</FONT><br>
+ <br>
+ <FONT FACE="Courier New, monospace">&lt;FreeFileSync installation folder&gt;\RealtimeSync.exe &lt;path to *.ffs_real or *.ffs_batch file&gt;</FONT>
</P>
+
+<BR>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Example:</B></FONT></P>
<UL>
<P><SPAN ID="Rahmen2" DIR="LTR" STYLE="float: left; width: 80%; height: 0.04cm; border: none; padding: 0cm; background: #e6e6e6">
- <P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Courier New, monospace">&quot;C:\Program
- Files\FreeFileSync\RealtimeSync.exe&quot; &quot;<FONT COLOR="#000000"><FONT SIZE=3><SPAN STYLE="font-weight: normal">D</SPAN></FONT></FONT><FONT COLOR="#000000"><FONT SIZE=3><SPAN STYLE="font-weight: normal">:\</SPAN></FONT></FONT><FONT COLOR="#000000"><FONT SIZE=3><SPAN STYLE="font-weight: normal">Backup
- Projects</SPAN></FONT></FONT>.ffs_real&quot;</FONT></P>
+ <P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Courier New, monospace">
+ &quot;C:\Program Files\FreeFileSync\RealtimeSync.exe&quot; &quot;D:\Backup Projects.ffs_real&quot;</FONT></P>
</SPAN><BR CLEAR=LEFT>
</P>
</UL>
-<P><BR><BR>
-</P>
+<BR><BR>
<OL>
- <LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-variant: normal"><SPAN STYLE="font-style: normal"><SPAN STYLE="font-weight: normal">RealtimeSync
- should be monitoring only while a specific user is logged in: </SPAN></SPAN></SPAN>Create
- a new shortcut, enter the command line from above as target and
- place it into the user's autostart folder.</FONT></P>
+ <LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">
+ RealtimeSync should be monitoring only while a specific user is logged in: Create
+ a new shortcut, enter the command line from above as target and place it into the user's autostart folder.</FONT></P>
+
<P STYLE="margin-bottom: 0cm"><IMG SRC="../img/create_shortcut.png" NAME="Grafik3" ALIGN=BOTTOM BORDER=0></P>
<P STYLE="margin-bottom: 0cm"><IMG SRC="../img/shortcut_properties.png" NAME="Grafik4" ALIGN=BOTTOM BORDER=0></P>
<P STYLE="margin-bottom: 0cm">&nbsp;</P>
- <LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">RealtimeSync
- should be monitoring while Windows is online irrespective of
- currently logged in users: Create a new task in your operating
- systems's task scheduler and have it execute the command line above
- when the system starts. See <A HREF="Schedule%20a%20batch%20job.html">Schedule
- a Batch Job</A> for an example how to add a new task. Then change
- the user to run the task to </FONT><FONT FACE="Tahoma, sans-serif"><B>SYSTEM</B></FONT>
- <FONT FACE="Tahoma, sans-serif">- a special user account always
- running in the background.</FONT></P>
+
+ <LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">RealtimeSync should be monitoring while Windows is running irrespective of
+ currently logged in users: Create a new task in your operating systems's task scheduler and have it execute the command line above
+ when the system starts. See <A HREF="Schedule%20a%20batch%20job.html">Schedule a Batch Job</A> for an example how to add a task. Then change
+ the user which runs the task to <B>SYSTEM</B> - a special user account always running in the background.</FONT></P>
<P STYLE="margin-bottom: 0cm"><IMG SRC="../img/schedule_realtimesync.png" NAME="Grafik1" ALIGN=BOTTOM BORDER=0></P>
</OL>
<P STYLE="margin-bottom: 0cm"><BR>
diff --git a/BUILD/Help/html/Schedule a Batch Job.html b/BUILD/Help/html/Schedule a Batch Job.html
index 76393187..dbd3fc2a 100644
--- a/BUILD/Help/html/Schedule a Batch Job.html
+++ b/BUILD/Help/html/Schedule a Batch Job.html
@@ -16,8 +16,7 @@
</STYLE>
</HEAD>
<BODY LANG="de-DE" DIR="LTR">
-<H2 CLASS="western"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4 STYLE="font-size: 15pt">Schedule
-a batch job</FONT></FONT></H2>
+<H2 CLASS="western"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4 STYLE="font-size: 15pt">Schedule a Batch Job</FONT></FONT></H2>
<OL>
<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Create
a new batch job via FreeFileSync's main dialog: </FONT><SPAN STYLE="font-variant: normal"><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-style: normal"><B>Menu
@@ -27,19 +26,26 @@ a batch job</FONT></FONT></H2>
unattended batch script, make sure that no popup dialog stops the
progress:<BR>Disable checkbox <SPAN STYLE="font-variant: normal"><SPAN STYLE="font-style: normal"><B>Show
progress dialog</B></SPAN></SPAN> to avoid blocking while showing
- the result after synchronization. Alternatively you can select the
- &quot;On completion&quot; action <B>Close progress dialog</B>
- located in synchronization settings.<BR><B>Note:</B> Even if the
- progress dialog is not shown at the beginning, a user can make it
+ the result after synchronization. Alternatively you can leave this option checked and select the <i>On completion</i> action <B>Close progress dialog</B>
+ located in synchronization settings. FreeFileSync will then show a progress dialog but close it automatically when it is finished.<BR>
+ <br>
+ <B>Note:</B> Even if the
+ progress dialog is not shown at the beginning, you can make it
visible <B>during</B> synchronization by double-clicking the
- FreeFileSync systray icon.<BR><IMG SRC="../img/SetupBatch.png" NAME="Grafik3" ALIGN=BOTTOM WIDTH=660 HEIGHT=263 BORDER=0></FONT></P>
- <P STYLE="margin-bottom: 0cm">&nbsp;</P>
+ FreeFileSync notification area icon.<BR>
+ <BR>
+ <IMG SRC="../img/SetupBatch.png" NAME="Grafik3" ALIGN=BOTTOM BORDER=0>
+ <br><br>
+ </FONT>
+ </P>
+
<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">In
order to prevent error or warning popup messages from stopping
- progress, set <SPAN STYLE="font-variant: normal"><SPAN STYLE="font-style: normal"><B>Error
- handling</B></SPAN></SPAN> to either <SPAN STYLE="font-variant: normal"><SPAN STYLE="font-style: normal"><B>Ignore</B></SPAN></SPAN>
- or <SPAN STYLE="font-variant: normal"><SPAN STYLE="font-style: normal"><B>Exit</B></SPAN></SPAN>.</FONT></P>
- <P STYLE="margin-bottom: 0cm">&nbsp;</P>
+ progress, set <SPAN STYLE="font-variant: normal"><SPAN STYLE="font-style: normal"><B>Handle errors</B></SPAN></SPAN> to either <SPAN STYLE="font-variant: normal"><SPAN STYLE="font-style: normal"><B>Ignore</B></SPAN></SPAN>
+ or <SPAN STYLE="font-variant: normal"><SPAN STYLE="font-style: normal"><B>Stop</B></SPAN></SPAN>.</FONT>
+ <br><br>
+ </P>
+
<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Setup
your operating system's scheduler</FONT></P>
</OL>
@@ -48,59 +54,63 @@ a batch job</FONT></FONT></H2>
<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Windows
7 Task Scheduler:</B></FONT></P>
<UL>
- <LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">Go
- to Start and run</SPAN></FONT> <FONT FACE="Tahoma, sans-serif"><FONT SIZE=3><B>taskschd.msc</B></FONT></FONT><FONT COLOR="#000000"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=3><SPAN STYLE="font-weight: normal">.</SPAN></FONT></FONT></FONT></P>
- <LI><P STYLE="margin-bottom: 0cm; font-weight: normal"><FONT COLOR="#000000"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=3>Create
- a new basic task and follow the wizard.</FONT></FONT></FONT></P>
- <LI><P STYLE="margin-bottom: 0cm; font-weight: normal"><FONT COLOR="#000000"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=3>Make
- <B>Program/script</B> point to the location of FreeFileSync.exe
- and insert the <FONT FACE="Courier New, monospace">*.ffs_batch</FONT>
- file into <B>Add arguments</B>.</FONT></FONT></FONT></P>
- <LI><P STYLE="margin-bottom: 0cm; font-weight: normal"><FONT FACE="Tahoma, sans-serif"><FONT COLOR="#000000"><FONT SIZE=3>Use
- quotation marks to protect spaces in path names, e.g.: </FONT></FONT><FONT COLOR="#000000"><FONT FACE="Courier New, monospace"><FONT SIZE=3>&quot;</FONT></FONT></FONT><FONT COLOR="#000000"><FONT FACE="Courier New, monospace"><FONT SIZE=3>D</FONT></FONT></FONT><FONT COLOR="#000000"><FONT FACE="Courier New, monospace"><FONT SIZE=3>:\</FONT></FONT></FONT><FONT COLOR="#000000"><FONT FACE="Courier New, monospace"><FONT SIZE=3>Backup
- Projects</FONT></FONT></FONT><FONT COLOR="#000000"><FONT FACE="Courier New, monospace"><FONT SIZE=3>.ffs_batch&quot;</FONT></FONT></FONT><FONT COLOR="#000000"><FONT SIZE=3><BR></FONT></FONT><IMG SRC="../img/win7scheduler.png" NAME="Grafik1" ALIGN=BOTTOM WIDTH=708 HEIGHT=284 BORDER=0></FONT></P>
+ <LI>
+ <P STYLE="margin-bottom: 0cm">
+ <FONT FACE="Tahoma, sans-serif">Go to Start and run <FONT FACE="Courier New, monospace"><B>taskschd.msc</B></FONT>.</FONT>
+ </P>
+
+ <LI>
+ <P STYLE="margin-bottom: 0cm">
+ <FONT FACE="Tahoma, sans-serif">Create a new basic task and follow the wizard.</FONT>
+ </P>
+
+ <LI>
+ <P STYLE="margin-bottom: 0cm">
+ <FONT FACE="Tahoma, sans-serif">Make <B>Program/script</B> point to the location of FreeFileSync.exe
+ and insert the ffs_batch file into <B>Add arguments</B>.</FONT>
+ </P>
+
+ <LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Use quotation marks to protect spaces in path names, e.g. <FONT FACE="Courier New, monospace">&quot;D:\Backup Projects.ffs_batch&quot;</FONT><BR>
+ <BR>
+ <IMG SRC="../img/win7scheduler.png" NAME="Grafik1" ALIGN=BOTTOM BORDER=0></FONT>
+ </P>
</UL>
</OL>
<P STYLE="margin-bottom: 0cm"><SPAN ID="Rahmen2" DIR="LTR" STYLE="float: left; width: 80%; height: 0.04cm; border: 1px solid #000080; padding: 0.05cm; background: #ccccff">
<P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Note</B></FONT><FONT FACE="Tahoma, sans-serif"><BR>Beginning
- with Windows Vista the &quot;Program/script&quot; always needs
- point to an executable file like &quot;FreeFileSync.exe&quot; even
- if ffs_batch file associations have been set!</FONT> I<FONT FACE="Tahoma, sans-serif">f
- a ffs_batch file were entered instead the task would return with
+ with Windows Vista the <i>Program/script</i> always needs point to an executable file like FreeFileSync.exe even
+ if ffs_batch file association is set. If a ffs_batch file is entered instead the task will return with
error code 0xC1, &quot;%1 is not a valid Win32 application&quot;.</FONT></P>
</SPAN><BR CLEAR=LEFT>&nbsp;
</P>
</OL>
<OL>
<OL TYPE=A START=2>
- <LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Windows
- XP Scheduled Tasks:</B></FONT></P>
+ <LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Windows XP Scheduled Tasks:</B></FONT></P>
<UL>
<LI VALUE=1><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Go
- to <SPAN STYLE="font-variant: normal"><SPAN STYLE="font-style: normal"><B>Start
- &rarr; Control Panel &rarr; Scheduled Tasks</B></SPAN></SPAN> and
- select <SPAN STYLE="font-variant: normal"><SPAN STYLE="font-style: normal"><B>Add
- Scheduled Task</B></SPAN></SPAN>.</FONT></P>
- <LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Follow
- the wizard and select FreeFileSync.exe as program to run.</FONT></P>
- <LI><P STYLE="margin-bottom: 0cm; font-weight: normal"><FONT FACE="Tahoma, sans-serif">Fill
- input field <B>Run:</B> as: <FONT FACE="Courier New, monospace">&lt;FreeFileSync
- installation folder&gt;\FreeFileSync.exe &lt;job
- name&gt;.ffs_batch</FONT><BR><IMG SRC="../img/ScheduleBatch.png" NAME="Grafik2" ALIGN=BOTTOM WIDTH=406 HEIGHT=455 BORDER=0><BR>&nbsp;</FONT></P>
+ to <B>Start &rarr; Control Panel &rarr; Scheduled Tasks</B> and select <B>Add Scheduled Task</B>.</FONT>
+ </P>
+
+ <LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Follow the wizard and select FreeFileSync.exe as program to run.</FONT></P>
+
+ <LI><P STYLE="margin-bottom: 0cm; font-weight: normal"><FONT FACE="Tahoma, sans-serif">Fill the input field <B>Run:</B>
+ <FONT FACE="Courier New, monospace">&lt;FreeFileSync installation folder&gt;\FreeFileSync.exe &lt;job name&gt;.ffs_batch</FONT><BR>
+ <BR>
+ <IMG SRC="../img/ScheduleBatch.png" NAME="Grafik2" ALIGN=BOTTOM BORDER=0><BR>&nbsp;</FONT></P>
</UL>
- <LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Ubuntu
- Linux Gnome-schedule:</B></FONT></P>
+
+ <LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Ubuntu Linux Gnome-schedule:</B></FONT></P>
<UL>
- <LI><P STYLE="margin-bottom: 0cm; font-weight: normal"><FONT FACE="Tahoma, sans-serif">Install
- Gnome-schedule, if necessary: <FONT FACE="Courier New, monospace">sudo
- apt-get install gnome-schedule</FONT></FONT></P>
- <LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">Go
- to </SPAN></FONT><SPAN STYLE="font-variant: normal"><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-style: normal"><B>System
- &rarr; Preferences &rarr; Scheduled tasks</B></SPAN></FONT></SPAN></P>
- <LI><P STYLE="margin-bottom: 0cm"><SPAN STYLE="font-variant: normal"><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-style: normal"><SPAN STYLE="font-weight: normal">Enter
- the command as:</SPAN></SPAN></FONT></SPAN><SPAN STYLE="font-variant: normal">
- </SPAN><SPAN STYLE="font-variant: normal"><FONT FACE="Courier New, monospace"><SPAN STYLE="font-style: normal"><SPAN STYLE="font-weight: normal">&lt;FreeFileSync
- installation folder&gt;/FreeFileSync &lt;job name&gt;.ffs_batch</SPAN></SPAN></FONT></SPAN><FONT FACE="Courier New, monospace"><I><SPAN STYLE="font-weight: normal"><BR></SPAN></I></FONT><IMG SRC="../img/ubuntuScheduler.png" NAME="Grafik5" ALIGN=BOTTOM WIDTH=629 HEIGHT=560 BORDER=0></P>
+ <LI><P STYLE="margin-bottom: 0cm; font-weight: normal">
+ <FONT FACE="Tahoma, sans-serif">Install Gnome-schedule, if necessary: </FONT><FONT FACE="Courier New, monospace">sudo apt-get install gnome-schedule</FONT></P>
+
+ <LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Go to <B>System &rarr; Preferences &rarr; Scheduled tasks</B></FONT></P>
+
+ <LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Enter the command:</FONT>
+ <FONT FACE="Courier New, monospace">&lt;FreeFileSync installation folder&gt;/FreeFileSync &lt;job name&gt;.ffs_batch</FONT><BR>
+ <BR>
+ <IMG SRC="../img/ubuntuScheduler.png" NAME="Grafik5" ALIGN=BOTTOM BORDER=0></P>
</UL>
</OL>
</OL>
diff --git a/BUILD/Help/html/Synchronize with FTP.html b/BUILD/Help/html/Synchronize with FTP.html
index 43cc5a1b..cbca698d 100644
--- a/BUILD/Help/html/Synchronize with FTP.html
+++ b/BUILD/Help/html/Synchronize with FTP.html
@@ -50,10 +50,7 @@ drive letter:</FONT></P>
<A HREF="Compare%20by%20File%20Size.html">Compare by File Size</A>.</FONT></P>
</SPAN><BR CLEAR=LEFT><BR>
</P>
-<P STYLE="margin-bottom: 0cm"><BR>
-</P>
-<P STYLE="margin-bottom: 0cm"><BR>
-</P>
+<br>
<H3 CLASS="western"><FONT FACE="Tahoma, sans-serif">Synchronize with
SFTP <SPAN STYLE="font-weight: normal">(Linux)</SPAN></FONT></H3>
<P STYLE="margin-bottom: 0cm"><BR>
@@ -62,13 +59,18 @@ SFTP <SPAN STYLE="font-weight: normal">(Linux)</SPAN></FONT></H3>
share can be easily mapped onto a local folder for use with
FreeFileSync:</FONT></P>
<P STYLE="margin-left: 1.32cm; margin-bottom: 0cm"><SPAN ID="Rahmen5" DIR="LTR" STYLE="float: left; width: 80%; border: none; padding: 0cm; background: #e6e6e6">
- <LI><P STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Install:</FONT><FONT FACE="Courier New, monospace"><BR>sudo
- apt-get install sshfs<BR>&nbsp;</FONT></P>
- <LI><P STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Mount
- SFTP share:</FONT><FONT FACE="Courier New, monospace"><BR>sshfs
- ssh-account@ssh-server:&lt;path&gt; mountpoint<BR>&nbsp;</FONT></P>
- <LI><P STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Unmount:</FONT><FONT FACE="Courier New, monospace"><BR>fusermount
- -u mountpoint</FONT></P>
+ <LI><P STYLE="margin-left: 0.79cm; margin-bottom: 0cm">
+ <FONT FACE="Tahoma, sans-serif">Install:</FONT>
+ <FONT FACE="Courier New, monospace"><BR>sudo apt-get install sshfs<BR>
+ &nbsp;</FONT></P>
+
+ <LI><P STYLE="margin-left: 0.79cm; margin-bottom: 0cm">
+ <FONT FACE="Tahoma, sans-serif">Mount SFTP share:</FONT>
+ <FONT FACE="Courier New, monospace"><BR>sshfs ssh-account@ssh-server:&lt;path&gt; mountpoint<BR>
+ &nbsp;</FONT></P>
+
+ <LI><P STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Unmount:</FONT>
+ <FONT FACE="Courier New, monospace"><BR>fusermount -u mountpoint</FONT></P>
</SPAN><BR CLEAR=LEFT><BR>
</P>
</BODY>
diff --git a/BUILD/Help/html/Variable Drive Letters.html b/BUILD/Help/html/Variable Drive Letters.html
index ee95e4a3..a9368041 100644
--- a/BUILD/Help/html/Variable Drive Letters.html
+++ b/BUILD/Help/html/Variable Drive Letters.html
@@ -16,8 +16,7 @@
</STYLE>
</HEAD>
<BODY LANG="de-DE" DIR="LTR">
-<H2 CLASS="western"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4 STYLE="font-size: 15pt">Variable
-drive letters</FONT></FONT></H2>
+<H2 CLASS="western"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4 STYLE="font-size: 15pt">Variable Drive Letters</FONT></FONT></H2>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">USB
memory sticks or external hard disks often get different
drive letters assigned when plugged into distinct computers. FreeFileSync
@@ -27,49 +26,42 @@ offers two solutions to handle this problem:</FONT></P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Option
1: </B>Specify a folder path by using the volume name:</FONT></P>
<P STYLE="margin-left: 1.32cm; margin-bottom: 0cm"><SPAN ID="Rahmen5" DIR="LTR" STYLE="float: left; width: 80%; height: 0.04cm; border: none; padding: 0cm; background: #e6e6e6">
- <P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Use
- &quot;<FONT FACE="Courier New, monospace">[ZENJU-USB]\folder</FONT>&quot;
- instead of &quot;<FONT FACE="Courier New, monospace">G:\folder</FONT>&quot;
- where &quot;<FONT FACE="Courier New, monospace">ZENJU-USB</FONT>&quot;
- is the volume name of the USB stick which is currently mounted in
- drive G:\.</FONT></P>
+ <P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm">
+ <FONT FACE="Tahoma, sans-serif">Use <FONT FACE="Courier New, monospace">[ZENJU-USB]\folder</FONT> instead of <FONT FACE="Courier New, monospace">G:\folder</FONT> where ZENJU-USB
+ is the volume name of the USB stick which is currently mounted in drive <FONT FACE="Courier New, monospace">G:\</FONT>.
+ </FONT></P>
</SPAN><BR CLEAR=LEFT><BR>
</P>
<P STYLE="margin-left: 1.32cm; margin-bottom: 0cm"><SPAN ID="Rahmen4" DIR="LTR" STYLE="float: left; width: 80%; height: 0.04cm; border: 1px solid #000080; padding: 0.05cm; background: #ccccff">
- <P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Note<BR></B>It
+ <P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">
+ <B>Note<BR></B>It
is not required to look up and enter the volume name manually. Just
- select the corresponding entry in the drop down menu.</FONT></P>
- <P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><IMG SRC="../img/VolumeName.png" NAME="Grafik1" ALIGN=BOTTOM WIDTH=424 HEIGHT=86 BORDER=0></P>
+ select the corresponding entry in the drop down menu.</FONT>
+ <IMG SRC="../img/VolumeName.png" NAME="Grafik1" ALIGN=BOTTOM BORDER=0>
+ </P>
</SPAN><BR CLEAR=LEFT><BR>
</P>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Option
-2: </B></FONT><FONT FACE="Tahoma, sans-serif">Use a relative
-directory name:</FONT></P>
+2: </B></FONT><FONT FACE="Tahoma, sans-serif">Use a relative directory name:</FONT></P>
<P STYLE="margin-left: 1.32cm; margin-bottom: 0cm"><SPAN ID="Rahmen3" DIR="LTR" STYLE="float: left; width: 80%; border: none; padding: 0.05cm; background: #e6e6e6">
<LI><P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm">
- <FONT FACE="Tahoma, sans-serif">Use
- &quot;</FONT><FONT FACE="Courier New, monospace">\folder</FONT><FONT FACE="Tahoma, sans-serif">&quot;
- instead of &quot;</FONT><FONT FACE="Courier New, monospace">G:\folder</FONT><FONT FACE="Tahoma, sans-serif">&quot;</FONT>
+ <FONT FACE="Tahoma, sans-serif">Use <FONT FACE="Courier New, monospace">\folder</FONT> instead of <FONT FACE="Courier New, monospace">G:\folder</FONT></FONT>
</P><BR>
<LI><P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm; font-style: normal">
- <FONT FACE="Tahoma, sans-serif">Save
- and copy synchronization settings to the USB stick:
- &quot;</FONT><FONT COLOR="#000000"><FONT FACE="Courier New, monospace"><FONT SIZE=3>G:\</FONT></FONT></FONT><FONT COLOR="#000000"><FONT FACE="Courier New, monospace"><FONT SIZE=3>Backup</FONT></FONT></FONT><FONT COLOR="#000000"><FONT FACE="Courier New, monospace"><FONT SIZE=3>.ffs_gui&quot;</FONT></FONT></FONT>
+ <FONT FACE="Tahoma, sans-serif">Save and copy synchronization settings to the USB stick: </FONT><FONT FACE="Courier New, monospace">G:\Backup.ffs_gui</FONT>
</P><BR>
<LI><P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm; font-style: normal">
- <FONT FACE="Tahoma, sans-serif">Start
- FreeFileSync by double-clicking on &quot;</FONT><FONT FACE="Courier New, monospace">G:\</FONT><FONT FACE="Courier New, monospace">Backup</FONT><FONT FACE="Courier New, monospace">.ffs_gui</FONT><FONT FACE="Tahoma, sans-serif">&quot;<BR>&rarr;
- The working directory is automatically set to &quot;</FONT><FONT FACE="Courier New, monospace">G:\</FONT><FONT FACE="Tahoma, sans-serif">&quot;
- by the operating system so that </FONT><FONT FACE="Tahoma, sans-serif">the
- relative path </FONT><FONT FACE="Tahoma, sans-serif">&quot;</FONT><FONT FACE="Courier New, monospace">\folder</FONT><FONT FACE="Tahoma, sans-serif">&quot;
- will be resolved as &quot;</FONT><FONT FACE="Courier New, monospace">G:\folder</FONT><FONT FACE="Tahoma, sans-serif">&quot;
- during synchronization.</FONT>
+ <FONT FACE="Tahoma, sans-serif">Start FreeFileSync by double-clicking on <FONT FACE="Courier New, monospace">G:\Backup.ffs_gui</FONT><br>
+ <br>
+ The working directory is then automatically set to <FONT FACE="Courier New, monospace">G:\</FONT> by the operating system so that the
+ relative path <FONT FACE="Courier New, monospace">\folder</FONT> will be resolved as <FONT FACE="Courier New, monospace">G:\folder</FONT> during synchronization.
+ </FONT>
</P>
</SPAN><BR CLEAR=LEFT><BR>
</P>
diff --git a/BUILD/Help/html/Versioning.html b/BUILD/Help/html/Versioning.html
index e61ec43f..9b81b731 100644
--- a/BUILD/Help/html/Versioning.html
+++ b/BUILD/Help/html/Versioning.html
@@ -20,12 +20,11 @@
</STYLE>
</HEAD>
<BODY LANG="en-US" DIR="LTR">
-<H2 CLASS="western"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4 STYLE="font-size: 15pt">File
-versioning</FONT></FONT></H2>
+<H2 CLASS="western"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4 STYLE="font-size: 15pt">File Versioning</FONT></FONT></H2>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">When
you need to preserve files that have been deleted or overwritten it's
-often sufficient to select <B>Recycle Bin</B> in synchronization
-settings. However this is only available on local drives and offers
+often sufficient to select <B>Recycle bin</B> in synchronization
+settings. However this is only available for local drives and offers
little control on how to store and how long to keep the files.
FreeFileSync therefore has an additional option, <B>Versioning</B>.</FONT></P>
<P STYLE="margin-bottom: 0cm"><BR>
@@ -39,11 +38,10 @@ deleted files into the provided folder and add a time stamp to each
file name. The structure of the synchronized folders is preserved so
that old versions of a file can be conveniently accessed via a file
browser.</FONT></P>
-<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Example:
-</B></FONT><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">A
-file &quot;</SPAN></FONT><FONT FACE="Courier New, monospace"><SPAN STYLE="font-weight: normal">Folder\File.txt</SPAN></FONT><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">&quot;
-was updated three times and old versions were moved to folder
-&quot;</SPAN></FONT><FONT FACE="Courier New, monospace"><SPAN STYLE="font-weight: normal">C:\Revisions</SPAN></FONT><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">&quot;</SPAN></FONT></P>
+<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Example:</B>
+A file <FONT FACE="Courier New, monospace">Folder\File.txt</FONT> was updated three times and old versions were moved to folder <FONT FACE="Courier New, monospace">C:\Revisions</FONT>
+</FONT>
+</P>
<P STYLE="margin-left: 1.32cm; margin-bottom: 0cm"><SPAN ID="Rahmen1" DIR="LTR" STYLE="float: left; width: 80%; height: 0.04cm; border: none; padding: 0cm; background: #e6e6e6">
<P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><FONT FACE="Courier New, monospace">C:\Revisions\Folder\File.txt
</FONT><FONT FACE="Courier New, monospace"><B>2012-12-12
@@ -56,7 +54,7 @@ was updated three times and old versions were moved to folder
<P STYLE="margin-bottom: 0cm"><BR>
</P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>2.
-Save only most recent version</B></FONT></P>
+Save only the most recent version</B></FONT></P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Set
deletion handling to <B>Versioning</B> and naming convention to
<B>Replace</B>. Deleted files will be moved to the specified folder
@@ -68,14 +66,16 @@ versions.</FONT></P>
Save versions at certain intervals</B></FONT></P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">With
naming convention </FONT><FONT FACE="Tahoma, sans-serif"><B>Replace</B></FONT>
-<FONT FACE="Tahoma, sans-serif">it's possible to refine the
+<FONT FACE="Tahoma, sans-serif">it is possible to refine the
granularity of versions to keep by adding <A HREF="Macros.html">macros</A>
to the versioning folder path. For example you can save deleted files
on a per sync session basis by adding the </FONT><FONT FACE="Tahoma, sans-serif"><B>%timestamp%</B></FONT>
<FONT FACE="Tahoma, sans-serif">macro:</FONT></P>
-<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Example:
-</B></FONT><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">Using
-the dynamically generated folder name &quot;</SPAN></FONT><FONT FACE="Courier New, monospace"><SPAN STYLE="font-weight: normal">C:\Revisions\%timestamp%</SPAN></FONT><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">&quot;</SPAN></FONT></P>
+
+<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Example:</B>
+Using the dynamically generated folder name <FONT FACE="Courier New, monospace">C:\Revisions\%timestamp%</FONT></FONT>
+</P>
+
<P STYLE="margin-left: 1.32cm; margin-bottom: 0cm"><SPAN ID="Rahmen2" DIR="LTR" STYLE="float: left; width: 80%; height: 0.04cm; border: none; padding: 0cm; background: #e6e6e6">
<P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><FONT FACE="Courier New, monospace">C:\Revisions\</FONT><FONT FACE="Courier New, monospace"><B>2012-12-12
111111</B></FONT><FONT FACE="Courier New, monospace">\Folder\File.txt<BR>C:\Revisions\</FONT><FONT FACE="Courier New, monospace"><B>2012-12-12
diff --git a/BUILD/Help/html/Volume Shadow Copy.html b/BUILD/Help/html/Volume Shadow Copy.html
index 24a3bd92..c5e32e80 100644
--- a/BUILD/Help/html/Volume Shadow Copy.html
+++ b/BUILD/Help/html/Volume Shadow Copy.html
@@ -25,7 +25,7 @@ Shadow Copy Service <SPAN STYLE="font-weight: normal">(Windows only)</SPAN></FON
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">FreeFileSync
supports copying locked or shared files by creating a Volume Shadow
Copy of the source drive. This feature can be configured via </FONT><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-style: normal"><B>Menu
-&rarr; Advanced &rarr; Global settings: Copy locked files</B></SPAN></FONT><FONT FACE="Tahoma, sans-serif">.</FONT></P>
+&rarr; Tools &rarr; Global settings: Copy locked files</B></SPAN></FONT><FONT FACE="Tahoma, sans-serif">.</FONT></P>
<P STYLE="margin-left: 1.32cm; margin-bottom: 0cm"><SPAN ID="Rahmen3" DIR="LTR" STYLE="float: left; width: 80%; border: 1px solid #000080; padding: 0.05cm; background: #ccccff">
<P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Note</B></FONT></P>
<LI><P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">The
@@ -40,16 +40,25 @@ Copy of the source drive. This feature can be configured via </FONT><FONT FACE="
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Troubleshooting</B></FONT></P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">If you
experience problems using the Volume Shadow Copy Service a renewal of
-registration might help. Create and execute a *.cmd batch file with
-the follow content or enter directly via command line:</FONT></P>
+registration might help. Create and execute a cmd batch file and insert the following lines or enter directly via command line:</FONT></P>
<P STYLE="margin-left: 1.32cm; margin-bottom: 0cm"><SPAN ID="Rahmen1" DIR="LTR" STYLE="float: left; width: 80%; border: none; padding: 0cm; background: #e6e6e6">
<P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm">
- <FONT FACE="Courier New, monospace">cd /d %windir%\system32<BR>Net
- stop vss<BR>Net stop swprv<BR>regsvr32 ole32.dll<BR>regsvr32
- oleaut32.dll<BR>regsvr32 vss_ps.dll<BR>Vssvc /register<BR>regsvr32
- /i swprv.dll<BR>regsvr32 /i eventcls.dll<BR>regsvr32 es.dll<BR>regsvr32
- stdprov.dll<BR>regsvr32 vssui.dll<BR>regsvr32 msxml.dll<BR>regsvr32
- msxml3.dll<BR>regsvr32 msxml4.dll</FONT></P>
+ <FONT FACE="Courier New, monospace">
+ cd /d %windir%\system32<BR>
+ Net stop vss<BR>
+ Net stop swprv<BR>
+ regsvr32 ole32.dll<BR>
+ regsvr32 oleaut32.dll<BR>
+ regsvr32 vss_ps.dll<BR>
+ Vssvc /register<BR>
+ regsvr32 /i swprv.dll<BR>
+ regsvr32 /i eventcls.dll<BR>
+ regsvr32 es.dll<BR>
+ regsvr32 stdprov.dll<BR>
+ regsvr32 vssui.dll<BR>
+ regsvr32 msxml.dll<BR>
+ regsvr32 msxml3.dll<BR>
+ regsvr32 msxml4.dll</FONT></P>
</SPAN><BR CLEAR=LEFT><BR>
</P>
<P ALIGN=LEFT STYLE=" margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Reference:
diff --git a/BUILD/Help/img/CmpSettings.png b/BUILD/Help/img/CmpSettings.png
index da67415a..16c30698 100644
--- a/BUILD/Help/img/CmpSettings.png
+++ b/BUILD/Help/img/CmpSettings.png
Binary files differ
diff --git a/BUILD/Help/img/CompareButton.png b/BUILD/Help/img/CompareButton.png
index b761e929..3fe37be1 100644
--- a/BUILD/Help/img/CompareButton.png
+++ b/BUILD/Help/img/CompareButton.png
Binary files differ
diff --git a/BUILD/Help/img/MainDialog.png b/BUILD/Help/img/MainDialog.png
index 5ac7aa5a..9f2f2566 100644
--- a/BUILD/Help/img/MainDialog.png
+++ b/BUILD/Help/img/MainDialog.png
Binary files differ
diff --git a/BUILD/Help/img/RealtimeSync.png b/BUILD/Help/img/RealtimeSync.png
index 59b4fa01..971baefd 100644
--- a/BUILD/Help/img/RealtimeSync.png
+++ b/BUILD/Help/img/RealtimeSync.png
Binary files differ
diff --git a/BUILD/Help/img/SetupBatch.png b/BUILD/Help/img/SetupBatch.png
index 01d1ecff..e1789917 100644
--- a/BUILD/Help/img/SetupBatch.png
+++ b/BUILD/Help/img/SetupBatch.png
Binary files differ
diff --git a/BUILD/Help/img/SynchronizeButton.png b/BUILD/Help/img/SynchronizeButton.png
index 084edcb7..0ab74cb8 100644
--- a/BUILD/Help/img/SynchronizeButton.png
+++ b/BUILD/Help/img/SynchronizeButton.png
Binary files differ
diff --git a/BUILD/Help/img/WatchUsbInsert.png b/BUILD/Help/img/WatchUsbInsert.png
index 35d0b45d..0e90278a 100644
--- a/BUILD/Help/img/WatchUsbInsert.png
+++ b/BUILD/Help/img/WatchUsbInsert.png
Binary files differ
diff --git a/BUILD/Languages/arabic.lng b/BUILD/Languages/arabic.lng
index c97b927d..9a59faea 100644
--- a/BUILD/Languages/arabic.lng
+++ b/BUILD/Languages/arabic.lng
@@ -2,176 +2,31 @@
<language>العربية</language>
<translator>MEinea</translator>
<locale>ar</locale>
- <flag_image>flag_arabic.png</flag_image>
- <plural_form_count>6</plural_form_count>
+ <image>flag_arabic.png</image>
+ <plural_count>6</plural_count>
<plural_definition>n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5</plural_definition>
</header>
-<source>Unable to move %x to the recycle bin.</source>
-<target></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>
-</target>
-
-<source>Log</source>
-<target></target>
-
-<source>&Continue</source>
-<target></target>
-
-<source>&Don't show this warning again</source>
-<target></target>
-
-<source>&Ignore subsequent errors</source>
-<target></target>
-
-<source>Comma-separated values</source>
-<target></target>
-
-<source>Never save &changes</source>
-<target></target>
-
-<source>Include via filter:</source>
-<target></target>
-
-<source>&Execute</source>
-<target></target>
-
-<source>Confirm</source>
-<target></target>
-
-<source>
-<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for one item?</pluralform>
<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
</source>
<target>
</target>
-<source>Transfer file and folder permissions (requires administrator rights)</source>
-<target></target>
-
-<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
-<target></target>
-
-<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
-<target></target>
-
-<source>
-Files will only be synchronized if they pass all filter rules.
-Note: File paths must be relative to base directories.
-</source>
-<target></target>
-
-<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
-<target></target>
-
-<source>Move files to a user-defined folder</source>
-<target></target>
-
-<source>Back up deleted and overwritten files in the recycle bin</source>
-<target></target>
-
-<source>Recycle bin</source>
-<target></target>
-
-<source>Requires database files. Not supported by all file systems.</source>
-<target></target>
-
-<source>Detect moved files</source>
-<target></target>
-
-<source>&Don't show this dialog again</source>
-<target></target>
-
-<source>Minimize to notification area</source>
-<target></target>
-
-<source>Retrying operation after error:</source>
-<target></target>
-
-<source>job name</source>
+<source>&Check</source>
<target></target>
-<source>Creating a Volume Shadow Copy for %x...</source>
-<target></target>
-
-<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
-<target></target>
-
-<source>&Show error</source>
-<target></target>
-
-<source>Waiting until all directories are available...</source>
-<target></target>
-
-<source>Directory monitoring active</source>
-<target></target>
-
-<source>Volume name %x is not part of file path %y.</source>
-<target></target>
-
-<source>Cannot access the Volume Shadow Copy Service.</source>
-<target></target>
-
-<source>%x items</source>
+<source>Retrying operation...</source>
<target></target>
<source>
-<pluralform>1 byte</pluralform>
-<pluralform>%x bytes</pluralform>
+<pluralform>Automatic retry in 1 second...</pluralform>
+<pluralform>Automatic retry in %x seconds...</pluralform>
</source>
<target>
</target>
-<source>Any number of alternative directories for at most one config file.</source>
-<target></target>
-
-<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
-<target></target>
-
-<source>directory</source>
-<target></target>
-
-<source>config files</source>
-<target></target>
-
-<source>Syntax:</source>
-<target></target>
-
-<source>Directories cannot be set for more than one configuration file.</source>
-<target></target>
-
-<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
-<target></target>
-
-<source>Unequal number of left and right directories specified.</source>
-<target></target>
-
-<source>Cannot open file %x.</source>
-<target></target>
-
-<source>Syntax error</source>
-<target></target>
-
-<source>A directory path is expected after %x.</source>
-<target></target>
-
-<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source>
-<target></target>
-
-<source>Moving symbolic link %x to the recycle bin</source>
-<target></target>
-
-<source>Moving folder %x to the recycle bin</source>
-<target></target>
-
-<source>Moving file %x to the recycle bin</source>
-<target></target>
-
<source>Both sides have changed since last synchronization.</source>
<target>كلا الجانبين قد تغير منذ المزامنة الأخيرة.</target>
@@ -190,6 +45,15 @@ Note: File paths must be relative to base directories.
<source>Checking recycle bin availability for folder %x...</source>
<target>التحقق من توافر سلة المحذوفات من أجل المجلد %x...</target>
+<source>Moving file %x to the recycle bin</source>
+<target>نقل الملف %x إلى سلة المهملات</target>
+
+<source>Moving folder %x to the recycle bin</source>
+<target>نقل المجلد %x إلى سلة المهملات</target>
+
+<source>Moving symbolic link %x to the recycle bin</source>
+<target>نقل الارتباط الرمزي %x إلى سلة المهملات</target>
+
<source>Deleting file %x</source>
<target>حذف الملف %x</target>
@@ -199,21 +63,51 @@ Note: File paths must be relative to base directories.
<source>Deleting symbolic link %x</source>
<target>حذف الارتباط الرمزي %x</target>
+<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<target>سلة المهملات غير متوفرة للمجلدات التالية. سيتم حذف الملفات بشكل نهائي بدلاً عن ذلك:</target>
+
<source>An exception occurred</source>
<target>حدث استثناء</target>
-<source>Error</source>
-<target>خطأ</target>
+<source>A directory path is expected after %x.</source>
+<target>مسار متوقع بعد %x.</target>
+
+<source>Syntax error</source>
+<target>خطأ في البنية</target>
+
+<source>Cannot open file %x.</source>
+<target>تعذر فتح الملف %x.</target>
<source>File %x does not contain a valid configuration.</source>
<target>لا يحتوي الملف %x تكويناً صحيحاً.</target>
-<source>Warning</source>
-<target>تحذير</target>
+<source>Unequal number of left and right directories specified.</source>
+<target>لم يتم تحديد عدد متساوي من المسارات على الطرفين</target>
+
+<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
+<target>يجب أن يحتوي ملف الخيارات الخيارات على مستوى أزواج المسارات عند تحديد المسارات بواسطة سطر الأوامر</target>
+
+<source>Directories cannot be set for more than one configuration file.</source>
+<target>لا يمكن اختيار المسارات لأكثر من ملف خيارات واحد</target>
<source>Command line</source>
<target>سطر الأوامر</target>
+<source>Syntax:</source>
+<target>بنية:</target>
+
+<source>config files</source>
+<target>ملفات الخيارات</target>
+
+<source>directory</source>
+<target>مسار</target>
+
+<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
+<target>أي عدد من ملفات خيارات FreeFileSyn أو\و _gui and/or .ffs_batch</target>
+
+<source>Any number of alternative directories for at most one config file.</source>
+<target>أي عدد من المسارات البديلة لملف خيارات وحيد على الأكثر.</target>
+
<source>A folder input field is empty.</source>
<target>حقل إدخال خاص بمجلد فارغ.</target>
@@ -374,6 +268,19 @@ Note: File paths must be relative to base directories.
<source>Total time:</source>
<target>مجموع الوقت:</target>
+<source>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
+</source>
+<target>
+<pluralform>0 byte</pluralform>
+<pluralform>1 byte</pluralform>
+<pluralform>2 bytes</pluralform>
+<pluralform>%x bytes</pluralform>
+<pluralform>%x bytes</pluralform>
+<pluralform>%x bytes</pluralform>
+</target>
+
<source>%x MB</source>
<target>%x MB</target>
@@ -411,6 +318,9 @@ Note: File paths must be relative to base directories.
<source>/sec</source>
<target>\ثانية</target>
+<source>%x items/sec</source>
+<target>%x عنصر\الثانية</target>
+
<source>Configuration file %x loaded partially only.</source>
<target>تم تحميل ملف التكوين %x بشكلٍ جزئي فقط.</target>
@@ -423,6 +333,9 @@ Note: File paths must be relative to base directories.
<source>Browse directory</source>
<target>تصفح المسار</target>
+<source>Cannot access the Volume Shadow Copy Service.</source>
+<target>لا يمكن الوصول إلى خدمة النسخ الظلي الوسيط.</target>
+
<source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
<target>الرجاء استخدام إصدار الـ 64-bit للبرنامج لإنشاء ملفات الظل الاحتياطية على هذا النظام.</target>
@@ -432,10 +345,13 @@ Note: File paths must be relative to base directories.
<source>Cannot determine volume name for %x.</source>
<target>تعذر تحديد اسم الوسط %x</target>
-<source>Abort requested: Waiting for current operation to finish...</source>
+<source>Volume name %x is not part of file path %y.</source>
+<target>اسم الوسط %x ليس جزءا من مسار الملق %y.</target>
+
+<source>Stop requested: Waiting for current operation to finish...</source>
<target>طلب إحباط المهمة: في انتظار انتهاء المهمة الحالية...</target>
-<source>Failure to create timestamp for versioning:</source>
+<source>Unable to create timestamp for versioning:</source>
<target>فشل إنشاء طبعة زمنية من أجل عملية الوسم حسب الإصدار:</target>
<source>Cannot read the following XML elements:</source>
@@ -453,8 +369,8 @@ Note: File paths must be relative to base directories.
<source>&Program</source>
<target>&البرنامج</target>
-<source>&Content</source>
-<target>&المحتوى</target>
+<source>&View help</source>
+<target>&إظهار المساعدة</target>
<source>&About</source>
<target>&حول</target>
@@ -477,8 +393,8 @@ Note: File paths must be relative to base directories.
<source>To get started just import a .ffs_batch file.</source>
<target>للبدء قم باستيراد ملف .ffs_batch.</target>
-<source>Folders to watch</source>
-<target>المجلدات للمتابعة</target>
+<source>Folders to watch:</source>
+<target>المجلدات المراقبة</target>
<source>Add folder</source>
<target>إضافة مجلد</target>
@@ -492,12 +408,15 @@ Note: File paths must be relative to base directories.
<source>Select a folder</source>
<target>تحديد مجلد</target>
-<source>Idle time [seconds]</source>
-<target>وقت الخمول [ثواني]</target>
+<source>Idle time (in seconds):</source>
+<target>وقت الخمول (بالثانية)</target>
<source>Idle time between last detected change and execution of command</source>
<target>وقت الخمول بين آخر تغيير تم الكشف عنه وتنفيذ الأوامر</target>
+<source>Command line:</source>
+<target>سطر الأوامر:</target>
+
<source>
The command is triggered if:
- files or subfolders change
@@ -509,8 +428,8 @@ The command is triggered if:
-ظهور مجلدات جديدة (مثال: إدخال USB stick)
</target>
-<source>Start</source>
-<target>ابدأ</target>
+<source>&Start</source>
+<target>&ابدأ</target>
<source>&Retry</source>
<target>&إعادة المحاولة</target>
@@ -518,26 +437,38 @@ The command is triggered if:
<source>Cancel</source>
<target>إلغاء الأمر</target>
-<source>RealtimeSync - Automated Synchronization</source>
-<target>المزامنة اللحظية - المزمنة التلقائية</target>
+<source>About</source>
+<target>حول</target>
<source>Build: %x</source>
<target>بناء: %x</target>
-<source>About</source>
-<target>حول</target>
-
<source>All files</source>
<target>جميع الملفات</target>
+<source>Automated Synchronization</source>
+<target>مزامنة تلقائية</target>
+
+<source>Directory monitoring active</source>
+<target>مراقبة المسارات فعالة</target>
+
+<source>Waiting until all directories are available...</source>
+<target>انتظر حتى توفر جميع المسارات...</target>
+
+<source>Error</source>
+<target>خطأ</target>
+
<source>&Restore</source>
<target>&استعادة</target>
+<source>&Show error</source>
+<target>&إظهار الخطأ</target>
+
<source>&Exit</source>
<target>&خروج</target>
-<source>Invalid command line:</source>
-<target>سطر الأوامر غير صالح:</target>
+<source>Incorrect command line:</source>
+<target>سطر أوامر خاطئ:</target>
<source>File content</source>
<target>محتوى الملف</target>
@@ -599,8 +530,8 @@ The command is triggered if:
<source>Target folder input field must not be empty.</source>
<target>يجب أن لا يكون حقل إدخال المجلد الهدف فارغاً.</target>
-<source>Folder input field for versioning must not be empty.</source>
-<target>يجب أن لا يكون حقل إدخال المجلد من أجل الإصدارات فارغاً.</target>
+<source>Please enter a target folder for versioning.</source>
+<target>الرجاء تحديد مجلد هدف من أجل الوسم حسب الإصدار.</target>
<source>Source folder %x not found.</source>
<target>لم يتم العثور على المجلد المصدر %x.</target>
@@ -608,6 +539,9 @@ The command is triggered if:
<source>The following items have unresolved conflicts and will not be synchronized:</source>
<target>العناصر التالية لم تحل اختلافاتها، و لن يتم مزامنتها:</target>
+<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
+<target>المجلدات التالية مختلفة بشكل كبير. تأكد من تقابل المجلدات بشكل صحيح من أجل المزامنة.</target>
+
<source>Not enough free disk space available in:</source>
<target>المساحة الحرة المتوفرة على القرص غير كافية:</target>
@@ -626,11 +560,17 @@ The command is triggered if:
<source>Generating database...</source>
<target>إنشاء قاعدة بيانات...</target>
+<source>Creating a Volume Shadow Copy for %x...</source>
+<target>جاري إنشاء نسخة ظل وسيطة لـ %x...</target>
+
<source>Data verification error: %x and %y have different content.</source>
<target>خطأ في التحقق من البيانات: يحتوي %x و %y بيانات مختلفة.</target>
-<source>Synchronization aborted</source>
-<target>تم إحباط المزامنة</target>
+<source>job name</source>
+<target>اسم المهمة</target>
+
+<source>Synchronization stopped</source>
+<target>توقفت عملية المزامنة</target>
<source>Synchronization completed with errors</source>
<target>انتهاء عملية المزامنة مع وجود أخطء</target>
@@ -647,11 +587,29 @@ The command is triggered if:
<source>Saving log file %x...</source>
<target>حفظ ملف السجل %x...</target>
-<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
-<target>اضغط على "تبديل" لحل المشاكل في نافذة الحوار الرئيسي البرنامج.</target>
+<source>You can switch to FreeFileSync's main window to resolve this issue.</source>
+<target>بإمكانك العودة إلى نافذة FreeFileSync الرئيسية لحل هذه المشكلة.</target>
-<source>Switching to FreeFileSync main dialog</source>
-<target>الانتقال إلى نافذة حوار FreeFileSync الأساسية</target>
+<source>&Don't show this warning again</source>
+<target>&لا تظهر هذا التنبيه مرة ثانية</target>
+
+<source>&Ignore</source>
+<target>&تجاهل</target>
+
+<source>&Switch</source>
+<target>&تبديل</target>
+
+<source>Switching to FreeFileSync's main window</source>
+<target>العودة إلى نافذة FreeFileSync الرئيسية</target>
+
+<source>Serious Error</source>
+<target>خطأ فادح</target>
+
+<source>&Ignore subsequent errors</source>
+<target>&تجاهلا الأخطاء المماثلة</target>
+
+<source>Check for Program Updates</source>
+<target>تفقد وجود تحديثات للبرنامج</target>
<source>A new version of FreeFileSync is available:</source>
<target>يتوفر إصدار جديد من FreeFileSync:</target>
@@ -659,18 +617,12 @@ The command is triggered if:
<source>Download now?</source>
<target>تنزيل الآن؟</target>
-<source>New version found</source>
-<target>تم العثور على نسخة أحدث</target>
-
<source>&Download</source>
<target>&تنزيل</target>
<source>FreeFileSync is up to date.</source>
<target>البرنامج هو الأحدث حتى الآن.</target>
-<source>Information</source>
-<target>معلومات</target>
-
<source>Unable to connect to sourceforge.net.</source>
<target>تعذر الاتصال بـ sourceforge.net.</target>
@@ -728,26 +680,26 @@ The command is triggered if:
<source>Hibernate</source>
<target>السبات</target>
-<source>Selected variant:</source>
-<target>المتغير المختار:</target>
+<source>Alternate comparison settings</source>
+<target>خيارات المفارنة البديلة</target>
-<source>Select alternate comparison settings</source>
-<target>تحديد إعدادات المقارنة البديلة</target>
+<source>Alternate synchronization settings</source>
+<target>خيارات المزامنة البديلة</target>
-<source>Select alternate synchronization settings</source>
-<target>تحديد إعدادات المزامنة البديلة</target>
+<source>Local filter</source>
+<target>فلتر محلي</target>
-<source>Filter is active</source>
-<target>عامل التصفية نشط</target>
+<source>Active</source>
+<target>مفعل</target>
-<source>No filter selected</source>
-<target>لا يوجد عامل تصفية مختار</target>
+<source>None</source>
+<target>لا شيء</target>
<source>Remove alternate settings</source>
<target>إزالة الإعدادات البديلة</target>
<source>Clear filter settings</source>
-<target>مسح إعدادات عامل التصفية</target>
+<target>مسح إعدادات عامل الفلترة</target>
<source>Copy</source>
<target>نسخ</target>
@@ -755,6 +707,15 @@ The command is triggered if:
<source>Paste</source>
<target>لصق</target>
+<source>Alternate Comparison Settings</source>
+<target>خيارات المفارنة البديلة</target>
+
+<source>Alternate Synchronization Settings</source>
+<target>خيارات المزامنة البديلة</target>
+
+<source>Local Filter</source>
+<target>فلتر محلي</target>
+
<source>&New</source>
<target>&جديد</target>
@@ -770,15 +731,18 @@ The command is triggered if:
<source>2. &Synchronize</source>
<target>2. &مزامنة</target>
+<source>&Global settings</source>
+<target>&الإعدادات العامة</target>
+
<source>&Language</source>
<target>&اللغة</target>
+<source>&Find...</source>
+<target>&بحث...</target>
+
<source>&Export file list...</source>
<target>&تصدير قائمة الملفات...</target>
-<source>&Global settings</source>
-<target>&الإعدادات العامة</target>
-
<source>&Tools</source>
<target>&أدوات</target>
@@ -788,18 +752,12 @@ The command is triggered if:
<source>Check &automatically once a week</source>
<target>تحقق &أوتوماتيكياً بشكل أسبوعي</target>
-<source>Check for new &version</source>
-<target>التحقق من وجود &إصدار جديد</target>
+<source>&Check for new version</source>
+<target>&التحقق من وجود نسخة جديدة</target>
<source>Compare</source>
<target>قارن</target>
-<source>Comparison settings</source>
-<target>إعدادات المقارنة</target>
-
-<source>Synchronization settings</source>
-<target>إعدادات المزامنة</target>
-
<source>Synchronize</source>
<target>مزامنة</target>
@@ -812,6 +770,15 @@ The command is triggered if:
<source>Swap sides</source>
<target>مبادلة الجانبين</target>
+<source>Close search bar</source>
+<target>إغلاق شريط البحث</target>
+
+<source>Find:</source>
+<target>بحث</target>
+
+<source>Match case</source>
+<target>مطابقة حالة الأحرف (Match case)</target>
+
<source>Save as batch job</source>
<target>حفظ كمهمة دفعية</target>
@@ -819,7 +786,7 @@ The command is triggered if:
<target>إخفاء العناصر المستبعدة</target>
<source>Show filtered or temporarily excluded files</source>
-<target>إظهار الملفات التي تم تصفيتها أو استبعادها بشكل مؤقت</target>
+<target>إظهار الملفات التي تم فلترتها أو استبعادها بشكل مؤقت</target>
<source>Number of files and folders that will be created</source>
<target>عدد الملفات و المجلدات التي سيتم إنشاؤها</target>
@@ -833,86 +800,71 @@ The command is triggered if:
<source>Total bytes to copy</source>
<target>إجمالي عدد الـ bytes التي سيتم نسخها</target>
-<source>Items found:</source>
-<target>العناصر التي تم العثور عليها:</target>
+<source>Select a variant:</source>
+<target>اختيار بديل:</target>
-<source>Speed:</source>
-<target>السرعة:</target>
+<source>Identify equal files by comparing modification time and size.</source>
+<target>التعرف على الملفات المتساوية عن طريق مقارنة التاريخ و الحجم</target>
-<source>Time remaining:</source>
-<target>الوقت المتبقي:</target>
+<source>Identify equal files by comparing the file content.</source>
+<target>التعرف على الملفات المتساوية عن طريق مقارنة محتوى الملف</target>
-<source>Time elapsed:</source>
-<target>الوقت المنقضي:</target>
+<source>Symbolic links:</source>
+<target>ارتباطات رمزية:</target>
-<source>Synchronizing...</source>
-<target>مزامنة...</target>
+<source>More information</source>
+<target>المزيد من المعلومات</target>
-<source>On completion</source>
-<target>عند الانتهاء</target>
+<source>OK</source>
+<target>موافق</target>
-<source>Close</source>
-<target>إغلاق</target>
+<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
+<target>تحديد التغيرات و مواكبتها على الجانبين. عمليات الحذف, النقل و المشاكل المكتشفة بواسطة قواعد البيانات</target>
-<source>&Pause</source>
-<target>&إيقاف مؤقت</target>
+<source>Create a mirror backup of the left folder which exactly matches the right folder after synchronization.</source>
+<target>إنشاء نسخة نظيرة للمجلد على اليسار بحيث يطابق المجلد على اليمين بعد المزامنة</target>
-<source>Variant</source>
-<target>المتغير</target>
+<source>Copy new and updated files to the right folder.</source>
+<target>نسخ الملفات المحدثة إلى المجلد المناسب</target>
-<source>Statistics</source>
-<target>إحصائيات</target>
+<source>Configure your own synchronization rules.</source>
+<target>تحديد قواعد المزامنة الخاصة بك.</target>
-<source>Select a variant</source>
-<target>اختيار بديل</target>
+<source>Detect moved files</source>
+<target>اكتشاف الملفات المنقولة</target>
-<source>
-Files are found equal if
- - last write time and date
- - file size
-are the same
-</source>
-<target>
-يتم تعريف الملفات على أنها متماثلة إذا كان
- -آخر وقت و تاريخ كتابة
- -حجم الملف
-متطابقين
-</target>
+<source>Requires database files. Not supported by all file systems.</source>
+<target>يتطلب ملفات قواعد بيانات. غير مدعوم من قبل جميع أنظمة الملفات.</target>
-<source>
-Files are found equal if
- - file content
-is the same
-</source>
-<target>
-يتم تعريف الملفات على أنها متماثلة إذا كان
- -محتوى الملف
-متطابقين
-</target>
+<source>Delete files:</source>
+<target>حذف الملفات:</target>
-<source>Symbolic Link handling</source>
-<target>التعامل مع الارتباط رمزي</target>
+<source>Permanent</source>
+<target>الدائم</target>
-<source>Help</source>
-<target>تعليمات</target>
+<source>Delete or overwrite files permanently</source>
+<target>حذف أو الكتابة فوق الملفات بشكل دائم</target>
-<source>OK</source>
-<target>موافق</target>
+<source>Recycle bin</source>
+<target>سلة المهملات</target>
-<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
-<target>تحديد التغيرات و مواكبتها على الجانبين. عمليات الحذف, النقل و المشاكل المكتشفة بواسطة قواعد البيانات</target>
+<source>Back up deleted and overwritten files in the recycle bin</source>
+<target>نسخ احتياطي للملفات المحذوفة و المستبدلة في سلة المهملات</target>
+
+<source>Versioning</source>
+<target>الوسم برقم الإصدار</target>
-<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
-<target>إنشاء نسخة منعكسة عن المجلد الأيمن. يتم تعديل المجلد الأيسر ليطابق المجلد الأيمن.</target>
+<source>Move files to a user-defined folder</source>
+<target>نقل الملفات إلى المجلد المحدد من قبل المستخدم</target>
-<source>Copy new or updated files to right folder.</source>
-<target>نسخ الملفات الجديدة أو المحدثة إلى المجلد الأيمن.</target>
+<source>Naming convention:</source>
+<target>اصطلاح التسمية:</target>
-<source>Configure your own synchronization rules.</source>
-<target>تحديد قواعد المزامنة الخاصة بك.</target>
+<source>Show examples</source>
+<target>إظهار أمثلة</target>
-<source>Error handling</source>
-<target>معالجة الأخطاء</target>
+<source>Handle errors:</source>
+<target>التعامل مع الأخطاء:</target>
<source>Ignore</source>
<target>تجاهل</target>
@@ -926,68 +878,71 @@ is the same
<source>Show pop-up on errors or warnings</source>
<target>إظهار إطارات منبثقة عند حصول أخطاء أو تحذيرات</target>
-<source>Deletion handling</source>
-<target>التعامل مع الحذف</target>
+<source>On completion:</source>
+<target>عند الانتهاء:</target>
-<source>Permanent</source>
-<target>الدائم</target>
+<source>Start synchronization now?</source>
+<target>بدأ المزامنة الآن؟</target>
-<source>Delete or overwrite files permanently</source>
-<target>حذف أو الكتابة فوق الملفات بشكل دائم</target>
+<source>Variant:</source>
+<target>بديل</target>
-<source>Versioning</source>
-<target>الوسم برقم الإصدار</target>
+<source>Statistics</source>
+<target>إحصائيات</target>
-<source>Naming convention:</source>
-<target>اصطلاح التسمية:</target>
+<source>&Don't show this dialog again</source>
+<target>&لا تظهر نافذة الحوار هذه مرة ثانية</target>
-<source>Batch job</source>
-<target>مهمة دفعية</target>
+<source>Items found:</source>
+<target>العناصر التي تم العثور عليها:</target>
-<source>Exit</source>
-<target>خروج</target>
+<source>Speed:</source>
+<target>السرعة:</target>
-<source>Abort synchronization on first error</source>
-<target>إحباط المزامنة عند أول خطأ</target>
+<source>Time remaining:</source>
+<target>الوقت المتبقي:</target>
-<source>Show progress dialog</source>
-<target>إظهار نافذة حوار تقدم العملية</target>
+<source>Time elapsed:</source>
+<target>الوقت المنقضي:</target>
-<source>Save log</source>
-<target>حفظ سجل</target>
+<source>Synchronizing...</source>
+<target>مزامنة...</target>
-<source>Select folder to save log files</source>
-<target>حدد مجلداً لحفظ ملفات السجل</target>
+<source>Minimize to notification area</source>
+<target>تصغير إلى منطقة التنبيهات</target>
-<source>Limit</source>
-<target>الحد الأقصى</target>
+<source>Close</source>
+<target>إغلاق</target>
-<source>Limit maximum number of log files</source>
-<target>تقييد الحد الأقصى لعدد ملفات السجل</target>
+<source>&Pause</source>
+<target>&إيقاف مؤقت</target>
-<source>Source code written in C++ using:</source>
-<target>الرماز المصدري مكتوب بلغة C++ باستخدام:</target>
+<source>Stop</source>
+<target>توقف</target>
-<source>If you like FreeFileSync</source>
-<target>إذا أعجبك FreeFileSync</target>
+<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>إنشاء ملف دفعي من أجل عمليات المزامنة غير المحضورة. للبدأ, انقر نقراً مزدوجاً على الملف أو المهمة المجدولة في منظم المهام: %x</target>
-<source>Donate with PayPal</source>
-<target>تبرع باستخدام PayPal</target>
+<source>Stop synchronization at first error</source>
+<target>إيقاف المزامنة عند أول خطأ</target>
-<source>Many thanks for localization:</source>
-<target>شكرا جزيلا للترجمة:</target>
+<source>Show progress dialog</source>
+<target>إظهار نافذة حوار تقدم العملية</target>
-<source>Feedback and suggestions are welcome</source>
-<target>التعليقات و الاقتراحات موضع ترحيب</target>
+<source>Save log:</source>
+<target>حفظ السجل</target>
-<source>Homepage</source>
-<target>الصفحة الرئيسية</target>
+<source>Limit:</source>
+<target>حدود</target>
-<source>Email</source>
-<target>البريد الإلكتروني</target>
+<source>Limit maximum number of log files</source>
+<target>تقييد الحد الأقصى لعدد ملفات السجل</target>
-<source>Published under the GNU General Public License</source>
-<target>نشر تحت رخصة GNU General Public License</target>
+<source>How can I schedule a batch job?</source>
+<target>كيف يمكنني جدولة مهمة دفعية؟</target>
+
+<source>&Recycle bin</source>
+<target>&سلة المهملات</target>
<source>Delete on both sides</source>
<target>حذف على كلا الجانبين</target>
@@ -995,92 +950,140 @@ is the same
<source>Delete on both sides even if the file is selected on one side only</source>
<target>حذف الملف في كلا الجانبين حتى إذا كان الملف محدداً على جانب واحد فقط</target>
-<source>Include</source>
-<target>شمول</target>
+<source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source>
+<target>اختيار قوانين فلترة لاستثناء ملفات معينة من المزامنة. أدخل مسارات الملفات منسوبة إلى زوج المجلدات المقابل.</target>
-<source>Exclude</source>
-<target>استبعاد</target>
+<source>Include:</source>
+<target>إدخال:</target>
+
+<source>Exclude:</source>
+<target>استثناء:</target>
-<source>Time span</source>
-<target>المجال الزمني</target>
+<source>Time span:</source>
+<target>المجال الزمني:</target>
-<source>File size</source>
-<target>حجم الملف</target>
+<source>File size:</source>
+<target>حجم الملف:</target>
-<source>Minimum</source>
-<target>الحد الأدنى</target>
+<source>Minimum:</source>
+<target>أصغري</target>
-<source>Maximum</source>
-<target>الحد الأقصى</target>
+<source>Maximum:</source>
+<target>أعظمي</target>
<source>&Clear</source>
<target>&إزالة</target>
-<source>Global settings</source>
-<target>الإعدادات العامة</target>
+<source>The following settings are used for all synchronization jobs.</source>
+<target>هذه الإعدادات مستخدمة لجميع مهمات المزامنة</target>
<source>Fail-safe file copy</source>
<target>نسخ ملفات آمن من الفشل</target>
+<source>
+Copy to a temporary file (*.ffs_tmp) before overwriting target.
+This guarantees a consistent state even in case of a serious error.
+</source>
+<target>
+قم بالنسخ إلى ملف مؤقت (*.ffs_tmp) قبل استبدال الملف الهدف.
+هذه العملية تضمن حالة مستقرة حتى في حال حدوث خطأ فادح.
+</target>
+
+<source>(recommended)</source>
+<target>(موصى به)</target>
+
<source>Copy locked files</source>
<target>نسخ الملفات المقفلة</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service.</source>
+<target>نسخ الملفات المشتركة مع مستخدمين آخرين أو المقفولة باستخدام خدمة نسخ الظل الوسيط</target>
+
+<source>(requires administrator rights)</source>
+<target>(بحاجة امتيازات المدير)</target>
+
<source>Copy file access permissions</source>
<target>نسخ أذونات الوصول إلى الملف</target>
-<source>Restore hidden dialogs</source>
-<target>استعادة نوافذ الحوار المخفية</target>
+<source>Transfer file and folder permissions.</source>
+<target>نقل أذونات الملفات و المجلدات.</target>
+
+<source>Automatic retry on error:</source>
+<target>إعادة المحاولة بشكل تلقائي عند حصول خطأ:</target>
-<source>External applications</source>
-<target>تطبيقات خارجية</target>
+<source>Retry count:</source>
+<target>تعداد محاولات الإعادة:</target>
+
+<source>Delay (in seconds):</source>
+<target>التأخير (بالثواني):</target>
+
+<source>Customize context menu:</source>
+<target>تخصيص القائمة المحلية</target>
<source>Description</source>
<target>الوصف</target>
+<source>Restore hidden windows</source>
+<target>استعادة نوافذ الحوار المخفية</target>
+
<source>&Default</source>
<target>&الافتراضي</target>
-<source>Find what:</source>
-<target>بحث عن:</target>
+<source>Source code written in C++ using:</source>
+<target>الرماز المصدري مكتوب بلغة C++ باستخدام:</target>
-<source>Match case</source>
-<target>مطابقة حالة الأحرف (Match case)</target>
+<source>If you like FreeFileSync</source>
+<target>إذا أعجبك FreeFileSync</target>
-<source>&Find next</source>
-<target>&بحث عن التالي</target>
+<source>Donate with PayPal</source>
+<target>تبرع باستخدام PayPal</target>
-<source>Start synchronization</source>
-<target>بدء المزامنة</target>
+<source>Feedback and suggestions are welcome</source>
+<target>التعليقات و الاقتراحات موضع ترحيب</target>
-<source>Delete</source>
-<target>حذف</target>
+<source>Homepage</source>
+<target>الصفحة الرئيسية</target>
-<source>Configure filter</source>
-<target>ضبط عامل التصفية</target>
+<source>Email</source>
+<target>البريد الإلكتروني</target>
-<source>Find</source>
-<target>بحث</target>
+<source>Published under the GNU General Public License</source>
+<target>نشر تحت رخصة GNU General Public License</target>
+
+<source>Many thanks for localization:</source>
+<target>شكرا جزيلا للترجمة:</target>
+
+<source>Save as Batch Job</source>
+<target>حفظ كمهمة دفعية</target>
+
+<source>Delete Items</source>
+<target>حذف العناصر</target>
+
+<source>Global Settings</source>
+<target>الخيارات العامة</target>
-<source>Select time span</source>
-<target>حدد المجال الزمني</target>
+<source>Select Time Span</source>
+<target>اختيار المطال الزمني</target>
-<source>Folder pairs</source>
+<source>Folder Pairs</source>
<target>أزواج المجلدات</target>
+<source>Find</source>
+<target>بحث</target>
+
<source>Overview</source>
<target>نظرة عامة</target>
<source>Configuration</source>
<target>التكوين</target>
-<source>Main bar</source>
+<source>Main Bar</source>
<target>الشريط الرئيسي</target>
-<source>Filter files</source>
-<target>تصفية الملفات</target>
+<source>Filter Files</source>
+<target>فلترة الملفات</target>
-<source>Select view</source>
-<target>حدد طريقة العرض</target>
+<source>Select View</source>
+<target>اخيار طريقة العرض</target>
<source>Open...</source>
<target>فتح...</target>
@@ -1091,6 +1094,21 @@ is the same
<source>Compare both sides</source>
<target>مقارنة بين كلا الجانبين</target>
+<source>Comparison settings</source>
+<target>إعدادات المقارنة</target>
+
+<source>Synchronization settings</source>
+<target>إعدادات المزامنة</target>
+
+<source>Start synchronization</source>
+<target>بدء المزامنة</target>
+
+<source>Confirm</source>
+<target>تأكيد</target>
+
+<source>&Execute</source>
+<target>&تنفيذ</target>
+
<source>
<pluralform>1 directory</pluralform>
<pluralform>%x directories</pluralform>
@@ -1133,17 +1151,23 @@ is the same
<source>Set direction:</source>
<target>تحديد الاتجاه:</target>
+<source>multiple selection</source>
+<target>تحديد متعدد</target>
+
+<source>Include via filter:</source>
+<target>تضمن عن طريق فلتر</target>
+
+<source>Exclude via filter:</source>
+<target>استبعاد باستخدام عامل الفلترة:</target>
+
<source>Exclude temporarily</source>
<target>استبعاد مؤقتاً</target>
<source>Include temporarily</source>
<target>شمول مؤقتاً</target>
-<source>multiple selection</source>
-<target>تحديد متعدد</target>
-
-<source>Exclude via filter:</source>
-<target>استبعاد باستخدام عامل التصفية:</target>
+<source>Delete</source>
+<target>حذف</target>
<source>Include all</source>
<target>شمول الكل</target>
@@ -1187,9 +1211,15 @@ is the same
<source>Do you want to save changes to %x?</source>
<target>هل تريد حفظ التغييرات إلى %x؟</target>
+<source>Never save &changes</source>
+<target>لا تقم بحفظ &التغيرات</target>
+
<source>Do&n't save</source>
<target>&لا تحفظ</target>
+<source>Filter</source>
+<target>عامل الفلترة</target>
+
<source>Show files that exist on left side only</source>
<target>إظهار الملفات الموجودة في الجانب الأيمن فقط</target>
@@ -1235,35 +1265,26 @@ is the same
<source>Set as default</source>
<target>تحديد كوضع افتراضي</target>
-<source>Operation aborted</source>
-<target>تم إحباط العملية</target>
-
<source>All folders are in sync</source>
<target>جميع المجلدات متزامنة</target>
-<source>File list exported</source>
-<target>تم تصدير قائمة الملفات</target>
-
-<source>Searching for program updates...</source>
-<target>جاري البحث عن تحديثات للبرنامج...</target>
+<source>Synchronization Settings</source>
+<target>خيارات المزامنة</target>
-<source>&Ignore</source>
-<target>&تجاهل</target>
-
-<source>Fatal Error</source>
-<target>خطأ فادح</target>
+<source>Comparison Settings</source>
+<target>خيارات المقارنة</target>
-<source>&Switch</source>
-<target>&تبديل</target>
+<source>Cannot find %x</source>
+<target>لا يمكن العثور على %x</target>
-<source>Question</source>
-<target>سؤال</target>
+<source>Comma-separated values</source>
+<target>قيم مفصولة بواسطة فواصل</target>
-<source>&Yes</source>
-<target>&نعم</target>
+<source>File list exported</source>
+<target>تم تصدير قائمة الملفات</target>
-<source>&No</source>
-<target>&لا</target>
+<source>Searching for program updates...</source>
+<target>جاري البحث عن تحديثات للبرنامج...</target>
<source>Scanning...</source>
<target>جاري الفحص...</target>
@@ -1274,23 +1295,26 @@ is the same
<source>Info</source>
<target>معلومات</target>
+<source>Warning</source>
+<target>تحذير</target>
+
<source>Paused</source>
<target>تم الإيقاف مؤقتاً</target>
<source>Initializing...</source>
<target>التجهيز للبدأ...</target>
-<source>Aborted</source>
-<target>تم الإحباط</target>
+<source>Stopped</source>
+<target>توقف</target>
<source>Completed</source>
<target>تم الإنتهاء</target>
-<source>Cannot find %x</source>
-<target>لا يمكن العثور على %x</target>
+<source>&Continue</source>
+<target>&متابعة</target>
-<source>Inactive</source>
-<target>خامل</target>
+<source>Log</source>
+<target>السجل</target>
<source>Today</source>
<target>اليوم</target>
@@ -1316,8 +1340,21 @@ is the same
<source>MB</source>
<target>MB</target>
-<source>Filter</source>
-<target>عامل التصفية</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>هل تريد حقاً نقل 0 ملف إلى سلة المهملات ؟</pluralform>
+<pluralform>هل تريد حقاً نقل هذا الملف الوحيد 1 إلى سلة المهملات ؟</pluralform>
+<pluralform>هل تريد حقاً نقل هذين الملفبن 2 إلى سلة المهملات ؟</pluralform>
+<pluralform>هل تريد حقاً نقل %x ملفات إلى سلة المهملات ؟</pluralform>
+<pluralform>هل تريد حقاً نقل %x ملفاً إلى سلة المهملات ؟</pluralform>
+<pluralform>هل تريد حقاً نقل %x ملف إلى سلة المهملات ؟</pluralform>
+</target>
+
+<source>Move</source>
+<target>نقل</target>
<source>
<pluralform>Do you really want to delete the following item?</pluralform>
@@ -1332,6 +1369,9 @@ is the same
<pluralform>هل تريد حقاً حذف الـ %x ملف التالية ؟</pluralform>
</target>
+<source>Exclude</source>
+<target>استبعاد</target>
+
<source>Direct</source>
<target>مباشر</target>
@@ -1356,8 +1396,8 @@ is the same
<source>- Other side's counterpart to %item_folder%</source>
<target>- االنظير للجانب الآخر لـ %item_folder%</target>
-<source>Make hidden warnings and dialogs visible again?</source>
-<target>جعل التحذيرات و نوافذ الحوارات المخفية مرئية من جديد؟</target>
+<source>Restore all hidden windows and warnings?</source>
+<target>استعادة جميع نوافذ الحوار و التحذيرات المخفية؟</target>
<source>Leave as unresolved conflict</source>
<target>ترك كاختلافات من دون حل</target>
@@ -1494,18 +1534,21 @@ is the same
<pluralform>%x يوم</pluralform>
</target>
-<source>Failed to register to receive system messages.</source>
+<source>Unable to register to receive system messages.</source>
<target>تعذر التسجيل لاستقبال رسائل النظام.</target>
<source>Cannot set privilege %x.</source>
<target>لا يمكن تعيين امتيازات %x.</target>
-<source>Failed to suspend system sleep mode.</source>
+<source>Unable to suspend system sleep mode.</source>
<target>تعذر تعليق وضع النوم للنظام.</target>
<source>Cannot change process I/O priorities.</source>
<target>تعذر تغيير أولويات I/O للعملية</target>
+<source>Unable to move %x to the recycle bin.</source>
+<target>تعذر نقل %x إلى سلة المهملات.</target>
+
<source>Cannot determine final path for %x.</source>
<target>تعذر تحديد المسار النهائي لـ %x.</target>
diff --git a/BUILD/Languages/chinese_simple.lng b/BUILD/Languages/chinese_simple.lng
index 98c55320..8b5a89d6 100644
--- a/BUILD/Languages/chinese_simple.lng
+++ b/BUILD/Languages/chinese_simple.lng
@@ -2,11 +2,31 @@
<language>简体中文</language>
<translator>CyberCowBoy</translator>
<locale>zh_CN</locale>
- <flag_image>flag_china.png</flag_image>
- <plural_form_count>1</plural_form_count>
+ <image>flag_china.png</image>
+ <plural_count>1</plural_count>
<plural_definition>0</plural_definition>
</header>
+<source>
+<pluralform>Do you really want to execute the command %y for one item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+</target>
+
+<source>&Check</source>
+<target></target>
+
+<source>Retrying operation...</source>
+<target></target>
+
+<source>
+<pluralform>Automatic retry in 1 second...</pluralform>
+<pluralform>Automatic retry in %x seconds...</pluralform>
+</source>
+<target>
+</target>
+
<source>Both sides have changed since last synchronization.</source>
<target>在最后的同步之后两边均已改变.</target>
@@ -58,9 +78,6 @@
<source>Cannot open file %x.</source>
<target>无法打开文件 %x.</target>
-<source>Error</source>
-<target>错误</target>
-
<source>File %x does not contain a valid configuration.</source>
<target>文件 %x 并未包含合法的配置.</target>
@@ -70,12 +87,12 @@
<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
<target>当目录通过命令行设定时配置文件必须不包含目录对级别的设置.</target>
-<source>Warning</source>
-<target>警告</target>
-
<source>Directories cannot be set for more than one configuration file.</source>
<target>无法为多于一个配置文件设置目录.</target>
+<source>Command line</source>
+<target>命令行</target>
+
<source>Syntax:</source>
<target>语法:</target>
@@ -91,9 +108,6 @@
<source>Any number of alternative directories for at most one config file.</source>
<target>任意数量的替代目录中至多有一个配置文件.</target>
-<source>Command line</source>
-<target>命令行</target>
-
<source>A folder input field is empty.</source>
<target>有一个文件夹输入框为空.</target>
@@ -289,8 +303,8 @@
<source>/sec</source>
<target>/秒</target>
-<source>%x items</source>
-<target>%x 个项目</target>
+<source>%x items/sec</source>
+<target>%x 个项目/秒</target>
<source>Configuration file %x loaded partially only.</source>
<target>配置文件 %x 只是部分载入.</target>
@@ -319,11 +333,11 @@
<source>Volume name %x is not part of file path %y.</source>
<target>卷名 %x 不是文件路径 %y 的一部分.</target>
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>请求中止: 正在等待当前操作完成...</target>
+<source>Stop requested: Waiting for current operation to finish...</source>
+<target>停止要求: 等待当前操作完成...</target>
-<source>Failure to create timestamp for versioning:</source>
-<target>未能为历史版本创建时间标记</target>
+<source>Unable to create timestamp for versioning:</source>
+<target>无法为历史版本创建时间戳:</target>
<source>Cannot read the following XML elements:</source>
<target>无法读取如下XML元素:</target>
@@ -340,8 +354,8 @@
<source>&Program</source>
<target>程序(&P)</target>
-<source>&Content</source>
-<target>内容(&C)</target>
+<source>&View help</source>
+<target>查看帮助(&V)</target>
<source>&About</source>
<target>关于(&A)</target>
@@ -364,8 +378,8 @@
<source>To get started just import a .ffs_batch file.</source>
<target>要开始只需导入一个 .ffs_batch文件.</target>
-<source>Folders to watch</source>
-<target>要监视的文件夹</target>
+<source>Folders to watch:</source>
+<target>要监视的文件夹:</target>
<source>Add folder</source>
<target>添加文件夹</target>
@@ -379,12 +393,15 @@
<source>Select a folder</source>
<target>选择一个文件夹</target>
-<source>Idle time [seconds]</source>
-<target>空闲时间[秒]</target>
+<source>Idle time (in seconds):</source>
+<target>空闲时间(秒):</target>
<source>Idle time between last detected change and execution of command</source>
<target>最后检测到改变和命令执行之间的空闲时间</target>
+<source>Command line:</source>
+<target>命令行:</target>
+
<source>
The command is triggered if:
- files or subfolders change
@@ -396,33 +413,30 @@ The command is triggered if:
- 新文件夹到达(例如U盘插入)
</target>
-<source>Start</source>
-<target>开始</target>
-
-<source>&Retry</source>
-<target>重试(&R)</target>
-
-<source>Cancel</source>
-<target>取消</target>
+<source>&Start</source>
+<target>开始(&S)</target>
-<source>RealtimeSync - Automated Synchronization</source>
-<target>实时同步 - 自动同步</target>
+<source>About</source>
+<target>关于</target>
<source>Build: %x</source>
<target>Build: %x</target>
-<source>About</source>
-<target>关于</target>
-
<source>All files</source>
<target>所有文件</target>
+<source>Automated Synchronization</source>
+<target>自动同步</target>
+
<source>Directory monitoring active</source>
<target>目录监视激活</target>
<source>Waiting until all directories are available...</source>
<target>正在等待直到所有目录都可用...</target>
+<source>Error</source>
+<target>错误</target>
+
<source>&Restore</source>
<target>恢复(&R)</target>
@@ -432,8 +446,11 @@ The command is triggered if:
<source>&Exit</source>
<target>退出(&E)</target>
-<source>Invalid command line:</source>
-<target>无效的命令行:</target>
+<source>Incorrect command line:</source>
+<target>不正确的命令行:</target>
+
+<source>&Retry</source>
+<target>重试(&R)</target>
<source>File content</source>
<target>文件内容</target>
@@ -495,8 +512,8 @@ The command is triggered if:
<source>Target folder input field must not be empty.</source>
<target>目标文件夹输入框必须不为空.</target>
-<source>Folder input field for versioning must not be empty.</source>
-<target>用于存放历史版本的文件夹输入框必须不为空.</target>
+<source>Please enter a target folder for versioning.</source>
+<target>请输入一个用于保存历史版本的目标文件夹.</target>
<source>Source folder %x not found.</source>
<target>无法找到源文件夹 %x.</target>
@@ -534,8 +551,8 @@ The command is triggered if:
<source>job name</source>
<target>作业名称</target>
-<source>Synchronization aborted</source>
-<target>同步已被中止</target>
+<source>Synchronization stopped</source>
+<target>同步已停止</target>
<source>Synchronization completed with errors</source>
<target>同步已完成但有错误</target>
@@ -552,14 +569,29 @@ The command is triggered if:
<source>Saving log file %x...</source>
<target>正在保存日志文件 %x...</target>
-<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
-<target>请按下"切换"来解决 FreeFileSync主对话框上的问题.</target>
+<source>You can switch to FreeFileSync's main window to resolve this issue.</source>
+<target>你可以切换至 FreeFileSync 的主窗口来解决这个问题.</target>
+
+<source>&Don't show this warning again</source>
+<target>不再显示这个警告(&D)</target>
+
+<source>&Ignore</source>
+<target>忽略(&I)</target>
+
+<source>&Switch</source>
+<target>切换(&S)</target>
+
+<source>Switching to FreeFileSync's main window</source>
+<target>切换至 FreeFileSync 的主窗口</target>
+
+<source>&Ignore subsequent errors</source>
+<target>忽略后续的错误(&I)</target>
-<source>Switching to FreeFileSync main dialog</source>
-<target>正在切换到 FreeFileSync 主对话框</target>
+<source>Serious Error</source>
+<target>严重错误</target>
-<source>Retrying operation after error:</source>
-<target>发生错误后重试操作:</target>
+<source>Check for Program Updates</source>
+<target>检查程序的更新</target>
<source>A new version of FreeFileSync is available:</source>
<target>已经有新版本的FreeFileSync可用:</target>
@@ -567,18 +599,12 @@ The command is triggered if:
<source>Download now?</source>
<target>立即下载?</target>
-<source>New version found</source>
-<target>找到新版本</target>
-
<source>&Download</source>
<target>下载(&D)</target>
<source>FreeFileSync is up to date.</source>
<target>FreeFileSync 已是最新.</target>
-<source>Information</source>
-<target>信息</target>
-
<source>Unable to connect to sourceforge.net.</source>
<target>无法链接到 Sourceforge.net.</target>
@@ -636,20 +662,20 @@ The command is triggered if:
<source>Hibernate</source>
<target>休眠</target>
-<source>Selected variant:</source>
-<target>选定的变化:</target>
+<source>Alternate comparison settings</source>
+<target>备用比较设置</target>
-<source>Select alternate comparison settings</source>
-<target>选择替换的比较设置</target>
+<source>Alternate synchronization settings</source>
+<target>备用同步设置</target>
-<source>Select alternate synchronization settings</source>
-<target>选择替换同步设置</target>
+<source>Local filter</source>
+<target>本地过滤器</target>
-<source>Filter is active</source>
-<target>过滤器已生效</target>
+<source>Active</source>
+<target>生效</target>
-<source>No filter selected</source>
-<target>没有选定过滤器</target>
+<source>None</source>
+<target>无</target>
<source>Remove alternate settings</source>
<target>移除替换设置</target>
@@ -663,6 +689,15 @@ The command is triggered if:
<source>Paste</source>
<target>粘贴</target>
+<source>Alternate Comparison Settings</source>
+<target>备用比较设置</target>
+
+<source>Alternate Synchronization Settings</source>
+<target>备用同步设置</target>
+
+<source>Local Filter</source>
+<target>本地过滤器</target>
+
<source>&New</source>
<target>新建(&N)</target>
@@ -678,15 +713,18 @@ The command is triggered if:
<source>2. &Synchronize</source>
<target>2. 同步(&S)</target>
+<source>&Global settings</source>
+<target>全局设置(&G)</target>
+
<source>&Language</source>
<target>切换语言(&L)</target>
+<source>&Find...</source>
+<target>查找...(&F)</target>
+
<source>&Export file list...</source>
<target>导出文件列表(&E)...</target>
-<source>&Global settings</source>
-<target>全局设置(&G)</target>
-
<source>&Tools</source>
<target>工具(&T)</target>
@@ -696,17 +734,14 @@ The command is triggered if:
<source>Check &automatically once a week</source>
<target>每周自动检查一次(&A)</target>
-<source>Check for new &version</source>
-<target>检查新版本(&V)</target>
+<source>&Check for new version</source>
+<target>检查新版本(&C)</target>
<source>Compare</source>
<target>比较</target>
-<source>Comparison settings</source>
-<target>比较设置</target>
-
-<source>Synchronization settings</source>
-<target>同步设置</target>
+<source>Cancel</source>
+<target>取消</target>
<source>Synchronize</source>
<target>同步</target>
@@ -720,6 +755,15 @@ The command is triggered if:
<source>Swap sides</source>
<target>两侧互换</target>
+<source>Close search bar</source>
+<target>关闭搜索条</target>
+
+<source>Find:</source>
+<target>查找:</target>
+
+<source>Match case</source>
+<target>匹配大小写</target>
+
<source>Save as batch job</source>
<target>另存为批处理作业</target>
@@ -741,74 +785,20 @@ The command is triggered if:
<source>Total bytes to copy</source>
<target>要复制的总字节数</target>
-<source>Items found:</source>
-<target>已找到的项目:</target>
-
-<source>Speed:</source>
-<target>速度:</target>
-
-<source>Time remaining:</source>
-<target>剩余时间:</target>
-
-<source>Time elapsed:</source>
-<target>已用时间:</target>
-
-<source>Synchronizing...</source>
-<target>同步中...</target>
-
-<source>Minimize to notification area</source>
-<target>最小化到托盘</target>
-
-<source>On completion</source>
-<target>在完成时</target>
-
-<source>Close</source>
-<target>关闭</target>
-
-<source>&Pause</source>
-<target>暂停(&P)</target>
-
-<source>Variant</source>
-<target>变化</target>
-
-<source>Statistics</source>
-<target>统计</target>
-
-<source>&Don't show this dialog again</source>
-<target>不要再显示这个对话框(&D)</target>
-
-<source>Select a variant</source>
-<target>选择一个变化</target>
+<source>Select a variant:</source>
+<target>选择一个变化:</target>
-<source>
-Files are found equal if
- - last write time and date
- - file size
-are the same
-</source>
-<target>
-文件被认为是相同的,如果
- - 最后修改时间和日期
- - 文件大小
-是相同的
-</target>
+<source>Identify equal files by comparing modification time and size.</source>
+<target>以比较修改时间和文件大小来识别相同文件.</target>
-<source>
-Files are found equal if
- - file content
-is the same
-</source>
-<target>
-文件被认为是相同的,如果
- - 文件内容
-是相同的
-</target>
+<source>Identify equal files by comparing the file content.</source>
+<target>以比较文件内容来识别相同的文件.</target>
-<source>Symbolic Link handling</source>
-<target>符号连接处理方式</target>
+<source>Symbolic links:</source>
+<target>符号连接:</target>
-<source>Help</source>
-<target>帮助</target>
+<source>More information</source>
+<target>更多信息</target>
<source>OK</source>
<target>确定</target>
@@ -816,11 +806,11 @@ is the same
<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
<target>识别和传播两侧的变化. 删除, 移动和冲突会使用一个数据库来自动检测.</target>
-<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
-<target>镜像备份左边的文件夹.同步后右边的文件夹被修改为和左边文件夹精确匹配.</target>
+<source>Create a mirror backup of the left folder which exactly matches the right folder after synchronization.</source>
+<target>创建左侧文件夹的镜像备份, 在同步之后右侧文件夹完全精确匹配.</target>
-<source>Copy new or updated files to right folder.</source>
-<target>复制新的或修改过的文件到右侧文件夹</target>
+<source>Copy new and updated files to the right folder.</source>
+<target>复制新的和已更新的文件到右侧文件夹.</target>
<source>Configure your own synchronization rules.</source>
<target>配置你自己的同步规则.</target>
@@ -831,23 +821,8 @@ is the same
<source>Requires database files. Not supported by all file systems.</source>
<target>需要数据库文件. 不是所有文件系统都支持.</target>
-<source>Error handling</source>
-<target>错误处理</target>
-
-<source>Ignore</source>
-<target>忽略</target>
-
-<source>Hide all error and warning messages</source>
-<target>隐藏所有错误与警告信息</target>
-
-<source>Pop-up</source>
-<target>弹出框</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>在错误或警告时显示弹出对话框</target>
-
-<source>Deletion handling</source>
-<target>删除处理</target>
+<source>Delete files:</source>
+<target>删除文件:</target>
<source>Permanent</source>
<target>永久</target>
@@ -870,56 +845,89 @@ is the same
<source>Naming convention:</source>
<target>命名规则:</target>
-<source>Batch job</source>
-<target>批处理作业</target>
+<source>Show examples</source>
+<target>显示范例</target>
-<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
-<target>创建一个用于无人值守同步的批处理文件. 要开始, 双击这个文件或任务计划器中的计划调度: %x</target>
+<source>Handle errors:</source>
+<target>处理错误:</target>
-<source>Exit</source>
-<target>退出</target>
+<source>Ignore</source>
+<target>忽略</target>
-<source>Abort synchronization on first error</source>
-<target>在第一个错误时中止同步</target>
+<source>Hide all error and warning messages</source>
+<target>隐藏所有错误与警告信息</target>
-<source>Show progress dialog</source>
-<target>显示进度对话框</target>
+<source>Pop-up</source>
+<target>弹出框</target>
-<source>Save log</source>
-<target>保存日志</target>
+<source>Show pop-up on errors or warnings</source>
+<target>在错误或警告时显示弹出对话框</target>
-<source>Select folder to save log files</source>
-<target>选择要保存日志文件的文件夹</target>
+<source>On completion:</source>
+<target>在完成时:</target>
-<source>Limit</source>
-<target>限制</target>
+<source>Start synchronization now?</source>
+<target>现在开始同步吗?</target>
-<source>Limit maximum number of log files</source>
-<target>限制日志文件的量大个数</target>
+<source>Variant:</source>
+<target>变化:</target>
-<source>Source code written in C++ using:</source>
-<target>源代码用如下C++工具写成:</target>
+<source>Statistics</source>
+<target>统计</target>
-<source>If you like FreeFileSync</source>
-<target>如果你喜欢 FreeFileSync</target>
+<source>&Don't show this dialog again</source>
+<target>不要再显示这个对话框(&D)</target>
-<source>Donate with PayPal</source>
-<target>通过PayPal捐赠</target>
+<source>Items found:</source>
+<target>已找到的项目:</target>
-<source>Many thanks for localization:</source>
-<target>非常感谢以下本地化翻译者:</target>
+<source>Speed:</source>
+<target>速度:</target>
-<source>Feedback and suggestions are welcome</source>
-<target>欢迎反馈意见和提出建议</target>
+<source>Time remaining:</source>
+<target>剩余时间:</target>
-<source>Homepage</source>
-<target>主页</target>
+<source>Time elapsed:</source>
+<target>已用时间:</target>
-<source>Email</source>
-<target>邮箱</target>
+<source>Synchronizing...</source>
+<target>同步中...</target>
-<source>Published under the GNU General Public License</source>
-<target>在GNU通用公共许可下发布</target>
+<source>Minimize to notification area</source>
+<target>最小化到托盘</target>
+
+<source>Close</source>
+<target>关闭</target>
+
+<source>&Pause</source>
+<target>暂停(&P)</target>
+
+<source>Stop</source>
+<target>停止</target>
+
+<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>创建一个用于无人值守同步的批处理文件. 要开始, 双击这个文件或任务计划器中的计划调度: %x</target>
+
+<source>Stop synchronization at first error</source>
+<target>在遇到第一个错误时停止同步</target>
+
+<source>Show progress dialog</source>
+<target>显示进度对话框</target>
+
+<source>Save log:</source>
+<target>保存日志:</target>
+
+<source>Limit:</source>
+<target>限制:</target>
+
+<source>Limit maximum number of log files</source>
+<target>限制日志文件的量大个数</target>
+
+<source>How can I schedule a batch job?</source>
+<target>我如何计划一个批处理作业?</target>
+
+<source>&Recycle bin</source>
+<target>回收站(&R)</target>
<source>Delete on both sides</source>
<target>从两侧删除</target>
@@ -927,109 +935,136 @@ is the same
<source>Delete on both sides even if the file is selected on one side only</source>
<target>从两侧删除(即使仅在一侧选择文件)</target>
-<source>
-Files will only be synchronized if they pass all filter rules.
-Note: File paths must be relative to base directories.
-</source>
-<target>
-文件仅仅在它们通过了所有的过滤器规则时才会被同步.
-备注: 文件路径必须是主目录的相对路径.
-</target>
+<source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source>
+<target>选择过滤器规则以将某些文件从同步中排除. 输入与相关的文件夹对相对的与文件路径.</target>
-<source>Include</source>
-<target>包括</target>
+<source>Include:</source>
+<target>包括:</target>
-<source>Exclude</source>
-<target>排除</target>
+<source>Exclude:</source>
+<target>排除:</target>
-<source>Time span</source>
-<target>时间跨度</target>
+<source>Time span:</source>
+<target>时间跨度:</target>
-<source>File size</source>
-<target>文件大小</target>
+<source>File size:</source>
+<target>文件大小:</target>
-<source>Minimum</source>
-<target>最小</target>
+<source>Minimum:</source>
+<target>最小:</target>
-<source>Maximum</source>
-<target>最大</target>
+<source>Maximum:</source>
+<target>最大:</target>
<source>&Clear</source>
<target>清除(&C)</target>
-<source>Global settings</source>
-<target>全局设置</target>
+<source>The following settings are used for all synchronization jobs.</source>
+<target>如下的设置使用于所有同步作业.</target>
<source>Fail-safe file copy</source>
<target>无风险的文件复制</target>
-<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
-<target>先复制到一个临时文件(*.ffs_tmp)然后再改名. 这保证了即使是在发生致使错误的情况下也有一致的状态.</target>
+<source>
+Copy to a temporary file (*.ffs_tmp) before overwriting target.
+This guarantees a consistent state even in case of a serious error.
+</source>
+<target>在覆盖目标之前先复制到临时文件(*.ffs_tmp). 这样即使在发生严重错误的情况下也可以保证有一致的状态.</target>
+
+<source>(recommended)</source>
+<target>(推荐)</target>
<source>Copy locked files</source>
<target>复制被锁定的文件</target>
-<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
-<target>使用卷影复制服务来复制已共享或已锁定的文件(需要管理员权限)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service.</source>
+<target>使用卷影复制服务来复制已共享或已锁定的文件.</target>
+
+<source>(requires administrator rights)</source>
+<target>(需要管理员权限)</target>
<source>Copy file access permissions</source>
<target>复制文件存取权限</target>
-<source>Transfer file and folder permissions (requires administrator rights)</source>
-<target>传输文件和文件夹权限(需要管理员权限)</target>
+<source>Transfer file and folder permissions.</source>
+<target>传输文件及文件夹的权限.</target>
+
+<source>Automatic retry on error:</source>
+<target>在出错时自动重试:</target>
+
+<source>Retry count:</source>
+<target>重试计数:</target>
-<source>Restore hidden dialogs</source>
-<target>恢复被隐藏的对话框</target>
+<source>Delay (in seconds):</source>
+<target>延时 (秒):</target>
-<source>External applications</source>
-<target>外部应用程序</target>
+<source>Customize context menu:</source>
+<target>自定义右键菜单:</target>
<source>Description</source>
<target>描述</target>
+<source>Restore hidden windows</source>
+<target>恢复隐藏窗口</target>
+
<source>&Default</source>
<target>默认(&D)</target>
-<source>Find what:</source>
-<target>要查找什么:</target>
+<source>Source code written in C++ using:</source>
+<target>源代码用如下C++工具写成:</target>
-<source>Match case</source>
-<target>匹配大小写</target>
+<source>If you like FreeFileSync</source>
+<target>如果你喜欢 FreeFileSync</target>
-<source>&Find next</source>
-<target>查找下一个(&F)</target>
+<source>Donate with PayPal</source>
+<target>通过PayPal捐赠</target>
-<source>Start synchronization</source>
-<target>开始同步</target>
+<source>Feedback and suggestions are welcome</source>
+<target>欢迎反馈意见和提出建议</target>
-<source>Delete</source>
-<target>删除</target>
+<source>Homepage</source>
+<target>主页</target>
-<source>Configure filter</source>
-<target>配置过滤器</target>
+<source>Email</source>
+<target>邮箱</target>
-<source>Find</source>
-<target>查找</target>
+<source>Published under the GNU General Public License</source>
+<target>在GNU通用公共许可下发布</target>
-<source>Select time span</source>
+<source>Many thanks for localization:</source>
+<target>非常感谢以下本地化翻译者:</target>
+
+<source>Save as Batch Job</source>
+<target>另存为批处理作业</target>
+
+<source>Delete Items</source>
+<target>删除项目</target>
+
+<source>Global Settings</source>
+<target>全局设置</target>
+
+<source>Select Time Span</source>
<target>选择时间跨度</target>
-<source>Folder pairs</source>
+<source>Folder Pairs</source>
<target>文件夹对</target>
+<source>Find</source>
+<target>查找</target>
+
<source>Overview</source>
<target>摘要</target>
<source>Configuration</source>
<target>配置</target>
-<source>Main bar</source>
-<target>主工具条</target>
+<source>Main Bar</source>
+<target>主工具栏</target>
-<source>Filter files</source>
+<source>Filter Files</source>
<target>过滤器文件</target>
-<source>Select view</source>
+<source>Select View</source>
<target>选择视图</target>
<source>Open...</source>
@@ -1041,13 +1076,14 @@ Note: File paths must be relative to base directories.
<source>Compare both sides</source>
<target>比较两侧</target>
-<source>
-<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
-<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
-</source>
-<target>
-<pluralform>你是否真的要对 %x 个项目执行命令 %y?</pluralform>
-</target>
+<source>Comparison settings</source>
+<target>比较设置</target>
+
+<source>Synchronization settings</source>
+<target>同步设置</target>
+
+<source>Start synchronization</source>
+<target>开始同步</target>
<source>Confirm</source>
<target>确认</target>
@@ -1082,12 +1118,6 @@ Note: File paths must be relative to base directories.
<source>Set direction:</source>
<target>设置方向:</target>
-<source>Exclude temporarily</source>
-<target>暂时排除</target>
-
-<source>Include temporarily</source>
-<target>暂时包括</target>
-
<source>multiple selection</source>
<target>多选</target>
@@ -1097,6 +1127,15 @@ Note: File paths must be relative to base directories.
<source>Exclude via filter:</source>
<target>通过过滤器排除:</target>
+<source>Exclude temporarily</source>
+<target>暂时排除</target>
+
+<source>Include temporarily</source>
+<target>暂时包括</target>
+
+<source>Delete</source>
+<target>删除</target>
+
<source>Include all</source>
<target>包括所有</target>
@@ -1139,11 +1178,14 @@ Note: File paths must be relative to base directories.
<source>Do you want to save changes to %x?</source>
<target>是否要保存修改到 %x ?</target>
+<source>Never save &changes</source>
+<target>不再保存更改(&C)</target>
+
<source>Do&n't save</source>
<target>不保存(&N)</target>
-<source>Never save &changes</source>
-<target>不再保存更改(&C)</target>
+<source>Filter</source>
+<target>过滤器</target>
<source>Show files that exist on left side only</source>
<target>显示仅存在左侧的文件</target>
@@ -1190,12 +1232,18 @@ Note: File paths must be relative to base directories.
<source>Set as default</source>
<target>设置为默认值</target>
-<source>Operation aborted</source>
-<target>操作已取消</target>
-
<source>All folders are in sync</source>
<target>所有文件夹都是同步的</target>
+<source>Synchronization Settings</source>
+<target>同步设置</target>
+
+<source>Comparison Settings</source>
+<target>比较设置</target>
+
+<source>Cannot find %x</source>
+<target>找不到 %x</target>
+
<source>Comma-separated values</source>
<target>逗号分割的数值(CSV)</target>
@@ -1205,30 +1253,6 @@ Note: File paths must be relative to base directories.
<source>Searching for program updates...</source>
<target>正在搜索程序的更新...</target>
-<source>&Ignore subsequent errors</source>
-<target>忽略后续的错误(&I)</target>
-
-<source>&Ignore</source>
-<target>忽略(&I)</target>
-
-<source>Fatal Error</source>
-<target>致命错误</target>
-
-<source>&Don't show this warning again</source>
-<target>不再显示这个警告(&D)</target>
-
-<source>&Switch</source>
-<target>切换(&S)</target>
-
-<source>Question</source>
-<target>问题</target>
-
-<source>&Yes</source>
-<target>是(&Y)</target>
-
-<source>&No</source>
-<target>否(&N)</target>
-
<source>Scanning...</source>
<target>正扫描...</target>
@@ -1238,14 +1262,17 @@ Note: File paths must be relative to base directories.
<source>Info</source>
<target>信息</target>
+<source>Warning</source>
+<target>警告</target>
+
<source>Paused</source>
<target>已暂停</target>
<source>Initializing...</source>
<target>正在初始化...</target>
-<source>Aborted</source>
-<target>已取消</target>
+<source>Stopped</source>
+<target>已停止</target>
<source>Completed</source>
<target>完成</target>
@@ -1256,12 +1283,6 @@ Note: File paths must be relative to base directories.
<source>Log</source>
<target>日志</target>
-<source>Cannot find %x</source>
-<target>找不到 %x</target>
-
-<source>Inactive</source>
-<target>不使用</target>
-
<source>Today</source>
<target>今天</target>
@@ -1286,9 +1307,6 @@ Note: File paths must be relative to base directories.
<source>MB</source>
<target>MB</target>
-<source>Filter</source>
-<target>过滤器</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>
@@ -1297,6 +1315,9 @@ Note: File paths must be relative to base directories.
<pluralform>你是否要将如下 %x 个项目移动到回收站?</pluralform>
</target>
+<source>Move</source>
+<target>移动</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>
@@ -1305,6 +1326,9 @@ Note: File paths must be relative to base directories.
<pluralform>是否真的要删除如下 %x 个项目?</pluralform>
</target>
+<source>Exclude</source>
+<target>排除</target>
+
<source>Direct</source>
<target>直接</target>
@@ -1329,8 +1353,8 @@ Note: File paths must be relative to base directories.
<source>- Other side's counterpart to %item_folder%</source>
<target>- 另一边的对应项到 %item_folder%</target>
-<source>Make hidden warnings and dialogs visible again?</source>
-<target>重新让已经隐藏的警告和对话框变为可见?</target>
+<source>Restore all hidden windows and warnings?</source>
+<target>要恢复所有隐藏的窗口和警告吗?</target>
<source>Leave as unresolved conflict</source>
<target>遗留为未解决的冲突</target>
@@ -1452,14 +1476,14 @@ Note: File paths must be relative to base directories.
<pluralform>%x 天</pluralform>
</target>
-<source>Failed to register to receive system messages.</source>
-<target>接收系统信息的注册失败.</target>
+<source>Unable to register to receive system messages.</source>
+<target>无法注册以接收系统信息.</target>
<source>Cannot set privilege %x.</source>
<target>无法设置 %x 的特权.</target>
-<source>Failed to suspend system sleep mode.</source>
-<target>中止系统睡眠模式失败.</target>
+<source>Unable to suspend system sleep mode.</source>
+<target>无法路上系统睡眠模式.</target>
<source>Cannot change process I/O priorities.</source>
<target>无法更改进程的I/O优先级.</target>
diff --git a/BUILD/Languages/chinese_traditional.lng b/BUILD/Languages/chinese_traditional.lng
index 9b93446e..36cbd8ad 100644
--- a/BUILD/Languages/chinese_traditional.lng
+++ b/BUILD/Languages/chinese_traditional.lng
@@ -2,12 +2,15 @@
<language>正體中文</language>
<translator>Carlos Chen</translator>
<locale>Chinese (Traditional)</locale>
- <flag_image>flag_taiwan.png</flag_image>
- <plural_form_count>1</plural_form_count>
+ <image>flag_taiwan.png</image>
+ <plural_count>1</plural_count>
<plural_definition>0</plural_definition>
</header>
-<source>Close search bar</source>
+<source>&Check</source>
+<target></target>
+
+<source>Retrying operation...</source>
<target></target>
<source>Both sides have changed since last synchronization.</source>
@@ -61,9 +64,6 @@
<source>Cannot open file %x.</source>
<target>無法開啟檔案 %x。</target>
-<source>Error</source>
-<target>錯誤</target>
-
<source>File %x does not contain a valid configuration.</source>
<target>檔案 %x 不包含一個有效的配置。</target>
@@ -73,12 +73,12 @@
<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
<target>目錄設定透過命令列時,該設定檔必須不包含配對目錄級別的設定。</target>
-<source>Warning</source>
-<target>警告</target>
-
<source>Directories cannot be set for more than one configuration file.</source>
<target>目錄無法設定多個配置檔。</target>
+<source>Command line</source>
+<target>命令列</target>
+
<source>Syntax:</source>
<target>語法:</target>
@@ -92,10 +92,7 @@
<target>FreeFileSync .ffs_gui和/或.ffs_batch配置檔案的任意數量。</target>
<source>Any number of alternative directories for at most one config file.</source>
-<target>替代目錄的任意數量中最多有一個配置文件。</target>
-
-<source>Command line</source>
-<target>命令列</target>
+<target>備用目錄的任意數量中最多有一個配置文件。</target>
<source>A folder input field is empty.</source>
<target>資料夾輸入欄位是空的。</target>
@@ -116,7 +113,7 @@
<target>檔案 %x 的日期無效。</target>
<source>Date:</source>
-<target>資料:</target>
+<target>日期:</target>
<source>Files %x have the same date but a different size.</source>
<target>檔案 %x 日期相同但大小不同。</target>
@@ -292,8 +289,8 @@
<source>/sec</source>
<target>/秒</target>
-<source>%x items</source>
-<target>%x 項目</target>
+<source>%x items/sec</source>
+<target>%x 個項目/秒</target>
<source>Configuration file %x loaded partially only.</source>
<target>只載入設定檔 %x 的一部份。</target>
@@ -322,11 +319,11 @@
<source>Volume name %x is not part of file path %y.</source>
<target>卷名 %x 不是檔案路徑 %y 的一部分。</target>
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>中止請求:正在等待目前操作完成...</target>
+<source>Stop requested: Waiting for current operation to finish...</source>
+<target>停止要求:等待目前的操作結束...</target>
-<source>Failure to create timestamp for versioning:</source>
-<target>無法新建時間戳記的版本控制:</target>
+<source>Unable to create timestamp for versioning:</source>
+<target>無法新建版本控制的時間戳記:</target>
<source>Cannot read the following XML elements:</source>
<target>無法讀取下列XML元素:</target>
@@ -343,8 +340,8 @@
<source>&Program</source>
<target>程式(&P)</target>
-<source>&Content</source>
-<target>內容(&C)</target>
+<source>&View help</source>
+<target>檢視說明(&V)</target>
<source>&About</source>
<target>關於(&A)</target>
@@ -367,8 +364,8 @@
<source>To get started just import a .ffs_batch file.</source>
<target>開始只是導入一個.ffs_batch檔。</target>
-<source>Folders to watch</source>
-<target>要監看的資料夾</target>
+<source>Folders to watch:</source>
+<target>要監看的資料夾:</target>
<source>Add folder</source>
<target>新增資料夾</target>
@@ -382,12 +379,15 @@
<source>Select a folder</source>
<target>選擇一個資料夾</target>
-<source>Idle time [seconds]</source>
-<target>閒置時間 [秒]</target>
+<source>Idle time (in seconds):</source>
+<target>閒置時間(以秒為單位)</target>
<source>Idle time between last detected change and execution of command</source>
<target>最後檢測到變更和執行命令之間的閒置時間</target>
+<source>Command line:</source>
+<target>命令列:</target>
+
<source>
The command is triggered if:
- files or subfolders change
@@ -399,33 +399,30 @@ The command is triggered if:
- 新資料夾到來(例如插入USB隨身碟)
</target>
-<source>Start</source>
-<target>開始</target>
+<source>&Start</source>
+<target>開始(&S)</target>
-<source>&Retry</source>
-<target>重試(&R)</target>
-
-<source>Cancel</source>
-<target>取消</target>
-
-<source>RealtimeSync - Automated Synchronization</source>
-<target>即時同步 - 自動同步</target>
+<source>About</source>
+<target>關於</target>
<source>Build: %x</source>
<target>建立:%x</target>
-<source>About</source>
-<target>關於</target>
-
<source>All files</source>
<target>所有檔案</target>
+<source>Automated Synchronization</source>
+<target>自動化同步</target>
+
<source>Directory monitoring active</source>
<target>目錄監測啟動</target>
<source>Waiting until all directories are available...</source>
<target>等到所有目錄可用...</target>
+<source>Error</source>
+<target>錯誤</target>
+
<source>&Restore</source>
<target>還原(&R)</target>
@@ -435,8 +432,11 @@ The command is triggered if:
<source>&Exit</source>
<target>結束(&E)</target>
-<source>Invalid command line:</source>
-<target>無效的命令列:</target>
+<source>Incorrect command line:</source>
+<target>不正確的命令列:</target>
+
+<source>&Retry</source>
+<target>重試(&R)</target>
<source>File content</source>
<target>檔案内容</target>
@@ -498,8 +498,8 @@ The command is triggered if:
<source>Target folder input field must not be empty.</source>
<target>目標資料夾輸入欄位不能為空。</target>
-<source>Folder input field for versioning must not be empty.</source>
-<target>版本控制資料夾輸入欄位不能為空。</target>
+<source>Please enter a target folder for versioning.</source>
+<target>請輸入版本控制的目的資料夾。</target>
<source>Source folder %x not found.</source>
<target>來源資料夾 %x 找不到。</target>
@@ -537,8 +537,8 @@ The command is triggered if:
<source>job name</source>
<target>作業名稱</target>
-<source>Synchronization aborted</source>
-<target>同步已中止</target>
+<source>Synchronization stopped</source>
+<target>同步已停止。</target>
<source>Synchronization completed with errors</source>
<target>同步完成但有錯誤</target>
@@ -555,14 +555,37 @@ The command is triggered if:
<source>Saving log file %x...</source>
<target>正在儲存日誌檔 %x...</target>
-<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
-<target>在FreeFileSync主對話框,按下 "切換" 來解決問題。</target>
+<source>You can switch to FreeFileSync's main window to resolve this issue.</source>
+<target>您可以切換到FreeFileSync的主視窗中來解決此問題。</target>
+
+<source>&Don't show this warning again</source>
+<target>不要再顯示此警告(&D)</target>
+
+<source>&Ignore</source>
+<target>忽略(&I)</target>
+
+<source>&Switch</source>
+<target>切換(&S)</target>
+
+<source>Switching to FreeFileSync's main window</source>
+<target>切換到FreeFileSync的主視窗</target>
+
+<source>
+<pluralform>Automatic retry in 1 second...</pluralform>
+<pluralform>Automatic retry in %x seconds...</pluralform>
+</source>
+<target>
+<pluralform>在 %x 秒自動重試...</pluralform>
+</target>
+
+<source>&Ignore subsequent errors</source>
+<target>忽略後續的錯誤(&I)</target>
-<source>Switching to FreeFileSync main dialog</source>
-<target>切換到FreeFileSync主對話框</target>
+<source>Serious Error</source>
+<target>嚴重錯誤</target>
-<source>Retrying operation after error:</source>
-<target>錯誤後重試操作:</target>
+<source>Check for Program Updates</source>
+<target>檢查程式更新</target>
<source>A new version of FreeFileSync is available:</source>
<target>FreeFileSync有新版本可用:</target>
@@ -570,18 +593,12 @@ The command is triggered if:
<source>Download now?</source>
<target>要立即下載嗎?</target>
-<source>New version found</source>
-<target>找到新版本</target>
-
<source>&Download</source>
<target>下載(&D)</target>
<source>FreeFileSync is up to date.</source>
<target>FreeFileSync已經是最新版本。</target>
-<source>Information</source>
-<target>訊息</target>
-
<source>Unable to connect to sourceforge.net.</source>
<target>無法連接到sourceforge.net。</target>
@@ -639,23 +656,23 @@ The command is triggered if:
<source>Hibernate</source>
<target>休眠</target>
-<source>Selected variant:</source>
-<target>選取的變數:</target>
+<source>Alternate comparison settings</source>
+<target>備用比對設定</target>
-<source>Select alternate comparison settings</source>
-<target>選擇替代的比對設定</target>
+<source>Alternate synchronization settings</source>
+<target>備用同步設定</target>
-<source>Select alternate synchronization settings</source>
-<target>選擇替代的同步設定</target>
+<source>Local filter</source>
+<target>本機篩選器</target>
-<source>Filter is active</source>
-<target>篩選器為啟動</target>
+<source>Active</source>
+<target>啟用</target>
-<source>No filter selected</source>
-<target>沒有選擇篩選器</target>
+<source>None</source>
+<target>無</target>
<source>Remove alternate settings</source>
-<target>移除替代設定</target>
+<target>移除備用設定</target>
<source>Clear filter settings</source>
<target>清除篩選器設定</target>
@@ -666,6 +683,15 @@ The command is triggered if:
<source>Paste</source>
<target>貼上</target>
+<source>Alternate Comparison Settings</source>
+<target>備用比對設定</target>
+
+<source>Alternate Synchronization Settings</source>
+<target>備用同步設定</target>
+
+<source>Local Filter</source>
+<target>本機篩選器</target>
+
<source>&New</source>
<target>新增(&N)</target>
@@ -681,15 +707,18 @@ The command is triggered if:
<source>2. &Synchronize</source>
<target>2. 同步(&S)</target>
+<source>&Global settings</source>
+<target>整體設定(&G)</target>
+
<source>&Language</source>
<target>語言(&L)</target>
+<source>&Find...</source>
+<target>尋找(&F)</target>
+
<source>&Export file list...</source>
<target>匯出檔案清單(&E)...</target>
-<source>&Global settings</source>
-<target>整體設定(&G)</target>
-
<source>&Tools</source>
<target>工具(&T)</target>
@@ -699,12 +728,15 @@ The command is triggered if:
<source>Check &automatically once a week</source>
<target>一週自動檢查一次(&a)</target>
-<source>Check for new &version</source>
-<target>檢查新版本(&v)</target>
+<source>&Check for new version</source>
+<target>檢查新版本(&C)</target>
<source>Compare</source>
<target>比對</target>
+<source>Cancel</source>
+<target>取消</target>
+
<source>Synchronize</source>
<target>同步</target>
@@ -717,8 +749,11 @@ The command is triggered if:
<source>Swap sides</source>
<target>兩邊交換</target>
-<source>Find what:</source>
-<target>尋找內容:</target>
+<source>Close search bar</source>
+<target>關閉搜尋欄位</target>
+
+<source>Find:</source>
+<target>尋找:</target>
<source>Match case</source>
<target>區分大小寫</target>
@@ -744,65 +779,20 @@ The command is triggered if:
<source>Total bytes to copy</source>
<target>要複製的位元組總數</target>
-<source>Items found:</source>
-<target>尋找項目:</target>
-
-<source>Speed:</source>
-<target>速度:</target>
-
-<source>Time remaining:</source>
-<target>剩餘時間:</target>
-
-<source>Time elapsed:</source>
-<target>經過時間:</target>
-
-<source>Synchronizing...</source>
-<target>正在同步...</target>
-
-<source>Minimize to notification area</source>
-<target>最小化到通知區域</target>
-
-<source>On completion</source>
-<target>完成後</target>
-
-<source>Close</source>
-<target>關閉</target>
-
-<source>&Pause</source>
-<target>暫停(&P)</target>
-
-<source>Variant</source>
-<target>變數</target>
-
-<source>Statistics</source>
-<target>統計</target>
-
-<source>&Don't show this dialog again</source>
-<target>不要再顯示此對話框(&D)</target>
-
-<source>Select a variant</source>
-<target>選擇一個變數</target>
+<source>Select a variant:</source>
+<target>選擇一個變數:</target>
-<source>
-Files are found equal if
- - last write time and date
- - file size
-are the same
-</source>
-<target>如果檔案大小和最後修改時間和日期相同則判斷兩者相同</target>
+<source>Identify equal files by comparing modification time and size.</source>
+<target>由修改時間和檔案大小比對來判斷相同檔案。</target>
-<source>
-Files are found equal if
- - file content
-is the same
-</source>
-<target>如果檔案内容相同則判斷兩者相同</target>
+<source>Identify equal files by comparing the file content.</source>
+<target>由比對檔案內容來判斷相同檔案。</target>
-<source>Symbolic Link handling</source>
-<target>符號連結處理</target>
+<source>Symbolic links:</source>
+<target>符號連結:</target>
-<source>Help</source>
-<target>說明</target>
+<source>More information</source>
+<target>詳細資訊</target>
<source>OK</source>
<target>確定</target>
@@ -810,11 +800,11 @@ is the same
<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
<target>識別和傳播兩邊的變更。自動檢測刪除、移動和衝突使用的資料庫。</target>
-<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
-<target>鏡像備份的左邊的資料夾。同步後,右邊的資料夾進行修改以完全相配左邊的資料夾。</target>
+<source>Create a mirror backup of the left folder which exactly matches the right folder after synchronization.</source>
+<target>新建左邊資料夾的鏡像備份,同步後完整匹配右邊資料夾。</target>
-<source>Copy new or updated files to right folder.</source>
-<target>將新的或更新過的檔案複製到右邊的資料夾中。</target>
+<source>Copy new and updated files to the right folder.</source>
+<target>將新的和已更新的檔案複製到右邊資料夾。</target>
<source>Configure your own synchronization rules.</source>
<target>配置你自己的同步規則。</target>
@@ -825,23 +815,8 @@ is the same
<source>Requires database files. Not supported by all file systems.</source>
<target>需要資料庫檔案。不支援所有檔案系統。</target>
-<source>Error handling</source>
-<target>錯誤處理</target>
-
-<source>Ignore</source>
-<target>忽略</target>
-
-<source>Hide all error and warning messages</source>
-<target>隱藏所有錯誤和警告訊息</target>
-
-<source>Pop-up</source>
-<target>彈出視窗</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>在彈出視窗上顯示錯誤或警告訊息</target>
-
-<source>Deletion handling</source>
-<target>刪除處理</target>
+<source>Delete files:</source>
+<target>刪除檔案:</target>
<source>Permanent</source>
<target>常駐</target>
@@ -864,99 +839,171 @@ is the same
<source>Naming convention:</source>
<target>命名慣例:</target>
-<source>Batch job</source>
-<target>批次處理作業</target>
+<source>Show examples</source>
+<target>顯示範例</target>
+
+<source>Handle errors:</source>
+<target>錯誤處理:</target>
+
+<source>Ignore</source>
+<target>忽略</target>
+
+<source>Hide all error and warning messages</source>
+<target>隱藏所有錯誤和警告訊息</target>
+
+<source>Pop-up</source>
+<target>彈出視窗</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>在彈出視窗上顯示錯誤或警告訊息</target>
+
+<source>On completion:</source>
+<target>完成後:</target>
+
+<source>Start synchronization now?</source>
+<target>現在開始同步?</target>
+
+<source>Variant:</source>
+<target>變數:</target>
+
+<source>Statistics</source>
+<target>統計</target>
+
+<source>&Don't show this dialog again</source>
+<target>不要再顯示此對話框(&D)</target>
+
+<source>Items found:</source>
+<target>尋找項目:</target>
+
+<source>Speed:</source>
+<target>速度:</target>
+
+<source>Time remaining:</source>
+<target>剩餘時間:</target>
+
+<source>Time elapsed:</source>
+<target>經過時間:</target>
+
+<source>Synchronizing...</source>
+<target>正在同步...</target>
+
+<source>Minimize to notification area</source>
+<target>最小化到通知區域</target>
+
+<source>Close</source>
+<target>關閉</target>
+
+<source>&Pause</source>
+<target>暫停(&P)</target>
+
+<source>Stop</source>
+<target>停止</target>
<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
<target>新建一個批次處理檔,用於無人值守同步。開始,點兩下此檔案,或安排在任務規劃中:%x</target>
-<source>Exit</source>
-<target>結束</target>
-
-<source>Abort synchronization on first error</source>
-<target>在第一個錯誤出現即中止同步</target>
+<source>Stop synchronization at first error</source>
+<target>在第一個錯誤出現停止同步</target>
<source>Show progress dialog</source>
<target>顯示進度對話框</target>
-<source>Save log</source>
+<source>Save log:</source>
<target>儲存日誌</target>
-<source>Select folder to save log files</source>
-<target>選擇要儲存日誌檔的資料夾</target>
-
-<source>Limit</source>
-<target>限制</target>
+<source>Limit:</source>
+<target>限制:</target>
<source>Limit maximum number of log files</source>
<target>限制日誌檔的最大數量</target>
+<source>How can I schedule a batch job?</source>
+<target>如何安排批次處理作業?</target>
+
+<source>&Recycle bin</source>
+<target>資源回收筒(&R)</target>
+
<source>Delete on both sides</source>
<target>兩邊都刪除</target>
<source>Delete on both sides even if the file is selected on one side only</source>
<target>即使只在一邊中選好檔案,還是會刪除兩邊檔案。</target>
-<source>
-Files will only be synchronized if they pass all filter rules.
-Note: File paths must be relative to base directories.
-</source>
-<target>
-如果他們通過所有的過濾規則,將只會同步檔案。
-注意:檔案路徑必須是相對於基本目錄。
-</target>
+<source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source>
+<target>選擇從同步中排除某些檔案的篩選器規則。輸入相對於其對應的配對資料夾路徑。</target>
-<source>Include</source>
-<target>包括</target>
+<source>Include:</source>
+<target>包括:</target>
-<source>Exclude</source>
-<target>排除</target>
+<source>Exclude:</source>
+<target>排除:</target>
-<source>Time span</source>
-<target>時間間隔</target>
+<source>Time span:</source>
+<target>時間間隔:</target>
-<source>File size</source>
-<target>檔案大小</target>
+<source>File size:</source>
+<target>檔案大小:</target>
-<source>Minimum</source>
-<target>最小</target>
+<source>Minimum:</source>
+<target>最小:</target>
-<source>Maximum</source>
-<target>最大</target>
+<source>Maximum:</source>
+<target>最大:</target>
<source>&Clear</source>
<target>清除(&C)</target>
-<source>Global settings</source>
-<target>整體設定</target>
+<source>The following settings are used for all synchronization jobs.</source>
+<target>以下設定用於所有同步作業。</target>
<source>Fail-safe file copy</source>
<target>故障保護檔案複製</target>
-<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
-<target>先複製到一個臨時檔案(*.ffs_tmp)然後將其重新命名。即使發生致命錯誤時,還能確保一致的狀態。</target>
+<source>
+Copy to a temporary file (*.ffs_tmp) before overwriting target.
+This guarantees a consistent state even in case of a serious error.
+</source>
+<target>
+覆蓋目標之前先複製到一個臨時檔案(*.ffs_tmp)。
+即使發生嚴重錯誤時,還能確保一致的狀態。
+</target>
+
+<source>(recommended)</source>
+<target>(建議)</target>
<source>Copy locked files</source>
<target>複製被鎖定的檔案</target>
-<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
-<target>共用的副本或鎖定的檔案使用卷影複製服務(需要管理員權限)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service.</source>
+<target>共用的副本或鎖定的檔案使用卷影複製服務</target>
+
+<source>(requires administrator rights)</source>
+<target>(需要管理員權限)</target>
<source>Copy file access permissions</source>
<target>複製檔案系統權限</target>
-<source>Transfer file and folder permissions (requires administrator rights)</source>
-<target>傳輸檔案和資料夾的權限(需要管理員權限)</target>
+<source>Transfer file and folder permissions.</source>
+<target>傳輸檔案和資料夾的權限。</target>
+
+<source>Automatic retry on error:</source>
+<target>錯誤時自動重試:</target>
-<source>Restore hidden dialogs</source>
-<target>還原隱藏的對話框</target>
+<source>Retry count:</source>
+<target>重試次數:</target>
-<source>External applications</source>
-<target>外部應用程式</target>
+<source>Delay (in seconds):</source>
+<target>延遲(以秒為單位):</target>
+
+<source>Customize context menu:</source>
+<target>自訂內容功能表:</target>
<source>Description</source>
<target>描述</target>
+<source>Restore hidden windows</source>
+<target>還原隱藏視窗</target>
+
<source>&Default</source>
<target>預設(&D)</target>
@@ -984,25 +1031,19 @@ Note: File paths must be relative to base directories.
<source>Many thanks for localization:</source>
<target>非常感謝本地化語系翻譯工作人員:</target>
-<source>Start synchronization</source>
-<target>開始同步</target>
-
-<source>Comparison settings</source>
-<target>比對設定</target>
-
-<source>Synchronization settings</source>
-<target>同步設定</target>
+<source>Save as Batch Job</source>
+<target>另存為批次處理作業</target>
-<source>Delete</source>
-<target>刪除</target>
+<source>Delete Items</source>
+<target>刪除項目</target>
-<source>Configure filter</source>
-<target>配置篩選</target>
+<source>Global Settings</source>
+<target>整體設定</target>
-<source>Select time span</source>
+<source>Select Time Span</source>
<target>選擇時間間隔</target>
-<source>Folder pairs</source>
+<source>Folder Pairs</source>
<target>配對資料夾</target>
<source>Find</source>
@@ -1014,13 +1055,13 @@ Note: File paths must be relative to base directories.
<source>Configuration</source>
<target>配置</target>
-<source>Main bar</source>
+<source>Main Bar</source>
<target>主欄位</target>
-<source>Filter files</source>
+<source>Filter Files</source>
<target>篩選檔案</target>
-<source>Select view</source>
+<source>Select View</source>
<target>選擇檢視</target>
<source>Open...</source>
@@ -1032,17 +1073,26 @@ Note: File paths must be relative to base directories.
<source>Compare both sides</source>
<target>比對兩邊</target>
+<source>Comparison settings</source>
+<target>比對設定</target>
+
+<source>Synchronization settings</source>
+<target>同步設定</target>
+
+<source>Start synchronization</source>
+<target>開始同步</target>
+
+<source>Confirm</source>
+<target>確認</target>
+
<source>
-<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for one item?</pluralform>
<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
</source>
<target>
<pluralform>你真的要執行 %x 項目的命令 %y 嗎?</pluralform>
</target>
-<source>Confirm</source>
-<target>確認</target>
-
<source>&Execute</source>
<target>執行(&E)</target>
@@ -1077,10 +1127,10 @@ Note: File paths must be relative to base directories.
<target>多重選擇</target>
<source>Include via filter:</source>
-<target>包括透過篩選器:</target>
+<target>透過篩選器包括:</target>
<source>Exclude via filter:</source>
-<target>使用篩選器排除:</target>
+<target>透過篩選器排除:</target>
<source>Exclude temporarily</source>
<target>暫時排除</target>
@@ -1088,6 +1138,9 @@ Note: File paths must be relative to base directories.
<source>Include temporarily</source>
<target>暫時包括</target>
+<source>Delete</source>
+<target>刪除</target>
+
<source>Include all</source>
<target>包括所有</target>
@@ -1130,11 +1183,14 @@ Note: File paths must be relative to base directories.
<source>Do you want to save changes to %x?</source>
<target>是否要儲存變更到 %x?</target>
+<source>Never save &changes</source>
+<target>從不保存更改(&c)</target>
+
<source>Do&n't save</source>
<target>不儲存(&N)</target>
-<source>Never save &changes</source>
-<target>從不保存更改(&c)</target>
+<source>Filter</source>
+<target>篩選器</target>
<source>Show files that exist on left side only</source>
<target>顯示只存在於左邊的檔案</target>
@@ -1181,12 +1237,15 @@ Note: File paths must be relative to base directories.
<source>Set as default</source>
<target>設為預設值</target>
-<source>Operation aborted</source>
-<target>操作已中止</target>
-
<source>All folders are in sync</source>
<target>所有資料夾都是同步的</target>
+<source>Synchronization Settings</source>
+<target>同步設定</target>
+
+<source>Comparison Settings</source>
+<target>比對設定</target>
+
<source>Cannot find %x</source>
<target>找不到 %x</target>
@@ -1199,30 +1258,6 @@ Note: File paths must be relative to base directories.
<source>Searching for program updates...</source>
<target>正在搜尋程式更新...</target>
-<source>&Ignore subsequent errors</source>
-<target>忽略後續的錯誤(&I)</target>
-
-<source>&Ignore</source>
-<target>忽略(&I)</target>
-
-<source>Fatal Error</source>
-<target>嚴重錯誤</target>
-
-<source>&Don't show this warning again</source>
-<target>不要再顯示此警告(&D)</target>
-
-<source>&Switch</source>
-<target>切換(&S)</target>
-
-<source>Question</source>
-<target>問題</target>
-
-<source>&Yes</source>
-<target>是(&Y)</target>
-
-<source>&No</source>
-<target>否(&N)</target>
-
<source>Scanning...</source>
<target>正在掃瞄...</target>
@@ -1232,14 +1267,17 @@ Note: File paths must be relative to base directories.
<source>Info</source>
<target>訊息</target>
+<source>Warning</source>
+<target>警告</target>
+
<source>Paused</source>
<target>已暫停</target>
<source>Initializing...</source>
<target>正在初始化...</target>
-<source>Aborted</source>
-<target>已中止</target>
+<source>Stopped</source>
+<target>已停止</target>
<source>Completed</source>
<target>已完成</target>
@@ -1250,9 +1288,6 @@ Note: File paths must be relative to base directories.
<source>Log</source>
<target>日誌</target>
-<source>Inactive</source>
-<target>停用</target>
-
<source>Today</source>
<target>今日</target>
@@ -1277,9 +1312,6 @@ Note: File paths must be relative to base directories.
<source>MB</source>
<target>MB</target>
-<source>Filter</source>
-<target>篩選器</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>
@@ -1288,6 +1320,9 @@ Note: File paths must be relative to base directories.
<pluralform>你真的要將以下項目 %x 移動到資源回收筒嗎?</pluralform>
</target>
+<source>Move</source>
+<target>移動</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>
@@ -1296,6 +1331,9 @@ Note: File paths must be relative to base directories.
<pluralform>您真的要將下列 %x 項目刪除嗎?</pluralform>
</target>
+<source>Exclude</source>
+<target>排除</target>
+
<source>Direct</source>
<target>直接</target>
@@ -1306,7 +1344,7 @@ Note: File paths must be relative to base directories.
<target>複製NTFS權限</target>
<source>Integrate external applications into context menu. The following macros are available:</source>
-<target>整合上下文功能表中的外部應用程式。可以使用下面的巨集:</target>
+<target>整合內容功能表中的外部應用程式。可以使用下面的巨集:</target>
<source>- full file or folder name</source>
<target>- 完整檔案或資料夾名稱</target>
@@ -1320,8 +1358,8 @@ Note: File paths must be relative to base directories.
<source>- Other side's counterpart to %item_folder%</source>
<target>- 另一邊對應到 %item_folder%</target>
-<source>Make hidden warnings and dialogs visible again?</source>
-<target>使隱藏的警告和對話框再次可見?</target>
+<source>Restore all hidden windows and warnings?</source>
+<target>還原所有隱藏的視窗和警告?</target>
<source>Leave as unresolved conflict</source>
<target>保留給未解決的衝突</target>
@@ -1378,10 +1416,10 @@ Note: File paths must be relative to base directories.
<target>無法寫入 %x 的修改時間。</target>
<source>Cannot read security context of %x.</source>
-<target>無法讀取 %x 的安全上下文。</target>
+<target>無法讀取 %x 的安全內容。</target>
<source>Cannot write security context of %x.</source>
-<target>無法寫入 %x 的安全上下文。</target>
+<target>無法寫入 %x 的安全內容。</target>
<source>Cannot read permissions of %x.</source>
<target>無法讀取 %x 的權限。</target>
@@ -1443,14 +1481,14 @@ Note: File paths must be relative to base directories.
<pluralform>%x 天</pluralform>
</target>
-<source>Failed to register to receive system messages.</source>
-<target>登錄接收系統訊息失敗。</target>
+<source>Unable to register to receive system messages.</source>
+<target>無法登錄接收系統訊息。</target>
<source>Cannot set privilege %x.</source>
<target>無法設定權限 %x。</target>
-<source>Failed to suspend system sleep mode.</source>
-<target>中止系統睡眠模式失敗。</target>
+<source>Unable to suspend system sleep mode.</source>
+<target>無法中止系統睡眠模式。</target>
<source>Cannot change process I/O priorities.</source>
<target>無法更改I/O處理優先順序。</target>
diff --git a/BUILD/Languages/croatian.lng b/BUILD/Languages/croatian.lng
index 1db53365..3bf1410c 100644
--- a/BUILD/Languages/croatian.lng
+++ b/BUILD/Languages/croatian.lng
@@ -2,14 +2,271 @@
<language>Hrvatski</language>
<translator>Miroslav Vranić</translator>
<locale>hr_HR</locale>
- <flag_image>flag_croatia.png</flag_image>
- <plural_form_count>3</plural_form_count>
+ <image>flag_croatia.png</image>
+ <plural_count>3</plural_count>
<plural_definition>n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2</plural_definition>
</header>
+<source>Unable to suspend system sleep mode.</source>
+<target></target>
+
+<source>Unable to register to receive system messages.</source>
+<target></target>
+
+<source>Restore all hidden windows and warnings?</source>
+<target></target>
+
+<source>Move</source>
+<target></target>
+
+<source>Stopped</source>
+<target></target>
+
+<source>Serious Error</source>
+<target></target>
+
+<source>Comparison Settings</source>
+<target></target>
+
+<source>Synchronization Settings</source>
+<target></target>
+
+<source>
+<pluralform>Do you really want to execute the command %y for one item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+</target>
+
+<source>Select View</source>
+<target></target>
+
+<source>Filter Files</source>
+<target></target>
+
+<source>Main Bar</source>
+<target></target>
+
+<source>Folder Pairs</source>
+<target></target>
+
+<source>Select Time Span</source>
+<target></target>
+
+<source>Global Settings</source>
+<target></target>
+
+<source>Delete Items</source>
+<target></target>
+
+<source>Save as Batch Job</source>
+<target></target>
+
+<source>Restore hidden windows</source>
+<target></target>
+
+<source>Customize context menu:</source>
+<target></target>
+
+<source>Delay (in seconds):</source>
+<target></target>
+
+<source>Retry count:</source>
+<target></target>
+
+<source>Automatic retry on error:</source>
+<target></target>
+
+<source>Transfer file and folder permissions.</source>
+<target></target>
+
+<source>(requires administrator rights)</source>
+<target></target>
+
+<source>Copy shared or locked files using the Volume Shadow Copy Service.</source>
+<target></target>
+
+<source>(recommended)</source>
+<target></target>
+
+<source>
+Copy to a temporary file (*.ffs_tmp) before overwriting target.
+This guarantees a consistent state even in case of a serious error.
+</source>
+<target></target>
+
+<source>The following settings are used for all synchronization jobs.</source>
+<target></target>
+
+<source>Maximum:</source>
+<target></target>
+
+<source>Minimum:</source>
+<target></target>
+
+<source>File size:</source>
+<target></target>
+
+<source>Time span:</source>
+<target></target>
+
+<source>Exclude:</source>
+<target></target>
+
+<source>Include:</source>
+<target></target>
+
+<source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source>
+<target></target>
+
+<source>&Recycle bin</source>
+<target></target>
+
+<source>How can I schedule a batch job?</source>
+<target></target>
+
+<source>Limit:</source>
+<target></target>
+
+<source>Save log:</source>
+<target></target>
+
+<source>Stop synchronization at first error</source>
+<target></target>
+
+<source>Stop</source>
+<target></target>
+
+<source>Variant:</source>
+<target></target>
+
+<source>Start synchronization now?</source>
+<target></target>
+
+<source>On completion:</source>
+<target></target>
+
+<source>Handle errors:</source>
+<target></target>
+
+<source>Show examples</source>
+<target></target>
+
+<source>Delete files:</source>
+<target></target>
+
+<source>Copy new and updated files to the right folder.</source>
+<target></target>
+
+<source>Create a mirror backup of the left folder which exactly matches the right folder after synchronization.</source>
+<target></target>
+
+<source>More information</source>
+<target></target>
+
+<source>Symbolic links:</source>
+<target></target>
+
+<source>Identify equal files by comparing the file content.</source>
+<target></target>
+
+<source>Identify equal files by comparing modification time and size.</source>
+<target></target>
+
+<source>Select a variant:</source>
+<target></target>
+
+<source>Find:</source>
+<target></target>
+
<source>Close search bar</source>
<target></target>
+<source>&Check for new version</source>
+<target></target>
+
+<source>&Find...</source>
+<target></target>
+
+<source>Local Filter</source>
+<target></target>
+
+<source>Alternate Synchronization Settings</source>
+<target></target>
+
+<source>Alternate Comparison Settings</source>
+<target></target>
+
+<source>None</source>
+<target></target>
+
+<source>Active</source>
+<target></target>
+
+<source>Local filter</source>
+<target></target>
+
+<source>Alternate synchronization settings</source>
+<target></target>
+
+<source>Alternate comparison settings</source>
+<target></target>
+
+<source>Check for Program Updates</source>
+<target></target>
+
+<source>Retrying operation</source>
+<target></target>
+
+<source>
+<pluralform>Automatic retry in 1 second...</pluralform>
+<pluralform>Automatic retry in %x seconds...</pluralform>
+</source>
+<target>
+</target>
+
+<source>Switching to FreeFileSync's main window</source>
+<target></target>
+
+<source>You can switch to FreeFileSync's main window to resolve this issue.</source>
+<target></target>
+
+<source>Synchronization stopped</source>
+<target></target>
+
+<source>Please enter a target folder for versioning.</source>
+<target></target>
+
+<source>Incorrect command line:</source>
+<target></target>
+
+<source>Automated Synchronization</source>
+<target></target>
+
+<source>&Start</source>
+<target></target>
+
+<source>Command line:</source>
+<target></target>
+
+<source>Idle time (in seconds):</source>
+<target></target>
+
+<source>Folders to watch:</source>
+<target></target>
+
+<source>&View help</source>
+<target></target>
+
+<source>Unable to create timestamp for versioning:</source>
+<target></target>
+
+<source>Stop requested: Waiting for current operation to finish...</source>
+<target></target>
+
+<source>%x items/sec</source>
+<target></target>
+
<source>Both sides have changed since last synchronization.</source>
<target>Obje su strane promjenjene od posljednje sinkronizacije.</target>
@@ -298,9 +555,6 @@
<source>/sec</source>
<target>/sek</target>
-<source>%x items</source>
-<target>%x stavke</target>
-
<source>Configuration file %x loaded partially only.</source>
<target>Datoteka postavki %x učitana samo djelomično</target>
@@ -328,12 +582,6 @@
<source>Volume name %x is not part of file path %y.</source>
<target>Ime voumena %x nije dio puta datotke %y.</target>
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Prekid zahtjevan: čekam da se trenutna akcija završi...</target>
-
-<source>Failure to create timestamp for versioning:</source>
-<target>Nije moguća vremenska oznaka za varijantu</target>
-
<source>Cannot read the following XML elements:</source>
<target>Ne mogu čitati slijedeće XML elemente</target>
@@ -349,9 +597,6 @@
<source>&Program</source>
<target>&Program</target>
-<source>&Content</source>
-<target>&Sadržaj</target>
-
<source>&About</source>
<target>&O programu</target>
@@ -373,9 +618,6 @@
<source>To get started just import a .ffs_batch file.</source>
<target>Za započeti uvezite .ffs slijednu datoteku.</target>
-<source>Folders to watch</source>
-<target>Mape za nadziranje</target>
-
<source>Add folder</source>
<target>Dodaj mapu</target>
@@ -388,9 +630,6 @@
<source>Select a folder</source>
<target>Izaberite mapu</target>
-<source>Idle time [seconds]</source>
-<target>Vrijeme mirovanja [sekundi]</target>
-
<source>Idle time between last detected change and execution of command</source>
<target>Vrijeme čekanja između zadnje prepoznate promjene i izvršenja naredbe</target>
@@ -405,18 +644,12 @@ Naredba će biti pokrenuta ako se:
- nove mape pojave (npr. umetanje USB sticka)
</target>
-<source>Start</source>
-<target>Start</target>
-
<source>&Retry</source>
<target>&Ponovi</target>
<source>Cancel</source>
<target>Odustani</target>
-<source>RealtimeSync - Automated Synchronization</source>
-<target>RealtimeSync - Automatska Sinkronizacija</target>
-
<source>Build: %x</source>
<target>Inačnica: %x</target>
@@ -441,9 +674,6 @@ Naredba će biti pokrenuta ako se:
<source>&Exit</source>
<target>&Izlaz</target>
-<source>Invalid command line:</source>
-<target>Netočna naredba:</target>
-
<source>File content</source>
<target>Sadržaj datoteke</target>
@@ -504,9 +734,6 @@ Naredba će biti pokrenuta ako se:
<source>Target folder input field must not be empty.</source>
<target>Odredišna mapa ne može biti prazna.</target>
-<source>Folder input field for versioning must not be empty.</source>
-<target>Mapa unosa ne smije biti prazna.</target>
-
<source>Source folder %x not found.</source>
<target>Izvorna mapa %x nije pronađena.</target>
@@ -543,9 +770,6 @@ Naredba će biti pokrenuta ako se:
<source>job name</source>
<target>Ime zadatka</target>
-<source>Synchronization aborted</source>
-<target>Sinkronizacija prekinuta</target>
-
<source>Synchronization completed with errors</source>
<target>Sinkronizacija završena s greškama</target>
@@ -561,24 +785,12 @@ Naredba će biti pokrenuta ako se:
<source>Saving log file %x...</source>
<target>Spremam izješće %x...</target>
-<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
-<target>Preisni "Zamjeni" za riješavanje problema u FreeFileSync glavnom dijaloškom okviru</target>
-
-<source>Switching to FreeFileSync main dialog</source>
-<target>Prebacujem na FreeFileSync glavni dijaloški prozor</target>
-
-<source>Retrying operation after error:</source>
-<target>Ponavljam operaciju nakon greške:</target>
-
<source>A new version of FreeFileSync is available:</source>
<target>Nova verzija FreeFileSync je dostupna:</target>
<source>Download now?</source>
<target>Preuzeti sada?</target>
-<source>New version found</source>
-<target>Nova verzija je nađena</target>
-
<source>&Download</source>
<target>&Preuzmi</target>
@@ -645,21 +857,6 @@ Naredba će biti pokrenuta ako se:
<source>Hibernate</source>
<target>Hibernacija</target>
-<source>Selected variant:</source>
-<target>Odaberite način</target>
-
-<source>Select alternate comparison settings</source>
-<target>Izaberite alternativne postavke usporedbe</target>
-
-<source>Select alternate synchronization settings</source>
-<target>Izaberite alternativne postavke sinkronizacije</target>
-
-<source>Filter is active</source>
-<target>Filter je aktivan</target>
-
-<source>No filter selected</source>
-<target>Nijedan filter odabran</target>
-
<source>Remove alternate settings</source>
<target>Ukloni alternativne postavke</target>
@@ -687,15 +884,15 @@ Naredba će biti pokrenuta ako se:
<source>2. &Synchronize</source>
<target>2. &Sinkroniziraj</target>
+<source>&Global settings</source>
+<target>&Globalne postavke</target>
+
<source>&Language</source>
<target>&Jezik</target>
<source>&Export file list...</source>
<target>&Izvoz liste datoteka...</target>
-<source>&Global settings</source>
-<target>&Globalne postavke</target>
-
<source>&Tools</source>
<target>&Alati</target>
@@ -705,9 +902,6 @@ Naredba će biti pokrenuta ako se:
<source>Check &automatically once a week</source>
<target>Provjeri &automatski jednom tjedno</target>
-<source>Check for new &version</source>
-<target>Prvojeri dostupnost nove &verzije</target>
-
<source>Compare</source>
<target>Usporedi</target>
@@ -723,9 +917,6 @@ Naredba će biti pokrenuta ako se:
<source>Swap sides</source>
<target>Zamjeni strane</target>
-<source>Find what:</source>
-<target>Nađi što:</target>
-
<source>Match case</source>
<target>Poklopi se</target>
@@ -750,87 +941,12 @@ Naredba će biti pokrenuta ako se:
<source>Total bytes to copy</source>
<target>Ukupno bajta za kopirati</target>
-<source>Items found:</source>
-<target>Pronađene stavke:</target>
-
-<source>Speed:</source>
-<target>Brzina:</target>
-
-<source>Time remaining:</source>
-<target>Preostalo vremena:</target>
-
-<source>Time elapsed:</source>
-<target>Proteklo vremena:</target>
-
-<source>Synchronizing...</source>
-<target>Sinkroniziram...</target>
-
-<source>Minimize to notification area</source>
-<target>Spusti u notifikacije</target>
-
-<source>On completion</source>
-<target>Pri završetku</target>
-
-<source>Close</source>
-<target>Zatvori</target>
-
-<source>&Pause</source>
-<target>&Pauziraj</target>
-
-<source>Variant</source>
-<target>Način</target>
-
-<source>Statistics</source>
-<target>Statistika</target>
-
-<source>&Don't show this dialog again</source>
-<target>&Nemoj više prikazivati ovaj dijaloški prozor</target>
-
-<source>Select a variant</source>
-<target>Odaberite varijantu</target>
-
-<source>
-Files are found equal if
- - last write time and date
- - file size
-are the same
-</source>
-<target>
-Datoteke se smatraju jednake ako su im
- - vrijeme zadnje promjene i datum
- - veličina datoteke
-jednaki
-</target>
-
-<source>
-Files are found equal if
- - file content
-is the same
-</source>
-<target>
-Datoteke se smatraju jednake ako im je
- - sadržaj datoteke
-jednak
-</target>
-
-<source>Symbolic Link handling</source>
-<target>Upravljanje simboličnim poveznicama</target>
-
-<source>Help</source>
-<target>Pomoć</target>
-
<source>OK</source>
<target>U redu</target>
<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
<target>Pronađi i izvrši izmjene na obje strane. Izbrisano, premješteno te sukobe se otkrije automatski pomoću baze.</target>
-<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
-<target>Zrcalna pričuva lijeve mape. Desna mapa je uređena da bi bila jednaka lijevom folderu nakon sinkronizacije.</target>
-
-<source>Copy new or updated files to right folder.</source>
-<target>Kopiraj nove ili ažurirane datoteke u desnu mapu.</target>
-
<source>Configure your own synchronization rules.</source>
<target>Konfigurirajte vaša vlastita sinkronizacijska pravila.</target>
@@ -840,24 +956,6 @@ jednak
<source>Requires database files. Not supported by all file systems.</source>
<target>Zahtjevaju se datoteke baze. Nisu podržai svi datotečni sustavi.</target>
-<source>Error handling</source>
-<target>Greška pri obradi</target>
-
-<source>Ignore</source>
-<target>Ignoriraj</target>
-
-<source>Hide all error and warning messages</source>
-<target>Sakrij sve greške i upozorenja</target>
-
-<source>Pop-up</source>
-<target>Pop-up</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Prikaži skočni prozor pri greškama i upozorenjima</target>
-
-<source>Deletion handling</source>
-<target>Upravljanje pri brisanju</target>
-
<source>Permanent</source>
<target>Trajno</target>
@@ -879,96 +977,75 @@ jednak
<source>Naming convention:</source>
<target>Pravilo imena:</target>
-<source>Batch job</source>
-<target>Slijedni zadatak</target>
+<source>Ignore</source>
+<target>Ignoriraj</target>
-<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
-<target>Stvaranje batch datoteka za sinkronizaciju bez nadzora. Za početak, dvaput kliknite na ovu datoteku ili planirajte u planeru zadataka: %x</target>
+<source>Hide all error and warning messages</source>
+<target>Sakrij sve greške i upozorenja</target>
-<source>Exit</source>
-<target>Izađi</target>
+<source>Pop-up</source>
+<target>Pop-up</target>
-<source>Abort synchronization on first error</source>
-<target>Prekini sinkronizaciju pri prvoj pogrešci</target>
+<source>Show pop-up on errors or warnings</source>
+<target>Prikaži skočni prozor pri greškama i upozorenjima</target>
-<source>Show progress dialog</source>
-<target>Prikaži napredak</target>
+<source>Statistics</source>
+<target>Statistika</target>
-<source>Save log</source>
-<target>Spremi izvješće</target>
+<source>&Don't show this dialog again</source>
+<target>&Nemoj više prikazivati ovaj dijaloški prozor</target>
-<source>Select folder to save log files</source>
-<target>Odaberi mapu za spremanje izvješća</target>
+<source>Items found:</source>
+<target>Pronađene stavke:</target>
-<source>Limit</source>
-<target>Ograniči</target>
+<source>Speed:</source>
+<target>Brzina:</target>
-<source>Limit maximum number of log files</source>
-<target>Ograniči maksimalan broj izvješća</target>
+<source>Time remaining:</source>
+<target>Preostalo vremena:</target>
-<source>Delete on both sides</source>
-<target>Izbriši na obje strane</target>
+<source>Time elapsed:</source>
+<target>Proteklo vremena:</target>
-<source>Delete on both sides even if the file is selected on one side only</source>
-<target>Izbriši na obje strane iako je označena datoteka samo na jednoj strani</target>
+<source>Synchronizing...</source>
+<target>Sinkroniziram...</target>
-<source>
-Files will only be synchronized if they pass all filter rules.
-Note: File paths must be relative to base directories.
-</source>
-<target>
-Datoteke će biti kopirane ukoliko zadovolje sve zahtjeve filtera.
-Pažnja: Putanje datoteka moraju biti relativne na ishodni direktorij.
-</target>
+<source>Minimize to notification area</source>
+<target>Spusti u notifikacije</target>
-<source>Include</source>
-<target>Uključi</target>
+<source>Close</source>
+<target>Zatvori</target>
-<source>Exclude</source>
-<target>Isključi</target>
+<source>&Pause</source>
+<target>&Pauziraj</target>
+
+<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>Stvaranje batch datoteka za sinkronizaciju bez nadzora. Za početak, dvaput kliknite na ovu datoteku ili planirajte u planeru zadataka: %x</target>
-<source>Time span</source>
-<target>Vremensko ograničenje</target>
+<source>Show progress dialog</source>
+<target>Prikaži napredak</target>
-<source>File size</source>
-<target>Veličina datoteke</target>
+<source>Limit maximum number of log files</source>
+<target>Ograniči maksimalan broj izvješća</target>
-<source>Minimum</source>
-<target>Minimum</target>
+<source>Delete on both sides</source>
+<target>Izbriši na obje strane</target>
-<source>Maximum</source>
-<target>Maksimum</target>
+<source>Delete on both sides even if the file is selected on one side only</source>
+<target>Izbriši na obje strane iako je označena datoteka samo na jednoj strani</target>
<source>&Clear</source>
<target>&Brisati</target>
-<source>Global settings</source>
-<target>Globalne postavke</target>
-
<source>Fail-safe file copy</source>
<target>Kopiranje zaštićeno od grešaka</target>
-<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
-<target>Prvo kopiraj u privremenu datoteku (*ffs_tmp) zatim promijeni ime. Ovo osigurava dosljedno stanje čak i kod fatalne greške.</target>
-
<source>Copy locked files</source>
<target>Kopiraj zaključane datoteke</target>
-<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
-<target>Kopiraj dijeljene ili zaključane datoteke koristeći Volume Shadow Copy servis (potrebna su administratorska ovlaštenja)</target>
-
<source>Copy file access permissions</source>
<target>Kopiraj datotečna dopuštenja</target>
-<source>Transfer file and folder permissions (requires administrator rights)</source>
-<target>Prenesi dozvole za mape i datoteke (potrebna su administratorska ovlaštenja)</target>
-
-<source>Restore hidden dialogs</source>
-<target>Prikaži skrivene prozore</target>
-
-<source>External applications</source>
-<target>Vanjske aplikacije</target>
-
<source>Description</source>
<target>Opis</target>
@@ -999,27 +1076,6 @@ Pažnja: Putanje datoteka moraju biti relativne na ishodni direktorij.
<source>Many thanks for localization:</source>
<target>Velike zahvale idu:</target>
-<source>Start synchronization</source>
-<target>Započni sinkronizaciju</target>
-
-<source>Comparison settings</source>
-<target>Postavke usporedbe</target>
-
-<source>Synchronization settings</source>
-<target>Postavke sinkronizacije</target>
-
-<source>Delete</source>
-<target>Izbriši</target>
-
-<source>Configure filter</source>
-<target>Konfiguriraj filter</target>
-
-<source>Select time span</source>
-<target>Izaberite mjerni raspon</target>
-
-<source>Folder pairs</source>
-<target>Par mape</target>
-
<source>Find</source>
<target>Pronađi</target>
@@ -1029,15 +1085,6 @@ Pažnja: Putanje datoteka moraju biti relativne na ishodni direktorij.
<source>Configuration</source>
<target>Postavke</target>
-<source>Main bar</source>
-<target>Glavna traka</target>
-
-<source>Filter files</source>
-<target>Filtriraj datoteke</target>
-
-<source>Select view</source>
-<target>Izaberite pogled</target>
-
<source>Open...</source>
<target>Otvori...</target>
@@ -1047,15 +1094,14 @@ Pažnja: Putanje datoteka moraju biti relativne na ishodni direktorij.
<source>Compare both sides</source>
<target>Usporedi obje strane</target>
-<source>
-<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
-<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
-</source>
-<target>
-<pluralform>Dali stvarno želite izvršiti nardebu %y za %x stavku?</pluralform>
-<pluralform>Dali stvarno želite izvršiti nardebu %y za %x stavke?</pluralform>
-<pluralform>Dali stvarno želite izvršiti nardebu %y za %x stavki?</pluralform>
-</target>
+<source>Comparison settings</source>
+<target>Postavke usporedbe</target>
+
+<source>Synchronization settings</source>
+<target>Postavke sinkronizacije</target>
+
+<source>Start synchronization</source>
+<target>Započni sinkronizaciju</target>
<source>Confirm</source>
<target>Potvrdi</target>
@@ -1111,6 +1157,9 @@ Pažnja: Putanje datoteka moraju biti relativne na ishodni direktorij.
<source>Include temporarily</source>
<target>Trenutno uključi</target>
+<source>Delete</source>
+<target>Izbriši</target>
+
<source>Include all</source>
<target>Uključi sve</target>
@@ -1159,6 +1208,9 @@ Pažnja: Putanje datoteka moraju biti relativne na ishodni direktorij.
<source>Never save &changes</source>
<target>Nikad ne spremaj &promjene</target>
+<source>Filter</source>
+<target>Filtriranje</target>
+
<source>Show files that exist on left side only</source>
<target>Prikaži datoteke koje postoje samo na lijevoj strani</target>
@@ -1204,9 +1256,6 @@ Pažnja: Putanje datoteka moraju biti relativne na ishodni direktorij.
<source>Set as default</source>
<target>Postavi kao zadano</target>
-<source>Operation aborted</source>
-<target>Operacija otkazana</target>
-
<source>All folders are in sync</source>
<target>Sve mape su u sinkronizaciji</target>
@@ -1228,18 +1277,12 @@ Pažnja: Putanje datoteka moraju biti relativne na ishodni direktorij.
<source>&Ignore</source>
<target>&Ignoriraj</target>
-<source>Fatal Error</source>
-<target>Kritična greška</target>
-
<source>&Don't show this warning again</source>
<target>&Ne prikazuj više ovo upozorenje.</target>
<source>&Switch</source>
<target>&Zamjeni</target>
-<source>Question</source>
-<target>Pitanje</target>
-
<source>&Yes</source>
<target>&Da</target>
@@ -1261,9 +1304,6 @@ Pažnja: Putanje datoteka moraju biti relativne na ishodni direktorij.
<source>Initializing...</source>
<target>Učitavam</target>
-<source>Aborted</source>
-<target>Prekinuto</target>
-
<source>Completed</source>
<target>Završeno</target>
@@ -1273,9 +1313,6 @@ Pažnja: Putanje datoteka moraju biti relativne na ishodni direktorij.
<source>Log</source>
<target>Dnevnik</target>
-<source>Inactive</source>
-<target>Neaktivno</target>
-
<source>Today</source>
<target>Danas</target>
@@ -1300,9 +1337,6 @@ Pažnja: Putanje datoteka moraju biti relativne na ishodni direktorij.
<source>MB</source>
<target>MB</target>
-<source>Filter</source>
-<target>Filtriranje</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>
@@ -1323,6 +1357,9 @@ Pažnja: Putanje datoteka moraju biti relativne na ishodni direktorij.
<pluralform>Dali stvarno želite obristi sljedećih %x stavki?</pluralform>
</target>
+<source>Exclude</source>
+<target>Isključi</target>
+
<source>Direct</source>
<target>Neposredno</target>
@@ -1347,9 +1384,6 @@ Pažnja: Putanje datoteka moraju biti relativne na ishodni direktorij.
<source>- Other side's counterpart to %item_folder%</source>
<target>- Duplikat s druge strane u %item_folder%</target>
-<source>Make hidden warnings and dialogs visible again?</source>
-<target>Vrati skrivena upozorenja i dijaloški okvir ponovno vidljivim?</target>
-
<source>Leave as unresolved conflict</source>
<target>Ostavi kao neriješeni sukob</target>
@@ -1476,15 +1510,9 @@ Pažnja: Putanje datoteka moraju biti relativne na ishodni direktorij.
<pluralform>%x dana</pluralform>
</target>
-<source>Failed to register to receive system messages.</source>
-<target>Neuspijela registracija za primanje sistemskih poruka.</target>
-
<source>Cannot set privilege %x.</source>
<target>Ne mogu postaviti prava za %x.</target>
-<source>Failed to suspend system sleep mode.</source>
-<target>Nije moguće odgoditi mod spavanja računala</target>
-
<source>Cannot change process I/O priorities.</source>
<target>Ne može se promjeniti proces I/O prioriteta</target>
diff --git a/BUILD/Languages/czech.lng b/BUILD/Languages/czech.lng
index 9762fbb7..1e49b62e 100644
--- a/BUILD/Languages/czech.lng
+++ b/BUILD/Languages/czech.lng
@@ -2,11 +2,28 @@
<language>Čeština</language>
<translator>ViCi</translator>
<locale>cs_CZ</locale>
- <flag_image>flag_czech_republic.png</flag_image>
- <plural_form_count>3</plural_form_count>
+ <image>flag_czech_republic.png</image>
+ <plural_count>3</plural_count>
<plural_definition>n==1 ? 0 : n>=2 && n<=4 ? 1 : 2</plural_definition>
</header>
+<source>
+<pluralform>Do you really want to execute the command %y for one item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+</target>
+
+<source>Retrying operation</source>
+<target></target>
+
+<source>
+<pluralform>Automatic retry in 1 second...</pluralform>
+<pluralform>Automatic retry in %x seconds...</pluralform>
+</source>
+<target>
+</target>
+
<source>Both sides have changed since last synchronization.</source>
<target>Došlo ke změně obou stran od poslední synchronizace.</target>
@@ -295,8 +312,8 @@
<source>/sec</source>
<target>/s</target>
-<source>%x items</source>
-<target>%x položek</target>
+<source>%x items/sec</source>
+<target>%x položek/s</target>
<source>Configuration file %x loaded partially only.</source>
<target>Konfigurace ze souboru %x byla načtena jen částečně.</target>
@@ -325,11 +342,11 @@
<source>Volume name %x is not part of file path %y.</source>
<target>Název disku %x není součástí cesty souboru %y.</target>
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Požadavek na přerušení: Čekání na ukončení aktuální operace...</target>
+<source>Stop requested: Waiting for current operation to finish...</source>
+<target>Zastavování: Čekání na dokončení právě probíhající operace...</target>
-<source>Failure to create timestamp for versioning:</source>
-<target>Chyba při vytvoření časové značky verzování:</target>
+<source>Unable to create timestamp for versioning:</source>
+<target>Nelze vytvořit časové značky verzování:</target>
<source>Cannot read the following XML elements:</source>
<target>Nelze načíst následující XML elementy:</target>
@@ -346,8 +363,8 @@
<source>&Program</source>
<target>&Nástroje</target>
-<source>&Content</source>
-<target>&Obsah</target>
+<source>&View help</source>
+<target>&Nápověda (pouze anglicky)</target>
<source>&About</source>
<target>O &Programu</target>
@@ -370,8 +387,8 @@
<source>To get started just import a .ffs_batch file.</source>
<target>Můžete načíst také konfigurační soubor .ffs_batch</target>
-<source>Folders to watch</source>
-<target>Složka ke sledování</target>
+<source>Folders to watch:</source>
+<target>Sledovaná složka:</target>
<source>Add folder</source>
<target>Přidat adresář</target>
@@ -385,12 +402,15 @@
<source>Select a folder</source>
<target>Vyberte adresář</target>
-<source>Idle time [seconds]</source>
-<target>Prodleva (v sekundách)</target>
+<source>Idle time (in seconds):</source>
+<target>Prodleva (v sekundách):</target>
<source>Idle time between last detected change and execution of command</source>
<target>Prodleva mezi zjištěním poslední změny a spuštěním příkazu</target>
+<source>Command line:</source>
+<target>Příkazová řádka:</target>
+
<source>
The command is triggered if:
- files or subfolders change
@@ -402,8 +422,8 @@ Příkaz je spuštěn když:
- je zjištěna nová složka (např. vložením USB disku)
</target>
-<source>Start</source>
-<target>Start</target>
+<source>&Start</source>
+<target>&Start</target>
<source>&Retry</source>
<target>&Opakovat</target>
@@ -411,18 +431,18 @@ Příkaz je spuštěn když:
<source>Cancel</source>
<target>Zrušit</target>
-<source>RealtimeSync - Automated Synchronization</source>
-<target>RealtimeSync - Automatická synchronizace</target>
-
<source>Build: %x</source>
<target>Verze: %x</target>
<source>About</source>
-<target>O Programu</target>
+<target>O programu</target>
<source>All files</source>
<target>Všechny soubory</target>
+<source>Automated Synchronization</source>
+<target>Automatická synchronizace</target>
+
<source>Directory monitoring active</source>
<target>Sledování adresářů je aktivní</target>
@@ -438,7 +458,7 @@ Příkaz je spuštěn když:
<source>&Exit</source>
<target>&Konec</target>
-<source>Invalid command line:</source>
+<source>Incorrect command line:</source>
<target>Neplatný příkaz:</target>
<source>File content</source>
@@ -501,8 +521,8 @@ Příkaz je spuštěn když:
<source>Target folder input field must not be empty.</source>
<target>Cílová složka nesmí být prázdná.</target>
-<source>Folder input field for versioning must not be empty.</source>
-<target>Složka pro verzování souborů nesmí být prázdná.</target>
+<source>Please enter a target folder for versioning.</source>
+<target>Prosím zadejte cílovou složku pro verzování.</target>
<source>Source folder %x not found.</source>
<target>Zdrojovou složku %x nelze najít.</target>
@@ -540,8 +560,8 @@ Příkaz je spuštěn když:
<source>job name</source>
<target>název úlohy</target>
-<source>Synchronization aborted</source>
-<target>Synchronizace zrušena</target>
+<source>Synchronization stopped</source>
+<target>Synchronizace zastavena</target>
<source>Synchronization completed with errors</source>
<target>Synchronizace dokončena s chybami</target>
@@ -558,23 +578,20 @@ Příkaz je spuštěn když:
<source>Saving log file %x...</source>
<target>Ukládání žurnálu %x...</target>
-<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
-<target>Použijte tlačítko "Přepnout" k vyřešení problému pomocí hlavního okna FreeFileSync.</target>
+<source>You can switch to FreeFileSync's main window to resolve this issue.</source>
+<target>K odstranění tohoto problému se přepněte do hlavního okna FreeFileSync.</target>
-<source>Switching to FreeFileSync main dialog</source>
+<source>Switching to FreeFileSync's main window</source>
<target>Přepínání do hlavního okna FreeFileSync</target>
-<source>Retrying operation after error:</source>
-<target>Opakovaní operace po chybě:</target>
-
<source>A new version of FreeFileSync is available:</source>
<target>Je dostupná novější verze FreeFileSync:</target>
<source>Download now?</source>
<target>Stáhnout nyní?</target>
-<source>New version found</source>
-<target>Nalezena novější verze</target>
+<source>Check for Program Updates</source>
+<target>Hledání aktualizací programu</target>
<source>&Download</source>
<target>&Stahování</target>
@@ -642,20 +659,20 @@ Příkaz je spuštěn když:
<source>Hibernate</source>
<target>Přepnout do režimu spánku</target>
-<source>Selected variant:</source>
-<target>Vybraná varianta:</target>
+<source>Alternate comparison settings</source>
+<target>Jiné nastavení porovnání</target>
-<source>Select alternate comparison settings</source>
-<target>Změnit nastavení porovnání</target>
+<source>Alternate synchronization settings</source>
+<target>Jiné nastavení synchronizace</target>
-<source>Select alternate synchronization settings</source>
-<target>Změnit nastavení synchronizace</target>
+<source>Local filter</source>
+<target>Místní filtr</target>
-<source>Filter is active</source>
-<target>Filtr je zapnutý</target>
+<source>Active</source>
+<target>Zapnutý</target>
-<source>No filter selected</source>
-<target>Není vybrán žádný filtr</target>
+<source>None</source>
+<target>Žádný</target>
<source>Remove alternate settings</source>
<target>Zrušit jiné nastavení</target>
@@ -669,6 +686,15 @@ Příkaz je spuštěn když:
<source>Paste</source>
<target>Vložit</target>
+<source>Alternate Comparison Settings</source>
+<target>Jiné nastavení porovnání</target>
+
+<source>Alternate Synchronization Settings</source>
+<target>Jiné nastavení synchronizace</target>
+
+<source>Local Filter</source>
+<target>Místní filtr</target>
+
<source>&New</source>
<target>&Nový</target>
@@ -684,15 +710,18 @@ Příkaz je spuštěn když:
<source>2. &Synchronize</source>
<target>2. &Synchronizovat</target>
+<source>&Global settings</source>
+<target>&Nastavení programu</target>
+
<source>&Language</source>
<target>&Jazyk</target>
+<source>&Find...</source>
+<target>&Najít...</target>
+
<source>&Export file list...</source>
<target>&Exportovat seznam souborů...</target>
-<source>&Global settings</source>
-<target>&Nastavení programu</target>
-
<source>&Tools</source>
<target>&Upřesnit</target>
@@ -702,7 +731,7 @@ Příkaz je spuštěn když:
<source>Check &automatically once a week</source>
<target>Kontrolovat &automaticky jednou týdně</target>
-<source>Check for new &version</source>
+<source>&Check for new version</source>
<target>&Zkontrolovat aktualizace</target>
<source>Compare</source>
@@ -720,6 +749,15 @@ Příkaz je spuštěn když:
<source>Swap sides</source>
<target>Změna stran</target>
+<source>Close search bar</source>
+<target>Zavřít hledání</target>
+
+<source>Find:</source>
+<target>Najít:</target>
+
+<source>Match case</source>
+<target>Rozlišovat malá a velká písmena</target>
+
<source>Save as batch job</source>
<target>Uložit jako dávku</target>
@@ -741,74 +779,20 @@ Příkaz je spuštěn když:
<source>Total bytes to copy</source>
<target>Celkový objem dat</target>
-<source>Items found:</source>
-<target>Nalezeno položek:</target>
-
-<source>Speed:</source>
-<target>Rychlost:</target>
-
-<source>Time remaining:</source>
-<target>Zbývající čas:</target>
-
-<source>Time elapsed:</source>
-<target>Uplynulý čas:</target>
-
-<source>Synchronizing...</source>
-<target>Synchronizuji...</target>
-
-<source>Minimize to notification area</source>
-<target>Minimalizovat do oznamovací oblasti</target>
+<source>Select a variant:</source>
+<target>Výběr varianty:</target>
-<source>On completion</source>
-<target>Po dokončení</target>
+<source>Identify equal files by comparing modification time and size.</source>
+<target>Rozpoznat shodné soubory porovnáním jejich data změny a velikosti.</target>
-<source>Close</source>
-<target>Zavřít</target>
-
-<source>&Pause</source>
-<target>&Pauza</target>
-
-<source>Variant</source>
-<target>Varianta</target>
-
-<source>Statistics</source>
-<target>Statistika</target>
-
-<source>&Don't show this dialog again</source>
-<target>Tento dialog již &nezobrazovat</target>
+<source>Identify equal files by comparing the file content.</source>
+<target>Rozpoznat shodné soubory porovnáním jejich obsahu.</target>
-<source>Select a variant</source>
-<target>Výběr možnosti</target>
+<source>Symbolic links:</source>
+<target>Symbolickéh odkazy:</target>
-<source>
-Files are found equal if
- - last write time and date
- - file size
-are the same
-</source>
-<target>
-Soubory jsou shodné jestliže
- - datum i čas poslední změny
- - velikost souboru
-jsou stejné
-</target>
-
-<source>
-Files are found equal if
- - file content
-is the same
-</source>
-<target>
-Soubory jsou shodné jestliže
- - obsah souboru
-je stejný
-</target>
-
-<source>Symbolic Link handling</source>
-<target>Zpracování symbolických odkazů</target>
-
-<source>Help</source>
-<target>Nápověda</target>
+<source>More information</source>
+<target>Více informací</target>
<source>OK</source>
<target>OK</target>
@@ -816,11 +800,11 @@ je stejný
<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
<target>Rozpoznat a provést změny na obou stranách. Odstraněné, přesunuté nebo přejmenované soubory a konflikty budou detekovány automaticky pomocí databáze.</target>
-<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
-<target>Zrcadlení levého adresáře. Pravý adresář bude změněn tak, aby po synchronizaci byl totožný s levým.</target>
+<source>Create a mirror backup of the left folder which exactly matches the right folder after synchronization.</source>
+<target>Vytvořit zrcadlovou kopii levé složky tak, aby po synchronizci pravá složka přesně odpovídala levé.</target>
-<source>Copy new or updated files to right folder.</source>
-<target>Kopírovat nové nebo aktualizované soubory do adresáře vpravo.</target>
+<source>Copy new and updated files to the right folder.</source>
+<target>Kopírovat nové a aktualizované soubory do pravé složky.</target>
<source>Configure your own synchronization rules.</source>
<target>Nastavení vlastních pravidel synchronizace.</target>
@@ -831,23 +815,8 @@ je stejný
<source>Requires database files. Not supported by all file systems.</source>
<target>Je nutný soubor databáze. Toto není dostupné na všech systémech.</target>
-<source>Error handling</source>
-<target>Zpracování chyb</target>
-
-<source>Ignore</source>
-<target>Přeskočit</target>
-
-<source>Hide all error and warning messages</source>
-<target>Skrýt všechny chyby a varování</target>
-
-<source>Pop-up</source>
-<target>Hlášení</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Zobrazit hlášení při chybě nebo varování</target>
-
-<source>Deletion handling</source>
-<target>Nastavení mazání</target>
+<source>Delete files:</source>
+<target>Mazání souborů:</target>
<source>Permanent</source>
<target>Trvale</target>
@@ -870,56 +839,89 @@ je stejný
<source>Naming convention:</source>
<target>Pojmenování:</target>
-<source>Batch job</source>
-<target>Dávkový soubor</target>
+<source>Show examples</source>
+<target>Ukázat příklady</target>
-<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
-<target>Vytvoří dávkový souboru pro automatickou synchronizaci. Ke spuštění dávky jednoduše poklikejte na vytvořený soubor nebo využijte plánovač úloh vašeho systému: %x</target>
+<source>Handle errors:</source>
+<target>Zpracování chyb:</target>
-<source>Exit</source>
-<target>Konec</target>
+<source>Ignore</source>
+<target>Přeskočit</target>
-<source>Abort synchronization on first error</source>
-<target>Ukončit synchronizaci při první chybě</target>
+<source>Hide all error and warning messages</source>
+<target>Skrýt všechny chyby a varování</target>
-<source>Show progress dialog</source>
-<target>Zobrazit průběh zpracování</target>
+<source>Pop-up</source>
+<target>Hlášení</target>
-<source>Save log</source>
-<target>Uložit žurnál</target>
+<source>Show pop-up on errors or warnings</source>
+<target>Zobrazit hlášení při chybě nebo varování</target>
-<source>Select folder to save log files</source>
-<target>Vyberte složku pro žurnály</target>
+<source>On completion:</source>
+<target>Po dokončení:</target>
-<source>Limit</source>
-<target>Omezení</target>
+<source>Start synchronization now?</source>
+<target>Začít synchronizovat nyní?</target>
-<source>Limit maximum number of log files</source>
-<target>Omezení maximálního počtu žurnálů</target>
+<source>Variant:</source>
+<target>Varianta:</target>
-<source>Source code written in C++ using:</source>
-<target>Zdrojový kód byl napsán kompletně v C++ pomocí:</target>
+<source>Statistics</source>
+<target>Statistika</target>
-<source>If you like FreeFileSync</source>
-<target>Pokud se Vám FreeFileSync líbí</target>
+<source>&Don't show this dialog again</source>
+<target>Tento dialog již &nezobrazovat</target>
-<source>Donate with PayPal</source>
-<target>Přispět pomocí PayPal</target>
+<source>Items found:</source>
+<target>Nalezeno položek:</target>
-<source>Feedback and suggestions are welcome</source>
-<target>Komentáře a náměty jsou vždy vítány</target>
+<source>Speed:</source>
+<target>Rychlost:</target>
-<source>Homepage</source>
-<target>Navštivte</target>
+<source>Time remaining:</source>
+<target>Zbývající čas:</target>
-<source>Email</source>
-<target>Napište</target>
+<source>Time elapsed:</source>
+<target>Uplynulý čas:</target>
-<source>Published under the GNU General Public License</source>
-<target>Vydáno pod GNU General Public License (GPL)</target>
+<source>Synchronizing...</source>
+<target>Synchronizuji...</target>
-<source>Many thanks for localization:</source>
-<target>Poděkování za překlad FreeFileSync:</target>
+<source>Minimize to notification area</source>
+<target>Minimalizovat do oznamovací oblasti</target>
+
+<source>Close</source>
+<target>Zavřít</target>
+
+<source>&Pause</source>
+<target>&Pauza</target>
+
+<source>Stop</source>
+<target>Ukončit</target>
+
+<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>Vytvoří dávkový souboru pro automatickou synchronizaci. Ke spuštění dávky jednoduše poklikejte na vytvořený soubor nebo využijte plánovač úloh vašeho systému: %x</target>
+
+<source>Stop synchronization at first error</source>
+<target>Ukončit synchronizaci při první chybě</target>
+
+<source>Show progress dialog</source>
+<target>Zobrazit průběh zpracování</target>
+
+<source>Save log:</source>
+<target>Uložit žurnál:</target>
+
+<source>Limit:</source>
+<target>Omezení:</target>
+
+<source>Limit maximum number of log files</source>
+<target>Omezení maximálního počtu žurnálů</target>
+
+<source>How can I schedule a batch job?</source>
+<target>Jak nastavit spouštění dávky?</target>
+
+<source>&Recycle bin</source>
+<target>&Koš</target>
<source>Delete on both sides</source>
<target>Smazat z obou stran</target>
@@ -927,116 +929,137 @@ je stejný
<source>Delete on both sides even if the file is selected on one side only</source>
<target>Smazat na obou stranách i když je soubor vybrán pouze na jedné z nich</target>
-<source>
-Files will only be synchronized if they pass all filter rules.
-Note: File paths must be relative to base directories.
-</source>
-<target>
-Pouze soubory odpovídající nastavenému filtru budou vybrány pro synchronizaci.
-Poznámka: Filtr je aplikován relativně k základním adresářům.
-</target>
+<source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source>
+<target>Nastavte pravidla filtru pro vynechání některých souborů ze synchronizace. Zadávajte cesty relativně k odpovídající složce.</target>
-<source>Include</source>
-<target>Přidat</target>
+<source>Include:</source>
+<target>Zahrnout:</target>
-<source>Exclude</source>
-<target>Vynechat</target>
+<source>Exclude:</source>
+<target>Vynechat:</target>
-<source>Time span</source>
-<target>Časové rozmezí</target>
+<source>Time span:</source>
+<target>Časové rozmezí:</target>
-<source>File size</source>
-<target>Velikost souboru</target>
+<source>File size:</source>
+<target>Velikost soubor:</target>
-<source>Minimum</source>
-<target>Od</target>
+<source>Minimum:</source>
+<target>Od:</target>
-<source>Maximum</source>
-<target>Do</target>
+<source>Maximum:</source>
+<target>Do:</target>
<source>&Clear</source>
<target>&Smazat</target>
-<source>Global settings</source>
-<target>Nastavení programu</target>
+<source>The following settings are used for all synchronization jobs.</source>
+<target>Toto nastavení je platné pro všechny synchronizační úlohy.</target>
<source>Fail-safe file copy</source>
<target>Bezpečné kopírování souborů</target>
-<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
-<target>Kopírovat nejprve do pomocného souboru (*.ffs_tmp) a teprve poté soubor přejmenovat. Tento postup zajišťuje bezpečné chování i v případě chyby během přenosu</target>
+<source>
+Copy to a temporary file (*.ffs_tmp) before overwriting target.
+This guarantees a consistent state even in case of a serious error.
+</source>
+<target>Kopírovat nejprve do pomocného souboru (*.ffs_tmp) před přepisem cíle. Tento postup zajišťuje bezpečné chování i v případě závažné chyby.</target>
+
+<source>(recommended)</source>
+<target>(doporučeno)</target>
<source>Copy locked files</source>
<target>Kopírovat zamčené soubory</target>
-<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
-<target>Kopírovat sdílené nebo zamčené soubory pomocí služby Stínové kopie (Vyžaduje administrátorské oprávnění)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service.</source>
+<target>Kopírovat sdílené nebo zamčené soubory pomocí služby Stínové kopie</target>
+
+<source>(requires administrator rights)</source>
+<target>(vyžaduje administrátorská oprávnění)</target>
<source>Copy file access permissions</source>
<target>Kopírovat přístupová oprávnění k souborům</target>
-<source>Transfer file and folder permissions (requires administrator rights)</source>
-<target>Přenést přístupová oprávnění souborů a složek (Vyžaduje administrátorské oprávnění)</target>
+<source>Transfer file and folder permissions.</source>
+<target>Přenést přístupová oprávnění souborů a složek</target>
-<source>Restore hidden dialogs</source>
-<target>Obnovit skryté dialogy</target>
+<source>Automatic retry on error:</source>
+<target>Automaticky opakovat při chybě:</target>
+
+<source>Retry count:</source>
+<target>Počet opakování:</target>
-<source>External applications</source>
-<target>Externí aplikace</target>
+<source>Delay (in seconds):</source>
+<target>Prodleva (v sekundách):</target>
+
+<source>Customize context menu:</source>
+<target>Přizpůsobit kontextovou nabídku:</target>
<source>Description</source>
<target>Popis</target>
+<source>Restore hidden windows</source>
+<target>Obnovit skryté dialogy</target>
+
<source>&Default</source>
<target>&Předdefinované</target>
-<source>Find what:</source>
-<target>Najít:</target>
+<source>Source code written in C++ using:</source>
+<target>Zdrojový kód byl napsán kompletně v C++ pomocí:</target>
-<source>Match case</source>
-<target>Rozlišovat malá a velká písmena</target>
+<source>If you like FreeFileSync</source>
+<target>Pokud se Vám FreeFileSync líbí</target>
-<source>&Find next</source>
-<target>&Najít další</target>
+<source>Donate with PayPal</source>
+<target>Přispět pomocí PayPal</target>
-<source>Start synchronization</source>
-<target>Start synchronizace</target>
+<source>Feedback and suggestions are welcome</source>
+<target>Komentáře a náměty jsou vždy vítány</target>
-<source>Comparison settings</source>
-<target>Nastavení porovnání</target>
+<source>Homepage</source>
+<target>Navštivte</target>
-<source>Synchronization settings</source>
-<target>Nastavení synchronizace</target>
+<source>Email</source>
+<target>Napište</target>
-<source>Delete</source>
-<target>Smazat</target>
+<source>Published under the GNU General Public License</source>
+<target>Vydáno pod GNU General Public License (GPL)</target>
+
+<source>Many thanks for localization:</source>
+<target>Poděkování za překlad FreeFileSync:</target>
-<source>Configure filter</source>
-<target>Nastavení filtru</target>
+<source>Save as Batch Job</source>
+<target>Uložit jako dávku</target>
-<source>Find</source>
-<target>Najít</target>
+<source>Delete Items</source>
+<target>Smazané položky</target>
-<source>Select time span</source>
+<source>Global Settings</source>
+<target>Nastavení programu</target>
+
+<source>Select Time Span</source>
<target>Časové rozmezí</target>
-<source>Folder pairs</source>
+<source>Folder Pairs</source>
<target>Adresářové páry</target>
+<source>Find</source>
+<target>Najít</target>
+
<source>Overview</source>
<target>Přehled</target>
<source>Configuration</source>
<target>Konfigurace</target>
-<source>Main bar</source>
+<source>Main Bar</source>
<target>Hlavní lišta</target>
-<source>Filter files</source>
+<source>Filter Files</source>
<target>Filtr souborů</target>
-<source>Select view</source>
-<target>Vyberte zobrazení</target>
+<source>Select View</source>
+<target>Zobrazení</target>
<source>Open...</source>
<target>Otevřít...</target>
@@ -1047,15 +1070,14 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
<source>Compare both sides</source>
<target>Porovnat obě strany</target>
-<source>
-<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
-<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
-</source>
-<target>
-<pluralform>Opravdu chcete provést příkaz %y pro 1 položku?</pluralform>
-<pluralform>Opravdu chcete provést příkaz %y pro %x položky?</pluralform>
-<pluralform>Opravdu chcete provést příkaz %y pro %x položek?</pluralform>
-</target>
+<source>Comparison settings</source>
+<target>Nastavení porovnání</target>
+
+<source>Synchronization settings</source>
+<target>Nastavení synchronizace</target>
+
+<source>Start synchronization</source>
+<target>Start synchronizace</target>
<source>Confirm</source>
<target>Potvrdit</target>
@@ -1096,12 +1118,6 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
<source>Set direction:</source>
<target>Nastavit adresář:</target>
-<source>Exclude temporarily</source>
-<target>Vynechat dočasně</target>
-
-<source>Include temporarily</source>
-<target>Přidat dočasně</target>
-
<source>multiple selection</source>
<target>vícenásobný výběr</target>
@@ -1111,6 +1127,15 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
<source>Exclude via filter:</source>
<target>Vynechat pomocí filtru:</target>
+<source>Exclude temporarily</source>
+<target>Vynechat dočasně</target>
+
+<source>Include temporarily</source>
+<target>Přidat dočasně</target>
+
+<source>Delete</source>
+<target>Smazat</target>
+
<source>Include all</source>
<target>Zahrnout vše</target>
@@ -1142,7 +1167,7 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
<target>Poslední sezení</target>
<source>Folder Comparison and Synchronization</source>
-<target>Porovnání a Synchronizace adresářů</target>
+<target>porovnání a synchronizace složek</target>
<source>Configuration saved</source>
<target>Konfigurace uložena</target>
@@ -1159,6 +1184,9 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
<source>Never save &changes</source>
<target>Nikdy &neukládat změny</target>
+<source>Filter</source>
+<target>Filtr</target>
+
<source>Show files that exist on left side only</source>
<target>Zobrazit soubory existující pouze vlevo</target>
@@ -1204,12 +1232,18 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
<source>Set as default</source>
<target>Nastavit jako výchozí</target>
-<source>Operation aborted</source>
-<target>Operace zrušena</target>
-
<source>All folders are in sync</source>
<target>Všechny složky jsou synchronizovány</target>
+<source>Synchronization Settings</source>
+<target>Nastavení synchronizace</target>
+
+<source>Comparison Settings</source>
+<target>Nastavení porovnání</target>
+
+<source>Cannot find %x</source>
+<target>Nelze najít %x</target>
+
<source>Comma-separated values</source>
<target>Text oddělený čárkami</target>
@@ -1225,7 +1259,7 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
<source>&Ignore</source>
<target>&Pokračovat</target>
-<source>Fatal Error</source>
+<source>Serious Error</source>
<target>Závažná chyba</target>
<source>&Don't show this warning again</source>
@@ -1234,9 +1268,6 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
<source>&Switch</source>
<target>&Přepnout</target>
-<source>Question</source>
-<target>Dotaz</target>
-
<source>&Yes</source>
<target>&Ano</target>
@@ -1258,8 +1289,8 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
<source>Initializing...</source>
<target>Inicializace...</target>
-<source>Aborted</source>
-<target>Přerušeno</target>
+<source>Stopped</source>
+<target>Zastaveno</target>
<source>Completed</source>
<target>Hotovo</target>
@@ -1270,12 +1301,6 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
<source>Log</source>
<target>Záznam zpracování</target>
-<source>Cannot find %x</source>
-<target>Nelze najít %x</target>
-
-<source>Inactive</source>
-<target>Vypnuto</target>
-
<source>Today</source>
<target>Dnes</target>
@@ -1300,9 +1325,6 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
<source>MB</source>
<target>MB</target>
-<source>Filter</source>
-<target>Filtr</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>
@@ -1313,6 +1335,9 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
<pluralform>Opravdu chcete přesunout následujících %x položek do Koše?</pluralform>
</target>
+<source>Move</source>
+<target>Přesunout</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>
@@ -1323,6 +1348,9 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
<pluralform>Opravdu chcete smazat následujících %x položek?</pluralform>
</target>
+<source>Exclude</source>
+<target>Vynechat</target>
+
<source>Direct</source>
<target>Zachovat</target>
@@ -1347,8 +1375,8 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
<source>- Other side's counterpart to %item_folder%</source>
<target>- pouze cesta z opačného panelu pro %item_folder%</target>
-<source>Make hidden warnings and dialogs visible again?</source>
-<target>Povolit opět zobrazování skrytých dialogů a hlášení?</target>
+<source>Restore all hidden windows and warnings?</source>
+<target>Obnovit všechny skryté dialogy a varování?</target>
<source>Leave as unresolved conflict</source>
<target>Ponechat jako nevyřešený konflikt</target>
@@ -1476,14 +1504,14 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
<pluralform>%x dnů</pluralform>
</target>
-<source>Failed to register to receive system messages.</source>
-<target>Nepodařilo se zaregistrovat pro příjem systémových zpráv.</target>
+<source>Unable to register to receive system messages.</source>
+<target>Nepodařilo se zaregistrovat k odběru systémových zpráv.</target>
<source>Cannot set privilege %x.</source>
<target>Nelze nastavit práva pro %x.</target>
-<source>Failed to suspend system sleep mode.</source>
-<target>Nepodařilo se uspat systém</target>
+<source>Unable to suspend system sleep mode.</source>
+<target>Nelze pozastavit Režim spánku.</target>
<source>Cannot change process I/O priorities.</source>
<target>Nelze nastavit priority procesu.</target>
diff --git a/BUILD/Languages/danish.lng b/BUILD/Languages/danish.lng
index a835f88c..423b649c 100644
--- a/BUILD/Languages/danish.lng
+++ b/BUILD/Languages/danish.lng
@@ -2,11 +2,28 @@
<language>Dansk</language>
<translator>Regmos</translator>
<locale>da_DK</locale>
- <flag_image>flag_denmark.png</flag_image>
- <plural_form_count>2</plural_form_count>
+ <image>flag_denmark.png</image>
+ <plural_count>2</plural_count>
<plural_definition>n == 1 ? 0 : 1</plural_definition>
</header>
+<source>
+<pluralform>Do you really want to execute the command %y for one item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+</target>
+
+<source>Retrying operation</source>
+<target></target>
+
+<source>
+<pluralform>Automatic retry in 1 second...</pluralform>
+<pluralform>Automatic retry in %x seconds...</pluralform>
+</source>
+<target>
+</target>
+
<source>Both sides have changed since last synchronization.</source>
<target>Begge sider ændret siden sidste synkronisering.</target>
@@ -292,8 +309,8 @@
<source>/sec</source>
<target>/sek</target>
-<source>%x items</source>
-<target>%x emner</target>
+<source>%x items/sec</source>
+<target>%x emner/sek</target>
<source>Configuration file %x loaded partially only.</source>
<target>Indstillingsfilen %x er kun delvist indlæst.</target>
@@ -322,10 +339,10 @@
<source>Volume name %x is not part of file path %y.</source>
<target>Volumennavnet %x er ikke del af filstien %y.</target>
-<source>Abort requested: Waiting for current operation to finish...</source>
+<source>Stop requested: Waiting for current operation to finish...</source>
<target>Afbrydelse: Venter på aktuel opgave afsluttes...</target>
-<source>Failure to create timestamp for versioning:</source>
+<source>Unable to create timestamp for versioning:</source>
<target>Kunne ikke oprette versioneringstid:</target>
<source>Cannot read the following XML elements:</source>
@@ -343,7 +360,7 @@
<source>&Program</source>
<target>&Filer</target>
-<source>&Content</source>
+<source>&View help</source>
<target>&Åben hjælp</target>
<source>&About</source>
@@ -367,8 +384,8 @@
<source>To get started just import a .ffs_batch file.</source>
<target>Importer en .ffs_batchfil (Filer > Åben...) for at komme igang.</target>
-<source>Folders to watch</source>
-<target>Jobbets mapper</target>
+<source>Folders to watch:</source>
+<target>Jobbets mapper:</target>
<source>Add folder</source>
<target>Tilføj mappe</target>
@@ -382,12 +399,15 @@
<source>Select a folder</source>
<target>Vælg en mappe</target>
-<source>Idle time [seconds]</source>
-<target>Køres når computeren har ledige resourcer i [sek.]</target>
+<source>Idle time (in seconds):</source>
+<target>Efter PC tomgang i (sek)</target>
<source>Idle time between last detected change and execution of command</source>
<target>Tid imellem sidst fundne ændring og udførsel</target>
+<source>Command line:</source>
+<target>Kommando:</target>
+
<source>
The command is triggered if:
- files or subfolders change
@@ -399,8 +419,8 @@ Kommandoen udføres hvis:
- nye mapper findes (f.eks USB nøgle)
</target>
-<source>Start</source>
-<target>Start</target>
+<source>&Start</source>
+<target>&Start</target>
<source>&Retry</source>
<target>&Prøv igen</target>
@@ -408,9 +428,6 @@ Kommandoen udføres hvis:
<source>Cancel</source>
<target>Annuller</target>
-<source>RealtimeSync - Automated Synchronization</source>
-<target>Realtids synk - automatisk synkronisering</target>
-
<source>Build: %x</source>
<target>Udgivet: %x</target>
@@ -420,6 +437,9 @@ Kommandoen udføres hvis:
<source>All files</source>
<target>Alle filer</target>
+<source>Automated Synchronization</source>
+<target>Automatisk synkronisering</target>
+
<source>Directory monitoring active</source>
<target>Mappeovervågning aktiv</target>
@@ -435,7 +455,7 @@ Kommandoen udføres hvis:
<source>&Exit</source>
<target>&Luk</target>
-<source>Invalid command line:</source>
+<source>Incorrect command line:</source>
<target>Ugyldig kommando:</target>
<source>File content</source>
@@ -498,8 +518,8 @@ Kommandoen udføres hvis:
<source>Target folder input field must not be empty.</source>
<target>Destinationsmappen skal angives.</target>
-<source>Folder input field for versioning must not be empty.</source>
-<target>Mappe til versionering skal angives.</target>
+<source>Please enter a target folder for versioning.</source>
+<target>Angiv mappe til versionering.</target>
<source>Source folder %x not found.</source>
<target>Kildemappen %x blev ikke fundet.</target>
@@ -537,7 +557,7 @@ Kommandoen udføres hvis:
<source>job name</source>
<target>Jobnavn</target>
-<source>Synchronization aborted</source>
+<source>Synchronization stopped</source>
<target>Synkronisering afbrudt</target>
<source>Synchronization completed with errors</source>
@@ -555,23 +575,20 @@ Kommandoen udføres hvis:
<source>Saving log file %x...</source>
<target>Gemmer rapport %x...</target>
-<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
-<target>Klik "Skift" for at løse problemerne fra hovedvinduet.</target>
+<source>You can switch to FreeFileSync's main window to resolve this issue.</source>
+<target>Skift til FreeFileSyncs hovedvindue for at løse problemet.</target>
-<source>Switching to FreeFileSync main dialog</source>
+<source>Switching to FreeFileSync's main window</source>
<target>Skifter til hovedvinduet</target>
-<source>Retrying operation after error:</source>
-<target>Prøver igen efter fejl:</target>
-
<source>A new version of FreeFileSync is available:</source>
<target>Opdatering tilgængelig:</target>
<source>Download now?</source>
<target>Download nu?</target>
-<source>New version found</source>
-<target>Opdatering fundet</target>
+<source>Check for Program Updates</source>
+<target>Søg efter opdatering</target>
<source>&Download</source>
<target>&Download</target>
@@ -639,20 +656,20 @@ Kommandoen udføres hvis:
<source>Hibernate</source>
<target>Dvale</target>
-<source>Selected variant:</source>
-<target>Valgt variant:</target>
-
-<source>Select alternate comparison settings</source>
+<source>Alternate comparison settings</source>
<target>Tilpas analyse</target>
-<source>Select alternate synchronization settings</source>
+<source>Alternate synchronization settings</source>
<target>Tilpas synkronisering</target>
-<source>Filter is active</source>
-<target>Aktivt filter</target>
+<source>Local filter</source>
+<target>Lokalt filter</target>
-<source>No filter selected</source>
-<target>Intet filter valgt</target>
+<source>Active</source>
+<target>Aktiv</target>
+
+<source>None</source>
+<target>Ingen</target>
<source>Remove alternate settings</source>
<target>Fjern tilpassede indstillinger</target>
@@ -666,6 +683,15 @@ Kommandoen udføres hvis:
<source>Paste</source>
<target>Indsæt</target>
+<source>Alternate Comparison Settings</source>
+<target>Tilpas analyse</target>
+
+<source>Alternate Synchronization Settings</source>
+<target>Tilpas synkronisering</target>
+
+<source>Local Filter</source>
+<target>Lokalt filter</target>
+
<source>&New</source>
<target>&Ny</target>
@@ -681,15 +707,18 @@ Kommandoen udføres hvis:
<source>2. &Synchronize</source>
<target>2. &Synkroniser</target>
+<source>&Global settings</source>
+<target>&Programindstillinger</target>
+
<source>&Language</source>
<target>&Sprog</target>
+<source>&Find...</source>
+<target>S&øg</target>
+
<source>&Export file list...</source>
<target>&Eksporter filliste...</target>
-<source>&Global settings</source>
-<target>&Programindstillinger</target>
-
<source>&Tools</source>
<target>&Værktøj</target>
@@ -699,20 +728,14 @@ Kommandoen udføres hvis:
<source>Check &automatically once a week</source>
<target>Søg &automatisk en gang om ugen</target>
-<source>Check for new &version</source>
-<target>&Søg efter opdatering</target>
+<source>&Check for new version</source>
+<target>Søg &efter opdatering</target>
<source>Compare</source>
-<target>Analyser</target>
-
-<source>Comparison settings</source>
-<target>Analyseindstillinger</target>
-
-<source>Synchronization settings</source>
-<target>Synkroniseringsindstillinger</target>
+<target>Analysér</target>
<source>Synchronize</source>
-<target>Synkroniser</target>
+<target>Synkronisér</target>
<source>Add folder pair</source>
<target>Tilføj mappepar</target>
@@ -723,6 +746,15 @@ Kommandoen udføres hvis:
<source>Swap sides</source>
<target>Byt side</target>
+<source>Close search bar</source>
+<target>Luk søgelinie</target>
+
+<source>Find:</source>
+<target>Søg:</target>
+
+<source>Match case</source>
+<target>Versalfølsom (a/A)</target>
+
<source>Save as batch job</source>
<target>Gem som batchfil</target>
@@ -744,74 +776,20 @@ Kommandoen udføres hvis:
<source>Total bytes to copy</source>
<target>Antal bytes der kopieres</target>
-<source>Items found:</source>
-<target>Emner fundet:</target>
-
-<source>Speed:</source>
-<target>Hastighed:</target>
-
-<source>Time remaining:</source>
-<target>Resterende tid:</target>
-
-<source>Time elapsed:</source>
-<target>Brugt tid:</target>
-
-<source>Synchronizing...</source>
-<target>Synkroniserer...</target>
-
-<source>Minimize to notification area</source>
-<target>Minimér til uret</target>
-
-<source>On completion</source>
-<target>Ved gennemført</target>
-
-<source>Close</source>
-<target>Luk</target>
-
-<source>&Pause</source>
-<target>&Pause</target>
-
-<source>Variant</source>
-<target>Jobtype</target>
+<source>Select a variant:</source>
+<target>Vælg metode:</target>
-<source>Statistics</source>
-<target>Statistik</target>
+<source>Identify equal files by comparing modification time and size.</source>
+<target>Genkend ens filer efter filtid og størrelse.</target>
-<source>&Don't show this dialog again</source>
-<target>&Vis ikke igen</target>
+<source>Identify equal files by comparing the file content.</source>
+<target>Genkend ens filer efter indhold.</target>
-<source>Select a variant</source>
-<target>Vælg metode</target>
+<source>Symbolic links:</source>
+<target>Symbolske link:</target>
-<source>
-Files are found equal if
- - last write time and date
- - file size
-are the same
-</source>
-<target>
-Filer betragtes som ens hvis
- - senest ændret
- - filstørrelse
-er identisk
-</target>
-
-<source>
-Files are found equal if
- - file content
-is the same
-</source>
-<target>
-Filer betragtes som ens hvis
- - filindhold
-er identisk
-</target>
-
-<source>Symbolic Link handling</source>
-<target>Symlink håndtering</target>
-
-<source>Help</source>
-<target>Hjælp</target>
+<source>More information</source>
+<target>Mere information</target>
<source>OK</source>
<target>OK</target>
@@ -819,10 +797,10 @@ er identisk
<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
<target>Find og udbred ændringer på begge sider. Sletninger, omdøbninger og konflikter findes automatisk i en database.</target>
-<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
+<source>Create a mirror backup of the left folder which exactly matches the right folder after synchronization.</source>
<target>Spejl venstre mappe. Efter synkronisering er højre mappe en kopi af venstre.</target>
-<source>Copy new or updated files to right folder.</source>
+<source>Copy new and updated files to the right folder.</source>
<target>Kopier nye og opdaterede filer til højre mappe.</target>
<source>Configure your own synchronization rules.</source>
@@ -834,23 +812,8 @@ er identisk
<source>Requires database files. Not supported by all file systems.</source>
<target>Kræver databasefiler. Ikke understøttet i alle filsystemer</target>
-<source>Error handling</source>
-<target>Fejlhåndtering</target>
-
-<source>Ignore</source>
-<target>Ignorer</target>
-
-<source>Hide all error and warning messages</source>
-<target>Skjul fejlbeskeder og advarsler</target>
-
-<source>Pop-up</source>
-<target>Besked</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Vis fejlbeskeder og advarsler</target>
-
-<source>Deletion handling</source>
-<target>Sletning</target>
+<source>Delete files:</source>
+<target>Filsletning:</target>
<source>Permanent</source>
<target>Permanent</target>
@@ -873,56 +836,89 @@ er identisk
<source>Naming convention:</source>
<target>Navneregler:</target>
-<source>Batch job</source>
-<target>Batchfil</target>
+<source>Show examples</source>
+<target>Vis eksempler</target>
-<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
-<target>Opret batchfil til automatisk synkronisering. Start ved at dobbeltklikke på filen eller planlæg via opgavestyring: %x</target>
+<source>Handle errors:</source>
+<target>Fejlhåndtering:</target>
-<source>Exit</source>
-<target>Luk</target>
+<source>Ignore</source>
+<target>Ignorer</target>
-<source>Abort synchronization on first error</source>
-<target>Stop synkronisering ved første fejl</target>
+<source>Hide all error and warning messages</source>
+<target>Skjul fejlbeskeder og advarsler</target>
-<source>Show progress dialog</source>
-<target>Vis fremskridt</target>
+<source>Pop-up</source>
+<target>Besked</target>
-<source>Save log</source>
-<target>Gem rapport</target>
+<source>Show pop-up on errors or warnings</source>
+<target>Vis fejlbeskeder og advarsler</target>
-<source>Select folder to save log files</source>
-<target>Vælg mappe til rapporter</target>
+<source>On completion:</source>
+<target>Ved gennemført:</target>
-<source>Limit</source>
-<target>Antal</target>
+<source>Start synchronization now?</source>
+<target>Synkroniser nu?</target>
-<source>Limit maximum number of log files</source>
-<target>Begræns antal rapporter</target>
+<source>Variant:</source>
+<target>Jobtype:</target>
-<source>Source code written in C++ using:</source>
-<target>Kildekoden er skrevet i C++ med hjælp fra:</target>
+<source>Statistics</source>
+<target>Statistik</target>
-<source>If you like FreeFileSync</source>
-<target>Er du glad for FreeFileSync</target>
+<source>&Don't show this dialog again</source>
+<target>&Vis ikke igen</target>
-<source>Donate with PayPal</source>
-<target>Donér med PayPal</target>
+<source>Items found:</source>
+<target>Emner fundet:</target>
-<source>Many thanks for localization:</source>
-<target>Tak for oversættelse:</target>
+<source>Speed:</source>
+<target>Hastighed:</target>
-<source>Feedback and suggestions are welcome</source>
-<target>Kritik og forslag er meget velkomne</target>
+<source>Time remaining:</source>
+<target>Resterende tid:</target>
-<source>Homepage</source>
-<target>Hjemmeside</target>
+<source>Time elapsed:</source>
+<target>Brugt tid:</target>
-<source>Email</source>
-<target>Email</target>
+<source>Synchronizing...</source>
+<target>Synkroniserer...</target>
-<source>Published under the GNU General Public License</source>
-<target>Udgivet under GNU General Public Licence</target>
+<source>Minimize to notification area</source>
+<target>Minimér til uret</target>
+
+<source>Close</source>
+<target>Luk</target>
+
+<source>&Pause</source>
+<target>&Pause</target>
+
+<source>Stop</source>
+<target>Stop</target>
+
+<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>Opret batchfil til automatisk synkronisering. Start ved at dobbeltklikke på filen eller planlæg via opgavestyring: %x</target>
+
+<source>Stop synchronization at first error</source>
+<target>Stop synkronisering ved første fejl</target>
+
+<source>Show progress dialog</source>
+<target>Vis fremskridt</target>
+
+<source>Save log:</source>
+<target>Gem log:</target>
+
+<source>Limit:</source>
+<target>Højst:</target>
+
+<source>Limit maximum number of log files</source>
+<target>Begræns antal rapporter</target>
+
+<source>How can I schedule a batch job?</source>
+<target>Hvordan oprettes en batchfil?</target>
+
+<source>&Recycle bin</source>
+<target>&Papirkurv</target>
<source>Delete on both sides</source>
<target>Slet på begge sider</target>
@@ -930,109 +926,136 @@ er identisk
<source>Delete on both sides even if the file is selected on one side only</source>
<target>Slet på begge sider selvom selvom filen kun er valgt på en side</target>
-<source>
-Files will only be synchronized if they pass all filter rules.
-Note: File paths must be relative to base directories.
-</source>
-<target>
-Filer synkroniseres kun hvis de opfyldet alle filterregler.
-Bemærk: Filstier skal relatere til kildemappen.
-</target>
+<source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source>
+<target>Angiv filterregler til ekskludering af bestemte filer fra synkroniseringen. Filstier skal relatere til kildemapperne.</target>
-<source>Include</source>
-<target>Inkluder</target>
+<source>Include:</source>
+<target>Inkludér:</target>
-<source>Exclude</source>
-<target>Ekskluder</target>
+<source>Exclude:</source>
+<target>Ekskludér:</target>
-<source>Time span</source>
-<target>Tidsinterval</target>
+<source>Time span:</source>
+<target>Interval:</target>
-<source>File size</source>
-<target>Filstørrelse</target>
+<source>File size:</source>
+<target>Filstørrelse:</target>
-<source>Minimum</source>
-<target>Minimum</target>
+<source>Minimum:</source>
+<target>Minimum:</target>
-<source>Maximum</source>
-<target>Maksimum</target>
+<source>Maximum:</source>
+<target>Maksimum:</target>
<source>&Clear</source>
<target>&Ryd</target>
-<source>Global settings</source>
-<target>Programindstillinger</target>
+<source>The following settings are used for all synchronization jobs.</source>
+<target>Disse indstillinger gælder alle synkroniseringer.</target>
<source>Fail-safe file copy</source>
<target>Sikker filkopiering</target>
-<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
-<target>Kopiér til midlertidig fil (*.ffs_tmp) før omdøbning. Sikrer processen ved alvorlige fejl.</target>
+<source>
+Copy to a temporary file (*.ffs_tmp) before overwriting target.
+This guarantees a consistent state even in case of a serious error.
+</source>
+<target>Kopiér til midlertidig fil (*.ffs_tmp) før overskrivning. Sikrer processen ved alvorlige fejl.</target>
+
+<source>(recommended)</source>
+<target>(anbefalet)</target>
<source>Copy locked files</source>
<target>Kopier låste filer</target>
-<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
-<target>Kopiér delte eller låste filer med VSS kopiering (administrator)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service.</source>
+<target>Kopiér delte eller låste filer med VSS kopiering.</target>
+
+<source>(requires administrator rights)</source>
+<target>(administrator)</target>
<source>Copy file access permissions</source>
<target>Kopier adgangstilladelser</target>
-<source>Transfer file and folder permissions (requires administrator rights)</source>
-<target>Overfør fil og mappetilladelser (administrator)</target>
+<source>Transfer file and folder permissions.</source>
+<target>Overfør fil og mappetilladelser.</target>
+
+<source>Automatic retry on error:</source>
+<target>Antal forsøg ved fejl:</target>
-<source>Restore hidden dialogs</source>
-<target>Gendan skjulte dialoger</target>
+<source>Retry count:</source>
+<target>Antal forsøg:</target>
-<source>External applications</source>
-<target>Eksterne programmer</target>
+<source>Delay (in seconds):</source>
+<target>Forsinkelse (sek):</target>
+
+<source>Customize context menu:</source>
+<target>Tilpas kontekstmenu:</target>
<source>Description</source>
<target>Beskrivelse</target>
+<source>Restore hidden windows</source>
+<target>Gendan skjulte vinduer</target>
+
<source>&Default</source>
<target>S&tandard</target>
-<source>Find what:</source>
-<target>Søg efter:</target>
+<source>Source code written in C++ using:</source>
+<target>Kildekoden er skrevet i C++ med hjælp fra:</target>
+
+<source>If you like FreeFileSync</source>
+<target>Er du glad for FreeFileSync</target>
-<source>Match case</source>
-<target>Versalfølsom (a/A)</target>
+<source>Donate with PayPal</source>
+<target>Donér med PayPal</target>
-<source>&Find next</source>
-<target>&Find næste</target>
+<source>Feedback and suggestions are welcome</source>
+<target>Kritik og forslag er meget velkomne</target>
-<source>Start synchronization</source>
-<target>Start synkronisering</target>
+<source>Homepage</source>
+<target>Hjemmeside</target>
-<source>Delete</source>
-<target>Slet</target>
+<source>Email</source>
+<target>Email</target>
-<source>Configure filter</source>
-<target>Indstil filter</target>
+<source>Published under the GNU General Public License</source>
+<target>Udgivet under GNU General Public Licence</target>
-<source>Find</source>
-<target>Søg</target>
+<source>Many thanks for localization:</source>
+<target>Tak for oversættelse:</target>
+
+<source>Save as Batch Job</source>
+<target>Gem som batchfil</target>
-<source>Select time span</source>
+<source>Delete Items</source>
+<target>Slet emner</target>
+
+<source>Global Settings</source>
+<target>Programindstillinger</target>
+
+<source>Select Time Span</source>
<target>Vælg tidsinterval</target>
-<source>Folder pairs</source>
+<source>Folder Pairs</source>
<target>Mappepar</target>
+<source>Find</source>
+<target>Søg</target>
+
<source>Overview</source>
<target>Oversigt</target>
<source>Configuration</source>
<target>Indstilling</target>
-<source>Main bar</source>
+<source>Main Bar</source>
<target>Hovedlinie</target>
-<source>Filter files</source>
+<source>Filter Files</source>
<target>Filtrer filer</target>
-<source>Select view</source>
+<source>Select View</source>
<target>Tilpas visning</target>
<source>Open...</source>
@@ -1044,14 +1067,14 @@ Bemærk: Filstier skal relatere til kildemappen.
<source>Compare both sides</source>
<target>Analyser begge sider</target>
-<source>
-<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
-<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
-</source>
-<target>
-<pluralform>Vil du køre kommandoen %y for 1 emne?</pluralform>
-<pluralform>Vil du køre kommandoen %y for %x emner?</pluralform>
-</target>
+<source>Comparison settings</source>
+<target>Analyseindstillinger</target>
+
+<source>Synchronization settings</source>
+<target>Synkroniseringsindstillinger</target>
+
+<source>Start synchronization</source>
+<target>Start synkronisering</target>
<source>Confirm</source>
<target>Bekræft</target>
@@ -1089,12 +1112,6 @@ Bemærk: Filstier skal relatere til kildemappen.
<source>Set direction:</source>
<target>Retning:</target>
-<source>Exclude temporarily</source>
-<target>Ekskluder midlertidigt</target>
-
-<source>Include temporarily</source>
-<target>Inkluder midlertidigt</target>
-
<source>multiple selection</source>
<target>vælg flere</target>
@@ -1104,6 +1121,15 @@ Bemærk: Filstier skal relatere til kildemappen.
<source>Exclude via filter:</source>
<target>Ekskluder m. filter:</target>
+<source>Exclude temporarily</source>
+<target>Ekskluder midlertidigt</target>
+
+<source>Include temporarily</source>
+<target>Inkluder midlertidigt</target>
+
+<source>Delete</source>
+<target>Slet</target>
+
<source>Include all</source>
<target>Vælg alle</target>
@@ -1152,6 +1178,9 @@ Bemærk: Filstier skal relatere til kildemappen.
<source>Never save &changes</source>
<target>Gem &aldrig ændringer</target>
+<source>Filter</source>
+<target>Filter</target>
+
<source>Show files that exist on left side only</source>
<target>Vis filer der kun findes på venstre side</target>
@@ -1197,12 +1226,18 @@ Bemærk: Filstier skal relatere til kildemappen.
<source>Set as default</source>
<target>Sæt som standard</target>
-<source>Operation aborted</source>
-<target>Handling afbrudt</target>
-
<source>All folders are in sync</source>
<target>Alle mapper er synkrone</target>
+<source>Synchronization Settings</source>
+<target>Synkroniseringsindstillinger</target>
+
+<source>Comparison Settings</source>
+<target>Analyseindstillinger</target>
+
+<source>Cannot find %x</source>
+<target>Kan ikke finde %x</target>
+
<source>Comma-separated values</source>
<target>Kommaopdelte værdier</target>
@@ -1218,8 +1253,8 @@ Bemærk: Filstier skal relatere til kildemappen.
<source>&Ignore</source>
<target>&Ignorer</target>
-<source>Fatal Error</source>
-<target>Fatal fejl</target>
+<source>Serious Error</source>
+<target>Kritisk fejl</target>
<source>&Don't show this warning again</source>
<target>&Vis ikke igen</target>
@@ -1227,9 +1262,6 @@ Bemærk: Filstier skal relatere til kildemappen.
<source>&Switch</source>
<target>&Skift</target>
-<source>Question</source>
-<target>Spørgsmål</target>
-
<source>&Yes</source>
<target>&Ja</target>
@@ -1251,7 +1283,7 @@ Bemærk: Filstier skal relatere til kildemappen.
<source>Initializing...</source>
<target>Forbereder...</target>
-<source>Aborted</source>
+<source>Stopped</source>
<target>Afbrudt</target>
<source>Completed</source>
@@ -1263,12 +1295,6 @@ Bemærk: Filstier skal relatere til kildemappen.
<source>Log</source>
<target>Log</target>
-<source>Cannot find %x</source>
-<target>Kan ikke finde %x</target>
-
-<source>Inactive</source>
-<target>Inaktiv</target>
-
<source>Today</source>
<target>Idag</target>
@@ -1293,9 +1319,6 @@ Bemærk: Filstier skal relatere til kildemappen.
<source>MB</source>
<target>MB</target>
-<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>
@@ -1305,6 +1328,9 @@ Bemærk: Filstier skal relatere til kildemappen.
<pluralform>Vil du flytte følgende %x emner til papirkurven?</pluralform>
</target>
+<source>Move</source>
+<target>Flyt</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>
@@ -1314,6 +1340,9 @@ Bemærk: Filstier skal relatere til kildemappen.
<pluralform>Vil du slette følgende %x emner?</pluralform>
</target>
+<source>Exclude</source>
+<target>Ekskludér</target>
+
<source>Direct</source>
<target>Direkte</target>
@@ -1338,8 +1367,8 @@ Bemærk: Filstier skal relatere til kildemappen.
<source>- Other side's counterpart to %item_folder%</source>
<target>Modsat sides pendant til %item_folder%</target>
-<source>Make hidden warnings and dialogs visible again?</source>
-<target>Vis skjulte advarsler og dialoger igen?</target>
+<source>Restore all hidden windows and warnings?</source>
+<target>Gendan skjulte vinduer og advarsler?</target>
<source>Leave as unresolved conflict</source>
<target>Efterlad som uløst konflikt</target>
@@ -1464,14 +1493,14 @@ Bemærk: Filstier skal relatere til kildemappen.
<pluralform>%x dage</pluralform>
</target>
-<source>Failed to register to receive system messages.</source>
-<target>Kunne ikke registrere modtagelse af systembeskeder</target>
+<source>Unable to register to receive system messages.</source>
+<target>Kunne ikke registrere modtagelse af systembeskeder.</target>
<source>Cannot set privilege %x.</source>
<target>Kan ikke sætte %x privilegier.</target>
-<source>Failed to suspend system sleep mode.</source>
-<target>Kunne ikke suspendere systemets standby funktion.</target>
+<source>Unable to suspend system sleep mode.</source>
+<target>Kunne ikke ophæve standby.</target>
<source>Cannot change process I/O priorities.</source>
<target>Kan ikke ændre I/O prioriteter.</target>
diff --git a/BUILD/Languages/dutch.lng b/BUILD/Languages/dutch.lng
index dca4af40..cb0656b5 100644
--- a/BUILD/Languages/dutch.lng
+++ b/BUILD/Languages/dutch.lng
@@ -2,11 +2,271 @@
<language>Nederlands</language>
<translator>Edwin Dierssen</translator>
<locale>nl_NL</locale>
- <flag_image>flag_holland.png</flag_image>
- <plural_form_count>2</plural_form_count>
+ <image>flag_holland.png</image>
+ <plural_count>2</plural_count>
<plural_definition>n == 1 ? 0 : 1</plural_definition>
</header>
+<source>Unable to suspend system sleep mode.</source>
+<target></target>
+
+<source>Unable to register to receive system messages.</source>
+<target></target>
+
+<source>Restore all hidden windows and warnings?</source>
+<target></target>
+
+<source>Move</source>
+<target></target>
+
+<source>Stopped</source>
+<target></target>
+
+<source>Serious Error</source>
+<target></target>
+
+<source>Comparison Settings</source>
+<target></target>
+
+<source>Synchronization Settings</source>
+<target></target>
+
+<source>
+<pluralform>Do you really want to execute the command %y for one item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+</target>
+
+<source>Select View</source>
+<target></target>
+
+<source>Filter Files</source>
+<target></target>
+
+<source>Main Bar</source>
+<target></target>
+
+<source>Folder Pairs</source>
+<target></target>
+
+<source>Select Time Span</source>
+<target></target>
+
+<source>Global Settings</source>
+<target></target>
+
+<source>Delete Items</source>
+<target></target>
+
+<source>Save as Batch Job</source>
+<target></target>
+
+<source>Restore hidden windows</source>
+<target></target>
+
+<source>Customize context menu:</source>
+<target></target>
+
+<source>Delay (in seconds):</source>
+<target></target>
+
+<source>Retry count:</source>
+<target></target>
+
+<source>Automatic retry on error:</source>
+<target></target>
+
+<source>Transfer file and folder permissions.</source>
+<target></target>
+
+<source>(requires administrator rights)</source>
+<target></target>
+
+<source>Copy shared or locked files using the Volume Shadow Copy Service.</source>
+<target></target>
+
+<source>(recommended)</source>
+<target></target>
+
+<source>
+Copy to a temporary file (*.ffs_tmp) before overwriting target.
+This guarantees a consistent state even in case of a serious error.
+</source>
+<target></target>
+
+<source>The following settings are used for all synchronization jobs.</source>
+<target></target>
+
+<source>Maximum:</source>
+<target></target>
+
+<source>Minimum:</source>
+<target></target>
+
+<source>File size:</source>
+<target></target>
+
+<source>Time span:</source>
+<target></target>
+
+<source>Exclude:</source>
+<target></target>
+
+<source>Include:</source>
+<target></target>
+
+<source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source>
+<target></target>
+
+<source>&Recycle bin</source>
+<target></target>
+
+<source>How can I schedule a batch job?</source>
+<target></target>
+
+<source>Limit:</source>
+<target></target>
+
+<source>Save log:</source>
+<target></target>
+
+<source>Stop synchronization at first error</source>
+<target></target>
+
+<source>Stop</source>
+<target></target>
+
+<source>Variant:</source>
+<target></target>
+
+<source>Start synchronization now?</source>
+<target></target>
+
+<source>On completion:</source>
+<target></target>
+
+<source>Handle errors:</source>
+<target></target>
+
+<source>Show examples</source>
+<target></target>
+
+<source>Delete files:</source>
+<target></target>
+
+<source>Copy new and updated files to the right folder.</source>
+<target></target>
+
+<source>Create a mirror backup of the left folder which exactly matches the right folder after synchronization.</source>
+<target></target>
+
+<source>More information</source>
+<target></target>
+
+<source>Symbolic links:</source>
+<target></target>
+
+<source>Identify equal files by comparing the file content.</source>
+<target></target>
+
+<source>Identify equal files by comparing modification time and size.</source>
+<target></target>
+
+<source>Select a variant:</source>
+<target></target>
+
+<source>Find:</source>
+<target></target>
+
+<source>Close search bar</source>
+<target></target>
+
+<source>&Check for new version</source>
+<target></target>
+
+<source>&Find...</source>
+<target></target>
+
+<source>Local Filter</source>
+<target></target>
+
+<source>Alternate Synchronization Settings</source>
+<target></target>
+
+<source>Alternate Comparison Settings</source>
+<target></target>
+
+<source>None</source>
+<target></target>
+
+<source>Active</source>
+<target></target>
+
+<source>Local filter</source>
+<target></target>
+
+<source>Alternate synchronization settings</source>
+<target></target>
+
+<source>Alternate comparison settings</source>
+<target></target>
+
+<source>Check for Program Updates</source>
+<target></target>
+
+<source>Retrying operation</source>
+<target></target>
+
+<source>
+<pluralform>Automatic retry in 1 second...</pluralform>
+<pluralform>Automatic retry in %x seconds...</pluralform>
+</source>
+<target>
+</target>
+
+<source>Switching to FreeFileSync's main window</source>
+<target></target>
+
+<source>You can switch to FreeFileSync's main window to resolve this issue.</source>
+<target></target>
+
+<source>Synchronization stopped</source>
+<target></target>
+
+<source>Please enter a target folder for versioning.</source>
+<target></target>
+
+<source>Incorrect command line:</source>
+<target></target>
+
+<source>Automated Synchronization</source>
+<target></target>
+
+<source>&Start</source>
+<target></target>
+
+<source>Command line:</source>
+<target></target>
+
+<source>Idle time (in seconds):</source>
+<target></target>
+
+<source>Folders to watch:</source>
+<target></target>
+
+<source>&View help</source>
+<target></target>
+
+<source>Unable to create timestamp for versioning:</source>
+<target></target>
+
+<source>Stop requested: Waiting for current operation to finish...</source>
+<target></target>
+
+<source>%x items/sec</source>
+<target></target>
+
<source>Both sides have changed since last synchronization.</source>
<target>Beide zijdes zijn veranderd sinds de laatste synchronisatie.</target>
@@ -292,9 +552,6 @@
<source>/sec</source>
<target>/sec</target>
-<source>%x items</source>
-<target>%x items</target>
-
<source>Configuration file %x loaded partially only.</source>
<target>Configuratiebestand %x alleen deels geladen.</target>
@@ -322,12 +579,6 @@
<source>Volume name %x is not part of file path %y.</source>
<target>Schijfnaam %x is geen deel van bestandspad %y.</target>
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Bezig met afbreken: Wacht op beëindiging huidige bewerking...</target>
-
-<source>Failure to create timestamp for versioning:</source>
-<target>Het creëren van een tijdsstempen voor versiebeheer is mislukt:</target>
-
<source>Cannot read the following XML elements:</source>
<target>Kan de volgende XML elementen niet lezen:</target>
@@ -343,9 +594,6 @@
<source>&Program</source>
<target>&Programma</target>
-<source>&Content</source>
-<target>&Inhoud</target>
-
<source>&About</source>
<target>&Over</target>
@@ -367,9 +615,6 @@
<source>To get started just import a .ffs_batch file.</source>
<target>Importeer een .ffs_batch bestand om te beginnen.</target>
-<source>Folders to watch</source>
-<target>Mappen om te bekijken</target>
-
<source>Add folder</source>
<target>Map toevoegen</target>
@@ -382,9 +627,6 @@
<source>Select a folder</source>
<target>Selecteer een map</target>
-<source>Idle time [seconds]</source>
-<target>Inactiviteit [seconden]</target>
-
<source>Idle time between last detected change and execution of command</source>
<target>Tijd tussen de laatste gedetecteerde verandering en de uitvoering van het commando</target>
@@ -399,18 +641,12 @@ De opdracht word geactiveerd als:
- nieuwe folders worden gevonden (bijvoorbeeld bij invoeging van USB stick)
</target>
-<source>Start</source>
-<target>Start</target>
-
<source>&Retry</source>
<target>&Opnieuw proberen</target>
<source>Cancel</source>
<target>Annuleren</target>
-<source>RealtimeSync - Automated Synchronization</source>
-<target>RealtimeSync - Geautomatiseerde Synchronisatie</target>
-
<source>Build: %x</source>
<target>Build: %x</target>
@@ -435,9 +671,6 @@ De opdracht word geactiveerd als:
<source>&Exit</source>
<target>&Afsluiten</target>
-<source>Invalid command line:</source>
-<target>Ongeldige opdrachtregel:</target>
-
<source>File content</source>
<target>Bestandsinhoud</target>
@@ -498,9 +731,6 @@ De opdracht word geactiveerd als:
<source>Target folder input field must not be empty.</source>
<target>Doelmap mag niet leeg zijn.</target>
-<source>Folder input field for versioning must not be empty.</source>
-<target>Bronmap voor versiebeheer mag niet leeg zijn.</target>
-
<source>Source folder %x not found.</source>
<target>Bronmap %x niet gevonden.</target>
@@ -537,9 +767,6 @@ De opdracht word geactiveerd als:
<source>job name</source>
<target>taaknaam</target>
-<source>Synchronization aborted</source>
-<target>Synchronisatie afgebroken</target>
-
<source>Synchronization completed with errors</source>
<target>Synchronisatie is met fouten afgerond</target>
@@ -555,24 +782,12 @@ De opdracht word geactiveerd als:
<source>Saving log file %x...</source>
<target>Opslaan van logbestand %x...</target>
-<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
-<target>Druk op "Omschakelen" om problemen op te lossen in het hoofdscherm van FreeFileSync.</target>
-
-<source>Switching to FreeFileSync main dialog</source>
-<target>Wisselen naar FreeFileSync hoofdscherm</target>
-
-<source>Retrying operation after error:</source>
-<target>Bewerking opnieuw proberen na fout:</target>
-
<source>A new version of FreeFileSync is available:</source>
<target>Er is een nieuwe versie van FreeFileSync beschikbaar:</target>
<source>Download now?</source>
<target>Nu downloaden?</target>
-<source>New version found</source>
-<target>Nieuwe versie gevonden</target>
-
<source>&Download</source>
<target>&Download</target>
@@ -639,21 +854,6 @@ De opdracht word geactiveerd als:
<source>Hibernate</source>
<target>Slaapstand</target>
-<source>Selected variant:</source>
-<target>Selecter variant:</target>
-
-<source>Select alternate comparison settings</source>
-<target>Selecteer alternatieve vergelijkingsinstellingen</target>
-
-<source>Select alternate synchronization settings</source>
-<target>Selecteer alternatieve synchronisatieinstellingen</target>
-
-<source>Filter is active</source>
-<target>Filter is actief</target>
-
-<source>No filter selected</source>
-<target>Geen filter geselecteerd</target>
-
<source>Remove alternate settings</source>
<target>Verwijder alternatieve instellingen</target>
@@ -681,15 +881,15 @@ De opdracht word geactiveerd als:
<source>2. &Synchronize</source>
<target>2. &Synchroniseer</target>
+<source>&Global settings</source>
+<target>&Algemene instellingen</target>
+
<source>&Language</source>
<target>&Taal</target>
<source>&Export file list...</source>
<target>&Exporteer bestandslijst...</target>
-<source>&Global settings</source>
-<target>&Algemene instellingen</target>
-
<source>&Tools</source>
<target>&Gereedschap</target>
@@ -699,18 +899,9 @@ De opdracht word geactiveerd als:
<source>Check &automatically once a week</source>
<target>Controleer &automatisch eens per week</target>
-<source>Check for new &version</source>
-<target>Kijk voor een nieuwe &versie</target>
-
<source>Compare</source>
<target>Vergelijk</target>
-<source>Comparison settings</source>
-<target>Vergelijksinstellingen</target>
-
-<source>Synchronization settings</source>
-<target>Synchronisatieinstellingen</target>
-
<source>Synchronize</source>
<target>Synchroniseer</target>
@@ -723,6 +914,9 @@ De opdracht word geactiveerd als:
<source>Swap sides</source>
<target>Wissel zijdes</target>
+<source>Match case</source>
+<target>Hoofdlettergevoelig</target>
+
<source>Save as batch job</source>
<target>Opslaan als batch opdracht</target>
@@ -744,87 +938,12 @@ De opdracht word geactiveerd als:
<source>Total bytes to copy</source>
<target>Aantal bytes om te kopiëren</target>
-<source>Items found:</source>
-<target>Onderdelen gevonden:</target>
-
-<source>Speed:</source>
-<target>Snelheid:</target>
-
-<source>Time remaining:</source>
-<target>Resterende tijd:</target>
-
-<source>Time elapsed:</source>
-<target>Verstreken tijd:</target>
-
-<source>Synchronizing...</source>
-<target>Synchroniseert...</target>
-
-<source>Minimize to notification area</source>
-<target>Minimaliseer naar systeemvak</target>
-
-<source>On completion</source>
-<target>Na voltooiing</target>
-
-<source>Close</source>
-<target>Sluiten</target>
-
-<source>&Pause</source>
-<target>&Pauze</target>
-
-<source>Variant</source>
-<target>Variant</target>
-
-<source>Statistics</source>
-<target>Statistieken</target>
-
-<source>&Don't show this dialog again</source>
-<target>Laat deze dialoog &niet meer zien</target>
-
-<source>Select a variant</source>
-<target>Selecteer een variant</target>
-
-<source>
-Files are found equal if
- - last write time and date
- - file size
-are the same
-</source>
-<target>
-Bestanden worden als gelijk bevonden indien
- - de laatste schrijf tijd en datum
- - de bestandsgrootte
-gelijk zijn
-</target>
-
-<source>
-Files are found equal if
- - file content
-is the same
-</source>
-<target>
-Bestanden worden als gelijk beschouwd indien
- - de bestandsinhoud
-overeenkomt
-</target>
-
-<source>Symbolic Link handling</source>
-<target>Afhandeling van snelkoppelingen</target>
-
-<source>Help</source>
-<target>Help</target>
-
<source>OK</source>
<target>OK</target>
<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
<target>Identificeer en pas veranderingen toe aan beide kanten. Verwijderingen, verplaatsingen en conflicten worden automatisch gevonden met behulp van een database.</target>
-<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
-<target>Spiegel backup van linker map. Rechter map is na synchronisatie een exacte kopie van de linker map.</target>
-
-<source>Copy new or updated files to right folder.</source>
-<target>Kopiëer nieuwe of geupdate bestanden naar de rechter map.</target>
-
<source>Configure your own synchronization rules.</source>
<target>Configureer uw eigen synchronisatieregels.</target>
@@ -834,24 +953,6 @@ overeenkomt
<source>Requires database files. Not supported by all file systems.</source>
<target>Heeft database bestanden nodig. Wordt niet ondersteund door alle bestandssystemen</target>
-<source>Error handling</source>
-<target>Fout afhandeling</target>
-
-<source>Ignore</source>
-<target>Negeer</target>
-
-<source>Hide all error and warning messages</source>
-<target>Verberg alle fout- en waarschuwingsberichten</target>
-
-<source>Pop-up</source>
-<target>Pop-up</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Laat pop-up zien bij foutmeldingen of waarschuwingen</target>
-
-<source>Deletion handling</source>
-<target>Verwijder-afhandeling</target>
-
<source>Permanent</source>
<target>Permanent</target>
@@ -873,56 +974,56 @@ overeenkomt
<source>Naming convention:</source>
<target>Naamgevingsconventie</target>
-<source>Batch job</source>
-<target>Taaklijst</target>
+<source>Ignore</source>
+<target>Negeer</target>
-<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
-<target>Maak een batchbestand voor onbeheerde synchronisatie. Om te starten dubbelklikt u dit bestand of rooster in een taakplanner: %x</target>
+<source>Hide all error and warning messages</source>
+<target>Verberg alle fout- en waarschuwingsberichten</target>
-<source>Exit</source>
-<target>Sluiten</target>
+<source>Pop-up</source>
+<target>Pop-up</target>
-<source>Abort synchronization on first error</source>
-<target>Synchronisatie stoppen bij eerste foutmelding</target>
+<source>Show pop-up on errors or warnings</source>
+<target>Laat pop-up zien bij foutmeldingen of waarschuwingen</target>
-<source>Show progress dialog</source>
-<target>Toon voortgangsdialoogvenster</target>
+<source>Statistics</source>
+<target>Statistieken</target>
-<source>Save log</source>
-<target>Logbestand opslaan</target>
+<source>&Don't show this dialog again</source>
+<target>Laat deze dialoog &niet meer zien</target>
-<source>Select folder to save log files</source>
-<target>Selecteer map om log bestanden op te slaan</target>
+<source>Items found:</source>
+<target>Onderdelen gevonden:</target>
-<source>Limit</source>
-<target>Limiet</target>
+<source>Speed:</source>
+<target>Snelheid:</target>
-<source>Limit maximum number of log files</source>
-<target>Limiteer maximaal aantal log bestanden</target>
+<source>Time remaining:</source>
+<target>Resterende tijd:</target>
-<source>Source code written in C++ using:</source>
-<target>Broncode geschreven in C++ met behulp van:</target>
+<source>Time elapsed:</source>
+<target>Verstreken tijd:</target>
-<source>If you like FreeFileSync</source>
-<target>Indien FreeFileSync u bevalt</target>
+<source>Synchronizing...</source>
+<target>Synchroniseert...</target>
-<source>Donate with PayPal</source>
-<target>Doneer met PayPal</target>
+<source>Minimize to notification area</source>
+<target>Minimaliseer naar systeemvak</target>
-<source>Many thanks for localization:</source>
-<target>Veel dank voor de vertalingen:</target>
+<source>Close</source>
+<target>Sluiten</target>
-<source>Feedback and suggestions are welcome</source>
-<target>Feedback en suggesties zijn welkom</target>
+<source>&Pause</source>
+<target>&Pauze</target>
-<source>Homepage</source>
-<target>Homepage</target>
+<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>Maak een batchbestand voor onbeheerde synchronisatie. Om te starten dubbelklikt u dit bestand of rooster in een taakplanner: %x</target>
-<source>Email</source>
-<target>E-mail</target>
+<source>Show progress dialog</source>
+<target>Toon voortgangsdialoogvenster</target>
-<source>Published under the GNU General Public License</source>
-<target>Gepubliceerd onder de GNU General Public License</target>
+<source>Limit maximum number of log files</source>
+<target>Limiteer maximaal aantal log bestanden</target>
<source>Delete on both sides</source>
<target>Verwijder aan beide zijdes</target>
@@ -930,92 +1031,50 @@ overeenkomt
<source>Delete on both sides even if the file is selected on one side only</source>
<target>Verwijder aan beide zijdes ook al is het bestand maar aan één zijde geselecteerd</target>
-<source>
-Files will only be synchronized if they pass all filter rules.
-Note: File paths must be relative to base directories.
-</source>
-<target>Bestanden zullen alleen gesynchroniseerd worden als ze aan alle filterregels voldoen.</target>
-
-<source>Include</source>
-<target>Opnemen</target>
-
-<source>Exclude</source>
-<target>Uitsluiten</target>
-
-<source>Time span</source>
-<target>Tijdspanne</target>
-
-<source>File size</source>
-<target>Bestandsgrootte</target>
-
-<source>Minimum</source>
-<target>Minimum</target>
-
-<source>Maximum</source>
-<target>Maximum</target>
-
<source>&Clear</source>
<target>&Leegmaken</target>
-<source>Global settings</source>
-<target>Algemene instellingen</target>
-
<source>Fail-safe file copy</source>
<target>Fail-safe bestandskopie</target>
-<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
-<target>Kopiëer eerst naar een tijdelijk bestand (*.ffs_tmp) en hernoem het daarna. Dit garandeert consistentie, zelfs in het geval van een fatale fout.</target>
-
<source>Copy locked files</source>
<target>Kopiëer vergrendelde bestanden</target>
-<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
-<target>Kopiëer gedeelde of afgesloten bestanden met behulp van de Volume Shadow Copy Service (vereist administrator rechten)</target>
-
<source>Copy file access permissions</source>
<target>Kopiëer toegangsrechten van bestand.</target>
-<source>Transfer file and folder permissions (requires administrator rights)</source>
-<target>Verplaats bestands en map permissies (vereist administrator rechten)</target>
-
-<source>Restore hidden dialogs</source>
-<target>Herstel verborgen dialogen</target>
-
-<source>External applications</source>
-<target>Externe applicaties</target>
-
<source>Description</source>
<target>Omschrijving</target>
<source>&Default</source>
<target>&Standaard</target>
-<source>Find what:</source>
-<target>Vind wat:</target>
+<source>Source code written in C++ using:</source>
+<target>Broncode geschreven in C++ met behulp van:</target>
-<source>Match case</source>
-<target>Hoofdlettergevoelig</target>
+<source>If you like FreeFileSync</source>
+<target>Indien FreeFileSync u bevalt</target>
-<source>&Find next</source>
-<target>&Vind volgende</target>
+<source>Donate with PayPal</source>
+<target>Doneer met PayPal</target>
-<source>Start synchronization</source>
-<target>Start synchronisatie</target>
+<source>Feedback and suggestions are welcome</source>
+<target>Feedback en suggesties zijn welkom</target>
-<source>Delete</source>
-<target>Verwijderen</target>
+<source>Homepage</source>
+<target>Homepage</target>
-<source>Configure filter</source>
-<target>Filterconfiguratie</target>
+<source>Email</source>
+<target>E-mail</target>
-<source>Find</source>
-<target>Vind</target>
+<source>Published under the GNU General Public License</source>
+<target>Gepubliceerd onder de GNU General Public License</target>
-<source>Select time span</source>
-<target>Selecteer tijdsspanne</target>
+<source>Many thanks for localization:</source>
+<target>Veel dank voor de vertalingen:</target>
-<source>Folder pairs</source>
-<target>Map paren</target>
+<source>Find</source>
+<target>Vind</target>
<source>Overview</source>
<target>Overzicht</target>
@@ -1023,15 +1082,6 @@ Note: File paths must be relative to base directories.
<source>Configuration</source>
<target>Configuratie</target>
-<source>Main bar</source>
-<target>Hoofdbalk</target>
-
-<source>Filter files</source>
-<target>Filter bestanden</target>
-
-<source>Select view</source>
-<target>Selecteer weergave</target>
-
<source>Open...</source>
<target>Open...</target>
@@ -1041,14 +1091,14 @@ Note: File paths must be relative to base directories.
<source>Compare both sides</source>
<target>Vergelijk beide zijdes</target>
-<source>
-<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
-<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
-</source>
-<target>
-<pluralform>Weet u zeker dat u commando %y wilt uitvoeren voor 1 item?</pluralform>
-<pluralform>Weet u zeker dat u commando %y wilt uitvoeren voor %x items?</pluralform>
-</target>
+<source>Comparison settings</source>
+<target>Vergelijksinstellingen</target>
+
+<source>Synchronization settings</source>
+<target>Synchronisatieinstellingen</target>
+
+<source>Start synchronization</source>
+<target>Start synchronisatie</target>
<source>Confirm</source>
<target>Bevestigen</target>
@@ -1086,12 +1136,6 @@ Note: File paths must be relative to base directories.
<source>Set direction:</source>
<target>Stel richting in:</target>
-<source>Exclude temporarily</source>
-<target>Tijdelijk uitsluiten</target>
-
-<source>Include temporarily</source>
-<target>Tijdelijk opnemen</target>
-
<source>multiple selection</source>
<target>meervoudige selectie</target>
@@ -1101,6 +1145,15 @@ Note: File paths must be relative to base directories.
<source>Exclude via filter:</source>
<target>Sluit via filter uit:</target>
+<source>Exclude temporarily</source>
+<target>Tijdelijk uitsluiten</target>
+
+<source>Include temporarily</source>
+<target>Tijdelijk opnemen</target>
+
+<source>Delete</source>
+<target>Verwijderen</target>
+
<source>Include all</source>
<target>Alles opnemen</target>
@@ -1149,6 +1202,9 @@ Note: File paths must be relative to base directories.
<source>Never save &changes</source>
<target>Sla &veranderingen nooit op</target>
+<source>Filter</source>
+<target>Filter</target>
+
<source>Show files that exist on left side only</source>
<target>Toon bestanden die alleen aan de linkerzijde bestaan</target>
@@ -1194,12 +1250,12 @@ Note: File paths must be relative to base directories.
<source>Set as default</source>
<target>Instellen als standaard</target>
-<source>Operation aborted</source>
-<target>Bewerking afgebroken</target>
-
<source>All folders are in sync</source>
<target>Alle mappen zijn gesynchroniseerd</target>
+<source>Cannot find %x</source>
+<target>Kan %x niet vinden</target>
+
<source>Comma-separated values</source>
<target>Door komma gescheiden waarden</target>
@@ -1215,18 +1271,12 @@ Note: File paths must be relative to base directories.
<source>&Ignore</source>
<target>&Negeren</target>
-<source>Fatal Error</source>
-<target>Kritieke fout</target>
-
<source>&Don't show this warning again</source>
<target>Laat deze &waarschuwing niet meer zien</target>
<source>&Switch</source>
<target>&Omschakelen</target>
-<source>Question</source>
-<target>Vraag</target>
-
<source>&Yes</source>
<target>&Ja</target>
@@ -1248,9 +1298,6 @@ Note: File paths must be relative to base directories.
<source>Initializing...</source>
<target>Initialiseren...</target>
-<source>Aborted</source>
-<target>Afgebroken</target>
-
<source>Completed</source>
<target>Voltooid</target>
@@ -1260,12 +1307,6 @@ Note: File paths must be relative to base directories.
<source>Log</source>
<target>Log</target>
-<source>Cannot find %x</source>
-<target>Kan %x niet vinden</target>
-
-<source>Inactive</source>
-<target>Niet actief</target>
-
<source>Today</source>
<target>Vandaag</target>
@@ -1290,9 +1331,6 @@ Note: File paths must be relative to base directories.
<source>MB</source>
<target>MB</target>
-<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>
@@ -1311,6 +1349,9 @@ Note: File paths must be relative to base directories.
<pluralform>Wilt u echt de volgende %x items verwijderen?</pluralform>
</target>
+<source>Exclude</source>
+<target>Uitsluiten</target>
+
<source>Direct</source>
<target>Direct</target>
@@ -1335,9 +1376,6 @@ Note: File paths must be relative to base directories.
<source>- Other side's counterpart to %item_folder%</source>
<target>- Tegenhanger van de andere kant naar %item_folder%</target>
-<source>Make hidden warnings and dialogs visible again?</source>
-<target>Verborgen waarschuwingen en dialogen zichtbaar maken?</target>
-
<source>Leave as unresolved conflict</source>
<target>Beschouw als onopgelost conflict</target>
@@ -1461,15 +1499,9 @@ Note: File paths must be relative to base directories.
<pluralform>%x dagen</pluralform>
</target>
-<source>Failed to register to receive system messages.</source>
-<target>Registreren voor het ontvangen van systeemmeldingen is mislukt.</target>
-
<source>Cannot set privilege %x.</source>
<target>Kan privilege %x niet instellen.</target>
-<source>Failed to suspend system sleep mode.</source>
-<target>Het opschorten van slaapstand is mislukt.</target>
-
<source>Cannot change process I/O priorities.</source>
<target>Kan de I/O prioriteiten niet aanpassen.</target>
diff --git a/BUILD/Languages/english_uk.lng b/BUILD/Languages/english_uk.lng
index 69642e78..71e8c67e 100644
--- a/BUILD/Languages/english_uk.lng
+++ b/BUILD/Languages/english_uk.lng
@@ -2,14 +2,11 @@
<language>English (UK)</language>
<translator>Robert Readman</translator>
<locale>en_GB</locale>
- <flag_image>flag_england.png</flag_image>
- <plural_form_count>2</plural_form_count>
+ <image>flag_england.png</image>
+ <plural_count>2</plural_count>
<plural_definition>n == 1 ? 0 : 1</plural_definition>
</header>
-<source>Close search bar</source>
-<target>Close search bar</target>
-
<source>Both sides have changed since last synchronization.</source>
<target>Both sides have changed since last synchronisation.</target>
@@ -295,8 +292,8 @@
<source>/sec</source>
<target>/sec</target>
-<source>%x items</source>
-<target>%x items</target>
+<source>%x items/sec</source>
+<target>%x items/sec</target>
<source>Configuration file %x loaded partially only.</source>
<target>Configuration file %x loaded partially only.</target>
@@ -325,11 +322,11 @@
<source>Volume name %x is not part of file path %y.</source>
<target>Volume name %x is not part of file path %y.</target>
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Abort requested: Waiting for current operation to finish...</target>
+<source>Stop requested: Waiting for current operation to finish...</source>
+<target>Stop requested: Waiting for current operation to finish...</target>
-<source>Failure to create timestamp for versioning:</source>
-<target>Failure to create time stamp for versioning:</target>
+<source>Unable to create timestamp for versioning:</source>
+<target>Unable to create timestamp for versioning:</target>
<source>Cannot read the following XML elements:</source>
<target>Cannot read the following XML elements:</target>
@@ -346,8 +343,8 @@
<source>&Program</source>
<target>&Program</target>
-<source>&Content</source>
-<target>&Content</target>
+<source>&View help</source>
+<target>&View help</target>
<source>&About</source>
<target>&About</target>
@@ -370,8 +367,8 @@
<source>To get started just import a .ffs_batch file.</source>
<target>To get started just import a .ffs_batch file.</target>
-<source>Folders to watch</source>
-<target>Folders to watch</target>
+<source>Folders to watch:</source>
+<target>Folders to watch:</target>
<source>Add folder</source>
<target>Add folder</target>
@@ -385,12 +382,15 @@
<source>Select a folder</source>
<target>Select a folder</target>
-<source>Idle time [seconds]</source>
-<target>Idle time [seconds]</target>
+<source>Idle time (in seconds):</source>
+<target>Idle time (in seconds):</target>
<source>Idle time between last detected change and execution of command</source>
<target>Idle time between last detected change and execution of command</target>
+<source>Command line:</source>
+<target>Command line:</target>
+
<source>
The command is triggered if:
- files or subfolders change
@@ -402,8 +402,8 @@ The command is triggered if:
- new folders arrive (e.g. USB stick insert)
</target>
-<source>Start</source>
-<target>Start</target>
+<source>&Start</source>
+<target>&Start</target>
<source>&Retry</source>
<target>&Retry</target>
@@ -411,9 +411,6 @@ The command is triggered if:
<source>Cancel</source>
<target>Cancel</target>
-<source>RealtimeSync - Automated Synchronization</source>
-<target>RealtimeSync - Automated Synchronisation</target>
-
<source>Build: %x</source>
<target>Build: %x</target>
@@ -423,6 +420,9 @@ The command is triggered if:
<source>All files</source>
<target>All files</target>
+<source>Automated Synchronization</source>
+<target>Automated Synchronisation</target>
+
<source>Directory monitoring active</source>
<target>Directory monitoring active</target>
@@ -438,8 +438,8 @@ The command is triggered if:
<source>&Exit</source>
<target>&Exit</target>
-<source>Invalid command line:</source>
-<target>Invalid command line:</target>
+<source>Incorrect command line:</source>
+<target>Incorrect command line:</target>
<source>File content</source>
<target>File content</target>
@@ -501,8 +501,8 @@ The command is triggered if:
<source>Target folder input field must not be empty.</source>
<target>Target folder input field 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>Please enter a target folder for versioning.</source>
+<target>Please enter a target folder for versioning.</target>
<source>Source folder %x not found.</source>
<target>Source folder %x not found.</target>
@@ -540,8 +540,8 @@ The command is triggered if:
<source>job name</source>
<target>job name</target>
-<source>Synchronization aborted</source>
-<target>Synchronisation aborted</target>
+<source>Synchronization stopped</source>
+<target>Synchronisation stopped</target>
<source>Synchronization completed with errors</source>
<target>Synchronisation completed with errors</target>
@@ -558,14 +558,23 @@ The command is triggered if:
<source>Saving log file %x...</source>
<target>Saving log file %x...</target>
-<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
-<target>Press "Switch" to resolve issues in FreeFileSync main dialogue.</target>
+<source>You can switch to FreeFileSync's main window to resolve this issue.</source>
+<target>You can switch to FreeFileSync's main window to resolve this issue.</target>
-<source>Switching to FreeFileSync main dialog</source>
-<target>Switching to FreeFileSync main dialogue</target>
+<source>Switching to FreeFileSync's main window</source>
+<target>Switching to FreeFileSync's main window</target>
-<source>Retrying operation after error:</source>
-<target>Retrying operation after error:</target>
+<source>
+<pluralform>Automatic retry in 1 second...</pluralform>
+<pluralform>Automatic retry in %x seconds...</pluralform>
+</source>
+<target>
+<pluralform>Automatic retry in 1 second...</pluralform>
+<pluralform>Automatic retry in %x seconds...</pluralform>
+</target>
+
+<source>Retrying operation</source>
+<target>Retrying operation</target>
<source>A new version of FreeFileSync is available:</source>
<target>A new version of FreeFileSync is available:</target>
@@ -573,8 +582,8 @@ The command is triggered if:
<source>Download now?</source>
<target>Download now?</target>
-<source>New version found</source>
-<target>New version found</target>
+<source>Check for Program Updates</source>
+<target>Check for Program Updates</target>
<source>&Download</source>
<target>&Download</target>
@@ -642,20 +651,20 @@ The command is triggered if:
<source>Hibernate</source>
<target>Hibernate</target>
-<source>Selected variant:</source>
-<target>Selected variant:</target>
+<source>Alternate comparison settings</source>
+<target>Alternate comparison settings</target>
-<source>Select alternate comparison settings</source>
-<target>Select alternate comparison settings</target>
+<source>Alternate synchronization settings</source>
+<target>Alternate synchronisation settings</target>
-<source>Select alternate synchronization settings</source>
-<target>Select alternate synchronisation settings</target>
+<source>Local filter</source>
+<target>Local filter</target>
-<source>Filter is active</source>
-<target>Filter is active</target>
+<source>Active</source>
+<target>Active</target>
-<source>No filter selected</source>
-<target>No filter selected</target>
+<source>None</source>
+<target>None</target>
<source>Remove alternate settings</source>
<target>Remove alternate settings</target>
@@ -669,6 +678,15 @@ The command is triggered if:
<source>Paste</source>
<target>Paste</target>
+<source>Alternate Comparison Settings</source>
+<target>Alternate Comparison Settings</target>
+
+<source>Alternate Synchronization Settings</source>
+<target>Alternate Synchronisation Settings</target>
+
+<source>Local Filter</source>
+<target>Local Filter</target>
+
<source>&New</source>
<target>&New</target>
@@ -684,15 +702,18 @@ The command is triggered if:
<source>2. &Synchronize</source>
<target>2. &Synchronise</target>
+<source>&Global settings</source>
+<target>&Global settings</target>
+
<source>&Language</source>
<target>&Language</target>
+<source>&Find...</source>
+<target>&Find...</target>
+
<source>&Export file list...</source>
<target>&Export file list...</target>
-<source>&Global settings</source>
-<target>&Global settings</target>
-
<source>&Tools</source>
<target>&Tools</target>
@@ -702,8 +723,8 @@ The command is triggered if:
<source>Check &automatically once a week</source>
<target>Check &automatically once a week</target>
-<source>Check for new &version</source>
-<target>Check for new &version</target>
+<source>&Check for new version</source>
+<target>&Check for new version</target>
<source>Compare</source>
<target>Compare</target>
@@ -720,8 +741,11 @@ The command is triggered if:
<source>Swap sides</source>
<target>Swap sides</target>
-<source>Find what:</source>
-<target>Find what:</target>
+<source>Close search bar</source>
+<target>Close search bar</target>
+
+<source>Find:</source>
+<target>Find:</target>
<source>Match case</source>
<target>Match case</target>
@@ -747,74 +771,20 @@ The command is triggered if:
<source>Total bytes to copy</source>
<target>Total bytes to copy</target>
-<source>Items found:</source>
-<target>Elements found:</target>
-
-<source>Speed:</source>
-<target>Speed:</target>
-
-<source>Time remaining:</source>
-<target>Time remaining:</target>
-
-<source>Time elapsed:</source>
-<target>Time elapsed:</target>
-
-<source>Synchronizing...</source>
-<target>Synchronising...</target>
-
-<source>Minimize to notification area</source>
-<target>Minimize to notification area</target>
-
-<source>On completion</source>
-<target>On completion</target>
-
-<source>Close</source>
-<target>Close</target>
-
-<source>&Pause</source>
-<target>&Pause</target>
-
-<source>Variant</source>
-<target>Variant</target>
+<source>Select a variant:</source>
+<target>Select a variant:</target>
-<source>Statistics</source>
-<target>Statistics</target>
+<source>Identify equal files by comparing modification time and size.</source>
+<target>Identify equal files by comparing modification time and size.</target>
-<source>&Don't show this dialog again</source>
-<target>&Don't show this dialogue again</target>
+<source>Identify equal files by comparing the file content.</source>
+<target>Identify equal files by comparing the file content.</target>
-<source>Select a variant</source>
-<target>Select a variant</target>
+<source>Symbolic links:</source>
+<target>Symbolic links:</target>
-<source>
-Files are found equal if
- - last write time and date
- - file size
-are the same
-</source>
-<target>
-Files are found equal if
- - last write time and date
- - file size
-are the same
-</target>
-
-<source>
-Files are found equal if
- - file content
-is the same
-</source>
-<target>
-Files are found equal if
- - file content
-is the same
-</target>
-
-<source>Symbolic Link handling</source>
-<target>Symbolic Link handling</target>
-
-<source>Help</source>
-<target>Help</target>
+<source>More information</source>
+<target>More information</target>
<source>OK</source>
<target>OK</target>
@@ -822,11 +792,11 @@ is the same
<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
<target>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</target>
-<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
-<target>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronisation.</target>
+<source>Create a mirror backup of the left folder which exactly matches the right folder after synchronization.</source>
+<target>Create a mirror backup of the left folder which exactly matches the right folder after synchronisation.</target>
-<source>Copy new or updated files to right folder.</source>
-<target>Copy new or updated files to right folder.</target>
+<source>Copy new and updated files to the right folder.</source>
+<target>Copy new and updated files to the right folder.</target>
<source>Configure your own synchronization rules.</source>
<target>Configure your own synchronisation rules.</target>
@@ -837,23 +807,8 @@ is the same
<source>Requires database files. Not supported by all file systems.</source>
<target>Requires database files. Not supported by all file systems.</target>
-<source>Error handling</source>
-<target>Error handling</target>
-
-<source>Ignore</source>
-<target>Ignore</target>
-
-<source>Hide all error and warning messages</source>
-<target>Hide all error and warning messages</target>
-
-<source>Pop-up</source>
-<target>Pop-up</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Show pop-up on errors or warnings</target>
-
-<source>Deletion handling</source>
-<target>Deletion handling</target>
+<source>Delete files:</source>
+<target>Delete files:</target>
<source>Permanent</source>
<target>Permanent</target>
@@ -876,99 +831,171 @@ is the same
<source>Naming convention:</source>
<target>Naming convention:</target>
-<source>Batch job</source>
-<target>Batch job</target>
+<source>Show examples</source>
+<target>Show examples</target>
+
+<source>Handle errors:</source>
+<target>Handle errors:</target>
+
+<source>Ignore</source>
+<target>Ignore</target>
+
+<source>Hide all error and warning messages</source>
+<target>Hide all error and warning messages</target>
+
+<source>Pop-up</source>
+<target>Pop-up</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Show pop-up on errors or warnings</target>
+
+<source>On completion:</source>
+<target>On completion:</target>
+
+<source>Start synchronization now?</source>
+<target>Start synchronisation now?</target>
+
+<source>Variant:</source>
+<target>Variant:</target>
+
+<source>Statistics</source>
+<target>Statistics</target>
+
+<source>&Don't show this dialog again</source>
+<target>&Don't show this dialogue again</target>
+
+<source>Items found:</source>
+<target>Elements found:</target>
+
+<source>Speed:</source>
+<target>Speed:</target>
+
+<source>Time remaining:</source>
+<target>Time remaining:</target>
+
+<source>Time elapsed:</source>
+<target>Time elapsed:</target>
+
+<source>Synchronizing...</source>
+<target>Synchronising...</target>
+
+<source>Minimize to notification area</source>
+<target>Minimize to notification area</target>
+
+<source>Close</source>
+<target>Close</target>
+
+<source>&Pause</source>
+<target>&Pause</target>
+
+<source>Stop</source>
+<target>Stop</target>
<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
<target>Create a batch file for unattended synchronisation. To start, double-click this file or schedule in a task planner: %x</target>
-<source>Exit</source>
-<target>Exit</target>
-
-<source>Abort synchronization on first error</source>
-<target>Abort synchronisation on first error</target>
+<source>Stop synchronization at first error</source>
+<target>Stop synchronisation at first error</target>
<source>Show progress dialog</source>
<target>Show progress dialogue</target>
-<source>Save log</source>
-<target>Save log</target>
-
-<source>Select folder to save log files</source>
-<target>Select folder to save log files</target>
+<source>Save log:</source>
+<target>Save log:</target>
-<source>Limit</source>
-<target>Limit</target>
+<source>Limit:</source>
+<target>Limit:</target>
<source>Limit maximum number of log files</source>
<target>Limit maximum number of log files</target>
+<source>How can I schedule a batch job?</source>
+<target>How can I schedule a batch job?</target>
+
+<source>&Recycle bin</source>
+<target>&Recycle bin</target>
+
<source>Delete on both sides</source>
<target>Delete on both sides</target>
<source>Delete on both sides even if the file is selected on one side only</source>
<target>Delete on both sides even if the file is selected on one side only</target>
-<source>
-Files will only be synchronized if they pass all filter rules.
-Note: File paths must be relative to base directories.
-</source>
-<target>
-Files will only be synchronised if they pass all filter rules.
-Note: File paths must be relative to base directories.
-</target>
+<source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source>
+<target>Select filter rules to exclude certain files from synchronisation. Enter file paths relative to their corresponding folder pair.</target>
-<source>Include</source>
-<target>Include</target>
+<source>Include:</source>
+<target>Include:</target>
-<source>Exclude</source>
-<target>Exclude</target>
+<source>Exclude:</source>
+<target>Exclude:</target>
-<source>Time span</source>
-<target>Time span</target>
+<source>Time span:</source>
+<target>Time span:</target>
-<source>File size</source>
-<target>File size</target>
+<source>File size:</source>
+<target>File size:</target>
-<source>Minimum</source>
-<target>Minimum</target>
+<source>Minimum:</source>
+<target>Minimum:</target>
-<source>Maximum</source>
-<target>Maximum</target>
+<source>Maximum:</source>
+<target>Maximum:</target>
<source>&Clear</source>
<target>&Clear</target>
-<source>Global settings</source>
-<target>Global settings</target>
+<source>The following settings are used for all synchronization jobs.</source>
+<target>The following settings are used for all synchronisation jobs.</target>
<source>Fail-safe file copy</source>
<target>Fail-safe file copy</target>
-<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
-<target>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</target>
+<source>
+Copy to a temporary file (*.ffs_tmp) before overwriting target.
+This guarantees a consistent state even in case of a serious error.
+</source>
+<target>
+Copy to a temporary file (*.ffs_tmp) before overwriting target.
+This guarantees a consistent state even in case of a serious error.
+</target>
+
+<source>(recommended)</source>
+<target>(recommended)</target>
<source>Copy locked files</source>
<target>Copy locked files</target>
-<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
-<target>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service.</source>
+<target>Copy shared or locked files using the Volume Shadow Copy Service.</target>
+
+<source>(requires administrator rights)</source>
+<target>(requires administrator rights)</target>
<source>Copy file access permissions</source>
<target>Copy file access permissions</target>
-<source>Transfer file and folder permissions (requires administrator rights)</source>
-<target>Transfer file and folder permissions (requires administrator rights)</target>
+<source>Transfer file and folder permissions.</source>
+<target>Transfer file and folder permissions.</target>
+
+<source>Automatic retry on error:</source>
+<target>Automatic retry on error:</target>
-<source>Restore hidden dialogs</source>
-<target>Restore hidden dialogues</target>
+<source>Retry count:</source>
+<target>Retry count:</target>
-<source>External applications</source>
-<target>External applications</target>
+<source>Delay (in seconds):</source>
+<target>Delay (in seconds):</target>
+
+<source>Customize context menu:</source>
+<target>Customise context menu:</target>
<source>Description</source>
<target>Description</target>
+<source>Restore hidden windows</source>
+<target>Restore hidden windows</target>
+
<source>&Default</source>
<target>&Default</target>
@@ -996,26 +1023,20 @@ Note: File paths must be relative to base directories.
<source>Many thanks for localization:</source>
<target>Many thanks for localisation:</target>
-<source>Start synchronization</source>
-<target>Start synchronisation</target>
+<source>Save as Batch Job</source>
+<target>Save as Batch Job</target>
-<source>Comparison settings</source>
-<target>Comparison settings</target>
+<source>Delete Items</source>
+<target>Delete Items</target>
-<source>Synchronization settings</source>
-<target>Synchronisation settings</target>
-
-<source>Delete</source>
-<target>Delete</target>
-
-<source>Configure filter</source>
-<target>Configure filter</target>
+<source>Global Settings</source>
+<target>Global Settings</target>
-<source>Select time span</source>
-<target>Select time span</target>
+<source>Select Time Span</source>
+<target>Select Time Span</target>
-<source>Folder pairs</source>
-<target>Folder pairs</target>
+<source>Folder Pairs</source>
+<target>Folder Pairs</target>
<source>Find</source>
<target>Find</target>
@@ -1026,14 +1047,14 @@ Note: File paths must be relative to base directories.
<source>Configuration</source>
<target>Configuration</target>
-<source>Main bar</source>
-<target>Main bar</target>
+<source>Main Bar</source>
+<target>Main Bar</target>
-<source>Filter files</source>
-<target>Filter files</target>
+<source>Filter Files</source>
+<target>Filter Files</target>
-<source>Select view</source>
-<target>Select view</target>
+<source>Select View</source>
+<target>Select View</target>
<source>Open...</source>
<target>Open...</target>
@@ -1044,12 +1065,21 @@ Note: File paths must be relative to base directories.
<source>Compare both sides</source>
<target>Compare both sides</target>
+<source>Comparison settings</source>
+<target>Comparison settings</target>
+
+<source>Synchronization settings</source>
+<target>Synchronisation settings</target>
+
+<source>Start synchronization</source>
+<target>Start synchronisation</target>
+
<source>
-<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for one item?</pluralform>
<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
</source>
<target>
-<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for one item?</pluralform>
<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
</target>
@@ -1104,6 +1134,9 @@ Note: File paths must be relative to base directories.
<source>Include temporarily</source>
<target>Include temporarily</target>
+<source>Delete</source>
+<target>Delete</target>
+
<source>Include all</source>
<target>Include all</target>
@@ -1152,6 +1185,9 @@ Note: File paths must be relative to base directories.
<source>Never save &changes</source>
<target>Never save &changes</target>
+<source>Filter</source>
+<target>Filter</target>
+
<source>Show files that exist on left side only</source>
<target>Show files that exist on left side only</target>
@@ -1197,12 +1233,15 @@ Note: File paths 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>Synchronization Settings</source>
+<target>Synchronisation Settings</target>
+
+<source>Comparison Settings</source>
+<target>Comparison Settings</target>
+
<source>Cannot find %x</source>
<target>Cannot find %x</target>
@@ -1221,8 +1260,8 @@ Note: File paths must be relative to base directories.
<source>&Ignore</source>
<target>&Ignore</target>
-<source>Fatal Error</source>
-<target>Fatal Error</target>
+<source>Serious Error</source>
+<target>Serious Error</target>
<source>&Don't show this warning again</source>
<target>&Don't show this warning again</target>
@@ -1230,9 +1269,6 @@ Note: File paths must be relative to base directories.
<source>&Switch</source>
<target>&Switch</target>
-<source>Question</source>
-<target>Question</target>
-
<source>&Yes</source>
<target>&Yes</target>
@@ -1254,8 +1290,8 @@ Note: File paths must be relative to base directories.
<source>Initializing...</source>
<target>Initialising...</target>
-<source>Aborted</source>
-<target>Aborted</target>
+<source>Stopped</source>
+<target>Stopped</target>
<source>Completed</source>
<target>Completed</target>
@@ -1266,9 +1302,6 @@ Note: File paths must be relative to base directories.
<source>Log</source>
<target>Log</target>
-<source>Inactive</source>
-<target>Inactive</target>
-
<source>Today</source>
<target>Today</target>
@@ -1293,9 +1326,6 @@ Note: File paths must be relative to base directories.
<source>MB</source>
<target>MB</target>
-<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>
@@ -1305,6 +1335,9 @@ Note: File paths must be relative to base directories.
<pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform>
</target>
+<source>Move</source>
+<target>Move</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>
@@ -1314,6 +1347,9 @@ Note: File paths must be relative to base directories.
<pluralform>Do you really want to delete the following %x items?</pluralform>
</target>
+<source>Exclude</source>
+<target>Exclude</target>
+
<source>Direct</source>
<target>Direct</target>
@@ -1338,8 +1374,8 @@ Note: File paths must be relative to base directories.
<source>- Other side's counterpart to %item_folder%</source>
<target>- Other side's counterpart to %item_folder%</target>
-<source>Make hidden warnings and dialogs visible again?</source>
-<target>Make hidden warnings and dialogues visible again?</target>
+<source>Restore all hidden windows and warnings?</source>
+<target>Restore all hidden windows and warnings?</target>
<source>Leave as unresolved conflict</source>
<target>Leave as unresolved conflict</target>
@@ -1464,14 +1500,14 @@ Note: File paths must be relative to base directories.
<pluralform>%x days</pluralform>
</target>
-<source>Failed to register to receive system messages.</source>
-<target>Failed to register to receive system messages.</target>
+<source>Unable to register to receive system messages.</source>
+<target>Unable to register to receive system messages.</target>
<source>Cannot set privilege %x.</source>
<target>Cannot set privilege %x.</target>
-<source>Failed to suspend system sleep mode.</source>
-<target>Failed to suspend system sleep mode.</target>
+<source>Unable to suspend system sleep mode.</source>
+<target>Unable to suspend system sleep mode.</target>
<source>Cannot change process I/O priorities.</source>
<target>Cannot change process I/O priorities.</target>
diff --git a/BUILD/Languages/finnish.lng b/BUILD/Languages/finnish.lng
index 54b8c2c7..45b3b9fc 100644
--- a/BUILD/Languages/finnish.lng
+++ b/BUILD/Languages/finnish.lng
@@ -2,11 +2,31 @@
<language>Suomi</language>
<translator>Nalle Juslén</translator>
<locale>fi_FI</locale>
- <flag_image>flag_finland.png</flag_image>
- <plural_form_count>2</plural_form_count>
+ <image>flag_finland.png</image>
+ <plural_count>2</plural_count>
<plural_definition>n == 1 ? 0 : 1</plural_definition>
</header>
+<source>
+<pluralform>Do you really want to execute the command %y for one item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+</target>
+
+<source>&Check</source>
+<target></target>
+
+<source>Retrying operation...</source>
+<target></target>
+
+<source>
+<pluralform>Automatic retry in 1 second...</pluralform>
+<pluralform>Automatic retry in %x seconds...</pluralform>
+</source>
+<target>
+</target>
+
<source>Both sides have changed since last synchronization.</source>
<target>Molemmat puolet muuttuneet edellisestä täsmäyksestä.</target>
@@ -58,9 +78,6 @@
<source>Cannot open file %x.</source>
<target>Tiedosto %x ei aukea.</target>
-<source>Error</source>
-<target>Virhe</target>
-
<source>File %x does not contain a valid configuration.</source>
<target>Tiedosto %x ei sisällä kelvollista kokoonpanoa.</target>
@@ -70,12 +87,12 @@
<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
<target>Määrittelyssä on oltava viittaukset hakemistopareista, jos hakemistot kutsutaam komentoriviltä.</target>
-<source>Warning</source>
-<target>Varoitus</target>
-
<source>Directories cannot be set for more than one configuration file.</source>
<target>Hakemisto määriteltävä vain yhteen määrittelyyn.</target>
+<source>Command line</source>
+<target>Komentokehote</target>
+
<source>Syntax:</source>
<target>Syntaksi:</target>
@@ -91,9 +108,6 @@
<source>Any number of alternative directories for at most one config file.</source>
<target>Vapaa määrä eri hakemistoja yhdessä määrittelytiedostossa.</target>
-<source>Command line</source>
-<target>Komentokehote</target>
-
<source>A folder input field is empty.</source>
<target>Hakemiston syöte on tyhjä.</target>
@@ -292,8 +306,8 @@
<source>/sec</source>
<target>/s</target>
-<source>%x items</source>
-<target>%x kpl</target>
+<source>%x items/sec</source>
+<target>%x olioo/s</target>
<source>Configuration file %x loaded partially only.</source>
<target>Kokoonpanotiedosto %x ladattu vain osittain.</target>
@@ -322,11 +336,11 @@
<source>Volume name %x is not part of file path %y.</source>
<target>Nimi %x ei esiinny tiedostopolussa %y.</target>
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Keskeytys pyydetty: Odotetaan toiminnon loppumista...</target>
+<source>Stop requested: Waiting for current operation to finish...</source>
+<target>Keskeytyspyyntö: Odotetaan tehtävän valmistumista...</target>
-<source>Failure to create timestamp for versioning:</source>
-<target>Ongelma luoda aikaleimaa versionnissa:</target>
+<source>Unable to create timestamp for versioning:</source>
+<target>Versiohallinan aikaleimaa ei voida luoda:</target>
<source>Cannot read the following XML elements:</source>
<target>XML elementit lukukelvottimia:</target>
@@ -343,8 +357,8 @@
<source>&Program</source>
<target>&Ohjelma</target>
-<source>&Content</source>
-<target>&Sisältö</target>
+<source>&View help</source>
+<target>&Näytä ohje</target>
<source>&About</source>
<target>&Ohje</target>
@@ -367,8 +381,8 @@
<source>To get started just import a .ffs_batch file.</source>
<target>Aloita lataamalla joku .ffs_batch -tiedosto.</target>
-<source>Folders to watch</source>
-<target>Tarkkailtavat hakemistot</target>
+<source>Folders to watch:</source>
+<target>Seurattavat hakemistot:</target>
<source>Add folder</source>
<target>Lisää hakemisto</target>
@@ -382,12 +396,15 @@
<source>Select a folder</source>
<target>Valitse hakemisto</target>
-<source>Idle time [seconds]</source>
-<target>Jouto aika [sekunttia]</target>
+<source>Idle time (in seconds):</source>
+<target>Jouten (s)</target>
<source>Idle time between last detected change and execution of command</source>
<target>Joutoaika edellisen muutoksen ja käskyn suorittamisen välillä</target>
+<source>Command line:</source>
+<target>Komentokehoite</target>
+
<source>
The command is triggered if:
- files or subfolders change
@@ -399,33 +416,30 @@ Käsky suoritetaan jos:
- uusi hakemisto ilmestyy (esim. USB tikku)
</target>
-<source>Start</source>
-<target>Käynnistä</target>
-
-<source>&Retry</source>
-<target>&Uudestaan</target>
-
-<source>Cancel</source>
-<target>Lopeta</target>
+<source>&Start</source>
+<target>&Käynnistä</target>
-<source>RealtimeSync - Automated Synchronization</source>
-<target>RealtimeSync - Automaattisoitu täsmäytys</target>
+<source>About</source>
+<target>Ohje</target>
<source>Build: %x</source>
<target>Versio: %x</target>
-<source>About</source>
-<target>Ohje</target>
-
<source>All files</source>
<target>Kaikki tiedostot</target>
+<source>Automated Synchronization</source>
+<target>Automaattinen täsmäytys</target>
+
<source>Directory monitoring active</source>
<target>Hakemistovalvonta päällä</target>
<source>Waiting until all directories are available...</source>
<target>Odota kunnes kaikki hakemistot on saatavilla...</target>
+<source>Error</source>
+<target>Virhe</target>
+
<source>&Restore</source>
<target>&Palauta</target>
@@ -435,8 +449,11 @@ Käsky suoritetaan jos:
<source>&Exit</source>
<target>&Poistu</target>
-<source>Invalid command line:</source>
-<target>Virheellinen komentokehote:</target>
+<source>Incorrect command line:</source>
+<target>Virheellinen komento:</target>
+
+<source>&Retry</source>
+<target>&Uudestaan</target>
<source>File content</source>
<target>Tiedoston sisältö</target>
@@ -498,8 +515,8 @@ Käsky suoritetaan jos:
<source>Target folder input field must not be empty.</source>
<target>Kohde hakemiston kenttä on annettava.</target>
-<source>Folder input field for versioning must not be empty.</source>
-<target>Kohde hakemiston version syötettävä.</target>
+<source>Please enter a target folder for versioning.</source>
+<target>Anna versioinnin kohdehakemisto.</target>
<source>Source folder %x not found.</source>
<target>Lähdehakemisto %x ei löydy.</target>
@@ -537,8 +554,8 @@ Käsky suoritetaan jos:
<source>job name</source>
<target>työnimi</target>
-<source>Synchronization aborted</source>
-<target>Täsmäytys lopetettiin</target>
+<source>Synchronization stopped</source>
+<target>Täsmäytys on pysäytetty</target>
<source>Synchronization completed with errors</source>
<target>Täsmäytys päättyi virheisiin</target>
@@ -555,14 +572,29 @@ Käsky suoritetaan jos:
<source>Saving log file %x...</source>
<target>Lokitiedosto: tallennetaan %x...</target>
-<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
-<target>Paina "Vaihda" ja korjaa virheet FreeFileSync päävalintaikkunassa</target>
+<source>You can switch to FreeFileSync's main window to resolve this issue.</source>
+<target>Siirry FreeFileSync -pääikkunaan korjataksesi virheen.</target>
+
+<source>&Don't show this warning again</source>
+<target>&Älä enää näytä tätä varoitusta</target>
+
+<source>&Ignore</source>
+<target>&Unohda</target>
+
+<source>&Switch</source>
+<target>&Vaihda</target>
+
+<source>Switching to FreeFileSync's main window</source>
+<target>Vaihdä FreeFileSync -pääikkunaan</target>
-<source>Switching to FreeFileSync main dialog</source>
-<target>Siirry FreeFileSync perusikkunaan</target>
+<source>&Ignore subsequent errors</source>
+<target>&Hylkää toistuvat virheet</target>
+
+<source>Serious Error</source>
+<target>Vakava virhe</target>
-<source>Retrying operation after error:</source>
-<target>Yritä virheen jälkeen uudestaan:</target>
+<source>Check for Program Updates</source>
+<target>Etsi ohjelmaan päivitystä</target>
<source>A new version of FreeFileSync is available:</source>
<target>FreeFileSync:n uusi verio on saatavilla:</target>
@@ -570,18 +602,12 @@ Käsky suoritetaan jos:
<source>Download now?</source>
<target>Lataa nyt?</target>
-<source>New version found</source>
-<target>Uusi versio saatavilla</target>
-
<source>&Download</source>
<target>&Lataa</target>
<source>FreeFileSync is up to date.</source>
<target>FreeFileSync on ajan tasalla.</target>
-<source>Information</source>
-<target>Tietoja</target>
-
<source>Unable to connect to sourceforge.net.</source>
<target>Yhteys sourceforge.net:n ei onnistu.</target>
@@ -639,20 +665,20 @@ Käsky suoritetaan jos:
<source>Hibernate</source>
<target>Horrostila</target>
-<source>Selected variant:</source>
-<target>Valitse tyyppi:</target>
+<source>Alternate comparison settings</source>
+<target>Vaihtoehtoinen asetus vertailulle</target>
-<source>Select alternate comparison settings</source>
-<target>Muuta vertailun asetusta</target>
+<source>Alternate synchronization settings</source>
+<target>Vaihtoehtoinen asetus täsmäytykselle</target>
-<source>Select alternate synchronization settings</source>
-<target>Muuta täsmäytyksen asetus</target>
+<source>Local filter</source>
+<target>Paikallinen suodin</target>
-<source>Filter is active</source>
-<target>Suodin aktivoitu</target>
+<source>Active</source>
+<target>Aktiivinen</target>
-<source>No filter selected</source>
-<target>Suodin valitsematta</target>
+<source>None</source>
+<target>Ei yhtään</target>
<source>Remove alternate settings</source>
<target>Poista muut asetukset</target>
@@ -666,6 +692,15 @@ Käsky suoritetaan jos:
<source>Paste</source>
<target>Liitä</target>
+<source>Alternate Comparison Settings</source>
+<target>Vaihtoehtoinen asetus vertailulle</target>
+
+<source>Alternate Synchronization Settings</source>
+<target>Vaihtoehtoinen asetus täsmäytykselle</target>
+
+<source>Local Filter</source>
+<target>Paikallinen suodin</target>
+
<source>&New</source>
<target>&Uusi</target>
@@ -681,15 +716,18 @@ Käsky suoritetaan jos:
<source>2. &Synchronize</source>
<target>2. &Täsmäytä</target>
+<source>&Global settings</source>
+<target>&Yleiset asetukset</target>
+
<source>&Language</source>
<target>&Kieli</target>
+<source>&Find...</source>
+<target>&Etsi...</target>
+
<source>&Export file list...</source>
<target>&Vie tiedostojoukko...</target>
-<source>&Global settings</source>
-<target>&Yleiset asetukset</target>
-
<source>&Tools</source>
<target>&Asetukset</target>
@@ -699,12 +737,15 @@ Käsky suoritetaan jos:
<source>Check &automatically once a week</source>
<target>Tarkista &viikoittain</target>
-<source>Check for new &version</source>
-<target>Onko uusi &versio saatavilla</target>
+<source>&Check for new version</source>
+<target>&Hae uusi versio</target>
<source>Compare</source>
<target>Vertaile</target>
+<source>Cancel</source>
+<target>Lopeta</target>
+
<source>Synchronize</source>
<target>Täsmäytä</target>
@@ -717,6 +758,15 @@ Käsky suoritetaan jos:
<source>Swap sides</source>
<target>Puolten vaihto</target>
+<source>Close search bar</source>
+<target>Sulje hakukenttä</target>
+
+<source>Find:</source>
+<target>Etsi</target>
+
+<source>Match case</source>
+<target>Täsmää kirjainkoko</target>
+
<source>Save as batch job</source>
<target>Tallenna eräajona</target>
@@ -738,74 +788,20 @@ Käsky suoritetaan jos:
<source>Total bytes to copy</source>
<target>Kopioitava määrä tavuja</target>
-<source>Items found:</source>
-<target>Osia löytyi:</target>
-
-<source>Speed:</source>
-<target>Nopeus:</target>
-
-<source>Time remaining:</source>
-<target>Aikaa jäljellä:</target>
-
-<source>Time elapsed:</source>
-<target>Aikaa kulunut:</target>
-
-<source>Synchronizing...</source>
-<target>Täsmäytetään...</target>
-
-<source>Minimize to notification area</source>
-<target>Pienennä huomiokenttään</target>
-
-<source>On completion</source>
-<target>Valmistuttua</target>
-
-<source>Close</source>
-<target>Sulje</target>
+<source>Select a variant:</source>
+<target>Valitse vaihtoehto:</target>
-<source>&Pause</source>
-<target>&Keskeytä</target>
+<source>Identify equal files by comparing modification time and size.</source>
+<target>Tunnista tiedostojen vastaavuus ajan ja koon mukaan.</target>
-<source>Variant</source>
-<target>Vaihtoehto</target>
+<source>Identify equal files by comparing the file content.</source>
+<target>Tunnista tiedostojen vastaavuus sisällöstä.</target>
-<source>Statistics</source>
-<target>Tilastot</target>
+<source>Symbolic links:</source>
+<target>Pikakuvike:</target>
-<source>&Don't show this dialog again</source>
-<target>&Älä näytä valitaa uudestaan</target>
-
-<source>Select a variant</source>
-<target>Valitse tyyppi</target>
-
-<source>
-Files are found equal if
- - last write time and date
- - file size
-are the same
-</source>
-<target>
-Tiedostot samat jos
- - viimeinen kirjoitusaika ja pvm
- - tiedostokoko
-ovat samat
-</target>
-
-<source>
-Files are found equal if
- - file content
-is the same
-</source>
-<target>
-Tiedostot samat jos,
- - tiedoston sisältö
-on sama
-</target>
-
-<source>Symbolic Link handling</source>
-<target>Pikakuvakkeiden hallinta</target>
-
-<source>Help</source>
-<target>Ohje</target>
+<source>More information</source>
+<target>Lisää tietoa</target>
<source>OK</source>
<target>OK</target>
@@ -813,11 +809,11 @@ on sama
<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
<target>Löydä ja suorita muutokset molemmilla puolilla. Poistot, siirrot ja eroavuudet tunnistetaan tietokannan avulla.</target>
-<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
-<target>Vasemman peilaava varmuuskopio. Oikeanpuoleinen hakemisto muutetaan täsmäytyksessä vastaamaan tarkasti vasenta.</target>
+<source>Create a mirror backup of the left folder which exactly matches the right folder after synchronization.</source>
+<target>Tee tarkka kopio vasemmasta oikealle.</target>
-<source>Copy new or updated files to right folder.</source>
-<target>Kopioi uudet tai päivitetyt tiedostot oikeaan kansioon.</target>
+<source>Copy new and updated files to the right folder.</source>
+<target>Monista muuttuneet ja uudet oikealle.</target>
<source>Configure your own synchronization rules.</source>
<target>Määritä omat täsmäytyssäännöt.</target>
@@ -828,8 +824,35 @@ on sama
<source>Requires database files. Not supported by all file systems.</source>
<target>Vaatii tietokantaa. Ei toimi kaikissa käyttöjärjestelmissä.</target>
-<source>Error handling</source>
-<target>Virheiden käsittely</target>
+<source>Delete files:</source>
+<target>Poista tiedosto:</target>
+
+<source>Permanent</source>
+<target>Pysyvä</target>
+
+<source>Delete or overwrite files permanently</source>
+<target>Poista tai korvaa tiedostoja pysyvästi</target>
+
+<source>&Recycle bin</source>
+<target>&Roskakori</target>
+
+<source>Back up deleted and overwritten files in the recycle bin</source>
+<target>Tallenna poistetut/ylikirjoitetut tiedostot Roskakoriin</target>
+
+<source>Versioning</source>
+<target>Versiointi</target>
+
+<source>Move files to a user-defined folder</source>
+<target>Siirrä tiedostot määrättyyn hakemistoon</target>
+
+<source>Naming convention:</source>
+<target>Nimeämis käytäntö:</target>
+
+<source>Show examples</source>
+<target>Näytä esimerkki</target>
+
+<source>Handle errors:</source>
+<target>Hoida virheet:</target>
<source>Ignore</source>
<target>Ohita</target>
@@ -843,135 +866,153 @@ on sama
<source>Show pop-up on errors or warnings</source>
<target>Näytä Pop-Up (virheet/varoitukset)</target>
-<source>Deletion handling</source>
-<target>Poistotapa</target>
+<source>On completion:</source>
+<target>Kun valmis:</target>
-<source>Permanent</source>
-<target>Pysyvä</target>
+<source>Start synchronization now?</source>
+<target>Kännistetäänkö täsmäyts?</target>
-<source>Delete or overwrite files permanently</source>
-<target>Poista tai korvaa tiedostoja pysyvästi</target>
+<source>Variant:</source>
+<target>Vaihtoehto</target>
-<source>Recycle bin</source>
-<target>Roskakori</target>
+<source>Statistics</source>
+<target>Tilastot</target>
-<source>Back up deleted and overwritten files in the recycle bin</source>
-<target>Tallenna poistetut/ylikirjoitetut tiedostot Roskakoriin</target>
+<source>&Don't show this dialog again</source>
+<target>&Älä näytä valitaa uudestaan</target>
-<source>Versioning</source>
-<target>Versiointi</target>
+<source>Items found:</source>
+<target>Osia löytyi:</target>
-<source>Move files to a user-defined folder</source>
-<target>Siirrä tiedostot määrättyyn hakemistoon</target>
+<source>Speed:</source>
+<target>Nopeus:</target>
-<source>Naming convention:</source>
-<target>Nimeämis käytäntö:</target>
+<source>Time remaining:</source>
+<target>Aikaa jäljellä:</target>
+
+<source>Time elapsed:</source>
+<target>Aikaa kulunut:</target>
+
+<source>Synchronizing...</source>
+<target>Täsmäytetään...</target>
+
+<source>Minimize to notification area</source>
+<target>Pienennä huomiokenttään</target>
+
+<source>Close</source>
+<target>Sulje</target>
+
+<source>&Pause</source>
+<target>&Keskeytä</target>
-<source>Batch job</source>
-<target>Eräajo</target>
+<source>Stop</source>
+<target>Keskeytä</target>
<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
<target>Luo eräajo-tiedosto automaattiseen täsmäytykseen. Käynnista tuplaklickillä tai ajasta: %x</target>
-<source>Exit</source>
-<target>Poistu</target>
-
-<source>Abort synchronization on first error</source>
-<target>Keskeytä täsmäytys ensimmäisestä virheestä</target>
+<source>Stop synchronization at first error</source>
+<target>Keskeytä täsmäytys ensimmäiseen virheeseen</target>
<source>Show progress dialog</source>
<target>Näytä etenemä ikkuna</target>
-<source>Save log</source>
-<target>Tallenna loki</target>
-
-<source>Select folder to save log files</source>
-<target>Valitse tallennushakemisto lokeille</target>
+<source>Save log:</source>
+<target>Tallenna loki:</target>
-<source>Limit</source>
-<target>Raja</target>
+<source>Limit:</source>
+<target>Raja:</target>
<source>Limit maximum number of log files</source>
<target>Lokeja enintäin</target>
+<source>How can I schedule a batch job?</source>
+<target>Miten ajastan eräajon?</target>
+
<source>Delete on both sides</source>
<target>Poista molemmilta puolilta</target>
<source>Delete on both sides even if the file is selected on one side only</source>
<target>Poista molemmin puolin, vaikka tiedosto on valittu vain toisella puolella</target>
-<source>
-Files will only be synchronized if they pass all filter rules.
-Note: File paths must be relative to base directories.
-</source>
-<target>
-Tiedostot synkronoidaan vain jos kaikki ehdot täyttyy.
-HUOM: Tiedostopolku oltava suhteessa juurihakemistoon.
-</target>
+<source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source>
+<target>Ohitettavien tiedostojen ehdot täsmäytysessä. Anna hakemistopariin nähden suhteellinen osoite.</target>
-<source>Include</source>
-<target>Sisällytä</target>
+<source>Include:</source>
+<target>Sisällytä:</target>
-<source>Exclude</source>
-<target>Sulje pois</target>
+<source>Exclude:</source>
+<target>Sulje pois:</target>
-<source>Time span</source>
-<target>Aikajana</target>
+<source>Time span:</source>
+<target>Aikajakso:</target>
-<source>File size</source>
-<target>Tiedosto koko</target>
+<source>File size:</source>
+<target>Tiedosto koko:</target>
-<source>Minimum</source>
-<target>Pienin</target>
+<source>Minimum:</source>
+<target>Vähintäin:</target>
-<source>Maximum</source>
-<target>Enintäin</target>
+<source>Maximum:</source>
+<target>Enintäin:</target>
<source>&Clear</source>
<target>&Pyyhi</target>
-<source>Global settings</source>
-<target>Yleiset asetukset</target>
+<source>The following settings are used for all synchronization jobs.</source>
+<target>Nämä asetukset käytetään kaikkiin täsmäytyksiin.</target>
<source>Fail-safe file copy</source>
<target>Varmennettu tiedostokopiointi</target>
-<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
-<target>Kopio ensin välitiedostoon (*.ffs_tmp) ja nimeä sitten uudestaan. Varmistaa toimivuudet vakavan virheen tapahtuessa.</target>
+<source>
+Copy to a temporary file (*.ffs_tmp) before overwriting target.
+This guarantees a consistent state even in case of a serious error.
+</source>
+<target>
+Kopioi väliaikaistiedostoon (*.ffs_tmp) ennen kohteen ylikirjoitusta.
+Tällä varmistetaa eheys vaikka vakava virhe tapahtuisi.
+</target>
+
+<source>(recommended)</source>
+<target>(suositus)</target>
<source>Copy locked files</source>
<target>Kopioi lukitut tiedostot</target>
-<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
-<target>Kopioi jaetut/lukitut tiedostot Volume Shadow Copy Service:lla (vaatii pääkäyttäjän oikeudet)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service.</source>
+<target>Jaettujen tai lukittujen tiedostojen kopiointi käyttäen Volume Shadow Copy Service</target>
+
+<source>(requires administrator rights)</source>
+<target>(edellyttää pääkäyttäjän oikeuksia)</target>
<source>Copy file access permissions</source>
<target>Kopioi tiedoston käyttöoikeuksia</target>
-<source>Transfer file and folder permissions (requires administrator rights)</source>
-<target>Vie tiedosto ja hakemisto ominaisuudet(vaatii pääkäyttäjän oikeudet)</target>
+<source>Transfer file and folder permissions.</source>
+<target>Tiedosto ja hakemisto määreet siirretään.</target>
+
+<source>Automatic retry on error:</source>
+<target>Automaattinen uusintayritys virheestä:</target>
-<source>Restore hidden dialogs</source>
-<target>Palauta piiloitetut ikkunat</target>
+<source>Retry count:</source>
+<target>Uusintayrityksiä:</target>
-<source>External applications</source>
-<target>Ulkopuolinen sovellus</target>
+<source>Delay (in seconds):</source>
+<target>Viive (s):</target>
+
+<source>Customize context menu:</source>
+<target>Yksilöi valikko:</target>
<source>Description</source>
<target>Seloste</target>
+<source>Restore hidden windows</source>
+<target>Palauta piiloitettu ikkuna</target>
+
<source>&Default</source>
<target>&Vakio</target>
-<source>Find what:</source>
-<target>Etsi:</target>
-
-<source>Match case</source>
-<target>Täsmää kirjainkoko</target>
-
-<source>&Find next</source>
-<target>&Etsi seuraava</target>
-
<source>Source code written in C++ using:</source>
<target>Koodikieli on C++ käyttäen:</target>
@@ -996,43 +1037,37 @@ HUOM: Tiedostopolku oltava suhteessa juurihakemistoon.
<source>Many thanks for localization:</source>
<target>Paljon kiitoksia kääntäjille:</target>
-<source>Start synchronization</source>
-<target>Käynnistä täsmäytys</target>
+<source>Save as Batch Job</source>
+<target>Tallenna eräajona</target>
-<source>Comparison settings</source>
-<target>Vertailun asetukset</target>
+<source>Delete Items</source>
+<target>Poista kohteet</target>
-<source>Synchronization settings</source>
-<target>Täsmäytyksen asetukset</target>
+<source>Global Settings</source>
+<target>Yleinen asetus</target>
-<source>Delete</source>
-<target>Poista</target>
+<source>Select Time Span</source>
+<target>Valitse aikajakso</target>
-<source>Configure filter</source>
-<target>Määritä suodin</target>
+<source>Folder Pairs</source>
+<target>Hakemisto parit</target>
<source>Find</source>
<target>Etsi</target>
-<source>Select time span</source>
-<target>Valitse aikajana</target>
-
-<source>Folder pairs</source>
-<target>Hakemistoparit</target>
-
<source>Overview</source>
<target>Yleiskatsaus</target>
<source>Configuration</source>
<target>Asetukset</target>
-<source>Main bar</source>
+<source>Main Bar</source>
<target>Pääpalkki</target>
-<source>Filter files</source>
+<source>Filter Files</source>
<target>Suodata tiedostot</target>
-<source>Select view</source>
+<source>Select View</source>
<target>Valitse näkymä</target>
<source>Open...</source>
@@ -1044,14 +1079,14 @@ HUOM: Tiedostopolku oltava suhteessa juurihakemistoon.
<source>Compare both sides</source>
<target>Vertaile molemmat puolet</target>
-<source>
-<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
-<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
-</source>
-<target>
-<pluralform>Haluatko varmasti suorittaa komentoa %y yhteen?</pluralform>
-<pluralform>Haluatko varmasti suorittaa komentoa %y %x:n?</pluralform>
-</target>
+<source>Comparison settings</source>
+<target>Vertailun asetukset</target>
+
+<source>Synchronization settings</source>
+<target>Täsmäytyksen asetukset</target>
+
+<source>Start synchronization</source>
+<target>Käynnistä täsmäytys</target>
<source>Confirm</source>
<target>Vahvista</target>
@@ -1089,12 +1124,6 @@ HUOM: Tiedostopolku oltava suhteessa juurihakemistoon.
<source>Set direction:</source>
<target>Aseta suunta:</target>
-<source>Exclude temporarily</source>
-<target>Sulje pois, tilapäisesti</target>
-
-<source>Include temporarily</source>
-<target>Sisällytä, tilapäisesti</target>
-
<source>multiple selection</source>
<target>monivalinta</target>
@@ -1104,6 +1133,15 @@ HUOM: Tiedostopolku oltava suhteessa juurihakemistoon.
<source>Exclude via filter:</source>
<target>Sulje pois suotimella:</target>
+<source>Exclude temporarily</source>
+<target>Sulje pois, tilapäisesti</target>
+
+<source>Include temporarily</source>
+<target>Sisällytä, tilapäisesti</target>
+
+<source>Delete</source>
+<target>Poista</target>
+
<source>Include all</source>
<target>Valitse kaikki</target>
@@ -1146,11 +1184,14 @@ HUOM: Tiedostopolku oltava suhteessa juurihakemistoon.
<source>Do you want to save changes to %x?</source>
<target>Haluatko tallentaa muutokset: %x?</target>
+<source>Never save &changes</source>
+<target>Älä tallenna &muutoksia</target>
+
<source>Do&n't save</source>
<target>Äl&ä tallenna</target>
-<source>Never save &changes</source>
-<target>Älä tallenna &muutoksia</target>
+<source>Filter</source>
+<target>Suodin</target>
<source>Show files that exist on left side only</source>
<target>Näytä vain vasemmalla esiintyvät tiedostot</target>
@@ -1197,12 +1238,18 @@ HUOM: Tiedostopolku oltava suhteessa juurihakemistoon.
<source>Set as default</source>
<target>Aseta oletukseksi</target>
-<source>Operation aborted</source>
-<target>Toiminto lopetettiin</target>
-
<source>All folders are in sync</source>
<target>Kaikki hakemistot täsmäytetty</target>
+<source>Synchronization Settings</source>
+<target>Täsmäytyksen asetukset</target>
+
+<source>Comparison Settings</source>
+<target>Vertailun asetukset</target>
+
+<source>Cannot find %x</source>
+<target>En löydä %x</target>
+
<source>Comma-separated values</source>
<target>Pilkulla erotetut arvot</target>
@@ -1212,30 +1259,6 @@ HUOM: Tiedostopolku oltava suhteessa juurihakemistoon.
<source>Searching for program updates...</source>
<target>Ohjelmapäivytys haetaa...</target>
-<source>&Ignore subsequent errors</source>
-<target>&Hylkää toistuvat virheet</target>
-
-<source>&Ignore</source>
-<target>&Unohda</target>
-
-<source>Fatal Error</source>
-<target>Kohtalokas virhe</target>
-
-<source>&Don't show this warning again</source>
-<target>&Älä enää näytä tätä varoitusta</target>
-
-<source>&Switch</source>
-<target>&Vaihda</target>
-
-<source>Question</source>
-<target>Kysymys</target>
-
-<source>&Yes</source>
-<target>&Kyllä</target>
-
-<source>&No</source>
-<target>&Ei</target>
-
<source>Scanning...</source>
<target>Tiedostoja haetaan...</target>
@@ -1245,14 +1268,17 @@ HUOM: Tiedostopolku oltava suhteessa juurihakemistoon.
<source>Info</source>
<target>Info</target>
+<source>Warning</source>
+<target>Varoitus</target>
+
<source>Paused</source>
<target>Pysäytetty</target>
<source>Initializing...</source>
<target>Alustus...</target>
-<source>Aborted</source>
-<target>Keskeytetty</target>
+<source>Stopped</source>
+<target>Keskeytys</target>
<source>Completed</source>
<target>Valmis</target>
@@ -1263,12 +1289,6 @@ HUOM: Tiedostopolku oltava suhteessa juurihakemistoon.
<source>Log</source>
<target>Loki</target>
-<source>Cannot find %x</source>
-<target>En löydä %x</target>
-
-<source>Inactive</source>
-<target>Lepotilassa</target>
-
<source>Today</source>
<target>Tänään</target>
@@ -1293,9 +1313,6 @@ HUOM: Tiedostopolku oltava suhteessa juurihakemistoon.
<source>MB</source>
<target>MB</target>
-<source>Filter</source>
-<target>Suodin</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>
@@ -1305,6 +1322,9 @@ HUOM: Tiedostopolku oltava suhteessa juurihakemistoon.
<pluralform>Haluatko varmasti siirtää nämä %x kohteet Roskakoriin?</pluralform>
</target>
+<source>Move</source>
+<target>Siirrä</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>
@@ -1314,6 +1334,9 @@ HUOM: Tiedostopolku oltava suhteessa juurihakemistoon.
<pluralform>Haluatko todella poistaa nämä %x kohdetta?</pluralform>
</target>
+<source>Exclude</source>
+<target>Sulje pois</target>
+
<source>Direct</source>
<target>Suoraan</target>
@@ -1338,8 +1361,8 @@ HUOM: Tiedostopolku oltava suhteessa juurihakemistoon.
<source>- Other side's counterpart to %item_folder%</source>
<target>- Toisen puolen osa liittyy %item_folder%</target>
-<source>Make hidden warnings and dialogs visible again?</source>
-<target>Näytä piiloitetut varoitukset/ikkunnat uudestaan?</target>
+<source>Restore all hidden windows and warnings?</source>
+<target>Palauta kaikki piiloitetut ikkunat ja varoitukset?</target>
<source>Leave as unresolved conflict</source>
<target>Jätä ratkaisemattomana virheenä</target>
@@ -1464,14 +1487,14 @@ HUOM: Tiedostopolku oltava suhteessa juurihakemistoon.
<pluralform>%x päivää</pluralform>
</target>
-<source>Failed to register to receive system messages.</source>
-<target>Järjestelmäviestien vastaanottoa ei voitu aktivoida.</target>
+<source>Unable to register to receive system messages.</source>
+<target>Virheviestien vastaanotto ei onnistu.</target>
<source>Cannot set privilege %x.</source>
<target>Oikeuksia %x ei voitu asettaa.</target>
-<source>Failed to suspend system sleep mode.</source>
-<target>Lepotilan keskeytys epäonnistui.</target>
+<source>Unable to suspend system sleep mode.</source>
+<target>Lepotilan katkaisu ei onnistu.</target>
<source>Cannot change process I/O priorities.</source>
<target>Prosessin I/O -pririteetin muutos ei onnistu.</target>
diff --git a/BUILD/Languages/french.lng b/BUILD/Languages/french.lng
index ece832e9..d040b728 100644
--- a/BUILD/Languages/french.lng
+++ b/BUILD/Languages/french.lng
@@ -2,16 +2,33 @@
<language>Français</language>
<translator>Jean-François Hartmann</translator>
<locale>fr_FR</locale>
- <flag_image>flag_france.png</flag_image>
- <plural_form_count>2</plural_form_count>
+ <image>flag_france.png</image>
+ <plural_count>2</plural_count>
<plural_definition>n <= 1 ? 0 : 1</plural_definition>
</header>
+<source>
+<pluralform>Do you really want to execute the command %y for one item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+</target>
+
+<source>Retrying operation...</source>
+<target></target>
+
+<source>
+<pluralform>Automatic retry in 1 second...</pluralform>
+<pluralform>Automatic retry in %x seconds...</pluralform>
+</source>
+<target>
+</target>
+
<source>Both sides have changed since last synchronization.</source>
<target>Les deux côtés ont changé depuis la dernière synchronisation.</target>
<source>Cannot determine sync-direction:</source>
-<target>Impossible de déterminer le sens de la synchro :</target>
+<target>Impossible de déterminer le sens de la synchronisation :</target>
<source>No change since last synchronization.</source>
<target>Aucun changement depuis la dernière synchronisation.</target>
@@ -44,7 +61,7 @@
<target>Suppression du lien symbolique %x</target>
<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source>
-<target>La Corbeille n'est pas disponible por les dossiers suivants. Les fichiers seront détruits définitivement /</target>
+<target>La Corbeille n'est pas disponible por les dossiers suivants. Les fichiers seront détruits définitivement :</target>
<source>An exception occurred</source>
<target>Une erreur s'est produite</target>
@@ -65,7 +82,7 @@
<target>Le fichier %x ne contient pas une configuration valide.</target>
<source>Unequal number of left and right directories specified.</source>
-<target>Nombre incorrect de répertoires à gauche et à droite.</target>
+<target>Le nombre de répertoires à gauche et à droite n'est pas identique.</target>
<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
<target>Le fichier de configuration ne peut pas contenir de paramètres au niveau de paires de répertoires quand ceux-ci sont définis par une ligne de commande.</target>
@@ -242,10 +259,10 @@
<target>Création du fichier %x</target>
<source>Items processed:</source>
-<target>Elements traités :</target>
+<target>Élements traités :</target>
<source>Items remaining:</source>
-<target>Elements restants :</target>
+<target>Élements restants :</target>
<source>Total time:</source>
<target>Durée totale :</target>
@@ -292,8 +309,8 @@
<source>/sec</source>
<target>/sec</target>
-<source>%x items</source>
-<target>%x éléments</target>
+<source>%x items/sec</source>
+<target>%x éléments/sec</target>
<source>Configuration file %x loaded partially only.</source>
<target>Le fichier de configuration %x a été chargé seulement partiellement.</target>
@@ -322,11 +339,11 @@
<source>Volume name %x is not part of file path %y.</source>
<target>Le nom de volume %x ne fait pas partie du chemin %y.</target>
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Abandon demandé : En attente de la fin de l'opération en cours...</target>
+<source>Stop requested: Waiting for current operation to finish...</source>
+<target>Arrêt demandé : En attente de la fin de l'opération en cours...</target>
-<source>Failure to create timestamp for versioning:</source>
-<target>Impossible de créer l'horodatage des versions</target>
+<source>Unable to create timestamp for versioning:</source>
+<target>Impossible de créer l'horodatage des versions :</target>
<source>Cannot read the following XML elements:</source>
<target>Impossible de lire les données XML suivantes :</target>
@@ -343,8 +360,8 @@
<source>&Program</source>
<target>&Programme</target>
-<source>&Content</source>
-<target>&Contenu</target>
+<source>&View help</source>
+<target>&Afficher l'aide</target>
<source>&About</source>
<target>A &Propos de</target>
@@ -367,8 +384,8 @@
<source>To get started just import a .ffs_batch file.</source>
<target>Pour démarrer, il faut importer un fichier .ffs_batch.</target>
-<source>Folders to watch</source>
-<target>Dossiers à examiner</target>
+<source>Folders to watch:</source>
+<target>Dossiers à surveiller :</target>
<source>Add folder</source>
<target>Ajout d'un dossier</target>
@@ -382,12 +399,15 @@
<source>Select a folder</source>
<target>Choisissez un dossier</target>
-<source>Idle time [seconds]</source>
-<target>Pause [secondes]</target>
+<source>Idle time (in seconds):</source>
+<target>Durée d'inactivité (en secondes) :</target>
<source>Idle time between last detected change and execution of command</source>
<target>Délai entre le dernier changement détecté et la dernière exécution de la commande</target>
+<source>Command line:</source>
+<target>Ligne de commande :</target>
+
<source>
The command is triggered if:
- files or subfolders change
@@ -399,8 +419,8 @@ La commande est déclenchée si :
- un nouveau dossier apparait (par exemple : insertion d'une clé USB)
</target>
-<source>Start</source>
-<target>Démarrer</target>
+<source>&Start</source>
+<target>&Démarrer</target>
<source>&Retry</source>
<target>&Réessayer</target>
@@ -408,9 +428,6 @@ La commande est déclenchée si :
<source>Cancel</source>
<target>Annuler</target>
-<source>RealtimeSync - Automated Synchronization</source>
-<target>RealtimeSync - Synchronisation Automatisée</target>
-
<source>Build: %x</source>
<target>Généré : %x</target>
@@ -420,6 +437,9 @@ La commande est déclenchée si :
<source>All files</source>
<target>Tous les fichiers</target>
+<source>Automated Synchronization</source>
+<target>Synchronisation Automatique</target>
+
<source>Directory monitoring active</source>
<target>Gestion des répertoires active</target>
@@ -435,7 +455,7 @@ La commande est déclenchée si :
<source>&Exit</source>
<target>&Quitter</target>
-<source>Invalid command line:</source>
+<source>Incorrect command line:</source>
<target>Ligne de commande incorrecte :</target>
<source>File content</source>
@@ -498,8 +518,8 @@ La commande est déclenchée si :
<source>Target folder input field must not be empty.</source>
<target>L'entrée dossier de destination ne doit pas être vide.</target>
-<source>Folder input field for versioning must not be empty.</source>
-<target>L'entrée dossier de gestion des versions ne doit pas être vide.</target>
+<source>Please enter a target folder for versioning.</source>
+<target>Veuillez entrer le dossier destinataire pour la gestion des versions.</target>
<source>Source folder %x not found.</source>
<target>Dossier source %x non trouvé.</target>
@@ -537,8 +557,8 @@ La commande est déclenchée si :
<source>job name</source>
<target>nom du job</target>
-<source>Synchronization aborted</source>
-<target>Synchronisation abandonnée</target>
+<source>Synchronization stopped</source>
+<target>Synchronisation arrêtée</target>
<source>Synchronization completed with errors</source>
<target>Synchronisation terminée avec des erreurs</target>
@@ -555,14 +575,11 @@ La commande est déclenchée si :
<source>Saving log file %x...</source>
<target>Enregistrement du fichier log %x...</target>
-<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
-<target>Cliquez sur "Permuter" pour résoudre les problèmes dans l'écran principal de FreeFileSync.</target>
-
-<source>Switching to FreeFileSync main dialog</source>
-<target>Passage à la fenêtre principale de FreeFileSync</target>
+<source>You can switch to FreeFileSync's main window to resolve this issue.</source>
+<target>Vous pouvez basculer vers la fenêtre principale de FreeFileSync pour résoudre ce problème.</target>
-<source>Retrying operation after error:</source>
-<target>Réessauer l'opération après erreur :</target>
+<source>Switching to FreeFileSync's main window</source>
+<target>Basculer vers la fenêtre principale de FreeFileSync</target>
<source>A new version of FreeFileSync is available:</source>
<target>Une nouvelle version de FreeFileSync est disponible</target>
@@ -570,8 +587,8 @@ La commande est déclenchée si :
<source>Download now?</source>
<target>Télécharger maintenant ?</target>
-<source>New version found</source>
-<target>Une nouvelle version a été trouvée</target>
+<source>Check for Program Updates</source>
+<target>Recherche des Mises à Jour</target>
<source>&Download</source>
<target>&Télécharger</target>
@@ -639,20 +656,20 @@ La commande est déclenchée si :
<source>Hibernate</source>
<target>Figer</target>
-<source>Selected variant:</source>
-<target>Variante choisie :</target>
+<source>Alternate comparison settings</source>
+<target>configuration distincte de la comparaison</target>
-<source>Select alternate comparison settings</source>
-<target>Choisir d'autres paramètres de comparaison</target>
+<source>Alternate synchronization settings</source>
+<target>configuration distincte de la synchronisation</target>
-<source>Select alternate synchronization settings</source>
-<target>Sélectionner une autre configuration de la synchronisation</target>
+<source>Local filter</source>
+<target>Filtre local</target>
-<source>Filter is active</source>
-<target>Le filtre est actif</target>
+<source>Active</source>
+<target>Actif</target>
-<source>No filter selected</source>
-<target>Aucun filtre sélectionné</target>
+<source>None</source>
+<target>Aucun</target>
<source>Remove alternate settings</source>
<target>Supprimer les paramètres de rechange</target>
@@ -666,6 +683,15 @@ La commande est déclenchée si :
<source>Paste</source>
<target>Coller</target>
+<source>Alternate Comparison Settings</source>
+<target>Configuration Distincte de la Comparaison</target>
+
+<source>Alternate Synchronization Settings</source>
+<target>Configuration Distincte de la Synchronisation</target>
+
+<source>Local Filter</source>
+<target>Filtre Local</target>
+
<source>&New</source>
<target>&Nouveau</target>
@@ -681,15 +707,18 @@ La commande est déclenchée si :
<source>2. &Synchronize</source>
<target>2. &Synchroniser</target>
+<source>&Global settings</source>
+<target>&Paramètres généraux</target>
+
<source>&Language</source>
<target>&Langue</target>
+<source>&Find...</source>
+<target>&Rechercher...</target>
+
<source>&Export file list...</source>
<target>&Exportation de la liste des fichiers...</target>
-<source>&Global settings</source>
-<target>&Paramètres généraux</target>
-
<source>&Tools</source>
<target>Ou&tils</target>
@@ -699,18 +728,12 @@ La commande est déclenchée si :
<source>Check &automatically once a week</source>
<target>Contrôler &automatiquement une fois par semaine</target>
-<source>Check for new &version</source>
-<target>Existence d'une nouvelle &version</target>
+<source>&Check for new version</source>
+<target>&Vérifier les nouvelles versions</target>
<source>Compare</source>
<target>Comparer</target>
-<source>Comparison settings</source>
-<target>Paramètres de comparaison</target>
-
-<source>Synchronization settings</source>
-<target>Paramétrage de la synchronisation</target>
-
<source>Synchronize</source>
<target>Synchroniser</target>
@@ -723,6 +746,15 @@ La commande est déclenchée si :
<source>Swap sides</source>
<target>Permuter les côtés</target>
+<source>Close search bar</source>
+<target>Fermer la barre de recherche</target>
+
+<source>Find:</source>
+<target>Rechercher :</target>
+
+<source>Match case</source>
+<target>Respecter la casse</target>
+
<source>Save as batch job</source>
<target>Enrgistrer en temps que fichier batch</target>
@@ -744,74 +776,20 @@ La commande est déclenchée si :
<source>Total bytes to copy</source>
<target>Nombre total d'octets à copier</target>
-<source>Items found:</source>
-<target>Elements trouvés :</target>
-
-<source>Speed:</source>
-<target>Vitesse :</target>
+<source>Select a variant:</source>
+<target>Choisir une variante :</target>
-<source>Time remaining:</source>
-<target>Temps restant :</target>
+<source>Identify equal files by comparing modification time and size.</source>
+<target>Reconnaître les fichiers identiques à l'aide de leur taille et de leur date.</target>
-<source>Time elapsed:</source>
-<target>Temps écoulé :</target>
+<source>Identify equal files by comparing the file content.</source>
+<target>Reconnaître les fichiers identiques à l'aide de leur contenu.</target>
-<source>Synchronizing...</source>
-<target>Synchronisation en cours...</target>
+<source>Symbolic links:</source>
+<target>Liens symboliques</target>
-<source>Minimize to notification area</source>
-<target>Réduction à la zone de notification</target>
-
-<source>On completion</source>
-<target>À la fin</target>
-
-<source>Close</source>
-<target>Fermer</target>
-
-<source>&Pause</source>
-<target>&Pause</target>
-
-<source>Variant</source>
-<target>Variante</target>
-
-<source>Statistics</source>
-<target>Statistiques</target>
-
-<source>&Don't show this dialog again</source>
-<target>&Ne plus afficher cette boîte de dialogue</target>
-
-<source>Select a variant</source>
-<target>Choisir une variante</target>
-
-<source>
-Files are found equal if
- - last write time and date
- - file size
-are the same
-</source>
-<target>
-Les fichiers sont considérés comme identiques si
- - la date et l'heure de modification
- - la taille des fichiers
-sont les mêmes
-</target>
-
-<source>
-Files are found equal if
- - file content
-is the same
-</source>
-<target>
-Les fichiers sont considérés comme identiques si
- - leur contenu
-est identique
-</target>
-
-<source>Symbolic Link handling</source>
-<target>Gestion des Liens Symboliques</target>
-
-<source>Help</source>
-<target>Aide</target>
+<source>More information</source>
+<target>Plus d'informations</target>
<source>OK</source>
<target>OK</target>
@@ -819,11 +797,11 @@ est identique
<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
<target>Identifier et propager les modifications des deux côtés. Suppressions, déplacements et conflits sont détectés automatiquement en utilisant une base de données.</target>
-<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
-<target>Copie miroir du dossier de gauche. Le dossier de droite est modifié pour être strictement identique après la synchronisation.</target>
+<source>Create a mirror backup of the left folder which exactly matches the right folder after synchronization.</source>
+<target>Créer une copie miroir du dossier de gauche qui correspondra exactement à celui de droite après la synchronisation.</target>
-<source>Copy new or updated files to right folder.</source>
-<target>Copie les fichiers nouveaux ou modifiés dans le dossier de droite.</target>
+<source>Copy new and updated files to the right folder.</source>
+<target>Copier les fichiers nouveaux ou mis à jour dans le dossier de droite.</target>
<source>Configure your own synchronization rules.</source>
<target>Paramétrage de vos règles de synchronisation.</target>
@@ -834,23 +812,8 @@ est identique
<source>Requires database files. Not supported by all file systems.</source>
<target>Exige les fichiers de la base de données. Non supporté par tous les systèmes de fichiers.</target>
-<source>Error handling</source>
-<target>Erreur de gestion de fichiers</target>
-
-<source>Ignore</source>
-<target>Ignorer</target>
-
-<source>Hide all error and warning messages</source>
-<target>Masquer tous les messages d'erreurs et les avertissements</target>
-
-<source>Pop-up</source>
-<target>Pop-up</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Montrer les messages d'avertissement ou d'erreur</target>
-
-<source>Deletion handling</source>
-<target>Gestion des suppressions</target>
+<source>Delete files:</source>
+<target>Supprimer les fichiers :</target>
<source>Permanent</source>
<target>Permanent</target>
@@ -873,56 +836,89 @@ est identique
<source>Naming convention:</source>
<target>Convention de nommage :</target>
-<source>Batch job</source>
-<target>Traitement batch</target>
+<source>Show examples</source>
+<target>Afficher les exemples</target>
-<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
-<target>Créer un fichier batch pour une synchronisation non assitée. Pour démarrer, double-cliquez sur ce fichier ou planifiez-le dans le gestionnaire des tâches : %x</target>
+<source>Handle errors:</source>
+<target>Gestion des erreurs :</target>
-<source>Exit</source>
-<target>Quitter</target>
+<source>Ignore</source>
+<target>Ignorer</target>
-<source>Abort synchronization on first error</source>
-<target>Abandonner la synchronisation dès la première erreur</target>
+<source>Hide all error and warning messages</source>
+<target>Masquer tous les messages d'erreurs et les avertissements</target>
-<source>Show progress dialog</source>
-<target>Montrer la fenêtre de progression</target>
+<source>Pop-up</source>
+<target>Pop-up</target>
-<source>Save log</source>
-<target>Sauvegarder le fichier log</target>
+<source>Show pop-up on errors or warnings</source>
+<target>Montrer les messages d'avertissement ou d'erreur</target>
-<source>Select folder to save log files</source>
-<target>Choisir le dossier de sauvegarde des fichiers log</target>
+<source>On completion:</source>
+<target>A la fin :</target>
-<source>Limit</source>
-<target>Limite</target>
+<source>Start synchronization now?</source>
+<target>Démarrer la synchronisation maintenant ?</target>
-<source>Limit maximum number of log files</source>
-<target>Nombre maximal de fichiers log</target>
+<source>Variant:</source>
+<target>Variante :</target>
-<source>Source code written in C++ using:</source>
-<target>Code source écrit en C++ utilisant :</target>
+<source>Statistics</source>
+<target>Statistiques</target>
-<source>If you like FreeFileSync</source>
-<target>Si vous aimez FreeFileSync</target>
+<source>&Don't show this dialog again</source>
+<target>&Ne plus afficher cette boîte de dialogue</target>
-<source>Donate with PayPal</source>
-<target>Faites un don avec PayPal</target>
+<source>Items found:</source>
+<target>Élements trouvés :</target>
-<source>Many thanks for localization:</source>
-<target>Un grand merci pour la traduction à :</target>
+<source>Speed:</source>
+<target>Vitesse :</target>
-<source>Feedback and suggestions are welcome</source>
-<target>Vos commentaires et vos suggestions sont les bienvenus</target>
+<source>Time remaining:</source>
+<target>Temps restant :</target>
-<source>Homepage</source>
-<target>Accueil</target>
+<source>Time elapsed:</source>
+<target>Temps écoulé :</target>
-<source>Email</source>
-<target>Email</target>
+<source>Synchronizing...</source>
+<target>Synchronisation en cours...</target>
-<source>Published under the GNU General Public License</source>
-<target>Publié sous licence GNU General Public License</target>
+<source>Minimize to notification area</source>
+<target>Réduction à la zone de notification</target>
+
+<source>Close</source>
+<target>Fermer</target>
+
+<source>&Pause</source>
+<target>&Pause</target>
+
+<source>Stop</source>
+<target>Arrêt</target>
+
+<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>Créer un fichier batch pour une synchronisation non assitée. Pour démarrer, double-cliquez sur ce fichier ou planifiez-le dans le gestionnaire des tâches : %x</target>
+
+<source>Stop synchronization at first error</source>
+<target>Arrêter la synchronisation à la première erreur</target>
+
+<source>Show progress dialog</source>
+<target>Montrer la fenêtre de progression</target>
+
+<source>Save log:</source>
+<target>Sauvegarder le fichier log :</target>
+
+<source>Limit:</source>
+<target>Mimite :</target>
+
+<source>Limit maximum number of log files</source>
+<target>Nombre maximal de fichiers log</target>
+
+<source>How can I schedule a batch job?</source>
+<target>Comment plannifier un job batch ?</target>
+
+<source>&Recycle bin</source>
+<target>&Corbeille</target>
<source>Delete on both sides</source>
<target>Suppression des deux côtés</target>
@@ -930,95 +926,125 @@ est identique
<source>Delete on both sides even if the file is selected on one side only</source>
<target>Suppression des deux côtés même si le fichier n'est sélectionné que d'un seul côté</target>
-<source>
-Files will only be synchronized if they pass all filter rules.
-Note: File paths must be relative to base directories.
-</source>
-<target>
-Les fichiers ne seront synchronisés que s'ils satisfont aux règles de filtrage.
-Note : Les chemins doivent être relatifs aux répertoires de base.
-</target>
+<source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source>
+<target>Sélectionnez les règles de filtrage pour exclure certains fichiers de la synchronisation. Entrez les chemins des fichiers par rapport à leur paire de dossiers.</target>
-<source>Include</source>
-<target>Inclure</target>
+<source>Include:</source>
+<target>Inclure :</target>
-<source>Exclude</source>
-<target>Exclure</target>
+<source>Exclude:</source>
+<target>Exclure :</target>
-<source>Time span</source>
-<target>Durée</target>
+<source>Time span:</source>
+<target>Intervalle de temps :</target>
-<source>File size</source>
-<target>Taille du fichier</target>
+<source>File size:</source>
+<target>Taille du fichier :</target>
-<source>Minimum</source>
-<target>Minimum</target>
+<source>Minimum:</source>
+<target>Minimum :</target>
-<source>Maximum</source>
-<target>Maximum</target>
+<source>Maximum:</source>
+<target>Maximum :</target>
<source>&Clear</source>
<target>&Effacer</target>
-<source>Global settings</source>
-<target>Paramètres généraux</target>
+<source>The following settings are used for all synchronization jobs.</source>
+<target>Les paramètres suivants sont utilisés lors de toutes les synchronisations.</target>
<source>Fail-safe file copy</source>
<target>Copie de fichiers sécurisé</target>
-<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
-<target>Copie d'abord vers un fichier temporaire (*.ffs_tmp) puis le renomme. Cela garantit un état cohérent même en cas d'erreur fatale.</target>
+<source>
+Copy to a temporary file (*.ffs_tmp) before overwriting target.
+This guarantees a consistent state even in case of a serious error.
+</source>
+<target>
+Copie vers un fichier temporaire (*.ffs_tmp) avant le remplacement de la cible.
+Cela garantit la cohérence du système de fichiers en cas d'erreur grave.
+</target>
+
+<source>(recommended)</source>
+<target>(recommandé)</target>
<source>Copy locked files</source>
<target>Copier les fichiers verrouillés</target>
-<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
-<target>Copie de fichiers partagés ou verrouillés à l'aide du service Volume Shadow Copy (exige les droits d'administrateur)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service.</source>
+<target>Copie les fichiers partagés ou verrouillés à l'aide du Service Volume Shadow Copy.</target>
+
+<source>(requires administrator rights)</source>
+<target>(nécessite les droits administrateur)</target>
<source>Copy file access permissions</source>
<target>Copie des droits d'accès aux fichiers</target>
-<source>Transfer file and folder permissions (requires administrator rights)</source>
-<target>Transfert des autorisations de fichier et de dossier (exige les droits d'administrateur)</target>
+<source>Transfer file and folder permissions.</source>
+<target>Transfert des autorisations des fichiers et dossiers.</target>
-<source>Restore hidden dialogs</source>
-<target>Afficher les boîtes de dialogue masquées</target>
+<source>Automatic retry on error:</source>
+<target>Nouvelle tentative automatique en cas d'erreur :</target>
-<source>External applications</source>
-<target>Applications externes</target>
+<source>Retry count:</source>
+<target>Nombre de tentatives :</target>
+
+<source>Delay (in seconds):</source>
+<target>Délai (en secondes) :</target>
+
+<source>Customize context menu:</source>
+<target>Personnaliser le menu contextuel :</target>
<source>Description</source>
<target>Description</target>
+<source>Restore hidden windows</source>
+<target>Restaurer les fenêtres masquées</target>
+
<source>&Default</source>
<target>&Défaut</target>
-<source>Find what:</source>
-<target>Chercher cela :</target>
+<source>Source code written in C++ using:</source>
+<target>Code source écrit en C++ utilisant :</target>
-<source>Match case</source>
-<target>Respecter la casse</target>
+<source>If you like FreeFileSync</source>
+<target>Si vous aimez FreeFileSync</target>
-<source>&Find next</source>
-<target>&Chercher le suivant</target>
+<source>Donate with PayPal</source>
+<target>Faites un don avec PayPal</target>
-<source>Start synchronization</source>
-<target>Démarrer la synchronisation</target>
+<source>Feedback and suggestions are welcome</source>
+<target>Vos commentaires et vos suggestions sont les bienvenus</target>
-<source>Delete</source>
-<target>Supprimer</target>
+<source>Homepage</source>
+<target>Accueil</target>
-<source>Configure filter</source>
-<target>Configuration des filtres</target>
+<source>Email</source>
+<target>Email</target>
-<source>Find</source>
-<target>Chercher</target>
+<source>Published under the GNU General Public License</source>
+<target>Publié sous licence GNU General Public License</target>
+
+<source>Many thanks for localization:</source>
+<target>Un grand merci pour la traduction à :</target>
-<source>Select time span</source>
-<target>Choisir un intervalle de temps</target>
+<source>Save as Batch Job</source>
+<target>Sauvegarder comme Job Batch</target>
-<source>Folder pairs</source>
-<target>Paires de dossiers</target>
+<source>Delete Items</source>
+<target>Supprimer les Éléments</target>
+
+<source>Global Settings</source>
+<target>Configuration Générale</target>
+
+<source>Select Time Span</source>
+<target>Sélection de l'Intervalle de Temps</target>
+
+<source>Folder Pairs</source>
+<target>Paires de Dossiers</target>
+
+<source>Find</source>
+<target>Rechercher</target>
<source>Overview</source>
<target>Présentation</target>
@@ -1026,14 +1052,14 @@ Note : Les chemins doivent être relatifs aux répertoires de base.
<source>Configuration</source>
<target>Configuration</target>
-<source>Main bar</source>
-<target>Barre principale</target>
+<source>Main Bar</source>
+<target>Barre Principale</target>
-<source>Filter files</source>
-<target>Filtrage des fichiers</target>
+<source>Filter Files</source>
+<target>Filtrage des Fichiers</target>
-<source>Select view</source>
-<target>Choisissez une vue</target>
+<source>Select View</source>
+<target>Sélection de l'Affichage</target>
<source>Open...</source>
<target>Ouvrir ...</target>
@@ -1044,14 +1070,14 @@ Note : Les chemins doivent être relatifs aux répertoires de base.
<source>Compare both sides</source>
<target>Comparer les deux listes</target>
-<source>
-<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
-<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
-</source>
-<target>
-<pluralform>Etes-vous sûr de vouloir exécuter la commande %y pour %x élément ?</pluralform>
-<pluralform>Etes-vous sûr de vouloir exécuter la commande %y pour %x éléments ?</pluralform>
-</target>
+<source>Comparison settings</source>
+<target>Paramètres de comparaison</target>
+
+<source>Synchronization settings</source>
+<target>Paramétrage de la synchronisation</target>
+
+<source>Start synchronization</source>
+<target>Démarrer la synchronisation</target>
<source>Confirm</source>
<target>Confirmer</target>
@@ -1089,12 +1115,6 @@ Note : Les chemins doivent être relatifs aux répertoires de base.
<source>Set direction:</source>
<target>Choix de la direction :</target>
-<source>Exclude temporarily</source>
-<target>Exclure temporairement</target>
-
-<source>Include temporarily</source>
-<target>Inclure temporairement</target>
-
<source>multiple selection</source>
<target>sélection multiple</target>
@@ -1104,6 +1124,15 @@ Note : Les chemins doivent être relatifs aux répertoires de base.
<source>Exclude via filter:</source>
<target>Exclure à l'aide du filtre :</target>
+<source>Exclude temporarily</source>
+<target>Exclure temporairement</target>
+
+<source>Include temporarily</source>
+<target>Inclure temporairement</target>
+
+<source>Delete</source>
+<target>Supprimer</target>
+
<source>Include all</source>
<target>Inclure tout</target>
@@ -1123,7 +1152,7 @@ Note : Les chemins doivent être relatifs aux répertoires de base.
<target>Grand</target>
<source>Select time span...</source>
-<target>choisir un intervalle de temps...</target>
+<target>Choisir un intervalle de temps...</target>
<source>Default view</source>
<target>Vue par défaut</target>
@@ -1152,6 +1181,9 @@ Note : Les chemins doivent être relatifs aux répertoires de base.
<source>Never save &changes</source>
<target>Ne jamais sauvegarder les &modifications</target>
+<source>Filter</source>
+<target>Filtre</target>
+
<source>Show files that exist on left side only</source>
<target>Afficher les fichiers existant seulement à gauche</target>
@@ -1197,12 +1229,18 @@ Note : Les chemins doivent être relatifs aux répertoires de base.
<source>Set as default</source>
<target>Définir par défaut</target>
-<source>Operation aborted</source>
-<target>Opération abandonnée</target>
-
<source>All folders are in sync</source>
<target>Tous les dossiers sont synchronisés</target>
+<source>Synchronization Settings</source>
+<target>Configuration de la Synchronisation</target>
+
+<source>Comparison Settings</source>
+<target>Configuration de la Comparaison</target>
+
+<source>Cannot find %x</source>
+<target>Impossible de trouver %x</target>
+
<source>Comma-separated values</source>
<target>Valeurs séparées par une virgule</target>
@@ -1218,8 +1256,8 @@ Note : Les chemins doivent être relatifs aux répertoires de base.
<source>&Ignore</source>
<target>&Ignorer</target>
-<source>Fatal Error</source>
-<target>Erreur Fatale</target>
+<source>Serious Error</source>
+<target>Erreur Grave</target>
<source>&Don't show this warning again</source>
<target>&Ne plus afficher cet avertissement</target>
@@ -1227,9 +1265,6 @@ Note : Les chemins doivent être relatifs aux répertoires de base.
<source>&Switch</source>
<target>&Changer</target>
-<source>Question</source>
-<target>Question</target>
-
<source>&Yes</source>
<target>&Oui</target>
@@ -1251,8 +1286,8 @@ Note : Les chemins doivent être relatifs aux répertoires de base.
<source>Initializing...</source>
<target>Initialisation...</target>
-<source>Aborted</source>
-<target>Abandonné</target>
+<source>Stopped</source>
+<target>Arrêté</target>
<source>Completed</source>
<target>Terminé</target>
@@ -1263,12 +1298,6 @@ Note : Les chemins doivent être relatifs aux répertoires de base.
<source>Log</source>
<target>Log</target>
-<source>Cannot find %x</source>
-<target>Impossible de trouver %x</target>
-
-<source>Inactive</source>
-<target>Inactif</target>
-
<source>Today</source>
<target>Aujourd'hui</target>
@@ -1293,9 +1322,6 @@ Note : Les chemins doivent être relatifs aux répertoires de base.
<source>MB</source>
<target>Mo</target>
-<source>Filter</source>
-<target>Filtre</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>
@@ -1305,6 +1331,9 @@ Note : Les chemins doivent être relatifs aux répertoires de base.
<pluralform>Etes-vous sûr de vouloir mettre à la Corbeille les %x éléments suivants ?</pluralform>
</target>
+<source>Move</source>
+<target>Déplacer</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>
@@ -1314,6 +1343,9 @@ Note : Les chemins doivent être relatifs aux répertoires de base.
<pluralform>Voulez-vous vraiment supprimer ces %x éléments ?</pluralform>
</target>
+<source>Exclude</source>
+<target>Exclure</target>
+
<source>Direct</source>
<target>Direct</target>
@@ -1338,8 +1370,8 @@ Note : Les chemins doivent être relatifs aux répertoires de base.
<source>- Other side's counterpart to %item_folder%</source>
<target>- Duplication vers %item_folder%</target>
-<source>Make hidden warnings and dialogs visible again?</source>
-<target>Voulez-vous réafficher les avertissements et les boîtes de dialogue ?</target>
+<source>Restore all hidden windows and warnings?</source>
+<target>Reataurer toutes les fenêtres masquées et les avertissements ?</target>
<source>Leave as unresolved conflict</source>
<target>Abandonner en tant que conflit non résolu</target>
@@ -1464,13 +1496,13 @@ Note : Les chemins doivent être relatifs aux répertoires de base.
<pluralform>%x jours</pluralform>
</target>
-<source>Failed to register to receive system messages.</source>
+<source>Unable to register to receive system messages.</source>
<target>Impossible d'enregistrer la réception des messages système.</target>
<source>Cannot set privilege %x.</source>
<target>Impossible de fixer le privilège %x.</target>
-<source>Failed to suspend system sleep mode.</source>
+<source>Unable to suspend system sleep mode.</source>
<target>Impossible de suspendre le mode veille du système.</target>
<source>Cannot change process I/O priorities.</source>
diff --git a/BUILD/Languages/german.lng b/BUILD/Languages/german.lng
index cd78dc28..ca271765 100644
--- a/BUILD/Languages/german.lng
+++ b/BUILD/Languages/german.lng
@@ -2,16 +2,22 @@
<language>Deutsch</language>
<translator>Zenju</translator>
<locale>de_DE</locale>
- <flag_image>flag_germany.png</flag_image>
- <plural_form_count>2</plural_form_count>
+ <image>flag_germany.png</image>
+ <plural_count>2</plural_count>
<plural_definition>n == 1 ? 0 : 1</plural_definition>
</header>
+<source>&Check</source>
+<target>&Prüfen</target>
+
+<source>Syntax error</source>
+<target>Syntaxfehler</target>
+
<source>Both sides have changed since last synchronization.</source>
<target>Beide Seiten wurden seit der letzten Synchronisation verändert.</target>
<source>Cannot determine sync-direction:</source>
-<target>Die Synchronisationsrichtung konnte nicht bestimmt werden:</target>
+<target>Die Synchronisationsrichtung kann nicht bestimmt werden:</target>
<source>No change since last synchronization.</source>
<target>Keine Änderungen seit der letzten Synchronisation.</target>
@@ -52,15 +58,9 @@
<source>A directory path is expected after %x.</source>
<target>Ein Verzeichnispfad wird nach %x erwartet.</target>
-<source>Syntax error</source>
-<target>Syntaxfehler</target>
-
<source>Cannot open file %x.</source>
<target>Die Datei %x kann nicht geöffnet werden.</target>
-<source>Error</source>
-<target>Fehler</target>
-
<source>File %x does not contain a valid configuration.</source>
<target>Die Datei %x enthält keine gültige Konfiguration.</target>
@@ -70,12 +70,12 @@
<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
<target>Die Konfigurationsdatei darf keine Einstellungen auf Verzeichnispaarebene enthalten, wenn Verzeichnisse über die Befehlszeile gesetzt werden.</target>
-<source>Warning</source>
-<target>Warnung</target>
-
<source>Directories cannot be set for more than one configuration file.</source>
<target>Verzeichnisse können nicht für mehr als eine Konfigurationsdatei gesetzt werden.</target>
+<source>Command line</source>
+<target>Kommandozeile</target>
+
<source>Syntax:</source>
<target>Syntax:</target>
@@ -91,9 +91,6 @@
<source>Any number of alternative directories for at most one config file.</source>
<target>Beliebige Anzahl von alternativen Verzeichnissen für höchstens eine Konfigurationsdatei.</target>
-<source>Command line</source>
-<target>Befehlszeile</target>
-
<source>A folder input field is empty.</source>
<target>Ein Ordnereingabefeld ist leer.</target>
@@ -292,8 +289,8 @@
<source>/sec</source>
<target>/sek</target>
-<source>%x items</source>
-<target>%x Elemente</target>
+<source>%x items/sec</source>
+<target>%x Elemente/sek</target>
<source>Configuration file %x loaded partially only.</source>
<target>Die Konfigurationsdatei %x wurde nur teilweise geladen.</target>
@@ -317,15 +314,15 @@
<target>Die Datei %x kann nicht geladen werden.</target>
<source>Cannot determine volume name for %x.</source>
-<target>Der Laufwerksname für %x konnte nicht bestimmt werden.</target>
+<target>Der Laufwerksname für %x kann nicht bestimmt werden.</target>
<source>Volume name %x is not part of file path %y.</source>
<target>Laufwerksname %x ist kein Teil des Dateipfades %y.</target>
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Abbruch initiiert: Warte bis die aktuelle Operation beendet ist...</target>
+<source>Stop requested: Waiting for current operation to finish...</source>
+<target>Stop wurde eingeleitet: Warte bis die aktuelle Operation beendet ist...</target>
-<source>Failure to create timestamp for versioning:</source>
+<source>Unable to create timestamp for versioning:</source>
<target>Der Zeitstempel für die Versionierung kann nicht erstellt werden:</target>
<source>Cannot read the following XML elements:</source>
@@ -343,8 +340,8 @@
<source>&Program</source>
<target>&Programm</target>
-<source>&Content</source>
-<target>&Inhalt</target>
+<source>&View help</source>
+<target>&Hilfe anzeigen</target>
<source>&About</source>
<target>&Über</target>
@@ -367,8 +364,8 @@
<source>To get started just import a .ffs_batch file.</source>
<target>Zum Schnelleinstieg einfach eine .ffs_batch Datei importieren.</target>
-<source>Folders to watch</source>
-<target>Zu überwachende Ordner</target>
+<source>Folders to watch:</source>
+<target>Zu überwachende Ordner:</target>
<source>Add folder</source>
<target>Ordner hinzufügen</target>
@@ -382,12 +379,15 @@
<source>Select a folder</source>
<target>Ordner auswählen</target>
-<source>Idle time [seconds]</source>
-<target>Ruhezeit [Sekunden]</target>
+<source>Idle time (in seconds):</source>
+<target>Ruhezeit (in Sekunden):</target>
<source>Idle time between last detected change and execution of command</source>
<target>Ruhezeit zwischen der letzten erkannten Änderung und dem Aufruf der Befehlszeile</target>
+<source>Command line:</source>
+<target>Befehlszeile:</target>
+
<source>
The command is triggered if:
- files or subfolders change
@@ -399,8 +399,8 @@ Die Befehlszeile wird ausgelöst, wenn:
- neue Ordner erscheinen (z.B. Anschluss eines USB Sticks)
</target>
-<source>Start</source>
-<target>Start</target>
+<source>&Start</source>
+<target>&Start</target>
<source>&Retry</source>
<target>&Wiederholen</target>
@@ -408,24 +408,27 @@ Die Befehlszeile wird ausgelöst, wenn:
<source>Cancel</source>
<target>Abbrechen</target>
-<source>RealtimeSync - Automated Synchronization</source>
-<target>RealtimeSync - Automatisierte Synchronisation</target>
+<source>About</source>
+<target>Über</target>
<source>Build: %x</source>
<target>Build: %x</target>
-<source>About</source>
-<target>Über</target>
-
<source>All files</source>
<target>Alle Dateien</target>
+<source>Automated Synchronization</source>
+<target>Automatisierte Synchronisation</target>
+
<source>Directory monitoring active</source>
<target>Verzeichnisüberwachung ist aktiv</target>
<source>Waiting until all directories are available...</source>
<target>Warte bis alle Verzeichnisse verfügbar sind...</target>
+<source>Error</source>
+<target>Fehler</target>
+
<source>&Restore</source>
<target>&Wiederherstellen</target>
@@ -435,7 +438,7 @@ Die Befehlszeile wird ausgelöst, wenn:
<source>&Exit</source>
<target>&Beenden</target>
-<source>Invalid command line:</source>
+<source>Incorrect command line:</source>
<target>Ungültige Befehlszeile:</target>
<source>File content</source>
@@ -498,8 +501,8 @@ Die Befehlszeile wird ausgelöst, wenn:
<source>Target folder input field must not be empty.</source>
<target>Das Eingabefeld für den Zielordner darf nicht leer sein.</target>
-<source>Folder input field for versioning must not be empty.</source>
-<target>Das Eingabefeld für den Ordner für die Versionierung darf nicht leer sein.</target>
+<source>Please enter a target folder for versioning.</source>
+<target>Bitte geben Sie einen Zielorder für die Versionierung ein.</target>
<source>Source folder %x not found.</source>
<target>Der Quellordner %x wurde nicht gefunden.</target>
@@ -537,8 +540,8 @@ Die Befehlszeile wird ausgelöst, wenn:
<source>job name</source>
<target>Auftragsname</target>
-<source>Synchronization aborted</source>
-<target>Synchronisation abgebrochen</target>
+<source>Synchronization stopped</source>
+<target>Synchronisation gestoppt</target>
<source>Synchronization completed with errors</source>
<target>Synchronisation mit Fehlern abgeschlossen</target>
@@ -555,14 +558,26 @@ Die Befehlszeile wird ausgelöst, wenn:
<source>Saving log file %x...</source>
<target>Speichere Logdatei %x...</target>
-<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
-<target>Drücken Sie "Wechseln", um die Probleme in FreeFileSyncs Hauptdialog zu beheben.</target>
+<source>You can switch to FreeFileSync's main window to resolve this issue.</source>
+<target>Sie können auf FreeFileSyncs Hauptfenster wechseln, um das Problem zu beheben.</target>
+
+<source>Switching to FreeFileSync's main window</source>
+<target>Wechsle auf FreeFileSyncs Hauptfenster</target>
-<source>Switching to FreeFileSync main dialog</source>
-<target>Wechsle in FreeFileSyncs Hauptdialog</target>
+<source>
+<pluralform>Automatic retry in 1 second...</pluralform>
+<pluralform>Automatic retry in %x seconds...</pluralform>
+</source>
+<target>
+<pluralform>Automatische Wiederholung in 1 Sekunde...</pluralform>
+<pluralform>Automatische Wiederholung in %x Sekunden...</pluralform>
+</target>
-<source>Retrying operation after error:</source>
-<target>Wiederhole Operation nach Fehler:</target>
+<source>Retrying operation...</source>
+<target>Wiederhole Operation...</target>
+
+<source>Check for Program Updates</source>
+<target>Suche nach neuer Programmversion</target>
<source>A new version of FreeFileSync is available:</source>
<target>Eine neue Version von FreeFileSync ist verfügbar:</target>
@@ -570,20 +585,14 @@ Die Befehlszeile wird ausgelöst, wenn:
<source>Download now?</source>
<target>Jetzt herunterladen?</target>
-<source>New version found</source>
-<target>Neue Version gefunden</target>
-
<source>&Download</source>
<target>&Download</target>
<source>FreeFileSync is up to date.</source>
<target>FreeFileSync ist auf dem neuesten Stand.</target>
-<source>Information</source>
-<target>Information</target>
-
<source>Unable to connect to sourceforge.net.</source>
-<target>Es konnte keine Verbindung zu Sourceforge.net aufgebaut werden.</target>
+<target>Es kann keine Verbindung zu Sourceforge.net aufgebaut werden.</target>
<source>Cannot find current FreeFileSync version number online. Do you want to check manually?</source>
<target>Die aktuelle FreeFileSync Versionsnummer wurde online nicht gefunden. Möchten Sie manuell prüfen?</target>
@@ -639,20 +648,20 @@ Die Befehlszeile wird ausgelöst, wenn:
<source>Hibernate</source>
<target>Ruhezustand</target>
-<source>Selected variant:</source>
-<target>Ausgewählte Variante:</target>
+<source>Alternate comparison settings</source>
+<target>Alternative Vergleichseinstellungen</target>
-<source>Select alternate comparison settings</source>
-<target>Alternative Vergleichseinstellungen auswählen</target>
+<source>Alternate synchronization settings</source>
+<target>Alternative Synchronisationseinstellungen</target>
-<source>Select alternate synchronization settings</source>
-<target>Alternative Synchronisationseinstellungen auswählen</target>
+<source>Local filter</source>
+<target>Lokaler Filter</target>
-<source>Filter is active</source>
-<target>Filter ist aktiv</target>
+<source>Active</source>
+<target>Aktiv</target>
-<source>No filter selected</source>
-<target>Kein Filter gesetzt</target>
+<source>None</source>
+<target>Ohne</target>
<source>Remove alternate settings</source>
<target>Alternative Einstellungen entfernen</target>
@@ -666,6 +675,15 @@ Die Befehlszeile wird ausgelöst, wenn:
<source>Paste</source>
<target>Einfügen</target>
+<source>Alternate Comparison Settings</source>
+<target>Alternative Vergleichseinstellungen</target>
+
+<source>Alternate Synchronization Settings</source>
+<target>Alternative Synchronisationseinstellungen</target>
+
+<source>Local Filter</source>
+<target>Lokaler Filter</target>
+
<source>&New</source>
<target>&Neu</target>
@@ -673,7 +691,7 @@ Die Befehlszeile wird ausgelöst, wenn:
<target>&Speichern</target>
<source>Save as &batch job...</source>
-<target>Speichern als &Batch-Auftrag...</target>
+<target>Speichern als Batch-&Auftrag...</target>
<source>1. &Compare</source>
<target>1. &Vergleichen</target>
@@ -681,15 +699,18 @@ Die Befehlszeile wird ausgelöst, wenn:
<source>2. &Synchronize</source>
<target>2. &Synchronisieren</target>
+<source>&Global settings</source>
+<target>&Globale Einstellungen</target>
+
<source>&Language</source>
<target>&Sprache</target>
+<source>&Find...</source>
+<target>S&uchen...</target>
+
<source>&Export file list...</source>
<target>Dateiliste e&xportieren...</target>
-<source>&Global settings</source>
-<target>&Globale Einstellungen</target>
-
<source>&Tools</source>
<target>E&xtras</target>
@@ -699,8 +720,8 @@ Die Befehlszeile wird ausgelöst, wenn:
<source>Check &automatically once a week</source>
<target>&Automatisch wöchentlich prüfen</target>
-<source>Check for new &version</source>
-<target>Auf neue &Version prüfen</target>
+<source>&Check for new version</source>
+<target>&Auf neue Version prüfen</target>
<source>Compare</source>
<target>Vergleichen</target>
@@ -720,8 +741,8 @@ Die Befehlszeile wird ausgelöst, wenn:
<source>Close search bar</source>
<target>Suchleiste schließen</target>
-<source>Find what:</source>
-<target>Suchen nach:</target>
+<source>Find:</source>
+<target>Suchen:</target>
<source>Match case</source>
<target>Groß-/Kleinschreibung</target>
@@ -747,74 +768,20 @@ Die Befehlszeile wird ausgelöst, wenn:
<source>Total bytes to copy</source>
<target>Gesamtmenge der zu kopierenden Daten</target>
-<source>Items found:</source>
-<target>Gefundene Elemente:</target>
+<source>Select a variant:</source>
+<target>Variante wählen:</target>
-<source>Speed:</source>
-<target>Geschwindigkeit:</target>
+<source>Identify equal files by comparing modification time and size.</source>
+<target>Erkenne gleiche Dateien anhand der Änderungszeit und Größe.</target>
-<source>Time remaining:</source>
-<target>Verbleibende Zeit:</target>
+<source>Identify equal files by comparing the file content.</source>
+<target>Erkenne gleiche Dateien durch Vergleich des Dateiinhaltes.</target>
-<source>Time elapsed:</source>
-<target>Vergangene Zeit:</target>
+<source>Symbolic links:</source>
+<target>Symbolische Links:</target>
-<source>Synchronizing...</source>
-<target>Synchronisiere...</target>
-
-<source>Minimize to notification area</source>
-<target>In das Benachrichtigungsfeld minimieren</target>
-
-<source>On completion</source>
-<target>Nach Abschluss</target>
-
-<source>Close</source>
-<target>Schließen</target>
-
-<source>&Pause</source>
-<target>&Pause</target>
-
-<source>Variant</source>
-<target>Variante</target>
-
-<source>Statistics</source>
-<target>Statistiken</target>
-
-<source>&Don't show this dialog again</source>
-<target>&Diesen Dialog nicht mehr anzeigen</target>
-
-<source>Select a variant</source>
-<target>Variante auswählen</target>
-
-<source>
-Files are found equal if
- - last write time and date
- - file size
-are the same
-</source>
-<target>
-Dateien gelten als gleich, wenn
- - Datum und Uhrzeit der letzten Änderung
- - die Größe
-gleich sind
-</target>
-
-<source>
-Files are found equal if
- - file content
-is the same
-</source>
-<target>
-Dateien gelten als gleich, wenn
- - der Inhalt
-gleich ist
-</target>
-
-<source>Symbolic Link handling</source>
-<target>Symbolische Links</target>
-
-<source>Help</source>
-<target>Hilfe</target>
+<source>More information</source>
+<target>Mehr Information</target>
<source>OK</source>
<target>OK</target>
@@ -822,11 +789,11 @@ gleich ist
<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
<target>Identifiziere und propagiere Änderungen auf beiden Seiten. Löschungen, Verschiebungen und Konflikte werden automatisch mit Hilfe einer Datenbank erkannt.</target>
-<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
-<target>Spiegelkopie des linken Ordners erstellen. Der rechte Ordner wird dem linken exakt angeglichen.</target>
+<source>Create a mirror backup of the left folder which exactly matches the right folder after synchronization.</source>
+<target>Eine Spiegelkopie des linken Ordners erstellen, die dem rechten Ordner genau entspricht.</target>
-<source>Copy new or updated files to right folder.</source>
-<target>Neue oder aktualisierte Dateien in den rechten Ordner kopieren.</target>
+<source>Copy new and updated files to the right folder.</source>
+<target>Neue und aktualisierte Dateien in den rechten Ordner kopieren.</target>
<source>Configure your own synchronization rules.</source>
<target>Eigene Synchronisationsregeln definieren.</target>
@@ -837,23 +804,8 @@ gleich ist
<source>Requires database files. Not supported by all file systems.</source>
<target>Benötigt Datenbankdateien. Wird nicht von allen Dateisystemen unterstützt.</target>
-<source>Error handling</source>
-<target>Fehlerbehandlung</target>
-
-<source>Ignore</source>
-<target>Ignorieren</target>
-
-<source>Hide all error and warning messages</source>
-<target>Alle Fehler- und Warnmeldungen unterdrücken</target>
-
-<source>Pop-up</source>
-<target>Nachfragen</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Ein Auswahlfenster bei Fehlern oder Warnungen anzeigen</target>
-
-<source>Deletion handling</source>
-<target>Behandlung von Löschungen</target>
+<source>Delete files:</source>
+<target>Dateien löschen:</target>
<source>Permanent</source>
<target>Permanent</target>
@@ -876,104 +828,176 @@ gleich ist
<source>Naming convention:</source>
<target>Namenskonvention:</target>
-<source>Batch job</source>
-<target>Batch-Auftrag</target>
+<source>Show examples</source>
+<target>Zeige Beispiele</target>
+
+<source>Handle errors:</source>
+<target>Fehlerbehandlung:</target>
+
+<source>Ignore</source>
+<target>Ignorieren</target>
+
+<source>Hide all error and warning messages</source>
+<target>Alle Fehler- und Warnmeldungen unterdrücken</target>
+
+<source>Pop-up</source>
+<target>Nachfragen</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Ein Auswahlfenster bei Fehlern oder Warnungen anzeigen</target>
+
+<source>On completion:</source>
+<target>Nach Abschluss:</target>
+
+<source>Start synchronization now?</source>
+<target>Synchronisation jetzt starten?</target>
+
+<source>Variant:</source>
+<target>Variante:</target>
+
+<source>Statistics</source>
+<target>Statistiken</target>
+
+<source>&Don't show this dialog again</source>
+<target>&Diesen Dialog nicht mehr anzeigen</target>
+
+<source>Items found:</source>
+<target>Gefundene Elemente:</target>
+
+<source>Speed:</source>
+<target>Geschwindigkeit:</target>
+
+<source>Time remaining:</source>
+<target>Verbleibende Zeit:</target>
+
+<source>Time elapsed:</source>
+<target>Vergangene Zeit:</target>
+
+<source>Synchronizing...</source>
+<target>Synchronisiere...</target>
+
+<source>Minimize to notification area</source>
+<target>In das Benachrichtigungsfeld minimieren</target>
+
+<source>Close</source>
+<target>Schließen</target>
+
+<source>&Pause</source>
+<target>&Pause</target>
+
+<source>Stop</source>
+<target>Stop</target>
<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
<target>Erstellt eine Batchdatei für die unbeaufsichtigte Synchronisation. Zum Starten die Datei doppelklicken oder in einen Taskplaner eintragen: %x</target>
-<source>Exit</source>
-<target>Beenden</target>
-
-<source>Abort synchronization on first error</source>
-<target>Synchronisation beim ersten Fehler abbrechen</target>
+<source>Stop synchronization at first error</source>
+<target>Synchronisation beim ersten Fehler anhalten</target>
<source>Show progress dialog</source>
<target>Fortschrittsdialog zeigen</target>
-<source>Save log</source>
-<target>Log speichern</target>
-
-<source>Select folder to save log files</source>
-<target>Ordner zum Speichern der Logdateien wählen</target>
+<source>Save log:</source>
+<target>Log speichern:</target>
-<source>Limit</source>
-<target>Limit</target>
+<source>Limit:</source>
+<target>Limit:</target>
<source>Limit maximum number of log files</source>
<target>Maximale Anzahl der Logdateien begrenzen</target>
+<source>How can I schedule a batch job?</source>
+<target>Wie können Batch-Aufträge in den Taskplaner eingetragen werden?</target>
+
+<source>&Recycle bin</source>
+<target>&Papierkorb</target>
+
<source>Delete on both sides</source>
<target>Auf beiden Seiten löschen</target>
<source>Delete on both sides even if the file is selected on one side only</source>
<target>Lösche auf beiden Seiten, auch wenn die Datei nur auf einer Seite markiert ist</target>
-<source>
-Files will only be synchronized if they pass all filter rules.
-Note: File paths must be relative to base directories.
-</source>
-<target>
-Es werden nur Dateien synchronisiert, die zu allen Filterregeln passen.
-Achtung: Dateipfade müssen relativ zu den Basisverzeichnissen sein.
-</target>
+<source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source>
+<target>Wählen Sie Filterregeln aus, um einzelne Dateien von der Synchronisation auszuschließen. Geben Sie Dateipfade relativ zu ihrem zugehörigen Ordnerpaar an.</target>
-<source>Include</source>
-<target>Einschließen</target>
+<source>Include:</source>
+<target>Einschließen:</target>
-<source>Exclude</source>
-<target>Ausschließen</target>
+<source>Exclude:</source>
+<target>Ausschließen:</target>
-<source>Time span</source>
-<target>Zeitspanne</target>
+<source>Time span:</source>
+<target>Zeitspanne:</target>
-<source>File size</source>
-<target>Dateigröße</target>
+<source>File size:</source>
+<target>Dateigröße:</target>
-<source>Minimum</source>
-<target>Minimum</target>
+<source>Minimum:</source>
+<target>Minimum:</target>
-<source>Maximum</source>
-<target>Maximum</target>
+<source>Maximum:</source>
+<target>Maximum:</target>
<source>&Clear</source>
<target>&Löschen</target>
-<source>Global settings</source>
-<target>Globale Einstellungen</target>
+<source>The following settings are used for all synchronization jobs.</source>
+<target>Die folgenden Einstellungen werden für alle Synchronisationsaufgaben verwendet.</target>
<source>Fail-safe file copy</source>
<target>Dateien ausfallsicher kopieren</target>
-<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
-<target>Kopiere zunächst in eine temporäre Datei (*.ffs_tmp) und benenne diese anschließend um. Dadurch wird ein konsistenter Datenstand auch im größten Fehlerfall garantiert.</target>
+<source>
+Copy to a temporary file (*.ffs_tmp) before overwriting target.
+This guarantees a consistent state even in case of a serious error.
+</source>
+<target>
+Kopiere in eine temporäre Datei (*.ffs_tmp) bevor das Ziel überschrieben wird.
+Dadurch wird ein konsistenter Datenstand auch im schweren Fehlerfall garantiert.
+</target>
+
+<source>(recommended)</source>
+<target>(Empfohlen)</target>
<source>Copy locked files</source>
<target>Gesperrte Dateien kopieren</target>
-<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
-<target>Kopiere gesperrte Dateien mit Hilfe des Volumenschattenkopie-Dienstes (benötigt Administratorrechte)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service.</source>
+<target>Kopiere gesperrte Dateien mit Hilfe des Volumenschattenkopie-Dienstes.</target>
+
+<source>(requires administrator rights)</source>
+<target>(Benötigt Administratorrechte)</target>
<source>Copy file access permissions</source>
<target>Dateizugriffsberechtigungen kopieren</target>
-<source>Transfer file and folder permissions (requires administrator rights)</source>
-<target>Übertrage Datei- und Ordnerberechtigungen (benötigt Administratorrechte)</target>
+<source>Transfer file and folder permissions.</source>
+<target>Übertrage Datei- und Ordnerberechtigungen.</target>
+
+<source>Automatic retry on error:</source>
+<target>Automatische Wiederholung bei Fehlern:</target>
-<source>Restore hidden dialogs</source>
-<target>Versteckte Dialoge wiederherstellen</target>
+<source>Retry count:</source>
+<target>Wiederholungen:</target>
-<source>External applications</source>
-<target>Externe Anwendungen</target>
+<source>Delay (in seconds):</source>
+<target>Verzögerung (in Sekunden):</target>
+
+<source>Customize context menu:</source>
+<target>Kontextmenü anpassen:</target>
<source>Description</source>
<target>Beschreibung</target>
+<source>Restore hidden windows</source>
+<target>Versteckte Fenster wiederherstellen</target>
+
<source>&Default</source>
<target>&Standard</target>
<source>Source code written in C++ using:</source>
-<target>Sourcecode in C++ geschrieben mit Hilfe von:</target>
+<target>Der Quellcode wurde in C++ geschrieben mit:</target>
<source>If you like FreeFileSync</source>
<target>Wenn Sie FreeFileSync mögen</target>
@@ -996,25 +1020,22 @@ Achtung: Dateipfade müssen relativ zu den Basisverzeichnissen sein.
<source>Many thanks for localization:</source>
<target>Vielen Dank für die Lokalisation:</target>
-<source>Start synchronization</source>
-<target>Synchronisation starten</target>
-
-<source>Comparison settings</source>
-<target>Vergleichseinstellungen</target>
-
-<source>Synchronization settings</source>
-<target>Synchronisationseinstellungen</target>
+<source>Save as Batch Job</source>
+<target>Als Batch-Auftrag speichern</target>
-<source>Delete</source>
-<target>Löschen</target>
+<source>Delete Items</source>
+<target>Elemente löschen</target>
-<source>Configure filter</source>
-<target>Filter konfigurieren</target>
+<source>Global Settings</source>
+<target>Globale Einstellungen</target>
-<source>Select time span</source>
+<source>Select Time Span</source>
<target>Zeitspanne auswählen</target>
-<source>Folder pairs</source>
+<source>Serious Error</source>
+<target>Schwerer Fehler</target>
+
+<source>Folder Pairs</source>
<target>Ordnerpaare</target>
<source>Find</source>
@@ -1026,13 +1047,13 @@ Achtung: Dateipfade müssen relativ zu den Basisverzeichnissen sein.
<source>Configuration</source>
<target>Konfiguration</target>
-<source>Main bar</source>
+<source>Main Bar</source>
<target>Hauptleiste</target>
-<source>Filter files</source>
+<source>Filter Files</source>
<target>Dateien filtern</target>
-<source>Select view</source>
+<source>Select View</source>
<target>Ansicht auswählen</target>
<source>Open...</source>
@@ -1044,12 +1065,21 @@ Achtung: Dateipfade müssen relativ zu den Basisverzeichnissen sein.
<source>Compare both sides</source>
<target>Beide Seiten vergleichen</target>
+<source>Comparison settings</source>
+<target>Vergleichseinstellungen</target>
+
+<source>Synchronization settings</source>
+<target>Synchronisationseinstellungen</target>
+
+<source>Start synchronization</source>
+<target>Synchronisation starten</target>
+
<source>
-<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for one item?</pluralform>
<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
</source>
<target>
-<pluralform>Soll der Befehl %y wirklich für 1 Element ausgeführt werden?</pluralform>
+<pluralform>Soll der Befehl %y wirklich für ein Element ausgeführt werden?</pluralform>
<pluralform>Soll der Befehl %y wirklich für %x Elemente ausgeführt werden?</pluralform>
</target>
@@ -1104,6 +1134,9 @@ Achtung: Dateipfade müssen relativ zu den Basisverzeichnissen sein.
<source>Include temporarily</source>
<target>Temporär einschließen</target>
+<source>Delete</source>
+<target>Löschen</target>
+
<source>Include all</source>
<target>Alle einschließen</target>
@@ -1152,6 +1185,9 @@ Achtung: Dateipfade müssen relativ zu den Basisverzeichnissen sein.
<source>Never save &changes</source>
<target>Änderungen nie &speichern</target>
+<source>Filter</source>
+<target>Filter</target>
+
<source>Show files that exist on left side only</source>
<target>Nur links existierende Dateien anzeigen</target>
@@ -1197,12 +1233,15 @@ Achtung: Dateipfade müssen relativ zu den Basisverzeichnissen sein.
<source>Set as default</source>
<target>Als Standard festlegen</target>
-<source>Operation aborted</source>
-<target>Vorgang abgebrochen</target>
-
<source>All folders are in sync</source>
<target>Alle Ordner sind synchron</target>
+<source>Synchronization Settings</source>
+<target>Synchronisationseinstellungen</target>
+
+<source>Comparison Settings</source>
+<target>Vergleichseinstellungen</target>
+
<source>Cannot find %x</source>
<target>%x wurde nicht gefunden.</target>
@@ -1215,30 +1254,6 @@ Achtung: Dateipfade müssen relativ zu den Basisverzeichnissen sein.
<source>Searching for program updates...</source>
<target>Suche nach aktualisierten Programmversionen...</target>
-<source>&Ignore subsequent errors</source>
-<target>&Nachfolgende Fehler ignorieren</target>
-
-<source>&Ignore</source>
-<target>&Ignorieren</target>
-
-<source>Fatal Error</source>
-<target>Schwerer Fehler</target>
-
-<source>&Don't show this warning again</source>
-<target>&Diese Warnung nicht mehr anzeigen</target>
-
-<source>&Switch</source>
-<target>&Wechseln</target>
-
-<source>Question</source>
-<target>Frage</target>
-
-<source>&Yes</source>
-<target>&Ja</target>
-
-<source>&No</source>
-<target>&Nein</target>
-
<source>Scanning...</source>
<target>Suche Dateien...</target>
@@ -1248,14 +1263,17 @@ Achtung: Dateipfade müssen relativ zu den Basisverzeichnissen sein.
<source>Info</source>
<target>Info</target>
+<source>Warning</source>
+<target>Warnung</target>
+
<source>Paused</source>
<target>Angehalten</target>
<source>Initializing...</source>
<target>Initialisiere...</target>
-<source>Aborted</source>
-<target>Abgebrochen</target>
+<source>Stopped</source>
+<target>Angehalten</target>
<source>Completed</source>
<target>Fertig</target>
@@ -1266,9 +1284,6 @@ Achtung: Dateipfade müssen relativ zu den Basisverzeichnissen sein.
<source>Log</source>
<target>Protokoll</target>
-<source>Inactive</source>
-<target>Inaktiv</target>
-
<source>Today</source>
<target>Heute</target>
@@ -1293,9 +1308,6 @@ Achtung: Dateipfade müssen relativ zu den Basisverzeichnissen sein.
<source>MB</source>
<target>MB</target>
-<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>
@@ -1305,6 +1317,9 @@ Achtung: Dateipfade müssen relativ zu den Basisverzeichnissen sein.
<pluralform>Sollen die folgenden %x Elemente wirklich in den Papierkorb verschoben werden?</pluralform>
</target>
+<source>Move</source>
+<target>Verschieben</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>
@@ -1314,6 +1329,9 @@ Achtung: Dateipfade müssen relativ zu den Basisverzeichnissen sein.
<pluralform>Sollen die folgenden %x Elemente wirklich gelöscht werden?</pluralform>
</target>
+<source>Exclude</source>
+<target>Ausschließen</target>
+
<source>Direct</source>
<target>Direkt</target>
@@ -1338,8 +1356,8 @@ Achtung: Dateipfade müssen relativ zu den Basisverzeichnissen sein.
<source>- Other side's counterpart to %item_folder%</source>
<target>- Entsprechung der anderen Seite zu %item_folder%</target>
-<source>Make hidden warnings and dialogs visible again?</source>
-<target>Sollen versteckte Warnungen und Dialoge wieder sichtbar gemacht werden?</target>
+<source>Restore all hidden windows and warnings?</source>
+<target>Sollen alle versteckten Fenster und Warnungen wiederhergestellt werden?</target>
<source>Leave as unresolved conflict</source>
<target>Als unbehandelten Konflikt belassen</target>
@@ -1371,6 +1389,24 @@ Achtung: Dateipfade müssen relativ zu den Basisverzeichnissen sein.
<source>Percentage</source>
<target>Prozent</target>
+<source>&Ignore subsequent errors</source>
+<target>&Nachfolgende Fehler ignorieren</target>
+
+<source>&Ignore</source>
+<target>&Ignorieren</target>
+
+<source>&Don't show this warning again</source>
+<target>&Diese Warnung nicht mehr anzeigen</target>
+
+<source>&Switch</source>
+<target>&Wechseln</target>
+
+<source>&Yes</source>
+<target>&Ja</target>
+
+<source>&No</source>
+<target>&Nein</target>
+
<source>Cannot monitor directory %x.</source>
<target>Das Verzeichnis %x kann nicht überwacht werden.</target>
@@ -1464,17 +1500,17 @@ Achtung: Dateipfade müssen relativ zu den Basisverzeichnissen sein.
<pluralform>%x Tage</pluralform>
</target>
-<source>Failed to register to receive system messages.</source>
+<source>Unable to register to receive system messages.</source>
<target>Die Registrierung zum Empfang von Systemmeldungen ist fehlgeschlagen.</target>
<source>Cannot set privilege %x.</source>
<target>Das Privileg %x kann nicht gesetzt werden.</target>
-<source>Failed to suspend system sleep mode.</source>
-<target>Der Schlafmodus des Betriebssystems konnte nicht ausgesetzt werden.</target>
+<source>Unable to suspend system sleep mode.</source>
+<target>Der Schlafmodus des Betriebssystems kann nicht ausgesetzt werden.</target>
<source>Cannot change process I/O priorities.</source>
-<target>Die Eingabe/Ausgabe Prioritäten für den Prozess konnten nicht geändert werden.</target>
+<target>Die Eingabe/Ausgabe Prioritäten für den Prozess kann nicht geändert werden.</target>
<source>Unable to move %x to the recycle bin.</source>
<target>%x kann nicht in den Papierkorb verschoben werden.</target>
diff --git a/BUILD/Languages/greek.lng b/BUILD/Languages/greek.lng
index 96df2f6b..4b74807f 100644
--- a/BUILD/Languages/greek.lng
+++ b/BUILD/Languages/greek.lng
@@ -2,11 +2,24 @@
<language>Eλληνικά</language>
<translator>Γιώργος Δ. Γιαγλής</translator>
<locale>el_GR</locale>
- <flag_image>flag_greece.png</flag_image>
- <plural_form_count>2</plural_form_count>
+ <image>flag_greece.png</image>
+ <plural_count>2</plural_count>
<plural_definition>n == 1 ? 0 : 1</plural_definition>
</header>
+<source>
+<pluralform>Do you really want to execute the command %y for one item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+</target>
+
+<source>&Check</source>
+<target></target>
+
+<source>Retrying operation...</source>
+<target></target>
+
<source>Both sides have changed since last synchronization.</source>
<target>Και οι δυο πλευρές έχουν αλλάξει από τον τελευταίο συγχρονισμό.</target>
@@ -58,9 +71,6 @@
<source>Cannot open file %x.</source>
<target>Δεν είναι δυνατό το άνοιγμα του αρχείου %x.</target>
-<source>Error</source>
-<target>Σφάλματα</target>
-
<source>File %x does not contain a valid configuration.</source>
<target>Το αρχείο %x δεν περιέχει μια έγκυρη διάταξη.</target>
@@ -70,12 +80,12 @@
<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
<target>Το αρχείο διάταξης δεν πρέπει να περιλαμβάνει ρυθμίσεις στο επίπεδο του ζεύγους των υποκαταλόγων, όταν οι υποκατάλογοι ορίζονται μέσω της γραμμής εργασιών.</target>
-<source>Warning</source>
-<target>Προειδοποίηση</target>
-
<source>Directories cannot be set for more than one configuration file.</source>
<target>Δεν μπορούν να οριστούν υποκατάλογοι για περισσότερα από ένα αρχεία διάταξης.</target>
+<source>Command line</source>
+<target>Γραμμή εντολών</target>
+
<source>Syntax:</source>
<target>Σύνταξη:</target>
@@ -91,9 +101,6 @@
<source>Any number of alternative directories for at most one config file.</source>
<target>Οποιοσδήποτε αριθμός εναλλακτικών υποκαταλόγων για το πολύ ένα αρχείο διάταξης.</target>
-<source>Command line</source>
-<target>Γραμμή εντολών</target>
-
<source>A folder input field is empty.</source>
<target>Ένα πεδίο εισαγωγής υποκαταλόγων είναι άδειο.</target>
@@ -292,8 +299,8 @@
<source>/sec</source>
<target>/δευτερόλεπτο</target>
-<source>%x items</source>
-<target>%x αντικείμενα</target>
+<source>%x items/sec</source>
+<target>%x στοιχεία</target>
<source>Configuration file %x loaded partially only.</source>
<target>Το αρχείο διάταξης %x έχει φορτωθεί μόνο κατά ένα μέρος.</target>
@@ -322,11 +329,11 @@
<source>Volume name %x is not part of file path %y.</source>
<target>Το όνομα τόμου %x δεν είναι μέρος της διαδρομής %y.</target>
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Ζητήθηκε ματαίωση: Αναμονή για την λήξη της τρέχουσας εργασίας...</target>
+<source>Stop requested: Waiting for current operation to finish...</source>
+<target>Αίτημα διακοπής: Αναμονή για την ολοκλήρωση της τρέχουσας εργασίας...</target>
-<source>Failure to create timestamp for versioning:</source>
-<target>Αποτυχία να δημιουργηθεί χρονική σήμανση για τη διατήρηση παλιών εκδόσεων:</target>
+<source>Unable to create timestamp for versioning:</source>
+<target>Αδυναμία δημιουργίας χρονικής σήμανσης για διατήρηση εκδόσεων:</target>
<source>Cannot read the following XML elements:</source>
<target>Δεν ήταν δυνατό να αναγνωσθούν τα ακόλουθα στοιχεία XML:</target>
@@ -343,8 +350,8 @@
<source>&Program</source>
<target>&Πρόγραμμα</target>
-<source>&Content</source>
-<target>&Περιεχόμενα</target>
+<source>&View help</source>
+<target>&Προβολή βοήθειας</target>
<source>&About</source>
<target>&Σχετικά</target>
@@ -367,8 +374,8 @@
<source>To get started just import a .ffs_batch file.</source>
<target>Για να ξεκινήσετε μπορείτε απλά να εισάγετε ένα αρχείο .ffs_batch.</target>
-<source>Folders to watch</source>
-<target>Υποκατάλογοι που θα παρακολουθούνται</target>
+<source>Folders to watch:</source>
+<target>Υποκατάλογοι για παρακολούθηση:</target>
<source>Add folder</source>
<target>Προσθήκη υποκαταλόγου</target>
@@ -382,12 +389,15 @@
<source>Select a folder</source>
<target>Επιλογή υποκαταλόγου</target>
-<source>Idle time [seconds]</source>
-<target>Λανθάνων χρόνος [δευτερόλεπτα]</target>
+<source>Idle time (in seconds):</source>
+<target>Λανθάνων χρόνος (σε δευτερόλεπτα):</target>
<source>Idle time between last detected change and execution of command</source>
<target>Λανθάνων χρόνος μεταξύ τελευταίας αλλαγής που ανιχνεύθηκε και εκτέλεσης της εντολής</target>
+<source>Command line:</source>
+<target>Γραμμή εντολών</target>
+
<source>
The command is triggered if:
- files or subfolders change
@@ -399,33 +409,30 @@ The command is triggered if:
-παρουσιαστούν νέοι υποκατάλογοι (π.χ. εισαχθεί ένα φλασάκι USB)
</target>
-<source>Start</source>
-<target>Έναρξη</target>
-
-<source>&Retry</source>
-<target>&Επανάληψη</target>
-
-<source>Cancel</source>
-<target>Άκυρο</target>
+<source>&Start</source>
+<target>Έ&ναρξη</target>
-<source>RealtimeSync - Automated Synchronization</source>
-<target>RealtimeSync - Αυτοματοποιημένος Συγχρονισμός</target>
+<source>About</source>
+<target>Σχετικά με το...</target>
<source>Build: %x</source>
<target>Δημιουργήθηκε : %x</target>
-<source>About</source>
-<target>Σχετικά με το...</target>
-
<source>All files</source>
<target>Όλα τα αρχεία</target>
+<source>Automated Synchronization</source>
+<target>Αυτοματοποιημένος Συγχρονισμός</target>
+
<source>Directory monitoring active</source>
<target>Η παρακολούθηση των υποκαταλόγων είναι ενεργή</target>
<source>Waiting until all directories are available...</source>
<target>Αναμονή μέχρι να είναι διαθέσιμοι όλοι οι υποκατάλογοι...</target>
+<source>Error</source>
+<target>Σφάλματα</target>
+
<source>&Restore</source>
<target>&Επαναφορά</target>
@@ -435,8 +442,11 @@ The command is triggered if:
<source>&Exit</source>
<target>Έ&ξοδος</target>
-<source>Invalid command line:</source>
-<target>Σφάλμα στη γραμμή εντολών:</target>
+<source>Incorrect command line:</source>
+<target>Εσφαλμένη γραμμή εντολών:</target>
+
+<source>&Retry</source>
+<target>&Επανάληψη</target>
<source>File content</source>
<target>Περιεχόμενο αρχείων</target>
@@ -498,8 +508,8 @@ The command is triggered if:
<source>Target folder input field must not be empty.</source>
<target>Το πεδίο εισαγωγής του υποκαταλόγου-στόχου πρέπει να μην είναι κενό.</target>
-<source>Folder input field for versioning must not be empty.</source>
-<target>Το πεδίο εισαγωγής του υποκαταλόγου για διατήρηση παλιών εκδόσεων πρέπει να μην είναι κενό.</target>
+<source>Please enter a target folder for versioning.</source>
+<target>Παρακαλώ εισάγετε έναν υποκατάλογο για αποθήκευση εκδόσεων.</target>
<source>Source folder %x not found.</source>
<target>Ο υποκατάλογος %x δε βρέθηκε.</target>
@@ -537,8 +547,8 @@ The command is triggered if:
<source>job name</source>
<target>όνομα ενέργειας</target>
-<source>Synchronization aborted</source>
-<target>Ο συγχρονισμός ματαιώθηκε</target>
+<source>Synchronization stopped</source>
+<target>Ο συγχρονισμός διακόπηκε</target>
<source>Synchronization completed with errors</source>
<target>Ο συγχρονισμός ολοκληρώθηκε με σφάλματα</target>
@@ -555,14 +565,38 @@ The command is triggered if:
<source>Saving log file %x...</source>
<target>Αποθήκευση του αρχείου καταγραφής %x...</target>
-<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
-<target>Πατήστε "Εναλλαγή" για να επιλύσετε τα θέματα στο κεντρικό παράθυρο του FreeFileSync.</target>
+<source>You can switch to FreeFileSync's main window to resolve this issue.</source>
+<target>Μπορείτε να επιστρέψετε στο κύριο παράθυρο του FreeFileSync για να επιλύσετε αυτό το θέμα.</target>
-<source>Switching to FreeFileSync main dialog</source>
-<target>Εναλλαγή στο βασικό παράθυρο του FreeFileSync</target>
+<source>&Don't show this warning again</source>
+<target>&Να μην εμφανιστεί ξανά αυτή η προειδοποίηση</target>
+
+<source>&Ignore</source>
+<target>&Παράβλεψη</target>
+
+<source>&Switch</source>
+<target>&Εναλλαγή</target>
+
+<source>Switching to FreeFileSync's main window</source>
+<target>Επιστροφή στο κύριο παράθυρο του FreeFileSync</target>
+
+<source>
+<pluralform>Automatic retry in 1 second...</pluralform>
+<pluralform>Automatic retry in %x seconds...</pluralform>
+</source>
+<target>
+<pluralform>Αυτόματη επανάληψη σε 1 δευτερόλεπτο...</pluralform>
+<pluralform>Αυτόματη επανάληψη σε %x δευτερόλεπτα...</pluralform>
+</target>
+
+<source>&Ignore subsequent errors</source>
+<target>&Αγνόηση επόμενων σφαλμάτων</target>
+
+<source>Serious Error</source>
+<target>Σοβαρό Σφάλμα</target>
-<source>Retrying operation after error:</source>
-<target>Επανάληψη της προσπάθειας μετά από σφάλμα:</target>
+<source>Check for Program Updates</source>
+<target>Έλεγχος για Ενημερώσεις του Προγράμματος</target>
<source>A new version of FreeFileSync is available:</source>
<target>Μια νέα έκδοση του FreeFileSync είναι διαθέσιμη:</target>
@@ -570,18 +604,12 @@ The command is triggered if:
<source>Download now?</source>
<target>Λήψη τώρα;</target>
-<source>New version found</source>
-<target>Βρέθηκε νέα έκδοση</target>
-
<source>&Download</source>
<target>&Λήψη</target>
<source>FreeFileSync is up to date.</source>
<target>Το FreeFileSync είναι ενημερωμένο.</target>
-<source>Information</source>
-<target>Πληροφορία</target>
-
<source>Unable to connect to sourceforge.net.</source>
<target>Δεν είναι δυνατή η σύνδεση με το sourceforge.net.</target>
@@ -639,20 +667,20 @@ The command is triggered if:
<source>Hibernate</source>
<target>Αδρανοποίηση</target>
-<source>Selected variant:</source>
-<target>Μέθοδος που επιλέχθηκε:</target>
+<source>Alternate comparison settings</source>
+<target>Διαφοροποιημένες ρυθμίσεις σύγκρισης</target>
-<source>Select alternate comparison settings</source>
-<target>Επιλογή διαφοροποιημένων ρυθμίσεων σύγκρισης</target>
+<source>Alternate synchronization settings</source>
+<target>Διαφοροποιημένες ρυθμίσεις συγχρονισμού</target>
-<source>Select alternate synchronization settings</source>
-<target>Επιλογή διαφοροποιημένων ρυθμίσεων συγχρονισμού</target>
+<source>Local filter</source>
+<target>Τοπικό φίλτρο</target>
-<source>Filter is active</source>
-<target>Το φίλτρο είναι ενεργό</target>
+<source>Active</source>
+<target>Ενεργό</target>
-<source>No filter selected</source>
-<target>Δεν έχει επιλεχθεί φίλτρο</target>
+<source>None</source>
+<target>Καθόλου</target>
<source>Remove alternate settings</source>
<target>Διαγραφή των διαφοροποιημένων ρυθμίσεων</target>
@@ -666,6 +694,15 @@ The command is triggered if:
<source>Paste</source>
<target>Επικόλληση</target>
+<source>Alternate Comparison Settings</source>
+<target>Διαφοροποιημένες Ρυθμίσεις Σύγκρισης</target>
+
+<source>Alternate Synchronization Settings</source>
+<target>Διαφοροποιημένες Ρυθμίσεις Συγχρονισμού</target>
+
+<source>Local Filter</source>
+<target>Τοπικό Φίλτρο</target>
+
<source>&New</source>
<target>&Δημιουργία</target>
@@ -681,15 +718,18 @@ The command is triggered if:
<source>2. &Synchronize</source>
<target>2. Συ&γχρονισμός</target>
+<source>&Global settings</source>
+<target>Γενικές &ρυθμίσεις</target>
+
<source>&Language</source>
<target>&Γλώσσα</target>
+<source>&Find...</source>
+<target>&Εύρεση</target>
+
<source>&Export file list...</source>
<target>Ε&ξαγωγή καταλόγου αρχείων...</target>
-<source>&Global settings</source>
-<target>Γενικές &ρυθμίσεις</target>
-
<source>&Tools</source>
<target>&Εργαλεία</target>
@@ -699,17 +739,14 @@ The command is triggered if:
<source>Check &automatically once a week</source>
<target>&Aυτόματος έλεγχος μια φορά την εβδομάδα</target>
-<source>Check for new &version</source>
+<source>&Check for new version</source>
<target>Έλεγχος για &νέα έκδοση</target>
<source>Compare</source>
<target>Σύγκριση</target>
-<source>Comparison settings</source>
-<target>Ρυθμίσεις σύγκρισης</target>
-
-<source>Synchronization settings</source>
-<target>Ρυθμίσεις συγχρονισμού</target>
+<source>Cancel</source>
+<target>Άκυρο</target>
<source>Synchronize</source>
<target>Συγχρονισμός</target>
@@ -723,6 +760,15 @@ The command is triggered if:
<source>Swap sides</source>
<target>Ανταλλαγή πλευρών</target>
+<source>Close search bar</source>
+<target>Κλείσιμο γραμμής εύρεσης</target>
+
+<source>Find:</source>
+<target>Εύρεση:</target>
+
+<source>Match case</source>
+<target>Αντιστοίχιση πεζών-κεφαλαίων</target>
+
<source>Save as batch job</source>
<target>Αποθήκευση ως δέσμη ενεργειών</target>
@@ -744,74 +790,20 @@ The command is triggered if:
<source>Total bytes to copy</source>
<target>Συνολικός αριθμός bytes προς αντιγραφή</target>
-<source>Items found:</source>
-<target>Βρέθηκαν στοιχεία:</target>
-
-<source>Speed:</source>
-<target>Ταχύτητα:</target>
-
-<source>Time remaining:</source>
-<target>Απομένει χρόνος:</target>
-
-<source>Time elapsed:</source>
-<target>Πέρασε χρόνος:</target>
-
-<source>Synchronizing...</source>
-<target>Γίνεται συγχρονισμός...</target>
-
-<source>Minimize to notification area</source>
-<target>Ελαχιστοποίηση στην περιοχή ειδοποιήσεων</target>
-
-<source>On completion</source>
-<target>Μετά την ολοκλήρωση</target>
+<source>Select a variant:</source>
+<target>Επιλογή μεθόδου:</target>
-<source>Close</source>
-<target>Κλείσιμο</target>
-
-<source>&Pause</source>
-<target>&Παύση</target>
-
-<source>Variant</source>
-<target>Μέθοδος</target>
-
-<source>Statistics</source>
-<target>Στατιστικά</target>
-
-<source>&Don't show this dialog again</source>
-<target>&Να μην εμφανιστεί ξανά αυτό το μήνυμα</target>
-
-<source>Select a variant</source>
-<target>Επιλέξτε μια μέθοδο</target>
-
-<source>
-Files are found equal if
- - last write time and date
- - file size
-are the same
-</source>
-<target>
-Τα αρχεία θεωρούνται ίδια εάν
- - η ημερομηνία και ώρα τελευταίας τροποποίησης
- - το μέγεθός τους
-είναι ίδια
-</target>
+<source>Identify equal files by comparing modification time and size.</source>
+<target>Αναγνώριση των ταυτόσημων αρχείων με σύγκριση του χρόνου τροποποίησης και του μεγέθους.</target>
-<source>
-Files are found equal if
- - file content
-is the same
-</source>
-<target>
-Τα αρχεία θεωρούνται ίδια, εάν
- - το περιεχόμενό τους
-είναι ίδιο
-</target>
+<source>Identify equal files by comparing the file content.</source>
+<target>Αναγνώριση των ταυτόσημων αρχείων με σύγκριση του περιεχομένου τους.</target>
-<source>Symbolic Link handling</source>
-<target>Τρόπος διαχείρισης των συμβολικών δεσμών</target>
+<source>Symbolic links:</source>
+<target>Συμβολικοί δεσμοί:</target>
-<source>Help</source>
-<target>Βοήθεια</target>
+<source>More information</source>
+<target>Περισσότερες πληροφορίες</target>
<source>OK</source>
<target>OK</target>
@@ -819,11 +811,11 @@ is the same
<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
<target>Αναγνώριση και εφαρμογή αλλαγών και στις δυο πλευρές. Οι διαγραφές, οι μεταφορές και οι διενέξεις αναγνωρίζονται αυτόματα με τη βοήθεια μιας βάσης δεδομένων.</target>
-<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
-<target>Κατοπτρικό αντίγραφο του αριστερού υποκαταλόγου. Ο υποκατάλογος δεξιά θα τροποποιηθεί και θα αντιστοιχεί εξολοκλήρου στον αριστερό μετά το συγχρονισμό</target>
+<source>Create a mirror backup of the left folder which exactly matches the right folder after synchronization.</source>
+<target>Δημιουργία ενός κατοπτρικού αντιγράφου του υποκαταλόγου αριστερά, ώστε μετά το συγχρονισμό ο υποκατάλογος δεξιά να είναι ένα ακριβές αντίγραφό του.</target>
-<source>Copy new or updated files to right folder.</source>
-<target>Αντιγραφή των νέων ή πιο πρόσφατων αρχείων στον υποκατάλογο δεξιά.</target>
+<source>Copy new and updated files to the right folder.</source>
+<target>Αντιγραφή των νέων και των τροποποιημένων αρχείων στον υποκατάλογο δεξιά.</target>
<source>Configure your own synchronization rules.</source>
<target>Ορίστε τους δικούς σας κανόνες συγχρονισμού.</target>
@@ -834,23 +826,8 @@ is the same
<source>Requires database files. Not supported by all file systems.</source>
<target>Απαιτεί αρχεία βάσης δεδομένων. Δεν υποστηρίζεται από όλα τα συστήματα αρχείων.</target>
-<source>Error handling</source>
-<target>Διαχείριση σφαλμάτων</target>
-
-<source>Ignore</source>
-<target>Παράβλεψη</target>
-
-<source>Hide all error and warning messages</source>
-<target>Απόκρυψη όλων των σφαλμάτων και προειδοποιήσεων</target>
-
-<source>Pop-up</source>
-<target>Αναδυόμενο μήνυμα</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Εμφάνιση αναδυόμενου παράθυρου σε σφάλματα ή προειδοποιήσεις</target>
-
-<source>Deletion handling</source>
-<target>Διαγραφή των αρχείων</target>
+<source>Delete files:</source>
+<target>Διαγραφή αρχείων:</target>
<source>Permanent</source>
<target>Μόνιμα</target>
@@ -873,56 +850,89 @@ is the same
<source>Naming convention:</source>
<target>Τρόπος ονομασίας:</target>
-<source>Batch job</source>
-<target>Δέσμη ενεργειών</target>
+<source>Show examples</source>
+<target>Εμφάνιση παραδειγμάτων</target>
-<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
-<target>Δημιουργία ενός αρχείου δέσμης για αυτόματο συγχρονισμό. Για να ξεκινήσετε, κάντε διπλό κλικ σε αυτό το αρχείο ή ενσωματώστε το σε ένα χρονοδιάγραμμα εργασιών: %x</target>
+<source>Handle errors:</source>
+<target>Χειρισμός σφαλμάτων:</target>
-<source>Exit</source>
-<target>Έξοδος</target>
+<source>Ignore</source>
+<target>Παράβλεψη</target>
-<source>Abort synchronization on first error</source>
-<target>Ματαίωση του συγχρονισμού με το πρώτο σφάλμα</target>
+<source>Hide all error and warning messages</source>
+<target>Απόκρυψη όλων των σφαλμάτων και προειδοποιήσεων</target>
-<source>Show progress dialog</source>
-<target>Εμφάνιση της αναφοράς προόδου</target>
+<source>Pop-up</source>
+<target>Αναδυόμενο μήνυμα</target>
-<source>Save log</source>
-<target>Αποθήκευση αρχείου καταγραφής</target>
+<source>Show pop-up on errors or warnings</source>
+<target>Εμφάνιση αναδυόμενου παράθυρου σε σφάλματα ή προειδοποιήσεις</target>
-<source>Select folder to save log files</source>
-<target>Επιλογή υποκαταλόγου για την αποθήκευση των αρχείων καταγραφής</target>
+<source>On completion:</source>
+<target>Μετά την ολοκλήρωση:</target>
-<source>Limit</source>
-<target>Μέγιστος αριθμός</target>
+<source>Start synchronization now?</source>
+<target>Να ξεκινήσει ο συγχρονισμός τώρα;</target>
-<source>Limit maximum number of log files</source>
-<target>Μέγιστος αριθμός αρχείων καταγραφής</target>
+<source>Variant:</source>
+<target>Μέθοδος:</target>
-<source>Source code written in C++ using:</source>
-<target>Ο πηγαίος κώδικας γράφτηκε σε C++ χρησιμοποιώντας τα:</target>
+<source>Statistics</source>
+<target>Στατιστικά</target>
-<source>If you like FreeFileSync</source>
-<target>Αν σας αρέσει το FreeFileSync</target>
+<source>&Don't show this dialog again</source>
+<target>&Να μην εμφανιστεί ξανά αυτό το μήνυμα</target>
-<source>Donate with PayPal</source>
-<target>Κάντε μια δωρεά μέσω PayPal</target>
+<source>Items found:</source>
+<target>Βρέθηκαν στοιχεία:</target>
-<source>Many thanks for localization:</source>
-<target>Πολλές ευχαριστίες για τις μεταφράσεις:</target>
+<source>Speed:</source>
+<target>Ταχύτητα:</target>
-<source>Feedback and suggestions are welcome</source>
-<target>Τα σχόλια και οι προτάσεις σας είναι ευπρόσδεκτα</target>
+<source>Time remaining:</source>
+<target>Απομένει χρόνος:</target>
-<source>Homepage</source>
-<target>Ιστοσελίδα</target>
+<source>Time elapsed:</source>
+<target>Πέρασε χρόνος:</target>
-<source>Email</source>
-<target>Email</target>
+<source>Synchronizing...</source>
+<target>Γίνεται συγχρονισμός...</target>
-<source>Published under the GNU General Public License</source>
-<target>Διανέμεται υπό την Γενική Άδεια Δημόσιας Χρήσης GNU</target>
+<source>Minimize to notification area</source>
+<target>Ελαχιστοποίηση στην περιοχή ειδοποιήσεων</target>
+
+<source>Close</source>
+<target>Κλείσιμο</target>
+
+<source>&Pause</source>
+<target>&Παύση</target>
+
+<source>Stop</source>
+<target>Διακοπή</target>
+
+<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>Δημιουργία ενός αρχείου δέσμης για αυτόματο συγχρονισμό. Για να ξεκινήσετε, κάντε διπλό κλικ σε αυτό το αρχείο ή ενσωματώστε το σε ένα χρονοδιάγραμμα εργασιών: %x</target>
+
+<source>Stop synchronization at first error</source>
+<target>Διακοπή του συγχρονισμού με το πρώτο σφάλμα</target>
+
+<source>Show progress dialog</source>
+<target>Εμφάνιση της αναφοράς προόδου</target>
+
+<source>Save log:</source>
+<target>Αποθήκευση αρχείου καταγραφής:</target>
+
+<source>Limit:</source>
+<target>Όριο:</target>
+
+<source>Limit maximum number of log files</source>
+<target>Μέγιστος αριθμός αρχείων καταγραφής</target>
+
+<source>How can I schedule a batch job?</source>
+<target>Πώς μπορώ να προγραμματίσω μια εργασία με δέσμη ενεργειών;</target>
+
+<source>&Recycle bin</source>
+<target>&Κάδος ανακύκλωσης</target>
<source>Delete on both sides</source>
<target>Διαγραφή και στις δυο πλευρές</target>
@@ -930,95 +940,125 @@ is the same
<source>Delete on both sides even if the file is selected on one side only</source>
<target>Διαγραφή και στις δυο πλευρές, ακόμα κι αν το αρχείο έχει επιλεχθεί μόνο στη μια πλευρά</target>
-<source>
-Files will only be synchronized if they pass all filter rules.
-Note: File paths must be relative to base directories.
-</source>
-<target>
-Θα συγχρονιστούν τα αρχεία που ικανοποιούν όλους τους κανόνες των φίλτρων.
-Σημείωση: Οι διαδρομές των αρχείων πρέπει να είναι σχετικές ως προς τους βασικούς υποκαταλόγους.
-</target>
+<source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source>
+<target>Επιλογή κανόνων φιλτραρίσματος, ώστε να αποκλειστούν ορισμένα αρχεία από το συγχρονισμό. Εισάγετε τις διαδρομές των αρχείων σχετικά με το αντίστοιχο ζεύγος υποκαταλόγων.</target>
-<source>Include</source>
-<target>Συμπερίληψη</target>
+<source>Include:</source>
+<target>Συμπερίληψη:</target>
-<source>Exclude</source>
-<target>Εξαίρεση</target>
+<source>Exclude:</source>
+<target>Αποκλεισμός:</target>
-<source>Time span</source>
-<target>Εύρος χρόνου</target>
+<source>Time span:</source>
+<target>Χρονικό εύρος:</target>
-<source>File size</source>
-<target>Μέγεθος αρχείου</target>
+<source>File size:</source>
+<target>Μέγεθος αρχείου:</target>
-<source>Minimum</source>
-<target>Ελάχιστο</target>
+<source>Minimum:</source>
+<target>Ελάχιστο:</target>
-<source>Maximum</source>
+<source>Maximum:</source>
<target>Μέγιστο</target>
<source>&Clear</source>
<target>&Καθαρισμός</target>
-<source>Global settings</source>
-<target>Γενικές ρυθμίσεις</target>
+<source>The following settings are used for all synchronization jobs.</source>
+<target>Οι ακόλουθες ρυθμίσεις χρησιμοποιούνται για όλες τις εργασίες συγχρονισμού.</target>
<source>Fail-safe file copy</source>
<target>Ασφαλής αντιγραφή αρχείων</target>
-<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
-<target>Αντιγραφή αρχικά σε ένα προσωρινό αρχείο (*.ffs_tmp) και στη συνέχεια μετονομασία του. Αυτό εγγυάται μια συνεπή κατάσταση ακόμα και σε περίπτωση μοιραίου σφάλματος.</target>
+<source>
+Copy to a temporary file (*.ffs_tmp) before overwriting target.
+This guarantees a consistent state even in case of a serious error.
+</source>
+<target>
+Αντιγραφή σε ένα προσωρινό αρχείο (*.ffs_tmp) πριν την αντικατάσταση του προορισμού.
+Αυτό εγγυάται μια συνεπή κατάσταση ακόμα και στην περίπτωση σοβαρού σφάλματος.
+</target>
+
+<source>(recommended)</source>
+<target>(προτεινόμενο)</target>
<source>Copy locked files</source>
<target>Αντιγραφή κλειδωμένων αρχείων</target>
-<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
-<target>Αντιγραφή των κοινόχρηστων ή κλειδωμένων αρχείων με τη χρήση της Υπηρεσίας Σκιώδους Αντίγραφου Τόμου (απαιτεί δικαιώματα διαχειριστή)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service.</source>
+<target>Αντιγραφή των κοινών ή κλειδωμένων αρχείων με τη χρήση της Υπηρεσίας Σκιωδών Αντιγράφων Τόμου.</target>
+
+<source>(requires administrator rights)</source>
+<target>(απαιτεί δικαιώματα διαχειριστή)</target>
<source>Copy file access permissions</source>
<target>Αντιγραφή των αδειών προσπέλασης των αρχείων</target>
-<source>Transfer file and folder permissions (requires administrator rights)</source>
-<target>Μεταφορά των αδειών προσπέλασης των αρχείων και των υποκαταλόγων(απαιτεί δικαιώματα διαχειριστή)</target>
+<source>Transfer file and folder permissions.</source>
+<target>Μεταφορά των αδειών προσπέλασης αρχείων και υποκαταλόγων.</target>
+
+<source>Automatic retry on error:</source>
+<target>Αυτόματη επανάληψη σε περίπτωση σφάλματος:</target>
-<source>Restore hidden dialogs</source>
-<target>Επανεμφάνιση κρυμμένων μηνυμάτων</target>
+<source>Retry count:</source>
+<target>Αριθμός προσπαθειών:</target>
-<source>External applications</source>
-<target>Εξωτερικές εφαρμογές</target>
+<source>Delay (in seconds):</source>
+<target>Καθυστέρηση (σε δευτερόλεπτα):</target>
+
+<source>Customize context menu:</source>
+<target>Προσαρμογή μενού επιλογών:</target>
<source>Description</source>
<target>Περιγραφή</target>
+<source>Restore hidden windows</source>
+<target>Επαναφορά των κρυμμένων διαλόγων</target>
+
<source>&Default</source>
<target>&Προεπιλογή</target>
-<source>Find what:</source>
-<target>Αναζήτηση του:</target>
+<source>Source code written in C++ using:</source>
+<target>Ο πηγαίος κώδικας γράφτηκε σε C++ χρησιμοποιώντας τα:</target>
-<source>Match case</source>
-<target>Αντιστοίχιση πεζών-κεφαλαίων</target>
+<source>If you like FreeFileSync</source>
+<target>Αν σας αρέσει το FreeFileSync</target>
-<source>&Find next</source>
-<target>&Εύρεση επομένου</target>
+<source>Donate with PayPal</source>
+<target>Κάντε μια δωρεά μέσω PayPal</target>
-<source>Start synchronization</source>
-<target>Έναρξη του συγχρονισμού</target>
+<source>Feedback and suggestions are welcome</source>
+<target>Τα σχόλια και οι προτάσεις σας είναι ευπρόσδεκτα</target>
-<source>Delete</source>
-<target>Διαγραφή</target>
+<source>Homepage</source>
+<target>Ιστοσελίδα</target>
+
+<source>Email</source>
+<target>Email</target>
-<source>Configure filter</source>
-<target>Ρύθμιση του φίλτρου</target>
+<source>Published under the GNU General Public License</source>
+<target>Διανέμεται υπό την Γενική Άδεια Δημόσιας Χρήσης GNU</target>
-<source>Find</source>
-<target>Αναζήτηση</target>
+<source>Many thanks for localization:</source>
+<target>Πολλές ευχαριστίες για τις μεταφράσεις:</target>
+
+<source>Save as Batch Job</source>
+<target>Αποθήκευση ως Δέσμη Εργασιών</target>
+
+<source>Delete Items</source>
+<target>Διαγραφή Στοιχείων</target>
+
+<source>Global Settings</source>
+<target>Γενικές Ρυθμίσεις</target>
-<source>Select time span</source>
-<target>Επιλογή χρονικού διαστήματος</target>
+<source>Select Time Span</source>
+<target>Επιλογή Χρονικού Εύρους</target>
-<source>Folder pairs</source>
-<target>Ζεύγη υποκαταλόγων</target>
+<source>Folder Pairs</source>
+<target>Ζεύγη Υποκαταλόγων</target>
+
+<source>Find</source>
+<target>Αναζήτηση</target>
<source>Overview</source>
<target>Σύνοψη</target>
@@ -1026,14 +1066,14 @@ Note: File paths must be relative to base directories.
<source>Configuration</source>
<target>Διάταξη</target>
-<source>Main bar</source>
-<target>Γραμμή εργαλείων</target>
+<source>Main Bar</source>
+<target>Κύρια Γραμμή</target>
-<source>Filter files</source>
-<target>Φιλτράρισμα</target>
+<source>Filter Files</source>
+<target>Φιλτράρισμα Αρχείων</target>
-<source>Select view</source>
-<target>Επιλογή εμφάνισης</target>
+<source>Select View</source>
+<target>Επιλογή Εμφάνισης</target>
<source>Open...</source>
<target>Άνοιγμα...</target>
@@ -1044,14 +1084,14 @@ Note: File paths must be relative to base directories.
<source>Compare both sides</source>
<target>Σύγκριση των δύο πλευρών</target>
-<source>
-<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
-<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
-</source>
-<target>
-<pluralform>Είστε σίγουροι ότι θέλετε να εκτελέσετε την εντολή %y για 1 αντικείμενο;</pluralform>
-<pluralform>Είστε σίγουροι ότι θέλετε να εκτελέσετε την εντολή %y για %x αντικείμενα;</pluralform>
-</target>
+<source>Comparison settings</source>
+<target>Ρυθμίσεις σύγκρισης</target>
+
+<source>Synchronization settings</source>
+<target>Ρυθμίσεις συγχρονισμού</target>
+
+<source>Start synchronization</source>
+<target>Έναρξη του συγχρονισμού</target>
<source>Confirm</source>
<target>Επιβεβαίωση</target>
@@ -1089,12 +1129,6 @@ Note: File paths must be relative to base directories.
<source>Set direction:</source>
<target>Επιλογή κατεύθυνσης:</target>
-<source>Exclude temporarily</source>
-<target>Προσωρινή εξαίρεση</target>
-
-<source>Include temporarily</source>
-<target>Προσωρινή συμπερίληψη</target>
-
<source>multiple selection</source>
<target>πολλαπλή επιλογή</target>
@@ -1104,6 +1138,15 @@ Note: File paths must be relative to base directories.
<source>Exclude via filter:</source>
<target>Εξαίρεση με βάση το φίλτρο:</target>
+<source>Exclude temporarily</source>
+<target>Προσωρινή εξαίρεση</target>
+
+<source>Include temporarily</source>
+<target>Προσωρινή συμπερίληψη</target>
+
+<source>Delete</source>
+<target>Διαγραφή</target>
+
<source>Include all</source>
<target>Συμπερίληψη όλων</target>
@@ -1146,11 +1189,14 @@ Note: File paths must be relative to base directories.
<source>Do you want to save changes to %x?</source>
<target>Θέλετε να αποθηκεύσετε τις αλλαγές στο %x;</target>
+<source>Never save &changes</source>
+<target>Να &μην αποθηκεύονται οι αλλαγές</target>
+
<source>Do&n't save</source>
<target>Να &μην αποθηκευθούν</target>
-<source>Never save &changes</source>
-<target>Να &μην αποθηκεύονται οι αλλαγές</target>
+<source>Filter</source>
+<target>Φίλτρο</target>
<source>Show files that exist on left side only</source>
<target>Εμφάνιση των αρχείων που υπάρχουν μόνο στα αριστερά</target>
@@ -1197,12 +1243,18 @@ Note: File paths must be relative to base directories.
<source>Set as default</source>
<target>Ορισμός ως προεπιλογής</target>
-<source>Operation aborted</source>
-<target>Η λειτουργία ματαιώθηκε</target>
-
<source>All folders are in sync</source>
<target>Όλοι οι υποκατάλογοι είναι συγχρονισμένοι</target>
+<source>Synchronization Settings</source>
+<target>Ρυθμίσεις συγχρονισμού</target>
+
+<source>Comparison Settings</source>
+<target>Ρυθμίσεις Σύγκρισης</target>
+
+<source>Cannot find %x</source>
+<target>Δεν μπορεί να βρεθεί το %x</target>
+
<source>Comma-separated values</source>
<target>Αρχείο χωρισμένο με κόμματα</target>
@@ -1212,30 +1264,6 @@ Note: File paths must be relative to base directories.
<source>Searching for program updates...</source>
<target>Αναζήτηση καινούριας έκδοσης...</target>
-<source>&Ignore subsequent errors</source>
-<target>&Αγνόηση επόμενων σφαλμάτων</target>
-
-<source>&Ignore</source>
-<target>&Παράβλεψη</target>
-
-<source>Fatal Error</source>
-<target>Σημαντικό Σφάλμα</target>
-
-<source>&Don't show this warning again</source>
-<target>&Να μην εμφανιστεί ξανά αυτή η προειδοποίηση</target>
-
-<source>&Switch</source>
-<target>&Εναλλαγή</target>
-
-<source>Question</source>
-<target>Ερώτηση</target>
-
-<source>&Yes</source>
-<target>&Ναι</target>
-
-<source>&No</source>
-<target>Ό&χι</target>
-
<source>Scanning...</source>
<target>Ανίχνευση...</target>
@@ -1245,14 +1273,17 @@ Note: File paths must be relative to base directories.
<source>Info</source>
<target>Πληροφορίες</target>
+<source>Warning</source>
+<target>Προειδοποίηση</target>
+
<source>Paused</source>
<target>Σε παύση</target>
<source>Initializing...</source>
<target>Αρχικοποίηση...</target>
-<source>Aborted</source>
-<target>Ματαιώθηκε</target>
+<source>Stopped</source>
+<target>Διεκόπη</target>
<source>Completed</source>
<target>Ολοκληρώθηκε</target>
@@ -1263,12 +1294,6 @@ Note: File paths must be relative to base directories.
<source>Log</source>
<target>Καταγραφή</target>
-<source>Cannot find %x</source>
-<target>Δεν μπορεί να βρεθεί το %x</target>
-
-<source>Inactive</source>
-<target>Ανενεργό</target>
-
<source>Today</source>
<target>Σήμερα</target>
@@ -1293,9 +1318,6 @@ Note: File paths must be relative to base directories.
<source>MB</source>
<target>MB</target>
-<source>Filter</source>
-<target>Φίλτρο</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>
@@ -1305,6 +1327,9 @@ Note: File paths must be relative to base directories.
<pluralform>Είστε σίγουροι ότι θέλετε να μετακινήσετε τα ακόλουθα %x αντικείμενα στον κάδο ανακύκλωσης;</pluralform>
</target>
+<source>Move</source>
+<target>Μεταφορά</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>
@@ -1314,11 +1339,14 @@ Note: File paths must be relative to base directories.
<pluralform>Είσαι σίγουρος ότι θέλεις να διαγραφούν τα ακόλουθα %x αντικείμενα;</pluralform>
</target>
+<source>Exclude</source>
+<target>Εξαίρεση</target>
+
<source>Direct</source>
-<target>Ως δεσμού</target>
+<target>Ως δεσμοί</target>
<source>Follow</source>
-<target>Ως περιεχομένου</target>
+<target>Ως περιεχόμενο</target>
<source>Copy NTFS permissions</source>
<target>Αντιγραφή αδειών προσπέλασης NTFS</target>
@@ -1338,8 +1366,8 @@ Note: File paths must be relative to base directories.
<source>- Other side's counterpart to %item_folder%</source>
<target>- Το αντίστοιχο του %item_folder% της άλλης πλευράς</target>
-<source>Make hidden warnings and dialogs visible again?</source>
-<target>Να επανεμφανιστούν τα κρυμμένα μηνύματα και προειδοποιήσεις;</target>
+<source>Restore all hidden windows and warnings?</source>
+<target>Να γίνει επαναφορά όλων των κρυμμένων μηνυμάτων και προειδοποιήσεων;</target>
<source>Leave as unresolved conflict</source>
<target>Παράβλεψη ως ανεπίλυτη διένεξη</target>
@@ -1464,14 +1492,14 @@ Note: File paths must be relative to base directories.
<pluralform>%x μέρες</pluralform>
</target>
-<source>Failed to register to receive system messages.</source>
-<target>Αποτυχία στην καταχώρηση για τη λήψη μηνυμάτων του συστήματος.</target>
+<source>Unable to register to receive system messages.</source>
+<target>Δεν μπορεί να καταχωρηθεί η λήψη μηνυμάτων συστήματος.</target>
<source>Cannot set privilege %x.</source>
<target>Τα δικαιώματα %x δεν μπορούν να οριστούν.</target>
-<source>Failed to suspend system sleep mode.</source>
-<target>Απέτυχε η αναβολή της αναστολής λειτουργίας του υπολογιστή.</target>
+<source>Unable to suspend system sleep mode.</source>
+<target>Δεν μπορεί να διακοπεί η αναστολή του συστήματος.</target>
<source>Cannot change process I/O priorities.</source>
<target>Δεν μπορούν να αλλάξουν οι προτεραιότητες I/O της διεργασίας.</target>
diff --git a/BUILD/Languages/hebrew.lng b/BUILD/Languages/hebrew.lng
index ede03515..210efe49 100644
--- a/BUILD/Languages/hebrew.lng
+++ b/BUILD/Languages/hebrew.lng
@@ -2,16 +2,20 @@
<language>עברית</language>
<translator>nitnit</translator>
<locale>he_IL</locale>
- <flag_image>flag_israel.png</flag_image>
- <plural_form_count>2</plural_form_count>
+ <image>flag_israel.png</image>
+ <plural_count>2</plural_count>
<plural_definition>n == 1 ? 0 : 1</plural_definition>
</header>
-<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
+<source>Retrying operation...</source>
<target></target>
-<source>Close search bar</source>
-<target></target>
+<source>
+<pluralform>Automatic retry in 1 second...</pluralform>
+<pluralform>Automatic retry in %x seconds...</pluralform>
+</source>
+<target>
+</target>
<source>Both sides have changed since last synchronization.</source>
<target>שני הצדדים שונו מאז הסנכרון האחרון.</target>
@@ -64,9 +68,6 @@
<source>Cannot open file %x.</source>
<target>לא יכול לפתוח קובץ %x.</target>
-<source>Error</source>
-<target>שגיאה</target>
-
<source>File %x does not contain a valid configuration.</source>
<target>קובץ %x אינו כולל תצורה תקינה.</target>
@@ -76,9 +77,6 @@
<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
<target>קבצי הקונפיגורציה אינם יכולים לכלול הגדרות של זוגות מחיצות כאשר מחיצות מוגדרות באמצעות שורת הפקודה</target>
-<source>Warning</source>
-<target>אזהרה</target>
-
<source>Directories cannot be set for more than one configuration file.</source>
<target>מחיצות אינו יכולות להיות מוגדרות עבור יותר מקובץ קונפיגורציה אחד.</target>
@@ -298,8 +296,8 @@
<source>/sec</source>
<target>/שנ</target>
-<source>%x items</source>
-<target>%x פריטים</target>
+<source>%x items/sec</source>
+<target>%x פריטים לשניה</target>
<source>Configuration file %x loaded partially only.</source>
<target>קובץ תצורה %x נטען חלקית בלבד.</target>
@@ -328,11 +326,11 @@
<source>Volume name %x is not part of file path %y.</source>
<target>כרך בשם %x אינו חלק של נתיב קובץ %y.</target>
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>התקבלה בקשת ביטול: מחכה לפעולה הנוכחית להסתיים...</target>
+<source>Stop requested: Waiting for current operation to finish...</source>
+<target>עצירה התבקשה: מחכה שפעולה נוכחית תסתיים...</target>
-<source>Failure to create timestamp for versioning:</source>
-<target>נכשל ייצור תג זמן עבור עדכון גרסאות</target>
+<source>Unable to create timestamp for versioning:</source>
+<target>לא ניתן ליצור תג זמן לגרסאות:</target>
<source>Cannot read the following XML elements:</source>
<target>לא יכול לקרוא את שמות צמתי XML:</target>
@@ -349,8 +347,8 @@
<source>&Program</source>
<target>&תוכנה</target>
-<source>&Content</source>
-<target>&תוכן</target>
+<source>&View help</source>
+<target>&הראה עזרה</target>
<source>&About</source>
<target>&אודות</target>
@@ -373,8 +371,8 @@
<source>To get started just import a .ffs_batch file.</source>
<target>בכדי להתחיל יבא קובץ .ffs_batch</target>
-<source>Folders to watch</source>
-<target>תיקיות לצפייה</target>
+<source>Folders to watch:</source>
+<target>תיקיות לצפייה:</target>
<source>Add folder</source>
<target>הוסף מחיצה</target>
@@ -388,12 +386,15 @@
<source>Select a folder</source>
<target>בחר מחיצה</target>
-<source>Idle time [seconds]</source>
-<target>זמן סרק [שניות]</target>
+<source>Idle time (in seconds):</source>
+<target>זמן המתנה (בשניות):</target>
<source>Idle time between last detected change and execution of command</source>
<target>זמן המתנה בין שינויי מאובחן אחרון לבין ביצוע של פקודה</target>
+<source>Command line:</source>
+<target>שורת פקודה:</target>
+
<source>
The command is triggered if:
- files or subfolders change
@@ -405,8 +406,8 @@ The command is triggered if:
- תיקיות חדשות מופיעות (לדוגמה התקן USB מוכנס)
</target>
-<source>Start</source>
-<target>התחל</target>
+<source>&Start</source>
+<target>&התחל</target>
<source>&Retry</source>
<target>&נסה שנית</target>
@@ -414,9 +415,6 @@ The command is triggered if:
<source>Cancel</source>
<target>בטל</target>
-<source>RealtimeSync - Automated Synchronization</source>
-<target>RealtimeSync - סינכרון אוטומטי</target>
-
<source>Build: %x</source>
<target>מבנה: %x</target>
@@ -426,12 +424,18 @@ The command is triggered if:
<source>All files</source>
<target>כל הקבצים</target>
+<source>Automated Synchronization</source>
+<target>סנכרון אוטומטי</target>
+
<source>Directory monitoring active</source>
<target>ניטור מחיצות פעיל</target>
<source>Waiting until all directories are available...</source>
<target>מחכה עד שכל המחיצות יהיו זמינות...</target>
+<source>Error</source>
+<target>שגיאה</target>
+
<source>&Restore</source>
<target>&טען מחדש</target>
@@ -441,8 +445,8 @@ The command is triggered if:
<source>&Exit</source>
<target>&יציאה</target>
-<source>Invalid command line:</source>
-<target>שורת פקודה בלתי חוקית:</target>
+<source>Incorrect command line:</source>
+<target>שורת פקודה לא תקינה:</target>
<source>File content</source>
<target>תכולת הקובץ</target>
@@ -504,8 +508,8 @@ The command is triggered if:
<source>Target folder input field must not be empty.</source>
<target>קלט תיקיית מטרה אינה יכול להיות ריק.</target>
-<source>Folder input field for versioning must not be empty.</source>
-<target>קלט שדה תיקייה עבור גירסאות אינו יכול להיות ריק.</target>
+<source>Please enter a target folder for versioning.</source>
+<target>בבקשה הזן תיקיית יעד עבור גרסאות.</target>
<source>Source folder %x not found.</source>
<target>תיקיית מקור %x לא נמצאת.</target>
@@ -543,8 +547,8 @@ The command is triggered if:
<source>job name</source>
<target>שם משימה</target>
-<source>Synchronization aborted</source>
-<target>סינכרון בוטל</target>
+<source>Synchronization stopped</source>
+<target>סנכרון הופסק</target>
<source>Synchronization completed with errors</source>
<target>סנכרון הושלם עם שגיאות</target>
@@ -561,14 +565,11 @@ The command is triggered if:
<source>Saving log file %x...</source>
<target>שומר קובץ יומן %x...</target>
-<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
-<target>לחץ על "החלפה" בכדי לפתור בעיות בדיאלוג הראשי.</target>
-
-<source>Switching to FreeFileSync main dialog</source>
-<target>מחליף לתיבת דו שיח ראשית של FreeFileSync</target>
+<source>You can switch to FreeFileSync's main window to resolve this issue.</source>
+<target>ניתן לעבור לחלון הראשי של FreeFileSybc כדי לפתור את הסוגיה הזו.</target>
-<source>Retrying operation after error:</source>
-<target>מנסה שנית לאחר שגיאה:</target>
+<source>Switching to FreeFileSync's main window</source>
+<target>מעבר אל החלון הראשי של FreeFileSybc</target>
<source>A new version of FreeFileSync is available:</source>
<target>גירסה חדשה של FreeFileSync זמינה:</target>
@@ -576,8 +577,8 @@ The command is triggered if:
<source>Download now?</source>
<target>הורד עכשיו?</target>
-<source>New version found</source>
-<target>גרסה חדשה נמצאה</target>
+<source>Check for Program Updates</source>
+<target>בדוק קיום עדכוני תוכנה</target>
<source>&Download</source>
<target>&הורד</target>
@@ -585,9 +586,6 @@ The command is triggered if:
<source>FreeFileSync is up to date.</source>
<target>FreeFileSync מעודכן לגירסה האחרונה.</target>
-<source>Information</source>
-<target>מידע</target>
-
<source>Unable to connect to sourceforge.net.</source>
<target>אין תקשורת ל sourceforge.net.</target>
@@ -645,20 +643,20 @@ The command is triggered if:
<source>Hibernate</source>
<target>עבור למצב שינה</target>
-<source>Selected variant:</source>
-<target>גירסה שנבחרה:</target>
+<source>Alternate comparison settings</source>
+<target>הגדרות השוואה חלופיות</target>
-<source>Select alternate comparison settings</source>
-<target>בחר הגדרות השוואה חליפיות</target>
+<source>Alternate synchronization settings</source>
+<target>הגדרות סנכרון חלופיות</target>
-<source>Select alternate synchronization settings</source>
-<target>בחר הגדרות סנכרון חליפיות</target>
+<source>Local filter</source>
+<target>מסנן מקומי</target>
-<source>Filter is active</source>
-<target>מסנן פעיל</target>
+<source>Active</source>
+<target>פעיל</target>
-<source>No filter selected</source>
-<target>לא נבחר מסנן פעיל</target>
+<source>None</source>
+<target>אין</target>
<source>Remove alternate settings</source>
<target>הסר הגדרות תצורה חליפיות</target>
@@ -672,6 +670,15 @@ The command is triggered if:
<source>Paste</source>
<target>הדבק</target>
+<source>Alternate Comparison Settings</source>
+<target>הגדרות השוואה חלופיות</target>
+
+<source>Alternate Synchronization Settings</source>
+<target>הגדרות סנכרון חלופיות</target>
+
+<source>Local Filter</source>
+<target>מסנן מקומי</target>
+
<source>&New</source>
<target>&חדש</target>
@@ -687,15 +694,18 @@ The command is triggered if:
<source>2. &Synchronize</source>
<target>2. &סנכרן</target>
+<source>&Global settings</source>
+<target>&משתנים גלובליים</target>
+
<source>&Language</source>
<target>&שפה</target>
+<source>&Find...</source>
+<target>&מצא</target>
+
<source>&Export file list...</source>
<target>&יצא רשימת קבצים...</target>
-<source>&Global settings</source>
-<target>&משתנים גלובליים</target>
-
<source>&Tools</source>
<target>&כלים</target>
@@ -705,8 +715,8 @@ The command is triggered if:
<source>Check &automatically once a week</source>
<target>בדוק &אוטומטית אחת לשבוע</target>
-<source>Check for new &version</source>
-<target>בדוק גרסה &חדשה</target>
+<source>&Check for new version</source>
+<target>&בדוק קיום גירסה חדשה</target>
<source>Compare</source>
<target>השוואה</target>
@@ -723,8 +733,11 @@ The command is triggered if:
<source>Swap sides</source>
<target>החלף צדדים</target>
-<source>Find what:</source>
-<target>חפש מה:</target>
+<source>Close search bar</source>
+<target>סגור סרגל חיפוש</target>
+
+<source>Find:</source>
+<target>מצא:</target>
<source>Match case</source>
<target>התאם רישיות</target>
@@ -750,74 +763,20 @@ The command is triggered if:
<source>Total bytes to copy</source>
<target>סה"כ בתים להעתיק</target>
-<source>Items found:</source>
-<target>אלמנטים נמצאו:</target>
+<source>Select a variant:</source>
+<target>בחר גירסה:</target>
-<source>Speed:</source>
-<target>מהירות:</target>
+<source>Identify equal files by comparing modification time and size.</source>
+<target>זהה קבצים זהים באמצעות השוואת תג הזמן והגודל.</target>
-<source>Time remaining:</source>
-<target>זמן שנשאר:</target>
+<source>Identify equal files by comparing the file content.</source>
+<target>זהה קבצים זהים באמצעות השוואת תוכן.</target>
-<source>Time elapsed:</source>
-<target>זמן שעבר:</target>
+<source>Symbolic links:</source>
+<target>קישורים סימבוליים:</target>
-<source>Synchronizing...</source>
-<target>מסנכרן...</target>
-
-<source>Minimize to notification area</source>
-<target>הקטן לאיזור ההתרעות</target>
-
-<source>On completion</source>
-<target>לאחר סיום:</target>
-
-<source>Close</source>
-<target>סגור</target>
-
-<source>&Pause</source>
-<target>&עצור</target>
-
-<source>Variant</source>
-<target>משתנה</target>
-
-<source>Statistics</source>
-<target>סטטיסטיקה</target>
-
-<source>&Don't show this dialog again</source>
-<target>&אל תראה דושיח זה שנית</target>
-
-<source>Select a variant</source>
-<target>בחר גירסה</target>
-
-<source>
-Files are found equal if
- - last write time and date
- - file size
-are the same
-</source>
-<target>
-הקבצים יימצאו כזהים אם
- - זמן ותאריך שמירה אחרונים
- - גודל קובץ
-הם זהים
-</target>
-
-<source>
-Files are found equal if
- - file content
-is the same
-</source>
-<target>
-קבצים מוגדרים כזהים אם
- - תכולת הקובץ
-היא זהה
-</target>
-
-<source>Symbolic Link handling</source>
-<target>טיפול בקישור סימבולי</target>
-
-<source>Help</source>
-<target>עזרה</target>
+<source>More information</source>
+<target>מידע נוסף</target>
<source>OK</source>
<target>אשר</target>
@@ -825,11 +784,11 @@ is the same
<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
<target>זהה והפץ שינויים בשני הצדדים. מחיקות העברות וסתירות מתגלים באופן אוטומטי באמצעות מסד נתונים.</target>
-<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
-<target>גיבוי מראה של מחיצה ימנית. מחיצה שמאלית תתעדכן ותהיה זהה לימנית לאחר הסינכרון.</target>
+<source>Create a mirror backup of the left folder which exactly matches the right folder after synchronization.</source>
+<target>צור גבוי מראה של התיקייה השמאלית אשר יהיה זהה לתיקייה הימנית לאחר הסנכרון.</target>
-<source>Copy new or updated files to right folder.</source>
-<target>העתק קבצים חדשים או מעודכנים למחיצה השמאלית.</target>
+<source>Copy new and updated files to the right folder.</source>
+<target>העתק קבצים חדשים ומעודכנים לתיקייה הימנית.</target>
<source>Configure your own synchronization rules.</source>
<target>סדר את כללי הסנכרון שלך.</target>
@@ -840,23 +799,8 @@ is the same
<source>Requires database files. Not supported by all file systems.</source>
<target>דורש קבצי בסיס נתונים. לא נתמך ע"י כל מערכות הקבצים.</target>
-<source>Error handling</source>
-<target>טיפול בשגיאות</target>
-
-<source>Ignore</source>
-<target>התעלם</target>
-
-<source>Hide all error and warning messages</source>
-<target>הסתר את כל הודעות ההזהרה והשגיאה</target>
-
-<source>Pop-up</source>
-<target>מוקפץ</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>הראה חלונות מוקפצים עבור שגיאות או אזהרות</target>
-
-<source>Deletion handling</source>
-<target>טיפול במחיקות</target>
+<source>Delete files:</source>
+<target>מחק קבצים:</target>
<source>Permanent</source>
<target>קבוע</target>
@@ -879,96 +823,171 @@ is the same
<source>Naming convention:</source>
<target>מוסכמות לקביעת שמות:</target>
-<source>Batch job</source>
-<target>עבודת אצווה</target>
+<source>Show examples</source>
+<target>הראה דוגמאות</target>
+
+<source>Handle errors:</source>
+<target>טפל בשגיאות:</target>
+
+<source>Ignore</source>
+<target>התעלם</target>
+
+<source>Hide all error and warning messages</source>
+<target>הסתר את כל הודעות ההזהרה והשגיאה</target>
+
+<source>Pop-up</source>
+<target>מוקפץ</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>הראה חלונות מוקפצים עבור שגיאות או אזהרות</target>
+
+<source>On completion:</source>
+<target>עם הסיום:</target>
+
+<source>Start synchronization now?</source>
+<target>האם להתחיל סנכרון עכשיו?</target>
+
+<source>Variant:</source>
+<target>גרסה אחרת:</target>
+
+<source>Statistics</source>
+<target>סטטיסטיקה</target>
+
+<source>&Don't show this dialog again</source>
+<target>&אל תראה דושיח זה שנית</target>
+
+<source>Items found:</source>
+<target>אלמנטים נמצאו:</target>
+
+<source>Speed:</source>
+<target>מהירות:</target>
+
+<source>Time remaining:</source>
+<target>זמן שנשאר:</target>
+
+<source>Time elapsed:</source>
+<target>זמן שעבר:</target>
+
+<source>Synchronizing...</source>
+<target>מסנכרן...</target>
+
+<source>Minimize to notification area</source>
+<target>הקטן לאיזור ההתרעות</target>
+
+<source>Close</source>
+<target>סגור</target>
+
+<source>&Pause</source>
+<target>&עצור</target>
+
+<source>Stop</source>
+<target>עצור</target>
<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
<target>צור קובץ אצווה לסינכרון ללא התערבות מפעיל. כדי להפעיל, הקלק הקלקה כפולה על הקובץ או תזמן במתכנן המשימות: %x</target>
-<source>Exit</source>
-<target>יציאה</target>
-
-<source>Abort synchronization on first error</source>
-<target>הפסק פעולת סינכרון בשגיאה ראשונה</target>
+<source>Stop synchronization at first error</source>
+<target>עצור סנכרון עם הופעת שגיאה ראשונה</target>
<source>Show progress dialog</source>
<target>הראה שיח התקדמות</target>
-<source>Save log</source>
-<target>שמור קובץ יומן</target>
-
-<source>Select folder to save log files</source>
-<target>בחר תיקיה לשמירת קובץ יומן</target>
+<source>Save log:</source>
+<target>שמור יומן:</target>
-<source>Limit</source>
-<target>הגבלה</target>
+<source>Limit:</source>
+<target>מגבלה:</target>
<source>Limit maximum number of log files</source>
<target>הגבל מספר מכסימלי של קבצי יומן</target>
+<source>How can I schedule a batch job?</source>
+<target>כיצד לתזמן משימת אצווה?</target>
+
+<source>&Recycle bin</source>
+<target>&סל מחזור</target>
+
<source>Delete on both sides</source>
<target>מחק בשני הצדדים</target>
<source>Delete on both sides even if the file is selected on one side only</source>
<target>מחק בשני הצדדים אף אם הקובץ נבחר בצד אחד בלבד</target>
-<source>
-Files will only be synchronized if they pass all filter rules.
-Note: File paths must be relative to base directories.
-</source>
-<target>
-קבצים יסונכרנו רק אם יקיימו את כל חוקי המסנן.
-הערה: נתיבי קבצים חייבים להיות יחסיים למחיצות הבסיס.
-</target>
+<source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source>
+<target>בחר כללי סינון כדי לא לכלול קבצים מסוימים בסנכרון. הזן את נתיבי הקבצים ביחס לזוג התיקיות בהתאמה.</target>
-<source>Include</source>
-<target>כלול</target>
+<source>Include:</source>
+<target>כלול:</target>
-<source>Exclude</source>
-<target>אל תכלול</target>
+<source>Exclude:</source>
+<target>לא לכלול:</target>
-<source>Time span</source>
-<target>תחום זמן</target>
+<source>Time span:</source>
+<target>טווח זמן:</target>
-<source>File size</source>
-<target>גודל קובץ</target>
+<source>File size:</source>
+<target>גודל קובץ:</target>
-<source>Minimum</source>
-<target>מינימום</target>
+<source>Minimum:</source>
+<target>מינימום:</target>
-<source>Maximum</source>
-<target>מקסימום</target>
+<source>Maximum:</source>
+<target>מקסימום:</target>
<source>&Clear</source>
<target>&נקה</target>
-<source>Global settings</source>
-<target>משתנים גלובליים</target>
+<source>The following settings are used for all synchronization jobs.</source>
+<target>ההגדרות הבאות משמשות לכל משימות הסנכרון.</target>
<source>Fail-safe file copy</source>
<target>כשלון באבטחת העתקת קובץ</target>
-<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
-<target>העתק לקובץ זמני (*.ffs_tmp) ראשית ואז שנה את שמו. זה מבטיח במצ עיקבי במקרה של שגיאה חמורה.</target>
+<source>
+Copy to a temporary file (*.ffs_tmp) before overwriting target.
+This guarantees a consistent state even in case of a serious error.
+</source>
+<target>
+העתק לקובץ זמני (*.ffs_tmp) לפני כתיבה מחדש על היעד.
+זה מבטיח מצב עקבי גם במקרה של שגיאה חמורה.
+</target>
+
+<source>(recommended)</source>
+<target>(מומלץ)</target>
<source>Copy locked files</source>
<target>העתק קבצים נעולים</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service.</source>
+<target>העתק קבצים בשיתוף או בנעילה באמצעות שרות Volume Shadow Copy.</target>
+
+<source>(requires administrator rights)</source>
+<target>(נדרשות זכויות מנהל)</target>
+
<source>Copy file access permissions</source>
<target>העתק הרשאות גישה של הקובץ</target>
-<source>Transfer file and folder permissions (requires administrator rights)</source>
-<target>העבר הרשאות של קובץ ותיקיה (דורש זכויות מנהל)</target>
+<source>Transfer file and folder permissions.</source>
+<target>הרשאות העברת קובץ ומחיצה.</target>
-<source>Restore hidden dialogs</source>
-<target>שחזר דיאלוגים מוסתרים</target>
+<source>Automatic retry on error:</source>
+<target>נסיון חוזר אוטומטי במקרה שגיאה:</target>
-<source>External applications</source>
-<target>תוכנה חיצונית</target>
+<source>Retry count:</source>
+<target>מונה נסיונות חוזרים:</target>
+
+<source>Delay (in seconds):</source>
+<target>השהייה (בשניות):</target>
+
+<source>Customize context menu:</source>
+<target>התאמה אישית של תפריט הקשר:</target>
<source>Description</source>
<target>תאור</target>
+<source>Restore hidden windows</source>
+<target>שחזר חלונות ניסתרים</target>
+
<source>&Default</source>
<target>&ברירת מחדל</target>
@@ -996,26 +1015,20 @@ Note: File paths must be relative to base directories.
<source>Many thanks for localization:</source>
<target>תודות עבור תרגום שפות:</target>
-<source>Start synchronization</source>
-<target>התחל סנכרון</target>
+<source>Save as Batch Job</source>
+<target>שמור כמשימת אצווה</target>
-<source>Comparison settings</source>
-<target>הגדרות השוואה</target>
+<source>Delete Items</source>
+<target>מחק פריטים</target>
-<source>Synchronization settings</source>
-<target>הגדרות סנכרון</target>
+<source>Global Settings</source>
+<target>הגדרות גלובליות</target>
-<source>Delete</source>
-<target>מחק</target>
+<source>Select Time Span</source>
+<target>בחר טווח זמן</target>
-<source>Configure filter</source>
-<target>תצורת מסנן</target>
-
-<source>Select time span</source>
-<target>בחר תחום זמן</target>
-
-<source>Folder pairs</source>
-<target>זוגות מחיצות</target>
+<source>Folder Pairs</source>
+<target>זוגות תיקיות</target>
<source>Find</source>
<target>חפש</target>
@@ -1026,14 +1039,14 @@ Note: File paths must be relative to base directories.
<source>Configuration</source>
<target>תצורה</target>
-<source>Main bar</source>
+<source>Main Bar</source>
<target>סרגל ראשי</target>
-<source>Filter files</source>
-<target>קבצי המסנן</target>
+<source>Filter Files</source>
+<target>סנן קבצים</target>
-<source>Select view</source>
-<target>בחר תצוגה</target>
+<source>Select View</source>
+<target>בחר מבט</target>
<source>Open...</source>
<target>פתח...</target>
@@ -1044,8 +1057,17 @@ Note: File paths must be relative to base directories.
<source>Compare both sides</source>
<target>השווה בין שני הצדדים</target>
+<source>Comparison settings</source>
+<target>הגדרות השוואה</target>
+
+<source>Synchronization settings</source>
+<target>הגדרות סנכרון</target>
+
+<source>Start synchronization</source>
+<target>התחל סנכרון</target>
+
<source>
-<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for one item?</pluralform>
<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
</source>
<target>
@@ -1104,6 +1126,9 @@ Note: File paths must be relative to base directories.
<source>Include temporarily</source>
<target>כלול זמנית</target>
+<source>Delete</source>
+<target>מחק</target>
+
<source>Include all</source>
<target>הכלל הכל</target>
@@ -1152,6 +1177,9 @@ Note: File paths must be relative to base directories.
<source>Never save &changes</source>
<target>לא לשמור שינויים ל&עולם</target>
+<source>Filter</source>
+<target>מסנן</target>
+
<source>Show files that exist on left side only</source>
<target>הראה קבצים הנמצאים אך ורק בצד ימין</target>
@@ -1197,12 +1225,15 @@ Note: File paths must be relative to base directories.
<source>Set as default</source>
<target>הגדר כברירת מחדל</target>
-<source>Operation aborted</source>
-<target>הפעולה בוטלה</target>
-
<source>All folders are in sync</source>
<target>כל התיקיות מסונכרנות</target>
+<source>Synchronization Settings</source>
+<target>הגדרות סנכרון</target>
+
+<source>Comparison Settings</source>
+<target>הגדרות השוואה</target>
+
<source>Cannot find %x</source>
<target>לא מוצא %x</target>
@@ -1215,30 +1246,6 @@ Note: File paths must be relative to base directories.
<source>Searching for program updates...</source>
<target>מחפש עידכוני תוכנה...</target>
-<source>&Ignore subsequent errors</source>
-<target>&התעלם מאזהרות נוספות</target>
-
-<source>&Ignore</source>
-<target>&התעלם</target>
-
-<source>Fatal Error</source>
-<target>שגיאה פטלית</target>
-
-<source>&Don't show this warning again</source>
-<target>&לא להראות אזהרה זו שוב</target>
-
-<source>&Switch</source>
-<target>&החלפה</target>
-
-<source>Question</source>
-<target>שאלה</target>
-
-<source>&Yes</source>
-<target>&כן</target>
-
-<source>&No</source>
-<target>&לא</target>
-
<source>Scanning...</source>
<target>סורק...</target>
@@ -1248,14 +1255,20 @@ Note: File paths must be relative to base directories.
<source>Info</source>
<target>מידע</target>
+<source>Warning</source>
+<target>אזהרה</target>
+
+<source>Serious Error</source>
+<target>שגיאה חמורה</target>
+
<source>Paused</source>
<target>עצור</target>
<source>Initializing...</source>
<target>מאתחל ...</target>
-<source>Aborted</source>
-<target>הופסק</target>
+<source>Stopped</source>
+<target>נעצר</target>
<source>Completed</source>
<target>הושלם</target>
@@ -1266,9 +1279,6 @@ Note: File paths must be relative to base directories.
<source>Log</source>
<target>יומן</target>
-<source>Inactive</source>
-<target>בלתי פעיל</target>
-
<source>Today</source>
<target>היום</target>
@@ -1293,9 +1303,6 @@ Note: File paths must be relative to base directories.
<source>MB</source>
<target>מגה-בייט</target>
-<source>Filter</source>
-<target>מסנן</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>
@@ -1305,6 +1312,9 @@ Note: File paths must be relative to base directories.
<pluralform>האם באמת ברצונך להעביר את הפריטים הבאים %x לסל המחזור?</pluralform>
</target>
+<source>Move</source>
+<target>העבר</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>
@@ -1314,6 +1324,9 @@ Note: File paths must be relative to base directories.
<pluralform>האם ברצונך למחוק את הפריטים %x הבאים?</pluralform>
</target>
+<source>Exclude</source>
+<target>אל תכלול</target>
+
<source>Direct</source>
<target>כוון</target>
@@ -1338,8 +1351,8 @@ Note: File paths must be relative to base directories.
<source>- Other side's counterpart to %item_folder%</source>
<target>הצד השני המקביל ל %item_folder%</target>
-<source>Make hidden warnings and dialogs visible again?</source>
-<target>להפוך דיאלוגים מוסתרים ואזהרות לגלויים שוב?</target>
+<source>Restore all hidden windows and warnings?</source>
+<target>האם לשחזר את כל החלונות וההודעות הנסתרות?</target>
<source>Leave as unresolved conflict</source>
<target>השאר כקונפליקט לא מטופל</target>
@@ -1371,6 +1384,24 @@ Note: File paths must be relative to base directories.
<source>Percentage</source>
<target>אחוז</target>
+<source>&Ignore subsequent errors</source>
+<target>&התעלם מאזהרות נוספות</target>
+
+<source>&Ignore</source>
+<target>&התעלם</target>
+
+<source>&Don't show this warning again</source>
+<target>&לא להראות אזהרה זו שוב</target>
+
+<source>&Switch</source>
+<target>&החלפה</target>
+
+<source>&Yes</source>
+<target>&כן</target>
+
+<source>&No</source>
+<target>&לא</target>
+
<source>Cannot monitor directory %x.</source>
<target>לא יכול לנטר מחיצה %x.</target>
@@ -1464,14 +1495,14 @@ Note: File paths must be relative to base directories.
<pluralform>%x ימים</pluralform>
</target>
-<source>Failed to register to receive system messages.</source>
-<target>נכשל נסיון להקשם לקבלת הודעות מערכת.</target>
+<source>Unable to register to receive system messages.</source>
+<target>לא ניתן להרשם לקבלת הודעות מערכת.</target>
<source>Cannot set privilege %x.</source>
<target>לא יכול להגדיר זבות %x.</target>
-<source>Failed to suspend system sleep mode.</source>
-<target>נכשל נסיון להשעות מצב שינה של המערכת.</target>
+<source>Unable to suspend system sleep mode.</source>
+<target>לא ניתן להשעות מצב שינה של המערכת.</target>
<source>Cannot change process I/O priorities.</source>
<target>לא יכול לשנות קדימויות של תהליך קלט פלט.</target>
diff --git a/BUILD/Languages/hungarian.lng b/BUILD/Languages/hungarian.lng
index 8061b8bf..f7057811 100644
--- a/BUILD/Languages/hungarian.lng
+++ b/BUILD/Languages/hungarian.lng
@@ -2,13 +2,26 @@
<language>Magyar</language>
<translator>szittner</translator>
<locale>hu_HU</locale>
- <flag_image>flag_hungary.png</flag_image>
- <plural_form_count>2</plural_form_count>
+ <image>flag_hungary.png</image>
+ <plural_count>2</plural_count>
<plural_definition>n == 1 ? 0 : 1</plural_definition>
</header>
+<source>&Check</source>
+<target></target>
+
+<source>Retrying operation...</source>
+<target></target>
+
+<source>
+<pluralform>Automatic retry in 1 second...</pluralform>
+<pluralform>Automatic retry in %x seconds...</pluralform>
+</source>
+<target>
+</target>
+
<source>Both sides have changed since last synchronization.</source>
-<target>Mindkét oldal megváltozott az utolsó szikronizálás óta.</target>
+<target>Mindkét oldal megváltozott az utolsó szinkronizálás óta.</target>
<source>Cannot determine sync-direction:</source>
<target>Nem meghatározható a szinkronizálás iránya:</target>
@@ -44,10 +57,10 @@
<target>%x szimbolikus hivatkozás törlése</target>
<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source>
-<target>A Lomtár nem elérhető a következő könytárak esetében. A fájlok ezért véglegesen törlődnek:</target>
+<target>A Lomtár nem elérhető a következő könyvtárak esetében. A fájlok ezért véglegesen törlődnek:</target>
<source>An exception occurred</source>
-<target>Kivétel történt</target>
+<target>Kivétel lépett fel</target>
<source>A directory path is expected after %x.</source>
<target>%x után egy könyvtár elérési útvonalának kell következnie.</target>
@@ -58,9 +71,6 @@
<source>Cannot open file %x.</source>
<target>%x fájl nem nyitható.</target>
-<source>Error</source>
-<target>Hiba</target>
-
<source>File %x does not contain a valid configuration.</source>
<target>%x fájl nem tartalmaz érvényes beállításokat.</target>
@@ -70,12 +80,12 @@
<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
<target>A konfigurációs fájl nem tartalmazhat beállításokat könyvár-pár szinten, ha a könyvtárakat parancssorban állítjuk be.</target>
-<source>Warning</source>
-<target>Figyelmeztetés</target>
-
<source>Directories cannot be set for more than one configuration file.</source>
<target>A könyvtárakat nem lehet egynél több konfigurációs fájlra beállítani</target>
+<source>Command line</source>
+<target>Parancssor</target>
+
<source>Syntax:</source>
<target>Szintaxis:</target>
@@ -91,9 +101,6 @@
<source>Any number of alternative directories for at most one config file.</source>
<target>Tetszőleges számú alternatív könyvtár legfeljebb egy konfigurációs fájlhoz</target>
-<source>Command line</source>
-<target>Parancssor</target>
-
<source>A folder input field is empty.</source>
<target>A könyvtár beviteli mező üres.</target>
@@ -107,7 +114,7 @@
<target>Figyelmen kívül hagyhatod ezt a hibát, ezzel üresnek tekintve minden egyes könyvtárat. A könytárak ekkor automatikusan létrejönnek a szinkronizálás folyamán.</target>
<source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source>
-<target>A következő könytárak egymástól függő útvonalat tartalmaznak. Légy óvatos a szinkronizálás szabályainak meghatározásánál!</target>
+<target>A következő könyvtárak egymástól függő útvonalat tartalmaznak. Légy óvatos a szinkronizálás szabályainak meghatározásánál!</target>
<source>File %x has an invalid date.</source>
<target>%x fájl dátuma érvénytelen.</target>
@@ -292,8 +299,8 @@
<source>/sec</source>
<target>/másodperc</target>
-<source>%x items</source>
-<target>%x elem</target>
+<source>%x items/sec</source>
+<target>%x elem/másodperc</target>
<source>Configuration file %x loaded partially only.</source>
<target>%x konfigurációs fájl csak részlegesen töltődött be: .</target>
@@ -322,11 +329,11 @@
<source>Volume name %x is not part of file path %y.</source>
<target>%x kötet név nem része a(z) %y fájl elérési útvonalnak</target>
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Megszakítást igényelt: Várakozás a folyamatban lévő művelet befejezésére...</target>
+<source>Stop requested: Waiting for current operation to finish...</source>
+<target>Megállás szükséges: várakozás a jelenlegi művelet befejezésére...</target>
-<source>Failure to create timestamp for versioning:</source>
-<target>Nem sikerült a verziókövetéshez szükséges időbélyeg létrehozása:</target>
+<source>Unable to create timestamp for versioning:</source>
+<target>Nem sikerült időbélyeget generálni a verziókövetéshez</target>
<source>Cannot read the following XML elements:</source>
<target>Nem sikerült a következő XML elemek olvasása:</target>
@@ -343,8 +350,8 @@
<source>&Program</source>
<target>&Program</target>
-<source>&Content</source>
-<target>&Tartalom</target>
+<source>&View help</source>
+<target>&Nézd meg a súgót</target>
<source>&About</source>
<target>&A programról</target>
@@ -365,10 +372,10 @@
<target>3. Nyomd meg a Start gombot.</target>
<source>To get started just import a .ffs_batch file.</source>
-<target>Az induláshoz importálj be egy .ffs_batch fájlt.</target>
+<target>Az induláshoz importálj egy .ffs_batch fájlt.</target>
-<source>Folders to watch</source>
-<target>Figyelendő könyvtárak</target>
+<source>Folders to watch:</source>
+<target>Figyelendő könyvtárak:</target>
<source>Add folder</source>
<target>Könyvtárat hozzáad</target>
@@ -382,12 +389,15 @@
<source>Select a folder</source>
<target>Könyvtárat kiválaszt</target>
-<source>Idle time [seconds]</source>
-<target>Üresjárat (másodpercben)</target>
+<source>Idle time (in seconds):</source>
+<target>Üresjárat időtartama (másodperc):</target>
<source>Idle time between last detected change and execution of command</source>
<target>Üresjárat időtartama az utolsó változás észlelése és a parancs végrehajtása között</target>
+<source>Command line:</source>
+<target>Parancssor:</target>
+
<source>
The command is triggered if:
- files or subfolders change
@@ -399,8 +409,8 @@ A parancs végrehajtódik, ha:
- új könyvtárak jelennek meg (pl. USB-kulcs csatlakoztatása)
</target>
-<source>Start</source>
-<target>Indítás</target>
+<source>&Start</source>
+<target>&Start</target>
<source>&Retry</source>
<target>&Ismét</target>
@@ -408,24 +418,27 @@ A parancs végrehajtódik, ha:
<source>Cancel</source>
<target>Mégsem</target>
-<source>RealtimeSync - Automated Synchronization</source>
-<target>Valós idejű - Automatikus szinkronizálás</target>
+<source>About</source>
+<target>A programról</target>
<source>Build: %x</source>
<target>Build: %x</target>
-<source>About</source>
-<target>A programról</target>
-
<source>All files</source>
<target>Összes fájl</target>
+<source>Automated Synchronization</source>
+<target>Automatizált szinkronizálás</target>
+
<source>Directory monitoring active</source>
-<target>A könytár figyelés aktív</target>
+<target>A könyvtár figyelés aktív</target>
<source>Waiting until all directories are available...</source>
<target>Várakozik, amíg az összes könyvtár elérhetővé válik...</target>
+<source>Error</source>
+<target>Hiba</target>
+
<source>&Restore</source>
<target>&Visszaállít</target>
@@ -435,8 +448,8 @@ A parancs végrehajtódik, ha:
<source>&Exit</source>
<target>&Kilép</target>
-<source>Invalid command line:</source>
-<target>Érvénytelen parancssor:</target>
+<source>Incorrect command line:</source>
+<target>Hibás parancssor:</target>
<source>File content</source>
<target>Fájl tartalma</target>
@@ -496,10 +509,10 @@ A parancs végrehajtódik, ha:
<target>%x célkönyvtár már létezik.</target>
<source>Target folder input field must not be empty.</source>
-<target>A célkönytárat meghatározó beviteli mező nem lehet üres.</target>
+<target>A célkönyvtárat meghatározó beviteli mező nem lehet üres.</target>
-<source>Folder input field for versioning must not be empty.</source>
-<target>A verziókövetéshez a könytárat meghatározó beviteli mező nem lehet üres.</target>
+<source>Please enter a target folder for versioning.</source>
+<target>Adja meg a célkönyvtárat a verziókövetéshez.</target>
<source>Source folder %x not found.</source>
<target>%x forráskönyvtár nem található .</target>
@@ -523,13 +536,13 @@ A parancs végrehajtódik, ha:
<target>Egy olyan könyvtár kerül módosításra, amely több könyvtár-pár része. Kérjük, ellenőrizze a szinkronizálási beállításokat.</target>
<source>Synchronizing folder pair:</source>
-<target>A szinkronizált könytár-pár:</target>
+<target>A szinkronizált könyvtár-pár:</target>
<source>Generating database...</source>
<target>Adatbázis generálása...</target>
<source>Creating a Volume Shadow Copy for %x...</source>
-<target>Készít egy ányékmásolat-kötetet %x számára</target>
+<target>Készít egy árnyékmásolat-kötetet %x számára</target>
<source>Data verification error: %x and %y have different content.</source>
<target>Adat-ellenőrzési hiba: %x és %y tartalma különböző.</target>
@@ -537,8 +550,8 @@ A parancs végrehajtódik, ha:
<source>job name</source>
<target>feladat neve</target>
-<source>Synchronization aborted</source>
-<target>A szinkronizálás megszakítva</target>
+<source>Synchronization stopped</source>
+<target>Szinkronizálás leállítva</target>
<source>Synchronization completed with errors</source>
<target>A szinkronizálás befejeződött, de történtek hibák</target>
@@ -555,14 +568,14 @@ A parancs végrehajtódik, ha:
<source>Saving log file %x...</source>
<target>Naplófájl mentése a következő fájlba: %x.</target>
-<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
-<target>Nyomd meg az "Váltás" gombot az események kezeléséhez a FreeFileSync fő párbeszédablakában.</target>
+<source>You can switch to FreeFileSync's main window to resolve this issue.</source>
+<target>E jelenség megoldásához kapcsoljon át a FreeFileSync fő ablakába.</target>
-<source>Switching to FreeFileSync main dialog</source>
-<target>Váltás a FreeFileSync fő párbeszéd-ablakára</target>
+<source>Switching to FreeFileSync's main window</source>
+<target>Átkapcsolás a FreeFileSync fő ablakába</target>
-<source>Retrying operation after error:</source>
-<target>Újrapróbálja a műveletet a hiba után:</target>
+<source>Check for Program Updates</source>
+<target>Program-frissítések ellenőrzése</target>
<source>A new version of FreeFileSync is available:</source>
<target>Elérhető a FreeFileSync új verziója:</target>
@@ -570,18 +583,12 @@ A parancs végrehajtódik, ha:
<source>Download now?</source>
<target>Letöltsem most?</target>
-<source>New version found</source>
-<target>Új verziót találtam</target>
-
<source>&Download</source>
<target>&Letölt</target>
<source>FreeFileSync is up to date.</source>
<target>A FreeFileSync naprakész.</target>
-<source>Information</source>
-<target>Információ</target>
-
<source>Unable to connect to sourceforge.net.</source>
<target>Nem sikerült a csatlakozás a sourceforge.net-hez.</target>
@@ -639,20 +646,20 @@ A parancs végrehajtódik, ha:
<source>Hibernate</source>
<target>Hibernál</target>
-<source>Selected variant:</source>
-<target>Kiválasztott változat:</target>
+<source>Alternate comparison settings</source>
+<target>Megváltoztatja az összehasonlítási beállításokat</target>
-<source>Select alternate comparison settings</source>
-<target>Válassz más összehasonlítási beállításokat</target>
+<source>Alternate synchronization settings</source>
+<target>Megváltoztatja a szinkronizálási beállításokat</target>
-<source>Select alternate synchronization settings</source>
-<target>Válassz más szinkronizálási beállításokat</target>
+<source>Local filter</source>
+<target>Helyi szűrő</target>
-<source>Filter is active</source>
-<target>A szűrő aktív</target>
+<source>Active</source>
+<target>Aktív</target>
-<source>No filter selected</source>
-<target>Nincs kiválasztott szűrő</target>
+<source>None</source>
+<target>Egyik sem</target>
<source>Remove alternate settings</source>
<target>Törölje a módosított beállításokat</target>
@@ -666,6 +673,15 @@ A parancs végrehajtódik, ha:
<source>Paste</source>
<target>Beilleszt</target>
+<source>Alternate Comparison Settings</source>
+<target>Megváltoztatja az összehasonlítási beállításokat</target>
+
+<source>Alternate Synchronization Settings</source>
+<target>Megváltoztatja a szinkronizálási beállításokat</target>
+
+<source>Local Filter</source>
+<target>Helyi szűrő</target>
+
<source>&New</source>
<target>&Új</target>
@@ -681,15 +697,18 @@ A parancs végrehajtódik, ha:
<source>2. &Synchronize</source>
<target>2. &Szinkronizál</target>
+<source>&Global settings</source>
+<target>&Globális beállítások</target>
+
<source>&Language</source>
<target>&Nyelv</target>
+<source>&Find...</source>
+<target>Ke&res...</target>
+
<source>&Export file list...</source>
<target>&Exportálja a fájllistát...</target>
-<source>&Global settings</source>
-<target>&Globális beállítások</target>
-
<source>&Tools</source>
<target>Es&zközök</target>
@@ -699,18 +718,12 @@ A parancs végrehajtódik, ha:
<source>Check &automatically once a week</source>
<target>&Automatikus ellenőrzés hetente</target>
-<source>Check for new &version</source>
-<target>Vizsgál&ja meg, létezik-e új verzió</target>
+<source>&Check for new version</source>
+<target>&Új verzió keresése</target>
<source>Compare</source>
<target>Összehasonlít</target>
-<source>Comparison settings</source>
-<target>Összehasonlítási beállítások</target>
-
-<source>Synchronization settings</source>
-<target>Szinkronizálási beállítások</target>
-
<source>Synchronize</source>
<target>Szinkronizál</target>
@@ -723,6 +736,15 @@ A parancs végrehajtódik, ha:
<source>Swap sides</source>
<target>Cserélje fel az oldalakat</target>
+<source>Close search bar</source>
+<target>Zárja be a keresési sávot</target>
+
+<source>Find:</source>
+<target>Keres:</target>
+
+<source>Match case</source>
+<target>Kis-/nagybetű megkülönböztetése</target>
+
<source>Save as batch job</source>
<target>Mentse kötegelt feladatként</target>
@@ -744,74 +766,20 @@ A parancs végrehajtódik, ha:
<source>Total bytes to copy</source>
<target>Összesen másolandó bájtok</target>
-<source>Items found:</source>
-<target>Talált elemek száma:</target>
+<source>Select a variant:</source>
+<target>Válasszon egy változatot:</target>
-<source>Speed:</source>
-<target>Sebesség:</target>
+<source>Identify equal files by comparing modification time and size.</source>
+<target>Módosítási idő és méret összehasonlítása alapján azonosítsa az azonos fájlokat.</target>
-<source>Time remaining:</source>
-<target>Hátralévő idő:</target>
+<source>Identify equal files by comparing the file content.</source>
+<target>Tartalom összehasonlítása alapján azonosítsa az azonos fájlokat.</target>
-<source>Time elapsed:</source>
-<target>Eltelt idő:</target>
-
-<source>Synchronizing...</source>
-<target>Szinkronizálás folyamatban...</target>
+<source>Symbolic links:</source>
+<target>Szimbolikus linkek:</target>
-<source>Minimize to notification area</source>
-<target>Minimalizálja a figyelmeztetési területre</target>
-
-<source>On completion</source>
-<target>Befejezés esetén</target>
-
-<source>Close</source>
-<target>Bezár</target>
-
-<source>&Pause</source>
-<target>&Várakozás</target>
-
-<source>Variant</source>
-<target>Variáns</target>
-
-<source>Statistics</source>
-<target>Statisztika</target>
-
-<source>&Don't show this dialog again</source>
-<target>&Ne mutassa ismételten ezt a párbeszédablakot</target>
-
-<source>Select a variant</source>
-<target>Válassz egy variánst</target>
-
-<source>
-Files are found equal if
- - last write time and date
- - file size
-are the same
-</source>
-<target>
-A fájlokat egyezőnek tekintjük, ha
- - az utolsó módosításuk (írásuk) dátuma és időpontja, valamint
- - a fájlméret
-megegyezik
-</target>
-
-<source>
-Files are found equal if
- - file content
-is the same
-</source>
-<target>
-A fájlokat egyezőnek tekintjük, ha
- - a fájlok tartalma
-megegyezik
-</target>
-
-<source>Symbolic Link handling</source>
-<target>Szimbolikus hivatkozás kezelése</target>
-
-<source>Help</source>
-<target>Súgó</target>
+<source>More information</source>
+<target>További információ</target>
<source>OK</source>
<target>OK</target>
@@ -819,11 +787,11 @@ megegyezik
<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
<target>Változások keresése és bemutatása mindkét oldalon. A törléseket, mozgatásokat és ütközéseket automatikusan ismeri fel egy adatbázis segítségével.</target>
-<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
-<target>A bal oldali könyvtár tükörmásolata. A jobb oldali könyvtárat úgy változtatja meg, hogy a szinkronizálás után pontosan egyezzen a bal oldalival.</target>
+<source>Create a mirror backup of the left folder which exactly matches the right folder after synchronization.</source>
+<target>Készítse el a bal oldali könyvtár egy tükör-másolatát, amely pontosan megegyezik a jobb oldali könyvtárral a szinkronizálás után.</target>
-<source>Copy new or updated files to right folder.</source>
-<target>Másolja az új vagy frissített fájlokat a jobb oldali könyvtárba.</target>
+<source>Copy new and updated files to the right folder.</source>
+<target>Másolja az új és módosult fájlokat a jobb oldali könyvtárba.</target>
<source>Configure your own synchronization rules.</source>
<target>Állítsd be a saját szinkronizálási szabályaidat</target>
@@ -834,23 +802,8 @@ megegyezik
<source>Requires database files. Not supported by all file systems.</source>
<target>Adatbázis fájlok szükségesek. Nem minden fájlrendszer támogatja.</target>
-<source>Error handling</source>
-<target>Hibakezelés</target>
-
-<source>Ignore</source>
-<target>Figyelmen kívül hagy</target>
-
-<source>Hide all error and warning messages</source>
-<target>Rejtse el az összes hibaüzenetet és figyelmeztetést</target>
-
-<source>Pop-up</source>
-<target>Párbeszédablak</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Hiba vagy figyelmeztetés esetén mutasson párbeszédablakot</target>
-
-<source>Deletion handling</source>
-<target>Törlés kezelése</target>
+<source>Delete files:</source>
+<target>Törölje a következő fájlokat:</target>
<source>Permanent</source>
<target>Állandó</target>
@@ -873,56 +826,89 @@ megegyezik
<source>Naming convention:</source>
<target>Elnevezési konvenció:</target>
-<source>Batch job</source>
-<target>Kötegelt feladat</target>
+<source>Show examples</source>
+<target>Mutasson példákat</target>
-<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
-<target>Készitsen egy parancsfájlt a felügyelet nélküli szinkronizáláshoz. Az indításhoz kattintson kétszer erre a fájlra vagy ütemezze a feladat-tervezőben: %x</target>
+<source>Handle errors:</source>
+<target>A következő hibák kezelése:</target>
-<source>Exit</source>
-<target>Kilép</target>
+<source>Ignore</source>
+<target>Figyelmen kívül hagy</target>
-<source>Abort synchronization on first error</source>
-<target>Állítsa le a szinkronizálást az első hibánál</target>
+<source>Hide all error and warning messages</source>
+<target>Rejtse el az összes hibaüzenetet és figyelmeztetést</target>
-<source>Show progress dialog</source>
-<target>Mutassa a folyamatjelző párbeszédablakot</target>
+<source>Pop-up</source>
+<target>Párbeszédablak</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Hiba vagy figyelmeztetés esetén mutasson párbeszédablakot</target>
-<source>Save log</source>
-<target>Mentssa a naplófájlt</target>
+<source>On completion:</source>
+<target>Végrehajtás alatt:</target>
-<source>Select folder to save log files</source>
-<target>Válaszd ki a naplófájlok mentésére szolgáló könytárat</target>
+<source>Start synchronization now?</source>
+<target>Megkezdje a szinkronizálást?</target>
-<source>Limit</source>
-<target>Korlát</target>
+<source>Variant:</source>
+<target>Variáns:</target>
-<source>Limit maximum number of log files</source>
-<target>Naplófájlok maximális számának korlátja</target>
+<source>Statistics</source>
+<target>Statisztika</target>
-<source>Source code written in C++ using:</source>
-<target>A programot C++-ban fejlesztették a következők felhasználásával:</target>
+<source>&Don't show this dialog again</source>
+<target>&Ne mutassa ismételten ezt a párbeszédablakot</target>
-<source>If you like FreeFileSync</source>
-<target>Ha szereted a FreeFileSync-et</target>
+<source>Items found:</source>
+<target>Talált elemek száma:</target>
-<source>Donate with PayPal</source>
-<target>Támogasd a PayPal segítségével</target>
+<source>Speed:</source>
+<target>Sebesség:</target>
-<source>Many thanks for localization:</source>
-<target>Köszönet a lokalizációért:</target>
+<source>Time remaining:</source>
+<target>Hátralévő idő:</target>
-<source>Feedback and suggestions are welcome</source>
-<target>Várjuk a visszajelzéseket és az ötleteket</target>
+<source>Time elapsed:</source>
+<target>Eltelt idő:</target>
-<source>Homepage</source>
-<target>Honlap</target>
+<source>Synchronizing...</source>
+<target>Szinkronizálás folyamatban...</target>
-<source>Email</source>
-<target>E-mail</target>
+<source>Minimize to notification area</source>
+<target>Minimalizálja a figyelmeztetési területre</target>
-<source>Published under the GNU General Public License</source>
-<target>Közzétéve a GNU General Public License alatt</target>
+<source>Close</source>
+<target>Bezár</target>
+
+<source>&Pause</source>
+<target>&Várakozás</target>
+
+<source>Stop</source>
+<target>Leállít</target>
+
+<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>Készítsen egy parancsfájlt a felügyelet nélküli szinkronizáláshoz. Az indításhoz kattintson kétszer erre a fájlra vagy ütemezze a feladat-tervezőben: %x</target>
+
+<source>Stop synchronization at first error</source>
+<target>Állítsa le a szinkronizálást az első hibánál</target>
+
+<source>Show progress dialog</source>
+<target>Mutassa a folyamatjelző párbeszédablakot</target>
+
+<source>Save log:</source>
+<target>Mentse a következő napló-fájlt:</target>
+
+<source>Limit:</source>
+<target>Határérték:</target>
+
+<source>Limit maximum number of log files</source>
+<target>Naplófájlok maximális számának korlátja</target>
+
+<source>How can I schedule a batch job?</source>
+<target>Hogyan tudok kötegelt feldolgozást ütemezni?</target>
+
+<source>&Recycle bin</source>
+<target>Lomtá&r</target>
<source>Delete on both sides</source>
<target>Törlés mindkét oldalon</target>
@@ -930,109 +916,142 @@ megegyezik
<source>Delete on both sides even if the file is selected on one side only</source>
<target>Törlés mindkét oldalon, még akkor is, ha a fájl csak az egyik oldalon lett kijelölve</target>
-<source>
-Files will only be synchronized if they pass all filter rules.
-Note: File paths must be relative to base directories.
-</source>
-<target>
-A fájlokat csak akkor szinkronizálja, ha azok valamennyi szűrőfeltételnek megfelelnek.
-Megjegyzés: Az útvonalakat az alapkönyvtárakhoz képest kell megadni.
-</target>
+<source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source>
+<target>Meghatározott fájlok szinkronizálásból történő kizárásához válasszon szűrőt. Az útvonalakat a megfelelő könyvtár-párjaikhoz viszonyítva adja meg.</target>
-<source>Include</source>
-<target>Csatol</target>
+<source>Include:</source>
+<target>Bevonva:</target>
-<source>Exclude</source>
-<target>Kizár</target>
+<source>Exclude:</source>
+<target>Kizárva:</target>
-<source>Time span</source>
-<target>Időtartam</target>
+<source>Time span:</source>
+<target>Idősáv (időtartam):</target>
-<source>File size</source>
-<target>Fájlméret</target>
+<source>File size:</source>
+<target>Fájl méret:</target>
-<source>Minimum</source>
-<target>Minimum</target>
+<source>Minimum:</source>
+<target>Minimum:</target>
-<source>Maximum</source>
-<target>Maximum</target>
+<source>Maximum:</source>
+<target>Maximum:</target>
<source>&Clear</source>
<target>&Töröl</target>
-<source>Global settings</source>
-<target>Globális beállítások</target>
+<source>The following settings are used for all synchronization jobs.</source>
+<target>A következő beállítások minden szinkronizálási feladatnál használja.</target>
<source>Fail-safe file copy</source>
<target>Hibamentes fájlmásolás</target>
-<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
-<target>Másolja először egy ideiglenes fájlba (*.ffs_tmp) aztán nevezze át. Ez garantálja a konzisztents állapotot végzetes hibák esetén is.</target>
+<source>
+Copy to a temporary file (*.ffs_tmp) before overwriting target.
+This guarantees a consistent state even in case of a serious error.
+</source>
+<target>
+Másolja először egy ideiglenes fájlba (*.ffs_tmp) mielőtt felülírja a célállományt.
+Ez garantálja a konzisztens állapotot egy komoly hiba esetén is.
+</target>
+
+<source>(recommended)</source>
+<target>(ajánlott)</target>
<source>Copy locked files</source>
<target>Másolja a zárolt fájlokat</target>
-<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
-<target>A megosztott és zárolt fájlokat a kötet-árnyékmásolat szolgáltatás használatával másolja(adminisztrátori jogosultság szükséges)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service.</source>
+<target>Megosztott vagy zárolt fájlok másolása a Kötet-árnyékmásolat szolgáltatás használatával.</target>
+
+<source>(requires administrator rights)</source>
+<target>(rendszergazdai jogosultság szükséges)</target>
<source>Copy file access permissions</source>
<target>Másolja a fájl hozzáférési jogosultságokat</target>
-<source>Transfer file and folder permissions (requires administrator rights)</source>
-<target>Örökítse át a fájl és könyvtár jogosultságokat (adminisztrátori jogosultság szükséges)</target>
+<source>Transfer file and folder permissions.</source>
+<target>Vigye át a fájl és könyvtár jogosultságokat.</target>
-<source>Restore hidden dialogs</source>
-<target>Állítsa vissza a rejtett párbeszédablakokat</target>
+<source>Automatic retry on error:</source>
+<target>Automatikus visszatérés a következő hibánál:</target>
-<source>External applications</source>
-<target>Külső alkalmazások</target>
+<source>Retry count:</source>
+<target>Visszatérések száma:</target>
+
+<source>Delay (in seconds):</source>
+<target>Késedelem (másodpercben):</target>
+
+<source>Customize context menu:</source>
+<target>Környezeti menü testreszabása:</target>
<source>Description</source>
<target>Leírás</target>
+<source>Restore hidden windows</source>
+<target>Állítsa vissza a rejtett ablakokat</target>
+
<source>&Default</source>
<target>&Alapértelmezett</target>
-<source>Find what:</source>
-<target>Mit keres:</target>
+<source>Source code written in C++ using:</source>
+<target>A programot C++-ban fejlesztették a következők felhasználásával:</target>
-<source>Match case</source>
-<target>Kis-/nagybetű megkülönböztetése</target>
+<source>If you like FreeFileSync</source>
+<target>Ha szereted a FreeFileSync-et</target>
-<source>&Find next</source>
-<target>&Keresse a következőt</target>
+<source>Donate with PayPal</source>
+<target>Támogasd a PayPal segítségével</target>
-<source>Start synchronization</source>
-<target>Indítja a szinkronizálást</target>
+<source>Feedback and suggestions are welcome</source>
+<target>Várjuk a visszajelzéseket és az ötleteket</target>
-<source>Delete</source>
-<target>Töröl</target>
+<source>Homepage</source>
+<target>Honlap</target>
+
+<source>Email</source>
+<target>E-mail</target>
-<source>Configure filter</source>
-<target>Beállítja a szűrőt</target>
+<source>Published under the GNU General Public License</source>
+<target>Közzétéve a GNU General Public License alatt</target>
-<source>Find</source>
-<target>Keres:</target>
+<source>Many thanks for localization:</source>
+<target>Köszönet a lokalizációért:</target>
+
+<source>Save as Batch Job</source>
+<target>Mentse kötegelt feladatként</target>
-<source>Select time span</source>
-<target>Kiválasztja az időintervallumot</target>
+<source>Delete Items</source>
+<target>Törölje az elemeket</target>
-<source>Folder pairs</source>
+<source>Global Settings</source>
+<target>Globális beállítások</target>
+
+<source>Select Time Span</source>
+<target>Válassza ki az idősávot (időtartamot)</target>
+
+<source>Serious Error</source>
+<target>Komoly hiba</target>
+
+<source>Folder Pairs</source>
<target>Könyvtár-párok</target>
+<source>Find</source>
+<target>Keres</target>
+
<source>Overview</source>
<target>Áttekintés</target>
<source>Configuration</source>
<target>Beállítás</target>
-<source>Main bar</source>
+<source>Main Bar</source>
<target>Fő sáv</target>
-<source>Filter files</source>
+<source>Filter Files</source>
<target>Szűrje a fájlokat</target>
-<source>Select view</source>
+<source>Select View</source>
<target>Válasszon nézetet</target>
<source>Open...</source>
@@ -1044,8 +1063,20 @@ Megjegyzés: Az útvonalakat az alapkönyvtárakhoz képest kell megadni.
<source>Compare both sides</source>
<target>Vesse össze mindkét oldalt</target>
+<source>Comparison settings</source>
+<target>Összehasonlítási beállítások</target>
+
+<source>Synchronization settings</source>
+<target>Szinkronizálási beállítások</target>
+
+<source>Start synchronization</source>
+<target>Indítja a szinkronizálást</target>
+
+<source>Confirm</source>
+<target>Jóváhagy</target>
+
<source>
-<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for one item?</pluralform>
<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
</source>
<target>
@@ -1053,8 +1084,8 @@ Megjegyzés: Az útvonalakat az alapkönyvtárakhoz képest kell megadni.
<pluralform>Tényleg a végre akarja hajtani a(z) %y parancsot a következő %x elemen?</pluralform>
</target>
-<source>Confirm</source>
-<target>Jóváhagy</target>
+<source>&Don't show this warning again</source>
+<target>&Ne mutassa ismételten ezt a figyelmeztetést</target>
<source>&Execute</source>
<target>Vé&grehajt</target>
@@ -1089,12 +1120,6 @@ Megjegyzés: Az útvonalakat az alapkönyvtárakhoz képest kell megadni.
<source>Set direction:</source>
<target>Állítsa be az irányt:</target>
-<source>Exclude temporarily</source>
-<target>Zárja ki ideiglenesen</target>
-
-<source>Include temporarily</source>
-<target>Csatolja ideiglenesen</target>
-
<source>multiple selection</source>
<target>többszörös kijelölés</target>
@@ -1104,6 +1129,15 @@ Megjegyzés: Az útvonalakat az alapkönyvtárakhoz képest kell megadni.
<source>Exclude via filter:</source>
<target>Zárja ki szűrő segítségével:</target>
+<source>Exclude temporarily</source>
+<target>Zárja ki ideiglenesen</target>
+
+<source>Include temporarily</source>
+<target>Csatolja ideiglenesen</target>
+
+<source>Delete</source>
+<target>Töröl</target>
+
<source>Include all</source>
<target>Csatolja az összest</target>
@@ -1152,6 +1186,9 @@ Megjegyzés: Az útvonalakat az alapkönyvtárakhoz képest kell megadni.
<source>Never save &changes</source>
<target>N&e mentse a változásokat</target>
+<source>Filter</source>
+<target>Szűrő</target>
+
<source>Show files that exist on left side only</source>
<target>Mutassa a csak a bal oldalon létező fájlokat</target>
@@ -1197,12 +1234,18 @@ Megjegyzés: Az útvonalakat az alapkönyvtárakhoz képest kell megadni.
<source>Set as default</source>
<target>Beállítás alapértelmezettként</target>
-<source>Operation aborted</source>
-<target>Művelet megszakítva</target>
-
<source>All folders are in sync</source>
<target>Minden könyvtár szinkronban</target>
+<source>Synchronization Settings</source>
+<target>Szinkronizálási beállítások</target>
+
+<source>Comparison Settings</source>
+<target>Összehasonlítási beállítások</target>
+
+<source>Cannot find %x</source>
+<target>Nem található: %x</target>
+
<source>Comma-separated values</source>
<target>Vesszővel elválasztott értékek (CSV)</target>
@@ -1212,30 +1255,6 @@ Megjegyzés: Az útvonalakat az alapkönyvtárakhoz képest kell megadni.
<source>Searching for program updates...</source>
<target>Programfrissítés keresése...</target>
-<source>&Ignore subsequent errors</source>
-<target>F&igyelmen kívül hagyja az utána következő hibákat</target>
-
-<source>&Ignore</source>
-<target>&Kihagy</target>
-
-<source>Fatal Error</source>
-<target>Kritikus hiba</target>
-
-<source>&Don't show this warning again</source>
-<target>&Ne mutassa ismételten ezt a figyelmeztetést</target>
-
-<source>&Switch</source>
-<target>&Váltás</target>
-
-<source>Question</source>
-<target>Kérdés</target>
-
-<source>&Yes</source>
-<target>&Igen</target>
-
-<source>&No</source>
-<target>&Nem</target>
-
<source>Scanning...</source>
<target>Vizsgálat folyamatban...</target>
@@ -1245,14 +1264,17 @@ Megjegyzés: Az útvonalakat az alapkönyvtárakhoz képest kell megadni.
<source>Info</source>
<target>Információ</target>
+<source>Warning</source>
+<target>Figyelmeztetés</target>
+
<source>Paused</source>
<target>Megállítva</target>
<source>Initializing...</source>
<target>Inicializálás...</target>
-<source>Aborted</source>
-<target>Megszakítva</target>
+<source>Stopped</source>
+<target>Leállítva</target>
<source>Completed</source>
<target>Befejeződött</target>
@@ -1263,23 +1285,17 @@ Megjegyzés: Az útvonalakat az alapkönyvtárakhoz képest kell megadni.
<source>Log</source>
<target>Napló</target>
-<source>Cannot find %x</source>
-<target>Nem található: %x</target>
-
-<source>Inactive</source>
-<target>Inaktív</target>
-
<source>Today</source>
<target>Mai</target>
<source>This week</source>
-<target>Eheti</target>
+<target>E heti</target>
<source>This month</source>
-<target>Ehavi</target>
+<target>E havi</target>
<source>This year</source>
-<target>Ezévi</target>
+<target>Ez évi</target>
<source>Last x days</source>
<target>Utolsó x nap</target>
@@ -1293,9 +1309,6 @@ Megjegyzés: Az útvonalakat az alapkönyvtárakhoz képest kell megadni.
<source>MB</source>
<target>MB</target>
-<source>Filter</source>
-<target>Szűrő</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>
@@ -1305,6 +1318,9 @@ Megjegyzés: Az útvonalakat az alapkönyvtárakhoz képest kell megadni.
<pluralform>Tényleg a Lomtárba akarja áthelyezni a következő %x elemet?</pluralform>
</target>
+<source>Move</source>
+<target>Mozgat</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>
@@ -1314,6 +1330,9 @@ Megjegyzés: Az útvonalakat az alapkönyvtárakhoz képest kell megadni.
<pluralform>Valóban törölni akarod a következő %x elemet?</pluralform>
</target>
+<source>Exclude</source>
+<target>Kizár</target>
+
<source>Direct</source>
<target>Közvetlen</target>
@@ -1324,7 +1343,7 @@ Megjegyzés: Az útvonalakat az alapkönyvtárakhoz képest kell megadni.
<target>Másolja az NTFS jogosultságokat</target>
<source>Integrate external applications into context menu. The following macros are available:</source>
-<target>Integráljon a helyi menübe külső alkalmazásokat. A következő makrók érhetők et:</target>
+<target>Integráljon a helyi menübe külső alkalmazásokat. A következő makrók érhetők el:</target>
<source>- full file or folder name</source>
<target>- teljes fájl- vagy könyvtárnév</target>
@@ -1338,8 +1357,8 @@ Megjegyzés: Az útvonalakat az alapkönyvtárakhoz képest kell megadni.
<source>- Other side's counterpart to %item_folder%</source>
<target>- A másik oldali megfelelőjét a következő könyvtárba: %item_folder%</target>
-<source>Make hidden warnings and dialogs visible again?</source>
-<target>Tegye újra láthatóvá a rejtett figyelmeztetéseket és párbeszédablakokat?</target>
+<source>Restore all hidden windows and warnings?</source>
+<target>Visszaállítsa az összes rejtett ablakot és figyelmeztetést?</target>
<source>Leave as unresolved conflict</source>
<target>Hagyja feloldatlan ütközésként</target>
@@ -1371,6 +1390,21 @@ Megjegyzés: Az útvonalakat az alapkönyvtárakhoz képest kell megadni.
<source>Percentage</source>
<target>Százalék</target>
+<source>&Ignore subsequent errors</source>
+<target>F&igyelmen kívül hagyja az utána következő hibákat</target>
+
+<source>&Ignore</source>
+<target>&Kihagy</target>
+
+<source>&Switch</source>
+<target>&Váltás</target>
+
+<source>&Yes</source>
+<target>&Igen</target>
+
+<source>&No</source>
+<target>&Nem</target>
+
<source>Cannot monitor directory %x.</source>
<target>Nem sikerült monitorozni a(z) %x könyvtárat.</target>
@@ -1464,14 +1498,14 @@ Megjegyzés: Az útvonalakat az alapkönyvtárakhoz képest kell megadni.
<pluralform>%x nap</pluralform>
</target>
-<source>Failed to register to receive system messages.</source>
-<target>Nem sikerült regisztrálni, hogy megkaphassa a rendszer-üzeneteket</target>
+<source>Unable to register to receive system messages.</source>
+<target>Nem tud regisztrálni hogy megkapja a rendszerüzeneteket.</target>
<source>Cannot set privilege %x.</source>
<target>A következő privilégium beállítása sikertelen: %x.</target>
-<source>Failed to suspend system sleep mode.</source>
-<target>Nem sikerült a rendszer alvó üzemmódját felfüggeszteni.</target>
+<source>Unable to suspend system sleep mode.</source>
+<target>Nem tudta felfüggeszteni a rendszer alvó üzemmódját.</target>
<source>Cannot change process I/O priorities.</source>
<target>Nem sikerült a folyamatok I/O prioritását megváltoztatni.</target>
diff --git a/BUILD/Languages/italian.lng b/BUILD/Languages/italian.lng
index 3a3f8e3d..c18c6d30 100644
--- a/BUILD/Languages/italian.lng
+++ b/BUILD/Languages/italian.lng
@@ -2,11 +2,28 @@
<language>Italiano</language>
<translator>Luciano Paravella</translator>
<locale>it_IT</locale>
- <flag_image>flag_italy.png</flag_image>
- <plural_form_count>2</plural_form_count>
+ <image>flag_italy.png</image>
+ <plural_count>2</plural_count>
<plural_definition>n == 1 ? 0 : 1</plural_definition>
</header>
+<source>
+<pluralform>Do you really want to execute the command %y for one item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+</target>
+
+<source>Retrying operation</source>
+<target></target>
+
+<source>
+<pluralform>Automatic retry in 1 second...</pluralform>
+<pluralform>Automatic retry in %x seconds...</pluralform>
+</source>
+<target>
+</target>
+
<source>Both sides have changed since last synchronization.</source>
<target>Entrambi i lati sono cambiati dall'ultima sincronizzazione.</target>
@@ -143,10 +160,10 @@
<target>Memoria insufficiente.</target>
<source>Item exists on left side only</source>
-<target>L'elemento esiste solo sul lato sinistro</target>
+<target>L'oggetto esiste solo sul lato sinistro</target>
<source>Item exists on right side only</source>
-<target>L'elemento esiste solo sul lato destro</target>
+<target>L'oggetto esiste solo sul lato destro</target>
<source>Left side is newer</source>
<target>Il più recente è sul lato sinistro</target>
@@ -155,25 +172,25 @@
<target>Il più recente è sul lato destro</target>
<source>Items have different content</source>
-<target>Gli elementi hanno contenuto differente</target>
+<target>Gli oggetti hanno contenuto differente</target>
<source>Both sides are equal</source>
<target>Entrambi i lati sono uguali</target>
<source>Conflict/item cannot be categorized</source>
-<target>Conflitto/elemento non categorizzabile</target>
+<target>Conflitto/oggetto non categorizzabile</target>
<source>Copy new item to left</source>
-<target>Copia nuovo elemento a sinistra</target>
+<target>Copia nuovo oggetto a sinistra</target>
<source>Copy new item to right</source>
-<target>Copia nuovo elemento a destra</target>
+<target>Copia nuovo oggetto a destra</target>
<source>Delete left item</source>
-<target>Elimina elemento di sinistra</target>
+<target>Elimina oggetto di sinistra</target>
<source>Delete right item</source>
-<target>Elimina elemento di destra</target>
+<target>Elimina oggetto di destra</target>
<source>Move file on left</source>
<target>Sposta il file a sinistra</target>
@@ -182,10 +199,10 @@
<target>Sposta il file a destra</target>
<source>Overwrite left item</source>
-<target>Sovrascrivi elemento di sinistra</target>
+<target>Sovrascrivi oggetto di sinistra</target>
<source>Overwrite right item</source>
-<target>Sovrascrivi elemento di destra</target>
+<target>Sovrascrivi oggetto di destra</target>
<source>Do nothing</source>
<target>Non fare nulla</target>
@@ -242,10 +259,10 @@
<target>Creazione file %x</target>
<source>Items processed:</source>
-<target>Elementi processati:</target>
+<target>Oggetti processati:</target>
<source>Items remaining:</source>
-<target>Elementi rimanenti:</target>
+<target>Oggetti rimanenti:</target>
<source>Total time:</source>
<target>Tempo totale:</target>
@@ -292,8 +309,8 @@
<source>/sec</source>
<target>/sec</target>
-<source>%x items</source>
-<target>%x articoli</target>
+<source>%x items/sec</source>
+<target>%x elementi/sec</target>
<source>Configuration file %x loaded partially only.</source>
<target>File di configurazione %x caricato solo parzialmente.</target>
@@ -322,11 +339,11 @@
<source>Volume name %x is not part of file path %y.</source>
<target>Nome volume %x non fa parte del percorso del file %y.</target>
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Richiesta interruazione: attendere conclusione dell'operazione...</target>
+<source>Stop requested: Waiting for current operation to finish...</source>
+<target>Bloccata richiesta: Aspettare la fine dell'operazione in corso ...</target>
-<source>Failure to create timestamp for versioning:</source>
-<target>Errore nella creazione di data e ora per il controllo delle versioni:</target>
+<source>Unable to create timestamp for versioning:</source>
+<target>Impossibile creare l'ora per la versione:</target>
<source>Cannot read the following XML elements:</source>
<target>Impossibile leggere i seguenti elementi XML:</target>
@@ -343,8 +360,8 @@
<source>&Program</source>
<target>&Programma</target>
-<source>&Content</source>
-<target>&Contenuto</target>
+<source>&View help</source>
+<target>&Vedere aiuto</target>
<source>&About</source>
<target>&Informazioni</target>
@@ -367,8 +384,8 @@
<source>To get started just import a .ffs_batch file.</source>
<target>Per iniziare è sufficiente importare un file con estensione .ffs_batch</target>
-<source>Folders to watch</source>
-<target>Cartelle da controllare</target>
+<source>Folders to watch:</source>
+<target>Cartelle da guardare:</target>
<source>Add folder</source>
<target>Aggiungi cartella</target>
@@ -382,12 +399,15 @@
<source>Select a folder</source>
<target>Seleziona una cartella</target>
-<source>Idle time [seconds]</source>
-<target>Tempo di attesa [secondi]</target>
+<source>Idle time (in seconds):</source>
+<target>Tempo di inattività (in secondi):</target>
<source>Idle time between last detected change and execution of command</source>
<target>Tempo di attesa tra ultimo cambiamento rilevato ed l'esecuzione del comando</target>
+<source>Command line:</source>
+<target>Riga di comando:</target>
+
<source>
The command is triggered if:
- files or subfolders change
@@ -399,8 +419,8 @@ Il comando è attivato se:
- nuove cartelle vengono aggiunte (es. inserimento di memoria USB)
</target>
-<source>Start</source>
-<target>Avvia</target>
+<source>&Start</source>
+<target>&Start</target>
<source>&Retry</source>
<target>&Riprova</target>
@@ -408,9 +428,6 @@ Il comando è attivato se:
<source>Cancel</source>
<target>Annulla</target>
-<source>RealtimeSync - Automated Synchronization</source>
-<target>SyncTempoReale - Sincronizzazione automatizzata</target>
-
<source>Build: %x</source>
<target>Versione: %x</target>
@@ -420,6 +437,9 @@ Il comando è attivato se:
<source>All files</source>
<target>Tutti i file</target>
+<source>Automated Synchronization</source>
+<target>Sincronizzazione automatizzata</target>
+
<source>Directory monitoring active</source>
<target>Directory di monitoraggio attiva</target>
@@ -435,8 +455,8 @@ Il comando è attivato se:
<source>&Exit</source>
<target>&Esci</target>
-<source>Invalid command line:</source>
-<target>Linea di comando non valida:</target>
+<source>Incorrect command line:</source>
+<target>Linea di comando non corretta:</target>
<source>File content</source>
<target>Contenuto del file</target>
@@ -498,8 +518,8 @@ Il comando è attivato se:
<source>Target folder input field must not be empty.</source>
<target>Il campo per la cartella di destinazione non può essere vuoto.</target>
-<source>Folder input field for versioning must not be empty.</source>
-<target>Il campo per la cartella di versione non può essere vuoto.</target>
+<source>Please enter a target folder for versioning.</source>
+<target>Inserisci una cartella di destinazione per il controllo delle versioni.</target>
<source>Source folder %x not found.</source>
<target>Cartella sorgente %x non trovata.</target>
@@ -537,8 +557,8 @@ Il comando è attivato se:
<source>job name</source>
<target>nome del lavoro</target>
-<source>Synchronization aborted</source>
-<target>Sincronizzazione abortita</target>
+<source>Synchronization stopped</source>
+<target>Sincronizzazione fermata</target>
<source>Synchronization completed with errors</source>
<target>Sincronizzazione completata con errori</target>
@@ -555,14 +575,11 @@ Il comando è attivato se:
<source>Saving log file %x...</source>
<target>Salvataggio file di log %x...</target>
-<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
-<target>Premere "Passa" per risolvere i problemi nella finestra principale di FreeFileSync.</target>
-
-<source>Switching to FreeFileSync main dialog</source>
-<target>Passaggio alla finestra di dialogo principale FreeFileSync</target>
+<source>You can switch to FreeFileSync's main window to resolve this issue.</source>
+<target>È possibile passare alla finestra principale di FreeFileSync per risolvere questo problema.</target>
-<source>Retrying operation after error:</source>
-<target>Ripetere l'operazione dopo l'errore:</target>
+<source>Switching to FreeFileSync's main window</source>
+<target>Passaggio alla finestra principale di FreeFileSync</target>
<source>A new version of FreeFileSync is available:</source>
<target>E' disponibile una nuova versione di FreeFileSync:</target>
@@ -570,8 +587,8 @@ Il comando è attivato se:
<source>Download now?</source>
<target>Scaricarla ora?</target>
-<source>New version found</source>
-<target>Nuova versione trovata</target>
+<source>Check for Program Updates</source>
+<target>Controlla Aggiornamenti del Programma</target>
<source>&Download</source>
<target>&Scaricare</target>
@@ -639,20 +656,20 @@ Il comando è attivato se:
<source>Hibernate</source>
<target>Iberna</target>
-<source>Selected variant:</source>
-<target>Variante selezionata:</target>
+<source>Alternate comparison settings</source>
+<target>Impostazioni di Confronto Alternativi</target>
-<source>Select alternate comparison settings</source>
-<target>Seleziona impostazioni di comparazione alternative</target>
+<source>Alternate synchronization settings</source>
+<target>Impostazioni di Sincronizzazione Alternativi</target>
-<source>Select alternate synchronization settings</source>
-<target>Seleziona impostazioni di sincronizzazione alternative</target>
+<source>Local filter</source>
+<target>Filtro Locale</target>
-<source>Filter is active</source>
-<target>Il filtro e' attivo</target>
+<source>Active</source>
+<target>Attivo</target>
-<source>No filter selected</source>
-<target>Nessun filtro selezionato</target>
+<source>None</source>
+<target>Nessuno</target>
<source>Remove alternate settings</source>
<target>Rimuovi impostazioni alternative</target>
@@ -666,6 +683,15 @@ Il comando è attivato se:
<source>Paste</source>
<target>Incolla</target>
+<source>Alternate Comparison Settings</source>
+<target>Impostazioni di Confronto Alternativi</target>
+
+<source>Alternate Synchronization Settings</source>
+<target>Impostazioni di Sincronizzazione Alternativi</target>
+
+<source>Local Filter</source>
+<target>Filtro Locale</target>
+
<source>&New</source>
<target>&Nuovo</target>
@@ -681,15 +707,18 @@ Il comando è attivato se:
<source>2. &Synchronize</source>
<target>2. &Sincronizza</target>
+<source>&Global settings</source>
+<target>&Preferenze</target>
+
<source>&Language</source>
<target>&Lingua</target>
+<source>&Find...</source>
+<target>&Trova ...</target>
+
<source>&Export file list...</source>
<target>&Esporta l'elenco dei file...</target>
-<source>&Global settings</source>
-<target>&Preferenze</target>
-
<source>&Tools</source>
<target>&Strumenti</target>
@@ -699,18 +728,12 @@ Il comando è attivato se:
<source>Check &automatically once a week</source>
<target>Controlla &automaticamente una volta a settimana</target>
-<source>Check for new &version</source>
-<target>Verificare presenza nuove &versione</target>
+<source>&Check for new version</source>
+<target>&Controlla nuova versione</target>
<source>Compare</source>
<target>Compara</target>
-<source>Comparison settings</source>
-<target>Impostazioni di comparazione</target>
-
-<source>Synchronization settings</source>
-<target>Parametri di sincronizzazione</target>
-
<source>Synchronize</source>
<target>Sincronizza</target>
@@ -723,6 +746,15 @@ Il comando è attivato se:
<source>Swap sides</source>
<target>Inverti i lati</target>
+<source>Close search bar</source>
+<target>Chiudi barra di ricerca</target>
+
+<source>Find:</source>
+<target>Trova:</target>
+
+<source>Match case</source>
+<target>Corrispondenza</target>
+
<source>Save as batch job</source>
<target>Salva come processo batch</target>
@@ -744,74 +776,20 @@ Il comando è attivato se:
<source>Total bytes to copy</source>
<target>Bytes totali da copiare</target>
-<source>Items found:</source>
-<target>Elementi trovati:</target>
-
-<source>Speed:</source>
-<target>Velocita':</target>
+<source>Select a variant:</source>
+<target>Scegli una variante:</target>
-<source>Time remaining:</source>
-<target>Tempo rimanente:</target>
+<source>Identify equal files by comparing modification time and size.</source>
+<target>Identificare i file uguali confrontando data di modifica e dimensione.</target>
-<source>Time elapsed:</source>
-<target>Tempo trascorso:</target>
+<source>Identify equal files by comparing the file content.</source>
+<target>Identificare i file uguali confrontando il contenuto del file.</target>
-<source>Synchronizing...</source>
-<target>Sincronizzazione...</target>
+<source>Symbolic links:</source>
+<target>Link simbolici:</target>
-<source>Minimize to notification area</source>
-<target>Ridurre al minimo l'area di notifica</target>
-
-<source>On completion</source>
-<target>In completamento</target>
-
-<source>Close</source>
-<target>Chiudi</target>
-
-<source>&Pause</source>
-<target>&Pausa</target>
-
-<source>Variant</source>
-<target>Variante</target>
-
-<source>Statistics</source>
-<target>Statistiche</target>
-
-<source>&Don't show this dialog again</source>
-<target>&Non mostrare più questo avviso</target>
-
-<source>Select a variant</source>
-<target>Seleziona una variante</target>
-
-<source>
-Files are found equal if
- - last write time and date
- - file size
-are the same
-</source>
-<target>
-I file sono considerati identici se
- - data e ora di ultima modifica
- - dimensione
-sono identici
-</target>
-
-<source>
-Files are found equal if
- - file content
-is the same
-</source>
-<target>
-I file sono considerati identici se
- - il contenuto
-è identico
-</target>
-
-<source>Symbolic Link handling</source>
-<target>Gestione Collegamenti</target>
-
-<source>Help</source>
-<target>Aiuto</target>
+<source>More information</source>
+<target>Maggiori informazioni</target>
<source>OK</source>
<target>OK</target>
@@ -819,11 +797,11 @@ I file sono considerati identici se
<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
<target>Identifica e propaga cambiamenti su entrambi i lati. Cancellazioni, spostamenti e conflitti sono identificati automaticamente usando un database.</target>
-<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
-<target>Backup a Specchio della cartella di sinistra. La cartella di destra verrà modificata per corrispondere esattamente alla cartella di sinistra dopo la sincronizzazione.</target>
+<source>Create a mirror backup of the left folder which exactly matches the right folder after synchronization.</source>
+<target>Creare un backup specchio della cartella di sinistra, che corrisponde esattamente alla cartella giusta dopo la sincronizzazione.</target>
-<source>Copy new or updated files to right folder.</source>
-<target>Copia file nuovi o aggiornati nella cartella di destra.</target>
+<source>Copy new and updated files to the right folder.</source>
+<target>Copiare i file nuovi e aggiornati nella cartella giusta.</target>
<source>Configure your own synchronization rules.</source>
<target>Configura le tue regole di sincronizzazione.</target>
@@ -834,23 +812,8 @@ I file sono considerati identici se
<source>Requires database files. Not supported by all file systems.</source>
<target>Richiede il file di database. Non è supportato da tutti i sistemi di file.</target>
-<source>Error handling</source>
-<target>Gestione degli errori</target>
-
-<source>Ignore</source>
-<target>Ignora</target>
-
-<source>Hide all error and warning messages</source>
-<target>Nascondi tutti gli errori e i messaggi d'avviso</target>
-
-<source>Pop-up</source>
-<target>Pop-up</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Mostra popup di errore o avviso</target>
-
-<source>Deletion handling</source>
-<target>Gestione cancellazione</target>
+<source>Delete files:</source>
+<target>Eliminare i file:</target>
<source>Permanent</source>
<target>Permanente</target>
@@ -873,56 +836,89 @@ I file sono considerati identici se
<source>Naming convention:</source>
<target>Modalità di rinomina:</target>
-<source>Batch job</source>
-<target>Attività batch</target>
+<source>Show examples</source>
+<target>Mostra esempi</target>
-<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
-<target>Creare un file batch per la sincronizzazione automatica. Per iniziare, fare doppio clic su questo file o programmarlo in un pianificatore di compiti: %x</target>
+<source>Handle errors:</source>
+<target>Gestire gli errori:</target>
-<source>Exit</source>
-<target>Esci</target>
+<source>Ignore</source>
+<target>Ignora</target>
-<source>Abort synchronization on first error</source>
-<target>Interrompi sincronizzazione al primo errore</target>
+<source>Hide all error and warning messages</source>
+<target>Nascondi tutti gli errori e i messaggi d'avviso</target>
-<source>Show progress dialog</source>
-<target>Mostra stato di avanzamento</target>
+<source>Pop-up</source>
+<target>Pop-up</target>
-<source>Save log</source>
-<target>Salva log</target>
+<source>Show pop-up on errors or warnings</source>
+<target>Mostra popup di errore o avviso</target>
-<source>Select folder to save log files</source>
-<target>Seleziona cartella dove salvare i file log</target>
+<source>On completion:</source>
+<target>Al termine:</target>
-<source>Limit</source>
-<target>Limita</target>
+<source>Start synchronization now?</source>
+<target>Avviare la sincronizzazione ora?</target>
-<source>Limit maximum number of log files</source>
-<target>Limita il numero massimo di file log</target>
+<source>Variant:</source>
+<target>Variante:</target>
-<source>Source code written in C++ using:</source>
-<target>Codice sorgente scritto in C++ utilizzando:</target>
+<source>Statistics</source>
+<target>Statistiche</target>
-<source>If you like FreeFileSync</source>
-<target>Se ti piace FreeFileSync</target>
+<source>&Don't show this dialog again</source>
+<target>&Non mostrare più questo avviso</target>
-<source>Donate with PayPal</source>
-<target>Fai una donazione con PayPal</target>
+<source>Items found:</source>
+<target>Oggetti trovati:</target>
-<source>Many thanks for localization:</source>
-<target>Ringraziamenti per la localizzazione:</target>
+<source>Speed:</source>
+<target>Velocita':</target>
-<source>Feedback and suggestions are welcome</source>
-<target>Ogni commento o suggerimento è ben accetto</target>
+<source>Time remaining:</source>
+<target>Tempo rimanente:</target>
-<source>Homepage</source>
-<target>Homepage</target>
+<source>Time elapsed:</source>
+<target>Tempo trascorso:</target>
-<source>Email</source>
-<target>Email</target>
+<source>Synchronizing...</source>
+<target>Sincronizzazione...</target>
-<source>Published under the GNU General Public License</source>
-<target>Pubblicato sotto licenza GNU General Public</target>
+<source>Minimize to notification area</source>
+<target>Ridurre al minimo l'area di notifica</target>
+
+<source>Close</source>
+<target>Chiudi</target>
+
+<source>&Pause</source>
+<target>&Pausa</target>
+
+<source>Stop</source>
+<target>Arresto</target>
+
+<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>Creare un file batch per la sincronizzazione automatica. Per iniziare, fare doppio clic su questo file o programmarlo in un pianificatore di compiti: %x</target>
+
+<source>Stop synchronization at first error</source>
+<target>Interrompere la sincronizzazione al primo errore</target>
+
+<source>Show progress dialog</source>
+<target>Mostra stato di avanzamento</target>
+
+<source>Save log:</source>
+<target>Salva log:</target>
+
+<source>Limit:</source>
+<target>Limite:</target>
+
+<source>Limit maximum number of log files</source>
+<target>Limita il numero massimo di file log</target>
+
+<source>How can I schedule a batch job?</source>
+<target>Come posso programmare un lavoro batch?</target>
+
+<source>&Recycle bin</source>
+<target>&Cestino</target>
<source>Delete on both sides</source>
<target>Elimina su entrambi i lati</target>
@@ -930,95 +926,125 @@ I file sono considerati identici se
<source>Delete on both sides even if the file is selected on one side only</source>
<target>Elimina su entrambi i lati anche se il file è selezionato su un solo lato.</target>
-<source>
-Files will only be synchronized if they pass all filter rules.
-Note: File paths must be relative to base directories.
-</source>
-<target>
-I file verranno sincronizzati solo se passano tutte le regole di filtraggio.
-Nota: percorso dei file deve essere relativo alla directory di base.
-</target>
+<source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source>
+<target>Selezionare le regole del filtro per escludere alcuni file dalla sincronizzazione. Immettere i percorsi dei file relativi alla loro corrispondente coppia di cartelle.</target>
-<source>Include</source>
-<target>Includi</target>
+<source>Include:</source>
+<target>Includi:</target>
-<source>Exclude</source>
-<target>Escludi</target>
+<source>Exclude:</source>
+<target>Escludi:</target>
-<source>Time span</source>
-<target>Intervallo di tempo</target>
+<source>Time span:</source>
+<target>Intervallo di tempo:</target>
-<source>File size</source>
-<target>Dimensione file</target>
+<source>File size:</source>
+<target>Dimensione del file:</target>
-<source>Minimum</source>
-<target>Minimo</target>
+<source>Minimum:</source>
+<target>Minimo:</target>
-<source>Maximum</source>
-<target>Massimo</target>
+<source>Maximum:</source>
+<target>Massimo:</target>
<source>&Clear</source>
<target>&Pulisci</target>
-<source>Global settings</source>
-<target>Preferenze</target>
+<source>The following settings are used for all synchronization jobs.</source>
+<target>Le seguenti impostazioni vengono utilizzate per tutti i processi di sincronizzazione.</target>
<source>Fail-safe file copy</source>
<target>Copia file di fail-safe</target>
-<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
-<target>Copiare prima in un file temporaneo (*.ffs_tmp) poi rinominarlo. Questo garantisce uno stato costante anche in caso di un errore fatale.</target>
+<source>
+Copy to a temporary file (*.ffs_tmp) before overwriting target.
+This guarantees a consistent state even in case of a serious error.
+</source>
+<target>
+Copiare in un file temporaneo ( *.ffs_tmp ) prima di sovrascrivere il bersaglio.
+Questo garantisce uno stato costante anche in caso di un errore grave.
+</target>
+
+<source>(recommended)</source>
+<target>(consigliato)</target>
<source>Copy locked files</source>
<target>Copia file bloccati</target>
-<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
-<target>Copiare i file condivisi o bloccati usando il Volume Shadow Copy Service (richiede i diritti di amministratore)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service.</source>
+<target>Copiare file condivisi o bloccati con il Volume Shadow Copy Service.</target>
+
+<source>(requires administrator rights)</source>
+<target>(richiede i diritti di amministratore)</target>
<source>Copy file access permissions</source>
<target>Copia permessi di accesso file</target>
-<source>Transfer file and folder permissions (requires administrator rights)</source>
-<target>Trasferimento di file e autorizzazioni cartelle (richiede i diritti di amministratore)</target>
+<source>Transfer file and folder permissions.</source>
+<target>Trasferimento file e autorizzazioni delle cartelle.</target>
+
+<source>Automatic retry on error:</source>
+<target>Tentativo Automaticoin caso di errore:</target>
+
+<source>Retry count:</source>
+<target>Riprova conta:</target>
-<source>Restore hidden dialogs</source>
-<target>Ripristina i messaggi nascosti</target>
+<source>Delay (in seconds):</source>
+<target>Ritardo (in secondi):</target>
-<source>External applications</source>
-<target>Applicazioni esterne</target>
+<source>Customize context menu:</source>
+<target>Personalizzare menu contestuale:</target>
<source>Description</source>
<target>Descrizione</target>
+<source>Restore hidden windows</source>
+<target>Ripristina le finestre nascoste</target>
+
<source>&Default</source>
<target>&Predefinito</target>
-<source>Find what:</source>
-<target>Trova questo:</target>
+<source>Source code written in C++ using:</source>
+<target>Codice sorgente scritto in C++ utilizzando:</target>
-<source>Match case</source>
-<target>Corrispondenza</target>
+<source>If you like FreeFileSync</source>
+<target>Se ti piace FreeFileSync</target>
-<source>&Find next</source>
-<target>&Trova successivo</target>
+<source>Donate with PayPal</source>
+<target>Fai una donazione con PayPal</target>
-<source>Start synchronization</source>
-<target>Avvia sincronizzazione</target>
+<source>Feedback and suggestions are welcome</source>
+<target>Ogni commento o suggerimento è ben accetto</target>
-<source>Delete</source>
-<target>Elimina</target>
+<source>Homepage</source>
+<target>Homepage</target>
-<source>Configure filter</source>
-<target>Configurazione dei filtri</target>
+<source>Email</source>
+<target>Email</target>
-<source>Find</source>
-<target>Trova</target>
+<source>Published under the GNU General Public License</source>
+<target>Pubblicato sotto licenza GNU General Public</target>
+
+<source>Many thanks for localization:</source>
+<target>Ringraziamenti per la localizzazione:</target>
+
+<source>Save as Batch Job</source>
+<target>Salva come Processo Batch</target>
-<source>Select time span</source>
-<target>Seleziona intervallo di tempo</target>
+<source>Delete Items</source>
+<target>Elimina Elementi</target>
-<source>Folder pairs</source>
-<target>Coppia di cartelle</target>
+<source>Global Settings</source>
+<target>Impostazioni Globali</target>
+
+<source>Select Time Span</source>
+<target>Selezionare Intervallo di Tempo</target>
+
+<source>Folder Pairs</source>
+<target>Coppie di Cartelle</target>
+
+<source>Find</source>
+<target>Trova</target>
<source>Overview</source>
<target>Anteprima</target>
@@ -1026,14 +1052,14 @@ Nota: percorso dei file deve essere relativo alla directory di base.
<source>Configuration</source>
<target>Configurazione</target>
-<source>Main bar</source>
-<target>Barra principale</target>
+<source>Main Bar</source>
+<target>Barra Principale</target>
-<source>Filter files</source>
-<target>Filtro dei file</target>
+<source>Filter Files</source>
+<target>Filtrare i file</target>
-<source>Select view</source>
-<target>Seleziona vista</target>
+<source>Select View</source>
+<target>Selezionare Visualizza</target>
<source>Open...</source>
<target>Apri...</target>
@@ -1044,14 +1070,14 @@ Nota: percorso dei file deve essere relativo alla directory di base.
<source>Compare both sides</source>
<target>Confronta entrambi i lati</target>
-<source>
-<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
-<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
-</source>
-<target>
-<pluralform>Vuoi veramente eseguire il comando %y per 1 articolo?</pluralform>
-<pluralform>Vuoi veramente eseguire %y comando per %x articoli?</pluralform>
-</target>
+<source>Comparison settings</source>
+<target>Impostazioni di comparazione</target>
+
+<source>Synchronization settings</source>
+<target>Parametri di sincronizzazione</target>
+
+<source>Start synchronization</source>
+<target>Avvia sincronizzazione</target>
<source>Confirm</source>
<target>Confermare</target>
@@ -1089,12 +1115,6 @@ Nota: percorso dei file deve essere relativo alla directory di base.
<source>Set direction:</source>
<target>Imposta direzione:</target>
-<source>Exclude temporarily</source>
-<target>Escludi temporaneamente</target>
-
-<source>Include temporarily</source>
-<target>Includi temporaneamente</target>
-
<source>multiple selection</source>
<target>selezione multipla</target>
@@ -1104,6 +1124,15 @@ Nota: percorso dei file deve essere relativo alla directory di base.
<source>Exclude via filter:</source>
<target>Escludi tramite filtro:</target>
+<source>Exclude temporarily</source>
+<target>Escludi temporaneamente</target>
+
+<source>Include temporarily</source>
+<target>Includi temporaneamente</target>
+
+<source>Delete</source>
+<target>Elimina</target>
+
<source>Include all</source>
<target>Includi tutto</target>
@@ -1152,6 +1181,9 @@ Nota: percorso dei file deve essere relativo alla directory di base.
<source>Never save &changes</source>
<target>Non salvare mai &modifiche</target>
+<source>Filter</source>
+<target>Filtro</target>
+
<source>Show files that exist on left side only</source>
<target>Mostra file esistenti solo a sinistra</target>
@@ -1197,12 +1229,18 @@ Nota: percorso dei file deve essere relativo alla directory di base.
<source>Set as default</source>
<target>Imposta come predefinito</target>
-<source>Operation aborted</source>
-<target>Operazione abortita</target>
-
<source>All folders are in sync</source>
<target>Tutte le cartelle sono sincronizzate</target>
+<source>Synchronization Settings</source>
+<target>Impostazioni di Sincronizzazione</target>
+
+<source>Comparison Settings</source>
+<target>Impostazioni di Confronto</target>
+
+<source>Cannot find %x</source>
+<target>Impossibile trovare %x</target>
+
<source>Comma-separated values</source>
<target>Valori separati da virgole</target>
@@ -1218,8 +1256,8 @@ Nota: percorso dei file deve essere relativo alla directory di base.
<source>&Ignore</source>
<target>&Ignora</target>
-<source>Fatal Error</source>
-<target>Errore fatale</target>
+<source>Serious Error</source>
+<target>Errore Grave</target>
<source>&Don't show this warning again</source>
<target>&Non mostrare più questo avviso</target>
@@ -1227,9 +1265,6 @@ Nota: percorso dei file deve essere relativo alla directory di base.
<source>&Switch</source>
<target>&Passa</target>
-<source>Question</source>
-<target>Domanda</target>
-
<source>&Yes</source>
<target>&Si</target>
@@ -1251,8 +1286,8 @@ Nota: percorso dei file deve essere relativo alla directory di base.
<source>Initializing...</source>
<target>Inizializzazione...</target>
-<source>Aborted</source>
-<target>Interrotto</target>
+<source>Stopped</source>
+<target>Arrestato</target>
<source>Completed</source>
<target>Completato</target>
@@ -1263,12 +1298,6 @@ Nota: percorso dei file deve essere relativo alla directory di base.
<source>Log</source>
<target>Log</target>
-<source>Cannot find %x</source>
-<target>Impossibile trovare %x</target>
-
-<source>Inactive</source>
-<target>Inattivo</target>
-
<source>Today</source>
<target>Oggi</target>
@@ -1293,18 +1322,18 @@ Nota: percorso dei file deve essere relativo alla directory di base.
<source>MB</source>
<target>MB</target>
-<source>Filter</source>
-<target>Filtro</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>Vuoi davvero spostare la seguente voce nel cestino?</pluralform>
-<pluralform>Vuoi davvero spostare i seguenti %x articoli nel cestino?</pluralform>
+<pluralform>Vuoi davvero spostare il seguente oggetto nel cestino?</pluralform>
+<pluralform>Vuoi davvero spostare i seguenti %x oggetti nel cestino?</pluralform>
</target>
+<source>Move</source>
+<target>Spostare</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>
@@ -1314,6 +1343,9 @@ Nota: percorso dei file deve essere relativo alla directory di base.
<pluralform>Vuoi veramente eliminare i seguenti %x oggetti?</pluralform>
</target>
+<source>Exclude</source>
+<target>Escludi</target>
+
<source>Direct</source>
<target>Diretto</target>
@@ -1338,8 +1370,8 @@ Nota: percorso dei file deve essere relativo alla directory di base.
<source>- Other side's counterpart to %item_folder%</source>
<target>- Omologo dell'altro lato a %item_folder%</target>
-<source>Make hidden warnings and dialogs visible again?</source>
-<target>Vuoi visualizzare nuovamente i dialoghi e gli avvisi nascosti?</target>
+<source>Restore all hidden windows and warnings?</source>
+<target>Ripristina tutte le finestre nascoste e gli avvisi?</target>
<source>Leave as unresolved conflict</source>
<target>Lascia come conflitti irrisolti</target>
@@ -1366,7 +1398,7 @@ Nota: percorso dei file deve essere relativo alla directory di base.
<target>File</target>
<source>Items</source>
-<target>Articoli</target>
+<target>Oggetti</target>
<source>Percentage</source>
<target>Percentuale</target>
@@ -1464,14 +1496,14 @@ Nota: percorso dei file deve essere relativo alla directory di base.
<pluralform>%x giorni</pluralform>
</target>
-<source>Failed to register to receive system messages.</source>
+<source>Unable to register to receive system messages.</source>
<target>Impossibile registrarsi per ricevere i messaggi di sistema.</target>
<source>Cannot set privilege %x.</source>
<target>Impossibile impostare privilegi %x.</target>
-<source>Failed to suspend system sleep mode.</source>
-<target>Sospensione sistema fallita.</target>
+<source>Unable to suspend system sleep mode.</source>
+<target>Impossibile sospendere la modalità di sonno del sistema.</target>
<source>Cannot change process I/O priorities.</source>
<target>Impossibile modificare le priorità I/O del processo.</target>
diff --git a/BUILD/Languages/japanese.lng b/BUILD/Languages/japanese.lng
index d27d0ff2..d47a75fc 100644
--- a/BUILD/Languages/japanese.lng
+++ b/BUILD/Languages/japanese.lng
@@ -2,11 +2,28 @@
<language>日本語</language>
<translator>Tilt</translator>
<locale>ja_JP</locale>
- <flag_image>flag_japan.png</flag_image>
- <plural_form_count>1</plural_form_count>
+ <image>flag_japan.png</image>
+ <plural_count>1</plural_count>
<plural_definition>0</plural_definition>
</header>
+<source>
+<pluralform>Do you really want to execute the command %y for one item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+</target>
+
+<source>Retrying operation</source>
+<target></target>
+
+<source>
+<pluralform>Automatic retry in 1 second...</pluralform>
+<pluralform>Automatic retry in %x seconds...</pluralform>
+</source>
+<target>
+</target>
+
<source>Both sides have changed since last synchronization.</source>
<target>前回最後の同期処理以降、両側とも変更があります.</target>
@@ -289,8 +306,8 @@
<source>/sec</source>
<target>/秒</target>
-<source>%x items</source>
-<target>%x 個の項目</target>
+<source>%x items/sec</source>
+<target>%x 項目/秒</target>
<source>Configuration file %x loaded partially only.</source>
<target>構成ファイル %x は部分的のみ読み込まれます.</target>
@@ -319,11 +336,11 @@
<source>Volume name %x is not part of file path %y.</source>
<target>ボリューム名 %x は、ファイルパス %y の一部ではありません.</target>
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>ユーザによる中断: 現在の処理を終了しています.. お待ちください...</target>
+<source>Stop requested: Waiting for current operation to finish...</source>
+<target>停止の要求: 現在の操作が完了するのを待機しています...</target>
-<source>Failure to create timestamp for versioning:</source>
-<target>バージョン付けのタイムスタンプ作成に失敗:</target>
+<source>Unable to create timestamp for versioning:</source>
+<target>バージョン付けのタイムスタンプを作成出来ません:</target>
<source>Cannot read the following XML elements:</source>
<target>次の XML要素を読み込めません:</target>
@@ -340,8 +357,8 @@
<source>&Program</source>
<target>プログラム(&P)</target>
-<source>&Content</source>
-<target>トピック(&C)</target>
+<source>&View help</source>
+<target>ヘルプを表示(&V)</target>
<source>&About</source>
<target>情報(&A)</target>
@@ -364,8 +381,8 @@
<source>To get started just import a .ffs_batch file.</source>
<target>一括ファイル(.ffs)からインポートして開始</target>
-<source>Folders to watch</source>
-<target>監視するフォルダ</target>
+<source>Folders to watch:</source>
+<target>監視するフォルダ:</target>
<source>Add folder</source>
<target>フォルダを追加</target>
@@ -379,12 +396,15 @@
<source>Select a folder</source>
<target>フォルダを選択</target>
-<source>Idle time [seconds]</source>
-<target>待機時間 [秒]</target>
+<source>Idle time (in seconds):</source>
+<target>待機時間(秒で指定):</target>
<source>Idle time between last detected change and execution of command</source>
<target>最後にコマンドを実行してから、次に変更を検出するまでの待機時間</target>
+<source>Command line:</source>
+<target>コマンドライン:</target>
+
<source>
The command is triggered if:
- files or subfolders change
@@ -396,8 +416,8 @@ The command is triggered if:
- 新規フォルダの追加 (例. USB の挿入)
</target>
-<source>Start</source>
-<target>開始</target>
+<source>&Start</source>
+<target>開始(&S)</target>
<source>&Retry</source>
<target>再試行(&R)</target>
@@ -405,9 +425,6 @@ The command is triggered if:
<source>Cancel</source>
<target>キャンセル</target>
-<source>RealtimeSync - Automated Synchronization</source>
-<target>リアルタイム同期 - 自動同期</target>
-
<source>Build: %x</source>
<target>ビルド: %x</target>
@@ -417,6 +434,9 @@ The command is triggered if:
<source>All files</source>
<target>すべてのファイル</target>
+<source>Automated Synchronization</source>
+<target>自動同期</target>
+
<source>Directory monitoring active</source>
<target>ディレクトリの監視アクティブ</target>
@@ -432,8 +452,8 @@ The command is triggered if:
<source>&Exit</source>
<target>終了(&E)</target>
-<source>Invalid command line:</source>
-<target>無効なコマンドライン:</target>
+<source>Incorrect command line:</source>
+<target>不正なコマンドライン:</target>
<source>File content</source>
<target>ファイルの内容</target>
@@ -495,8 +515,8 @@ The command is triggered if:
<source>Target folder input field must not be empty.</source>
<target>対象フォルダ入力欄が空白になっています.</target>
-<source>Folder input field for versioning must not be empty.</source>
-<target>バージョン管理のためフォルダ入力欄に空白は使えません.</target>
+<source>Please enter a target folder for versioning.</source>
+<target>バージョン付けをする対象フォルダを入力</target>
<source>Source folder %x not found.</source>
<target>ソースフォルダ %x が見つかりません</target>
@@ -520,7 +540,7 @@ The command is triggered if:
<target>複数フォルダペアの一部であるフォルダが変更されています. 同期設定を確認してください.</target>
<source>Synchronizing folder pair:</source>
-<target>フォルダペアを同期処理中:</target>
+<target>フォルダペアを同期処理:</target>
<source>Generating database...</source>
<target>データベースを作成中...</target>
@@ -534,8 +554,8 @@ The command is triggered if:
<source>job name</source>
<target>ジョブ名</target>
-<source>Synchronization aborted</source>
-<target>同期処理を中断</target>
+<source>Synchronization stopped</source>
+<target>同期処理を停止</target>
<source>Synchronization completed with errors</source>
<target>同期処理はエラーで終了しています</target>
@@ -552,14 +572,11 @@ The command is triggered if:
<source>Saving log file %x...</source>
<target>ログファイル %x を保存中...</target>
-<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
-<target>"切り替え"を押すと FreeFileSync ダイアログの問題を解決します.</target>
-
-<source>Switching to FreeFileSync main dialog</source>
-<target>FreeFileSync メインダイアログを切り替え中</target>
+<source>You can switch to FreeFileSync's main window to resolve this issue.</source>
+<target>FreeFileSync のメインウィンドウを切り替えることでこの問題を解決</target>
-<source>Retrying operation after error:</source>
-<target>エラーの後で処理を再試行:</target>
+<source>Switching to FreeFileSync's main window</source>
+<target>FreeFileSync メインウィンドウの切り替え</target>
<source>A new version of FreeFileSync is available:</source>
<target>FreeFileSync の新しいバージョンが利用できます:</target>
@@ -567,8 +584,8 @@ The command is triggered if:
<source>Download now?</source>
<target>ダウンロードしますか?</target>
-<source>New version found</source>
-<target>新たなバージョンがあります</target>
+<source>Check for Program Updates</source>
+<target>プログラムのアップデートを確認</target>
<source>&Download</source>
<target>ダウンロード(&D)</target>
@@ -636,20 +653,20 @@ The command is triggered if:
<source>Hibernate</source>
<target>休止状態</target>
-<source>Selected variant:</source>
-<target>選択されたバリアント:</target>
+<source>Alternate comparison settings</source>
+<target>代替比較設定</target>
-<source>Select alternate comparison settings</source>
-<target>代替比較設定を選択</target>
+<source>Alternate synchronization settings</source>
+<target>代替同期設定</target>
-<source>Select alternate synchronization settings</source>
-<target>代替同期設定を選択</target>
+<source>Local filter</source>
+<target>ローカル フィルター</target>
-<source>Filter is active</source>
-<target>フィルターを有効化</target>
+<source>Active</source>
+<target>アクティブ</target>
-<source>No filter selected</source>
-<target>フィルター選択なし</target>
+<source>None</source>
+<target>なし</target>
<source>Remove alternate settings</source>
<target>代替設定を除去</target>
@@ -663,6 +680,15 @@ The command is triggered if:
<source>Paste</source>
<target>貼り付け</target>
+<source>Alternate Comparison Settings</source>
+<target>代替比較設定</target>
+
+<source>Alternate Synchronization Settings</source>
+<target>代替同期設定</target>
+
+<source>Local Filter</source>
+<target>ローカル フィルター</target>
+
<source>&New</source>
<target>新規(&N)</target>
@@ -678,15 +704,18 @@ The command is triggered if:
<source>2. &Synchronize</source>
<target>2. 同期処理(&S)</target>
+<source>&Global settings</source>
+<target>全般的な設定(&G)</target>
+
<source>&Language</source>
<target>使用言語(&L)</target>
+<source>&Find...</source>
+<target>検索(&F)...</target>
+
<source>&Export file list...</source>
<target>ファイル一覧をエクスポート(&E)...</target>
-<source>&Global settings</source>
-<target>全般的な設定(&G)</target>
-
<source>&Tools</source>
<target>ツール(&T)</target>
@@ -696,18 +725,12 @@ The command is triggered if:
<source>Check &automatically once a week</source>
<target>週に一回、自動的に確認する(&A)</target>
-<source>Check for new &version</source>
-<target>新バージョンの確認(&V)</target>
+<source>&Check for new version</source>
+<target>新バージョンの確認(&C)</target>
<source>Compare</source>
<target>比較</target>
-<source>Comparison settings</source>
-<target>比較設定</target>
-
-<source>Synchronization settings</source>
-<target>同期処理設定</target>
-
<source>Synchronize</source>
<target>同期処理</target>
@@ -720,6 +743,15 @@ The command is triggered if:
<source>Swap sides</source>
<target>パネルを入れ替え</target>
+<source>Close search bar</source>
+<target>検索バーを閉じる</target>
+
+<source>Find:</source>
+<target>検索:</target>
+
+<source>Match case</source>
+<target>文字種を区別</target>
+
<source>Save as batch job</source>
<target>一括ジョブで保存</target>
@@ -741,74 +773,20 @@ The command is triggered if:
<source>Total bytes to copy</source>
<target>コピーする合計バイト</target>
-<source>Items found:</source>
-<target>見つかった要素:</target>
-
-<source>Speed:</source>
-<target>速度:</target>
-
-<source>Time remaining:</source>
-<target>残り時間:</target>
-
-<source>Time elapsed:</source>
-<target>経過時間</target>
-
-<source>Synchronizing...</source>
-<target>同期処理中...</target>
-
-<source>Minimize to notification area</source>
-<target>通知領域に最小化</target>
-
-<source>On completion</source>
-<target>完了時の動作</target>
-
-<source>Close</source>
-<target>閉じる</target>
+<source>Select a variant:</source>
+<target>メソッドを選択:</target>
-<source>&Pause</source>
-<target>一時停止(&P)</target>
+<source>Identify equal files by comparing modification time and size.</source>
+<target>更新時刻とサイズを比較して、同一ファイルを識別します</target>
-<source>Variant</source>
-<target>変化</target>
+<source>Identify equal files by comparing the file content.</source>
+<target>ファイルの内容を比較して、同一ファイルを識別します</target>
-<source>Statistics</source>
-<target>統計</target>
+<source>Symbolic links:</source>
+<target>シンボリック リンク:</target>
-<source>&Don't show this dialog again</source>
-<target>次回以降から表示しない(&D)</target>
-
-<source>Select a variant</source>
-<target>バリアントを選択</target>
-
-<source>
-Files are found equal if
- - last write time and date
- - file size
-are the same
-</source>
-<target>
-ファイルが同様だった場合
- - 最終書き込み時刻、日時
- - ファイルサイズ
-で判断する
-</target>
-
-<source>
-Files are found equal if
- - file content
-is the same
-</source>
-<target>
-ファイルが同様だった場合
- - ファイル内容
-で判断する
-</target>
-
-<source>Symbolic Link handling</source>
-<target>シンボリック・リンクの取り扱い</target>
-
-<source>Help</source>
-<target>ヘルプ</target>
+<source>More information</source>
+<target>更に詳細な情報</target>
<source>OK</source>
<target>OK</target>
@@ -816,11 +794,11 @@ is the same
<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
<target>変更箇所を識別して両側に変更を反映します。データベースを使用することで、削除、移動および競合などが自動的に検出されます。</target>
-<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
-<target>左側に合わせてバックアップ. 右側のフォルダ内容が同期処理後に左側と同じになるようにします。</target>
+<source>Create a mirror backup of the left folder which exactly matches the right folder after synchronization.</source>
+<target>同意処理後、右側フォルダと厳密に合致する左側フォルダのミラーバックアップを作成</target>
-<source>Copy new or updated files to right folder.</source>
-<target>新しい(更新)ファイルを右フォルダにコピー</target>
+<source>Copy new and updated files to the right folder.</source>
+<target>新しい、または更新されたファイルを右フォルダにコピー</target>
<source>Configure your own synchronization rules.</source>
<target>あなたの設定した同期規則を使用します。</target>
@@ -831,23 +809,8 @@ is the same
<source>Requires database files. Not supported by all file systems.</source>
<target>データベースファイルが必要です(すべてのシステムには未対応).</target>
-<source>Error handling</source>
-<target>ハンドリングのエラー時:</target>
-
-<source>Ignore</source>
-<target>無視</target>
-
-<source>Hide all error and warning messages</source>
-<target>すべてのエラーと警告メッセージを非表示</target>
-
-<source>Pop-up</source>
-<target>ポップアップ</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>エラーと警告をポップアップで表示</target>
-
-<source>Deletion handling</source>
-<target>削除の取り扱い</target>
+<source>Delete files:</source>
+<target>ファイルの削除:</target>
<source>Permanent</source>
<target>完全消去</target>
@@ -870,56 +833,89 @@ is the same
<source>Naming convention:</source>
<target>命名規則:</target>
-<source>Batch job</source>
-<target>一括処理</target>
+<source>Show examples</source>
+<target>入力例を表示</target>
-<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
-<target>無人で同期を行う為のバッチファイルを作成 - このファイルか、タスクプランナーからスケジュールをダブルクリックすることで開始: %x</target>
+<source>Handle errors:</source>
+<target>エラーの取り扱い:</target>
-<source>Exit</source>
-<target>終了</target>
+<source>Ignore</source>
+<target>無視</target>
-<source>Abort synchronization on first error</source>
-<target>最初のエラー発生時に同期を中断する</target>
+<source>Hide all error and warning messages</source>
+<target>すべてのエラーと警告メッセージを非表示</target>
-<source>Show progress dialog</source>
-<target>進捗ダイアログを表示</target>
+<source>Pop-up</source>
+<target>ポップアップ</target>
-<source>Save log</source>
-<target>ログを保存</target>
+<source>Show pop-up on errors or warnings</source>
+<target>エラーと警告をポップアップで表示</target>
-<source>Select folder to save log files</source>
-<target>ログファイル保存先フォルダを選択</target>
+<source>On completion:</source>
+<target>完了時の動作:</target>
-<source>Limit</source>
-<target>制限</target>
+<source>Start synchronization now?</source>
+<target>今すぐ同期を開始しますか?</target>
-<source>Limit maximum number of log files</source>
-<target>ログファイルの最大数を制限</target>
+<source>Variant:</source>
+<target>メソッド:</target>
-<source>Source code written in C++ using:</source>
-<target>ソースコードは C++ で書かれています</target>
+<source>Statistics</source>
+<target>統計</target>
-<source>If you like FreeFileSync</source>
-<target>FreeFileSync を気に入ってくれた方へ</target>
+<source>&Don't show this dialog again</source>
+<target>次回以降から表示しない(&D)</target>
-<source>Donate with PayPal</source>
-<target>PayPal から寄付</target>
+<source>Items found:</source>
+<target>見つかった要素:</target>
-<source>Many thanks for localization:</source>
-<target>ローカライズのご協力に感謝します:</target>
+<source>Speed:</source>
+<target>速度:</target>
-<source>Feedback and suggestions are welcome</source>
-<target>フィードバック、提案などはこちらから</target>
+<source>Time remaining:</source>
+<target>残り時間:</target>
-<source>Homepage</source>
-<target>ホームページ</target>
+<source>Time elapsed:</source>
+<target>経過時間</target>
-<source>Email</source>
-<target>E-メール</target>
+<source>Synchronizing...</source>
+<target>同期処理中...</target>
-<source>Published under the GNU General Public License</source>
-<target>GNU 一般共有使用許諾に基づき公開されています</target>
+<source>Minimize to notification area</source>
+<target>通知領域に最小化</target>
+
+<source>Close</source>
+<target>閉じる</target>
+
+<source>&Pause</source>
+<target>一時停止(&P)</target>
+
+<source>Stop</source>
+<target>停止</target>
+
+<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>無人で同期を行う為のバッチファイルを作成 - このファイルか、タスクプランナーからスケジュールをダブルクリックすることで開始: %x</target>
+
+<source>Stop synchronization at first error</source>
+<target>最初のエラーで同期処理を停止</target>
+
+<source>Show progress dialog</source>
+<target>進捗ダイアログを表示</target>
+
+<source>Save log:</source>
+<target>ログ保存:</target>
+
+<source>Limit:</source>
+<target>制限:</target>
+
+<source>Limit maximum number of log files</source>
+<target>ログファイルの最大数を制限</target>
+
+<source>How can I schedule a batch job?</source>
+<target>一括ジョブ スケジュールの作成方法</target>
+
+<source>&Recycle bin</source>
+<target>ゴミ箱(&R)</target>
<source>Delete on both sides</source>
<target>両方を削除</target>
@@ -927,95 +923,125 @@ is the same
<source>Delete on both sides even if the file is selected on one side only</source>
<target>片側のペインのみ選択されている場合でも両方を削除する</target>
-<source>
-Files will only be synchronized if they pass all filter rules.
-Note: File paths must be relative to base directories.
-</source>
-<target>
-すべてのフィルター規則に適合した場合のみ、ファイルの同期が行われます.
-注意: ファイルパスは基準ディレクトリからの相対パスを使用してください.
-</target>
+<source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source>
+<target>同期処理から特定のファイルを除外するフィルター規則を選択します。対応するそれらフォルダ ペアからの相対ファイルパスを入力.</target>
-<source>Include</source>
-<target>含める</target>
+<source>Include:</source>
+<target>含める:</target>
-<source>Exclude</source>
-<target>除外</target>
+<source>Exclude:</source>
+<target>除外:</target>
-<source>Time span</source>
-<target>時間間隔</target>
+<source>Time span:</source>
+<target>タイムスパン:</target>
-<source>File size</source>
-<target>ファイルサイズ</target>
+<source>File size:</source>
+<target>ファイルサイズ:</target>
-<source>Minimum</source>
-<target>最小</target>
+<source>Minimum:</source>
+<target>最小:</target>
-<source>Maximum</source>
-<target>最大</target>
+<source>Maximum:</source>
+<target>最大:</target>
<source>&Clear</source>
<target>クリア(&C)</target>
-<source>Global settings</source>
-<target>全般的な設定</target>
+<source>The following settings are used for all synchronization jobs.</source>
+<target>以下の設定は、すべての同期ジョブで使用されます</target>
<source>Fail-safe file copy</source>
<target>安全なファイルコピーを実施</target>
-<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
-<target>リネームする前に一時ファイル(*.ffs_tmp)へコピーする。これにより、予期せぬエラーが発生した場合も一貫性を保つことが可能です.</target>
+<source>
+Copy to a temporary file (*.ffs_tmp) before overwriting target.
+This guarantees a consistent state even in case of a serious error.
+</source>
+<target>
+対象を上書きする前に一時ファイル (*.ffs_tmp) にコピーします.
+これにより、エラーが発生した場合も一貫性ある状態が保証されます.
+</target>
+
+<source>(recommended)</source>
+<target>(推奨)</target>
<source>Copy locked files</source>
<target>ロックされたファイルをコピーする</target>
-<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
-<target>共有のコピーとファイルのロックにボリューム シャドウ コピーサービスを使用する (管理者権限が必要)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service.</source>
+<target>共有、ロックされたファイルをボリュームシャドウコピーサービスを使用してコピー</target>
+
+<source>(requires administrator rights)</source>
+<target>(管理者権限が必要)</target>
<source>Copy file access permissions</source>
<target>ファイルのアクセスパーミッションをコピーする</target>
-<source>Transfer file and folder permissions (requires administrator rights)</source>
-<target>ファイル転送とフォルダのパーミッション(管理者権限が必要)</target>
+<source>Transfer file and folder permissions.</source>
+<target>ファイルとフォルダのパーミッションを転送します</target>
+
+<source>Automatic retry on error:</source>
+<target>エラー時の自動再試行:</target>
-<source>Restore hidden dialogs</source>
-<target>隠したダイアログを復帰</target>
+<source>Retry count:</source>
+<target>再試行回数:</target>
-<source>External applications</source>
-<target>外部アプリケーション</target>
+<source>Delay (in seconds):</source>
+<target>遅延 (秒で指定):</target>
+
+<source>Customize context menu:</source>
+<target>コンテキストメニューのカスタマイズ:</target>
<source>Description</source>
<target>説明</target>
+<source>Restore hidden windows</source>
+<target>非表示ウィンドウを復帰</target>
+
<source>&Default</source>
<target>デフォルト(&D)</target>
-<source>Find what:</source>
-<target>検索語:</target>
+<source>Source code written in C++ using:</source>
+<target>ソースコードは C++ で書かれています</target>
-<source>Match case</source>
-<target>文字種を区別</target>
+<source>If you like FreeFileSync</source>
+<target>FreeFileSync を気に入ってくれた方へ</target>
-<source>&Find next</source>
-<target>次を検索(&F)</target>
+<source>Donate with PayPal</source>
+<target>PayPal から寄付</target>
-<source>Start synchronization</source>
-<target>同期の開始</target>
+<source>Feedback and suggestions are welcome</source>
+<target>フィードバック、提案などはこちらから</target>
-<source>Delete</source>
-<target>削除</target>
+<source>Homepage</source>
+<target>ホームページ</target>
-<source>Configure filter</source>
-<target>フィルター設定</target>
+<source>Email</source>
+<target>E-メール</target>
-<source>Find</source>
-<target>検索</target>
+<source>Published under the GNU General Public License</source>
+<target>GNU 一般共有使用許諾に基づき公開されています</target>
+
+<source>Many thanks for localization:</source>
+<target>ローカライズのご協力に感謝します:</target>
+
+<source>Save as Batch Job</source>
+<target>一括ジョブを保存</target>
-<source>Select time span</source>
+<source>Delete Items</source>
+<target>項目の削除</target>
+
+<source>Global Settings</source>
+<target>全般的な設定</target>
+
+<source>Select Time Span</source>
<target>タイムスパンを選択</target>
-<source>Folder pairs</source>
-<target>フォルダ・ペア</target>
+<source>Folder Pairs</source>
+<target>フォルダ ペア</target>
+
+<source>Find</source>
+<target>検索</target>
<source>Overview</source>
<target>概要</target>
@@ -1023,14 +1049,14 @@ Note: File paths must be relative to base directories.
<source>Configuration</source>
<target>構成設定</target>
-<source>Main bar</source>
+<source>Main Bar</source>
<target>メインバー</target>
-<source>Filter files</source>
-<target>ファイルフィルター</target>
+<source>Filter Files</source>
+<target>ファイルフィルター</target>
-<source>Select view</source>
-<target>表示選択</target>
+<source>Select View</source>
+<target>表示を選択</target>
<source>Open...</source>
<target>開く...</target>
@@ -1041,13 +1067,14 @@ Note: File paths must be relative to base directories.
<source>Compare both sides</source>
<target>両方を比較</target>
-<source>
-<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
-<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
-</source>
-<target>
-<pluralform>本当に合計 %x この項目に対してコマンド %y を実行しますか?</pluralform>
-</target>
+<source>Comparison settings</source>
+<target>比較設定</target>
+
+<source>Synchronization settings</source>
+<target>同期処理設定</target>
+
+<source>Start synchronization</source>
+<target>同期の開始</target>
<source>Confirm</source>
<target>確認</target>
@@ -1082,12 +1109,6 @@ Note: File paths must be relative to base directories.
<source>Set direction:</source>
<target>方向の設定:</target>
-<source>Exclude temporarily</source>
-<target>一時的に除外</target>
-
-<source>Include temporarily</source>
-<target>一時的に含める</target>
-
<source>multiple selection</source>
<target>複数選択</target>
@@ -1097,6 +1118,15 @@ Note: File paths must be relative to base directories.
<source>Exclude via filter:</source>
<target>フィルターを経由して除外</target>
+<source>Exclude temporarily</source>
+<target>一時的に除外</target>
+
+<source>Include temporarily</source>
+<target>一時的に含める</target>
+
+<source>Delete</source>
+<target>削除</target>
+
<source>Include all</source>
<target>すべて含める</target>
@@ -1145,6 +1175,9 @@ Note: File paths must be relative to base directories.
<source>Never save &changes</source>
<target>変更の保存をしない(&C)</target>
+<source>Filter</source>
+<target>フィルター</target>
+
<source>Show files that exist on left side only</source>
<target>左側のみに存在するファイルを表示</target>
@@ -1190,12 +1223,18 @@ Note: File paths must be relative to base directories.
<source>Set as default</source>
<target>デフォルトにセット</target>
-<source>Operation aborted</source>
-<target>操作の中断</target>
-
<source>All folders are in sync</source>
<target>すべてのフォルダを同期</target>
+<source>Synchronization Settings</source>
+<target>同期の設定</target>
+
+<source>Comparison Settings</source>
+<target>比較の設定</target>
+
+<source>Cannot find %x</source>
+<target>%x は見つかりません</target>
+
<source>Comma-separated values</source>
<target>カンマ区切りの値</target>
@@ -1211,8 +1250,8 @@ Note: File paths must be relative to base directories.
<source>&Ignore</source>
<target>無視(&I)</target>
-<source>Fatal Error</source>
-<target>致命的なエラー</target>
+<source>Serious Error</source>
+<target>重大なエラー</target>
<source>&Don't show this warning again</source>
<target>次回からこの警告を表示しない(&D)</target>
@@ -1220,9 +1259,6 @@ Note: File paths must be relative to base directories.
<source>&Switch</source>
<target>切り替え(&S)</target>
-<source>Question</source>
-<target>質問</target>
-
<source>&Yes</source>
<target>はい(&Y)</target>
@@ -1244,8 +1280,8 @@ Note: File paths must be relative to base directories.
<source>Initializing...</source>
<target>初期化中...</target>
-<source>Aborted</source>
-<target>中断</target>
+<source>Stopped</source>
+<target>停止</target>
<source>Completed</source>
<target>完了しました!</target>
@@ -1256,12 +1292,6 @@ Note: File paths must be relative to base directories.
<source>Log</source>
<target>ログ</target>
-<source>Cannot find %x</source>
-<target>%x は見つかりません</target>
-
-<source>Inactive</source>
-<target>非アクティブ</target>
-
<source>Today</source>
<target>今日</target>
@@ -1286,9 +1316,6 @@ Note: File paths must be relative to base directories.
<source>MB</source>
<target>MB</target>
-<source>Filter</source>
-<target>フィルター</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>
@@ -1297,6 +1324,9 @@ Note: File paths must be relative to base directories.
<pluralform>本当に以下 %x 個の項目をゴミ箱に移動しますか?</pluralform>
</target>
+<source>Move</source>
+<target>移動</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>
@@ -1305,6 +1335,9 @@ Note: File paths must be relative to base directories.
<pluralform>本当に以下の %x 個の項目を削除しますか</pluralform>
</target>
+<source>Exclude</source>
+<target>除外</target>
+
<source>Direct</source>
<target>ダイレクト</target>
@@ -1329,8 +1362,8 @@ Note: File paths must be relative to base directories.
<source>- Other side's counterpart to %item_folder%</source>
<target>- %item_folder% の反対側の対象</target>
-<source>Make hidden warnings and dialogs visible again?</source>
-<target>非表示にした警告ダイアログを再び表示しますか?</target>
+<source>Restore all hidden windows and warnings?</source>
+<target>すべての非表示ウィンドウと警告を元に戻しますか?</target>
<source>Leave as unresolved conflict</source>
<target>未解決の競合はそのまま残す</target>
@@ -1452,14 +1485,14 @@ Note: File paths must be relative to base directories.
<pluralform>%x 日</pluralform>
</target>
-<source>Failed to register to receive system messages.</source>
-<target>受信したシステムメッセージの登録に失敗.</target>
+<source>Unable to register to receive system messages.</source>
+<target>システム受信メッセージに登録できません</target>
<source>Cannot set privilege %x.</source>
<target>%x の特権をセットできません.</target>
-<source>Failed to suspend system sleep mode.</source>
-<target>システム スリープモードの中断に失敗</target>
+<source>Unable to suspend system sleep mode.</source>
+<target>システム スリープモードを中断できません</target>
<source>Cannot change process I/O priorities.</source>
<target>プロセスの I/O 優先度を変更できません</target>
diff --git a/BUILD/Languages/korean.lng b/BUILD/Languages/korean.lng
index 01ec80b0..0caaf5a4 100644
--- a/BUILD/Languages/korean.lng
+++ b/BUILD/Languages/korean.lng
@@ -2,11 +2,17 @@
<language>한국어</language>
<translator>Simon Park</translator>
<locale>ko_KR</locale>
- <flag_image>flag_south_korea.png</flag_image>
- <plural_form_count>1</plural_form_count>
+ <image>flag_south_korea.png</image>
+ <plural_count>1</plural_count>
<plural_definition>0</plural_definition>
</header>
+<source>&Check</source>
+<target></target>
+
+<source>Retrying operation...</source>
+<target></target>
+
<source>Both sides have changed since last synchronization.</source>
<target>마지막 동기화 작업 이후, 양측 모두 변경 되었습니다.</target>
@@ -58,9 +64,6 @@
<source>Cannot open file %x.</source>
<target>파일 %x을(를) 열 수 없습니다.</target>
-<source>Error</source>
-<target>오류</target>
-
<source>File %x does not contain a valid configuration.</source>
<target>파일 %x 의 구성이 유효하지 않습니다.</target>
@@ -70,12 +73,12 @@
<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
<target>명령줄을 통해 설정된 디렉토리의 경우, 설정 파일은 디렉토리 페어 상의 설정을 포함할 수 없습니다.</target>
-<source>Warning</source>
-<target>경고</target>
-
<source>Directories cannot be set for more than one configuration file.</source>
<target>디렉토리는 하나 이상의 설정 파일을 위해 설정될 수 없습니다.</target>
+<source>Command line</source>
+<target>명령줄(커맨드라인)</target>
+
<source>Syntax:</source>
<target>구문(Syntax):</target>
@@ -91,9 +94,6 @@
<source>Any number of alternative directories for at most one config file.</source>
<target>최대 한개 설정파일에 대한 대체 디렉토리 개수</target>
-<source>Command line</source>
-<target>명령줄(커맨드라인)</target>
-
<source>A folder input field is empty.</source>
<target>폴더 입력 필드 하나가 비어 있습니다.</target>
@@ -289,7 +289,7 @@
<source>/sec</source>
<target>/초</target>
-<source>%x items</source>
+<source>%x items/sec</source>
<target>%x 항목</target>
<source>Configuration file %x loaded partially only.</source>
@@ -319,11 +319,11 @@
<source>Volume name %x is not part of file path %y.</source>
<target>볼륨 이름 %x은(는) 파일 경로 %y의 일부가 아닙니다.</target>
-<source>Abort requested: Waiting for current operation to finish...</source>
+<source>Stop requested: Waiting for current operation to finish...</source>
<target>사용자에 의한 작업 중단: 현재 작업 종료 대기 중...</target>
-<source>Failure to create timestamp for versioning:</source>
-<target>버저닝을 위한 타임 스탬프 생성 실패:</target>
+<source>Unable to create timestamp for versioning:</source>
+<target>버저닝을 위한 타임 스탬프 생성 불가:</target>
<source>Cannot read the following XML elements:</source>
<target>다음 XML 요소를 읽을 수 없습니다:</target>
@@ -340,8 +340,8 @@
<source>&Program</source>
<target>프로그램(&P)</target>
-<source>&Content</source>
-<target>도움말 내용(&C)</target>
+<source>&View help</source>
+<target>도움말 보기(&V)</target>
<source>&About</source>
<target>상세 정보(&A)</target>
@@ -364,8 +364,8 @@
<source>To get started just import a .ffs_batch file.</source>
<target>시작하려면 .ffs_batch file (일괄 파일)을 가져오십시오.</target>
-<source>Folders to watch</source>
-<target>열어 볼 폴더</target>
+<source>Folders to watch:</source>
+<target>열어 볼 폴더:</target>
<source>Add folder</source>
<target>폴더 추가</target>
@@ -379,12 +379,15 @@
<source>Select a folder</source>
<target>폴더 선택</target>
-<source>Idle time [seconds]</source>
-<target>유휴시간 [초]</target>
+<source>Idle time (in seconds):</source>
+<target>유휴 시간 (초 단위)</target>
<source>Idle time between last detected change and execution of command</source>
<target>마지막으로 감지된 변화와 명령 실행 간의 유휴 시간</target>
+<source>Command line:</source>
+<target>명령줄(커맨드라인):</target>
+
<source>
The command is triggered if:
- files or subfolders change
@@ -396,8 +399,8 @@ The command is triggered if:
- 새 폴더가 생겼을 시 (예: USB 스틱 삽입)
</target>
-<source>Start</source>
-<target>시작</target>
+<source>&Start</source>
+<target>시작(&S)</target>
<source>&Retry</source>
<target>다시 시도(&R)</target>
@@ -405,24 +408,27 @@ The command is triggered if:
<source>Cancel</source>
<target>취소</target>
-<source>RealtimeSync - Automated Synchronization</source>
-<target>실시간 동기화 - 자동 동기화</target>
+<source>About</source>
+<target>상세 정보</target>
<source>Build: %x</source>
<target>빌드: %x</target>
-<source>About</source>
-<target>상세 정보</target>
-
<source>All files</source>
<target>모든 파일</target>
+<source>Automated Synchronization</source>
+<target>자동 동기화</target>
+
<source>Directory monitoring active</source>
<target>디렉토리 모니터링 활성화</target>
<source>Waiting until all directories are available...</source>
<target>모든 디렉토리가 사용 가능할 때까지 대기 중...</target>
+<source>Error</source>
+<target>오류</target>
+
<source>&Restore</source>
<target>복원(&R)</target>
@@ -432,8 +438,8 @@ The command is triggered if:
<source>&Exit</source>
<target>나가기(&E)</target>
-<source>Invalid command line:</source>
-<target>잘못된 명령줄:</target>
+<source>Incorrect command line:</source>
+<target>부정확한 명령줄:</target>
<source>File content</source>
<target>파일 내용</target>
@@ -495,8 +501,8 @@ The command is triggered if:
<source>Target folder input field must not be empty.</source>
<target>대상 폴더 입력 필드가 비어 있어서는 안 됩니다.</target>
-<source>Folder input field for versioning must not be empty.</source>
-<target>버저닝을 위한 폴더 입력 필드가 비어 있어서는 안 됩니다.</target>
+<source>Please enter a target folder for versioning.</source>
+<target>버저닝을 위한 대상 폴더를 입력하세요.</target>
<source>Source folder %x not found.</source>
<target>소스 폴더 %x을(를) 찾을 수 없음.</target>
@@ -505,7 +511,7 @@ The command is triggered if:
<target>아래의 항목들은 해결치 못 한 충돌로 인해 동기화할 수 없습니다:</target>
<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
-<target>다음 폴더들의 차이가 상당합니다. 동기화를 위해 올바른 폴더들이 매치되었는지 확인해 보십시오.</target>
+<target>다음 폴더들은 차이가 상당합니다. 동기화를 위해 올바른 폴더들이 매치되었는지 확인해 보십시오.</target>
<source>Not enough free disk space available in:</source>
<target>사용 가능한 디스크 여유 공간이 부족합니다:</target>
@@ -534,7 +540,7 @@ The command is triggered if:
<source>job name</source>
<target>작업 이름</target>
-<source>Synchronization aborted</source>
+<source>Synchronization stopped</source>
<target>동기화 중단</target>
<source>Synchronization completed with errors</source>
@@ -552,14 +558,37 @@ The command is triggered if:
<source>Saving log file %x...</source>
<target>로그 파일 %x 저장 중...</target>
-<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
-<target>FreeFileSync 기본 대화 창에서 문제 해결을 하려면 "Switch" [전환]을 누르십시오.</target>
+<source>You can switch to FreeFileSync's main window to resolve this issue.</source>
+<target>이 문제는 FreeFileSync 기본 창으로 전환해서 해결 가능합니다.</target>
+
+<source>&Don't show this warning again</source>
+<target>이 경고를 다시 표시하지 않음(&D)</target>
-<source>Switching to FreeFileSync main dialog</source>
-<target>FreeFileSync 기본 대화 창으로 전환</target>
+<source>&Ignore</source>
+<target>무시(&I)</target>
-<source>Retrying operation after error:</source>
-<target>오류 발생 후, 작업 재시도 중:</target>
+<source>&Switch</source>
+<target>전환(&S)</target>
+
+<source>Switching to FreeFileSync's main window</source>
+<target>FreeFileSync 기본 창으로 전환 중</target>
+
+<source>
+<pluralform>Automatic retry in 1 second...</pluralform>
+<pluralform>Automatic retry in %x seconds...</pluralform>
+</source>
+<target>
+<pluralform>%x초 이내에 자동 재시도...</pluralform>
+</target>
+
+<source>Serious Error</source>
+<target>심각한 오류</target>
+
+<source>&Ignore subsequent errors</source>
+<target>이후 오류 무시(&I)</target>
+
+<source>Check for Program Updates</source>
+<target>프로그램 업데이트 확인</target>
<source>A new version of FreeFileSync is available:</source>
<target>새로운 버전의 FreeFileSync가 나왔습니다:</target>
@@ -567,18 +596,12 @@ The command is triggered if:
<source>Download now?</source>
<target>지금 다운로드 하시겠습니까?</target>
-<source>New version found</source>
-<target>새로운 버전이 발견되었습니다.</target>
-
<source>&Download</source>
<target>다운로드(&D)</target>
<source>FreeFileSync is up to date.</source>
<target>FreeFileSync는 현재 최신버전 상태입니다.</target>
-<source>Information</source>
-<target>인포메이션 (정보)</target>
-
<source>Unable to connect to sourceforge.net.</source>
<target>Sourceforge.net에 접속할 수 없습니다.</target>
@@ -636,20 +659,20 @@ The command is triggered if:
<source>Hibernate</source>
<target>최대절전모드</target>
-<source>Selected variant:</source>
-<target>선택한 베어리언트</target>
+<source>Alternate comparison settings</source>
+<target>비교 설정 변경</target>
-<source>Select alternate comparison settings</source>
-<target>대체 비교 설정 선택</target>
+<source>Alternate synchronization settings</source>
+<target>동기화 설정 변경</target>
-<source>Select alternate synchronization settings</source>
-<target>대체 동기화 설정 선택</target>
+<source>Local filter</source>
+<target>로컬 필터</target>
-<source>Filter is active</source>
-<target>필터 활성화</target>
+<source>Active</source>
+<target>활성화</target>
-<source>No filter selected</source>
-<target>선택한 필터가 없음</target>
+<source>None</source>
+<target>아무것도 안 함</target>
<source>Remove alternate settings</source>
<target>대체설정 제거</target>
@@ -663,8 +686,17 @@ The command is triggered if:
<source>Paste</source>
<target>붙여넣기</target>
+<source>Alternate Comparison Settings</source>
+<target>비교 설정 변경</target>
+
+<source>Alternate Synchronization Settings</source>
+<target>동기화 설정 변경</target>
+
+<source>Local Filter</source>
+<target>로컬 필터</target>
+
<source>&New</source>
-<target>신규 작업 (&N)</target>
+<target>신규 작업(&N)</target>
<source>&Save</source>
<target>저장(&S)</target>
@@ -678,15 +710,18 @@ The command is triggered if:
<source>2. &Synchronize</source>
<target>2. 동기화(&S)</target>
+<source>&Global settings</source>
+<target>전체 설정(&G)</target>
+
<source>&Language</source>
<target>언어 선택(&L)</target>
+<source>&Find...</source>
+<target>찾기(&F)</target>
+
<source>&Export file list...</source>
<target>파일 리스트 내보내기(&E)</target>
-<source>&Global settings</source>
-<target>전체 설정(&G)</target>
-
<source>&Tools</source>
<target>도구(&T)</target>
@@ -696,18 +731,12 @@ The command is triggered if:
<source>Check &automatically once a week</source>
<target>자동으로 주당 1회 확인(&a)</target>
-<source>Check for new &version</source>
-<target>신규 버전 확인(&v)</target>
+<source>&Check for new version</source>
+<target>신규 버전 확인(&C)</target>
<source>Compare</source>
<target>비 교</target>
-<source>Comparison settings</source>
-<target>비교 설정</target>
-
-<source>Synchronization settings</source>
-<target>동기화 설정</target>
-
<source>Synchronize</source>
<target>동 기 화</target>
@@ -720,6 +749,15 @@ The command is triggered if:
<source>Swap sides</source>
<target>양측 위치 바꾸기</target>
+<source>Close search bar</source>
+<target>검색 창 닫기</target>
+
+<source>Find:</source>
+<target>찾기:</target>
+
+<source>Match case</source>
+<target>대문자/소문자 구분</target>
+
<source>Save as batch job</source>
<target>일괄 작업으로 저장</target>
@@ -741,74 +779,20 @@ The command is triggered if:
<source>Total bytes to copy</source>
<target>복사할 전체 바이트 크기</target>
-<source>Items found:</source>
-<target>발견된 항목:</target>
+<source>Select a variant:</source>
+<target>베어리언트 선택:</target>
-<source>Speed:</source>
-<target>속도:</target>
+<source>Identify equal files by comparing modification time and size.</source>
+<target>수정 시간 및 크기를 비교하여 동일한 파일을 식별</target>
-<source>Time remaining:</source>
-<target>남은 시간:</target>
+<source>Identify equal files by comparing the file content.</source>
+<target>파일 내용을 비교하여 동일한 파일을 식별</target>
-<source>Time elapsed:</source>
-<target>경과 시간:</target>
+<source>Symbolic links:</source>
+<target>심볼링 링크:</target>
-<source>Synchronizing...</source>
-<target>동기화 작업 중...</target>
-
-<source>Minimize to notification area</source>
-<target>알림 영역으로 최소화</target>
-
-<source>On completion</source>
-<target>완료 시</target>
-
-<source>Close</source>
-<target>닫기</target>
-
-<source>&Pause</source>
-<target>일시정지(&P)</target>
-
-<source>Variant</source>
-<target>베어리언트</target>
-
-<source>Statistics</source>
-<target>통계</target>
-
-<source>&Don't show this dialog again</source>
-<target>이 대화 창을 다시 표시 안 함 (&D)</target>
-
-<source>Select a variant</source>
-<target>베어리언트 선택</target>
-
-<source>
-Files are found equal if
- - last write time and date
- - file size
-are the same
-</source>
-<target>
-비교된 양쪽 파일은
-마지막 쓰기 시간과 날짜,
-그리고 파일 크기가 모두 같을 경우,
-동일한 파일로 간주됩니다.
-</target>
-
-<source>
-Files are found equal if
- - file content
-is the same
-</source>
-<target>
-비교된 양쪽 파일은
-파일 내용이 같을 경우,
-동일한 파일로 간주됩니다.
-</target>
-
-<source>Symbolic Link handling</source>
-<target>심볼릭 링크 처리</target>
-
-<source>Help</source>
-<target>도움말</target>
+<source>More information</source>
+<target>상세 정보</target>
<source>OK</source>
<target>OK</target>
@@ -816,10 +800,10 @@ is the same
<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
<target>양측 변경사항을 확인하고 전달. 삭제, 이동 및 충돌은 데이터베이스를 통해 자동으로 감지됩니다.</target>
-<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
-<target>좌측 폴더 백업 미러. 동기화 이후 우측 폴더는 좌측 폴더와 완전히 똑같이 매치 되도록 변경 됩니다.</target>
+<source>Create a mirror backup of the left folder which exactly matches the right folder after synchronization.</source>
+<target>좌측 폴더 백업 미러 생성: 동기화 이후 좌측 및 우측 폴더는 완전히 똑같이 매치 됩니다.</target>
-<source>Copy new or updated files to right folder.</source>
+<source>Copy new and updated files to the right folder.</source>
<target>신규 또는 업데이트 된 파일을 우측 폴더로 복사</target>
<source>Configure your own synchronization rules.</source>
@@ -831,23 +815,8 @@ is the same
<source>Requires database files. Not supported by all file systems.</source>
<target>데이터베이스 파일이 필요합니다. 모든 파일 시스템에서 지원되지는 않습니다.</target>
-<source>Error handling</source>
-<target>오류 발생시:</target>
-
-<source>Ignore</source>
-<target>무시</target>
-
-<source>Hide all error and warning messages</source>
-<target>모든 오류/경고 메세지 숨기기</target>
-
-<source>Pop-up</source>
-<target>팝업</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>오류 또는 경고에 대한 팝업 보이기</target>
-
-<source>Deletion handling</source>
-<target>삭제 처리 옵션</target>
+<source>Delete files:</source>
+<target>파일 삭제:</target>
<source>Permanent</source>
<target>영구</target>
@@ -855,8 +824,8 @@ is the same
<source>Delete or overwrite files permanently</source>
<target>파일 영구 삭제 또는 덮어쓰기</target>
-<source>Recycle bin</source>
-<target>휴지통</target>
+<source>&Recycle bin</source>
+<target>휴지통(&R)</target>
<source>Back up deleted and overwritten files in the recycle bin</source>
<target>휴지통에 삭제되고 덮어 씌어진 파일 백업</target>
@@ -870,56 +839,86 @@ is the same
<source>Naming convention:</source>
<target>이름 지정:</target>
-<source>Batch job</source>
-<target>일괄 작업</target>
+<source>Show examples</source>
+<target>예 보이기</target>
-<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
-<target>직접 지켜보지 않는 자동 동기화의 경우, 배치 파일을 만듭니다. 시작하려면 파일을 더블 클릭하거나 작업 플래너에서 일정을 만듭니다: %x</target>
+<source>Handle errors:</source>
+<target>오류 발생시:</target>
-<source>Exit</source>
-<target>종료</target>
+<source>Ignore</source>
+<target>무시</target>
-<source>Abort synchronization on first error</source>
-<target>첫 번째 오류 시 동기화 중지</target>
+<source>Hide all error and warning messages</source>
+<target>모든 오류/경고 메세지 숨기기</target>
-<source>Show progress dialog</source>
-<target>진행 표시 창 보기</target>
+<source>Pop-up</source>
+<target>팝업</target>
-<source>Save log</source>
-<target>로그 저장</target>
+<source>Show pop-up on errors or warnings</source>
+<target>오류 또는 경고에 대한 팝업 보이기</target>
-<source>Select folder to save log files</source>
-<target>로그 파일을 저장할 폴더 선택</target>
+<source>On completion:</source>
+<target>완료 시:</target>
-<source>Limit</source>
-<target>제한</target>
+<source>Start synchronization now?</source>
+<target>지금 동기화를 시작하시겠습니까?</target>
-<source>Limit maximum number of log files</source>
-<target>로그 파일의 최대 개수 제한</target>
+<source>Variant:</source>
+<target>베어리언트:</target>
-<source>Source code written in C++ using:</source>
-<target>소스코드는 C++ 언어로 아래 툴을 사용하여 작성되었습니다:</target>
+<source>Statistics</source>
+<target>통 계</target>
-<source>If you like FreeFileSync</source>
-<target>FreeFileSync를 위한 기부</target>
+<source>&Don't show this dialog again</source>
+<target>이 대화 창을 다시 표시 안 함(&D)</target>
-<source>Donate with PayPal</source>
-<target>PayPal로 기부하기</target>
+<source>Items found:</source>
+<target>발견된 항목:</target>
-<source>Many thanks for localization:</source>
-<target>현지화 작업에 깊은 감사 드립니다:</target>
+<source>Speed:</source>
+<target>속도:</target>
-<source>Feedback and suggestions are welcome</source>
-<target>모든 의견 및 건의/제안을 환영합니다</target>
+<source>Time remaining:</source>
+<target>남은 시간:</target>
-<source>Homepage</source>
-<target>홈페이지</target>
+<source>Time elapsed:</source>
+<target>경과 시간:</target>
-<source>Email</source>
-<target>이메일</target>
+<source>Synchronizing...</source>
+<target>동기화 작업 중...</target>
-<source>Published under the GNU General Public License</source>
-<target>GNU 일반 공용 라이센스에 의한 출시</target>
+<source>Minimize to notification area</source>
+<target>알림 영역으로 최소화</target>
+
+<source>Close</source>
+<target>닫기</target>
+
+<source>&Pause</source>
+<target>일시정지(&P)</target>
+
+<source>Stop</source>
+<target>중지</target>
+
+<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>직접 지켜보지 않는 자동 동기화의 경우, 배치 파일을 만듭니다. 시작하려면 파일을 더블 클릭하거나 작업 플래너에서 일정을 만듭니다: %x</target>
+
+<source>Stop synchronization at first error</source>
+<target>첫 오류 발생 시 동기화 중지</target>
+
+<source>Show progress dialog</source>
+<target>진행 표시 창 보기</target>
+
+<source>Save log:</source>
+<target>로그 저장:</target>
+
+<source>Limit:</source>
+<target>제한:</target>
+
+<source>Limit maximum number of log files</source>
+<target>로그 파일의 최대 개수 제한</target>
+
+<source>How can I schedule a batch job?</source>
+<target>일괄 작업 예약 방법은?</target>
<source>Delete on both sides</source>
<target>양측 모두 삭제</target>
@@ -927,109 +926,139 @@ is the same
<source>Delete on both sides even if the file is selected on one side only</source>
<target>어느 한쪽의 파일만 선택하더라도 양측 모두 삭제</target>
-<source>
-Files will only be synchronized if they pass all filter rules.
-Note: File paths must be relative to base directories.
-</source>
-<target>
-모든 필터 규칙에 준할 경우에만 파일을 동기화 시킵니다.
-참고: 파일 경로가 기본 디렉토리에 연결돼 있어야 합니다.
-</target>
+<source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source>
+<target>동기화에서 특정 파일을 제외시키는 필터 규칙을 선택합니다. 해당 폴더 페어(짝)에 대한 상대 파일 경로를 입력하세요.</target>
-<source>Include</source>
-<target>포함</target>
+<source>Include:</source>
+<target>포함:</target>
-<source>Exclude</source>
-<target>제외</target>
+<source>Exclude:</source>
+<target>제외:</target>
-<source>Time span</source>
-<target>시간간격(타임스팬)</target>
+<source>Time span:</source>
+<target>시간 간격:</target>
-<source>File size</source>
-<target>파일 크기</target>
+<source>File size:</source>
+<target>파일 크기:</target>
-<source>Minimum</source>
-<target>최소</target>
+<source>Minimum:</source>
+<target>최소:</target>
-<source>Maximum</source>
-<target>최대</target>
+<source>Maximum:</source>
+<target>최대:</target>
<source>&Clear</source>
<target>지우기(&C)</target>
-<source>Global settings</source>
-<target>전체 설정</target>
+<source>The following settings are used for all synchronization jobs.</source>
+<target>다음 설정은 모든 동기화 작업에 사용됩니다.</target>
<source>Fail-safe file copy</source>
<target>실패 - 안전 파일 복사</target>
-<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
-<target>일단 임시파일(*.ffs_tmp)로 복사한 후 이름 바꾸기. 이 같이 함으로써 치명적인 오류 발생시에도 일관된 상태 유지를 보장합니다.</target>
+<source>
+Copy to a temporary file (*.ffs_tmp) before overwriting target.
+This guarantees a consistent state even in case of a serious error.
+</source>
+<target>
+대상을 덮어쓰기 전에 임시파일(*.ffs_tmp)로 복사.
+이는 심각한 오류 발생시에도 일관된 상태 유지를 보장합니다.
+</target>
+
+<source>(recommended)</source>
+<target>(권장)</target>
<source>Copy locked files</source>
<target>락 걸린 파일 복사</target>
-<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
-<target>Volume Shadow Copy Service를 사용하여 공유 또는 잠긴 파일 복사 (관리자 권한 필요)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service.</source>
+<target>Volume Shadow Copy Service를 사용하여 공유 또는 잠긴 파일 복사</target>
+
+<source>(requires administrator rights)</source>
+<target>(관리자 권한 필요)</target>
<source>Copy file access permissions</source>
<target>파일 접근 권한 복사</target>
-<source>Transfer file and folder permissions (requires administrator rights)</source>
-<target>파일 및 폴더 권한 전송 (관리자 권한 필요)</target>
+<source>Transfer file and folder permissions.</source>
+<target>파일 및 폴더 권한 전송</target>
+
+<source>Automatic retry on error:</source>
+<target>오류 발생 시 자동 재시도:</target>
-<source>Restore hidden dialogs</source>
-<target>숨겨진 대화 창 복원</target>
+<source>Retry count:</source>
+<target>재시도 횟수:</target>
-<source>External applications</source>
-<target>외부 응용 프로그램</target>
+<source>Delay (in seconds):</source>
+<target>지연 (초 단위):</target>
+
+<source>Customize context menu:</source>
+<target>컨텍스트 메뉴 커스터마이즈 (사용자 정의):</target>
<source>Description</source>
<target>설명</target>
+<source>Restore hidden windows</source>
+<target>숨겨진 창 복원</target>
+
<source>&Default</source>
<target>기본 설정/값(&D)</target>
-<source>Find what:</source>
-<target>검색어:</target>
+<source>Source code written in C++ using:</source>
+<target>소스코드는 C++ 언어로 아래 툴을 사용하여 작성되었습니다:</target>
-<source>Match case</source>
-<target>대문자/소문자 구분</target>
+<source>If you like FreeFileSync</source>
+<target>FreeFileSync를 위한 기부</target>
-<source>&Find next</source>
-<target>다음 검색(&F)</target>
+<source>Donate with PayPal</source>
+<target>PayPal로 기부하기</target>
-<source>Start synchronization</source>
-<target>동기화 시작</target>
+<source>Feedback and suggestions are welcome</source>
+<target>모든 의견 및 건의/제안을 환영합니다</target>
-<source>Delete</source>
-<target>삭제</target>
+<source>Homepage</source>
+<target>홈페이지</target>
-<source>Configure filter</source>
-<target>필터 설정</target>
+<source>Email</source>
+<target>이메일</target>
-<source>Find</source>
-<target>검색</target>
+<source>Published under the GNU General Public License</source>
+<target>GNU 일반 공용 라이센스에 의한 출시</target>
-<source>Select time span</source>
+<source>Many thanks for localization:</source>
+<target>현지화 작업에 깊은 감사 드립니다:</target>
+
+<source>Save as Batch Job</source>
+<target>일괄 작업으로 저장</target>
+
+<source>Delete Items</source>
+<target>항목 삭제</target>
+
+<source>Global Settings</source>
+<target>전체 설정</target>
+
+<source>Select Time Span</source>
<target>시간간격(타임스팬) 선택</target>
-<source>Folder pairs</source>
+<source>Folder Pairs</source>
<target>폴더 페어(짝)</target>
+<source>Find</source>
+<target>검색</target>
+
<source>Overview</source>
<target>개요</target>
<source>Configuration</source>
<target>구성 설정</target>
-<source>Main bar</source>
+<source>Main Bar</source>
<target>메인 바</target>
-<source>Filter files</source>
+<source>Filter Files</source>
<target>파일 필터</target>
-<source>Select view</source>
+<source>Select View</source>
<target>보기 선택</target>
<source>Open...</source>
@@ -1041,17 +1070,26 @@ Note: File paths must be relative to base directories.
<source>Compare both sides</source>
<target>양측 비교</target>
+<source>Comparison settings</source>
+<target>비교 설정</target>
+
+<source>Synchronization settings</source>
+<target>동기화 설정</target>
+
+<source>Start synchronization</source>
+<target>동기화 시작</target>
+
+<source>Confirm</source>
+<target>확인</target>
+
<source>
-<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for one item?</pluralform>
<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
</source>
<target>
<pluralform>정말로 %x 항목을 위해 %y 명령을 실행하기를 원하십니까?</pluralform>
</target>
-<source>Confirm</source>
-<target>확인</target>
-
<source>&Execute</source>
<target>실행(&E)</target>
@@ -1082,12 +1120,6 @@ Note: File paths must be relative to base directories.
<source>Set direction:</source>
<target>방향 설정:</target>
-<source>Exclude temporarily</source>
-<target>임시 제외</target>
-
-<source>Include temporarily</source>
-<target>임시 포함</target>
-
<source>multiple selection</source>
<target>복수 선택</target>
@@ -1095,7 +1127,16 @@ Note: File paths must be relative to base directories.
<target>필터를 통해 다음을 포함:</target>
<source>Exclude via filter:</source>
-<target>필터를 통하여 제외</target>
+<target>필터를 통해 다음을 제외:</target>
+
+<source>Exclude temporarily</source>
+<target>임시 제외</target>
+
+<source>Include temporarily</source>
+<target>임시 포함</target>
+
+<source>Delete</source>
+<target>삭제</target>
<source>Include all</source>
<target>모두 포함</target>
@@ -1139,11 +1180,14 @@ Note: File paths must be relative to base directories.
<source>Do you want to save changes to %x?</source>
<target>%x의 변경사항을 저장하시겠습니까?</target>
+<source>Never save &changes</source>
+<target>변경사항을 절대 저장하기 않기(&c)</target>
+
<source>Do&n't save</source>
<target>저장하기 않기(&n)</target>
-<source>Never save &changes</source>
-<target>변경사항을 절대 저장하기 않기(&c)</target>
+<source>Filter</source>
+<target>필터</target>
<source>Show files that exist on left side only</source>
<target>좌측에만 존재하는 파일 표시</target>
@@ -1190,12 +1234,18 @@ Note: File paths must be relative to base directories.
<source>Set as default</source>
<target>기본 값으로 설정</target>
-<source>Operation aborted</source>
-<target>작업 중단</target>
-
<source>All folders are in sync</source>
<target>모든 폴더가 동기화 되었음</target>
+<source>Synchronization Settings</source>
+<target>동기화 설정</target>
+
+<source>Comparison Settings</source>
+<target>비교 설정</target>
+
+<source>Cannot find %x</source>
+<target>%x을(를) 찾을 수 없습니다.</target>
+
<source>Comma-separated values</source>
<target>쉼표로 구분된 값</target>
@@ -1205,30 +1255,6 @@ Note: File paths must be relative to base directories.
<source>Searching for program updates...</source>
<target>프로그램 업데이트 검색 중...</target>
-<source>&Ignore subsequent errors</source>
-<target>이후 오류 무시(&I)</target>
-
-<source>&Ignore</source>
-<target>무시(&I)</target>
-
-<source>Fatal Error</source>
-<target>치명적 오류</target>
-
-<source>&Don't show this warning again</source>
-<target>이 경고를 다시 표시하지 않음(&D)</target>
-
-<source>&Switch</source>
-<target>스위치[전환](&S)</target>
-
-<source>Question</source>
-<target>질문</target>
-
-<source>&Yes</source>
-<target>예(&Y)</target>
-
-<source>&No</source>
-<target>아니오(&N)</target>
-
<source>Scanning...</source>
<target>스캔 중...</target>
@@ -1238,14 +1264,17 @@ Note: File paths must be relative to base directories.
<source>Info</source>
<target>정보</target>
+<source>Warning</source>
+<target>경고</target>
+
<source>Paused</source>
<target>일시정지 중</target>
<source>Initializing...</source>
<target>초기화 작업 중...</target>
-<source>Aborted</source>
-<target>중단됨</target>
+<source>Stopped</source>
+<target>중단</target>
<source>Completed</source>
<target>완료</target>
@@ -1256,12 +1285,6 @@ Note: File paths must be relative to base directories.
<source>Log</source>
<target>로그</target>
-<source>Cannot find %x</source>
-<target>%x을(를) 찾을 수 없습니다.</target>
-
-<source>Inactive</source>
-<target>비활성화</target>
-
<source>Today</source>
<target>오늘</target>
@@ -1286,9 +1309,6 @@ Note: File paths must be relative to base directories.
<source>MB</source>
<target>MB</target>
-<source>Filter</source>
-<target>필터</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>
@@ -1297,6 +1317,9 @@ Note: File paths must be relative to base directories.
<pluralform>다음 %x 항목을 정말로 휴지통으로 이동하기를 원하십니까?</pluralform>
</target>
+<source>Move</source>
+<target>이동</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>
@@ -1305,6 +1328,9 @@ Note: File paths must be relative to base directories.
<pluralform>정말로 다음 %x 항목(들)을 삭제하시겠습니까?</pluralform>
</target>
+<source>Exclude</source>
+<target>제외</target>
+
<source>Direct</source>
<target>다이렉트</target>
@@ -1329,8 +1355,8 @@ Note: File paths must be relative to base directories.
<source>- Other side's counterpart to %item_folder%</source>
<target>% 항목_폴더 %의 반대편 대응부(카운터파트)</target>
-<source>Make hidden warnings and dialogs visible again?</source>
-<target>숨겨진 경고 창 또는 대화 창을 다시 보이게 하시겠습니까?</target>
+<source>Restore all hidden windows and warnings?</source>
+<target>모든 숨겨진 창 및 경고를 복원하시겠습니까?</target>
<source>Leave as unresolved conflict</source>
<target>미해결 충돌로 놔두기</target>
@@ -1452,17 +1478,17 @@ Note: File paths must be relative to base directories.
<pluralform>%x일</pluralform>
</target>
-<source>Failed to register to receive system messages.</source>
-<target>시스템 메시지를 받기 위한 등록에 실패하였습니다.</target>
+<source>Unable to register to receive system messages.</source>
+<target>시스템 메시지 수신을 위한 등록을 할 수 없습니다.</target>
<source>Cannot set privilege %x.</source>
<target>권한 %x을(를) 설정할 수 없습니다.</target>
-<source>Failed to suspend system sleep mode.</source>
-<target>시스템 절전모드 중지 실패</target>
+<source>Unable to suspend system sleep mode.</source>
+<target>시스템 절전모드 중지를 할 수 없습니다.</target>
<source>Cannot change process I/O priorities.</source>
-<target>I/O 우선순위 프로세스 변경 불가</target>
+<target>프로세스 I/O 우선순위 변경을 할 수 없습니다.</target>
<source>Unable to move %x to the recycle bin.</source>
<target>휴지통으로 %x을(를) 이동할 수 없습니다.</target>
diff --git a/BUILD/Languages/lithuanian.lng b/BUILD/Languages/outdated/lithuanian.lng
index 032b8ee6..d503fa7e 100644
--- a/BUILD/Languages/lithuanian.lng
+++ b/BUILD/Languages/outdated/lithuanian.lng
@@ -2,20 +2,44 @@
<language>Lietuvių</language>
<translator>Tadas Norbutas</translator>
<locale>lt_LT</locale>
- <flag_image>flag_lithuania.png</flag_image>
- <plural_form_count>4</plural_form_count>
+ <image>flag_lithuania.png</image>
+ <plural_count>4</plural_count>
<plural_definition>n==1 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3</plural_definition>
</header>
+<source>Unable to suspend system sleep mode.</source>
+<target></target>
+
+<source>Unable to register to receive system messages.</source>
+<target></target>
+
+<source>Restore all hidden windows and warnings?</source>
+<target></target>
+
+<source>Move</source>
+<target></target>
+
<source>&Continue</source>
<target></target>
+<source>Stopped</source>
+<target></target>
+
<source>&Don't show this warning again</source>
<target></target>
+<source>Serious Error</source>
+<target></target>
+
<source>&Ignore subsequent errors</source>
<target></target>
+<source>Comparison Settings</source>
+<target></target>
+
+<source>Synchronization Settings</source>
+<target></target>
+
<source>Never save &changes</source>
<target></target>
@@ -29,24 +53,254 @@
<source>&Execute</source>
<target></target>
+<source>
+<pluralform>Do you really want to execute the command %y for one item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+</target>
+
+<source>Select View</source>
+<target></target>
+
+<source>Filter Files</source>
+<target></target>
+
+<source>Main Bar</source>
+<target></target>
+
+<source>Folder Pairs</source>
+<target></target>
+
+<source>Select Time Span</source>
+<target></target>
+
+<source>Global Settings</source>
+<target></target>
+
+<source>Delete Items</source>
+<target></target>
+
+<source>Save as Batch Job</source>
+<target></target>
+
+<source>Restore hidden windows</source>
+<target></target>
+
+<source>Customize context menu:</source>
+<target></target>
+
+<source>Delay (in seconds):</source>
+<target></target>
+
+<source>Retry count:</source>
+<target></target>
+
+<source>Automatic retry on error:</source>
+<target></target>
+
+<source>Transfer file and folder permissions.</source>
+<target></target>
+
+<source>(requires administrator rights)</source>
+<target></target>
+
+<source>Copy shared or locked files using the Volume Shadow Copy Service.</source>
+<target></target>
+
+<source>(recommended)</source>
+<target></target>
+
+<source>
+Copy to a temporary file (*.ffs_tmp) before overwriting target.
+This guarantees a consistent state even in case of a serious error.
+</source>
+<target></target>
+
+<source>The following settings are used for all synchronization jobs.</source>
+<target></target>
+
+<source>Maximum:</source>
+<target></target>
+
+<source>Minimum:</source>
+<target></target>
+
+<source>File size:</source>
+<target></target>
+
+<source>Time span:</source>
+<target></target>
+
+<source>Exclude:</source>
+<target></target>
+
+<source>Include:</source>
+<target></target>
+
+<source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source>
+<target></target>
+
+<source>&Recycle bin</source>
+<target></target>
+
+<source>How can I schedule a batch job?</source>
+<target></target>
+
+<source>Limit:</source>
+<target></target>
+
+<source>Save log:</source>
+<target></target>
+
+<source>Stop synchronization at first error</source>
+<target></target>
+
+<source>Stop</source>
+<target></target>
+
<source>&Don't show this dialog again</source>
<target></target>
+<source>Variant:</source>
+<target></target>
+
+<source>Start synchronization now?</source>
+<target></target>
+
+<source>On completion:</source>
+<target></target>
+
+<source>Handle errors:</source>
+<target></target>
+
+<source>Show examples</source>
+<target></target>
+
+<source>Delete files:</source>
+<target></target>
+
+<source>Copy new and updated files to the right folder.</source>
+<target></target>
+
+<source>Create a mirror backup of the left folder which exactly matches the right folder after synchronization.</source>
+<target></target>
+
+<source>More information</source>
+<target></target>
+
+<source>Symbolic links:</source>
+<target></target>
+
+<source>Identify equal files by comparing the file content.</source>
+<target></target>
+
+<source>Identify equal files by comparing modification time and size.</source>
+<target></target>
+
+<source>Select a variant:</source>
+<target></target>
+
+<source>Find:</source>
+<target></target>
+
<source>Close search bar</source>
<target></target>
-<source>Check for new &version</source>
+<source>&Check for new version</source>
<target></target>
<source>&Tools</source>
<target></target>
+<source>&Find...</source>
+<target></target>
+
+<source>Local Filter</source>
+<target></target>
+
+<source>Alternate Synchronization Settings</source>
+<target></target>
+
+<source>Alternate Comparison Settings</source>
+<target></target>
+
+<source>None</source>
+<target></target>
+
+<source>Active</source>
+<target></target>
+
+<source>Local filter</source>
+<target></target>
+
+<source>Alternate synchronization settings</source>
+<target></target>
+
+<source>Alternate comparison settings</source>
+<target></target>
+
<source>&Download</source>
<target></target>
+<source>Check for Program Updates</source>
+<target></target>
+
+<source>Retrying operation</source>
+<target></target>
+
+<source>
+<pluralform>Automatic retry in 1 second...</pluralform>
+<pluralform>Automatic retry in %x seconds...</pluralform>
+</source>
+<target>
+</target>
+
+<source>Switching to FreeFileSync's main window</source>
+<target></target>
+
+<source>You can switch to FreeFileSync's main window to resolve this issue.</source>
+<target></target>
+
+<source>Synchronization stopped</source>
+<target></target>
+
+<source>Please enter a target folder for versioning.</source>
+<target></target>
+
+<source>Incorrect command line:</source>
+<target></target>
+
<source>&Show error</source>
<target></target>
+<source>Automated Synchronization</source>
+<target></target>
+
+<source>&Start</source>
+<target></target>
+
+<source>Command line:</source>
+<target></target>
+
+<source>Idle time (in seconds):</source>
+<target></target>
+
+<source>Folders to watch:</source>
+<target></target>
+
+<source>&View help</source>
+<target></target>
+
+<source>Unable to create timestamp for versioning:</source>
+<target></target>
+
+<source>Stop requested: Waiting for current operation to finish...</source>
+<target></target>
+
+<source>%x items/sec</source>
+<target></target>
+
<source>
<pluralform>1 thread</pluralform>
<pluralform>%x threads</pluralform>
@@ -330,9 +584,6 @@
<source>/sec</source>
<target>/sek.</target>
-<source>%x items</source>
-<target>%x pozicijos</target>
-
<source>Configuration file %x loaded partially only.</source>
<target>Nustatymų failas %x įkeltas tik dalinai.</target>
@@ -360,12 +611,6 @@
<source>Volume name %x is not part of file path %y.</source>
<target>Vietos vardas %x nėra failo kelio %y dalis.</target>
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Nutraukti: laukiama kol baigsis esama operacija...</target>
-
-<source>Failure to create timestamp for versioning:</source>
-<target>Nepavyo sukurti laiko žymės versijavimui:</target>
-
<source>Cannot read the following XML elements:</source>
<target>Nepavyksta perskaityti sekančių XML elementų:</target>
@@ -381,9 +626,6 @@
<source>&Program</source>
<target>&Programa</target>
-<source>&Content</source>
-<target>&Turinys</target>
-
<source>&About</source>
<target>&Apie</target>
@@ -405,9 +647,6 @@
<source>To get started just import a .ffs_batch file.</source>
<target>Kad pradėti tiesiog importuokite .ffs_batch failą.</target>
-<source>Folders to watch</source>
-<target>Stebimi aplankai</target>
-
<source>Add folder</source>
<target>Pridėti aplanką</target>
@@ -420,9 +659,6 @@
<source>Select a folder</source>
<target>Pažymėti aplanką</target>
-<source>Idle time [seconds]</source>
-<target>Neveiklus laikas [sek.]</target>
-
<source>Idle time between last detected change and execution of command</source>
<target>Neveiklus laikas tarp paskutinio aptikto pokyčio ir komandos įvykdymo</target>
@@ -437,18 +673,12 @@ Komanda inicijuojama jei:
- atsiranda nauji aplankai (pvz.: įkišamas USB raktas)
</target>
-<source>Start</source>
-<target>Pradėti</target>
-
<source>&Retry</source>
<target>&Bandyti vėl</target>
<source>Cancel</source>
<target>Atšaukti</target>
-<source>RealtimeSync - Automated Synchronization</source>
-<target>RealtimeSync - Automatizuotas sinchronizavimas</target>
-
<source>Build: %x</source>
<target>Versija: %x</target>
@@ -470,9 +700,6 @@ Komanda inicijuojama jei:
<source>&Exit</source>
<target>&Išeiti</target>
-<source>Invalid command line:</source>
-<target>Netinkama komandinė eilutė:</target>
-
<source>File content</source>
<target>Failo turinį</target>
@@ -533,9 +760,6 @@ Komanda inicijuojama jei:
<source>Target folder input field must not be empty.</source>
<target>Tikslo aplanko įvesties laukas negali būti tuščias.</target>
-<source>Folder input field for versioning must not be empty.</source>
-<target>Aplanko įvesties laukas versijavimui negali būti tuščias.</target>
-
<source>Source folder %x not found.</source>
<target>Šaltinio aplankas %x nerastas.</target>
@@ -572,9 +796,6 @@ Komanda inicijuojama jei:
<source>job name</source>
<target>Užduoties pavadinimas</target>
-<source>Synchronization aborted</source>
-<target>Synchronizavimas nutrauktas</target>
-
<source>Synchronization completed with errors</source>
<target>Synchronizavimas baigtas su klaidomis</target>
@@ -590,24 +811,12 @@ Komanda inicijuojama jei:
<source>Saving log file %x...</source>
<target>Saugmas žurnalo failas %x...</target>
-<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
-<target>Spauskite „Perjungti“, kad išspręsti problemas pagrindiniame FreeFileSync lange.</target>
-
-<source>Switching to FreeFileSync main dialog</source>
-<target>Keičiama į pagrindinį FreeFileSync langą</target>
-
-<source>Retrying operation after error:</source>
-<target>Po klaidos kartojama operacija:</target>
-
<source>A new version of FreeFileSync is available:</source>
<target>Yra nauja FreeFileSync versija:</target>
<source>Download now?</source>
<target>Atsiųsti dabar?</target>
-<source>New version found</source>
-<target>Rasta nauja versija</target>
-
<source>FreeFileSync is up to date.</source>
<target>FreeFileSync yra naujausia.</target>
@@ -671,21 +880,6 @@ Komanda inicijuojama jei:
<source>Hibernate</source>
<target>Stabdyti į operatyviąją atmintį</target>
-<source>Selected variant:</source>
-<target>Pasirinktas variantas:</target>
-
-<source>Select alternate comparison settings</source>
-<target>Pasirinkite alternatyvius sulyginimo nustatymus</target>
-
-<source>Select alternate synchronization settings</source>
-<target>Pasirinkite alternatyvius sinchronizavimo nustatymus</target>
-
-<source>Filter is active</source>
-<target>Filtas yra aktyvus</target>
-
-<source>No filter selected</source>
-<target>Nepažymėti jokie filtrai</target>
-
<source>Remove alternate settings</source>
<target>Pašalinti alternatyvius nustatymus</target>
@@ -713,15 +907,15 @@ Komanda inicijuojama jei:
<source>2. &Synchronize</source>
<target>2. &Sinchronizuoti</target>
+<source>&Global settings</source>
+<target>&Bendri nustatymai</target>
+
<source>&Language</source>
<target>&Kalba</target>
<source>&Export file list...</source>
<target>&Eksportuoti failų sąrašą...</target>
-<source>&Global settings</source>
-<target>&Bendri nustatymai</target>
-
<source>&Check now</source>
<target>&Tikrinti dabar</target>
@@ -743,9 +937,6 @@ Komanda inicijuojama jei:
<source>Swap sides</source>
<target>Sukeisti puses</target>
-<source>Find what:</source>
-<target>Rasti kas:</target>
-
<source>Match case</source>
<target>Atitikti atveją</target>
@@ -770,84 +961,12 @@ Komanda inicijuojama jei:
<source>Total bytes to copy</source>
<target>Viso baitų kopijuoti</target>
-<source>Items found:</source>
-<target>Rasta elementų:</target>
-
-<source>Speed:</source>
-<target>Greitis:</target>
-
-<source>Time remaining:</source>
-<target>Likęs laikas:</target>
-
-<source>Time elapsed:</source>
-<target>Praėjęs laikas:</target>
-
-<source>Synchronizing...</source>
-<target>Sinchronizuojama...</target>
-
-<source>Minimize to notification area</source>
-<target>Nuleisti į apačią dešinėje</target>
-
-<source>On completion</source>
-<target>Baigus</target>
-
-<source>Close</source>
-<target>Uždaryti</target>
-
-<source>&Pause</source>
-<target>&Pauzė</target>
-
-<source>Variant</source>
-<target>Variantas</target>
-
-<source>Statistics</source>
-<target>Statistika</target>
-
-<source>Select a variant</source>
-<target>Pasirinkti</target>
-
-<source>
-Files are found equal if
- - last write time and date
- - file size
-are the same
-</source>
-<target>
-Failai laikomi lygiais jei
- - paskutinis rašymo laikas ir data
- - failo dydis
-yra tokie patys
-</target>
-
-<source>
-Files are found equal if
- - file content
-is the same
-</source>
-<target>
-Failai laikomi lygiais jei
- - failo turinys
-yra toks pats
-</target>
-
-<source>Symbolic Link handling</source>
-<target>Simbolinių nuorodų valdymas</target>
-
-<source>Help</source>
-<target>Pagalba</target>
-
<source>OK</source>
<target>Gerai</target>
<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
<target>Nustatyti ir skatinti pokyčius apbiejose pusėse. Trinimai, perkėlimai ir konfliktai yra aptinkami automatiškai naudojant duomenų bazę.</target>
-<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
-<target>Veidrodinė kairiojo aplanko kopija. Dešinysis aplankas yra pakeičiamas taip, kad po sinchronizavimo tiksliai atitiktų kairyjį aplanką.</target>
-
-<source>Copy new or updated files to right folder.</source>
-<target>Kopijuoti naujus ar atnaujintus failus į dešinyjį aplanką.</target>
-
<source>Configure your own synchronization rules.</source>
<target>Nustatyti Jūsų pačių sinchronizavimo taisykles.</target>
@@ -857,24 +976,6 @@ yra toks pats
<source>Requires database files. Not supported by all file systems.</source>
<target>Reikalauja duomenų bazės failų. Visų failų sistemų nėra palaikoma.</target>
-<source>Error handling</source>
-<target>Klaidų valdymas</target>
-
-<source>Ignore</source>
-<target>Ignoruoti</target>
-
-<source>Hide all error and warning messages</source>
-<target>Slėpti visus klaidų ir perspėjimų pranešimus</target>
-
-<source>Pop-up</source>
-<target>Iššokti</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Rodyti pranešimą esant klaidoms ar perspėjimams</target>
-
-<source>Deletion handling</source>
-<target>Trinimo valdymas</target>
-
<source>Permanent</source>
<target>Visiškai</target>
@@ -896,96 +997,72 @@ yra toks pats
<source>Naming convention:</source>
<target>Pavadinimų taisyklės:</target>
-<source>Batch job</source>
-<target>Paketinė užduotis</target>
+<source>Ignore</source>
+<target>Ignoruoti</target>
-<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
-<target>Sukurti paleidimo failą sinchronizacijai be priežiūros. Norint jį paleisti reikia paspausti and failo du kartus pele arba nustatyti su užduočių planuotoju: %x</target>
+<source>Hide all error and warning messages</source>
+<target>Slėpti visus klaidų ir perspėjimų pranešimus</target>
-<source>Exit</source>
-<target>Išeiti</target>
+<source>Pop-up</source>
+<target>Iššokti</target>
-<source>Abort synchronization on first error</source>
-<target>Nutraukti sinchronizavimą su pirma klaida</target>
+<source>Show pop-up on errors or warnings</source>
+<target>Rodyti pranešimą esant klaidoms ar perspėjimams</target>
-<source>Show progress dialog</source>
-<target>Rodyti eigos langą</target>
+<source>Statistics</source>
+<target>Statistika</target>
-<source>Save log</source>
-<target>Saugoti žurnalus</target>
+<source>Items found:</source>
+<target>Rasta elementų:</target>
-<source>Select folder to save log files</source>
-<target>Pasirinkite aplanką ataskaitos failų saugojimui</target>
+<source>Speed:</source>
+<target>Greitis:</target>
-<source>Limit</source>
-<target>Riba</target>
+<source>Time remaining:</source>
+<target>Likęs laikas:</target>
-<source>Limit maximum number of log files</source>
-<target>Apriboti ataskaitų failų skaičių</target>
+<source>Time elapsed:</source>
+<target>Praėjęs laikas:</target>
-<source>Delete on both sides</source>
-<target>Ištrinti abiejose pusėse</target>
+<source>Synchronizing...</source>
+<target>Sinchronizuojama...</target>
-<source>Delete on both sides even if the file is selected on one side only</source>
-<target>Ištrinti abiejose pusėse net jei failas yra pažymėtas tik vienoje pusėje</target>
+<source>Minimize to notification area</source>
+<target>Nuleisti į apačią dešinėje</target>
-<source>
-Files will only be synchronized if they pass all filter rules.
-Note: File paths must be relative to base directories.
-</source>
-<target>
-Failai gali būti sinchronizuoti tik tada, kai atitinka filtrų taisykles
-Pastaba: Failų keliai turi būti nurodyti tik iki pagrindinių katalogų
-</target>
+<source>Close</source>
+<target>Uždaryti</target>
-<source>Include</source>
-<target>Įtraukti</target>
+<source>&Pause</source>
+<target>&Pauzė</target>
-<source>Exclude</source>
-<target>Neįtraukti</target>
+<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>Sukurti paleidimo failą sinchronizacijai be priežiūros. Norint jį paleisti reikia paspausti and failo du kartus pele arba nustatyti su užduočių planuotoju: %x</target>
-<source>Time span</source>
-<target>Laiko tarpas</target>
+<source>Show progress dialog</source>
+<target>Rodyti eigos langą</target>
-<source>File size</source>
-<target>Failo dydis</target>
+<source>Limit maximum number of log files</source>
+<target>Apriboti ataskaitų failų skaičių</target>
-<source>Minimum</source>
-<target>Mažiausiai</target>
+<source>Delete on both sides</source>
+<target>Ištrinti abiejose pusėse</target>
-<source>Maximum</source>
-<target>Daugiausiai</target>
+<source>Delete on both sides even if the file is selected on one side only</source>
+<target>Ištrinti abiejose pusėse net jei failas yra pažymėtas tik vienoje pusėje</target>
<source>&Clear</source>
<target>&Išvalyti</target>
-<source>Global settings</source>
-<target>Bendri nustatymai</target>
-
<source>Fail-safe file copy</source>
<target>Apsauginė failo kopija</target>
-<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
-<target>Kopijuoti į laikiną failą (*.ffs_tmp), o tik po to pervadinti. Tai garantuoją stabilią būseną net įvykus nepataisomai klaidai.</target>
-
<source>Copy locked files</source>
<target>Kopijuoti užrakintus failus</target>
-<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
-<target>Kopijuoti bendrintus ar užrakintus failus naudojant Volume Shadow Copy paslaugą (administratoriaus teisės privalomos)</target>
-
<source>Copy file access permissions</source>
<target>Kopijuoti failo leidimus</target>
-<source>Transfer file and folder permissions (requires administrator rights)</source>
-<target>Išsaugoti failų ir katalogų teises (administratoriaus teisės privalomos)</target>
-
-<source>Restore hidden dialogs</source>
-<target>Atstatyti paslėptus langus</target>
-
-<source>External applications</source>
-<target>Išorinės programos</target>
-
<source>Description</source>
<target>Apibūdinimas</target>
@@ -1016,27 +1093,6 @@ Pastaba: Failų keliai turi būti nurodyti tik iki pagrindinių katalogų
<source>Many thanks for localization:</source>
<target>Labai dėkojame už vertimą:</target>
-<source>Start synchronization</source>
-<target>Pradėti sinchronizavimą</target>
-
-<source>Comparison settings</source>
-<target>Sulyginimo nustatymai</target>
-
-<source>Synchronization settings</source>
-<target>Sinchronizavimo nustatymai</target>
-
-<source>Delete</source>
-<target>Trinti</target>
-
-<source>Configure filter</source>
-<target>Nustatyti filtrą</target>
-
-<source>Select time span</source>
-<target>Pažymėti laiko trukmę</target>
-
-<source>Folder pairs</source>
-<target>Aplankų poros</target>
-
<source>Find</source>
<target>Rasti</target>
@@ -1046,15 +1102,6 @@ Pastaba: Failų keliai turi būti nurodyti tik iki pagrindinių katalogų
<source>Configuration</source>
<target>Nustatymai</target>
-<source>Main bar</source>
-<target>Pagrindinė juosta</target>
-
-<source>Filter files</source>
-<target>Filtruoti failus</target>
-
-<source>Select view</source>
-<target>Pasirinkti rodomus</target>
-
<source>Open...</source>
<target>Atverti...</target>
@@ -1064,16 +1111,14 @@ Pastaba: Failų keliai turi būti nurodyti tik iki pagrindinių katalogų
<source>Compare both sides</source>
<target>Sulyginti abi puses</target>
-<source>
-<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
-<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
-</source>
-<target>
-<pluralform>Ar tikrai norite paleisti %y komandą 1-ai pozicijai?</pluralform>
-<pluralform>Ar tikrai norite paleisti %y komandą %x pozicijoms?</pluralform>
-<pluralform>Ar tikrai norite paleisti %y komandą %x pozicijų?</pluralform>
-<pluralform>Ar tikrai norite paleisti %y komandą %x pozicijai?</pluralform>
-</target>
+<source>Comparison settings</source>
+<target>Sulyginimo nustatymai</target>
+
+<source>Synchronization settings</source>
+<target>Sinchronizavimo nustatymai</target>
+
+<source>Start synchronization</source>
+<target>Pradėti sinchronizavimą</target>
<source>Confirm</source>
<target>Patvirtinti</target>
@@ -1118,6 +1163,9 @@ Pastaba: Failų keliai turi būti nurodyti tik iki pagrindinių katalogų
<source>Include temporarily</source>
<target>Įtraukti laikinai</target>
+<source>Delete</source>
+<target>Trinti</target>
+
<source>Include all</source>
<target>Įtraukti visus</target>
@@ -1163,6 +1211,9 @@ Pastaba: Failų keliai turi būti nurodyti tik iki pagrindinių katalogų
<source>Do&n't save</source>
<target>&Nesaugoti</target>
+<source>Filter</source>
+<target>Filtras</target>
+
<source>Show files that exist on left side only</source>
<target>Rodyti failus, kurie egzistuoja tik kairėje pusėje</target>
@@ -1208,9 +1259,6 @@ Pastaba: Failų keliai turi būti nurodyti tik iki pagrindinių katalogų
<source>Set as default</source>
<target>Nustatyti kaip numatytą</target>
-<source>Operation aborted</source>
-<target>Operacija nutraukta</target>
-
<source>All folders are in sync</source>
<target>Visi aplankai susinchronizuoti</target>
@@ -1229,15 +1277,9 @@ Pastaba: Failų keliai turi būti nurodyti tik iki pagrindinių katalogų
<source>&Ignore</source>
<target>&Ignoruoti</target>
-<source>Fatal Error</source>
-<target>Kritinė klaida</target>
-
<source>&Switch</source>
<target>&Perjungti</target>
-<source>Question</source>
-<target>Klausimas</target>
-
<source>&Yes</source>
<target>&Taip</target>
@@ -1259,18 +1301,12 @@ Pastaba: Failų keliai turi būti nurodyti tik iki pagrindinių katalogų
<source>Initializing...</source>
<target>Pradedama...</target>
-<source>Aborted</source>
-<target>Nutraukta</target>
-
<source>Completed</source>
<target>Baigta</target>
<source>Log</source>
<target>Archyvas</target>
-<source>Inactive</source>
-<target>Neaktyvus</target>
-
<source>Today</source>
<target>Šiandien</target>
@@ -1295,9 +1331,6 @@ Pastaba: Failų keliai turi būti nurodyti tik iki pagrindinių katalogų
<source>MB</source>
<target>MB</target>
-<source>Filter</source>
-<target>Filtras</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>
@@ -1320,6 +1353,9 @@ Pastaba: Failų keliai turi būti nurodyti tik iki pagrindinių katalogų
<pluralform>Ar tikrai norite ištrinti šį %x elementą?</pluralform>
</target>
+<source>Exclude</source>
+<target>Neįtraukti</target>
+
<source>Direct</source>
<target>Tiesiogiai</target>
@@ -1344,9 +1380,6 @@ Pastaba: Failų keliai turi būti nurodyti tik iki pagrindinių katalogų
<source>- Other side's counterpart to %item_folder%</source>
<target>- Kitos pusės atitikmuo %item_folder%</target>
-<source>Make hidden warnings and dialogs visible again?</source>
-<target>Ar vėl rodyti paslėptus perspėjimus ir langus?</target>
-
<source>Leave as unresolved conflict</source>
<target>Palikti kaip neišpręstą konfliktą</target>
@@ -1476,15 +1509,9 @@ Pastaba: Failų keliai turi būti nurodyti tik iki pagrindinių katalogų
<pluralform>%x diena</pluralform>
</target>
-<source>Failed to register to receive system messages.</source>
-<target>Užregistruoti sistemos pranešimų gavimui nepavyko</target>
-
<source>Cannot set privilege %x.</source>
<target>Nepavyksta nustatyti privilegijos %x.</target>
-<source>Failed to suspend system sleep mode.</source>
-<target>Nepavyko sustabdyti sistemos į miegojimo veikseną.</target>
-
<source>Cannot change process I/O priorities.</source>
<target>Nepavyksta pakeisti proceso I/O prioritetų.</target>
diff --git a/BUILD/Languages/outdated/norwegian.lng b/BUILD/Languages/outdated/norwegian.lng
index 2e50c49d..e965718f 100644
--- a/BUILD/Languages/outdated/norwegian.lng
+++ b/BUILD/Languages/outdated/norwegian.lng
@@ -2,8 +2,8 @@
<language>Norsk</language>
<translator>Bjørn Snoen</translator>
<locale>nb_NO</locale>
- <flag_image>flag_norway.png</flag_image>
- <plural_form_count>2</plural_form_count>
+ <image>flag_norway.png</image>
+ <plural_count>2</plural_count>
<plural_definition>n == 1 ? 0 : 1</plural_definition>
</header>
@@ -13,7 +13,10 @@
<source>Unable to move %x to the recycle bin.</source>
<target></target>
-<source>Failed to register to receive system messages.</source>
+<source>Unable to suspend system sleep mode.</source>
+<target></target>
+
+<source>Unable to register to receive system messages.</source>
<target></target>
<source>Cannot create symbolic link %x.</source>
@@ -25,6 +28,9 @@
<source>Time stamp</source>
<target></target>
+<source>Restore all hidden windows and warnings?</source>
+<target></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>
@@ -32,6 +38,9 @@
<target>
</target>
+<source>Move</source>
+<target></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>
@@ -45,9 +54,15 @@
<source>&Continue</source>
<target></target>
+<source>Stopped</source>
+<target></target>
+
<source>&Don't show this warning again</source>
<target></target>
+<source>Serious Error</source>
+<target></target>
+
<source>&Ignore subsequent errors</source>
<target></target>
@@ -57,6 +72,12 @@
<source>Comma-separated values</source>
<target></target>
+<source>Comparison Settings</source>
+<target></target>
+
+<source>Synchronization Settings</source>
+<target></target>
+
<source>Never save &changes</source>
<target></target>
@@ -77,33 +98,138 @@
<target></target>
<source>
-<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for one item?</pluralform>
<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
</source>
<target>
</target>
-<source>Transfer file and folder permissions (requires administrator rights)</source>
+<source>Select View</source>
<target></target>
-<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
+<source>Filter Files</source>
<target></target>
-<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
+<source>Main Bar</source>
<target></target>
-<source>&Clear</source>
+<source>Folder Pairs</source>
+<target></target>
+
+<source>Select Time Span</source>
+<target></target>
+
+<source>Global Settings</source>
+<target></target>
+
+<source>Delete Items</source>
+<target></target>
+
+<source>Save as Batch Job</source>
+<target></target>
+
+<source>Restore hidden windows</source>
+<target></target>
+
+<source>Customize context menu:</source>
+<target></target>
+
+<source>Delay (in seconds):</source>
+<target></target>
+
+<source>Retry count:</source>
+<target></target>
+
+<source>Automatic retry on error:</source>
+<target></target>
+
+<source>Transfer file and folder permissions.</source>
+<target></target>
+
+<source>(requires administrator rights)</source>
+<target></target>
+
+<source>Copy shared or locked files using the Volume Shadow Copy Service.</source>
+<target></target>
+
+<source>(recommended)</source>
<target></target>
<source>
-Files will only be synchronized if they pass all filter rules.
-Note: File paths must be relative to base directories.
+Copy to a temporary file (*.ffs_tmp) before overwriting target.
+This guarantees a consistent state even in case of a serious error.
</source>
<target></target>
+<source>The following settings are used for all synchronization jobs.</source>
+<target></target>
+
+<source>&Clear</source>
+<target></target>
+
+<source>Maximum:</source>
+<target></target>
+
+<source>Minimum:</source>
+<target></target>
+
+<source>File size:</source>
+<target></target>
+
+<source>Time span:</source>
+<target></target>
+
+<source>Exclude:</source>
+<target></target>
+
+<source>Include:</source>
+<target></target>
+
+<source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source>
+<target></target>
+
+<source>&Recycle bin</source>
+<target></target>
+
+<source>How can I schedule a batch job?</source>
+<target></target>
+
+<source>Limit:</source>
+<target></target>
+
+<source>Save log:</source>
+<target></target>
+
+<source>Stop synchronization at first error</source>
+<target></target>
+
<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
<target></target>
+<source>Stop</source>
+<target></target>
+
+<source>Minimize to notification area</source>
+<target></target>
+
+<source>&Don't show this dialog again</source>
+<target></target>
+
+<source>Variant:</source>
+<target></target>
+
+<source>Start synchronization now?</source>
+<target></target>
+
+<source>On completion:</source>
+<target></target>
+
+<source>Handle errors:</source>
+<target></target>
+
+<source>Show examples</source>
+<target></target>
+
<source>Move files to a user-defined folder</source>
<target></target>
@@ -113,25 +239,46 @@ Note: File paths must be relative to base directories.
<source>Recycle bin</source>
<target></target>
+<source>Delete files:</source>
+<target></target>
+
<source>Requires database files. Not supported by all file systems.</source>
<target></target>
<source>Detect moved files</source>
<target></target>
+<source>Copy new and updated files to the right folder.</source>
+<target></target>
+
+<source>Create a mirror backup of the left folder which exactly matches the right folder after synchronization.</source>
+<target></target>
+
<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
<target></target>
-<source>Select a variant</source>
+<source>More information</source>
<target></target>
-<source>&Don't show this dialog again</source>
+<source>Symbolic links:</source>
<target></target>
-<source>Minimize to notification area</source>
+<source>Identify equal files by comparing the file content.</source>
+<target></target>
+
+<source>Identify equal files by comparing modification time and size.</source>
+<target></target>
+
+<source>Select a variant:</source>
+<target></target>
+
+<source>Find:</source>
+<target></target>
+
+<source>Close search bar</source>
<target></target>
-<source>Check for new &version</source>
+<source>&Check for new version</source>
<target></target>
<source>Check &automatically once a week</source>
@@ -143,22 +290,62 @@ Note: File paths must be relative to base directories.
<source>&Tools</source>
<target></target>
+<source>&Find...</source>
+<target></target>
+
+<source>Local Filter</source>
+<target></target>
+
+<source>Alternate Synchronization Settings</source>
+<target></target>
+
+<source>Alternate Comparison Settings</source>
+<target></target>
+
<source>Paste</source>
<target></target>
+<source>None</source>
+<target></target>
+
+<source>Active</source>
+<target></target>
+
+<source>Local filter</source>
+<target></target>
+
+<source>Alternate synchronization settings</source>
+<target></target>
+
+<source>Alternate comparison settings</source>
+<target></target>
+
<source>Cannot find current FreeFileSync version number online. Do you want to check manually?</source>
<target></target>
<source>&Download</source>
<target></target>
-<source>New version found</source>
+<source>Check for Program Updates</source>
<target></target>
-<source>Retrying operation after error:</source>
+<source>Retrying operation</source>
<target></target>
-<source>Switching to FreeFileSync main dialog</source>
+<source>
+<pluralform>Automatic retry in 1 second...</pluralform>
+<pluralform>Automatic retry in %x seconds...</pluralform>
+</source>
+<target>
+</target>
+
+<source>Switching to FreeFileSync's main window</source>
+<target></target>
+
+<source>You can switch to FreeFileSync's main window to resolve this issue.</source>
+<target></target>
+
+<source>Synchronization stopped</source>
<target></target>
<source>job name</source>
@@ -173,6 +360,12 @@ Note: File paths must be relative to base directories.
<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
<target></target>
+<source>Please enter a target folder for versioning.</source>
+<target></target>
+
+<source>Incorrect command line:</source>
+<target></target>
+
<source>&Show error</source>
<target></target>
@@ -182,6 +375,30 @@ Note: File paths must be relative to base directories.
<source>Directory monitoring active</source>
<target></target>
+<source>Automated Synchronization</source>
+<target></target>
+
+<source>&Start</source>
+<target></target>
+
+<source>Command line:</source>
+<target></target>
+
+<source>Idle time (in seconds):</source>
+<target></target>
+
+<source>Folders to watch:</source>
+<target></target>
+
+<source>&View help</source>
+<target></target>
+
+<source>Unable to create timestamp for versioning:</source>
+<target></target>
+
+<source>Stop requested: Waiting for current operation to finish...</source>
+<target></target>
+
<source>Volume name %x is not part of file path %y.</source>
<target></target>
@@ -191,7 +408,7 @@ Note: File paths must be relative to base directories.
<source>Cannot access the Volume Shadow Copy Service.</source>
<target></target>
-<source>%x items</source>
+<source>%x items/sec</source>
<target></target>
<source>
@@ -493,12 +710,6 @@ Note: File paths must be relative to base directories.
<source>Cannot load file %x.</source>
<target>Kan ikke laste filen %x.</target>
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Handling avbrutt: Venter på at nåværende handling fullføres...</target>
-
-<source>Failure to create timestamp for versioning:</source>
-<target>Feil ved opprettelse av tidsstempel for versjon:</target>
-
<source>Cannot read the following XML elements:</source>
<target>Kan ikke lese følgende XML-elementer:</target>
@@ -514,9 +725,6 @@ Note: File paths must be relative to base directories.
<source>&Program</source>
<target>&Program</target>
-<source>&Content</source>
-<target>&Innhold</target>
-
<source>&About</source>
<target>&Om programmet</target>
@@ -538,9 +746,6 @@ Note: File paths must be relative to base directories.
<source>To get started just import a .ffs_batch file.</source>
<target>Importer en .ffs_batch-fil for å komme i gang</target>
-<source>Folders to watch</source>
-<target>Mapper å overvåke</target>
-
<source>Add folder</source>
<target>Legg til mappe</target>
@@ -553,9 +758,6 @@ Note: File paths must be relative to base directories.
<source>Select a folder</source>
<target>Velg en mappe</target>
-<source>Idle time [seconds]</source>
-<target>Inaktiv tid [sekunder]</target>
-
<source>Idle time between last detected change and execution of command</source>
<target>Inaktiv tid mellom forrige endring og utførelse av kommando</target>
@@ -570,18 +772,12 @@ Kommandoen utløses hvis:
- nye mapper legges til (f.eks. en USB-pinne kobles til)
</target>
-<source>Start</source>
-<target>Start</target>
-
<source>&Retry</source>
<target>&Prøv igjen</target>
<source>Cancel</source>
<target>Avbryt</target>
-<source>RealtimeSync - Automated Synchronization</source>
-<target>RealtimeSync - Automatisk synkronisering</target>
-
<source>Build: %x</source>
<target>Build: %x</target>
@@ -597,9 +793,6 @@ Kommandoen utløses hvis:
<source>&Exit</source>
<target>&Avslutt</target>
-<source>Invalid command line:</source>
-<target>Ugyldig kommando:</target>
-
<source>File content</source>
<target>Filinnhold</target>
@@ -660,9 +853,6 @@ Kommandoen utløses hvis:
<source>Target folder input field must not be empty.</source>
<target>Feltet for målmappe kan ikke være tomt.</target>
-<source>Folder input field for versioning must not be empty.</source>
-<target>Mappefeltet for versjon kan ikke være tomt.</target>
-
<source>Source folder %x not found.</source>
<target>Kildemappe %x finnes ikke.</target>
@@ -687,9 +877,6 @@ Kommandoen utløses hvis:
<source>Generating database...</source>
<target>Oppretter database...</target>
-<source>Synchronization aborted</source>
-<target>Synkronisering avbrutt</target>
-
<source>Synchronization completed with errors</source>
<target>Synkronisering fullført med feil</target>
@@ -705,9 +892,6 @@ Kommandoen utløses hvis:
<source>Saving log file %x...</source>
<target>Lagrer loggfil %x...</target>
-<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
-<target>Trykk "Skift" for å løse problemer i FreeFileSync hovedvindu.</target>
-
<source>A new version of FreeFileSync is available:</source>
<target>En ny versjon av FreeFileSync er tilgjengelig</target>
@@ -774,21 +958,6 @@ Kommandoen utløses hvis:
<source>Hibernate</source>
<target>Sett i dvalemodus</target>
-<source>Selected variant:</source>
-<target>Valgt variant:</target>
-
-<source>Select alternate comparison settings</source>
-<target>Velg alternative innstillinger for sammenligning</target>
-
-<source>Select alternate synchronization settings</source>
-<target>Velg alternative innstillinger for synkronisering</target>
-
-<source>Filter is active</source>
-<target>Filter er aktivt</target>
-
-<source>No filter selected</source>
-<target>Ingen filter valgt</target>
-
<source>Remove alternate settings</source>
<target>Fjern alternative innstillinger</target>
@@ -813,24 +982,18 @@ Kommandoen utløses hvis:
<source>2. &Synchronize</source>
<target>2. &Synkroniser</target>
+<source>&Global settings</source>
+<target>&Felles innstillinger</target>
+
<source>&Language</source>
<target>&Språk</target>
<source>&Export file list...</source>
<target>&Eksporter filliste...</target>
-<source>&Global settings</source>
-<target>&Felles innstillinger</target>
-
<source>Compare</source>
<target>Sammenlign</target>
-<source>Comparison settings</source>
-<target>Innstillinger for sammenligning</target>
-
-<source>Synchronization settings</source>
-<target>Innstillinger for synkronisering</target>
-
<source>Synchronize</source>
<target>Synkroniser</target>
@@ -843,6 +1006,9 @@ Kommandoen utløses hvis:
<source>Swap sides</source>
<target>Bytt sider</target>
+<source>Match case</source>
+<target>Skill mellom store og små bokstaver</target>
+
<source>Save as batch job</source>
<target>Lagre som sammensatt oppgave</target>
@@ -864,80 +1030,23 @@ Kommandoen utløses hvis:
<source>Total bytes to copy</source>
<target>Mengde bytes å kopiere</target>
-<source>Items found:</source>
-<target>Elementer funnet:</target>
-
-<source>Speed:</source>
-<target>Hastighet:</target>
-
-<source>Time remaining:</source>
-<target>Gjenstående tid:</target>
-
-<source>Time elapsed:</source>
-<target>Tid gått:</target>
-
-<source>Synchronizing...</source>
-<target>Synkroniserer...</target>
-
-<source>On completion</source>
-<target>Ved fullføring</target>
-
-<source>Close</source>
-<target>Lukk</target>
-
-<source>&Pause</source>
-<target>&Pause</target>
-
-<source>Variant</source>
-<target>Variant</target>
-
-<source>Statistics</source>
-<target>Statistikk</target>
-
-<source>
-Files are found equal if
- - last write time and date
- - file size
-are the same
-</source>
-<target>
-Filer blir funnet like hvis
- - sist skrevne tid og dato
- - filstørrelse
-er den samme
-</target>
-
-<source>
-Files are found equal if
- - file content
-is the same
-</source>
-<target>
-Filer blir funnet like hvis
- - filinnhold
-er det samme
-</target>
-
-<source>Symbolic Link handling</source>
-<target>Symbolsk lenkehåndtering</target>
-
-<source>Help</source>
-<target>Hjelp</target>
-
<source>OK</source>
<target>OK</target>
-<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
-<target>Speilings-sikkerhetskopi av venstre mappe. Høyre mappe endres slik at den blir helt lik venstre mappe etter synkronisering.</target>
-
-<source>Copy new or updated files to right folder.</source>
-<target>Kopier nye og endrede filer til høyre mappe.</target>
-
<source>Configure your own synchronization rules.</source>
<target>Still inn dine egne synkroniseringsregler.</target>
-<source>Error handling</source>
-<target>Feilhåndtering</target>
+<source>Permanent</source>
+<target>Permanent</target>
+
+<source>Delete or overwrite files permanently</source>
+<target>Slett eller overskriv filer permanent</target>
+
+<source>Versioning</source>
+<target>Versjonshåndtering</target>
+
+<source>Naming convention:</source>
+<target>Navnekonvensjon:</target>
<source>Ignore</source>
<target>Ignorer</target>
@@ -951,96 +1060,42 @@ er det samme
<source>Show pop-up on errors or warnings</source>
<target>Vis pop-upvindu ved feil eller advarsler</target>
-<source>Deletion handling</source>
-<target>Slette-håndtering</target>
+<source>Statistics</source>
+<target>Statistikk</target>
-<source>Permanent</source>
-<target>Permanent</target>
+<source>Items found:</source>
+<target>Elementer funnet:</target>
-<source>Delete or overwrite files permanently</source>
-<target>Slett eller overskriv filer permanent</target>
+<source>Speed:</source>
+<target>Hastighet:</target>
-<source>Versioning</source>
-<target>Versjonshåndtering</target>
+<source>Time remaining:</source>
+<target>Gjenstående tid:</target>
-<source>Naming convention:</source>
-<target>Navnekonvensjon:</target>
+<source>Time elapsed:</source>
+<target>Tid gått:</target>
-<source>Batch job</source>
-<target>Batch-jobb</target>
+<source>Synchronizing...</source>
+<target>Synkroniserer...</target>
-<source>Exit</source>
-<target>Avslutt</target>
+<source>Close</source>
+<target>Lukk</target>
-<source>Abort synchronization on first error</source>
-<target>Stopp synkronisering ved første feil</target>
+<source>&Pause</source>
+<target>&Pause</target>
<source>Show progress dialog</source>
<target>Vis statuslinje</target>
-<source>Save log</source>
-<target>Lagre logg</target>
-
-<source>Select folder to save log files</source>
-<target>Velg mappe for lagring av loggfiler</target>
-
-<source>Limit</source>
-<target>Grense</target>
-
<source>Limit maximum number of log files</source>
<target>Begrens maks antall loggfiler</target>
-<source>Source code written in C++ using:</source>
-<target>Kildekode skrevet i C++ med hjelp fra:</target>
-
-<source>If you like FreeFileSync</source>
-<target>Hvis du liker FreeFileSync</target>
-
-<source>Donate with PayPal</source>
-<target>Doner med PayPal</target>
-
-<source>Many thanks for localization:</source>
-<target>Mange takk for lokalisering:</target>
-
-<source>Feedback and suggestions are welcome</source>
-<target>Tilbakemelding og forslag er velkomne</target>
-
-<source>Homepage</source>
-<target>Hjemmeside</target>
-
-<source>Email</source>
-<target>E-post</target>
-
-<source>Published under the GNU General Public License</source>
-<target>Utgitt under GNU General Public Licence</target>
-
<source>Delete on both sides</source>
<target>Slett på begge sider</target>
<source>Delete on both sides even if the file is selected on one side only</source>
<target>Slett på begge sider selv om filen bare er valgt på en side</target>
-<source>Include</source>
-<target>Inkluder</target>
-
-<source>Exclude</source>
-<target>Ekskluder</target>
-
-<source>Time span</source>
-<target>Tidsrom</target>
-
-<source>File size</source>
-<target>Filstørrelse</target>
-
-<source>Minimum</source>
-<target>Minimum</target>
-
-<source>Maximum</source>
-<target>Maksimum</target>
-
-<source>Global settings</source>
-<target>Globale innstillinger</target>
-
<source>Fail-safe file copy</source>
<target>Trygg filkopi</target>
@@ -1050,44 +1105,38 @@ er det samme
<source>Copy file access permissions</source>
<target>Kopier filadgangstillatelser</target>
-<source>Restore hidden dialogs</source>
-<target>Gjenopprett skjulte dialoger</target>
-
-<source>External applications</source>
-<target>Eksterne programmer</target>
-
<source>Description</source>
<target>Beskrivelse</target>
<source>&Default</source>
<target>&Standard</target>
-<source>Find what:</source>
-<target>Søk hva:</target>
+<source>Source code written in C++ using:</source>
+<target>Kildekode skrevet i C++ med hjelp fra:</target>
-<source>Match case</source>
-<target>Skill mellom store og små bokstaver</target>
+<source>If you like FreeFileSync</source>
+<target>Hvis du liker FreeFileSync</target>
-<source>&Find next</source>
-<target>&Søk neste</target>
+<source>Donate with PayPal</source>
+<target>Doner med PayPal</target>
-<source>Start synchronization</source>
-<target>Start synkronisering</target>
+<source>Feedback and suggestions are welcome</source>
+<target>Tilbakemelding og forslag er velkomne</target>
-<source>Delete</source>
-<target>Slett</target>
+<source>Homepage</source>
+<target>Hjemmeside</target>
-<source>Configure filter</source>
-<target>Still inn filter</target>
+<source>Email</source>
+<target>E-post</target>
-<source>Find</source>
-<target>Søk</target>
+<source>Published under the GNU General Public License</source>
+<target>Utgitt under GNU General Public Licence</target>
-<source>Select time span</source>
-<target>Velg tidsrom</target>
+<source>Many thanks for localization:</source>
+<target>Mange takk for lokalisering:</target>
-<source>Folder pairs</source>
-<target>Mappepar</target>
+<source>Find</source>
+<target>Søk</target>
<source>Overview</source>
<target>Oversikt</target>
@@ -1095,15 +1144,6 @@ er det samme
<source>Configuration</source>
<target>Innstilling</target>
-<source>Main bar</source>
-<target>Hovedverktøylinje</target>
-
-<source>Filter files</source>
-<target>Filtrer filer</target>
-
-<source>Select view</source>
-<target>Velg visning</target>
-
<source>Open...</source>
<target>Åpne...</target>
@@ -1113,6 +1153,15 @@ er det samme
<source>Compare both sides</source>
<target>Sammenlign begge sider</target>
+<source>Comparison settings</source>
+<target>Innstillinger for sammenligning</target>
+
+<source>Synchronization settings</source>
+<target>Innstillinger for synkronisering</target>
+
+<source>Start synchronization</source>
+<target>Start synkronisering</target>
+
<source>
<pluralform>1 directory</pluralform>
<pluralform>%x directories</pluralform>
@@ -1134,17 +1183,20 @@ er det samme
<source>Set direction:</source>
<target>Still inn retningen:</target>
+<source>multiple selection</source>
+<target>flervalg</target>
+
+<source>Exclude via filter:</source>
+<target>Ekskluder via filter:</target>
+
<source>Exclude temporarily</source>
<target>Ekskluder midlertidig</target>
<source>Include temporarily</source>
<target>Inkluder midlertidig</target>
-<source>multiple selection</source>
-<target>flervalg</target>
-
-<source>Exclude via filter:</source>
-<target>Ekskluder via filter:</target>
+<source>Delete</source>
+<target>Slett</target>
<source>Include all</source>
<target>Inkluder alle</target>
@@ -1191,6 +1243,9 @@ er det samme
<source>Do&n't save</source>
<target>&Ikke lagre</target>
+<source>Filter</source>
+<target>Filter</target>
+
<source>Show files that exist on left side only</source>
<target>Vis filer som bare finnes på venstre side</target>
@@ -1236,27 +1291,21 @@ er det samme
<source>Set as default</source>
<target>Set som standard</target>
-<source>Operation aborted</source>
-<target>Handling avbrutt</target>
-
<source>All folders are in sync</source>
<target>Alle mapper er synkroniserte</target>
+<source>Cannot find %x</source>
+<target>Kan ikke finne %x</target>
+
<source>File list exported</source>
<target>Filliste eksportert</target>
<source>&Ignore</source>
<target>&Ignorer</target>
-<source>Fatal Error</source>
-<target>Fatal feil</target>
-
<source>&Switch</source>
<target>&Skift</target>
-<source>Question</source>
-<target>Spørsmål</target>
-
<source>&Yes</source>
<target>&Ja</target>
@@ -1278,18 +1327,9 @@ er det samme
<source>Initializing...</source>
<target>Initialiserer...</target>
-<source>Aborted</source>
-<target>Avbrutt</target>
-
<source>Completed</source>
<target>Fullført</target>
-<source>Cannot find %x</source>
-<target>Kan ikke finne %x</target>
-
-<source>Inactive</source>
-<target>Inaktiv</target>
-
<source>Today</source>
<target>Idag</target>
@@ -1314,8 +1354,8 @@ er det samme
<source>MB</source>
<target>MB</target>
-<source>Filter</source>
-<target>Filter</target>
+<source>Exclude</source>
+<target>Ekskluder</target>
<source>Direct</source>
<target>Direkte</target>
@@ -1341,9 +1381,6 @@ er det samme
<source>- Other side's counterpart to %item_folder%</source>
<target>- Den andre sidens motpart til %item_folder%</target>
-<source>Make hidden warnings and dialogs visible again?</source>
-<target>Gjør skjylte advarsler og dialoger synlige igjen?</target>
-
<source>Leave as unresolved conflict</source>
<target>Etterlat som uløste konflikter</target>
@@ -1461,9 +1498,6 @@ er det samme
<source>Cannot set privilege %x.</source>
<target>Kan ikke sette privilegie %x.</target>
-<source>Failed to suspend system sleep mode.</source>
-<target>Kan ikke sette systemet i hvilemodus</target>
-
<source>Cannot change process I/O priorities.</source>
<target>Kan ikke endre I/O prioriet på prosess</target>
diff --git a/BUILD/Languages/polish.lng b/BUILD/Languages/polish.lng
index 8e0ead7f..32b40d31 100644
--- a/BUILD/Languages/polish.lng
+++ b/BUILD/Languages/polish.lng
@@ -2,14 +2,31 @@
<language>Polski</language>
<translator>Wojciech Pietruszewski</translator>
<locale>pl_PL</locale>
- <flag_image>flag_poland.png</flag_image>
- <plural_form_count>3</plural_form_count>
+ <image>flag_poland.png</image>
+ <plural_count>3</plural_count>
<plural_definition>n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2</plural_definition>
</header>
-<source>Close search bar</source>
+<source>
+<pluralform>Do you really want to execute the command %y for one item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+</target>
+
+<source>&Check</source>
+<target></target>
+
+<source>Retrying operation...</source>
<target></target>
+<source>
+<pluralform>Automatic retry in 1 second...</pluralform>
+<pluralform>Automatic retry in %x seconds...</pluralform>
+</source>
+<target>
+</target>
+
<source>Both sides have changed since last synchronization.</source>
<target>Obie strony uległy zmianie od ostatniej synchronizacji.</target>
@@ -61,9 +78,6 @@
<source>Cannot open file %x.</source>
<target>Nie można otworzyć pliku %x.</target>
-<source>Error</source>
-<target>Błąd</target>
-
<source>File %x does not contain a valid configuration.</source>
<target>Plik %x nie zawiera prawidłowej konfiguracji</target>
@@ -73,12 +87,12 @@
<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
<target>Plik konfiguracyjny nie może zawierać informacji o synchronizowanych katalogach gdy nazwy ścieżek przekazywane są w linii poleceń.</target>
-<source>Warning</source>
-<target>Ostrzeżenie</target>
-
<source>Directories cannot be set for more than one configuration file.</source>
<target>Dla więcej niż jednego pliku konfiguracyjnego, nie można ustawić wielu katalogów.</target>
+<source>Command line</source>
+<target>Linia komend</target>
+
<source>Syntax:</source>
<target>Składnia:</target>
@@ -94,9 +108,6 @@
<source>Any number of alternative directories for at most one config file.</source>
<target>Dowolna liczba katalogów w przypadku użycia jednego pliku konfiguracyjnego.</target>
-<source>Command line</source>
-<target>Linia komend</target>
-
<source>A folder input field is empty.</source>
<target>Pole katalog źródłowy jest puste.</target>
@@ -298,8 +309,8 @@
<source>/sec</source>
<target>/sekundę</target>
-<source>%x items</source>
-<target>%x elementy</target>
+<source>%x items/sec</source>
+<target>%x elementów/sek</target>
<source>Configuration file %x loaded partially only.</source>
<target>Plik konfiguracyjny %x został wczytany tylko częściowo.</target>
@@ -328,11 +339,11 @@
<source>Volume name %x is not part of file path %y.</source>
<target>Nazwa zasobu %x ni jest częścią ścieżki %y.</target>
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Żądanie przerwania: Oczekiwanie na koniec aktualnie wykonywanego zadania...</target>
+<source>Stop requested: Waiting for current operation to finish...</source>
+<target>Przerwanie: Oczekiwanie na zakończenie aktualnej operacji...</target>
-<source>Failure to create timestamp for versioning:</source>
-<target>Nie można utworzyć sygnatury czasu na potrzeby wersjonowania:</target>
+<source>Unable to create timestamp for versioning:</source>
+<target>Nie można utowrzyć znacznika czasu dla wersjonowania:</target>
<source>Cannot read the following XML elements:</source>
<target>Nie można odczytać elementu XML:</target>
@@ -349,8 +360,8 @@
<source>&Program</source>
<target>&Program</target>
-<source>&Content</source>
-<target>Za&wartość</target>
+<source>&View help</source>
+<target>&Pomoc</target>
<source>&About</source>
<target>O Program&ie</target>
@@ -373,8 +384,8 @@
<source>To get started just import a .ffs_batch file.</source>
<target>Aby rozpocząć po zaimportuj plik .ffs_batch.</target>
-<source>Folders to watch</source>
-<target>Obserwowane katalogi</target>
+<source>Folders to watch:</source>
+<target>Katalogi do obserwowania:</target>
<source>Add folder</source>
<target>Dodaj katalog</target>
@@ -388,12 +399,15 @@
<source>Select a folder</source>
<target>Wybierz katalog</target>
-<source>Idle time [seconds]</source>
-<target>Bezczynność [sekundy]</target>
+<source>Idle time (in seconds):</source>
+<target>Czas bezczynności (w sekundach):</target>
<source>Idle time between last detected change and execution of command</source>
<target>Czas pomiędzy ostatnią wykrytą zmianą, a uruchomieniem komendy</target>
+<source>Command line:</source>
+<target>Linia komend:</target>
+
<source>
The command is triggered if:
- files or subfolders change
@@ -405,33 +419,30 @@ Komenda jest wykonywana gdy:
- zostaną utworzony nowe katalogi (n.p włożenie pamięci USB)
</target>
-<source>Start</source>
-<target>Rozpocznij</target>
-
-<source>&Retry</source>
-<target>&Powtórz</target>
-
-<source>Cancel</source>
-<target>Anuluj</target>
+<source>&Start</source>
+<target>&Rozpocznij</target>
-<source>RealtimeSync - Automated Synchronization</source>
-<target>RealtimeSync - Automatyczna Synchronizacja</target>
+<source>About</source>
+<target>O Programie</target>
<source>Build: %x</source>
<target>Zbudowano: %x</target>
-<source>About</source>
-<target>O Programie</target>
-
<source>All files</source>
<target>Wszystkie pliki</target>
+<source>Automated Synchronization</source>
+<target>Automatyczna synchronizacja</target>
+
<source>Directory monitoring active</source>
<target>Monitorowanie katalogów aktywne</target>
<source>Waiting until all directories are available...</source>
<target>Oczekiwanie na dostępność wszystkich katalogów...</target>
+<source>Error</source>
+<target>Błąd</target>
+
<source>&Restore</source>
<target>&Przywróć</target>
@@ -441,8 +452,11 @@ Komenda jest wykonywana gdy:
<source>&Exit</source>
<target>&Wyjście</target>
-<source>Invalid command line:</source>
-<target>Nieprawidłowa komenda:</target>
+<source>Incorrect command line:</source>
+<target>Niepoprawne polecenie:</target>
+
+<source>&Retry</source>
+<target>&Powtórz</target>
<source>File content</source>
<target>Zawartość pliku</target>
@@ -504,8 +518,8 @@ Komenda jest wykonywana gdy:
<source>Target folder input field must not be empty.</source>
<target>Pole katalog docelowy nie może być puste.</target>
-<source>Folder input field for versioning must not be empty.</source>
-<target>Określ katalog do przechowywania wersjonowanych plików.</target>
+<source>Please enter a target folder for versioning.</source>
+<target>Określ katalog do wersjonowania.</target>
<source>Source folder %x not found.</source>
<target>Nie znaleziono katalogu docelowego %x.</target>
@@ -543,8 +557,8 @@ Komenda jest wykonywana gdy:
<source>job name</source>
<target>nazwa zadania</target>
-<source>Synchronization aborted</source>
-<target>Synchronizacja przerwana</target>
+<source>Synchronization stopped</source>
+<target>Synchronizacja zatrzymana</target>
<source>Synchronization completed with errors</source>
<target>Synchronizacja zakończona z błędami</target>
@@ -561,14 +575,29 @@ Komenda jest wykonywana gdy:
<source>Saving log file %x...</source>
<target>Zapisywanie pliku logów %x...</target>
-<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
-<target>Kliknij "Przełącz" aby rozwiązać wszystkie problemy w głównym oknie FreeFileSync.</target>
+<source>You can switch to FreeFileSync's main window to resolve this issue.</source>
+<target>Możesz przejść do głównego okna FreeFileSync abe rozwiązać ten problem.</target>
-<source>Switching to FreeFileSync main dialog</source>
-<target>Przełączanie do głównego okna FreeFileSync</target>
+<source>&Don't show this warning again</source>
+<target>&Nie pokazuj ponownie tego ostrzeżenia</target>
-<source>Retrying operation after error:</source>
-<target>Ponawianie czynności po błędzie:</target>
+<source>&Ignore</source>
+<target>&Ignoruj</target>
+
+<source>&Switch</source>
+<target>&Zamień</target>
+
+<source>Switching to FreeFileSync's main window</source>
+<target>Przejdź do głównego okna FreeFileSync.</target>
+
+<source>&Ignore subsequent errors</source>
+<target>&Ignoruj kolejne błędy</target>
+
+<source>Serious Error</source>
+<target>Poważny błąd</target>
+
+<source>Check for Program Updates</source>
+<target>Sprawdź dostępne aktualizacje.</target>
<source>A new version of FreeFileSync is available:</source>
<target>Dostępna jest nowa wersja FreeFileSync:</target>
@@ -576,18 +605,12 @@ Komenda jest wykonywana gdy:
<source>Download now?</source>
<target>Pobrać teraz?</target>
-<source>New version found</source>
-<target>Dostępna jest nowa wersja programu</target>
-
<source>&Download</source>
<target>&Pobierz</target>
<source>FreeFileSync is up to date.</source>
<target>Posiadasz aktualną wersję FreeFileSync.</target>
-<source>Information</source>
-<target>Informacja</target>
-
<source>Unable to connect to sourceforge.net.</source>
<target>Nie można się połączyć z sourceforge.net.</target>
@@ -645,20 +668,20 @@ Komenda jest wykonywana gdy:
<source>Hibernate</source>
<target>Przejdź w stan hibernacji</target>
-<source>Selected variant:</source>
-<target>Określ wariant:</target>
+<source>Alternate comparison settings</source>
+<target>Alternatywne ustawienia porównywania</target>
-<source>Select alternate comparison settings</source>
-<target>Określ alternatywne ustawienia porównywania</target>
+<source>Alternate synchronization settings</source>
+<target>Alternatywne ustawienia synchronizacji</target>
-<source>Select alternate synchronization settings</source>
-<target>Określ alternatywne reguły synchronizacji</target>
+<source>Local filter</source>
+<target>Filtr lokalny</target>
-<source>Filter is active</source>
-<target>Filtr jest aktywny</target>
+<source>Active</source>
+<target>Aktywny</target>
-<source>No filter selected</source>
-<target>Nie wybrano żadnego filtra</target>
+<source>None</source>
+<target>Żaden</target>
<source>Remove alternate settings</source>
<target>Usuń alternatywne ustawienia</target>
@@ -672,6 +695,15 @@ Komenda jest wykonywana gdy:
<source>Paste</source>
<target>Wklej</target>
+<source>Alternate Comparison Settings</source>
+<target>Alternatywne ustawienia porównywania</target>
+
+<source>Alternate Synchronization Settings</source>
+<target>Alternatywne ustawienia synchronizacji</target>
+
+<source>Local Filter</source>
+<target>Filtr lokalny</target>
+
<source>&New</source>
<target>&Nowy</target>
@@ -687,15 +719,18 @@ Komenda jest wykonywana gdy:
<source>2. &Synchronize</source>
<target>2. &Synchronizuj</target>
+<source>&Global settings</source>
+<target>&Ustawienia programu</target>
+
<source>&Language</source>
<target>&Język</target>
+<source>&Find...</source>
+<target>&Szukaj...</target>
+
<source>&Export file list...</source>
<target>&Eksportuj listę plików...</target>
-<source>&Global settings</source>
-<target>&Ustawienia programu</target>
-
<source>&Tools</source>
<target>&Narzędzia</target>
@@ -705,12 +740,15 @@ Komenda jest wykonywana gdy:
<source>Check &automatically once a week</source>
<target>Sprawdzaj &automatycznie raz w tygodniu</target>
-<source>Check for new &version</source>
-<target>&Sprawdź aktualizacje</target>
+<source>&Check for new version</source>
+<target>Sprawdź &nową wersję</target>
<source>Compare</source>
<target>Porównaj</target>
+<source>Cancel</source>
+<target>Anuluj</target>
+
<source>Synchronize</source>
<target>Synchronizuj</target>
@@ -723,8 +761,11 @@ Komenda jest wykonywana gdy:
<source>Swap sides</source>
<target>Zamień stronami</target>
-<source>Find what:</source>
-<target>Co:</target>
+<source>Close search bar</source>
+<target>Zamknij pasek wyszukiwania</target>
+
+<source>Find:</source>
+<target>Szukaj:</target>
<source>Match case</source>
<target>Uwzględnij wielkość liter</target>
@@ -750,74 +791,20 @@ Komenda jest wykonywana gdy:
<source>Total bytes to copy</source>
<target>Całkowity rozmiar do skopiowania</target>
-<source>Items found:</source>
-<target>Znalezione elementy:</target>
-
-<source>Speed:</source>
-<target>Prędkość:</target>
-
-<source>Time remaining:</source>
-<target>Do ukończenia:</target>
-
-<source>Time elapsed:</source>
-<target>Szacowany czas:</target>
-
-<source>Synchronizing...</source>
-<target>Synchronizuję...</target>
-
-<source>Minimize to notification area</source>
-<target>Minimalizuj do obszaru powiadomiń</target>
-
-<source>On completion</source>
-<target>Po zakończeniu</target>
-
-<source>Close</source>
-<target>Zamknij</target>
-
-<source>&Pause</source>
-<target>&Pauza</target>
-
-<source>Variant</source>
-<target>Wariant</target>
-
-<source>Statistics</source>
-<target>Statystyki</target>
+<source>Select a variant:</source>
+<target>Określ wariant:</target>
-<source>&Don't show this dialog again</source>
-<target>&Nie pokazuj więcej tego okna</target>
+<source>Identify equal files by comparing modification time and size.</source>
+<target>Określ różnice w plikach na podstawie czasu modyfikacji i rozmiaru.</target>
-<source>Select a variant</source>
-<target>Określ wariant</target>
+<source>Identify equal files by comparing the file content.</source>
+<target>Określ różnice w plikach na podstawie ich zawartości.</target>
-<source>
-Files are found equal if
- - last write time and date
- - file size
-are the same
-</source>
-<target>
-Pliki są równe jeżeli
- - ostatni czas zapisu
- - rozmiar pliku
-są równe
-</target>
-
-<source>
-Files are found equal if
- - file content
-is the same
-</source>
-<target>
-Pliki są jednakowe jeżeli
- - zawartość pliku
-jest identyczna
-</target>
+<source>Symbolic links:</source>
+<target>Dowiązania symboliczne:</target>
-<source>Symbolic Link handling</source>
-<target>Obsługa dowiązań symbolicznych</target>
-
-<source>Help</source>
-<target>Pomoc</target>
+<source>More information</source>
+<target>Więcej informacji</target>
<source>OK</source>
<target>OK</target>
@@ -825,11 +812,11 @@ jest identyczna
<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
<target>Wyszukaj oraz zastosuj zmiany po obu stronach. Wszystkie operacje na plikach takie jak usunięcia, zmiany oraz konflikty wykrywane są automatycznie przy użyciu bazy danych.</target>
-<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
-<target>Lustrzana kopia lewego folderu. Prawy folder po synchronizacji jest lustrzaną kopią lewego folderu.</target>
+<source>Create a mirror backup of the left folder which exactly matches the right folder after synchronization.</source>
+<target>Kopia lustrzana lewego katalogu. Po synchronizacji, zawartość prawego katalogu będzie będzie identyczna jak w lewym katalogu.</target>
-<source>Copy new or updated files to right folder.</source>
-<target>Kopiuj nowe lub aktualniejsze pliki na prawą stronę.</target>
+<source>Copy new and updated files to the right folder.</source>
+<target>Kopiuj nowe i zmodyfikowane pliki do prawego katalogu.</target>
<source>Configure your own synchronization rules.</source>
<target>Skonfiguruj swoje własne reguły synchronizacji.</target>
@@ -840,26 +827,11 @@ jest identyczna
<source>Requires database files. Not supported by all file systems.</source>
<target>Wymaga plików bazy danych. Nie wspierane przez wszystkie systemy plików.</target>
-<source>Error handling</source>
-<target>Obsługa błędów</target>
-
-<source>Ignore</source>
-<target>Ignoruj</target>
-
-<source>Hide all error and warning messages</source>
-<target>Ukryj wszystkie informacje błędach i ostrzeżeniach</target>
-
-<source>Pop-up</source>
-<target>Pop-up</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Pokazuj okna pop-up dla błędów i ostrzeżeń</target>
-
-<source>Deletion handling</source>
-<target>Usuwanie</target>
+<source>Delete files:</source>
+<target>Usuwanie plików:</target>
<source>Permanent</source>
-<target>Trwały</target>
+<target>Trwale</target>
<source>Delete or overwrite files permanently</source>
<target>Usuń lub nadpisz pliki na stałe</target>
@@ -879,99 +851,171 @@ jest identyczna
<source>Naming convention:</source>
<target>Konwencja nazewnictwa:</target>
-<source>Batch job</source>
-<target>Plik wsadowy</target>
+<source>Show examples</source>
+<target>Przykład</target>
+
+<source>Handle errors:</source>
+<target>Obsługa błędów:</target>
+
+<source>Ignore</source>
+<target>Ignoruj</target>
+
+<source>Hide all error and warning messages</source>
+<target>Ukryj wszystkie informacje błędach i ostrzeżeniach</target>
+
+<source>Pop-up</source>
+<target>Pop-up</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Pokazuj okna pop-up dla błędów i ostrzeżeń</target>
+
+<source>On completion:</source>
+<target>Po zakończeniu:</target>
+
+<source>Start synchronization now?</source>
+<target>Rozpocząć teraz synchronizację?</target>
+
+<source>Variant:</source>
+<target>Wariant:</target>
+
+<source>Statistics</source>
+<target>Statystyki</target>
+
+<source>&Don't show this dialog again</source>
+<target>&Nie pokazuj więcej tego okna</target>
+
+<source>Items found:</source>
+<target>Znalezione elementy:</target>
+
+<source>Speed:</source>
+<target>Prędkość:</target>
+
+<source>Time remaining:</source>
+<target>Do ukończenia:</target>
+
+<source>Time elapsed:</source>
+<target>Szacowany czas:</target>
+
+<source>Synchronizing...</source>
+<target>Synchronizuję...</target>
+
+<source>Minimize to notification area</source>
+<target>Minimalizuj do obszaru powiadomiń</target>
+
+<source>Close</source>
+<target>Zamknij</target>
+
+<source>&Pause</source>
+<target>&Pauza</target>
+
+<source>Stop</source>
+<target>Przerwij</target>
<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
<target>Utwórz plik wsadowy do zautomatyzowania procesu synchronizacji. Aby rozpocząć, klknij dwa razy plik lub zaplanuj zadanie w: %x</target>
-<source>Exit</source>
-<target>Wyjście</target>
-
-<source>Abort synchronization on first error</source>
-<target>Zakończ synchronizację przy pierwszym błędzie</target>
+<source>Stop synchronization at first error</source>
+<target>Przerwij synchronizację przy pierwszym błędzie</target>
<source>Show progress dialog</source>
<target>Pokaż okno postępu</target>
-<source>Save log</source>
-<target>Zapisz logi</target>
+<source>Save log:</source>
+<target>Zapisz logi:</target>
-<source>Select folder to save log files</source>
-<target>Określ katalog z logami</target>
-
-<source>Limit</source>
-<target>Limit</target>
+<source>Limit:</source>
+<target>Limit:</target>
<source>Limit maximum number of log files</source>
<target>Określ maksymalną liczbę plików z logami</target>
+<source>How can I schedule a batch job?</source>
+<target>Jak zaplanować zadanie w trybie wsadowym?</target>
+
+<source>&Recycle bin</source>
+<target>&Kosz systemowy</target>
+
<source>Delete on both sides</source>
<target>Usuń po obu stronach</target>
<source>Delete on both sides even if the file is selected on one side only</source>
<target>Usuń po obu stronach nawet jeżeli plik zaznaczony jest tylko po jednej stronie</target>
-<source>
-Files will only be synchronized if they pass all filter rules.
-Note: File paths must be relative to base directories.
-</source>
-<target>
-Pliki zostaną zsynchronizowane tylko w przypadku przejścia przez wszystkie regóły filtra.
-Uwaga: Ścieżki plików muszą być względne do katalogów bazowych.
-</target>
+<source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source>
+<target>Określ reguły filtrowania w celu wykluczenia niektórych plików z synchronizacji. Ścieżki plików muszą być relatywne do podanych par katalogów.</target>
-<source>Include</source>
-<target>Dołącz</target>
+<source>Include:</source>
+<target>Dołącz:</target>
-<source>Exclude</source>
-<target>Wyklucz</target>
+<source>Exclude:</source>
+<target>Wyklucz:</target>
-<source>Time span</source>
-<target>Przedział czasowy</target>
+<source>Time span:</source>
+<target>Przedział czasu:</target>
-<source>File size</source>
-<target>Rozmiar pliku</target>
+<source>File size:</source>
+<target>Rozmiar pliku:</target>
-<source>Minimum</source>
-<target>Minimum</target>
+<source>Minimum:</source>
+<target>Minimalny:</target>
-<source>Maximum</source>
-<target>Maksimum</target>
+<source>Maximum:</source>
+<target>Maksymalny:</target>
<source>&Clear</source>
<target>W&yczyść</target>
-<source>Global settings</source>
-<target>Ustawienia programu</target>
+<source>The following settings are used for all synchronization jobs.</source>
+<target>Następujące ustawienia stosowane są do wszystkich zadań synchronizacji.</target>
<source>Fail-safe file copy</source>
<target>Bezpieczne kopiowanie</target>
-<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
-<target>Aby zagwarantować spójność synchronizacji nawet podczas błędu, program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp) po czym zmienia nazwę pliku na docelową.</target>
+<source>
+Copy to a temporary file (*.ffs_tmp) before overwriting target.
+This guarantees a consistent state even in case of a serious error.
+</source>
+<target>
+Aby zagwarantować spójność synchronizacji nawet podczas błędu,
+program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadpisuje plik docelowy.
+</target>
+
+<source>(recommended)</source>
+<target>(rekomendowane)</target>
<source>Copy locked files</source>
<target>Kopiuj zablokowane pliki</target>
-<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
-<target>Kopiuj współdzielone lub zablokowane pliki używając Volume Shadow Copy Service (wymaga uprawnień administratora)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service.</source>
+<target>Kopiuj pliki współdzielone lub zablokowane używając usługi Volume Shadow Copy.</target>
+
+<source>(requires administrator rights)</source>
+<target>(wymagane uprawnienia administratora)</target>
<source>Copy file access permissions</source>
<target>Kopiuj uprawnienia plików</target>
-<source>Transfer file and folder permissions (requires administrator rights)</source>
-<target>Kopiuj uprawnienia plików i katalogów (wymaga uprawnień administratora)</target>
+<source>Transfer file and folder permissions.</source>
+<target>kopiuj uprawnienia plików i katalogów.</target>
+
+<source>Automatic retry on error:</source>
+<target>Automatyczne ponowienie operacji podczas błędu:</target>
-<source>Restore hidden dialogs</source>
-<target>Przywróc ukryte dialogi</target>
+<source>Retry count:</source>
+<target>Liczba prób:</target>
-<source>External applications</source>
-<target>Aplikacje zewnętrzne</target>
+<source>Delay (in seconds):</source>
+<target>Opóźnienie (w sekundach):</target>
+
+<source>Customize context menu:</source>
+<target>Dostosuj menu kontekstowe:</target>
<source>Description</source>
<target>Opis</target>
+<source>Restore hidden windows</source>
+<target>Przywróć ukryte dialogi</target>
+
<source>&Default</source>
<target>&Domyślne</target>
@@ -999,26 +1043,20 @@ Uwaga: Ścieżki plików muszą być względne do katalogów bazowych.
<source>Many thanks for localization:</source>
<target>Podziękowania za tłumaczenia:</target>
-<source>Start synchronization</source>
-<target>Rozpocznij synchronizację</target>
-
-<source>Comparison settings</source>
-<target>Ustawienia porównywania</target>
-
-<source>Synchronization settings</source>
-<target>Ustawienia synchronizacji</target>
+<source>Save as Batch Job</source>
+<target>Zapisz w trybie wsadowym</target>
-<source>Delete</source>
-<target>Usuń</target>
+<source>Delete Items</source>
+<target>Usuń elementy</target>
-<source>Configure filter</source>
-<target>Konfiguruj filtr</target>
+<source>Global Settings</source>
+<target>Ustawienia ogólne</target>
-<source>Select time span</source>
-<target>Określ przedział czasowy</target>
+<source>Select Time Span</source>
+<target>Określ</target>
-<source>Folder pairs</source>
-<target>Pary folderów</target>
+<source>Folder Pairs</source>
+<target>Pary katalogów</target>
<source>Find</source>
<target>Znajdź</target>
@@ -1029,14 +1067,14 @@ Uwaga: Ścieżki plików muszą być względne do katalogów bazowych.
<source>Configuration</source>
<target>Konfiguracja</target>
-<source>Main bar</source>
+<source>Main Bar</source>
<target>Główny pasek</target>
-<source>Filter files</source>
-<target>Filtruj pliki</target>
+<source>Filter Files</source>
+<target>Filtr</target>
-<source>Select view</source>
-<target>Określ widok</target>
+<source>Select View</source>
+<target>Widok</target>
<source>Open...</source>
<target>Otwórz...</target>
@@ -1047,15 +1085,14 @@ Uwaga: Ścieżki plików muszą być względne do katalogów bazowych.
<source>Compare both sides</source>
<target>Porównaj foldery</target>
-<source>
-<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
-<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
-</source>
-<target>
-<pluralform>Czy na pewno chcesz wykonać polecenie %y dla 1 elementu?</pluralform>
-<pluralform>Czy na pewno chcesz wykonać polecenie %y dla %x elementów?</pluralform>
-<pluralform>Czy na pewno chcesz wykonać polecenie %y dla %x elementów?</pluralform>
-</target>
+<source>Comparison settings</source>
+<target>Ustawienia porównywania</target>
+
+<source>Synchronization settings</source>
+<target>Ustawienia synchronizacji</target>
+
+<source>Start synchronization</source>
+<target>Rozpocznij synchronizację</target>
<source>Confirm</source>
<target>Potwierdź</target>
@@ -1111,6 +1148,9 @@ Uwaga: Ścieżki plików muszą być względne do katalogów bazowych.
<source>Include temporarily</source>
<target>Dołącz tymczasowo</target>
+<source>Delete</source>
+<target>Usuń</target>
+
<source>Include all</source>
<target>Zaznacz wszystko</target>
@@ -1153,11 +1193,14 @@ Uwaga: Ścieżki plików muszą być względne do katalogów bazowych.
<source>Do you want to save changes to %x?</source>
<target>Czy chcesz zapisać zmiany w %x?</target>
+<source>Never save &changes</source>
+<target>Nigdy nie zapisuj &zmian</target>
+
<source>Do&n't save</source>
<target>&Nie zapisuj</target>
-<source>Never save &changes</source>
-<target>Nigdy nie zapisuj &zmian</target>
+<source>Filter</source>
+<target>Filtr</target>
<source>Show files that exist on left side only</source>
<target>Pokaż pliki istniejące tylko po lewej stronie</target>
@@ -1204,12 +1247,15 @@ Uwaga: Ścieżki plików muszą być względne do katalogów bazowych.
<source>Set as default</source>
<target>Zapisz jako domyślne</target>
-<source>Operation aborted</source>
-<target>Operacja przerwana</target>
-
<source>All folders are in sync</source>
<target>Wszystkie katalogi są zsynchronizowane</target>
+<source>Synchronization Settings</source>
+<target>Ustawienia synchronizacji</target>
+
+<source>Comparison Settings</source>
+<target>Ustawienia porównywania</target>
+
<source>Cannot find %x</source>
<target>Nie można znaleźć %x</target>
@@ -1222,30 +1268,6 @@ Uwaga: Ścieżki plików muszą być względne do katalogów bazowych.
<source>Searching for program updates...</source>
<target>Wyszukiwanie aktualizacji...</target>
-<source>&Ignore subsequent errors</source>
-<target>&Ignoruj kolejne błędy</target>
-
-<source>&Ignore</source>
-<target>&Ignoruj</target>
-
-<source>Fatal Error</source>
-<target>Błąd krytyczny</target>
-
-<source>&Don't show this warning again</source>
-<target>&Nie pokazuj ponownie tego ostrzeżenia</target>
-
-<source>&Switch</source>
-<target>&Zamień</target>
-
-<source>Question</source>
-<target>Pytanie</target>
-
-<source>&Yes</source>
-<target>&Tak</target>
-
-<source>&No</source>
-<target>&Nie</target>
-
<source>Scanning...</source>
<target>Skanowanie...</target>
@@ -1255,14 +1277,17 @@ Uwaga: Ścieżki plików muszą być względne do katalogów bazowych.
<source>Info</source>
<target>Info</target>
+<source>Warning</source>
+<target>Ostrzeżenie</target>
+
<source>Paused</source>
<target>Pauza</target>
<source>Initializing...</source>
<target>Inicjalizacja...</target>
-<source>Aborted</source>
-<target>Przerwana</target>
+<source>Stopped</source>
+<target>Zatrzymana</target>
<source>Completed</source>
<target>Zakończono</target>
@@ -1273,9 +1298,6 @@ Uwaga: Ścieżki plików muszą być względne do katalogów bazowych.
<source>Log</source>
<target>Log</target>
-<source>Inactive</source>
-<target>Nieaktywny</target>
-
<source>Today</source>
<target>Dzisiaj</target>
@@ -1300,9 +1322,6 @@ Uwaga: Ścieżki plików muszą być względne do katalogów bazowych.
<source>MB</source>
<target>MB</target>
-<source>Filter</source>
-<target>Filtr</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>
@@ -1313,6 +1332,9 @@ Uwaga: Ścieżki plików muszą być względne do katalogów bazowych.
<pluralform>Czy na pewno chcesz przenieść te %x elemntów do kosza?</pluralform>
</target>
+<source>Move</source>
+<target>Przenieś</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>
@@ -1323,6 +1345,9 @@ Uwaga: Ścieżki plików muszą być względne do katalogów bazowych.
<pluralform>Czy na pewno chcesz usunąć %x następujących elementów?</pluralform>
</target>
+<source>Exclude</source>
+<target>Wyklucz</target>
+
<source>Direct</source>
<target>Bezpośrednio</target>
@@ -1347,8 +1372,8 @@ Uwaga: Ścieżki plików muszą być względne do katalogów bazowych.
<source>- Other side's counterpart to %item_folder%</source>
<target>- Odpowiednik %item_folder% po drugiej stronie</target>
-<source>Make hidden warnings and dialogs visible again?</source>
-<target>Przywrócić ukryte powiadomienia i dialogi?</target>
+<source>Restore all hidden windows and warnings?</source>
+<target>Przywrócić wszystkie ukryte dialogi?</target>
<source>Leave as unresolved conflict</source>
<target>Zostaw jako nierozwiązany konflikt</target>
@@ -1476,14 +1501,14 @@ Uwaga: Ścieżki plików muszą być względne do katalogów bazowych.
<pluralform>%x dni</pluralform>
</target>
-<source>Failed to register to receive system messages.</source>
-<target>Błąd podczas rejestracji odbioru komunikatów systemowych.</target>
+<source>Unable to register to receive system messages.</source>
+<target>Błąd podczas rejestrowania do odbioru komunikatów systemowych.</target>
<source>Cannot set privilege %x.</source>
<target>Nie można ustawić uprawnień %x.</target>
-<source>Failed to suspend system sleep mode.</source>
-<target>Program nie mógł wyłączyć trybu uśpienia systemu.</target>
+<source>Unable to suspend system sleep mode.</source>
+<target>Nie można przerwać trybu uśpienia.</target>
<source>Cannot change process I/O priorities.</source>
<target>Nie można zmienić priorytetu I/O procesu.</target>
diff --git a/BUILD/Languages/portuguese.lng b/BUILD/Languages/portuguese.lng
index 5557ada4..66105d0a 100644
--- a/BUILD/Languages/portuguese.lng
+++ b/BUILD/Languages/portuguese.lng
@@ -2,11 +2,17 @@
<language>Português</language>
<translator>Carlos Balseiro</translator>
<locale>pt_PT</locale>
- <flag_image>flag_portugal.png</flag_image>
- <plural_form_count>2</plural_form_count>
+ <image>flag_portugal.png</image>
+ <plural_count>2</plural_count>
<plural_definition>n == 1 ? 0 : 1</plural_definition>
</header>
+<source>&Check</source>
+<target></target>
+
+<source>Retrying operation...</source>
+<target></target>
+
<source>Both sides have changed since last synchronization.</source>
<target>Ambos os lados tiveram alterações desde a última sincronização.</target>
@@ -58,9 +64,6 @@
<source>Cannot open file %x.</source>
<target>Não é possível abrir o ficheiro %x.</target>
-<source>Error</source>
-<target>Erro</target>
-
<source>File %x does not contain a valid configuration.</source>
<target>Ficheiro %x não tem uma configuração válida.</target>
@@ -70,12 +73,12 @@
<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
<target>O ficheiro de configuração não deve conter configurações ao nível de par-directório quando os directórios são definidos pela linha de comandos.</target>
-<source>Warning</source>
-<target>Atenção</target>
-
<source>Directories cannot be set for more than one configuration file.</source>
<target>Os directórios não podem ser definidos em mais do que um ficheiro de configuração.</target>
+<source>Command line</source>
+<target>Linha de comandos</target>
+
<source>Syntax:</source>
<target>Sintaxe:</target>
@@ -91,9 +94,6 @@
<source>Any number of alternative directories for at most one config file.</source>
<target>Qualquer número de directórios alternativos para apenas um ficheiro de configuração.</target>
-<source>Command line</source>
-<target>Linha de comandos</target>
-
<source>A folder input field is empty.</source>
<target>Um dos campos de directório para comparar está vazio.</target>
@@ -292,8 +292,8 @@
<source>/sec</source>
<target>/seg</target>
-<source>%x items</source>
-<target>%x itens</target>
+<source>%x items/sec</source>
+<target>%x itens/seg</target>
<source>Configuration file %x loaded partially only.</source>
<target>Ficheiro de configuração %x carregado parcialmente.</target>
@@ -322,11 +322,11 @@
<source>Volume name %x is not part of file path %y.</source>
<target>Nome de volume %x não faz parte do caminho do ficheiro %y.</target>
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Abortar pedido: À espera do fim da operação atual...</target>
+<source>Stop requested: Waiting for current operation to finish...</source>
+<target>Paragem solicitada: À espera que termine a operação actual...</target>
-<source>Failure to create timestamp for versioning:</source>
-<target>Falha ao criar selo temporal para versões anteriores:</target>
+<source>Unable to create timestamp for versioning:</source>
+<target>Não é possível criar timestamp para controle de versões:</target>
<source>Cannot read the following XML elements:</source>
<target>Não é possível ler os elementos XML:</target>
@@ -343,8 +343,8 @@
<source>&Program</source>
<target>&Programa</target>
-<source>&Content</source>
-<target>C&onteúdo</target>
+<source>&View help</source>
+<target>&Ver ajuda</target>
<source>&About</source>
<target>So&bre</target>
@@ -367,8 +367,8 @@
<source>To get started just import a .ffs_batch file.</source>
<target>Para começar basta importar um ficheiro .ffs_batch.</target>
-<source>Folders to watch</source>
-<target>Pastas a observar</target>
+<source>Folders to watch:</source>
+<target>Pastas a verificar:</target>
<source>Add folder</source>
<target>Adicionar pasta</target>
@@ -382,12 +382,15 @@
<source>Select a folder</source>
<target>Selecione uma pasta</target>
-<source>Idle time [seconds]</source>
-<target>Tempo de espera [segundos]</target>
+<source>Idle time (in seconds):</source>
+<target>Tempo de espera (em segundos):</target>
<source>Idle time between last detected change and execution of command</source>
<target>Tempo de espera entre a última alteração detetada e a execução do comando</target>
+<source>Command line:</source>
+<target>Linha de comandos:</target>
+
<source>
The command is triggered if:
- files or subfolders change
@@ -399,33 +402,30 @@ O comando é executado se:
- forem detetadas novas pastas (p.e. pen USB)
</target>
-<source>Start</source>
-<target>Iniciar</target>
-
-<source>&Retry</source>
-<target>&Tentar de Novo</target>
-
-<source>Cancel</source>
-<target>Cancelar</target>
+<source>&Start</source>
+<target>&Início</target>
-<source>RealtimeSync - Automated Synchronization</source>
-<target>RealtimeSync - Sincronização Automatizada</target>
+<source>About</source>
+<target>Sobre</target>
<source>Build: %x</source>
<target>Build: %x</target>
-<source>About</source>
-<target>Sobre</target>
-
<source>All files</source>
<target>Todos os ficheiros</target>
+<source>Automated Synchronization</source>
+<target>Sincronização Automática</target>
+
<source>Directory monitoring active</source>
<target>Monitorização de directório activa</target>
<source>Waiting until all directories are available...</source>
<target>A aguardar que todos os directórios fiquem disponíveis...</target>
+<source>Error</source>
+<target>Erro</target>
+
<source>&Restore</source>
<target>&Restaurar</target>
@@ -435,8 +435,11 @@ O comando é executado se:
<source>&Exit</source>
<target>&Sair</target>
-<source>Invalid command line:</source>
-<target>Linha de comando inválida:</target>
+<source>Incorrect command line:</source>
+<target>Linha de comandos incorrecta:</target>
+
+<source>&Retry</source>
+<target>&Tentar de Novo</target>
<source>File content</source>
<target>Conteúdo do ficheiro</target>
@@ -498,8 +501,8 @@ O comando é executado se:
<source>Target folder input field must not be empty.</source>
<target>Campo de directório de destino não deve estar vazio.</target>
-<source>Folder input field for versioning must not be empty.</source>
-<target>Campo do directório para manter versões não deve estar vazio.</target>
+<source>Please enter a target folder for versioning.</source>
+<target>Introduza uma pasta de destino para o controlo de versões.</target>
<source>Source folder %x not found.</source>
<target>Directório %x não encontrado.</target>
@@ -537,8 +540,8 @@ O comando é executado se:
<source>job name</source>
<target>nome da tarefa</target>
-<source>Synchronization aborted</source>
-<target>Sincronização abortada</target>
+<source>Synchronization stopped</source>
+<target>Sincronização parada</target>
<source>Synchronization completed with errors</source>
<target>Sincronização completa com erros</target>
@@ -555,14 +558,38 @@ O comando é executado se:
<source>Saving log file %x...</source>
<target>A guardar ficheiro log %x...</target>
-<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
-<target>Pressionar "Trocar" para resolver problemas com a interface principal do FreeFileSync.</target>
+<source>You can switch to FreeFileSync's main window to resolve this issue.</source>
+<target>Pode mudar para a janela principal do FreeFileSync para resovler este problema.</target>
+
+<source>&Don't show this warning again</source>
+<target>&Não mostrar este aviso novamente</target>
-<source>Switching to FreeFileSync main dialog</source>
-<target>A mudar para o diálogo principal do FreeFileSync</target>
+<source>&Ignore</source>
+<target>&Ignorar</target>
-<source>Retrying operation after error:</source>
-<target>A tentar novamente a operação após erro:</target>
+<source>&Switch</source>
+<target>&Trocar</target>
+
+<source>Switching to FreeFileSync's main window</source>
+<target>A mudar para a janela principal do FreeFileSync</target>
+
+<source>
+<pluralform>Automatic retry in 1 second...</pluralform>
+<pluralform>Automatic retry in %x seconds...</pluralform>
+</source>
+<target>
+<pluralform>Repetir automaticamente dentro de 1 segundo...</pluralform>
+<pluralform>Repetir automaticamente dentro de %x segundos...</pluralform>
+</target>
+
+<source>&Ignore subsequent errors</source>
+<target>&Ignorar erros subsequentes</target>
+
+<source>Serious Error</source>
+<target>Erro Grave</target>
+
+<source>Check for Program Updates</source>
+<target>Procurar actualizações do programa</target>
<source>A new version of FreeFileSync is available:</source>
<target>Uma nova versão do FreeFileSync está disponível:</target>
@@ -570,18 +597,12 @@ O comando é executado se:
<source>Download now?</source>
<target>Fazer download agora?</target>
-<source>New version found</source>
-<target>Nova versão encontrada</target>
-
<source>&Download</source>
<target>&Download</target>
<source>FreeFileSync is up to date.</source>
<target>FreeFileSync está actualizado.</target>
-<source>Information</source>
-<target>Informação</target>
-
<source>Unable to connect to sourceforge.net.</source>
<target>Não é possível ligar a sourceforge.net.</target>
@@ -639,20 +660,20 @@ O comando é executado se:
<source>Hibernate</source>
<target>Hibernar</target>
-<source>Selected variant:</source>
-<target>Variante selecionada:</target>
+<source>Alternate comparison settings</source>
+<target>Definições de comparação alternativas</target>
-<source>Select alternate comparison settings</source>
-<target>Selecionar opções alternativas de comparação</target>
+<source>Alternate synchronization settings</source>
+<target>Definições de sincronização alternativas</target>
-<source>Select alternate synchronization settings</source>
-<target>Selecionar opções alternativas de sincronização</target>
+<source>Local filter</source>
+<target>Filtro local</target>
-<source>Filter is active</source>
-<target>Filtro activo</target>
+<source>Active</source>
+<target>Activo</target>
-<source>No filter selected</source>
-<target>Nenhum filtro selecionado</target>
+<source>None</source>
+<target>Nenhum</target>
<source>Remove alternate settings</source>
<target>Remover opções alternativas</target>
@@ -666,6 +687,15 @@ O comando é executado se:
<source>Paste</source>
<target>Colar</target>
+<source>Alternate Comparison Settings</source>
+<target>Definições de comparação alternativas</target>
+
+<source>Alternate Synchronization Settings</source>
+<target>Definições de sincronização alternativas</target>
+
+<source>Local Filter</source>
+<target>Filtro local</target>
+
<source>&New</source>
<target>&Novo</target>
@@ -681,15 +711,18 @@ O comando é executado se:
<source>2. &Synchronize</source>
<target>2. &Sincronizar</target>
+<source>&Global settings</source>
+<target>&Opções</target>
+
<source>&Language</source>
<target>&Língua</target>
+<source>&Find...</source>
+<target>&Procurar...</target>
+
<source>&Export file list...</source>
<target>&Exportar lista de ficheiros...</target>
-<source>&Global settings</source>
-<target>&Opções</target>
-
<source>&Tools</source>
<target>&Ferramentas</target>
@@ -699,17 +732,14 @@ O comando é executado se:
<source>Check &automatically once a week</source>
<target>Verificar &automaticamente uma vez por semana</target>
-<source>Check for new &version</source>
-<target>Verificar nova &versão</target>
+<source>&Check for new version</source>
+<target>&Procurar por actualizações</target>
<source>Compare</source>
<target>Comparar</target>
-<source>Comparison settings</source>
-<target>Opções de comparação</target>
-
-<source>Synchronization settings</source>
-<target>Parametros de sincronização</target>
+<source>Cancel</source>
+<target>Cancelar</target>
<source>Synchronize</source>
<target>Sincronizar</target>
@@ -723,6 +753,15 @@ O comando é executado se:
<source>Swap sides</source>
<target>Trocar lados</target>
+<source>Close search bar</source>
+<target>Fechar barra de pesquisa</target>
+
+<source>Find:</source>
+<target>Procurar:</target>
+
+<source>Match case</source>
+<target>Correspondência</target>
+
<source>Save as batch job</source>
<target>Guardar como batch</target>
@@ -744,73 +783,20 @@ O comando é executado se:
<source>Total bytes to copy</source>
<target>Total em bytes a copiar</target>
-<source>Items found:</source>
-<target>Elementos encontrados:</target>
-
-<source>Speed:</source>
-<target>Velocidade:</target>
-
-<source>Time remaining:</source>
-<target>Tempo restante:</target>
-
-<source>Time elapsed:</source>
-<target>Tempo decorrido</target>
-
-<source>Synchronizing...</source>
-<target>A sincronizar...</target>
-
-<source>Minimize to notification area</source>
-<target>Minimizar para a área de notificação</target>
-
-<source>On completion</source>
-<target>Ao terminar</target>
-
-<source>Close</source>
-<target>Fechar</target>
-
-<source>&Pause</source>
-<target>&Pausa</target>
-
-<source>Variant</source>
-<target>Variável</target>
-
-<source>Statistics</source>
-<target>Estatísticas</target>
+<source>Select a variant:</source>
+<target>Seleccionar uma variante:</target>
-<source>&Don't show this dialog again</source>
-<target>&Não mostrar este diálogo novamente</target>
-
-<source>Select a variant</source>
-<target>Seleccione uma variante</target>
-
-<source>
-Files are found equal if
- - last write time and date
- - file size
-are the same
-</source>
-<target>
-Ficheiros considerados iguais se
- - data da última modificação
- - tamanho
-são iguais
-</target>
+<source>Identify equal files by comparing modification time and size.</source>
+<target>Identificar ficheiros iguais ao comparar hora de modificação e tamanho.</target>
-<source>
-Files are found equal if
- - file content
-is the same
-</source>
-<target>
-Os ficheiros são considerados iguais se
- - o conteúdo é o mesmo
-</target>
+<source>Identify equal files by comparing the file content.</source>
+<target>Identificar ficheiros iguais ao comparar o conteúdo.</target>
-<source>Symbolic Link handling</source>
-<target>Tratamento de links simbólicos</target>
+<source>Symbolic links:</source>
+<target>Links simbólicos:</target>
-<source>Help</source>
-<target>Ajuda</target>
+<source>More information</source>
+<target>Mais informação</target>
<source>OK</source>
<target>OK</target>
@@ -818,11 +804,11 @@ Os ficheiros são considerados iguais se
<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
<target>Identificar e propagar mudanças nos dois lados. Eliminações, cópias e conflitos são detectados automaticamente usando base de dados.</target>
-<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
-<target>Cópia de segurança do directório à esquerda. O directório da direita é alterado para ficar igual ao da esquerda após sincronização.</target>
+<source>Create a mirror backup of the left folder which exactly matches the right folder after synchronization.</source>
+<target>Criar uma cópia exacta da pasta à esquerda, que vai corresponder à pasta da direita após a sincronização.</target>
-<source>Copy new or updated files to right folder.</source>
-<target>Copiar ficheiros novos ou actualizados para a direita</target>
+<source>Copy new and updated files to the right folder.</source>
+<target>Copiar ficheiros novos e actualizados para a pasta à direita.</target>
<source>Configure your own synchronization rules.</source>
<target>Configure as suas regras de sincronização.</target>
@@ -833,23 +819,8 @@ Os ficheiros são considerados iguais se
<source>Requires database files. Not supported by all file systems.</source>
<target>Requer base de dados. Não é suportado por todos os sistemas de ficheiros.</target>
-<source>Error handling</source>
-<target>Controlador de erros</target>
-
-<source>Ignore</source>
-<target>Ignorar</target>
-
-<source>Hide all error and warning messages</source>
-<target>Ocultar todas as mensagens de erro/aviso</target>
-
-<source>Pop-up</source>
-<target>Pop-up</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Mostrar popup em caso de erros ou avisos</target>
-
-<source>Deletion handling</source>
-<target>Controlo eliminação</target>
+<source>Delete files:</source>
+<target>Eliminar ficheiros:</target>
<source>Permanent</source>
<target>Permanente</target>
@@ -872,56 +843,89 @@ Os ficheiros são considerados iguais se
<source>Naming convention:</source>
<target>Convenção de nomes:</target>
-<source>Batch job</source>
-<target>Ficheiro Batch</target>
+<source>Show examples</source>
+<target>Mostrar exemplos</target>
-<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
-<target>Criar ficheiro batch para sincronização automática. Para iniciar, fazer duplo clique no ficheiro ou acrescentar ao planeador de tarefas: %x</target>
+<source>Handle errors:</source>
+<target>Tratar erros:</target>
-<source>Exit</source>
-<target>Sair</target>
+<source>Ignore</source>
+<target>Ignorar</target>
-<source>Abort synchronization on first error</source>
-<target>Abortar sincronização ao primeiro erro</target>
+<source>Hide all error and warning messages</source>
+<target>Ocultar todas as mensagens de erro/aviso</target>
-<source>Show progress dialog</source>
-<target>Mostrar diálogo de progresso</target>
+<source>Pop-up</source>
+<target>Pop-up</target>
-<source>Save log</source>
-<target>Guardar log</target>
+<source>Show pop-up on errors or warnings</source>
+<target>Mostrar popup em caso de erros ou avisos</target>
-<source>Select folder to save log files</source>
-<target>Seleccionar pasta para guardar ficheiros log</target>
+<source>On completion:</source>
+<target>Ao completar:</target>
-<source>Limit</source>
-<target>Limitar</target>
+<source>Start synchronization now?</source>
+<target>Iniciar sincronização agora?</target>
-<source>Limit maximum number of log files</source>
-<target>Limitar o número máximo de ficheiros log</target>
+<source>Variant:</source>
+<target>Variante:</target>
-<source>Source code written in C++ using:</source>
-<target>Código fonte escrito em C++ utilizando:</target>
+<source>Statistics</source>
+<target>Estatísticas</target>
-<source>If you like FreeFileSync</source>
-<target>Se gosta do FreeFileSync</target>
+<source>&Don't show this dialog again</source>
+<target>&Não mostrar este diálogo novamente</target>
-<source>Donate with PayPal</source>
-<target>Doar usando PayPal</target>
+<source>Items found:</source>
+<target>Elementos encontrados:</target>
-<source>Many thanks for localization:</source>
-<target>Muito obrigado pela localização:</target>
+<source>Speed:</source>
+<target>Velocidade:</target>
-<source>Feedback and suggestions are welcome</source>
-<target>Comentários e sugestões são apreciados</target>
+<source>Time remaining:</source>
+<target>Tempo restante:</target>
-<source>Homepage</source>
-<target>Site</target>
+<source>Time elapsed:</source>
+<target>Tempo decorrido</target>
-<source>Email</source>
-<target>Email</target>
+<source>Synchronizing...</source>
+<target>A sincronizar...</target>
-<source>Published under the GNU General Public License</source>
-<target>Publicado sobre GNU General Public License</target>
+<source>Minimize to notification area</source>
+<target>Minimizar para a área de notificação</target>
+
+<source>Close</source>
+<target>Fechar</target>
+
+<source>&Pause</source>
+<target>&Pausa</target>
+
+<source>Stop</source>
+<target>Parar</target>
+
+<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>Criar ficheiro batch para sincronização automática. Para iniciar, fazer duplo clique no ficheiro ou acrescentar ao planeador de tarefas: %x</target>
+
+<source>Stop synchronization at first error</source>
+<target>Para sincronização ao primeiro erro</target>
+
+<source>Show progress dialog</source>
+<target>Mostrar diálogo de progresso</target>
+
+<source>Save log:</source>
+<target>Guardar registo:</target>
+
+<source>Limit:</source>
+<target>Limitar:</target>
+
+<source>Limit maximum number of log files</source>
+<target>Limitar o número máximo de ficheiros log</target>
+
+<source>How can I schedule a batch job?</source>
+<target>Como posso agendar um trabalho batch?</target>
+
+<source>&Recycle bin</source>
+<target>&Reciclagem</target>
<source>Delete on both sides</source>
<target>Eliminar em ambos os lados</target>
@@ -929,95 +933,125 @@ Os ficheiros são considerados iguais se
<source>Delete on both sides even if the file is selected on one side only</source>
<target>Eliminar em ambos os lados mesmo se o ficheiro só está seleccionado num lado</target>
-<source>
-Files will only be synchronized if they pass all filter rules.
-Note: File paths must be relative to base directories.
-</source>
-<target>
-Os ficheiros só serão sincronizados se passarem todos os filtros.
-Nota: O caminho dos ficheiros deve ser relativo ao directório raiz.
-</target>
+<source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source>
+<target>Seleccionar regras de filtro para excluir certos ficheiros da sincronização. Insira os caminhos relativos ao par de directórios correspondente.</target>
-<source>Include</source>
-<target>Incluir</target>
+<source>Include:</source>
+<target>Incluir:</target>
-<source>Exclude</source>
-<target>Excluir</target>
+<source>Exclude:</source>
+<target>Excluir:</target>
-<source>Time span</source>
-<target>Intervalo de tempo</target>
+<source>Time span:</source>
+<target>Intervalo de tempo:</target>
-<source>File size</source>
-<target>Tamanho ficheiro</target>
+<source>File size:</source>
+<target>Tamanho ficheiro:</target>
-<source>Minimum</source>
-<target>Mínimo</target>
+<source>Minimum:</source>
+<target>Mínimo:</target>
-<source>Maximum</source>
+<source>Maximum:</source>
<target>Máximo</target>
<source>&Clear</source>
<target>&Limpar</target>
-<source>Global settings</source>
-<target>Opções</target>
+<source>The following settings are used for all synchronization jobs.</source>
+<target>As seguintes definições são usadas para todas as sincronizações.</target>
<source>Fail-safe file copy</source>
<target>Cópia à prova de falhas</target>
-<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
-<target>Copiar para um ficheiro temporário (*.ffs_tmp) e depois renomear. Isto garante consistência mesmo em caso de erro fatal.</target>
+<source>
+Copy to a temporary file (*.ffs_tmp) before overwriting target.
+This guarantees a consistent state even in case of a serious error.
+</source>
+<target>
+Copiar para um ficheiro temporário (*.ffs_tmp) antes de substituir.
+Isto garante um estado consistente mesmo em caso de falha grave.
+</target>
+
+<source>(recommended)</source>
+<target>(recomendado)</target>
<source>Copy locked files</source>
<target>Copiar ficheiros bloqueados</target>
-<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
-<target>Copiar ficheiros partilhados ou bloqueados usando o serviço Volume Shadow Copy(necessita direitos de administrador)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service.</source>
+<target>Copiar ficheiros partilhados ou bloqueados usando o serviço Volume Shadow Copy.</target>
+
+<source>(requires administrator rights)</source>
+<target>(requer permissões de administrador)</target>
<source>Copy file access permissions</source>
<target>Copiar permissões de acesso do ficheiro</target>
-<source>Transfer file and folder permissions (requires administrator rights)</source>
-<target>Transferir permissões de ficheiros e pastas (necessita direitos de administrador)</target>
+<source>Transfer file and folder permissions.</source>
+<target>Transferir permissões de pasta e ficheiro.</target>
-<source>Restore hidden dialogs</source>
-<target>Restaurar diálogos escondidos</target>
+<source>Automatic retry on error:</source>
+<target>Retentar automaticamente em caso de erro:</target>
-<source>External applications</source>
-<target>Aplicações externas</target>
+<source>Retry count:</source>
+<target>Nº de tentativas:</target>
+
+<source>Delay (in seconds):</source>
+<target>Atraso (em segundos):</target>
+
+<source>Customize context menu:</source>
+<target>Personalizar menu de contexto:</target>
<source>Description</source>
<target>Descrição</target>
+<source>Restore hidden windows</source>
+<target>Restaurar janelas escondidas</target>
+
<source>&Default</source>
<target>&Config. Iniciais</target>
-<source>Find what:</source>
-<target>Procurar:</target>
+<source>Source code written in C++ using:</source>
+<target>Código fonte escrito em C++ utilizando:</target>
-<source>Match case</source>
-<target>Correspondência</target>
+<source>If you like FreeFileSync</source>
+<target>Se gosta do FreeFileSync</target>
-<source>&Find next</source>
-<target>&Procurar seguinte</target>
+<source>Donate with PayPal</source>
+<target>Doar usando PayPal</target>
-<source>Start synchronization</source>
-<target>Iniciar a sincronização</target>
+<source>Feedback and suggestions are welcome</source>
+<target>Comentários e sugestões são apreciados</target>
-<source>Delete</source>
-<target>Eliminar</target>
+<source>Homepage</source>
+<target>Site</target>
-<source>Configure filter</source>
-<target>Configurar filtros</target>
+<source>Email</source>
+<target>Email</target>
-<source>Find</source>
-<target>Procurar</target>
+<source>Published under the GNU General Public License</source>
+<target>Publicado sobre GNU General Public License</target>
+
+<source>Many thanks for localization:</source>
+<target>Muito obrigado pela localização:</target>
-<source>Select time span</source>
-<target>Selecionar intervalo de tempo</target>
+<source>Save as Batch Job</source>
+<target>Guardar como Ficheiro Batch</target>
-<source>Folder pairs</source>
-<target>Par de directório</target>
+<source>Delete Items</source>
+<target>Eliminar Itens</target>
+
+<source>Global Settings</source>
+<target>Opções Globais</target>
+
+<source>Select Time Span</source>
+<target>Seleccionar Intervalo de Tempo</target>
+
+<source>Folder Pairs</source>
+<target>Par de Pastas</target>
+
+<source>Find</source>
+<target>Procurar</target>
<source>Overview</source>
<target>Vista</target>
@@ -1025,14 +1059,14 @@ Nota: O caminho dos ficheiros deve ser relativo ao directório raiz.
<source>Configuration</source>
<target>Configuração</target>
-<source>Main bar</source>
+<source>Main Bar</source>
<target>Barra principal</target>
-<source>Filter files</source>
-<target>Filtrar ficheiros</target>
+<source>Filter Files</source>
+<target>Filtrar Ficheiros</target>
-<source>Select view</source>
-<target>Selecionar vista</target>
+<source>Select View</source>
+<target>Seleccionar Vista</target>
<source>Open...</source>
<target>Abrir...</target>
@@ -1043,18 +1077,27 @@ Nota: O caminho dos ficheiros deve ser relativo ao directório raiz.
<source>Compare both sides</source>
<target>Comparar listas</target>
+<source>Comparison settings</source>
+<target>Opções de comparação</target>
+
+<source>Synchronization settings</source>
+<target>Parametros de sincronização</target>
+
+<source>Start synchronization</source>
+<target>Iniciar a sincronização</target>
+
+<source>Confirm</source>
+<target>Confirmar</target>
+
<source>
-<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for one item?</pluralform>
<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
</source>
<target>
-<pluralform>Deseja mesmo executar o comando %y para 1 item?</pluralform>
+<pluralform>Deseja mesmo executar o comando %y para um item?</pluralform>
<pluralform>Deseja mesmo executar o comando %y para %x itens?</pluralform>
</target>
-<source>Confirm</source>
-<target>Confirmar</target>
-
<source>&Execute</source>
<target>&Executar</target>
@@ -1088,12 +1131,6 @@ Nota: O caminho dos ficheiros deve ser relativo ao directório raiz.
<source>Set direction:</source>
<target>Escolher direcção:</target>
-<source>Exclude temporarily</source>
-<target>Excluir temporariamente</target>
-
-<source>Include temporarily</source>
-<target>Incluir temporariamente</target>
-
<source>multiple selection</source>
<target>seleção múltipla</target>
@@ -1103,6 +1140,15 @@ Nota: O caminho dos ficheiros deve ser relativo ao directório raiz.
<source>Exclude via filter:</source>
<target>Excluir por filtro:</target>
+<source>Exclude temporarily</source>
+<target>Excluir temporariamente</target>
+
+<source>Include temporarily</source>
+<target>Incluir temporariamente</target>
+
+<source>Delete</source>
+<target>Eliminar</target>
+
<source>Include all</source>
<target>Incluir tudo</target>
@@ -1145,11 +1191,14 @@ Nota: O caminho dos ficheiros deve ser relativo ao directório raiz.
<source>Do you want to save changes to %x?</source>
<target>Deseja guardar as alterações a %x?</target>
+<source>Never save &changes</source>
+<target>Nunca guardar &alterações</target>
+
<source>Do&n't save</source>
<target>Não g&uardar</target>
-<source>Never save &changes</source>
-<target>Nunca guardar &alterações</target>
+<source>Filter</source>
+<target>Filtro</target>
<source>Show files that exist on left side only</source>
<target>Mostrar ficheiros existentes somente à esquerda</target>
@@ -1196,12 +1245,18 @@ Nota: O caminho dos ficheiros deve ser relativo ao directório raiz.
<source>Set as default</source>
<target>Definir como padrão</target>
-<source>Operation aborted</source>
-<target>Operação abortada</target>
-
<source>All folders are in sync</source>
<target>Todas as pastas estão sincronizadas</target>
+<source>Synchronization Settings</source>
+<target>Definições de Sincronização</target>
+
+<source>Comparison Settings</source>
+<target>Definições de Comparação</target>
+
+<source>Cannot find %x</source>
+<target>Não é possível descobrir %x</target>
+
<source>Comma-separated values</source>
<target>Valores separados por virgula</target>
@@ -1211,30 +1266,6 @@ Nota: O caminho dos ficheiros deve ser relativo ao directório raiz.
<source>Searching for program updates...</source>
<target>A procurar actualizações do programa...</target>
-<source>&Ignore subsequent errors</source>
-<target>&Ignorar erros subsequentes</target>
-
-<source>&Ignore</source>
-<target>&Ignorar</target>
-
-<source>Fatal Error</source>
-<target>Erro crítico</target>
-
-<source>&Don't show this warning again</source>
-<target>&Não mostrar este aviso novamente</target>
-
-<source>&Switch</source>
-<target>&Trocar</target>
-
-<source>Question</source>
-<target>Questão</target>
-
-<source>&Yes</source>
-<target>&Sim</target>
-
-<source>&No</source>
-<target>&Não</target>
-
<source>Scanning...</source>
<target>A pesquisar...</target>
@@ -1244,14 +1275,17 @@ Nota: O caminho dos ficheiros deve ser relativo ao directório raiz.
<source>Info</source>
<target>Info</target>
+<source>Warning</source>
+<target>Atenção</target>
+
<source>Paused</source>
<target>Em pausa</target>
<source>Initializing...</source>
<target>A iniciar...</target>
-<source>Aborted</source>
-<target>Abortado</target>
+<source>Stopped</source>
+<target>Parado</target>
<source>Completed</source>
<target>Terminado</target>
@@ -1262,12 +1296,6 @@ Nota: O caminho dos ficheiros deve ser relativo ao directório raiz.
<source>Log</source>
<target>Registo</target>
-<source>Cannot find %x</source>
-<target>Não é possível descobrir %x</target>
-
-<source>Inactive</source>
-<target>Inactivo</target>
-
<source>Today</source>
<target>Hoje</target>
@@ -1292,9 +1320,6 @@ Nota: O caminho dos ficheiros deve ser relativo ao directório raiz.
<source>MB</source>
<target>MB</target>
-<source>Filter</source>
-<target>Filtro</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>
@@ -1304,6 +1329,9 @@ Nota: O caminho dos ficheiros deve ser relativo ao directório raiz.
<pluralform>Deseja mesmo mover os seguintes %x itens para a reciclagem?</pluralform>
</target>
+<source>Move</source>
+<target>Mover</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>
@@ -1313,6 +1341,9 @@ Nota: O caminho dos ficheiros deve ser relativo ao directório raiz.
<pluralform>Deseja mesmo eliminar os seguintes %x itens?</pluralform>
</target>
+<source>Exclude</source>
+<target>Excluir</target>
+
<source>Direct</source>
<target>Direto</target>
@@ -1337,8 +1368,8 @@ Nota: O caminho dos ficheiros deve ser relativo ao directório raiz.
<source>- Other side's counterpart to %item_folder%</source>
<target>- Contrapartida de %item_folder%</target>
-<source>Make hidden warnings and dialogs visible again?</source>
-<target>Tornar visiveis os diálogos e avisos escondidos novamente?</target>
+<source>Restore all hidden windows and warnings?</source>
+<target>Restaurar todas as janelas e avisos escondidos?</target>
<source>Leave as unresolved conflict</source>
<target>Deixar como conflito</target>
@@ -1463,14 +1494,14 @@ Nota: O caminho dos ficheiros deve ser relativo ao directório raiz.
<pluralform>%x dias</pluralform>
</target>
-<source>Failed to register to receive system messages.</source>
-<target>Falhou o registo para receber mensagens de sistema.</target>
+<source>Unable to register to receive system messages.</source>
+<target>Não foi possível registar para receber mensagens do sistema.</target>
<source>Cannot set privilege %x.</source>
<target>Não é possível definir o privilégio %x.</target>
-<source>Failed to suspend system sleep mode.</source>
-<target>Falha ao suspender o modo de hibernação do sistema.</target>
+<source>Unable to suspend system sleep mode.</source>
+<target>Não é possível retornar do modo de suspensão do sistema.</target>
<source>Cannot change process I/O priorities.</source>
<target>Não é possível alterar as prioridades de E / S do processo.</target>
diff --git a/BUILD/Languages/portuguese_br.lng b/BUILD/Languages/portuguese_br.lng
index 1c503315..56a5cb8d 100644
--- a/BUILD/Languages/portuguese_br.lng
+++ b/BUILD/Languages/portuguese_br.lng
@@ -2,11 +2,14 @@
<language>Português (BR)</language>
<translator>Edison Aranha</translator>
<locale>pt_BR</locale>
- <flag_image>flag_brazil.png</flag_image>
- <plural_form_count>2</plural_form_count>
+ <image>flag_brazil.png</image>
+ <plural_count>2</plural_count>
<plural_definition>n == 1 ? 0 : 1</plural_definition>
</header>
+<source>Retrying operation...</source>
+<target></target>
+
<source>Both sides have changed since last synchronization.</source>
<target>Ambos os lados foram alterados desde a última sincronização.</target>
@@ -98,7 +101,7 @@
<target>Um campo de entrada de pasta está vazio.</target>
<source>The corresponding folder will be considered as empty.</source>
-<target>A pasta correspondente será considerar como vazia.</target>
+<target>A pasta correspondente será considerada como vazia.</target>
<source>Cannot find the following folders:</source>
<target>Não foi possível localizar as seguintes pastas:</target>
@@ -292,8 +295,8 @@
<source>/sec</source>
<target>/seg</target>
-<source>%x items</source>
-<target>%x itens</target>
+<source>%x items/sec</source>
+<target>%x itens/seg</target>
<source>Configuration file %x loaded partially only.</source>
<target>O arquivo de configuração %x foi carregado parcialmente.</target>
@@ -322,10 +325,10 @@
<source>Volume name %x is not part of file path %y.</source>
<target>O nome do volume %x não faz parte do caminho do arquivo %y.</target>
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Cancelar solicitado: Esperando fim da operação...</target>
+<source>Stop requested: Waiting for current operation to finish...</source>
+<target>Interromper solicitado: Aguardando operação ser finalizada...</target>
-<source>Failure to create timestamp for versioning:</source>
+<source>Unable to create timestamp for versioning:</source>
<target>Erro ao criar estampa de tempo para controle de versão:</target>
<source>Cannot read the following XML elements:</source>
@@ -343,8 +346,8 @@
<source>&Program</source>
<target>&Programa</target>
-<source>&Content</source>
-<target>&Conteúdo</target>
+<source>&View help</source>
+<target>&Ver ajuda</target>
<source>&About</source>
<target>&Sobre</target>
@@ -367,7 +370,7 @@
<source>To get started just import a .ffs_batch file.</source>
<target>Para iniciar importe um arquivo .ffs_batch.</target>
-<source>Folders to watch</source>
+<source>Folders to watch:</source>
<target>Pastas para comparar</target>
<source>Add folder</source>
@@ -382,12 +385,15 @@
<source>Select a folder</source>
<target>Selecionar uma pasta</target>
-<source>Idle time [seconds]</source>
-<target>Tempo de espera [segundos]</target>
+<source>Idle time (in seconds):</source>
+<target>Tempo de espera (em segundos):</target>
<source>Idle time between last detected change and execution of command</source>
<target>Tempo de espera entre última mudança detectada e execução do comando</target>
+<source>Command line:</source>
+<target>Linha de comando:</target>
+
<source>
The command is triggered if:
- files or subfolders change
@@ -399,8 +405,8 @@ O comando é disparado se:
- novas pastas aparecem (p. ex. Uma pendrive é inserida)
</target>
-<source>Start</source>
-<target>Iniciar</target>
+<source>&Start</source>
+<target>&Iniciar</target>
<source>&Retry</source>
<target>&Tentar Novamente</target>
@@ -408,9 +414,6 @@ O comando é disparado se:
<source>Cancel</source>
<target>Cancelar</target>
-<source>RealtimeSync - Automated Synchronization</source>
-<target>RealtimeSync - Sincronização Automatizada</target>
-
<source>Build: %x</source>
<target>Versão: %x</target>
@@ -420,6 +423,9 @@ O comando é disparado se:
<source>All files</source>
<target>Todos os arquivos</target>
+<source>Automated Synchronization</source>
+<target>Sincronização Automatizada</target>
+
<source>Directory monitoring active</source>
<target>Monitoramento de diretórios ativado</target>
@@ -435,8 +441,8 @@ O comando é disparado se:
<source>&Exit</source>
<target>&Sair</target>
-<source>Invalid command line:</source>
-<target>Linha de comando inválida:</target>
+<source>Incorrect command line:</source>
+<target>Linha de comando incorreta:</target>
<source>File content</source>
<target>Conteúdo do arquivo</target>
@@ -498,8 +504,8 @@ O comando é disparado se:
<source>Target folder input field must not be empty.</source>
<target>Campo de entrada da pasta de destino não pode ficar vazio.</target>
-<source>Folder input field for versioning must not be empty.</source>
-<target>Campo de entrada da pasta para controle de versão não pode ficar vazio.</target>
+<source>Please enter a target folder for versioning.</source>
+<target>Por favor, entre com uma pasta destino para controle de versões.</target>
<source>Source folder %x not found.</source>
<target>Pasta de origem %x não foi encontrada.</target>
@@ -537,8 +543,8 @@ O comando é disparado se:
<source>job name</source>
<target>nome da tarefa</target>
-<source>Synchronization aborted</source>
-<target>Sincronização cancelada</target>
+<source>Synchronization stopped</source>
+<target>Sincronização interrompida</target>
<source>Synchronization completed with errors</source>
<target>Sincronização finalizada com erros</target>
@@ -555,14 +561,20 @@ O comando é disparado se:
<source>Saving log file %x...</source>
<target>Salvando arquivo de log %x...</target>
-<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
-<target>Pressione "Alterar" para resolver os conflitos na tela principal do FreeFileSync.</target>
+<source>You can switch to FreeFileSync's main window to resolve this issue.</source>
+<target>Você pode alternar para a janela principal do FreeFileSync para resolver este problema.</target>
-<source>Switching to FreeFileSync main dialog</source>
-<target>Mudando para a caixa de diálogo principal do FreeFileSync</target>
+<source>Switching to FreeFileSync's main window</source>
+<target>Mudando para a janela principal do FreeFileSync</target>
-<source>Retrying operation after error:</source>
-<target>Tentando operação novamente após erro:</target>
+<source>
+<pluralform>Automatic retry in 1 second...</pluralform>
+<pluralform>Automatic retry in %x seconds...</pluralform>
+</source>
+<target>
+<pluralform>Nova tentativa autompatica em 1 segundo...</pluralform>
+<pluralform>Nova tentativa autompatica em %x segundos...</pluralform>
+</target>
<source>A new version of FreeFileSync is available:</source>
<target>Uma nova versão do FreeFileSync está disponível:</target>
@@ -570,8 +582,8 @@ O comando é disparado se:
<source>Download now?</source>
<target>Baixar agora?</target>
-<source>New version found</source>
-<target>Nova versão encontrada</target>
+<source>Check for Program Updates</source>
+<target>Verificar se existem atualizações</target>
<source>&Download</source>
<target>&Baixar</target>
@@ -639,20 +651,20 @@ O comando é disparado se:
<source>Hibernate</source>
<target>Hibernar</target>
-<source>Selected variant:</source>
-<target>Modo selecionado:</target>
+<source>Alternate comparison settings</source>
+<target>Configurações alternativas de comparação</target>
-<source>Select alternate comparison settings</source>
-<target>Selecionar configurações alternativas de comparação</target>
+<source>Alternate synchronization settings</source>
+<target>Configurações alternativas de sincronização</target>
-<source>Select alternate synchronization settings</source>
-<target>Selecionar configurações alternativas de sincronização</target>
+<source>Local filter</source>
+<target>Filtro local</target>
-<source>Filter is active</source>
-<target>Filtro está ativo</target>
+<source>Active</source>
+<target>Ativo</target>
-<source>No filter selected</source>
-<target>Nenhum filtro selecionado</target>
+<source>None</source>
+<target>Nenhum</target>
<source>Remove alternate settings</source>
<target>Remover configurações alternativas</target>
@@ -666,6 +678,15 @@ O comando é disparado se:
<source>Paste</source>
<target>Colar</target>
+<source>Alternate Comparison Settings</source>
+<target>Configurações Alternativas de Comparação</target>
+
+<source>Alternate Synchronization Settings</source>
+<target>Configurações Alternativas de Sincronização</target>
+
+<source>Local Filter</source>
+<target>Filtro Local</target>
+
<source>&New</source>
<target>&Novo</target>
@@ -681,15 +702,18 @@ O comando é disparado se:
<source>2. &Synchronize</source>
<target>2. S&incronizar</target>
+<source>&Global settings</source>
+<target>&Configurações</target>
+
<source>&Language</source>
<target>&Idioma</target>
+<source>&Find...</source>
+<target>&Localizar...</target>
+
<source>&Export file list...</source>
<target>&Exportar lista de arquivos...</target>
-<source>&Global settings</source>
-<target>&Configurações</target>
-
<source>&Tools</source>
<target>&Ferramentas</target>
@@ -699,8 +723,8 @@ O comando é disparado se:
<source>Check &automatically once a week</source>
<target>Verificar &automaticamente uma vez por semana</target>
-<source>Check for new &version</source>
-<target>Verificar se existe nova &versão</target>
+<source>&Check for new version</source>
+<target>&Verificar se existe nova versão</target>
<source>Compare</source>
<target>Comparar</target>
@@ -717,6 +741,15 @@ O comando é disparado se:
<source>Swap sides</source>
<target>Inverter lados</target>
+<source>Close search bar</source>
+<target>Fechar barra de localização</target>
+
+<source>Find:</source>
+<target>Localizar:</target>
+
+<source>Match case</source>
+<target>Diferenciar maiúsculas e minúsculas</target>
+
<source>Save as batch job</source>
<target>Salvar como tarefa em lote</target>
@@ -738,74 +771,20 @@ O comando é disparado se:
<source>Total bytes to copy</source>
<target>Bytes totais a serem copiados</target>
-<source>Items found:</source>
-<target>Elementos encontrados:</target>
-
-<source>Speed:</source>
-<target>Velocidade:</target>
-
-<source>Time remaining:</source>
-<target>Tempo restante:</target>
-
-<source>Time elapsed:</source>
-<target>Tempo decorrido:</target>
-
-<source>Synchronizing...</source>
-<target>Sincronizando...</target>
-
-<source>Minimize to notification area</source>
-<target>Minimizar para a área de notificação</target>
-
-<source>On completion</source>
-<target>Ao finalizar</target>
-
-<source>Close</source>
-<target>Fechar</target>
-
-<source>&Pause</source>
-<target>&Pausar</target>
-
-<source>Variant</source>
-<target>Modo</target>
-
-<source>Statistics</source>
-<target>Estatísticas</target>
-
-<source>&Don't show this dialog again</source>
-<target>&Não mostrar este diálogo novamente</target>
+<source>Select a variant:</source>
+<target>Selecione uma variante:</target>
-<source>Select a variant</source>
-<target>Selecione uma variante</target>
+<source>Identify equal files by comparing modification time and size.</source>
+<target>Identifica arquivos iguais comparando modificações na data e no tamanho.</target>
-<source>
-Files are found equal if
- - last write time and date
- - file size
-are the same
-</source>
-<target>
-Os arquivos são considerados iguais se
- - data e hora de modificação e
- - tamanho do arquivo
-são os mesmos
-</target>
+<source>Identify equal files by comparing the file content.</source>
+<target>Identifica arquivos iguais comparando o conteúdo do arquivo.</target>
-<source>
-Files are found equal if
- - file content
-is the same
-</source>
-<target>
-Os arquivos são considerados iguais se
- - o conteúdo do arquivo
-é o mesmo
-</target>
-
-<source>Symbolic Link handling</source>
-<target>Tratamento de Links Simbólicos</target>
+<source>Symbolic links:</source>
+<target>Links simbólicos:</target>
-<source>Help</source>
-<target>Ajuda</target>
+<source>More information</source>
+<target>Mais informação</target>
<source>OK</source>
<target>OK</target>
@@ -813,10 +792,10 @@ Os arquivos são considerados iguais se
<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
<target>Identifica e propaga as mudanças em ambos os lados. Arquivos e pastas apagados e/ou movidos e conflitos são detectados automaticamente usando um banco de dados.</target>
-<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
-<target>Cópia espelho da pasta da esquerda. A pasta da direita será modificada para ficar exatamente igual à pasta da esquerda após a sincronização.</target>
+<source>Create a mirror backup of the left folder which exactly matches the right folder after synchronization.</source>
+<target>Cria uma cópia espelho da pasta da esquerda que é exatamente igual à pasta da esquerda após a sincronização.</target>
-<source>Copy new or updated files to right folder.</source>
+<source>Copy new and updated files to the right folder.</source>
<target>Copia arquivos novos ou atualizados para a pasta da direita.</target>
<source>Configure your own synchronization rules.</source>
@@ -828,23 +807,8 @@ Os arquivos são considerados iguais se
<source>Requires database files. Not supported by all file systems.</source>
<target>Requer um arquivo de banco de dados. Não é suportado por todos os sistemas de arquivos.</target>
-<source>Error handling</source>
-<target>Tratamento de erros</target>
-
-<source>Ignore</source>
-<target>Ignorar</target>
-
-<source>Hide all error and warning messages</source>
-<target>Oculta todas as mensagens de erros e avisos</target>
-
-<source>Pop-up</source>
-<target>Pop-up</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Mostra pop-up em caso de erros ou avisos</target>
-
-<source>Deletion handling</source>
-<target>Tratamento da exclusão</target>
+<source>Delete files:</source>
+<target>Apagar arquivos:</target>
<source>Permanent</source>
<target>Permanente</target>
@@ -867,111 +831,174 @@ Os arquivos são considerados iguais se
<source>Naming convention:</source>
<target>Convenção de nomenclatura:</target>
-<source>Batch job</source>
-<target>Tarefa em lote</target>
+<source>Show examples</source>
+<target>Mostrar exemplos</target>
+
+<source>Handle errors:</source>
+<target>Tratamento de erros:</target>
+
+<source>Ignore</source>
+<target>Ignorar</target>
+
+<source>Hide all error and warning messages</source>
+<target>Oculta todas as mensagens de erros e avisos</target>
+
+<source>Pop-up</source>
+<target>Pop-up</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Mostra pop-up em caso de erros ou avisos</target>
+
+<source>On completion:</source>
+<target>Ao finalizar:</target>
+
+<source>Start synchronization now?</source>
+<target>Iniciar sincronização agora?</target>
+
+<source>Variant:</source>
+<target>Variante:</target>
+
+<source>Statistics</source>
+<target>Estatísticas</target>
+
+<source>&Don't show this dialog again</source>
+<target>&Não mostrar este diálogo novamente</target>
+
+<source>Items found:</source>
+<target>Elementos encontrados:</target>
+
+<source>Speed:</source>
+<target>Velocidade:</target>
+
+<source>Time remaining:</source>
+<target>Tempo restante:</target>
+
+<source>Time elapsed:</source>
+<target>Tempo decorrido:</target>
+
+<source>Synchronizing...</source>
+<target>Sincronizando...</target>
+
+<source>Minimize to notification area</source>
+<target>Minimizar para a área de notificação</target>
+
+<source>Close</source>
+<target>Fechar</target>
+
+<source>&Pause</source>
+<target>&Pausar</target>
+
+<source>Stop</source>
+<target>Interromper</target>
<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
<target>Cria um arquivo de tarefa em lote para sincronização desatendida. Para iniciar, dê um clique duplo neste arquivo ou agende no agendador de tarefas: %x</target>
-<source>Exit</source>
-<target>Sair</target>
-
-<source>Abort synchronization on first error</source>
-<target>Cancela sincronização no primeiro erro</target>
+<source>Stop synchronization at first error</source>
+<target>Interromper sincronização ao primeiro erro</target>
<source>Show progress dialog</source>
<target>Mostrar indicador de progresso</target>
-<source>Save log</source>
-<target>Salvar log</target>
-
-<source>Select folder to save log files</source>
-<target>Seleciona pasta para salvar arquivos de log</target>
+<source>Save log:</source>
+<target>Salvar arquivo de log:</target>
-<source>Limit</source>
-<target>Limite</target>
+<source>Limit:</source>
+<target>Limite:</target>
<source>Limit maximum number of log files</source>
<target>Limita número máximo de arquivos de log</target>
+<source>How can I schedule a batch job?</source>
+<target>Como posso agendar uma tarefa em lote?</target>
+
+<source>&Recycle bin</source>
+<target>&Lixeira</target>
+
<source>Delete on both sides</source>
<target>Apagar em ambos os lados</target>
<source>Delete on both sides even if the file is selected on one side only</source>
<target>Apaga em ambos os lados mesmo se o arquivo está selecionado só em um lado</target>
-<source>
-Files will only be synchronized if they pass all filter rules.
-Note: File paths must be relative to base directories.
-</source>
-<target>
-Os arquivos só serão sincronizados se passarem por todas as regras do filtro.
-Nota: os caminhos dos arquivos devem ser relativos aos diretórios base.
-</target>
+<source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source>
+<target>Selecione regras de filtro para exlcuir certos arquivos da sincrinização. Entre com os caminhos relativos dos pares de pastas correspondentes.</target>
-<source>Include</source>
-<target>Incluir</target>
+<source>Include:</source>
+<target>Incluir:</target>
-<source>Exclude</source>
-<target>Excluir</target>
+<source>Exclude:</source>
+<target>Excluir:</target>
-<source>Time span</source>
-<target>Intervalo de tempo</target>
+<source>Time span:</source>
+<target>Intervalo de tempo:</target>
-<source>File size</source>
-<target>Tamanho do arquivo</target>
+<source>File size:</source>
+<target>Tamanho do arquivo:</target>
-<source>Minimum</source>
-<target>Mínimo</target>
+<source>Minimum:</source>
+<target>Mínimo:</target>
-<source>Maximum</source>
-<target>Máximo</target>
+<source>Maximum:</source>
+<target>Máximo:</target>
<source>&Clear</source>
<target>&Limpar</target>
-<source>Global settings</source>
-<target>Configurações</target>
+<source>The following settings are used for all synchronization jobs.</source>
+<target>As seguintes configurações são utilizadas para todas as tarefas de sincronização.</target>
<source>Fail-safe file copy</source>
<target>Cópia de arquivos a prova de falhas</target>
-<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
-<target>Copia primeiro para um arquivo temporário (*.ffs_tmp) e depois o renomeia. Isto garante um estado consistente mesmo em caso de erro fatal.</target>
+<source>
+Copy to a temporary file (*.ffs_tmp) before overwriting target.
+This guarantees a consistent state even in case of a serious error.
+</source>
+<target>
+Copia para um arquivo temporário (*.ffs_tmp) antes de substituir o destino.
+Isto garante um estado consistente mesmo em caso de erro grave.
+</target>
+
+<source>(recommended)</source>
+<target>(recomendado)</target>
<source>Copy locked files</source>
<target>Copiar arquivos bloqueados (em uso)</target>
-<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
-<target>Copia arquivos compartilhados ou bloqueados usando o Serviço de Cópia de Sombra de Volume (requer direitos de administrador.</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service.</source>
+<target>Copia arquivos compartilhados ou bloqueados usando o Serviço de Cópia de Sombra de Volume.</target>
+
+<source>(requires administrator rights)</source>
+<target>(requer direitos de administrador)</target>
<source>Copy file access permissions</source>
<target>Copiar permissões de acesso aos arquivos</target>
-<source>Transfer file and folder permissions (requires administrator rights)</source>
-<target>Transfere permissões de arquivos e pastas (requer direitos de administrador).</target>
+<source>Transfer file and folder permissions.</source>
+<target>Transfere permissões de arquivos e pastas.</target>
+
+<source>Automatic retry on error:</source>
+<target>Nova tentativa automática em caso de erro:</target>
-<source>Restore hidden dialogs</source>
-<target>Restaurar diálogos ocultados</target>
+<source>Retry count:</source>
+<target>Número de tentativas:</target>
-<source>External applications</source>
-<target>Aplicações externas</target>
+<source>Delay (in seconds):</source>
+<target>Atraso (em segundos):</target>
+
+<source>Customize context menu:</source>
+<target>Personalizar menu de contexto:</target>
<source>Description</source>
<target>Descrição</target>
+<source>Restore hidden windows</source>
+<target>Restaurar janelas ocultadas</target>
+
<source>&Default</source>
<target>&Config. Padrão</target>
-<source>Find what:</source>
-<target>Localizar o que:</target>
-
-<source>Match case</source>
-<target>Diferenciar maiúsculas e minúsculas</target>
-
-<source>&Find next</source>
-<target>&Localizar próxima</target>
-
<source>Source code written in C++ using:</source>
<target>Código-fonte escrito em C++ utilizando:</target>
@@ -996,44 +1023,38 @@ Nota: os caminhos dos arquivos devem ser relativos aos diretórios base.
<source>Many thanks for localization:</source>
<target>Pela tradução, um agradecimento a:</target>
-<source>Start synchronization</source>
-<target>Iniciar a sincronização</target>
+<source>Save as Batch Job</source>
+<target>Salvar como Tarefa em Lote</target>
-<source>Comparison settings</source>
-<target>Parâmetros de comparação</target>
+<source>Delete Items</source>
+<target>Apagar Itens</target>
-<source>Synchronization settings</source>
-<target>Parâmetros de sincronização</target>
+<source>Global Settings</source>
+<target>Configurações</target>
-<source>Delete</source>
-<target>Apagar</target>
+<source>Select Time Span</source>
+<target>Selecionar Intervalo de Tempo</target>
-<source>Configure filter</source>
-<target>Configurar filtros</target>
+<source>Folder Pairs</source>
+<target>Pares de Pastas</target>
<source>Find</source>
<target>Localizar</target>
-<source>Select time span</source>
-<target>Selecionar intervalo de tempo</target>
-
-<source>Folder pairs</source>
-<target>Pares de pastas</target>
-
<source>Overview</source>
<target>Parâmetros</target>
<source>Configuration</source>
<target>Configuração</target>
-<source>Main bar</source>
-<target>Barra principal</target>
+<source>Main Bar</source>
+<target>Barra Principal</target>
-<source>Filter files</source>
-<target>Filtrar arquivos</target>
+<source>Filter Files</source>
+<target>Filtrar Arquivos</target>
-<source>Select view</source>
-<target>Selecionar visualização</target>
+<source>Select View</source>
+<target>Selecionar Visualização</target>
<source>Open...</source>
<target>Abrir...</target>
@@ -1044,12 +1065,21 @@ Nota: os caminhos dos arquivos devem ser relativos aos diretórios base.
<source>Compare both sides</source>
<target>Comparar os dois lados</target>
+<source>Comparison settings</source>
+<target>Parâmetros de comparação</target>
+
+<source>Synchronization settings</source>
+<target>Parâmetros de sincronização</target>
+
+<source>Start synchronization</source>
+<target>Iniciar a sincronização</target>
+
<source>
-<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for one item?</pluralform>
<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
</source>
<target>
-<pluralform>Você realmente deseja executar o comando %y para 1 item?</pluralform>
+<pluralform>Você realmente deseja executar o comando %y para um item?</pluralform>
<pluralform>Você realmente deseja executar o comando %y para %x itens?</pluralform>
</target>
@@ -1089,12 +1119,6 @@ Nota: os caminhos dos arquivos devem ser relativos aos diretórios base.
<source>Set direction:</source>
<target>Configurar direção</target>
-<source>Exclude temporarily</source>
-<target>Excluir temporariamente</target>
-
-<source>Include temporarily</source>
-<target>Incluir temporariamente</target>
-
<source>multiple selection</source>
<target>seleção múltipla</target>
@@ -1104,6 +1128,15 @@ Nota: os caminhos dos arquivos devem ser relativos aos diretórios base.
<source>Exclude via filter:</source>
<target>Excluir via filtro:</target>
+<source>Exclude temporarily</source>
+<target>Excluir temporariamente</target>
+
+<source>Include temporarily</source>
+<target>Incluir temporariamente</target>
+
+<source>Delete</source>
+<target>Apagar</target>
+
<source>Include all</source>
<target>Incluir todos</target>
@@ -1152,6 +1185,9 @@ Nota: os caminhos dos arquivos devem ser relativos aos diretórios base.
<source>Never save &changes</source>
<target>Nunca salvar as &modificações</target>
+<source>Filter</source>
+<target>Filtro</target>
+
<source>Show files that exist on left side only</source>
<target>Mostrar arquivos que existem somente à esquerda</target>
@@ -1197,12 +1233,18 @@ Nota: os caminhos dos arquivos devem ser relativos aos diretórios base.
<source>Set as default</source>
<target>Definir como padrão</target>
-<source>Operation aborted</source>
-<target>Operação cancelada</target>
-
<source>All folders are in sync</source>
<target>Todas as pastas estão sincronizadas</target>
+<source>Synchronization Settings</source>
+<target>Configurações de Sincronização</target>
+
+<source>Comparison Settings</source>
+<target>Configurações de Comparação</target>
+
+<source>Cannot find %x</source>
+<target>Não foi possível localizar %x</target>
+
<source>Comma-separated values</source>
<target>Valores separados por vírgula</target>
@@ -1218,8 +1260,8 @@ Nota: os caminhos dos arquivos devem ser relativos aos diretórios base.
<source>&Ignore</source>
<target>&Ignorar</target>
-<source>Fatal Error</source>
-<target>Erro fatal</target>
+<source>Serious Error</source>
+<target>Erro Grave</target>
<source>&Don't show this warning again</source>
<target>&Não mostrar este aviso novamente</target>
@@ -1227,9 +1269,6 @@ Nota: os caminhos dos arquivos devem ser relativos aos diretórios base.
<source>&Switch</source>
<target>&Alterar</target>
-<source>Question</source>
-<target>Questão</target>
-
<source>&Yes</source>
<target>&Sim</target>
@@ -1251,8 +1290,8 @@ Nota: os caminhos dos arquivos devem ser relativos aos diretórios base.
<source>Initializing...</source>
<target>Inicializando...</target>
-<source>Aborted</source>
-<target>Cancelado</target>
+<source>Stopped</source>
+<target>Interrompido</target>
<source>Completed</source>
<target>Finalizado</target>
@@ -1263,12 +1302,6 @@ Nota: os caminhos dos arquivos devem ser relativos aos diretórios base.
<source>Log</source>
<target>Log</target>
-<source>Cannot find %x</source>
-<target>Não foi possível localizar %x</target>
-
-<source>Inactive</source>
-<target>Inativo</target>
-
<source>Today</source>
<target>Hoje</target>
@@ -1293,9 +1326,6 @@ Nota: os caminhos dos arquivos devem ser relativos aos diretórios base.
<source>MB</source>
<target>MB</target>
-<source>Filter</source>
-<target>Filtro</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>
@@ -1305,6 +1335,9 @@ Nota: os caminhos dos arquivos devem ser relativos aos diretórios base.
<pluralform>Você realmente deseja mover os seguintes %x itens para a Lixeira?</pluralform>
</target>
+<source>Move</source>
+<target>Mover</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>
@@ -1314,6 +1347,9 @@ Nota: os caminhos dos arquivos devem ser relativos aos diretórios base.
<pluralform>Você realmente deseja apagar os seguintes %x itens?</pluralform>
</target>
+<source>Exclude</source>
+<target>Excluir</target>
+
<source>Direct</source>
<target>Direto</target>
@@ -1338,8 +1374,8 @@ Nota: os caminhos dos arquivos devem ser relativos aos diretórios base.
<source>- Other side's counterpart to %item_folder%</source>
<target>- Contrapartida do outro lado para %item_folder%</target>
-<source>Make hidden warnings and dialogs visible again?</source>
-<target>Tornar avisar e diálogos ocultados visíveis outra vez?</target>
+<source>Restore all hidden windows and warnings?</source>
+<target>Restaurar todos as janelas e avisos ocultados?</target>
<source>Leave as unresolved conflict</source>
<target>Deixar como conflito não resolvido</target>
@@ -1464,14 +1500,14 @@ Nota: os caminhos dos arquivos devem ser relativos aos diretórios base.
<pluralform>%x dias</pluralform>
</target>
-<source>Failed to register to receive system messages.</source>
-<target>Falha ao registrar para receber mensagens do sistema.</target>
+<source>Unable to register to receive system messages.</source>
+<target>Não foi possível registrar para receber mensagens do sistema.</target>
<source>Cannot set privilege %x.</source>
<target>Não foi possível estabelecer o privilégio %x.</target>
-<source>Failed to suspend system sleep mode.</source>
-<target>Falha ao suspender o modo de espera do sistema.</target>
+<source>Unable to suspend system sleep mode.</source>
+<target>Não foi possível suspender o modo de espera do sistema.</target>
<source>Cannot change process I/O priorities.</source>
<target>Não foi possível mudar a prioridade de E/S do processo.</target>
diff --git a/BUILD/Languages/romanian.lng b/BUILD/Languages/romanian.lng
index dd30e917..b16b7db7 100644
--- a/BUILD/Languages/romanian.lng
+++ b/BUILD/Languages/romanian.lng
@@ -2,11 +2,31 @@
<language>Română</language>
<translator>Alexandru Bogdan Munteanu</translator>
<locale>ro_RO</locale>
- <flag_image>flag_romania.png</flag_image>
- <plural_form_count>3</plural_form_count>
+ <image>flag_romania.png</image>
+ <plural_count>3</plural_count>
<plural_definition>n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2</plural_definition>
</header>
+<source>
+<pluralform>Do you really want to execute the command %y for one item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+</target>
+
+<source>&Check</source>
+<target></target>
+
+<source>Retrying operation...</source>
+<target></target>
+
+<source>
+<pluralform>Automatic retry in 1 second...</pluralform>
+<pluralform>Automatic retry in %x seconds...</pluralform>
+</source>
+<target>
+</target>
+
<source>Both sides have changed since last synchronization.</source>
<target>Ambele părți s-au modificat de la ultima sincronizare.</target>
@@ -58,9 +78,6 @@
<source>Cannot open file %x.</source>
<target>Nu pot deschide fila %x.</target>
-<source>Error</source>
-<target>Eroare</target>
-
<source>File %x does not contain a valid configuration.</source>
<target>Fila %x nu conține o configurație validă.</target>
@@ -70,12 +87,12 @@
<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
<target>Fila de configurare nu trebuie să conțină setări la nivelul perechii de dosare, cînd dosarele sînt setate prin linia de comandă.</target>
-<source>Warning</source>
-<target>Atenție</target>
-
<source>Directories cannot be set for more than one configuration file.</source>
<target>Dosarele nu pot fi setate pentru mai mult de o singură filă de configurare.</target>
+<source>Command line</source>
+<target>Linie de comandă</target>
+
<source>Syntax:</source>
<target>Sintaxă:</target>
@@ -91,9 +108,6 @@
<source>Any number of alternative directories for at most one config file.</source>
<target>Orice număr de dosare alternative pentru cel mult o filă de configurare.</target>
-<source>Command line</source>
-<target>Linie de comandă</target>
-
<source>A folder input field is empty.</source>
<target>Un cîmp de introducere a dosarului este gol.</target>
@@ -295,8 +309,8 @@
<source>/sec</source>
<target>/sec</target>
-<source>%x items</source>
-<target>%x itemuri</target>
+<source>%x items/sec</source>
+<target>%x itemuri/sec</target>
<source>Configuration file %x loaded partially only.</source>
<target>Fila de configurație %x a fost deschisă doar parțial.</target>
@@ -325,11 +339,11 @@
<source>Volume name %x is not part of file path %y.</source>
<target>Numele volumului %x nu face parte din calea filei %y.</target>
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Abandonare solicitată: Se așteaptă terminarea operației în curs...</target>
+<source>Stop requested: Waiting for current operation to finish...</source>
+<target>Oprire solicitată: Aștept terminarea operației în curs...</target>
-<source>Failure to create timestamp for versioning:</source>
-<target>Crearea marcajului temporal pentru versionare a eșuat</target>
+<source>Unable to create timestamp for versioning:</source>
+<target>Nu pot crea marcajul de timp pentru versionare:</target>
<source>Cannot read the following XML elements:</source>
<target>Nu pot citi următoarele elemente XML:</target>
@@ -346,8 +360,8 @@
<source>&Program</source>
<target>&Program</target>
-<source>&Content</source>
-<target>&Conținut</target>
+<source>&View help</source>
+<target>&Cuprins</target>
<source>&About</source>
<target>&Despre</target>
@@ -370,8 +384,8 @@
<source>To get started just import a .ffs_batch file.</source>
<target>Pentru a începe, importă o filă de tipul .ffs_batch.</target>
-<source>Folders to watch</source>
-<target>Dosare de Monitorizat</target>
+<source>Folders to watch:</source>
+<target>Dosare de Monitorizat:</target>
<source>Add folder</source>
<target>Adaugă Dosar</target>
@@ -385,12 +399,15 @@
<source>Select a folder</source>
<target>Selectează un Dosar</target>
-<source>Idle time [seconds]</source>
-<target>Timp de inactivitate [secunde]</target>
+<source>Idle time (in seconds):</source>
+<target>Timp de inactivitate (în secunde):</target>
<source>Idle time between last detected change and execution of command</source>
<target>Timpul de inactivitate între ultima schimbare detectată și executarea comenzii</target>
+<source>Command line:</source>
+<target>Linie de comandă:</target>
+
<source>
The command is triggered if:
- files or subfolders change
@@ -402,8 +419,8 @@ Comanda este declanșată dacă:
- apar dosare noi (de ex. prin atașarea unui dispozitiv USB)
</target>
-<source>Start</source>
-<target>Pornește</target>
+<source>&Start</source>
+<target>&Pornește</target>
<source>&Retry</source>
<target>&Reîncearcă</target>
@@ -411,24 +428,27 @@ Comanda este declanșată dacă:
<source>Cancel</source>
<target>Anulează</target>
-<source>RealtimeSync - Automated Synchronization</source>
-<target>RealtimeSync - Sincronizare Inteligentă</target>
+<source>About</source>
+<target>Despre</target>
<source>Build: %x</source>
<target>Compilația: %x</target>
-<source>About</source>
-<target>Despre</target>
-
<source>All files</source>
<target>Toate Filele</target>
+<source>Automated Synchronization</source>
+<target>Sincronizare Automată</target>
+
<source>Directory monitoring active</source>
<target>Monitorizarea dosarelor este activă</target>
<source>Waiting until all directories are available...</source>
<target>Aștept pînă cînd toate dosarele vor fi disponibile...</target>
+<source>Error</source>
+<target>Eroare</target>
+
<source>&Restore</source>
<target>&Restaurează</target>
@@ -438,8 +458,8 @@ Comanda este declanșată dacă:
<source>&Exit</source>
<target>&Ieși</target>
-<source>Invalid command line:</source>
-<target>Linie de comandă nevalidă:</target>
+<source>Incorrect command line:</source>
+<target>Linie de comandă incorectă:</target>
<source>File content</source>
<target>Conținutul Filelor</target>
@@ -448,7 +468,7 @@ Comanda este declanșată dacă:
<target>Timpul și Mărimea Filelor</target>
<source>Two way</source>
-<target>Bidirecțională</target>
+<target>Ambele Sensuri</target>
<source>Mirror</source>
<target>Clonare</target>
@@ -457,7 +477,7 @@ Comanda este declanșată dacă:
<target>Actualizare</target>
<source>Custom</source>
-<target>Sincronizare Personalizată</target>
+<target>Personalizat</target>
<source>Multiple...</source>
<target>Multiplu...</target>
@@ -501,8 +521,8 @@ Comanda este declanșată dacă:
<source>Target folder input field must not be empty.</source>
<target>Cîmpul de introducere a dosarului țintă nu trebuie să fie gol.</target>
-<source>Folder input field for versioning must not be empty.</source>
-<target>Cîmpul de introducere a dosarului pentru versionare nu trebuie să fie gol.</target>
+<source>Please enter a target folder for versioning.</source>
+<target>Introdu dosarul țintă pentru versionare.</target>
<source>Source folder %x not found.</source>
<target>Dosarul sursă %x nu a fost găsit.</target>
@@ -540,8 +560,8 @@ Comanda este declanșată dacă:
<source>job name</source>
<target>numele sarcinii</target>
-<source>Synchronization aborted</source>
-<target>Sincronizare abandonată</target>
+<source>Synchronization stopped</source>
+<target>Sincronizare oprită</target>
<source>Synchronization completed with errors</source>
<target>Sincronizare terminată cu erori</target>
@@ -558,14 +578,29 @@ Comanda este declanșată dacă:
<source>Saving log file %x...</source>
<target>Salvez fila jurnal %x...</target>
-<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
-<target>Apasă "Comută" pentru a rezolva problemele din dialogul principal FreeFileSync.</target>
+<source>You can switch to FreeFileSync's main window to resolve this issue.</source>
+<target>Poți comuta la fereastra principală FreeFileSync pentru a rezolva această problemă.</target>
-<source>Switching to FreeFileSync main dialog</source>
-<target>Comut la dialogul principal FreeFileSync</target>
+<source>&Don't show this warning again</source>
+<target>&Nu arăta din nou această atenționare</target>
-<source>Retrying operation after error:</source>
-<target>Reîncerc operația după eroare:</target>
+<source>&Ignore</source>
+<target>&OK</target>
+
+<source>&Switch</source>
+<target>&Comută</target>
+
+<source>Switching to FreeFileSync's main window</source>
+<target>Comut la fereastra principală FreeFileSync</target>
+
+<source>Serious Error</source>
+<target>Eroare Serioasă</target>
+
+<source>&Ignore subsequent errors</source>
+<target>&Ignoră erorile ulterioare</target>
+
+<source>Check for Program Updates</source>
+<target>Caută Actualizări ale Programului</target>
<source>A new version of FreeFileSync is available:</source>
<target>Este disponibilă o versiune nouă a softului:</target>
@@ -573,18 +608,12 @@ Comanda este declanșată dacă:
<source>Download now?</source>
<target>Vrei s-o descarci acum ?</target>
-<source>New version found</source>
-<target>A fost găsită o versiune nouă</target>
-
<source>&Download</source>
<target>&Descarcă</target>
<source>FreeFileSync is up to date.</source>
<target>Ai deja ultima versiune a softului.</target>
-<source>Information</source>
-<target>Informații</target>
-
<source>Unable to connect to sourceforge.net.</source>
<target>Conectarea la situl sourceforge.net nu poate fi realizată.</target>
@@ -642,20 +671,20 @@ Comanda este declanșată dacă:
<source>Hibernate</source>
<target>Pune Calculatorul în Hibernare</target>
-<source>Selected variant:</source>
-<target>Varianta selectată:</target>
+<source>Alternate comparison settings</source>
+<target>Setări alternative de comparare</target>
-<source>Select alternate comparison settings</source>
-<target>Selectează setările alternative de comparare</target>
+<source>Alternate synchronization settings</source>
+<target>Setări alternative de sincronizare</target>
-<source>Select alternate synchronization settings</source>
-<target>Selectează o altă configurație a sincronizării</target>
+<source>Local filter</source>
+<target>Filtru local</target>
-<source>Filter is active</source>
-<target>Filtrul de elemente este activ</target>
+<source>Active</source>
+<target>Activ</target>
-<source>No filter selected</source>
-<target>Nu a fost selectat nici un filtru</target>
+<source>None</source>
+<target>Nimic</target>
<source>Remove alternate settings</source>
<target>Înlătură setările alternative</target>
@@ -669,6 +698,15 @@ Comanda este declanșată dacă:
<source>Paste</source>
<target>Lipește</target>
+<source>Alternate Comparison Settings</source>
+<target>Setări Alternative de Comparare</target>
+
+<source>Alternate Synchronization Settings</source>
+<target>Setări Alternative de Sincronizare</target>
+
+<source>Local Filter</source>
+<target>Filtru Local</target>
+
<source>&New</source>
<target>Configurație &Nouă</target>
@@ -684,15 +722,18 @@ Comanda este declanșată dacă:
<source>2. &Synchronize</source>
<target>2. &Sincronizează</target>
+<source>&Global settings</source>
+<target>&Setări Globale</target>
+
<source>&Language</source>
<target>&Limbă</target>
+<source>&Find...</source>
+<target>&Găsește...</target>
+
<source>&Export file list...</source>
<target>&Exportă Lista de File...</target>
-<source>&Global settings</source>
-<target>&Setări Globale</target>
-
<source>&Tools</source>
<target>&Unelte</target>
@@ -702,7 +743,7 @@ Comanda este declanșată dacă:
<source>Check &automatically once a week</source>
<target>Caută &Automat în Fiecare Săptămînă</target>
-<source>Check for new &version</source>
+<source>&Check for new version</source>
<target>Caută &Versiune Nouă</target>
<source>Compare</source>
@@ -720,6 +761,15 @@ Comanda este declanșată dacă:
<source>Swap sides</source>
<target>Schimbă compartimentele stîng și drept între ele</target>
+<source>Close search bar</source>
+<target>Închide bara de căutare</target>
+
+<source>Find:</source>
+<target>Găsește:</target>
+
+<source>Match case</source>
+<target>Potrivește cu caseta literelor (MAJ/min)</target>
+
<source>Save as batch job</source>
<target>Salvează ca Sarcină Set</target>
@@ -741,74 +791,20 @@ Comanda este declanșată dacă:
<source>Total bytes to copy</source>
<target>Numărul total de baiți copiați</target>
-<source>Items found:</source>
-<target>Elemente Găsite:</target>
+<source>Select a variant:</source>
+<target>Selectează o variantă:</target>
-<source>Speed:</source>
-<target>Viteză:</target>
+<source>Identify equal files by comparing modification time and size.</source>
+<target>Filele identice sînt descoperite prin compararea timpului modificării și a mărimii.</target>
-<source>Time remaining:</source>
-<target>Timp Rămas:</target>
+<source>Identify equal files by comparing the file content.</source>
+<target>Filele identice sînt descoperite prin compararea conținutului filelor.</target>
-<source>Time elapsed:</source>
-<target>Timp Scurs:</target>
+<source>Symbolic links:</source>
+<target>Legături Simbolice:</target>
-<source>Synchronizing...</source>
-<target>Sincronizare Aflată în Curs...</target>
-
-<source>Minimize to notification area</source>
-<target>Minimizează în aria de notificare (sertar)</target>
-
-<source>On completion</source>
-<target>La Terminare</target>
-
-<source>Close</source>
-<target>Închide</target>
-
-<source>&Pause</source>
-<target>&Pauzează</target>
-
-<source>Variant</source>
-<target>Varianta Sincronizării</target>
-
-<source>Statistics</source>
-<target>Statistici</target>
-
-<source>&Don't show this dialog again</source>
-<target>Nu arăta acest &dialog din nou</target>
-
-<source>Select a variant</source>
-<target>Selectează o variantă</target>
-
-<source>
-Files are found equal if
- - last write time and date
- - file size
-are the same
-</source>
-<target>
-Filele sînt considerate identice dacă
- - data și ora ultimei scrieri
- - mărimea filelor
-sînt aceleași
-</target>
-
-<source>
-Files are found equal if
- - file content
-is the same
-</source>
-<target>
-Filele sînt considerate identice dacă
- - conținutul filelor
-este același
-</target>
-
-<source>Symbolic Link handling</source>
-<target>Gestionarea Legăturilor Simbolice</target>
-
-<source>Help</source>
-<target>Ajutor</target>
+<source>More information</source>
+<target>Mai multe informații</target>
<source>OK</source>
<target>OK</target>
@@ -816,11 +812,11 @@ este același
<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
<target>Identificare și propagare a modificărilor din ambele părți. Ștergerile, renumirile și conflictele sînt detectate automat, folosind o bază de date.</target>
-<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
-<target>Conservare [backup] în oglindă a dosarului stîng. Dosarul drept e modificat pentru a fi identic după sincronizare cu cel stîng.</target>
+<source>Create a mirror backup of the left folder which exactly matches the right folder after synchronization.</source>
+<target>Creează o conservare [backup] în oglindă a dosarului stîng care se potrivește exact cu dosarul drept după sincronizare.</target>
-<source>Copy new or updated files to right folder.</source>
-<target>Copiere în dosarul din dreapta a filelor actualizate sau noi.</target>
+<source>Copy new and updated files to the right folder.</source>
+<target>Copiază filele noi și cele actualizate în dosarul drept.</target>
<source>Configure your own synchronization rules.</source>
<target>Reguli de sincronizare definite de utilizator pentru fiecare situație.</target>
@@ -831,23 +827,8 @@ este același
<source>Requires database files. Not supported by all file systems.</source>
<target>Necesită file cu baze de date. Nu e suportat de toate sistemele de file.</target>
-<source>Error handling</source>
-<target>Gestionarea Erorilor</target>
-
-<source>Ignore</source>
-<target>Ignorare</target>
-
-<source>Hide all error and warning messages</source>
-<target>Mesajele de eroare și de avertizare nu sînt arătate</target>
-
-<source>Pop-up</source>
-<target>Popîc</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>În caz de erori sau avertizări este arătată o fereastră popîc [popup]</target>
-
-<source>Deletion handling</source>
-<target>Gestionarea Ștergerii</target>
+<source>Delete files:</source>
+<target>Ștergerea Filelor:</target>
<source>Permanent</source>
<target>Definitivă</target>
@@ -855,8 +836,8 @@ este același
<source>Delete or overwrite files permanently</source>
<target>Filele sînt șterse sau suprascrise în mod definitiv, fără a mai putea fi recuperate</target>
-<source>Recycle bin</source>
-<target>Reciclator</target>
+<source>&Recycle bin</source>
+<target>&Reciclator</target>
<source>Back up deleted and overwritten files in the recycle bin</source>
<target>Conservă [back up] în Reciclator filele șterse sau suprascrise</target>
@@ -870,56 +851,86 @@ este același
<source>Naming convention:</source>
<target>Convenție de numire:</target>
-<source>Batch job</source>
-<target>Sarcină Set</target>
+<source>Show examples</source>
+<target>Arată exemple</target>
-<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
-<target>Creează o filă set [batch file] pentru sincronizarea neasistată. Pentru efectuarea sincronizării, dublu-clichează această filă sau programează rularea ei folosind un Planificator de Sarcini [Task Scheduler]: %x</target>
+<source>Handle errors:</source>
+<target>Gestionarea Erorilor:</target>
-<source>Exit</source>
-<target>Ieșire</target>
+<source>Ignore</source>
+<target>Ignorare</target>
-<source>Abort synchronization on first error</source>
-<target>Sincronizarea e abandonată la prima eroare</target>
+<source>Hide all error and warning messages</source>
+<target>Mesajele de eroare și de avertizare nu sînt arătate</target>
-<source>Show progress dialog</source>
-<target>Arată progresul sincronizării</target>
+<source>Pop-up</source>
+<target>Popîc</target>
-<source>Save log</source>
-<target>Salvează jurnalul acțiunilor</target>
+<source>Show pop-up on errors or warnings</source>
+<target>În caz de erori sau avertizări este arătată o fereastră popîc [popup]</target>
-<source>Select folder to save log files</source>
-<target>Selectează dosarul cu filele jurnal</target>
+<source>On completion:</source>
+<target>La terminare:</target>
-<source>Limit</source>
-<target>Limită</target>
+<source>Start synchronization now?</source>
+<target>Pornesc sincronizarea acum?</target>
-<source>Limit maximum number of log files</source>
-<target>Limitează numărul maxim de file jurnal</target>
+<source>Variant:</source>
+<target>Variantă:</target>
-<source>Source code written in C++ using:</source>
-<target>Cod sursă scris în C++ folosind:</target>
+<source>Statistics</source>
+<target>Statistici</target>
-<source>If you like FreeFileSync</source>
-<target>Donează pentru FreeFileSync</target>
+<source>&Don't show this dialog again</source>
+<target>Nu arăta acest &dialog din nou</target>
-<source>Donate with PayPal</source>
-<target>Donează prin PayPal</target>
+<source>Items found:</source>
+<target>Elemente Găsite:</target>
-<source>Feedback and suggestions are welcome</source>
-<target>Opiniile și sugestiile despre program sînt binevenite.</target>
+<source>Speed:</source>
+<target>Viteză:</target>
-<source>Homepage</source>
-<target>Situl Softului</target>
+<source>Time remaining:</source>
+<target>Timp Rămas:</target>
-<source>Email</source>
-<target>Adresa Autorului</target>
+<source>Time elapsed:</source>
+<target>Timp Scurs:</target>
-<source>Published under the GNU General Public License</source>
-<target>Publicat sub licența GNU GPL</target>
+<source>Synchronizing...</source>
+<target>Sincronizare Aflată în Curs...</target>
-<source>Many thanks for localization:</source>
-<target>Multe mulțumiri pentru localizare:</target>
+<source>Minimize to notification area</source>
+<target>Minimizează în aria de notificare (sertar)</target>
+
+<source>Close</source>
+<target>Închide</target>
+
+<source>&Pause</source>
+<target>&Pauzează</target>
+
+<source>Stop</source>
+<target>Oprește</target>
+
+<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>Creează o filă set [batch file] pentru sincronizarea neasistată. Pentru efectuarea sincronizării, dublu-clichează această filă sau programează rularea ei folosind un Planificator de Sarcini [Task Scheduler]: %x</target>
+
+<source>Stop synchronization at first error</source>
+<target>Oprește sincronizarea la prima eroare întîlnită</target>
+
+<source>Show progress dialog</source>
+<target>Arată progresul sincronizării</target>
+
+<source>Save log:</source>
+<target>Salvează jurnalul:</target>
+
+<source>Limit:</source>
+<target>Limitare:</target>
+
+<source>Limit maximum number of log files</source>
+<target>Limitează numărul maxim de file jurnal</target>
+
+<source>How can I schedule a batch job?</source>
+<target>Cum pot planifica o sarcină set?</target>
<source>Delete on both sides</source>
<target>Șterge din ambele părți</target>
@@ -927,115 +938,139 @@ este același
<source>Delete on both sides even if the file is selected on one side only</source>
<target>Șterge din ambele părți, chiar dacă fila e selecționată într-o singură parte</target>
-<source>
-Files will only be synchronized if they pass all filter rules.
-Note: File paths must be relative to base directories.
-</source>
-<target>
-Filele vor fi sincronizate doar dacă îndeplinesc toate regulile filtrului.
-Notă: Căile filelor trebuie să fie relative la dosarele bază (rădăcină).
-</target>
+<source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source>
+<target>Selectează regulile filtrului pentru a exclude anumite file de la sincronizare. Introdu căile filelor relative la perechea lor de dosare corespondentă.</target>
-<source>Include</source>
-<target>Incluse</target>
+<source>Include:</source>
+<target>Incluse:</target>
-<source>Exclude</source>
-<target>Excluse</target>
+<source>Exclude:</source>
+<target>Excluse:</target>
-<source>Time span</source>
-<target>Intervalul de Timp</target>
+<source>Time span:</source>
+<target>Intervalul de Timp:</target>
-<source>File size</source>
-<target>Mărimea Filei</target>
+<source>File size:</source>
+<target>Mărimea Filei:</target>
-<source>Minimum</source>
-<target>Minim</target>
+<source>Minimum:</source>
+<target>Minim:</target>
-<source>Maximum</source>
-<target>Maxim</target>
+<source>Maximum:</source>
+<target>Maxim:</target>
<source>&Clear</source>
<target>&Curăță</target>
-<source>Global settings</source>
-<target>Setări Globale</target>
+<source>The following settings are used for all synchronization jobs.</source>
+<target>Setările următoare sînt folosite pentru toate sarcinile de sincronizare.</target>
<source>Fail-safe file copy</source>
<target>Copiază filele în modul protejat la eșec [fail-safe]</target>
-<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
-<target>Copierea se face mai întîi într-o filă temporară (*.ffs_tmp), care e apoi renumită. Se garantează astfel consecvența stării filelor chiar și în cazul apariției de erori fatale.</target>
+<source>
+Copy to a temporary file (*.ffs_tmp) before overwriting target.
+This guarantees a consistent state even in case of a serious error.
+</source>
+<target>
+Copiază într-o filă temporară (*.ffs_tmp) înainte de suprascrierea filei țintă.
+Aceasta garantează consecvența stării filelor chiar și în cazul apariției de erori serioase.
+</target>
+
+<source>(recommended)</source>
+<target>(recomandat)</target>
<source>Copy locked files</source>
<target>Copiază filele partajate [shared] sau zăvorîte [locked]</target>
-<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
-<target>Filele partajate sau zăvorîte sînt copiate folosind Serviciul de Conservare a Volumelor din Windows [Volume Shadow Copy] (necesită drepturi de Administrator)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service.</source>
+<target>Filele partajate sau zăvorîte sînt copiate folosind Serviciul de Conservare a Volumelor din Windows [Volume Shadow Copy].</target>
+
+<source>(requires administrator rights)</source>
+<target>(necesită drepturi de Administrator)</target>
<source>Copy file access permissions</source>
<target>Copiază permisiunile de acces ale filelor</target>
-<source>Transfer file and folder permissions (requires administrator rights)</source>
-<target>Permisiunile filelor și dosarelor sînt și ele transferate (necesită drepturi de Administrator)</target>
+<source>Transfer file and folder permissions.</source>
+<target>Permisiunile filelor și dosarelor sînt și ele transferate.</target>
+
+<source>Automatic retry on error:</source>
+<target>Reîncearcă automat în caz de eroare:</target>
-<source>Restore hidden dialogs</source>
-<target>Restaurează Dialogurile Ascunse</target>
+<source>Retry count:</source>
+<target>Numărul reîncercărilor:</target>
-<source>External applications</source>
-<target>Aplicații Externe</target>
+<source>Delay (in seconds):</source>
+<target>Întîrziere (în secunde):</target>
+
+<source>Customize context menu:</source>
+<target>Personalizează meniul contextual:</target>
<source>Description</source>
<target>Descriere</target>
+<source>Restore hidden windows</source>
+<target>Restaurează ferestrele ascunse</target>
+
<source>&Default</source>
<target>Coloanele &Implicite</target>
-<source>Find what:</source>
-<target>Găsește Asta:</target>
+<source>Source code written in C++ using:</source>
+<target>Cod sursă scris în C++ folosind:</target>
-<source>Match case</source>
-<target>Potrivește MAJ/min</target>
+<source>If you like FreeFileSync</source>
+<target>Donează pentru FreeFileSync</target>
-<source>&Find next</source>
-<target>&Găsește Următorul</target>
+<source>Donate with PayPal</source>
+<target>Donează prin PayPal</target>
-<source>Start synchronization</source>
-<target>Pornește Sincronizarea</target>
+<source>Feedback and suggestions are welcome</source>
+<target>Opiniile și sugestiile despre program sînt binevenite.</target>
-<source>Comparison settings</source>
-<target>Setările Comparării</target>
+<source>Homepage</source>
+<target>Situl Softului</target>
-<source>Synchronization settings</source>
-<target>Setările Sincronizării</target>
+<source>Email</source>
+<target>Adresa Autorului</target>
-<source>Delete</source>
-<target>Șterge</target>
+<source>Published under the GNU General Public License</source>
+<target>Publicat sub licența GNU GPL</target>
-<source>Configure filter</source>
-<target>Configurează Filtrul</target>
+<source>Many thanks for localization:</source>
+<target>Multe mulțumiri pentru localizare:</target>
-<source>Find</source>
-<target>Găsește</target>
+<source>Save as Batch Job</source>
+<target>Salvează ca Sarcină Set</target>
+
+<source>Delete Items</source>
+<target>Șterge Elementele</target>
+
+<source>Global Settings</source>
+<target>Setări Globale</target>
-<source>Select time span</source>
-<target>Selectează intervalul de timp</target>
+<source>Select Time Span</source>
+<target>Selectează Intervalul de Timp</target>
-<source>Folder pairs</source>
+<source>Folder Pairs</source>
<target>Perechi de Dosare</target>
+<source>Find</source>
+<target>Găsește</target>
+
<source>Overview</source>
<target>Panoramă</target>
<source>Configuration</source>
<target>Configurație</target>
-<source>Main bar</source>
+<source>Main Bar</source>
<target>Bara Principală</target>
-<source>Filter files</source>
-<target>Filtru</target>
+<source>Filter Files</source>
+<target>Filtrează Filele</target>
-<source>Select view</source>
+<source>Select View</source>
<target>Selectează Vederea</target>
<source>Open...</source>
@@ -1047,15 +1082,14 @@ Notă: Căile filelor trebuie să fie relative la dosarele bază (rădăcină).
<source>Compare both sides</source>
<target>Compară Părțile Stîngă și Dreaptă</target>
-<source>
-<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
-<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
-</source>
-<target>
-<pluralform>Sigur vrei să execuți comanda %y pentru 1 element?</pluralform>
-<pluralform>Sigur vrei să execuți comanda %y pentru %x elemente?</pluralform>
-<pluralform>Sigur vrei să execuți comanda %y pentru %x de elemente?</pluralform>
-</target>
+<source>Comparison settings</source>
+<target>Setările Comparării</target>
+
+<source>Synchronization settings</source>
+<target>Setările Sincronizării</target>
+
+<source>Start synchronization</source>
+<target>Pornește Sincronizarea</target>
<source>Confirm</source>
<target>Confirmă</target>
@@ -1096,12 +1130,6 @@ Notă: Căile filelor trebuie să fie relative la dosarele bază (rădăcină).
<source>Set direction:</source>
<target>Setează Acțiunea ca în Icoana Alăturată:</target>
-<source>Exclude temporarily</source>
-<target>Exclude Temporar</target>
-
-<source>Include temporarily</source>
-<target>Include Temporar</target>
-
<source>multiple selection</source>
<target>selectare multiplă</target>
@@ -1111,6 +1139,15 @@ Notă: Căile filelor trebuie să fie relative la dosarele bază (rădăcină).
<source>Exclude via filter:</source>
<target>Exclude prin Filtrul:</target>
+<source>Exclude temporarily</source>
+<target>Exclude Temporar</target>
+
+<source>Include temporarily</source>
+<target>Include Temporar</target>
+
+<source>Delete</source>
+<target>Șterge</target>
+
<source>Include all</source>
<target>Include Tot</target>
@@ -1153,11 +1190,14 @@ Notă: Căile filelor trebuie să fie relative la dosarele bază (rădăcină).
<source>Do you want to save changes to %x?</source>
<target>Vrei să salvezi modificările făcute la %x?</target>
+<source>Never save &changes</source>
+<target>Nu salva ni&ciodată modificările</target>
+
<source>Do&n't save</source>
<target>&Nu salva</target>
-<source>Never save &changes</source>
-<target>Nu salva ni&ciodată modificările</target>
+<source>Filter</source>
+<target>Filtru</target>
<source>Show files that exist on left side only</source>
<target>Arată filele care există doar în stînga</target>
@@ -1204,12 +1244,18 @@ Notă: Căile filelor trebuie să fie relative la dosarele bază (rădăcină).
<source>Set as default</source>
<target>Setează ca implicit</target>
-<source>Operation aborted</source>
-<target>Operație abandonată</target>
-
<source>All folders are in sync</source>
<target>Toate dosarele sînt sincronizate</target>
+<source>Synchronization Settings</source>
+<target>Setările Sincronizării</target>
+
+<source>Comparison Settings</source>
+<target>Setările Comparării</target>
+
+<source>Cannot find %x</source>
+<target>Nu pot găsi %x</target>
+
<source>Comma-separated values</source>
<target>Valori separate prin virgulă</target>
@@ -1219,30 +1265,6 @@ Notă: Căile filelor trebuie să fie relative la dosarele bază (rădăcină).
<source>Searching for program updates...</source>
<target>Caut actualizări ale programului...</target>
-<source>&Ignore subsequent errors</source>
-<target>&Ignoră erorile ulterioare</target>
-
-<source>&Ignore</source>
-<target>&OK</target>
-
-<source>Fatal Error</source>
-<target>Eroare Fatală</target>
-
-<source>&Don't show this warning again</source>
-<target>&Nu arăta din nou această atenționare</target>
-
-<source>&Switch</source>
-<target>&Comută</target>
-
-<source>Question</source>
-<target>Întrebare</target>
-
-<source>&Yes</source>
-<target>&Da</target>
-
-<source>&No</source>
-<target>&Nu</target>
-
<source>Scanning...</source>
<target>Scanez...</target>
@@ -1252,14 +1274,17 @@ Notă: Căile filelor trebuie să fie relative la dosarele bază (rădăcină).
<source>Info</source>
<target>Informații</target>
+<source>Warning</source>
+<target>Atenție</target>
+
<source>Paused</source>
<target>Sincronizare Pauzată</target>
<source>Initializing...</source>
<target>Inițializez...</target>
-<source>Aborted</source>
-<target>Sincronizare Abandonată</target>
+<source>Stopped</source>
+<target>Oprită</target>
<source>Completed</source>
<target>Sincronizare Terminată</target>
@@ -1270,12 +1295,6 @@ Notă: Căile filelor trebuie să fie relative la dosarele bază (rădăcină).
<source>Log</source>
<target>Jurnal</target>
-<source>Cannot find %x</source>
-<target>Nu pot găsi %x</target>
-
-<source>Inactive</source>
-<target>Dezactivat</target>
-
<source>Today</source>
<target>Azi</target>
@@ -1300,9 +1319,6 @@ Notă: Căile filelor trebuie să fie relative la dosarele bază (rădăcină).
<source>MB</source>
<target>MB</target>
-<source>Filter</source>
-<target>Filtru</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>
@@ -1313,6 +1329,9 @@ Notă: Căile filelor trebuie să fie relative la dosarele bază (rădăcină).
<pluralform>Sigur vrei să muți în Reciclator următoarele %x de elemente?</pluralform>
</target>
+<source>Move</source>
+<target>Mută</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>
@@ -1323,6 +1342,9 @@ Notă: Căile filelor trebuie să fie relative la dosarele bază (rădăcină).
<pluralform>Sigur vrei să ștergi definitiv următoarele %x de elemente?</pluralform>
</target>
+<source>Exclude</source>
+<target>Exclude</target>
+
<source>Direct</source>
<target>Direcționează</target>
@@ -1347,8 +1369,8 @@ Notă: Căile filelor trebuie să fie relative la dosarele bază (rădăcină).
<source>- Other side's counterpart to %item_folder%</source>
<target>- corespondentul din partea opusă al lui %item_folder%</target>
-<source>Make hidden warnings and dialogs visible again?</source>
-<target>Vrei ca dialogurile ascunse și mesajele de avertizare să fie vizibile din nou?</target>
+<source>Restore all hidden windows and warnings?</source>
+<target>Restaurezi toate ferestrele și avertismentele ascunse?</target>
<source>Leave as unresolved conflict</source>
<target>Lasă ca conflict nerezolvat</target>
@@ -1476,14 +1498,14 @@ Notă: Căile filelor trebuie să fie relative la dosarele bază (rădăcină).
<pluralform>%x de zile</pluralform>
</target>
-<source>Failed to register to receive system messages.</source>
-<target>Eșec al înregistrării pentru primirea mesajelor de sistem.</target>
+<source>Unable to register to receive system messages.</source>
+<target>Nu pot înregistra softul pentru a primi mesaje de la sistemul de operare.</target>
<source>Cannot set privilege %x.</source>
<target>Nu pot seta privilegiul %x.</target>
-<source>Failed to suspend system sleep mode.</source>
-<target>Nu pot suspenda intrarea sistemului în adormire (repaus).</target>
+<source>Unable to suspend system sleep mode.</source>
+<target>Nu pot suspenda modul de intrare în repaus [sleep] al sistemului.</target>
<source>Cannot change process I/O priorities.</source>
<target>Nu pot schimba prioritățile I/O ale procesului.</target>
diff --git a/BUILD/Languages/russian.lng b/BUILD/Languages/russian.lng
index 8ef22f8c..5735f4f3 100644
--- a/BUILD/Languages/russian.lng
+++ b/BUILD/Languages/russian.lng
@@ -2,183 +2,31 @@
<language>Pусский</language>
<translator>Fayzullin T.N. aka Svobodniy</translator>
<locale>ru_RU</locale>
- <flag_image>flag_russia.png</flag_image>
- <plural_form_count>3</plural_form_count>
+ <image>flag_russia.png</image>
+ <plural_count>3</plural_count>
<plural_definition>n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<11 || n%100>14) ? 1 : 2</plural_definition>
</header>
-<source>Unable to move %x to the recycle bin.</source>
-<target></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>
-</target>
-
-<source>Log</source>
-<target></target>
-
-<source>&Continue</source>
-<target></target>
-
-<source>&Don't show this warning again</source>
-<target></target>
-
-<source>&Ignore subsequent errors</source>
-<target></target>
-
-<source>Comma-separated values</source>
-<target></target>
-
-<source>Never save &changes</source>
-<target></target>
-
-<source>Include via filter:</source>
-<target></target>
-
-<source>&Execute</source>
-<target></target>
-
-<source>Confirm</source>
-<target></target>
-
-<source>
-<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for one item?</pluralform>
<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
</source>
<target>
</target>
-<source>Transfer file and folder permissions (requires administrator rights)</source>
-<target></target>
-
-<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
+<source>&Check</source>
<target></target>
-<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
+<source>Retrying operation...</source>
<target></target>
<source>
-Files will only be synchronized if they pass all filter rules.
-Note: File paths must be relative to base directories.
-</source>
-<target></target>
-
-<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
-<target></target>
-
-<source>Move files to a user-defined folder</source>
-<target></target>
-
-<source>Back up deleted and overwritten files in the recycle bin</source>
-<target></target>
-
-<source>Recycle bin</source>
-<target></target>
-
-<source>Requires database files. Not supported by all file systems.</source>
-<target></target>
-
-<source>Detect moved files</source>
-<target></target>
-
-<source>&Don't show this dialog again</source>
-<target></target>
-
-<source>Minimize to notification area</source>
-<target></target>
-
-<source>Retrying operation after error:</source>
-<target></target>
-
-<source>job name</source>
-<target></target>
-
-<source>Creating a Volume Shadow Copy for %x...</source>
-<target></target>
-
-<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
-<target></target>
-
-<source>&Show error</source>
-<target></target>
-
-<source>Waiting until all directories are available...</source>
-<target></target>
-
-<source>Directory monitoring active</source>
-<target></target>
-
-<source>Volume name %x is not part of file path %y.</source>
-<target></target>
-
-<source>Cannot access the Volume Shadow Copy Service.</source>
-<target></target>
-
-<source>%x items</source>
-<target></target>
-
-<source>
-<pluralform>1 thread</pluralform>
-<pluralform>%x threads</pluralform>
+<pluralform>Automatic retry in 1 second...</pluralform>
+<pluralform>Automatic retry in %x seconds...</pluralform>
</source>
<target>
</target>
-<source>
-<pluralform>1 byte</pluralform>
-<pluralform>%x bytes</pluralform>
-</source>
-<target>
-</target>
-
-<source>Any number of alternative directories for at most one config file.</source>
-<target></target>
-
-<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
-<target></target>
-
-<source>directory</source>
-<target></target>
-
-<source>config files</source>
-<target></target>
-
-<source>Syntax:</source>
-<target></target>
-
-<source>Directories cannot be set for more than one configuration file.</source>
-<target></target>
-
-<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
-<target></target>
-
-<source>Unequal number of left and right directories specified.</source>
-<target></target>
-
-<source>Cannot open file %x.</source>
-<target></target>
-
-<source>Syntax error</source>
-<target></target>
-
-<source>A directory path is expected after %x.</source>
-<target></target>
-
-<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source>
-<target></target>
-
-<source>Moving symbolic link %x to the recycle bin</source>
-<target></target>
-
-<source>Moving folder %x to the recycle bin</source>
-<target></target>
-
-<source>Moving file %x to the recycle bin</source>
-<target></target>
-
<source>Both sides have changed since last synchronization.</source>
<target>Со времени последней синхронизации с обеих сторон произошли изменения.</target>
@@ -200,6 +48,15 @@ Note: File paths must be relative to base directories.
<source>Checking recycle bin availability for folder %x...</source>
<target>Проверка доступности "Корзины" для папки %x...</target>
+<source>Moving file %x to the recycle bin</source>
+<target>Перемещение файла %x в "Корзину"</target>
+
+<source>Moving folder %x to the recycle bin</source>
+<target>Перемещение папки %x в "Корзину"</target>
+
+<source>Moving symbolic link %x to the recycle bin</source>
+<target>Перемещение символьной ссылки %x в "Корзину"</target>
+
<source>Deleting file %x</source>
<target>Удаление файла %x</target>
@@ -209,21 +66,51 @@ Note: File paths must be relative to base directories.
<source>Deleting symbolic link %x</source>
<target>Удаление символьной ссылки %x</target>
+<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<target>Для этого пути "Корзина" недоступна! Файлы будут удалены безвозвратно:</target>
+
<source>An exception occurred</source>
<target>Исключение произошло</target>
-<source>Error</source>
-<target>Ошибка</target>
+<source>A directory path is expected after %x.</source>
+<target>Ожидается путь папки после %x.</target>
+
+<source>Syntax error</source>
+<target>Синтаксическая ошибка</target>
+
+<source>Cannot open file %x.</source>
+<target>Невозможно открыть файл %x.</target>
<source>File %x does not contain a valid configuration.</source>
<target>Файл %x не содержит действительной конфигурации.</target>
-<source>Warning</source>
-<target>Внимание</target>
+<source>Unequal number of left and right directories specified.</source>
+<target>Указано неравное число папок слева и справа.</target>
+
+<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
+<target>Конфигурационный файл не должен содержать настройки на уровне пар папок, когда папки задаются с помощью командной строки.</target>
+
+<source>Directories cannot be set for more than one configuration file.</source>
+<target>Папки не могут быть установлены более чем в одном конфигурационном файле.</target>
<source>Command line</source>
<target>Командная строка</target>
+<source>Syntax:</source>
+<target>Синтаксис:</target>
+
+<source>config files</source>
+<target>конфигурационные файлы</target>
+
+<source>directory</source>
+<target>папка</target>
+
+<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
+<target>Любое количество FreeFileSync .ffs_gui и/или .ffs_batch конфигурационных файлов.</target>
+
+<source>Any number of alternative directories for at most one config file.</source>
+<target>Любое количество альтернативных папок для одного конфигурационного файла.</target>
+
<source>A folder input field is empty.</source>
<target>Поле ввода папки пустое.</target>
@@ -381,6 +268,16 @@ Note: File paths must be relative to base directories.
<source>Total time:</source>
<target>Общее время:</target>
+<source>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
+</source>
+<target>
+<pluralform>%x байт</pluralform>
+<pluralform>%x байта</pluralform>
+<pluralform>%x байт</pluralform>
+</target>
+
<source>%x MB</source>
<target>%x МБ</target>
@@ -399,12 +296,25 @@ Note: File paths must be relative to base directories.
<source>Scanning:</source>
<target>Сканирую:</target>
+<source>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
+</source>
+<target>
+<pluralform>%x поток</pluralform>
+<pluralform>%x потока</pluralform>
+<pluralform>%x потоков</pluralform>
+</target>
+
<source>Encoding extended time information: %x</source>
<target>Кодирование расширенной информации о времени: %x</target>
<source>/sec</source>
<target>/с</target>
+<source>%x items/sec</source>
+<target>%x элементов/с</target>
+
<source>Configuration file %x loaded partially only.</source>
<target>Файл конфигурации %x загрузился частично.</target>
@@ -417,6 +327,9 @@ Note: File paths must be relative to base directories.
<source>Browse directory</source>
<target>Обзор папок</target>
+<source>Cannot access the Volume Shadow Copy Service.</source>
+<target>Невозможно получить доступ к службе Теневого Копирования Тома.</target>
+
<source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
<target>Пожалуйста, используйте 64-разрядную версию FreeFileSync для создания теневых копий на этой системе.</target>
@@ -426,10 +339,13 @@ Note: File paths must be relative to base directories.
<source>Cannot determine volume name for %x.</source>
<target>Невозможно определить имя тома для %x.</target>
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Запрос отмены: Ожидайте, пока текущая операция завершится...</target>
+<source>Volume name %x is not part of file path %y.</source>
+<target>Имя тома %x не является частью имени файла %y.</target>
+
+<source>Stop requested: Waiting for current operation to finish...</source>
+<target>Запрошена остановка: Ожидайте, пока текущая операция завершится...</target>
-<source>Failure to create timestamp for versioning:</source>
+<source>Unable to create timestamp for versioning:</source>
<target>Неспособность создать отметку времени для архивации файлов:</target>
<source>Cannot read the following XML elements:</source>
@@ -445,16 +361,16 @@ Note: File paths must be relative to base directories.
<target>&Выход</target>
<source>&Program</source>
-<target>&Программа</target>
+<target>&Файл</target>
-<source>&Content</source>
+<source>&View help</source>
<target>&Справка</target>
<source>&About</source>
<target>&О программе</target>
<source>&Help</source>
-<target>П&омощь</target>
+<target>&Помощь</target>
<source>Usage:</source>
<target>Инструкция:</target>
@@ -471,8 +387,8 @@ Note: File paths must be relative to base directories.
<source>To get started just import a .ffs_batch file.</source>
<target>Для запуска просто импортируйте файл .ffs_batch.</target>
-<source>Folders to watch</source>
-<target>Папки для наблюдения</target>
+<source>Folders to watch:</source>
+<target>Папки для наблюдения:</target>
<source>Add folder</source>
<target>Добавить папку</target>
@@ -486,11 +402,14 @@ Note: File paths must be relative to base directories.
<source>Select a folder</source>
<target>Выбрать папку</target>
-<source>Idle time [seconds]</source>
-<target>Время задержки [секунды]</target>
+<source>Idle time (in seconds):</source>
+<target>Время ожидания (в секундах):</target>
<source>Idle time between last detected change and execution of command</source>
-<target>Время задержки между последним обнаруженным изменением и выполнением командной строки в секундах</target>
+<target>Время ожидания между последним обнаруженным изменением и выполнением командной строки в секундах</target>
+
+<source>Command line:</source>
+<target>Командная строка:</target>
<source>
The command is triggered if:
@@ -503,36 +422,45 @@ The command is triggered if:
- появились новые папки (например, подключение переносного носителя)
</target>
-<source>Start</source>
-<target>Старт</target>
-
-<source>&Retry</source>
-<target>&Повторить</target>
+<source>&Start</source>
+<target>&Старт</target>
-<source>Cancel</source>
-<target>Отмена</target>
-
-<source>RealtimeSync - Automated Synchronization</source>
-<target>RealtimeSync - Автоматическая синхронизация</target>
+<source>About</source>
+<target>О программе</target>
<source>Build: %x</source>
<target>сборка %x</target>
-<source>About</source>
-<target>О программе</target>
-
<source>All files</source>
<target>Все файлы</target>
+<source>Automated Synchronization</source>
+<target>Автоматическая синхронизация</target>
+
+<source>Directory monitoring active</source>
+<target>Слежение за папками активировано</target>
+
+<source>Waiting until all directories are available...</source>
+<target>Ожидать, пока все папки станут доступны...</target>
+
+<source>Error</source>
+<target>Ошибка</target>
+
<source>&Restore</source>
<target>&Восстановить</target>
+<source>&Show error</source>
+<target>&Показать ошибку</target>
+
<source>&Exit</source>
<target>&Выход</target>
-<source>Invalid command line:</source>
+<source>Incorrect command line:</source>
<target>Неверная командная строка:</target>
+<source>&Retry</source>
+<target>&Повторить</target>
+
<source>File content</source>
<target>Содержимое файла</target>
@@ -593,8 +521,8 @@ The command is triggered if:
<source>Target folder input field must not be empty.</source>
<target>Поле ввода целевой папки не должно быть пустым.</target>
-<source>Folder input field for versioning must not be empty.</source>
-<target>Поле ввода папки для архивации файлов не должно быть пустым.</target>
+<source>Please enter a target folder for versioning.</source>
+<target>Пожалуйста, введите целевую папку для архивации файлов.</target>
<source>Source folder %x not found.</source>
<target>Исходная папка %x не найдена.</target>
@@ -602,6 +530,12 @@ The command is triggered if:
<source>The following items have unresolved conflicts and will not be synchronized:</source>
<target>Следующие элементы имеют неурегулированные конфликты и не будут синхронизированы:</target>
+<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
+<target>
+Следующие папки существенно различаются.
+Убедитесь, что вы указали соответствующие папки для синхронизации.
+</target>
+
<source>Not enough free disk space available in:</source>
<target>Не достаточно свободного места в:</target>
@@ -620,11 +554,17 @@ The command is triggered if:
<source>Generating database...</source>
<target>Создание базы данных...</target>
+<source>Creating a Volume Shadow Copy for %x...</source>
+<target>Создание Тома Теневого Копирования для %x...</target>
+
<source>Data verification error: %x and %y have different content.</source>
<target>Ошибка проверки данных: %x и %y имеют разное содержание!</target>
-<source>Synchronization aborted</source>
-<target>Синхронизация отменена</target>
+<source>job name</source>
+<target>название</target>
+
+<source>Synchronization stopped</source>
+<target>Синхронизация остановлена</target>
<source>Synchronization completed with errors</source>
<target>Синхронизация завершена. В процессе синхронизации возникли ошибки</target>
@@ -641,30 +581,42 @@ The command is triggered if:
<source>Saving log file %x...</source>
<target>Сохранение лог-файла %x...</target>
-<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
-<target>Нажмите "Переключить" для продолжения работы в главном окне FreeFileSync.</target>
+<source>You can switch to FreeFileSync's main window to resolve this issue.</source>
+<target>Вы можете переключиться на главное окно FreeFileSync для решения этой проблемы.</target>
+
+<source>&Don't show this warning again</source>
+<target>Больше &не показывать это предупреждение</target>
-<source>Switching to FreeFileSync main dialog</source>
+<source>&Ignore</source>
+<target>&Игнорировать</target>
+
+<source>&Switch</source>
+<target>&Переключить</target>
+
+<source>Switching to FreeFileSync's main window</source>
<target>Переключение на главное окно FreeFileSync</target>
+<source>&Ignore subsequent errors</source>
+<target>И&гнорировать последующие ошибки</target>
+
+<source>Serious Error</source>
+<target>Серьезная ошибка</target>
+
+<source>Check for Program Updates</source>
+<target>Проверка обновления программы</target>
+
<source>A new version of FreeFileSync is available:</source>
<target>Доступна новая версия FreeFileSync:</target>
<source>Download now?</source>
<target>Загрузить сейчас?</target>
-<source>New version found</source>
-<target>Найдена новая версия</target>
-
<source>&Download</source>
<target>&Загрузить</target>
<source>FreeFileSync is up to date.</source>
<target>У Вас самая последняя версия FreeFileSync.</target>
-<source>Information</source>
-<target>Информация</target>
-
<source>Unable to connect to sourceforge.net.</source>
<target>Невозможно соединиться с sourceforge.net.</target>
@@ -722,20 +674,20 @@ The command is triggered if:
<source>Hibernate</source>
<target>Гибернация</target>
-<source>Selected variant:</source>
-<target>Выбранный вариант:</target>
+<source>Alternate comparison settings</source>
+<target>Альтернативные настройки сравнения</target>
-<source>Select alternate comparison settings</source>
-<target>Выбрать альтернативные настройки сравнения</target>
+<source>Alternate synchronization settings</source>
+<target>Альтернативные настройки синхронизации</target>
-<source>Select alternate synchronization settings</source>
-<target>Выбрать альтернативные настройки синхронизации</target>
+<source>Local filter</source>
+<target>Локальный фильтр</target>
-<source>Filter is active</source>
-<target>Фильтр активен</target>
+<source>Active</source>
+<target>активный</target>
-<source>No filter selected</source>
-<target>Ни один фильтр не выбран</target>
+<source>None</source>
+<target>неактивный</target>
<source>Remove alternate settings</source>
<target>Удалить альтернативные настройки</target>
@@ -749,6 +701,15 @@ The command is triggered if:
<source>Paste</source>
<target>Вставить</target>
+<source>Alternate Comparison Settings</source>
+<target>Альтернативные настройки сравнения</target>
+
+<source>Alternate Synchronization Settings</source>
+<target>Альтернативные настройки синхронизации</target>
+
+<source>Local Filter</source>
+<target>Локальный фильтр</target>
+
<source>&New</source>
<target>&Новая</target>
@@ -764,17 +725,20 @@ The command is triggered if:
<source>2. &Synchronize</source>
<target>2. С&инхронизировать</target>
+<source>&Global settings</source>
+<target>&Глобальные настройки</target>
+
<source>&Language</source>
<target>&Язык</target>
+<source>&Find...</source>
+<target>&Найти...</target>
+
<source>&Export file list...</source>
<target>&Экспортировать список файлов...</target>
-<source>&Global settings</source>
-<target>&Глобальные настройки</target>
-
<source>&Tools</source>
-<target>&Опции</target>
+<target>&Инструменты</target>
<source>&Check now</source>
<target>&Проверить сейчас</target>
@@ -782,17 +746,14 @@ The command is triggered if:
<source>Check &automatically once a week</source>
<target>Проверять &автоматически раз в неделю</target>
-<source>Check for new &version</source>
+<source>&Check for new version</source>
<target>&Проверка обновлений</target>
<source>Compare</source>
<target>Сравнить</target>
-<source>Comparison settings</source>
-<target>Настройки сравнения</target>
-
-<source>Synchronization settings</source>
-<target>Настройки синхронизации</target>
+<source>Cancel</source>
+<target>Отмена</target>
<source>Synchronize</source>
<target>Синхронизировать</target>
@@ -806,6 +767,15 @@ The command is triggered if:
<source>Swap sides</source>
<target>Поменять направление</target>
+<source>Close search bar</source>
+<target>Закрыть строку поиска</target>
+
+<source>Find:</source>
+<target>Найти:</target>
+
+<source>Match case</source>
+<target>Учитывать регистр</target>
+
<source>Save as batch job</source>
<target>Сохранить как пакетное задание</target>
@@ -827,81 +797,71 @@ The command is triggered if:
<source>Total bytes to copy</source>
<target>Всего байт для копирования</target>
-<source>Items found:</source>
-<target>Элементов найдено:</target>
+<source>Select a variant:</source>
+<target>Выберите вариант:</target>
-<source>Speed:</source>
-<target>Скорость:</target>
+<source>Identify equal files by comparing modification time and size.</source>
+<target>Определять одинаковые файлы путем сравнения времени изменения и размера.</target>
-<source>Time remaining:</source>
-<target>Времени осталось:</target>
+<source>Identify equal files by comparing the file content.</source>
+<target>Определять одинаковые файлы путем сравнения содержания файла.</target>
-<source>Time elapsed:</source>
-<target>Времени прошло:</target>
+<source>Symbolic links:</source>
+<target>Символьные ссылки:</target>
-<source>Synchronizing...</source>
-<target>Синхронизация...</target>
+<source>More information</source>
+<target>Подробнее</target>
-<source>On completion</source>
-<target>По завершению</target>
+<source>OK</source>
+<target>OK</target>
-<source>Close</source>
-<target>Закрыть</target>
+<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
+<target>Выявять и распространять изменения на обе стороны. Удаленные, перемещенные и конфликтующие файлы определяются автоматически с использованием базы данных.</target>
-<source>&Pause</source>
-<target>&Пауза</target>
+<source>Create a mirror backup of the left folder which exactly matches the right folder after synchronization.</source>
+<target>Создавать зеркальную копию левой части. После синхронизации правая часть будет полностью соответствовать левой.</target>
-<source>Variant</source>
-<target>Вариант</target>
+<source>Copy new and updated files to the right folder.</source>
+<target>Копировать новые или обновленные файлы на правую сторону.</target>
-<source>Statistics</source>
-<target>Статистика</target>
+<source>Configure your own synchronization rules.</source>
+<target>Настроить свои собственные правила синхронизации.</target>
-<source>Select a variant</source>
-<target>Выберите вариант</target>
+<source>Detect moved files</source>
+<target>Обнаруживать перемещенные файлы</target>
-<source>
-Files are found equal if
- - last write time and date
- - file size
-are the same
-</source>
-<target>
-Файлы считаются равными, если одинаковые
- - дата и время последнего изменения
- - размер файла
-</target>
+<source>Requires database files. Not supported by all file systems.</source>
+<target>Требуются файлы баз данных. Поддерживается не всеми файловыми системами.</target>
-<source>
-Files are found equal if
- - file content
-is the same
-</source>
-<target>Файлы считаются равными, если содержание файлов одинаковое</target>
+<source>Delete files:</source>
+<target>Удаление файлов:</target>
-<source>Symbolic Link handling</source>
-<target>Обращение к символьной ссылке</target>
+<source>Permanent</source>
+<target>Удалять безвозвратно</target>
-<source>Help</source>
-<target>Помощь</target>
+<source>Delete or overwrite files permanently</source>
+<target>Удалять или перезаписывать файлы, не помещая в "Корзину"</target>
-<source>OK</source>
-<target>OK</target>
+<source>&Recycle bin</source>
+<target>В "&Корзину"</target>
-<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
-<target>Выявление и распространение изменений на обе стороны. Удаленные, перемещенные и конфликтующие файлы определяются автоматически с использованием базы данных.</target>
+<source>Back up deleted and overwritten files in the recycle bin</source>
+<target>Делать резервную копию удаленных и перезаписанных файлов в "Корзине"</target>
-<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
-<target>Зеркальная (резервная) копия левой части. В результате синхронизации правая сторона будет изменена до полного соответствия с левой.</target>
+<source>Versioning</source>
+<target>Архивировать</target>
-<source>Copy new or updated files to right folder.</source>
-<target>Копировать новые или обновлять файлы на правой стороне.</target>
+<source>Move files to a user-defined folder</source>
+<target>Перемещать файлы в пользовательскую папку</target>
-<source>Configure your own synchronization rules.</source>
-<target>Настроить свои собственные правила синхронизации.</target>
+<source>Naming convention:</source>
+<target>Условие переименования:</target>
+
+<source>Show examples</source>
+<target>Подробнее</target>
-<source>Error handling</source>
-<target>Обработка ошибок</target>
+<source>Handle errors:</source>
+<target>Обработка ошибкок:</target>
<source>Ignore</source>
<target>Игнорировать</target>
@@ -910,73 +870,77 @@ is the same
<target>Скрывать все ошибки и сообщения с предупреждениями</target>
<source>Pop-up</source>
-<target>Всплывающие окна</target>
+<target>Показывать всплывающие окна</target>
<source>Show pop-up on errors or warnings</source>
<target>Показывать всплывающие окна при ошибках и предупреждениях</target>
-<source>Deletion handling</source>
-<target>Настройки удаления</target>
+<source>On completion:</source>
+<target>По завершению:</target>
-<source>Permanent</source>
-<target>Удалить безвозвратно</target>
+<source>Start synchronization now?</source>
+<target>Начать синхронизацию сейчас?</target>
-<source>Delete or overwrite files permanently</source>
-<target>Удалить или перезаписать файлы, не помещая в "Корзину"</target>
+<source>Variant:</source>
+<target>Вариант:</target>
-<source>Versioning</source>
-<target>Архивировать</target>
+<source>Statistics</source>
+<target>Статистика</target>
-<source>Naming convention:</source>
-<target>Условие переименования:</target>
+<source>&Don't show this dialog again</source>
+<target>Больше &не показывать это окно</target>
-<source>Batch job</source>
-<target>Пакетное задание</target>
+<source>Items found:</source>
+<target>Элементов найдено:</target>
-<source>Exit</source>
-<target>Выход</target>
+<source>Speed:</source>
+<target>Скорость:</target>
-<source>Abort synchronization on first error</source>
-<target>Отменить синхронизацию при первой ошибке</target>
+<source>Time remaining:</source>
+<target>Времени осталось:</target>
-<source>Show progress dialog</source>
-<target>Показать окно прогресса</target>
+<source>Time elapsed:</source>
+<target>Времени прошло:</target>
-<source>Save log</source>
-<target>Сохранить лог-файл</target>
+<source>Synchronizing...</source>
+<target>Синхронизация...</target>
-<source>Select folder to save log files</source>
-<target>Выберите папку для сохранения лог-файлов</target>
+<source>Minimize to notification area</source>
+<target>Свернуть в область уведомлений</target>
-<source>Limit</source>
-<target>Ограничение</target>
+<source>Close</source>
+<target>Закрыть</target>
-<source>Limit maximum number of log files</source>
-<target>Ограничить максимальное количество лог-файлов</target>
+<source>&Pause</source>
+<target>&Пауза</target>
-<source>Source code written in C++ using:</source>
-<target>Исходный код написан на C++ с использованием:</target>
+<source>Stop</source>
+<target>Остановить</target>
-<source>If you like FreeFileSync</source>
-<target>Если Вам понравился FreeFileSync</target>
+<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>
+Создать файл пакетного задания для автоматической синхронизации.
+Для запуска дважды кликните этот файл или запланируйте
+в планировщике задач: %x
+</target>
-<source>Donate with PayPal</source>
-<target>Отправить деньги через PayPal</target>
+<source>Stop synchronization at first error</source>
+<target>Остановить синхронизацию при первой ошибке</target>
-<source>Many thanks for localization:</source>
-<target>Большое спасибо за перевод:</target>
+<source>Show progress dialog</source>
+<target>Показать окно прогресса</target>
-<source>Feedback and suggestions are welcome</source>
-<target>Замечания и предложения приветствуются</target>
+<source>Save log:</source>
+<target>Сохранить лог-файл:</target>
-<source>Homepage</source>
-<target>Оф.сайт</target>
+<source>Limit:</source>
+<target>Ограничение:</target>
-<source>Email</source>
-<target>Почта</target>
+<source>Limit maximum number of log files</source>
+<target>Ограничить максимальное количество лог-файлов</target>
-<source>Published under the GNU General Public License</source>
-<target>Издается под лицензией GNU General Public License</target>
+<source>How can I schedule a batch job?</source>
+<target>Как запланировать пакетное задание?</target>
<source>Delete on both sides</source>
<target>Удалить с обеих сторон</target>
@@ -984,91 +948,139 @@ is the same
<source>Delete on both sides even if the file is selected on one side only</source>
<target>Удалить с обеих сторон, даже если файл выделен только на одной стороне</target>
-<source>Include</source>
-<target>Включить</target>
+<source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source>
+<target>Выберите правила фильтрации для исключения определенных файлов из синхронизации. Введите пути файлов относящиеся к соответствующим парам папок.</target>
-<source>Exclude</source>
-<target>Исключить</target>
+<source>Include:</source>
+<target>Включить:</target>
+
+<source>Exclude:</source>
+<target>Исключить:</target>
-<source>Time span</source>
-<target>Промежуток времени</target>
+<source>Time span:</source>
+<target>Промежуток времени:</target>
-<source>File size</source>
-<target>Размер файла</target>
+<source>File size:</source>
+<target>Размер файла:</target>
-<source>Minimum</source>
-<target>минимум</target>
+<source>Minimum:</source>
+<target>минимум:</target>
-<source>Maximum</source>
-<target>максимум</target>
+<source>Maximum:</source>
+<target>максимум:</target>
<source>&Clear</source>
<target>&Очистить</target>
-<source>Global settings</source>
-<target>Глобальные настройки</target>
+<source>The following settings are used for all synchronization jobs.</source>
+<target>Следующие настройки используются для всех заданий синхронизации.</target>
<source>Fail-safe file copy</source>
<target>Отказоустойчивое копирование файла</target>
+<source>
+Copy to a temporary file (*.ffs_tmp) before overwriting target.
+This guarantees a consistent state even in case of a serious error.
+</source>
+<target>
+Копирование во временный файл (*.ffs_tmp) перед перезаписью целевого файла.
+Это гарантирует целостность заменяемых файлов даже в случае возникновения серьезной ошибки.
+</target>
+
+<source>(recommended)</source>
+<target>(рекомендовано)</target>
+
<source>Copy locked files</source>
<target>Копирование заблокированных файлов</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service.</source>
+<target>Копирование общих или заблокированных файлов с использованием службы Теневого Копирования Тома</target>
+
+<source>(requires administrator rights)</source>
+<target>(требуются права Администратора)</target>
+
<source>Copy file access permissions</source>
<target>Копирование прав доступа к файлам</target>
-<source>Restore hidden dialogs</source>
-<target>Восстановить скрытые диалоговые окна?</target>
+<source>Transfer file and folder permissions.</source>
+<target>Передача прав доступа к файлам/папкам</target>
+
+<source>Automatic retry on error:</source>
+<target>Автоматическое повторение при ошибках:</target>
+
+<source>Retry count:</source>
+<target>Число повторений:</target>
-<source>External applications</source>
-<target>Внешние приложения</target>
+<source>Delay (in seconds):</source>
+<target>Задержка (в секундах):</target>
+
+<source>Customize context menu:</source>
+<target>Кастомизация контекстного меню:</target>
<source>Description</source>
<target>Описание</target>
+<source>Restore hidden windows</source>
+<target>Восстановить скрытые окна</target>
+
<source>&Default</source>
<target>&По умолчанию</target>
-<source>Find what:</source>
-<target>Найти:</target>
+<source>Source code written in C++ using:</source>
+<target>Исходный код написан на C++ с использованием:</target>
-<source>Match case</source>
-<target>Учитывать регистр</target>
+<source>If you like FreeFileSync</source>
+<target>Если Вам понравился FreeFileSync</target>
-<source>&Find next</source>
-<target>&Найти далее</target>
+<source>Donate with PayPal</source>
+<target>Отправить деньги через PayPal</target>
-<source>Start synchronization</source>
-<target>Начать синхронизацию</target>
+<source>Feedback and suggestions are welcome</source>
+<target>Замечания и предложения приветствуются</target>
-<source>Delete</source>
-<target>Удалить</target>
+<source>Homepage</source>
+<target>Оф.сайт</target>
-<source>Configure filter</source>
-<target>Настройки фильтра</target>
+<source>Email</source>
+<target>Почта</target>
-<source>Find</source>
-<target>Найти</target>
+<source>Published under the GNU General Public License</source>
+<target>Издается под лицензией GNU General Public License</target>
+
+<source>Many thanks for localization:</source>
+<target>Большое спасибо за перевод:</target>
+
+<source>Save as Batch Job</source>
+<target>Сохранение пакетного задания</target>
+
+<source>Delete Items</source>
+<target>Удаление элементов</target>
+
+<source>Global Settings</source>
+<target>Глобальные настройки</target>
-<source>Select time span</source>
-<target>Выберите промежуток времени</target>
+<source>Select Time Span</source>
+<target>Выбор промежутка времени</target>
-<source>Folder pairs</source>
+<source>Folder Pairs</source>
<target>Пары папок для синхронизации</target>
+<source>Find</source>
+<target>Поиск</target>
+
<source>Overview</source>
<target>Главная</target>
<source>Configuration</source>
<target>Настройки</target>
-<source>Main bar</source>
+<source>Main Bar</source>
<target>Главная панель</target>
-<source>Filter files</source>
+<source>Filter Files</source>
<target>Фильтр</target>
-<source>Select view</source>
+<source>Select View</source>
<target>Вид списка файлов</target>
<source>Open...</source>
@@ -1080,6 +1092,21 @@ is the same
<source>Compare both sides</source>
<target>Сравнить обе стороны</target>
+<source>Comparison settings</source>
+<target>Настройки сравнения</target>
+
+<source>Synchronization settings</source>
+<target>Настройки синхронизации</target>
+
+<source>Start synchronization</source>
+<target>Начать синхронизацию</target>
+
+<source>Confirm</source>
+<target>Подтвердить</target>
+
+<source>&Execute</source>
+<target>&Выполнить</target>
+
<source>
<pluralform>1 directory</pluralform>
<pluralform>%x directories</pluralform>
@@ -1113,17 +1140,23 @@ is the same
<source>Set direction:</source>
<target>Выберите направление:</target>
+<source>multiple selection</source>
+<target>групповое выделение</target>
+
+<source>Include via filter:</source>
+<target>Включить с помощью фильтра:</target>
+
+<source>Exclude via filter:</source>
+<target>Исключить с помощью фильтра:</target>
+
<source>Exclude temporarily</source>
<target>Временно исключить</target>
<source>Include temporarily</source>
<target>Временно включить</target>
-<source>multiple selection</source>
-<target>групповое выделение</target>
-
-<source>Exclude via filter:</source>
-<target>Исключить через фильтр:</target>
+<source>Delete</source>
+<target>Удалить</target>
<source>Include all</source>
<target>Включить все</target>
@@ -1167,9 +1200,15 @@ is the same
<source>Do you want to save changes to %x?</source>
<target>Вы хотите сохранить изменения в %x?</target>
+<source>Never save &changes</source>
+<target>Никогда не сохранять &изменения</target>
+
<source>Do&n't save</source>
<target>&Не сохранять</target>
+<source>Filter</source>
+<target>Фильтр</target>
+
<source>Show files that exist on left side only</source>
<target>Показать файлы, существующие только слева</target>
@@ -1215,35 +1254,26 @@ is the same
<source>Set as default</source>
<target>Установить по умолчанию</target>
-<source>Operation aborted</source>
-<target>Операция отменена</target>
-
<source>All folders are in sync</source>
<target>Все папки синхронизированы</target>
-<source>File list exported</source>
-<target>Список файлов экспортирован</target>
-
-<source>Searching for program updates...</source>
-<target>Проверка обновлений программы...</target>
-
-<source>&Ignore</source>
-<target>&Игнорировать</target>
+<source>Synchronization Settings</source>
+<target>Настройки синхронизации</target>
-<source>Fatal Error</source>
-<target>Критическая ошибка</target>
+<source>Comparison Settings</source>
+<target>Настройки сравнения</target>
-<source>&Switch</source>
-<target>&Переключить</target>
+<source>Cannot find %x</source>
+<target>Невозможно найти %x</target>
-<source>Question</source>
-<target>Вопрос</target>
+<source>Comma-separated values</source>
+<target>Значения, разделенные запятыми</target>
-<source>&Yes</source>
-<target>&Да</target>
+<source>File list exported</source>
+<target>Список файлов экспортирован</target>
-<source>&No</source>
-<target>&Нет</target>
+<source>Searching for program updates...</source>
+<target>Проверка обновлений программы...</target>
<source>Scanning...</source>
<target>Сканирование...</target>
@@ -1254,23 +1284,26 @@ is the same
<source>Info</source>
<target>Информация</target>
+<source>Warning</source>
+<target>Внимание</target>
+
<source>Paused</source>
<target>Пауза</target>
<source>Initializing...</source>
<target>Инициализация...</target>
-<source>Aborted</source>
-<target>Отменено</target>
+<source>Stopped</source>
+<target>Остановлено</target>
<source>Completed</source>
<target>Завершено</target>
-<source>Cannot find %x</source>
-<target>Невозможно найти %x</target>
+<source>&Continue</source>
+<target>&Продолжить</target>
-<source>Inactive</source>
-<target>---</target>
+<source>Log</source>
+<target>Лог (журнал)</target>
<source>Today</source>
<target>сегодня</target>
@@ -1296,8 +1329,18 @@ is the same
<source>MB</source>
<target>МБ</target>
-<source>Filter</source>
-<target>Фильтр</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>Вы точно хотите переместить следующий %x элемент в "Корзину"?</pluralform>
+<pluralform>Вы точно хотите переместить следующие %x элемента в "Корзину"?</pluralform>
+<pluralform>Вы точно хотите переместить следующие %x элементов в "Корзину"?</pluralform>
+</target>
+
+<source>Move</source>
+<target>Переместить</target>
<source>
<pluralform>Do you really want to delete the following item?</pluralform>
@@ -1309,6 +1352,9 @@ is the same
<pluralform>Вы точно хотите удалить следующие %x элементов?</pluralform>
</target>
+<source>Exclude</source>
+<target>Исключить</target>
+
<source>Direct</source>
<target>Прямое</target>
@@ -1336,8 +1382,8 @@ is the same
<source>- Other side's counterpart to %item_folder%</source>
<target>- аналог %item_folder% с другой стороны</target>
-<source>Make hidden warnings and dialogs visible again?</source>
-<target>Сделать скрытые предупреждения и диалоги видимыми снова?</target>
+<source>Restore all hidden windows and warnings?</source>
+<target>Восстановить все скрытые окна и предупреждения?</target>
<source>Leave as unresolved conflict</source>
<target>Оставить как нерешенный конфликт</target>
@@ -1391,7 +1437,7 @@ is the same
<target>Невозможно записать атрибуты файла %x.</target>
<source>Cannot write modification time of %x.</source>
-<target>Невозможно записать время модификации файла %x.</target>
+<target>Невозможно записать время изменения файла %x.</target>
<source>Cannot read security context of %x.</source>
<target>Невозможно прочитать контекст безобасности %x.</target>
@@ -1465,18 +1511,21 @@ is the same
<pluralform>%x дней</pluralform>
</target>
-<source>Failed to register to receive system messages.</source>
-<target>Не удалось зарегистрироваться для получения системных сообщений.</target>
+<source>Unable to register to receive system messages.</source>
+<target>Невозможно зарегистрироваться для получения системных сообщений.</target>
<source>Cannot set privilege %x.</source>
<target>Невозможно установить привелегии %x.</target>
-<source>Failed to suspend system sleep mode.</source>
-<target>Не удалось приостановить режим сна системы.</target>
+<source>Unable to suspend system sleep mode.</source>
+<target>Невозможно приостановить режим сна системы.</target>
<source>Cannot change process I/O priorities.</source>
<target>Невозможно изменить приоритет процесса.</target>
+<source>Unable to move %x to the recycle bin.</source>
+<target>Невозможно переместить %x в "Корзину".</target>
+
<source>Cannot determine final path for %x.</source>
<target>Невозможно определить конечный путь для %x.</target>
diff --git a/BUILD/Languages/scottish_gaelic.lng b/BUILD/Languages/scottish_gaelic.lng
index a68e9d6a..e7ded4f7 100644
--- a/BUILD/Languages/scottish_gaelic.lng
+++ b/BUILD/Languages/scottish_gaelic.lng
@@ -2,11 +2,17 @@
<language>Gàidhlig</language>
<translator>Michael Bauer aka Akerbeltz</translator>
<locale>gd</locale>
- <flag_image>flag_scotland.png</flag_image>
- <plural_form_count>4</plural_form_count>
+ <image>flag_scotland.png</image>
+ <plural_count>4</plural_count>
<plural_definition>(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3</plural_definition>
</header>
+<source>&Check</source>
+<target></target>
+
+<source>Retrying operation...</source>
+<target></target>
+
<source>Both sides have changed since last synchronization.</source>
<target>Chaidh an dà thaobh atharrachadh on t-sioncronachadh mu dheireadh.</target>
@@ -58,9 +64,6 @@
<source>Cannot open file %x.</source>
<target>Cha ghabh am faidhle %x fhosgladh.</target>
-<source>Error</source>
-<target>Mearachd</target>
-
<source>File %x does not contain a valid configuration.</source>
<target>Chan eil rèiteachadh dligheach san fhaidhle %x.</target>
@@ -70,12 +73,12 @@
<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
<target>Chan fhaod roghainnean aig ìre paidhrichean nam pasganan a bhith san fhaidhle rèiteachaidh nuair a thathar a' cur pasganan slighe na loidhne-àithne.</target>
-<source>Warning</source>
-<target>Rabhadh</target>
-
<source>Directories cannot be set for more than one configuration file.</source>
<target>Cha ghabh pasganan a shuidheachadh airson barrachd air aon fhaidhle rèiteachaidh.</target>
+<source>Command line</source>
+<target>Loidhne-àithne</target>
+
<source>Syntax:</source>
<target>Co-chàradh:</target>
@@ -91,9 +94,6 @@
<source>Any number of alternative directories for at most one config file.</source>
<target>Àireamh sam bith de phasganan eile airson aon fhaidhle rèiteachaidh air a' char as fhaide.</target>
-<source>Command line</source>
-<target>Loidhne-àithne</target>
-
<source>A folder input field is empty.</source>
<target>Tha co-dhiù aon raon pasgain ann a tha falamh.</target>
@@ -298,8 +298,8 @@
<source>/sec</source>
<target>/diog</target>
-<source>%x items</source>
-<target>%x nithean</target>
+<source>%x items/sec</source>
+<target>%x nithean/diog</target>
<source>Configuration file %x loaded partially only.</source>
<target>Cha deach faidhle an rèiteachaidh %x a luchdadh gu tur.</target>
@@ -328,11 +328,11 @@
<source>Volume name %x is not part of file path %y.</source>
<target>Chan eil ainm an draibh %x 'na phàirt de shlighe an fhaodhle %y.</target>
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Tha thu airson sgur dheth: A' feitheamh gus an crìochnaich an gnìomh làithreach...</target>
+<source>Stop requested: Waiting for current operation to finish...</source>
+<target>Dh'iarr thu oirnn sgur: A' feitheamh ri crìoch na h-obrach làithreach...</target>
-<source>Failure to create timestamp for versioning:</source>
-<target>Cha b' urrainn dhuinn stampa-ama a chruthachadh airson versioning:</target>
+<source>Unable to create timestamp for versioning:</source>
+<target>Chan urrainn dhuinn stampa-ama a chruthachadh airson versioning:</target>
<source>Cannot read the following XML elements:</source>
<target>Chan urrainn dhuinn na h-eileamaidean XML a leanas a leughadh:</target>
@@ -349,8 +349,8 @@
<source>&Program</source>
<target>&Prògram</target>
-<source>&Content</source>
-<target>S&usbaint</target>
+<source>&View help</source>
+<target>&Faic a' chobhair</target>
<source>&About</source>
<target>&Mu dheidhinn</target>
@@ -373,8 +373,8 @@
<source>To get started just import a .ffs_batch file.</source>
<target>Cha leig thu leas ach faidhle .ffs_batch ion-phortadh airson toiseach tòiseachaidh.</target>
-<source>Folders to watch</source>
-<target>Na pasgain air an cumar sùil</target>
+<source>Folders to watch:</source>
+<target>Pasganan air an cumar sùil:</target>
<source>Add folder</source>
<target>Cuir pasgan ris</target>
@@ -388,12 +388,15 @@
<source>Select a folder</source>
<target>Tagh pasgan</target>
-<source>Idle time [seconds]</source>
-<target>Ùine 'na thàmh [seconds]</target>
+<source>Idle time (in seconds):</source>
+<target>Ùine 'na thàmh (ann an diogan):</target>
<source>Idle time between last detected change and execution of command</source>
<target>An tàmh eadar an t-atharrachadh mu dheireadh agus gnìomhachadh na h-àithne</target>
+<source>Command line:</source>
+<target>Loidhne-àithne:</target>
+
<source>
The command is triggered if:
- files or subfolders change
@@ -405,33 +408,30 @@ Thèid an loidhne-àithne a chur gu dol:
- ma nochdas pasgain ùra (m.e. ma chuireas tu a-steach bioran USB)
</target>
-<source>Start</source>
-<target>Tòisich</target>
-
-<source>&Retry</source>
-<target>&Feuch ris a-rithist</target>
-
-<source>Cancel</source>
-<target>Sguir dheth</target>
+<source>&Start</source>
+<target>Tòi&sich</target>
-<source>RealtimeSync - Automated Synchronization</source>
-<target>RealtimeSync - Sioncronachadh fèin-obrachail</target>
+<source>About</source>
+<target>Mu dheidhinn</target>
<source>Build: %x</source>
<target>Build: %x</target>
-<source>About</source>
-<target>Mu dheidhinn</target>
-
<source>All files</source>
<target>Gach faidhle</target>
+<source>Automated Synchronization</source>
+<target>Sioncronachadh fèin-obrachail</target>
+
<source>Directory monitoring active</source>
<target>Tha na pasganan 'gam marasgladh</target>
<source>Waiting until all directories are available...</source>
<target>A' feitheamh gus am bi gach pasgan ri làimh...</target>
+<source>Error</source>
+<target>Mearachd</target>
+
<source>&Restore</source>
<target>&Aisig</target>
@@ -441,8 +441,11 @@ Thèid an loidhne-àithne a chur gu dol:
<source>&Exit</source>
<target>&Fàg an-seo</target>
-<source>Invalid command line:</source>
-<target>Loidhne-àithne mhì-dhligheach:</target>
+<source>Incorrect command line:</source>
+<target>Loidhne-àithne chearr:</target>
+
+<source>&Retry</source>
+<target>&Feuch ris a-rithist</target>
<source>File content</source>
<target>Susbaint an fhaidhle</target>
@@ -504,8 +507,8 @@ Thèid an loidhne-àithne a chur gu dol:
<source>Target folder input field must not be empty.</source>
<target>Chan fhaod raon a' phasgain a bhith falamh.</target>
-<source>Folder input field for versioning must not be empty.</source>
-<target>Chan fhaod raon a' pasgain airson versioning a bhith falamh.</target>
+<source>Please enter a target folder for versioning.</source>
+<target>Cuir a-steach pasgan-targaide a chum versioning.</target>
<source>Source folder %x not found.</source>
<target>Cha deach am pasgan tùsail %x a lorg.</target>
@@ -543,7 +546,7 @@ Thèid an loidhne-àithne a chur gu dol:
<source>job name</source>
<target>ainm na h-obrach</target>
-<source>Synchronization aborted</source>
+<source>Synchronization stopped</source>
<target>Sguireadh dhen t-sioncronachadh</target>
<source>Synchronization completed with errors</source>
@@ -561,14 +564,40 @@ Thèid an loidhne-àithne a chur gu dol:
<source>Saving log file %x...</source>
<target>A' sàbhaladh faidhle an loga %x...</target>
-<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
-<target>Briog air "Gearr leum" gus duilgheadasan a rèiteachadh sa phrìomh-chòmhradh aig FreeFileSync.</target>
+<source>You can switch to FreeFileSync's main window to resolve this issue.</source>
+<target>'S urrainn dhut leum a ghearradh gu prìomh-uinneag FreeFileSync gus an duilgheadas seo fhuasgladh.</target>
+
+<source>&Don't show this warning again</source>
+<target>Na seall an rabha&dh seo a-rithist</target>
+
+<source>&Ignore</source>
+<target>&Leig seachad</target>
+
+<source>&Switch</source>
+<target>&Dèan suids</target>
+
+<source>Switching to FreeFileSync's main window</source>
+<target>A' gearradh leum gu prìomh-uinneag FreeFileSync</target>
+
+<source>
+<pluralform>Automatic retry in 1 second...</pluralform>
+<pluralform>Automatic retry in %x seconds...</pluralform>
+</source>
+<target>
+<pluralform>A' feuchainn ris às ùr gu fèin-obrachail ann an %x diog...</pluralform>
+<pluralform>A' feuchainn ris às ùr gu fèin-obrachail ann an %x dhiog...</pluralform>
+<pluralform>A' feuchainn ris às ùr gu fèin-obrachail ann an %x diogan...</pluralform>
+<pluralform>A' feuchainn ris às ùr gu fèin-obrachail ann an %x diog...</pluralform>
+</target>
+
+<source>&Ignore subsequent errors</source>
+<target>Le&ig seachad mearachdan às a dhèidh seo</target>
-<source>Switching to FreeFileSync main dialog</source>
-<target>A' gearradh leum gu FreeFileSync sa phrìomh-chòmhradh</target>
+<source>Serious Error</source>
+<target>Mearachd mhòr</target>
-<source>Retrying operation after error:</source>
-<target>A' feuchainn ris an dèidh na mearachd:</target>
+<source>Check for Program Updates</source>
+<target>Thoir sùil ach a bheil ùrachadh ann airson a' phrògraim</target>
<source>A new version of FreeFileSync is available:</source>
<target>Tha tionndadh ùr de FreeFileSync ann:</target>
@@ -576,18 +605,12 @@ Thèid an loidhne-àithne a chur gu dol:
<source>Download now?</source>
<target>A bheil thu airson a luchdadh a-nuas an-dràsta?</target>
-<source>New version found</source>
-<target>Chaidh tionndadh ùr a lorg</target>
-
<source>&Download</source>
<target>&Luchdaich a-nuas</target>
<source>FreeFileSync is up to date.</source>
<target>Tha FreeFileSync cho ùr 's a ghabhas.</target>
-<source>Information</source>
-<target>Fiosrachadh</target>
-
<source>Unable to connect to sourceforge.net.</source>
<target>Cha b' urrainn dhuinn ceangal a dhèanamh ri Sourceforge.net.</target>
@@ -645,20 +668,20 @@ Thèid an loidhne-àithne a chur gu dol:
<source>Hibernate</source>
<target>Geamhraich</target>
-<source>Selected variant:</source>
-<target>An t-eug-samhail a thagh thu:</target>
+<source>Alternate comparison settings</source>
+<target>Roghainnean eile airson coimeasadh</target>
-<source>Select alternate comparison settings</source>
-<target>Tagh roghainnean coimeasaidh eile</target>
+<source>Alternate synchronization settings</source>
+<target>Roghainnean eile airson sioncronachadh</target>
-<source>Select alternate synchronization settings</source>
-<target>Tagh roghainnean sioncronachaidh eile</target>
+<source>Local filter</source>
+<target>Criathrag ionadail</target>
-<source>Filter is active</source>
-<target>Tha a' chriathrag gnìomhach</target>
+<source>Active</source>
+<target>Gnìomhach</target>
-<source>No filter selected</source>
-<target>Cha deach criathrag a thaghadh</target>
+<source>None</source>
+<target>Chan eil gin</target>
<source>Remove alternate settings</source>
<target>Thoir air falbh na roghainnean eile</target>
@@ -672,6 +695,15 @@ Thèid an loidhne-àithne a chur gu dol:
<source>Paste</source>
<target>Cuir ann</target>
+<source>Alternate Comparison Settings</source>
+<target>Roghainnean eile airson coimeasadh</target>
+
+<source>Alternate Synchronization Settings</source>
+<target>Roghainnean eile airson sioncronachadh</target>
+
+<source>Local Filter</source>
+<target>Criathrag ionadail</target>
+
<source>&New</source>
<target>Ù&r</target>
@@ -687,15 +719,18 @@ Thèid an loidhne-àithne a chur gu dol:
<source>2. &Synchronize</source>
<target>2. &Dèan sioncronachadh</target>
+<source>&Global settings</source>
+<target>&Na roghainnean uile-choitcheann</target>
+
<source>&Language</source>
<target>&Cànan</target>
+<source>&Find...</source>
+<target>L&org...</target>
+
<source>&Export file list...</source>
<target>Às-p&hortaich liosta nam faidhle...</target>
-<source>&Global settings</source>
-<target>&Na roghainnean uile-choitcheann</target>
-
<source>&Tools</source>
<target>&Innealan</target>
@@ -705,12 +740,15 @@ Thèid an loidhne-àithne a chur gu dol:
<source>Check &automatically once a week</source>
<target>Thoir sùil gu &fèin-obrachail turas san t-seachdain</target>
-<source>Check for new &version</source>
-<target>Thoir sùil a bheil &tionndadh ùr ann</target>
+<source>&Check for new version</source>
+<target>Thoir sùil a&ch a bheil tionndadh ùr ann</target>
<source>Compare</source>
<target>Dèan coimeas</target>
+<source>Cancel</source>
+<target>Sguir dheth</target>
+
<source>Synchronize</source>
<target>Dèan sioncronachadh</target>
@@ -723,6 +761,15 @@ Thèid an loidhne-àithne a chur gu dol:
<source>Swap sides</source>
<target>Cuir an dà thaobh an àite a chèile</target>
+<source>Close search bar</source>
+<target>Dùin bàr an luirg</target>
+
+<source>Find:</source>
+<target>Lorg:</target>
+
+<source>Match case</source>
+<target>An aire do litrichean mòra 's beaga</target>
+
<source>Save as batch job</source>
<target>Sàbhail mar obair baidse</target>
@@ -744,73 +791,20 @@ Thèid an loidhne-àithne a chur gu dol:
<source>Total bytes to copy</source>
<target>Co mheud baidht a thèid lethbhreac a dhèanamh dhiubh</target>
-<source>Items found:</source>
-<target>Rudan a chaidh a lorg:</target>
-
-<source>Speed:</source>
-<target>Astar:</target>
-
-<source>Time remaining:</source>
-<target>An ùine a tha air fhàgail:</target>
-
-<source>Time elapsed:</source>
-<target>An ùine a dh'fhalbh:</target>
-
-<source>Synchronizing...</source>
-<target>A' sioncronachadh...</target>
-
-<source>Minimize to notification area</source>
-<target>Lùghdach 's gluais gu raon nam brathan</target>
-
-<source>On completion</source>
-<target>Nuair a bhios e deiseil</target>
+<source>Select a variant:</source>
+<target>Tagh eug-samhail:</target>
-<source>Close</source>
-<target>Dùin</target>
-
-<source>&Pause</source>
-<target>&Cuir 'na stad</target>
-
-<source>Variant</source>
-<target>Eugsamhail</target>
-
-<source>Statistics</source>
-<target>Stats</target>
+<source>Identify equal files by comparing modification time and size.</source>
+<target>Lorg faidhlichean a tha co-ionnann le bhith a' dèanamh coimeas eadar an cuid meud is ama.</target>
-<source>&Don't show this dialog again</source>
-<target>&Na seall an còmhradh seo a-rithist</target>
+<source>Identify equal files by comparing the file content.</source>
+<target>Lorg faidhlichean a tha co-ionnann le bhith a' dèanamh coimeas eadar susbaint nam faidhlichean.</target>
-<source>Select a variant</source>
-<target>Tagh eug-samhail</target>
+<source>Symbolic links:</source>
+<target>Ceanglaichean samhlachail:</target>
-<source>
-Files are found equal if
- - last write time and date
- - file size
-are the same
-</source>
-<target>
-Bidh dà fhaidhle co-ionnann 'nar beachd-sa
- - ma tha àm is ceann-là an sgrìobhaidh mu dheireadh
- - ma tha am meud
-co-ionnann
-</target>
-
-<source>
-Files are found equal if
- - file content
-is the same
-</source>
-<target>
-Bidh dà fhaidhle co-ionnann 'nar beachd-sa
- - susbaint an dà fhaidhle co-ionnann
-</target>
-
-<source>Symbolic Link handling</source>
-<target>Làimhseachadh nan symbolic links</target>
-
-<source>Help</source>
-<target>Cobhair</target>
+<source>More information</source>
+<target>Barrachd fiosrachaidh</target>
<source>OK</source>
<target>Ceart ma-thà</target>
@@ -818,11 +812,11 @@ Bidh dà fhaidhle co-ionnann 'nar beachd-sa
<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
<target>Lorg is sìolaich na h-atharraichean air an dà thaobh. Mothaichidh sinn do rudan a chaidh a sguabadh às, a ghluasad no còmhstrithean gu fèin-obrachail le stòr-dàta.</target>
-<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
-<target>Dèan lethbhreac-glèidhidh 's tu a' sgàthanadh a' phasgain air an taobh chlì. Thèid am pasgan air an taobh deas a chur air gleus ach am bi e gu tur co-ionnann ris a' phasgan air an taobh chlì as dèidh dha sioncronachadh.</target>
+<source>Create a mirror backup of the left folder which exactly matches the right folder after synchronization.</source>
+<target>Cruthaich lethbhreac-glèidhidh sgàthanaichte dhen phasgan air an taobh chlì a bhios gu tur co-ionnann ris a' phasgan air an taobh deas an dèidh sioncronachaidh.</target>
-<source>Copy new or updated files to right folder.</source>
-<target>Cuir lethbhreac de dh'fhaidhlichean a tha ùr no ùraichte dhan phasgan air an taobh deas.</target>
+<source>Copy new and updated files to the right folder.</source>
+<target>Cuir lethbhreac de dh'fhaidhlichean ùra 's ùraichte dhan phasgan air an taobh deas.</target>
<source>Configure your own synchronization rules.</source>
<target>Sònraich riaghailtean sioncronachaidh thu fhèin.</target>
@@ -833,23 +827,8 @@ Bidh dà fhaidhle co-ionnann 'nar beachd-sa
<source>Requires database files. Not supported by all file systems.</source>
<target>Feumaidh seo faidhlichean stòir-dhàta. Chan eil gach siostam fhaidhlichean a' cur taic ri seo.</target>
-<source>Error handling</source>
-<target>Làimhseachadh mhearachdan</target>
-
-<source>Ignore</source>
-<target>Leig seachad</target>
-
-<source>Hide all error and warning messages</source>
-<target>Falaich gach teachdaireachd mu mhearachdan no rabhaidhean</target>
-
-<source>Pop-up</source>
-<target>Priob-uinneag</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Seall priob-uinneagan a thaobh mhearachdan no rabhaidhean</target>
-
-<source>Deletion handling</source>
-<target>Mar a dhèiligear ri sguabadh às</target>
+<source>Delete files:</source>
+<target>Sguab às na faidhlichean:</target>
<source>Permanent</source>
<target>Buan</target>
@@ -872,111 +851,174 @@ Bidh dà fhaidhle co-ionnann 'nar beachd-sa
<source>Naming convention:</source>
<target>Gnàthas nan ainmean:</target>
-<source>Batch job</source>
-<target>Obair baidse</target>
+<source>Show examples</source>
+<target>Seall buill-eisimpleir</target>
+
+<source>Handle errors:</source>
+<target>Mearachdan làimhseachaidh:</target>
+
+<source>Ignore</source>
+<target>Leig seachad</target>
+
+<source>Hide all error and warning messages</source>
+<target>Falaich gach teachdaireachd mu mhearachdan no rabhaidhean</target>
+
+<source>Pop-up</source>
+<target>Priob-uinneag</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Seall priob-uinneagan a thaobh mhearachdan no rabhaidhean</target>
+
+<source>On completion:</source>
+<target>An dèidh coileanaidh:</target>
+
+<source>Start synchronization now?</source>
+<target>A bheil thu airson tòiseachadh air an t-sioncronachadh an-dràsta?</target>
+
+<source>Variant:</source>
+<target>Eug-samhail:</target>
+
+<source>Statistics</source>
+<target>Stats</target>
+
+<source>&Don't show this dialog again</source>
+<target>&Na seall an còmhradh seo a-rithist</target>
+
+<source>Items found:</source>
+<target>Rudan a chaidh a lorg:</target>
+
+<source>Speed:</source>
+<target>Astar:</target>
+
+<source>Time remaining:</source>
+<target>An ùine a tha air fhàgail:</target>
+
+<source>Time elapsed:</source>
+<target>An ùine a dh'fhalbh:</target>
+
+<source>Synchronizing...</source>
+<target>A' sioncronachadh...</target>
+
+<source>Minimize to notification area</source>
+<target>Lùghdach 's gluais gu raon nam brathan</target>
+
+<source>Close</source>
+<target>Dùin</target>
+
+<source>&Pause</source>
+<target>&Cuir 'na stad</target>
+
+<source>Stop</source>
+<target>Sguir dheth</target>
<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
<target>Cruthaich faidhle batch airson sioncronachadh a dh'obraicheas gun thusa a bhith an làthair. Gus a thòiseachadh, dèan briogadh dùbailte air an fhaidhle seo ann am planadair shaothraichean: %x</target>
-<source>Exit</source>
-<target>Fàg an-seo</target>
-
-<source>Abort synchronization on first error</source>
-<target>Sguir dhen t-sioncronachadh nuair a thachras a' chiad mhearachd</target>
+<source>Stop synchronization at first error</source>
+<target>Sguir dhen t-sioncronachadh aig a' chiad mhearachd</target>
<source>Show progress dialog</source>
<target>Seall còmhradh an adhartais</target>
-<source>Save log</source>
-<target>Sàbhail an loga</target>
-
-<source>Select folder to save log files</source>
-<target>Tagh pasgan far an dèid faidhlichean an loga a shàbhaladh</target>
+<source>Save log:</source>
+<target>Sàbhail an loga:</target>
-<source>Limit</source>
-<target>Cuingich</target>
+<source>Limit:</source>
+<target>Crìoch:</target>
<source>Limit maximum number of log files</source>
<target>Cuingich an àireamh as motha de dh'fhaidhlichean an loga</target>
+<source>How can I schedule a batch job?</source>
+<target>Ciamar a chuireas mi obair baidse air an sgeideal?</target>
+
+<source>&Recycle bin</source>
+<target>A&m biona</target>
+
<source>Delete on both sides</source>
<target>Sguab às air an dà thaobh</target>
<source>Delete on both sides even if the file is selected on one side only</source>
<target>Sguab às air an dà thaobh fiù mur an deach am faidhle a thaghadh ach air aon taobh</target>
-<source>
-Files will only be synchronized if they pass all filter rules.
-Note: File paths must be relative to base directories.
-</source>
-<target>
-Cha dèidh faidhlichean a shioncronachadh ach ma choileanas iad gach riaghailte na criathraige.
-An aire: Feumaidh slighean nam faidhlichean a bhith dàimheach ris na bun-phasganan.
-</target>
+<source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source>
+<target>Tagh riaghailteach criathraidh gus seòrsachan àraidh de dh'fhaidhlichean fhàgail às an t-sioncronachadh. Cuir a-steach slighean fhaidhlichean a-rèir paidhir an dà phasgan aca.</target>
-<source>Include</source>
-<target>Gabh a-steach</target>
+<source>Include:</source>
+<target>Gabh a-staigh:</target>
-<source>Exclude</source>
-<target>Dùin a-mach</target>
+<source>Exclude:</source>
+<target>Dùin a-mach:</target>
-<source>Time span</source>
-<target>Raon-ama</target>
+<source>Time span:</source>
+<target>An rainse ama:</target>
-<source>File size</source>
-<target>Meudh an fhaidhle</target>
+<source>File size:</source>
+<target>Meud an fhaidhle:</target>
-<source>Minimum</source>
-<target>Air a' char as lugha</target>
+<source>Minimum:</source>
+<target>Air a' char as lugha:</target>
-<source>Maximum</source>
-<target>Air a' char as motha</target>
+<source>Maximum:</source>
+<target>Air a' char as motha:</target>
<source>&Clear</source>
<target>Fala&mhaich</target>
-<source>Global settings</source>
-<target>Na roghainnean uile-choitcheann</target>
+<source>The following settings are used for all synchronization jobs.</source>
+<target>Thèid na roghainnean a leanas a chleachdadh airson a h-uile obair sioncronachaidh.</target>
<source>Fail-safe file copy</source>
<target>Dèan lethbhreac nach gabh fàilligeadh</target>
-<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
-<target>Cuir lethbhreac dheth ann am faidhle sealach (*.ffs_tmp) an toiseach is thoir ainm ùr air an uairsin. Leis a seo, bidh staid sheasmhach agad fiù ma thachras mearachd mharbhtach.</target>
+<source>
+Copy to a temporary file (*.ffs_tmp) before overwriting target.
+This guarantees a consistent state even in case of a serious error.
+</source>
+<target>
+Cuir lethbhreac dheth ann am faidhle sealach (*.ffs_tmp) mus sgrìobhar thairis air an targaid.
+Nì seo cinnteach gum bi fuasgladh ann ma thachras mearachd mhòr.
+</target>
+
+<source>(recommended)</source>
+<target>(mholamaid seo)</target>
<source>Copy locked files</source>
<target>Dèan lethbhreac de dh'fhaidhlichean glaiste</target>
-<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
-<target>Dèan lethbhreac de dh'fhaidhlichean co-roinnte no glaiste le seirbheis lethbhreacan sgàil an draibh (feumaidh seo còraichean rianaire)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service.</source>
+<target>Dèan lethbhreac de dh'fhaidhlichean co-roinnte no glaiste le seirbheis lethbhreacan sgàil an draibh.</target>
+
+<source>(requires administrator rights)</source>
+<target>(feumaidh seo còraichean rianadair)</target>
<source>Copy file access permissions</source>
<target>Dèan lethbhreac de cheadan-inntrigidh nam faidhle</target>
-<source>Transfer file and folder permissions (requires administrator rights)</source>
-<target>Tar-chuir ceadan nam faidhlichean 's nam pasganan (feumaidh seo còraichean rianaire)</target>
+<source>Transfer file and folder permissions.</source>
+<target>Tar-chuir am faidhle 's ceadan a' phasgain</target>
+
+<source>Automatic retry on error:</source>
+<target>Feuch ris a-rithist gu fèin-obrachail ri linn mearachd:</target>
-<source>Restore hidden dialogs</source>
-<target>Aisig na còmhraidhean falaichte</target>
+<source>Retry count:</source>
+<target>Co mheud turas a dh'fheudadh ris a-rithist:</target>
-<source>External applications</source>
-<target>Aplacaidean air an taobh a-muigh</target>
+<source>Delay (in seconds):</source>
+<target>An dàil (ann an diogan):</target>
+
+<source>Customize context menu:</source>
+<target>Gnàthaich an clàr-taice co-theacsail</target>
<source>Description</source>
<target>Tuairisgeul</target>
+<source>Restore hidden windows</source>
+<target>Aisig na h-uinneagan falaichte</target>
+
<source>&Default</source>
<target>&Bun-roghainn</target>
-<source>Find what:</source>
-<target>Lorg na leanas:</target>
-
-<source>Match case</source>
-<target>An aire do litrichean mòra 's beaga</target>
-
-<source>&Find next</source>
-<target>&Lorg an ath-fhear</target>
-
<source>Source code written in C++ using:</source>
<target>Chaidh an còd tùsail a sgrìobhadh ann an C++ le taic:</target>
@@ -1001,43 +1043,37 @@ An aire: Feumaidh slighean nam faidhlichean a bhith dàimheach ris na bun-phasga
<source>Many thanks for localization:</source>
<target>Tha sinn fada an comain nan daoine a leanas airson eadar-theangachadh:</target>
-<source>Start synchronization</source>
-<target>Tòisich air an t-sioncronachadh</target>
+<source>Save as Batch Job</source>
+<target>Sàbhail mar obair baidse</target>
-<source>Comparison settings</source>
-<target>Roghainnean a' choimeasaidh</target>
+<source>Delete Items</source>
+<target>Sguab às na nithean</target>
-<source>Synchronization settings</source>
-<target>Roghainnean an t-sioncronachaidh</target>
+<source>Global Settings</source>
+<target>Na roghainnean uile-choitcheann</target>
-<source>Delete</source>
-<target>Sguab às</target>
+<source>Select Time Span</source>
+<target>Tagh an rainse ama</target>
-<source>Configure filter</source>
-<target>Rèitich a' chriathrag</target>
+<source>Folder Pairs</source>
+<target>Paidhrichean nam pasganan</target>
<source>Find</source>
<target>Lorg</target>
-<source>Select time span</source>
-<target>Tagh an raon-ama</target>
-
-<source>Folder pairs</source>
-<target>Paidhrichean phasgan</target>
-
<source>Overview</source>
<target>Foir-shealladh</target>
<source>Configuration</source>
<target>Rèiteachadh</target>
-<source>Main bar</source>
+<source>Main Bar</source>
<target>Am prìomh-bhàr</target>
-<source>Filter files</source>
+<source>Filter Files</source>
<target>Criathraich na faidhlichean</target>
-<source>Select view</source>
+<source>Select View</source>
<target>Tagh sealladh</target>
<source>Open...</source>
@@ -1049,20 +1085,29 @@ An aire: Feumaidh slighean nam faidhlichean a bhith dàimheach ris na bun-phasga
<source>Compare both sides</source>
<target>Dèan coimeas air an dà thaobh</target>
+<source>Comparison settings</source>
+<target>Roghainnean a' choimeasaidh</target>
+
+<source>Synchronization settings</source>
+<target>Roghainnean an t-sioncronachaidh</target>
+
+<source>Start synchronization</source>
+<target>Tòisich air an t-sioncronachadh</target>
+
+<source>Confirm</source>
+<target>Dearbh</target>
+
<source>
-<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for one item?</pluralform>
<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
</source>
<target>
-<pluralform>A bheil thu cinnteach gu bheil thu airson an àithne %y a ruith air %x nì?</pluralform>
-<pluralform>A bheil thu cinnteach gu bheil thu airson an àithne %y a ruith air %x nì?</pluralform>
-<pluralform>A bheil thu cinnteach gu bheil thu airson an àithne %y a ruith air %x nithean?</pluralform>
-<pluralform>A bheil thu cinnteach gu bheil thu airson an àithne %y a ruith air %x nì?</pluralform>
+<pluralform>A bheil thu cinnteach gu bheil thu airson an àithne seo (%y) a ruith air %x nì?</pluralform>
+<pluralform>A bheil thu cinnteach gu bheil thu airson an àithne seo (%y) a ruith air %x nì?</pluralform>
+<pluralform>A bheil thu cinnteach gu bheil thu airson an àithne seo (%y) a ruith air %x nithean?</pluralform>
+<pluralform>A bheil thu cinnteach gu bheil thu airson an àithne seo (%y) a ruith air %x nì?</pluralform>
</target>
-<source>Confirm</source>
-<target>Dearbh</target>
-
<source>&Execute</source>
<target>&Cuir an gnìomh</target>
@@ -1102,12 +1147,6 @@ An aire: Feumaidh slighean nam faidhlichean a bhith dàimheach ris na bun-phasga
<source>Set direction:</source>
<target>Suidhich a' chomhair:</target>
-<source>Exclude temporarily</source>
-<target>Dùin a-mach gu sealach</target>
-
-<source>Include temporarily</source>
-<target>Gabh a-steach gu sealach</target>
-
<source>multiple selection</source>
<target>Ioma-thaghadh</target>
@@ -1117,6 +1156,15 @@ An aire: Feumaidh slighean nam faidhlichean a bhith dàimheach ris na bun-phasga
<source>Exclude via filter:</source>
<target>Dùin a-mach le criathrag:</target>
+<source>Exclude temporarily</source>
+<target>Dùin a-mach gu sealach</target>
+
+<source>Include temporarily</source>
+<target>Gabh a-steach gu sealach</target>
+
+<source>Delete</source>
+<target>Sguab às</target>
+
<source>Include all</source>
<target>Gabh a-steach na h-uile</target>
@@ -1159,11 +1207,14 @@ An aire: Feumaidh slighean nam faidhlichean a bhith dàimheach ris na bun-phasga
<source>Do you want to save changes to %x?</source>
<target>An sàbhail sinn dhut na h-atharraichean air %x?</target>
+<source>Never save &changes</source>
+<target>Na sàbhail atharrai&chean idir</target>
+
<source>Do&n't save</source>
<target>&Na sàbhail</target>
-<source>Never save &changes</source>
-<target>Na sàbhail atharrai&chean idir</target>
+<source>Filter</source>
+<target>Criathrag</target>
<source>Show files that exist on left side only</source>
<target>Na seall ach faidhlichean a tha air an taobh chlì a-mhàin</target>
@@ -1210,12 +1261,18 @@ An aire: Feumaidh slighean nam faidhlichean a bhith dàimheach ris na bun-phasga
<source>Set as default</source>
<target>Suidhich mar a' bhun-roghainn</target>
-<source>Operation aborted</source>
-<target>Sguireadh dhen ghnìomh</target>
-
<source>All folders are in sync</source>
<target>Tha gach pasgan air a shioncronachadh</target>
+<source>Synchronization Settings</source>
+<target>Roghainnean an t-sioncronachaidh</target>
+
+<source>Comparison Settings</source>
+<target>Roghainnean a' choimeasaidh</target>
+
+<source>Cannot find %x</source>
+<target>Chan urrainn dhuinn %x a lorg.</target>
+
<source>Comma-separated values</source>
<target>Luachan le cromagan eatarra</target>
@@ -1225,30 +1282,6 @@ An aire: Feumaidh slighean nam faidhlichean a bhith dàimheach ris na bun-phasga
<source>Searching for program updates...</source>
<target>A' lorg ùrachaidhean a' phrògraim...</target>
-<source>&Ignore subsequent errors</source>
-<target>Le&ig seachad mearachdan às a dhèidh seo</target>
-
-<source>&Ignore</source>
-<target>&Leig seachad</target>
-
-<source>Fatal Error</source>
-<target>Mearachd mharbhtach</target>
-
-<source>&Don't show this warning again</source>
-<target>Na seall an rabha&dh seo a-rithist</target>
-
-<source>&Switch</source>
-<target>&Dèan suids</target>
-
-<source>Question</source>
-<target>Ceist</target>
-
-<source>&Yes</source>
-<target>&Tha</target>
-
-<source>&No</source>
-<target>&Chan eil</target>
-
<source>Scanning...</source>
<target>'Ga sganadh...</target>
@@ -1258,14 +1291,17 @@ An aire: Feumaidh slighean nam faidhlichean a bhith dàimheach ris na bun-phasga
<source>Info</source>
<target>Fiosrachadh</target>
+<source>Warning</source>
+<target>Rabhadh</target>
+
<source>Paused</source>
<target>'Na stad</target>
<source>Initializing...</source>
<target>A' tòiseachadh...</target>
-<source>Aborted</source>
-<target>Air sgur dheth</target>
+<source>Stopped</source>
+<target>Chaidh stad a chur air</target>
<source>Completed</source>
<target>Deiseil</target>
@@ -1276,12 +1312,6 @@ An aire: Feumaidh slighean nam faidhlichean a bhith dàimheach ris na bun-phasga
<source>Log</source>
<target>Logaich</target>
-<source>Cannot find %x</source>
-<target>Chan urrainn dhuinn %x a lorg.</target>
-
-<source>Inactive</source>
-<target>Neo-ghnìomhach</target>
-
<source>Today</source>
<target>An-diugh</target>
@@ -1306,9 +1336,6 @@ An aire: Feumaidh slighean nam faidhlichean a bhith dàimheach ris na bun-phasga
<source>MB</source>
<target>MB</target>
-<source>Filter</source>
-<target>Criathrag</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>
@@ -1320,6 +1347,9 @@ An aire: Feumaidh slighean nam faidhlichean a bhith dàimheach ris na bun-phasga
<pluralform>A bheil thu cinnteach gu bheil thu airson an %x nì seo a chur dhan bhiona?</pluralform>
</target>
+<source>Move</source>
+<target>Gluais</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>
@@ -1331,6 +1361,9 @@ An aire: Feumaidh slighean nam faidhlichean a bhith dàimheach ris na bun-phasga
<pluralform>A bheil thu cinnteach gu bheil thu airson na %x nì seo a sguabadh às?</pluralform>
</target>
+<source>Exclude</source>
+<target>Dùin a-mach</target>
+
<source>Direct</source>
<target>Dìreach</target>
@@ -1355,8 +1388,8 @@ An aire: Feumaidh slighean nam faidhlichean a bhith dàimheach ris na bun-phasga
<source>- Other side's counterpart to %item_folder%</source>
<target>- Seise %item_folder% aig a' choimpiutair eile</target>
-<source>Make hidden warnings and dialogs visible again?</source>
-<target>A bheil thus airson na rabhaidhean 's còmraidhean falaichte fhaicinn a-rithist?</target>
+<source>Restore all hidden windows and warnings?</source>
+<target>A bheil thu airson gach uinneag is rabhadh falaichte aiseaga?</target>
<source>Leave as unresolved conflict</source>
<target>Fàg mar còmhstri gun rèiteachadh</target>
@@ -1487,14 +1520,14 @@ An aire: Feumaidh slighean nam faidhlichean a bhith dàimheach ris na bun-phasga
<pluralform>%x latha</pluralform>
</target>
-<source>Failed to register to receive system messages.</source>
-<target>Cha b' urrainn dhuinn clàraidh airson teachdaireachdan an t-siostaim.</target>
+<source>Unable to register to receive system messages.</source>
+<target>Chan urrainn dhuinn clàradh gus teachdaireachdan an t-siostaim fhaighinn.</target>
<source>Cannot set privilege %x.</source>
<target>Cha ghabh a' phribhleid %x a shuidheachadh.</target>
-<source>Failed to suspend system sleep mode.</source>
-<target>Cha b' urrainn dhuinn modh cadal an t-siostaim a chur dheth.</target>
+<source>Unable to suspend system sleep mode.</source>
+<target>Chan urrainn dhuinn modh cadal an t-siostaim a chur dheth.</target>
<source>Cannot change process I/O priorities.</source>
<target>Chan urrainn dhuinn na prìomhachasan I/O atharrachadh.</target>
diff --git a/BUILD/Languages/serbian.lng b/BUILD/Languages/serbian.lng
index 9af8b193..679cfbe1 100644
--- a/BUILD/Languages/serbian.lng
+++ b/BUILD/Languages/serbian.lng
@@ -2,181 +2,15 @@
<language>Cрпски</language>
<translator>Балкански Шпијун</translator>
<locale>sr_RS</locale>
- <flag_image>flag_serbia.png</flag_image>
- <plural_form_count>3</plural_form_count>
+ <image>flag_serbia.png</image>
+ <plural_count>3</plural_count>
<plural_definition>n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2</plural_definition>
</header>
-<source>Unable to move %x to the recycle bin.</source>
-<target></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>
-</target>
-
-<source>Log</source>
-<target></target>
-
-<source>&Continue</source>
-<target></target>
-
-<source>&Don't show this warning again</source>
-<target></target>
-
-<source>&Ignore subsequent errors</source>
-<target></target>
-
-<source>Comma-separated values</source>
-<target></target>
-
-<source>Never save &changes</source>
-<target></target>
-
-<source>Include via filter:</source>
-<target></target>
-
-<source>&Execute</source>
-<target></target>
-
-<source>Confirm</source>
-<target></target>
-
-<source>
-<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
-<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
-</source>
-<target>
-</target>
-
-<source>Transfer file and folder permissions (requires administrator rights)</source>
-<target></target>
-
-<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
-<target></target>
-
-<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
-<target></target>
-
-<source>
-Files will only be synchronized if they pass all filter rules.
-Note: File paths must be relative to base directories.
-</source>
-<target></target>
-
-<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
-<target></target>
-
-<source>Move files to a user-defined folder</source>
-<target></target>
-
-<source>Back up deleted and overwritten files in the recycle bin</source>
-<target></target>
-
-<source>Recycle bin</source>
-<target></target>
-
-<source>Requires database files. Not supported by all file systems.</source>
-<target></target>
-
-<source>Detect moved files</source>
-<target></target>
-
-<source>&Don't show this dialog again</source>
-<target></target>
-
-<source>Minimize to notification area</source>
-<target></target>
-
-<source>Retrying operation after error:</source>
-<target></target>
-
-<source>job name</source>
-<target></target>
-
-<source>Creating a Volume Shadow Copy for %x...</source>
-<target></target>
-
-<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
-<target></target>
-
-<source>&Show error</source>
-<target></target>
-
-<source>Waiting until all directories are available...</source>
-<target></target>
-
-<source>Directory monitoring active</source>
-<target></target>
-
-<source>Volume name %x is not part of file path %y.</source>
-<target></target>
-
-<source>Cannot access the Volume Shadow Copy Service.</source>
-<target></target>
-
-<source>%x items</source>
-<target></target>
-
-<source>
-<pluralform>1 thread</pluralform>
-<pluralform>%x threads</pluralform>
-</source>
-<target>
-</target>
-
-<source>
-<pluralform>1 byte</pluralform>
-<pluralform>%x bytes</pluralform>
-</source>
-<target>
-</target>
-
-<source>Any number of alternative directories for at most one config file.</source>
-<target></target>
-
-<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
-<target></target>
-
-<source>directory</source>
-<target></target>
-
-<source>config files</source>
-<target></target>
-
-<source>Syntax:</source>
-<target></target>
-
-<source>Directories cannot be set for more than one configuration file.</source>
+<source>&Check</source>
<target></target>
-<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
-<target></target>
-
-<source>Unequal number of left and right directories specified.</source>
-<target></target>
-
-<source>Cannot open file %x.</source>
-<target></target>
-
-<source>Syntax error</source>
-<target></target>
-
-<source>A directory path is expected after %x.</source>
-<target></target>
-
-<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source>
-<target></target>
-
-<source>Moving symbolic link %x to the recycle bin</source>
-<target></target>
-
-<source>Moving folder %x to the recycle bin</source>
-<target></target>
-
-<source>Moving file %x to the recycle bin</source>
+<source>Retrying operation...</source>
<target></target>
<source>Both sides have changed since last synchronization.</source>
@@ -197,6 +31,15 @@ Note: File paths must be relative to base directories.
<source>Checking recycle bin availability for folder %x...</source>
<target>Проверавам доступност Корпе за смеће за фолдер %x...</target>
+<source>Moving file %x to the recycle bin</source>
+<target>Премештам датотеку %x у Корпи за смеће</target>
+
+<source>Moving folder %x to the recycle bin</source>
+<target>Премештам фолдер %x у Корпи за смеће</target>
+
+<source>Moving symbolic link %x to the recycle bin</source>
+<target>Премештам симболичну везу %x у Корпи за смеће</target>
+
<source>Deleting file %x</source>
<target>Брисање датотеке %x</target>
@@ -206,21 +49,51 @@ Note: File paths must be relative to base directories.
<source>Deleting symbolic link %x</source>
<target>Брисање симболичне везе %x</target>
+<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<target>Корпа за смеће није доступна за следеће фолдере. Уместо тога датотеке биће обрисане трајно:</target>
+
<source>An exception occurred</source>
<target>Догодило се изузеће</target>
-<source>Error</source>
-<target>Грешка</target>
+<source>A directory path is expected after %x.</source>
+<target>Путања фолдера се очекује после %x.</target>
+
+<source>Syntax error</source>
+<target>Синтаксичка грешка</target>
+
+<source>Cannot open file %x.</source>
+<target>Не могу отворити датотеку %x.</target>
<source>File %x does not contain a valid configuration.</source>
<target>Датотека %x не садржи валидну конфигурацију.</target>
-<source>Warning</source>
-<target>Упозорење</target>
+<source>Unequal number of left and right directories specified.</source>
+<target>Неједнак број левих и десних фолдера је дефинисан.</target>
+
+<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
+<target>Конфигурациона датотека не сме садржавати подешавања на нивоу фолдерског пара када су фолдери подешени по командној линији.</target>
+
+<source>Directories cannot be set for more than one configuration file.</source>
+<target>Фолдери не могу бити подешени за више од једне конфигурационе датотеке.</target>
<source>Command line</source>
<target>Командна линија</target>
+<source>Syntax:</source>
+<target>Синтакса:</target>
+
+<source>config files</source>
+<target>конфигурационе датотеке</target>
+
+<source>directory</source>
+<target>фолдер</target>
+
+<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
+<target>Било који број FreeFileSync .ffs_gui и/или .ffs_batch конфигурационих датотека.</target>
+
+<source>Any number of alternative directories for at most one config file.</source>
+<target>Било који број алтернативних фолдера за најмање једну конфигурациону датотеку.</target>
+
<source>A folder input field is empty.</source>
<target>Поље за одабир фолдера је празно.</target>
@@ -378,6 +251,16 @@ Note: File paths must be relative to base directories.
<source>Total time:</source>
<target>Укупно време:</target>
+<source>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
+</source>
+<target>
+<pluralform>%x бајт</pluralform>
+<pluralform>%x бајта</pluralform>
+<pluralform>%x бајтова</pluralform>
+</target>
+
<source>%x MB</source>
<target>%x MB</target>
@@ -396,12 +279,25 @@ Note: File paths must be relative to base directories.
<source>Scanning:</source>
<target>Претражујем:</target>
+<source>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
+</source>
+<target>
+<pluralform>%x нит</pluralform>
+<pluralform>%x нити</pluralform>
+<pluralform>%x нити</pluralform>
+</target>
+
<source>Encoding extended time information: %x</source>
<target>Кодирам проширене информације о времену: %x</target>
<source>/sec</source>
<target>/сек</target>
+<source>%x items/sec</source>
+<target>%x ставки/секунди</target>
+
<source>Configuration file %x loaded partially only.</source>
<target>Датотека подешавања %x учитана само делимично.</target>
@@ -414,6 +310,9 @@ Note: File paths must be relative to base directories.
<source>Browse directory</source>
<target>Одабери фолдер</target>
+<source>Cannot access the Volume Shadow Copy Service.</source>
+<target>Не могу приступити Volume Shadow Copy сервису.</target>
+
<source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
<target>Молимо користите FreeFileSync 64-битну верзију за израду shadow копија на овом систему.</target>
@@ -423,11 +322,14 @@ Note: File paths must be relative to base directories.
<source>Cannot determine volume name for %x.</source>
<target>Не могу утврдити назив партиције за %x.</target>
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Прекид захтеван: Чека се да се тренутна акција заврши...</target>
+<source>Volume name %x is not part of file path %y.</source>
+<target>Назив партиције %x није део путање датотеке %y.</target>
+
+<source>Stop requested: Waiting for current operation to finish...</source>
+<target>Заустављање захтевано: Чека се да се тренутна акција заврши...</target>
-<source>Failure to create timestamp for versioning:</source>
-<target>Неуспело стварање временске ознаке за верзију:</target>
+<source>Unable to create timestamp for versioning:</source>
+<target>Није могуће стварање временске ознаке за верзију:</target>
<source>Cannot read the following XML elements:</source>
<target>Не могу прочитати следеће XML елементе:</target>
@@ -444,8 +346,8 @@ Note: File paths must be relative to base directories.
<source>&Program</source>
<target>&Програм</target>
-<source>&Content</source>
-<target>&Садржај</target>
+<source>&View help</source>
+<target>&Погледај помоћ</target>
<source>&About</source>
<target>&О програму</target>
@@ -468,8 +370,8 @@ Note: File paths must be relative to base directories.
<source>To get started just import a .ffs_batch file.</source>
<target>Да би почели увезите .ffs_batch датотеку.</target>
-<source>Folders to watch</source>
-<target>Фолдери за надгледање</target>
+<source>Folders to watch:</source>
+<target>Фолдери за надгледање:</target>
<source>Add folder</source>
<target>Додај фолдер</target>
@@ -483,12 +385,15 @@ Note: File paths must be relative to base directories.
<source>Select a folder</source>
<target>Одаберите фолдер</target>
-<source>Idle time [seconds]</source>
-<target>Време мировања [секунди]</target>
+<source>Idle time (in seconds):</source>
+<target>Време мировања (у секундама):</target>
<source>Idle time between last detected change and execution of command</source>
<target>Време мировања између задње препознате промене и извршења наредбе</target>
+<source>Command line:</source>
+<target>Командна линија:</target>
+
<source>
The command is triggered if:
- files or subfolders change
@@ -500,36 +405,45 @@ The command is triggered if:
- нови фолдери појаве (нпр. укључење USB стика)
</target>
-<source>Start</source>
-<target>Старт</target>
+<source>&Start</source>
+<target>&Покрени</target>
-<source>&Retry</source>
-<target>&Понови</target>
-
-<source>Cancel</source>
-<target>Одустани</target>
-
-<source>RealtimeSync - Automated Synchronization</source>
-<target>RealtimeSync - Аутоматска Синхронизација</target>
+<source>About</source>
+<target>О програму</target>
<source>Build: %x</source>
<target>Подверзија: %x</target>
-<source>About</source>
-<target>О програму</target>
-
<source>All files</source>
<target>Све датотеке</target>
+<source>Automated Synchronization</source>
+<target>Аутоматска синхронизација</target>
+
+<source>Directory monitoring active</source>
+<target>Активно надгледање фолдера</target>
+
+<source>Waiting until all directories are available...</source>
+<target>Чекање да сви фолдери буду доступни...</target>
+
+<source>Error</source>
+<target>Грешка</target>
+
<source>&Restore</source>
<target>&Врати</target>
+<source>&Show error</source>
+<target>&Прикажи грешку</target>
+
<source>&Exit</source>
<target>&Излаз</target>
-<source>Invalid command line:</source>
+<source>Incorrect command line:</source>
<target>Нетачна командна линија:</target>
+<source>&Retry</source>
+<target>&Понови</target>
+
<source>File content</source>
<target>Садржај датотеке</target>
@@ -590,8 +504,8 @@ The command is triggered if:
<source>Target folder input field must not be empty.</source>
<target>Поље за одабир одредишног фолдера не може бити празно.</target>
-<source>Folder input field for versioning must not be empty.</source>
-<target>Поље за одабир фолдера за верзионирање не може бити празно.</target>
+<source>Please enter a target folder for versioning.</source>
+<target>Молим унесите одредишни фолдер за верзионирање.</target>
<source>Source folder %x not found.</source>
<target>Изворни фолдер %x није пронађен.</target>
@@ -599,6 +513,9 @@ The command is triggered if:
<source>The following items have unresolved conflicts and will not be synchronized:</source>
<target>Следеће ставке имају неразрешених конфликата и неће бити синхронизоване:</target>
+<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
+<target>Следећи фолдери су значајно различити. Обезбедите да сигурно упарујете праве фолдере за синхронизацију.</target>
+
<source>Not enough free disk space available in:</source>
<target>Недовољно простора на диску у:</target>
@@ -617,11 +534,17 @@ The command is triggered if:
<source>Generating database...</source>
<target>Генерисање базе података...</target>
+<source>Creating a Volume Shadow Copy for %x...</source>
+<target>Креирање Volume Shadow Copy за %x...</target>
+
<source>Data verification error: %x and %y have different content.</source>
<target>Грешка при провери података: %x и %y имају различит садржај.</target>
-<source>Synchronization aborted</source>
-<target>Синхронизација прекинута</target>
+<source>job name</source>
+<target>име задатка</target>
+
+<source>Synchronization stopped</source>
+<target>Синхронизација заустављена</target>
<source>Synchronization completed with errors</source>
<target>Синхронизација завршена с грешкама</target>
@@ -638,11 +561,39 @@ The command is triggered if:
<source>Saving log file %x...</source>
<target>Уписујем лог датотеку %x...</target>
-<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
-<target>Притисни "Замени" за решавање проблема у FreeFileSync главном оквиру дијалога.</target>
+<source>You can switch to FreeFileSync's main window to resolve this issue.</source>
+<target>Можете се пребацити на главни прозор FreeFileSync-а да би разрешили ову ствар.</target>
+
+<source>&Don't show this warning again</source>
+<target>&Не приказуј ово упозорење поновно</target>
+
+<source>&Ignore</source>
+<target>&Игнориши</target>
+
+<source>&Switch</source>
+<target>&Замени</target>
+
+<source>Switching to FreeFileSync's main window</source>
+<target>Пребацујем се на главни прозор FreeFileSync-а</target>
+
+<source>
+<pluralform>Automatic retry in 1 second...</pluralform>
+<pluralform>Automatic retry in %x seconds...</pluralform>
+</source>
+<target>
+<pluralform>Аутоматски покушај за %x секунду...</pluralform>
+<pluralform>Аутоматски покушај за %x секунде...</pluralform>
+<pluralform>Аутоматски покушај за %x секунди...</pluralform>
+</target>
-<source>Switching to FreeFileSync main dialog</source>
-<target>Пребацујем се на главни оквир диалога FreeFileSync-а</target>
+<source>&Ignore subsequent errors</source>
+<target>&Занемари грешке које даље следе</target>
+
+<source>Serious Error</source>
+<target>Озбиљна грешка</target>
+
+<source>Check for Program Updates</source>
+<target>Провери постојање надоградње програма</target>
<source>A new version of FreeFileSync is available:</source>
<target>Нова верзија FreeFileSync је доступна:</target>
@@ -650,24 +601,21 @@ The command is triggered if:
<source>Download now?</source>
<target>Преузети сада?</target>
-<source>New version found</source>
-<target>Пронађена нова верзија</target>
-
<source>&Download</source>
<target>&Преузми</target>
<source>FreeFileSync is up to date.</source>
<target>FreeFileSync је ажуриран.</target>
-<source>Information</source>
-<target>Информација</target>
-
<source>Unable to connect to sourceforge.net.</source>
<target>Не могу се повезати на sourceforge.net.</target>
<source>Cannot find current FreeFileSync version number online. Do you want to check manually?</source>
<target>Не могу на мрежи пронаћи тренутни број верзије FreeFileSync-а. Да ли желите да проверите ручно?</target>
+<source>Copy</source>
+<target>Копирај</target>
+
<source>Symlink</source>
<target>Сим-веза</target>
@@ -719,20 +667,20 @@ The command is triggered if:
<source>Hibernate</source>
<target>Хибернација</target>
-<source>Selected variant:</source>
-<target>Одабрана варијанта:</target>
+<source>Alternate comparison settings</source>
+<target>Алтернативна подешавања упоређивања</target>
-<source>Select alternate comparison settings</source>
-<target>Изаберите алтернативна подешавања упоређивања</target>
+<source>Alternate synchronization settings</source>
+<target>Алтернативна подешавања синхронизације</target>
-<source>Select alternate synchronization settings</source>
-<target>Изаберите алтернативна подешавања синхронизације</target>
+<source>Local filter</source>
+<target>Локални филтер</target>
-<source>Filter is active</source>
-<target>Филтер је активан</target>
+<source>Active</source>
+<target>Активан</target>
-<source>No filter selected</source>
-<target>Ниједан филтер није одабран</target>
+<source>None</source>
+<target>Ниједан</target>
<source>Remove alternate settings</source>
<target>Уклони алтернативна подешавања</target>
@@ -740,12 +688,18 @@ The command is triggered if:
<source>Clear filter settings</source>
<target>Уклони подешавања филтера</target>
-<source>Copy</source>
-<target>Копирај</target>
-
<source>Paste</source>
<target>Залепи</target>
+<source>Alternate Comparison Settings</source>
+<target>Алтернативна подешавања упоређивања</target>
+
+<source>Alternate Synchronization Settings</source>
+<target>Алтернативна подешавања синхронизације</target>
+
+<source>Local Filter</source>
+<target>Локални филтер</target>
+
<source>&New</source>
<target>&Ново</target>
@@ -761,15 +715,18 @@ The command is triggered if:
<source>2. &Synchronize</source>
<target>2. &Синхронизуј</target>
+<source>&Global settings</source>
+<target>&Глобална подешавања</target>
+
<source>&Language</source>
<target>&Језик</target>
+<source>&Find...</source>
+<target>&Нађи...</target>
+
<source>&Export file list...</source>
<target>&Извоз листе датотека...</target>
-<source>&Global settings</source>
-<target>&Глобална подешавања</target>
-
<source>&Tools</source>
<target>&Алати</target>
@@ -779,17 +736,14 @@ The command is triggered if:
<source>Check &automatically once a week</source>
<target>Провери &аутоматски једном недељно</target>
-<source>Check for new &version</source>
-<target>Провери постојање нове &верзије</target>
+<source>&Check for new version</source>
+<target>&Провери постојање нове верзије</target>
<source>Compare</source>
<target>Упореди</target>
-<source>Comparison settings</source>
-<target>Подешавања упоређивања</target>
-
-<source>Synchronization settings</source>
-<target>Подешавања синхронизације</target>
+<source>Cancel</source>
+<target>Одустани</target>
<source>Synchronize</source>
<target>Синхронизуј</target>
@@ -803,6 +757,15 @@ The command is triggered if:
<source>Swap sides</source>
<target>Замени стране</target>
+<source>Close search bar</source>
+<target>Затвори траку за претраживање</target>
+
+<source>Find:</source>
+<target>Нађи:</target>
+
+<source>Match case</source>
+<target>По величини слова</target>
+
<source>Save as batch job</source>
<target>Сачувај као беч задатак</target>
@@ -824,86 +787,71 @@ The command is triggered if:
<source>Total bytes to copy</source>
<target>Укупно бајтова за копирање</target>
-<source>Items found:</source>
-<target>Пронађене ставке:</target>
+<source>Select a variant:</source>
+<target>Одаберите варијанту:</target>
-<source>Speed:</source>
-<target>Брзина:</target>
+<source>Identify equal files by comparing modification time and size.</source>
+<target>Идентификуј једнаке датотеке упоређивањем времена промена и величина.</target>
-<source>Time remaining:</source>
-<target>Преостало време:</target>
+<source>Identify equal files by comparing the file content.</source>
+<target>Идентификуј једнаке датотеке упоређивањем садржаја датотека.</target>
-<source>Time elapsed:</source>
-<target>Протекло време:</target>
+<source>Symbolic links:</source>
+<target>Симболичне везе:</target>
-<source>Synchronizing...</source>
-<target>Синхронизујем...</target>
+<source>More information</source>
+<target>Више информација</target>
-<source>On completion</source>
-<target>При завршетку</target>
+<source>OK</source>
+<target>У реду</target>
-<source>Close</source>
-<target>Затвори</target>
+<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
+<target>Пронађи и изврши промене на обе стране. Брисања, премештања и конфликти се откривају аутоматски употребом базе података.</target>
-<source>&Pause</source>
-<target>&Пауза</target>
+<source>Create a mirror backup of the left folder which exactly matches the right folder after synchronization.</source>
+<target>Креирај огледални бекап левог фолдера који ће се тачно подударати са десним фолдером након синхронизације.</target>
-<source>Variant</source>
-<target>Варијанта</target>
+<source>Copy new and updated files to the right folder.</source>
+<target>Копирај нове и ажуриране датотеке у десни фолдер.</target>
-<source>Statistics</source>
-<target>Статистика</target>
+<source>Configure your own synchronization rules.</source>
+<target>Конфигуришите ваша властита синхронизациона правила.</target>
-<source>Select a variant</source>
-<target>Одаберите варијанту</target>
+<source>Detect moved files</source>
+<target>Уочи премештене датотеке</target>
-<source>
-Files are found equal if
- - last write time and date
- - file size
-are the same
-</source>
-<target>
-Датотеке се сматрају једнаке ако су им
- - време задње промене и датум
- - величине датотека
-једнаки
-</target>
+<source>Requires database files. Not supported by all file systems.</source>
+<target>Потребне датотеке базе. Није подржано за све системе датотека.</target>
-<source>
-Files are found equal if
- - file content
-is the same
-</source>
-<target>
-Датотеке се сматрају једнаке ако им је
- - садржај датотеке
-једнак
-</target>
+<source>Delete files:</source>
+<target>Обриши датотеке:</target>
-<source>Symbolic Link handling</source>
-<target>Управљање симболичним везама</target>
+<source>Permanent</source>
+<target>Трајно</target>
+
+<source>Delete or overwrite files permanently</source>
+<target>Трајно избриши или замени датотеке</target>
-<source>Help</source>
-<target>Помоћ</target>
+<source>Recycle bin</source>
+<target>Корпа за смеће</target>
-<source>OK</source>
-<target>У реду</target>
+<source>Back up deleted and overwritten files in the recycle bin</source>
+<target>Направи резервне копије обрисаних и замењених датотека у Корпи за смеће</target>
-<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
-<target>Пронађи и изврши промене на обе стране. Брисања, премештања и конфликти се откривају аутоматски употребом базе података.</target>
+<source>Versioning</source>
+<target>Верзионирање</target>
-<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
-<target>Огледални бекап левог фолдера. Десни фолдер се модификује да би био једнак левом фолдеру након синхронизације.</target>
+<source>Move files to a user-defined folder</source>
+<target>Премести датотеке у кориснички одабран фолдер</target>
-<source>Copy new or updated files to right folder.</source>
-<target>Копирај нове или ажуриране датотеке у десни фолдер.</target>
+<source>Naming convention:</source>
+<target>Правило именовања:</target>
-<source>Configure your own synchronization rules.</source>
-<target>Конфигуришите ваша властита синхронизациона правила.</target>
+<source>Show examples</source>
+<target>Прикажи примере</target>
-<source>Error handling</source>
-<target>Грешка при обради</target>
+<source>Handle errors:</source>
+<target>Обрада грешака:</target>
<source>Ignore</source>
<target>Игнориши</target>
@@ -917,68 +865,71 @@ is the same
<source>Show pop-up on errors or warnings</source>
<target>Прикажи искачући прозор при грешкама и упозорењима</target>
-<source>Deletion handling</source>
-<target>Управљање при брисању</target>
+<source>On completion:</source>
+<target>При завршетку:</target>
-<source>Permanent</source>
-<target>Трајно</target>
+<source>Start synchronization now?</source>
+<target>Почни синхронизацију сада?</target>
-<source>Delete or overwrite files permanently</source>
-<target>Трајно избриши или замени датотеке</target>
+<source>Variant:</source>
+<target>Варијанта:</target>
-<source>Versioning</source>
-<target>Верзионирање</target>
+<source>Statistics</source>
+<target>Статистика</target>
-<source>Naming convention:</source>
-<target>Правило именовања:</target>
+<source>&Don't show this dialog again</source>
+<target>&Не приказуј овај диалог поновно</target>
-<source>Batch job</source>
-<target>Беч задатак</target>
+<source>Items found:</source>
+<target>Пронађене ставке:</target>
-<source>Exit</source>
-<target>Изађи</target>
+<source>Speed:</source>
+<target>Брзина:</target>
-<source>Abort synchronization on first error</source>
-<target>Прекини синхронизацију при првој грешци</target>
+<source>Time remaining:</source>
+<target>Преостало време:</target>
-<source>Show progress dialog</source>
-<target>Прикажи дијалог прогреса</target>
+<source>Time elapsed:</source>
+<target>Протекло време:</target>
-<source>Save log</source>
-<target>Сачувај лог</target>
+<source>Synchronizing...</source>
+<target>Синхронизујем...</target>
-<source>Select folder to save log files</source>
-<target>Одабери фолдер за чување лог датотека</target>
+<source>Minimize to notification area</source>
+<target>Минимизирај у области за обавештења</target>
-<source>Limit</source>
-<target>Ограничи</target>
+<source>Close</source>
+<target>Затвори</target>
-<source>Limit maximum number of log files</source>
-<target>Ограничи максималан број лог датотека</target>
+<source>&Pause</source>
+<target>&Пауза</target>
-<source>Source code written in C++ using:</source>
-<target>Изворни код написан у C++ уз коришћење:</target>
+<source>Stop</source>
+<target>Заустави</target>
-<source>If you like FreeFileSync</source>
-<target>Ако вам се свиђа FreeFileSync</target>
+<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>Креирај беч датотеку за ненадзирану синхронизацију. Да би почели, кликните дуплим кликом ову датотеку или додајте задатак у таск менаџеру: %x</target>
-<source>Donate with PayPal</source>
-<target>Донација са PayPal-ом</target>
+<source>Stop synchronization at first error</source>
+<target>Заустави синхронизацију при првој грешци</target>
-<source>Many thanks for localization:</source>
-<target>Велике похвале за локализацију:</target>
+<source>Show progress dialog</source>
+<target>Прикажи дијалог прогреса</target>
-<source>Feedback and suggestions are welcome</source>
-<target>Повратне информације и предлози су добродошли</target>
+<source>Save log:</source>
+<target>Сачувај лог:</target>
-<source>Homepage</source>
-<target>Веб страница</target>
+<source>Limit:</source>
+<target>Ограничи:</target>
-<source>Email</source>
-<target>И-меил</target>
+<source>Limit maximum number of log files</source>
+<target>Ограничи максималан број лог датотека</target>
-<source>Published under the GNU General Public License</source>
-<target>Објављено под ГНУ Општом јавном лиценцом</target>
+<source>How can I schedule a batch job?</source>
+<target>Како могу заказати беч задатак?</target>
+
+<source>&Recycle bin</source>
+<target>&Корпа за смеће</target>
<source>Delete on both sides</source>
<target>Избриши на обе стране</target>
@@ -986,91 +937,139 @@ is the same
<source>Delete on both sides even if the file is selected on one side only</source>
<target>Избриши на обе стране чак иако је датотека селектована само на једној страни</target>
-<source>Include</source>
-<target>Укључи</target>
+<source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source>
+<target>Одаберите филтерска подешавања да би искључили одређене датотеке из синхронизације. Унесите путање датотека релативно према њиховим одговарајућим фолдерским паровима.</target>
-<source>Exclude</source>
-<target>Искључи</target>
+<source>Include:</source>
+<target>Укључи:</target>
-<source>Time span</source>
-<target>Временско ограничење</target>
+<source>Exclude:</source>
+<target>Искључи:</target>
-<source>File size</source>
-<target>Величина датотеке</target>
+<source>Time span:</source>
+<target>Временско ограничење:</target>
-<source>Minimum</source>
-<target>Минимум</target>
+<source>File size:</source>
+<target>Величина датотеке:</target>
-<source>Maximum</source>
-<target>Максимум</target>
+<source>Minimum:</source>
+<target>Минимум:</target>
+
+<source>Maximum:</source>
+<target>Максимум:</target>
<source>&Clear</source>
<target>&Уклони</target>
-<source>Global settings</source>
-<target>Глобална подешавања</target>
+<source>The following settings are used for all synchronization jobs.</source>
+<target>Следећа подешавања се користе за све синхронизацијске задатке.</target>
<source>Fail-safe file copy</source>
<target>Копирање заштићено од грешака</target>
+<source>
+Copy to a temporary file (*.ffs_tmp) before overwriting target.
+This guarantees a consistent state even in case of a serious error.
+</source>
+<target>
+Копирај у привремену датотеку (*.ffs_tmp) пре уклањања циљане ставке.
+Ово гарантује непромењивост чак и у случају озбиљне грешке.
+</target>
+
+<source>(recommended)</source>
+<target>(препоручено)</target>
+
<source>Copy locked files</source>
<target>Копирај закључане датотеке</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service.</source>
+<target>Копирај дељене или закључане датотеке користећи Volume Shadow Copy сервис.</target>
+
+<source>(requires administrator rights)</source>
+<target>(потребна администраторска права)</target>
+
<source>Copy file access permissions</source>
<target>Копирај овлашћења приступа датотекама</target>
-<source>Restore hidden dialogs</source>
-<target>Прикажи скривене диалоге</target>
+<source>Transfer file and folder permissions.</source>
+<target>Премести овлашћења приступа датотека и фолдера.</target>
-<source>External applications</source>
-<target>Спољне апликације</target>
+<source>Automatic retry on error:</source>
+<target>Аутоматски покушај при грешци:</target>
+
+<source>Retry count:</source>
+<target>Број покушаја:</target>
+
+<source>Delay (in seconds):</source>
+<target>Паузирање (у секундама):</target>
+
+<source>Customize context menu:</source>
+<target>Прилагоди контекстни мени:</target>
<source>Description</source>
<target>Опис</target>
+<source>Restore hidden windows</source>
+<target>Прикажи скривене прозоре</target>
+
<source>&Default</source>
<target>&Подразумевано</target>
-<source>Find what:</source>
-<target>Нађи шта:</target>
+<source>Source code written in C++ using:</source>
+<target>Изворни код написан у C++ уз коришћење:</target>
-<source>Match case</source>
-<target>По величини слова</target>
+<source>If you like FreeFileSync</source>
+<target>Ако вам се свиђа FreeFileSync</target>
-<source>&Find next</source>
-<target>&Нађи следеће</target>
+<source>Donate with PayPal</source>
+<target>Донација са PayPal-ом</target>
-<source>Start synchronization</source>
-<target>Почни синхронизацију</target>
+<source>Feedback and suggestions are welcome</source>
+<target>Повратне информације и предлози су добродошли</target>
-<source>Delete</source>
-<target>Избриши</target>
+<source>Homepage</source>
+<target>Веб страница</target>
-<source>Configure filter</source>
-<target>Конфигуриши филтер</target>
+<source>Email</source>
+<target>И-меил</target>
-<source>Find</source>
-<target>Пронађи</target>
+<source>Published under the GNU General Public License</source>
+<target>Објављено под ГНУ Општом јавном лиценцом</target>
+
+<source>Many thanks for localization:</source>
+<target>Велике похвале за локализацију:</target>
+
+<source>Save as Batch Job</source>
+<target>Сачувај као беч задатак</target>
+
+<source>Delete Items</source>
+<target>Избриши ставке</target>
-<source>Select time span</source>
+<source>Global Settings</source>
+<target>Глобална подешавања</target>
+
+<source>Select Time Span</source>
<target>Изаберите временски распон</target>
-<source>Folder pairs</source>
+<source>Folder Pairs</source>
<target>Фолдерски парови</target>
+<source>Find</source>
+<target>Пронађи</target>
+
<source>Overview</source>
<target>Преглед</target>
<source>Configuration</source>
<target>Подешавања</target>
-<source>Main bar</source>
+<source>Main Bar</source>
<target>Главна трака</target>
-<source>Filter files</source>
-<target>Филтрирај датотеке</target>
+<source>Filter Files</source>
+<target>Филтрирање датотека</target>
-<source>Select view</source>
+<source>Select View</source>
<target>Изаберите приказ</target>
<source>Open...</source>
@@ -1082,6 +1081,31 @@ is the same
<source>Compare both sides</source>
<target>Упореди обе стране</target>
+<source>Comparison settings</source>
+<target>Подешавања упоређивања</target>
+
+<source>Synchronization settings</source>
+<target>Подешавања синхронизације</target>
+
+<source>Start synchronization</source>
+<target>Почни синхронизацију</target>
+
+<source>Confirm</source>
+<target>Потврди</target>
+
+<source>
+<pluralform>Do you really want to execute the command %y for one item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+<pluralform>Да ли стварно желите да извршите команду %y за %x ставку?</pluralform>
+<pluralform>Да ли стварно желите да извршите команду %y за %x ставке?</pluralform>
+<pluralform>Да ли стварно желите да извршите команду %y за %x ставки?</pluralform>
+</target>
+
+<source>&Execute</source>
+<target>&Изврши</target>
+
<source>
<pluralform>1 directory</pluralform>
<pluralform>%x directories</pluralform>
@@ -1115,17 +1139,23 @@ is the same
<source>Set direction:</source>
<target>Одабери смер:</target>
+<source>multiple selection</source>
+<target>вишеструки одабир</target>
+
+<source>Include via filter:</source>
+<target>Укључи по филтеру:</target>
+
+<source>Exclude via filter:</source>
+<target>Искључи преко филтера:</target>
+
<source>Exclude temporarily</source>
<target>Тренутно искључи</target>
<source>Include temporarily</source>
<target>Тренутно укључи</target>
-<source>multiple selection</source>
-<target>вишеструки одабир</target>
-
-<source>Exclude via filter:</source>
-<target>Искључи преко филтера:</target>
+<source>Delete</source>
+<target>Избриши</target>
<source>Include all</source>
<target>Укључи све</target>
@@ -1169,9 +1199,15 @@ is the same
<source>Do you want to save changes to %x?</source>
<target>Да ли желите сачувати промене за %x?</target>
+<source>Never save &changes</source>
+<target>Никад не сачувај &промене</target>
+
<source>Do&n't save</source>
<target>Не&мој сачувати</target>
+<source>Filter</source>
+<target>Филтрирање</target>
+
<source>Show files that exist on left side only</source>
<target>Прикажи датотеке које постоје само на левој страни</target>
@@ -1217,35 +1253,26 @@ is the same
<source>Set as default</source>
<target>Постави као подразумевано</target>
-<source>Operation aborted</source>
-<target>Операција отказана</target>
-
<source>All folders are in sync</source>
<target>Сви фолдери су синхронизовани</target>
-<source>File list exported</source>
-<target>Листа датотека експортована</target>
-
-<source>Searching for program updates...</source>
-<target>Претражујем ажурирање за програм...</target>
-
-<source>&Ignore</source>
-<target>&Игнориши</target>
+<source>Synchronization Settings</source>
+<target>Подешавања синхронизације</target>
-<source>Fatal Error</source>
-<target>Критична грешка</target>
+<source>Comparison Settings</source>
+<target>Подешавања упоређивања</target>
-<source>&Switch</source>
-<target>&Замени</target>
+<source>Cannot find %x</source>
+<target>Немогу пронаћи %x</target>
-<source>Question</source>
-<target>Питање</target>
+<source>Comma-separated values</source>
+<target>Зарезом одвојене вредности</target>
-<source>&Yes</source>
-<target>&Да</target>
+<source>File list exported</source>
+<target>Листа датотека експортована</target>
-<source>&No</source>
-<target>&Не</target>
+<source>Searching for program updates...</source>
+<target>Претражујем ажурирање за програм...</target>
<source>Scanning...</source>
<target>Прегледавање...</target>
@@ -1256,23 +1283,26 @@ is the same
<source>Info</source>
<target>Инфо</target>
+<source>Warning</source>
+<target>Упозорење</target>
+
<source>Paused</source>
<target>Паузирано</target>
<source>Initializing...</source>
<target>Покретање...</target>
-<source>Aborted</source>
-<target>Прекинуто</target>
+<source>Stopped</source>
+<target>Заустављено</target>
<source>Completed</source>
<target>Завршено</target>
-<source>Cannot find %x</source>
-<target>Немогу пронаћи %x</target>
+<source>&Continue</source>
+<target>&Настави</target>
-<source>Inactive</source>
-<target>Неактивно</target>
+<source>Log</source>
+<target>Лог</target>
<source>Today</source>
<target>Данас</target>
@@ -1298,8 +1328,18 @@ is the same
<source>MB</source>
<target>MB</target>
-<source>Filter</source>
-<target>Филтрирање</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>Да ли стварно желите да преместите следећу %x ставку у Корпи за смеће?</pluralform>
+<pluralform>Да ли стварно желите да преместите следеће %x ставке у Корпи за смеће?</pluralform>
+<pluralform>Да ли стварно желите да преместите следећих %x ставки у Корпи за смеће?</pluralform>
+</target>
+
+<source>Move</source>
+<target>Премести</target>
<source>
<pluralform>Do you really want to delete the following item?</pluralform>
@@ -1311,6 +1351,9 @@ is the same
<pluralform>Да ли стварно желите да обришете следећих %x ставки?</pluralform>
</target>
+<source>Exclude</source>
+<target>Искључи</target>
+
<source>Direct</source>
<target>Непосредно</target>
@@ -1335,8 +1378,8 @@ is the same
<source>- Other side's counterpart to %item_folder%</source>
<target>- Дупликат с друге стране у %item_folder%</target>
-<source>Make hidden warnings and dialogs visible again?</source>
-<target>Врати скривена упозорења и диалоге поновно видљивим?</target>
+<source>Restore all hidden windows and warnings?</source>
+<target>Прикажи све скривене прозоре и упозорења?</target>
<source>Leave as unresolved conflict</source>
<target>Остави као неразрешени конфликт</target>
@@ -1393,10 +1436,10 @@ is the same
<target>Не могу уписати време промене %x.</target>
<source>Cannot read security context of %x.</source>
-<target>Не могу читати безбедоносни садржај %x.</target>
+<target>Не могу читати безбедносни садржај %x.</target>
<source>Cannot write security context of %x.</source>
-<target>Не могу уписати безбедоносни садржај %x.</target>
+<target>Не могу уписати безбедносни садржај %x.</target>
<source>Cannot read permissions of %x.</source>
<target>Не могу читати овлашћења од %x.</target>
@@ -1464,18 +1507,21 @@ is the same
<pluralform>%x дана</pluralform>
</target>
-<source>Failed to register to receive system messages.</source>
-<target>Неуспела регистрација намењена пријему системских порука.</target>
+<source>Unable to register to receive system messages.</source>
+<target>Није могућа регистрација примања системских порука.</target>
<source>Cannot set privilege %x.</source>
<target>Не могу поставити права за %x.</target>
-<source>Failed to suspend system sleep mode.</source>
-<target>Неуспео покушај суспендовања мода спавања рачунара</target>
+<source>Unable to suspend system sleep mode.</source>
+<target>Није могуће суспендовање мода спавања система.</target>
<source>Cannot change process I/O priorities.</source>
<target>Не може се променити процес I/O приоритета</target>
+<source>Unable to move %x to the recycle bin.</source>
+<target>Није могуће преместити %x у Корпи за смеће.</target>
+
<source>Cannot determine final path for %x.</source>
<target>Не могу утврдити коначну путању за %x.</target>
diff --git a/BUILD/Languages/slovenian.lng b/BUILD/Languages/slovenian.lng
index 0f83331f..6591bc68 100644
--- a/BUILD/Languages/slovenian.lng
+++ b/BUILD/Languages/slovenian.lng
@@ -2,11 +2,24 @@
<language>Slovenščina</language>
<translator>Matej Badalič, Tine Mlakar</translator>
<locale>sl_SI</locale>
- <flag_image>flag_slovenia.png</flag_image>
- <plural_form_count>4</plural_form_count>
+ <image>flag_slovenia.png</image>
+ <plural_count>4</plural_count>
<plural_definition>n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3</plural_definition>
</header>
+<source>
+<pluralform>Do you really want to execute the command %y for one item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+</target>
+
+<source>&Check</source>
+<target></target>
+
+<source>Retrying operation...</source>
+<target></target>
+
<source>Both sides have changed since last synchronization.</source>
<target>Obe strani sta se spremenili od zadnje sinhronizacije.</target>
@@ -58,9 +71,6 @@
<source>Cannot open file %x.</source>
<target>Ne morem odpreti datoteke %x.</target>
-<source>Error</source>
-<target>Napaka</target>
-
<source>File %x does not contain a valid configuration.</source>
<target>Datoteka %x ne vsebuje veljavnih nastavitev</target>
@@ -70,12 +80,12 @@
<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
<target>Konfiguracijska datoteka ne sme vsebovati nastavitev na ravni imeniških parov, če so imeniki nastavljeni prek ukazne vrstice.</target>
-<source>Warning</source>
-<target>Pozor</target>
-
<source>Directories cannot be set for more than one configuration file.</source>
<target>Imeniki ne morejo biti nastavljeni za eč kot eno konfiguracijsko datoteko.</target>
+<source>Command line</source>
+<target>Ukazna vrstica</target>
+
<source>Syntax:</source>
<target>Sintaksa:</target>
@@ -91,9 +101,6 @@
<source>Any number of alternative directories for at most one config file.</source>
<target>Poljubno število alternatvnih imenikov za največ eno konfiguracijsko datoteko.</target>
-<source>Command line</source>
-<target>Ukazna vrstica</target>
-
<source>A folder input field is empty.</source>
<target>Vnosno polje za mapo je prazno.</target>
@@ -298,8 +305,8 @@
<source>/sec</source>
<target>/sek</target>
-<source>%x items</source>
-<target>%x elementov</target>
+<source>%x items/sec</source>
+<target>%x elementov/s</target>
<source>Configuration file %x loaded partially only.</source>
<target>Nastavitvena datoteka %x naložena samo delno.</target>
@@ -328,11 +335,11 @@
<source>Volume name %x is not part of file path %y.</source>
<target>Ime nosilca %x ni del poti datoteke %y.</target>
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Zahtevana je bila prekinitev: čakam, da se zaključi trenutna operacija...</target>
+<source>Stop requested: Waiting for current operation to finish...</source>
+<target>Zahteva za ustavitev: Čakam da se trenutni proces zaključi...</target>
-<source>Failure to create timestamp for versioning:</source>
-<target>Napaka pri ustvarjanju časovne oznake pri ustvarjanju različic:</target>
+<source>Unable to create timestamp for versioning:</source>
+<target>Ne morem ustvariti časovnega žiga za verzioniranje:</target>
<source>Cannot read the following XML elements:</source>
<target>Ne morem brati naslednje XML elemente:</target>
@@ -349,8 +356,8 @@
<source>&Program</source>
<target>&Program</target>
-<source>&Content</source>
-<target>&Vsebina</target>
+<source>&View help</source>
+<target>&Prikaži pomoč</target>
<source>&About</source>
<target>&O programu</target>
@@ -362,7 +369,7 @@
<target>Uporaba:</target>
<source>1. Select folders to watch.</source>
-<target>1. Izberite mape za opazovanje</target>
+<target>1. Izberite imenike za opazovanje</target>
<source>2. Enter a command line.</source>
<target>2. Vnesite ukazno-vrstico.</target>
@@ -373,27 +380,30 @@
<source>To get started just import a .ffs_batch file.</source>
<target>Da začnete uvozite datoteko .ffs_batch</target>
-<source>Folders to watch</source>
-<target>Mape za opazovanje</target>
+<source>Folders to watch:</source>
+<target>Imeniki za pregled:</target>
<source>Add folder</source>
-<target>Dodaj mapo</target>
+<target>Dodaj imenik</target>
<source>Remove folder</source>
-<target>Odstrani v mapo</target>
+<target>Odstrani v imenik</target>
<source>Browse</source>
<target>Brskaj</target>
<source>Select a folder</source>
-<target>Izberite mapo</target>
+<target>Izberite imenik</target>
-<source>Idle time [seconds]</source>
-<target>Čas nedejavnosti [sekunde]</target>
+<source>Idle time (in seconds):</source>
+<target>Nedejavni čas (v sekundah):</target>
<source>Idle time between last detected change and execution of command</source>
<target>Čas nedejavnosti med zadnjo zaznano spremembo in izvršitvijo ukaza</target>
+<source>Command line:</source>
+<target>Ukazna vrstica:</target>
+
<source>
The command is triggered if:
- files or subfolders change
@@ -405,33 +415,30 @@ Ukaz se sproži če:
- pridejo nove mape (npr. ob vstavitvi USB ključka)
</target>
-<source>Start</source>
-<target>Začni</target>
-
-<source>&Retry</source>
-<target>&Ponovi</target>
-
-<source>Cancel</source>
-<target>Prekliči</target>
+<source>&Start</source>
+<target>&Zaženi</target>
-<source>RealtimeSync - Automated Synchronization</source>
-<target>RealtimeSync - Avtomatizirana sinhronizacija</target>
+<source>About</source>
+<target>O programu(1)</target>
<source>Build: %x</source>
<target>Izgradnja: %x</target>
-<source>About</source>
-<target>O programu(1)</target>
-
<source>All files</source>
<target>Vse datoteke</target>
+<source>Automated Synchronization</source>
+<target>Avtomatska sinhnorizacija</target>
+
<source>Directory monitoring active</source>
<target>Nadzor imenikov je aktven</target>
<source>Waiting until all directories are available...</source>
<target>Čakam da so vsi imeniki dostopni...</target>
+<source>Error</source>
+<target>Napaka</target>
+
<source>&Restore</source>
<target>&Obnovi</target>
@@ -441,11 +448,14 @@ Ukaz se sproži če:
<source>&Exit</source>
<target>&Izhod</target>
-<source>Invalid command line:</source>
+<source>Incorrect command line:</source>
<target>Napačna ukazna vrstica:</target>
+<source>&Retry</source>
+<target>&Ponovi</target>
+
<source>File content</source>
-<target>Vsebini datoteke</target>
+<target>Vsebina datoteke</target>
<source>File time and size</source>
<target>Čas in velikost datoteke</target>
@@ -504,8 +514,8 @@ Ukaz se sproži če:
<source>Target folder input field must not be empty.</source>
<target>Vnosno polje za ciljno mapo ne sme biti prazno.</target>
-<source>Folder input field for versioning must not be empty.</source>
-<target>Vnosno polje za ustvarjanje različic ne sme biti prazno.</target>
+<source>Please enter a target folder for versioning.</source>
+<target>Prosimo vnesite ciljno mapo za verzioniranje.</target>
<source>Source folder %x not found.</source>
<target>Izvorna mapa %x se ne najde.</target>
@@ -543,8 +553,8 @@ Ukaz se sproži če:
<source>job name</source>
<target>naziv opravila</target>
-<source>Synchronization aborted</source>
-<target>Sinhronizacija prekinjena</target>
+<source>Synchronization stopped</source>
+<target>Sinhnorizacija ustavljena</target>
<source>Synchronization completed with errors</source>
<target>Sinhronizacija se je končala z napakami</target>
@@ -561,14 +571,40 @@ Ukaz se sproži če:
<source>Saving log file %x...</source>
<target>Shranjujem datoteko beleženja %x...</target>
-<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
-<target>Pritisnite "Preklopi", da razrešite vprašanja v glavnem pogovornem oknu FreeFileSync.</target>
+<source>You can switch to FreeFileSync's main window to resolve this issue.</source>
+<target>Preklopite na FreeFileSync glavno okno za odpravo težave.</target>
+
+<source>&Don't show this warning again</source>
+<target>&Ne pokaži več tega opozorila</target>
+
+<source>&Ignore</source>
+<target>&Ignoriraj</target>
+
+<source>&Switch</source>
+<target>&Preklopi</target>
-<source>Switching to FreeFileSync main dialog</source>
-<target>Preklapljam na FreeFileSync osrednje pogovorno okno</target>
+<source>Switching to FreeFileSync's main window</source>
+<target>Preklopi na FreeFileSync glavno okno</target>
-<source>Retrying operation after error:</source>
-<target>Operacija za ponoven poiskus po napaki:</target>
+<source>
+<pluralform>Automatic retry in 1 second...</pluralform>
+<pluralform>Automatic retry in %x seconds...</pluralform>
+</source>
+<target>
+<pluralform>Ponovni poskus čez %x sekundo...</pluralform>
+<pluralform>Ponovni poskus čez %x sekundi...</pluralform>
+<pluralform>Ponovni poskus čez %x sekunde...</pluralform>
+<pluralform>Ponovni poskus čez %x sekund...</pluralform>
+</target>
+
+<source>&Ignore subsequent errors</source>
+<target>&Ignoriraj nadaljnje napake</target>
+
+<source>Serious Error</source>
+<target>Resna napaka</target>
+
+<source>Check for Program Updates</source>
+<target>Prevri obstoj nadgradnje programa</target>
<source>A new version of FreeFileSync is available:</source>
<target>Nova različica FreeFileSync je na voljo:</target>
@@ -576,18 +612,12 @@ Ukaz se sproži če:
<source>Download now?</source>
<target>Prenesem sedaj?</target>
-<source>New version found</source>
-<target>Najdena nova verzija</target>
-
<source>&Download</source>
<target>&Prenesi</target>
<source>FreeFileSync is up to date.</source>
<target>FreeFileSync je posodobljen.</target>
-<source>Information</source>
-<target>Informacije</target>
-
<source>Unable to connect to sourceforge.net.</source>
<target>Ne morem se povezati na sourceforge.net.</target>
@@ -645,20 +675,20 @@ Ukaz se sproži če:
<source>Hibernate</source>
<target>Hibernacija</target>
-<source>Selected variant:</source>
-<target>Izbrana varianta:</target>
+<source>Alternate comparison settings</source>
+<target>Alternativne nastavitve primerjave</target>
-<source>Select alternate comparison settings</source>
-<target>Izberite alternativne nastavitve primerjanja</target>
+<source>Alternate synchronization settings</source>
+<target>Alternativne nastavitve sinhnorizacije</target>
-<source>Select alternate synchronization settings</source>
-<target>Izberite nadomestne nastavitve sinhronizacije</target>
+<source>Local filter</source>
+<target>Lokalni filter</target>
-<source>Filter is active</source>
-<target>Filter je aktiven</target>
+<source>Active</source>
+<target>Aktivno</target>
-<source>No filter selected</source>
-<target>Noben filter ni izbran</target>
+<source>None</source>
+<target>Nič</target>
<source>Remove alternate settings</source>
<target>Odstrani nadomestne nastavitve</target>
@@ -672,6 +702,15 @@ Ukaz se sproži če:
<source>Paste</source>
<target>Prilepi</target>
+<source>Alternate Comparison Settings</source>
+<target>Alternativne nastavitve primerjave</target>
+
+<source>Alternate Synchronization Settings</source>
+<target>Alternativne nastavitve sinhnorizacije</target>
+
+<source>Local Filter</source>
+<target>Lokalni filter</target>
+
<source>&New</source>
<target>&Novo</target>
@@ -679,7 +718,7 @@ Ukaz se sproži če:
<target>&Shrani</target>
<source>Save as &batch job...</source>
-<target>Shrani kot paketno op&ravilo...</target>
+<target>Shrani kot serijsko op&ravilo...</target>
<source>1. &Compare</source>
<target>1. &Primerjaj</target>
@@ -687,15 +726,18 @@ Ukaz se sproži če:
<source>2. &Synchronize</source>
<target>2. &Sinhroniziraj</target>
+<source>&Global settings</source>
+<target>&Skupne nastavitve</target>
+
<source>&Language</source>
<target>&Jezik</target>
+<source>&Find...</source>
+<target>&Išči...</target>
+
<source>&Export file list...</source>
<target>&Izvozi seznam datotek...</target>
-<source>&Global settings</source>
-<target>&Globalne nastavitve</target>
-
<source>&Tools</source>
<target>&Orodja</target>
@@ -705,12 +747,15 @@ Ukaz se sproži če:
<source>Check &automatically once a week</source>
<target>S&amodejno preveri enkrat tedensko</target>
-<source>Check for new &version</source>
-<target>Preveri, če obstaja nova &verzija</target>
+<source>&Check for new version</source>
+<target>&Preveri, če obstaja nova verzija</target>
<source>Compare</source>
<target>Primerjaj</target>
+<source>Cancel</source>
+<target>Prekliči</target>
+
<source>Synchronize</source>
<target>Sinhroniziraj</target>
@@ -723,8 +768,17 @@ Ukaz se sproži če:
<source>Swap sides</source>
<target>Zamenjaj strani</target>
+<source>Close search bar</source>
+<target>Zapri iskalno vrstico</target>
+
+<source>Find:</source>
+<target>Išči:</target>
+
+<source>Match case</source>
+<target>Ujemaj se s primerom</target>
+
<source>Save as batch job</source>
-<target>Shrani kot paketno opravilo</target>
+<target>Shrani kot serijsko opravilo</target>
<source>Hide excluded items</source>
<target>Skrij izključene elemente</target>
@@ -744,74 +798,20 @@ Ukaz se sproži če:
<source>Total bytes to copy</source>
<target>Skupno bajtov za kopiranje</target>
-<source>Items found:</source>
-<target>Najdenih elementov:</target>
-
-<source>Speed:</source>
-<target>Hitrost:</target>
-
-<source>Time remaining:</source>
-<target>Preostali čas:</target>
-
-<source>Time elapsed:</source>
-<target>Pretečeni čas:</target>
-
-<source>Synchronizing...</source>
-<target>Sinhroniziram...</target>
-
-<source>Minimize to notification area</source>
-<target>Pomanjšaj v območje obvestil</target>
-
-<source>On completion</source>
-<target>Ob zaključku</target>
-
-<source>Close</source>
-<target>Zapri</target>
-
-<source>&Pause</source>
-<target>&Premor</target>
-
-<source>Variant</source>
-<target>Različica</target>
-
-<source>Statistics</source>
-<target>Statistika</target>
-
-<source>&Don't show this dialog again</source>
-<target>&Ne pokaži več tega sporočila</target>
-
-<source>Select a variant</source>
-<target>Izberite spremenljivko</target>
+<source>Select a variant:</source>
+<target>Izberi možnost:</target>
-<source>
-Files are found equal if
- - last write time and date
- - file size
-are the same
-</source>
-<target>
-Datoteki sta enaki, če sta
- - zadnji čas zapisa in datum
- - velikost datoteke
-enaka
-</target>
+<source>Identify equal files by comparing modification time and size.</source>
+<target>Določi enake datoteke s primerjavo datuma spremembe in velikosti.</target>
-<source>
-Files are found equal if
- - file content
-is the same
-</source>
-<target>
-Datoteki sta enaki, če
- - je vsebina datoteke
-enaka
-</target>
+<source>Identify equal files by comparing the file content.</source>
+<target>Določi enake datoteke s primerjavo vsebine.</target>
-<source>Symbolic Link handling</source>
-<target>Rokovanje s simboličnimi povezavami</target>
+<source>Symbolic links:</source>
+<target>Simbolične povezave:</target>
-<source>Help</source>
-<target>Pomoč</target>
+<source>More information</source>
+<target>Več informacij</target>
<source>OK</source>
<target>V redu</target>
@@ -819,11 +819,11 @@ enaka
<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
<target>Identificiraj in razširjaj spremembe na obeh straneh. Izbrisi, premiki in spori so samodejno zaznani z uporabo podatkovne baze.</target>
-<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
-<target>Zrcalna varnostna kopija leve mape. Desna mapa bo spremenjena, da se bo natančno ujemala z levo mapo po sinhronizaciji.</target>
+<source>Create a mirror backup of the left folder which exactly matches the right folder after synchronization.</source>
+<target>Ustvari zrcalno kopijo levega imenika, tako da se bo desni imenik po sinhnorizaciji popolnoma ujemal.</target>
-<source>Copy new or updated files to right folder.</source>
-<target>Kopiraj nove ali posodobljene datoteke v desno mapo.</target>
+<source>Copy new and updated files to the right folder.</source>
+<target>Kopiraj nove in posodobljene datoteke v desni imenik.</target>
<source>Configure your own synchronization rules.</source>
<target>Konfigurirajte vaša lastna sinhronizacijska pravila.</target>
@@ -834,23 +834,8 @@ enaka
<source>Requires database files. Not supported by all file systems.</source>
<target>Zahteva podatkovno bazo. Ni podprt s strani vseh datotečnih sistemov.</target>
-<source>Error handling</source>
-<target>Napaka pri obravnavanju</target>
-
-<source>Ignore</source>
-<target>Ignoriraj</target>
-
-<source>Hide all error and warning messages</source>
-<target>Skrij vsa obvestila o napakah in opozorilih</target>
-
-<source>Pop-up</source>
-<target>Pogovorno okno</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Prikaži pojavne napaka ali opozorila</target>
-
-<source>Deletion handling</source>
-<target>Ravnanje pri brisanju</target>
+<source>Delete files:</source>
+<target>Izbriši datoteke:</target>
<source>Permanent</source>
<target>Trajno</target>
@@ -873,111 +858,174 @@ enaka
<source>Naming convention:</source>
<target>Konvencija poimenovanja:</target>
-<source>Batch job</source>
-<target>Paketno opravilo</target>
+<source>Show examples</source>
+<target>Pokaži primere</target>
+
+<source>Handle errors:</source>
+<target>Upravljanje napak:</target>
+
+<source>Ignore</source>
+<target>Ignoriraj</target>
+
+<source>Hide all error and warning messages</source>
+<target>Skrij vsa obvestila o napakah in opozorilih</target>
+
+<source>Pop-up</source>
+<target>Pogovorno okno</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Prikaži pojavne napaka ali opozorila</target>
+
+<source>On completion:</source>
+<target>Ob zaključku:</target>
+
+<source>Start synchronization now?</source>
+<target>Zaženem sinhnorizacijo takoj?</target>
+
+<source>Variant:</source>
+<target>Možnost:</target>
+
+<source>Statistics</source>
+<target>Statistika</target>
+
+<source>&Don't show this dialog again</source>
+<target>&Ne pokaži več tega sporočila</target>
+
+<source>Items found:</source>
+<target>Najdenih elementov:</target>
+
+<source>Speed:</source>
+<target>Hitrost:</target>
+
+<source>Time remaining:</source>
+<target>Preostali čas:</target>
+
+<source>Time elapsed:</source>
+<target>Pretečeni čas:</target>
+
+<source>Synchronizing...</source>
+<target>Sinhroniziram...</target>
+
+<source>Minimize to notification area</source>
+<target>Pomanjšaj v območje obvestil</target>
+
+<source>Close</source>
+<target>Zapri</target>
+
+<source>&Pause</source>
+<target>&Premor</target>
+
+<source>Stop</source>
+<target>Ustavi</target>
<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
<target>Ustvari skriptno datoteko za samodejno sinhnorizacijo. Za zagon dvojno kliknite to datoteko ali pa jo umestite v razporejevalnik opravil: %x</target>
-<source>Exit</source>
-<target>Izhod</target>
-
-<source>Abort synchronization on first error</source>
-<target>Prekini sinhronizacijo ob prvi napaki</target>
+<source>Stop synchronization at first error</source>
+<target>Ustavi sinhnorizacojo ob prvi napaki</target>
<source>Show progress dialog</source>
<target>Prikazuj pogovorno okno z napredkom</target>
-<source>Save log</source>
-<target>Shrani beleženje</target>
-
-<source>Select folder to save log files</source>
-<target>Izberite mapo za shranjevanje datotek beleženja</target>
+<source>Save log:</source>
+<target>Shrani dnevnik:</target>
-<source>Limit</source>
-<target>Omejitev</target>
+<source>Limit:</source>
+<target>Omejitev:</target>
<source>Limit maximum number of log files</source>
<target>Omeji maksimalno število datotek beleženja</target>
+<source>How can I schedule a batch job?</source>
+<target>Kako nastavim urnik za serijsko opravilo?</target>
+
+<source>&Recycle bin</source>
+<target>&Koš</target>
+
<source>Delete on both sides</source>
<target>Izbriši na obeh straneh</target>
<source>Delete on both sides even if the file is selected on one side only</source>
<target>Izbriši na obeh straneh, četudi je datoteka izbrana na samo eni strani</target>
-<source>
-Files will only be synchronized if they pass all filter rules.
-Note: File paths must be relative to base directories.
-</source>
-<target>
-Datoteke bodo sinhnorizirane samo, če bodo zadoščale vsem filtrirnim pravilom.
-Opomba: Poti datotek morajo biti relativne na osnovne imenike.
-</target>
+<source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source>
+<target>Izberi filtrirna pravila za izključitev določenih datotek iz sinhnorizacije. Vpiši pot datotek relativno na imenik v obdelavi</target>
-<source>Include</source>
-<target>Vključi</target>
+<source>Include:</source>
+<target>Vključi:</target>
-<source>Exclude</source>
-<target>Izključi</target>
+<source>Exclude:</source>
+<target>Izključi:</target>
-<source>Time span</source>
+<source>Time span:</source>
<target>Časovno obdobje</target>
-<source>File size</source>
-<target>Velikost datoteke</target>
+<source>File size:</source>
+<target>Velikost datoteke:</target>
-<source>Minimum</source>
-<target>Minimum</target>
+<source>Minimum:</source>
+<target>Minimum:</target>
-<source>Maximum</source>
-<target>Maksimum</target>
+<source>Maximum:</source>
+<target>Maksimum:</target>
<source>&Clear</source>
<target>P&očisti</target>
-<source>Global settings</source>
-<target>Globalne nastavitve</target>
+<source>The following settings are used for all synchronization jobs.</source>
+<target>Naslednje nastavitve se uporabljajo pri vseh sinhronizacijskih opravilih.</target>
<source>Fail-safe file copy</source>
<target>Kopiranje datotek varno pred odpovedjo</target>
-<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
-<target>Najprej kopiraj v začasno datoteko (*.ffs_tmp) nato pa jo preimenuj. To zagotavlja konsistenco podatkov v primeru kritične napake.</target>
+<source>
+Copy to a temporary file (*.ffs_tmp) before overwriting target.
+This guarantees a consistent state even in case of a serious error.
+</source>
+<target>
+Kopiraj v začasno datoteko (*.ffs_tmp) preden prepišeš cilj.
+To zagotavlja konsistenco podatkov v primeru napake.
+</target>
+
+<source>(recommended)</source>
+<target>(priporočeno)</target>
<source>Copy locked files</source>
<target>Kopiraj zaklenjene datoteke</target>
-<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
-<target>Kopiraj zaklenjene ali imenike v souporabi s pomočjo Volume Shadow Copy servisa (zahteva pravice administratorja)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service.</source>
+<target>Kopiraj zaklenjene in datoteke v skupni rabi s pomočjo Shadow Copy Service.</target>
+
+<source>(requires administrator rights)</source>
+<target>(zahteva pravice administratorja)</target>
<source>Copy file access permissions</source>
<target>Kopiraj dovoljenja dostopov datoteke</target>
-<source>Transfer file and folder permissions (requires administrator rights)</source>
-<target>Prenesi pravice datotek in imenikov (zahteva pravice administratorja)</target>
+<source>Transfer file and folder permissions.</source>
+<target>Prenesi pravice datotek in map.</target>
+
+<source>Automatic retry on error:</source>
+<target>Ob napaki avtomatsko poskusi znova:</target>
+
+<source>Retry count:</source>
+<target>Število poiskusov:</target>
-<source>Restore hidden dialogs</source>
-<target>Obnovi skrite pogovore</target>
+<source>Delay (in seconds):</source>
+<target>Zakasnitev (v sekundah):</target>
-<source>External applications</source>
-<target>Zunanje aplikacije</target>
+<source>Customize context menu:</source>
+<target>Prilagodi vsebinski meni:</target>
<source>Description</source>
<target>Opis</target>
+<source>Restore hidden windows</source>
+<target>Obnovi skrita okna</target>
+
<source>&Default</source>
<target>&Privzeto</target>
-<source>Find what:</source>
-<target>Najdi kaj</target>
-
-<source>Match case</source>
-<target>Ujemaj se s primerom</target>
-
-<source>&Find next</source>
-<target>&Najdi naslednje</target>
-
<source>Source code written in C++ using:</source>
<target>Izvorna koda napisana v C++ z uporabo:</target>
@@ -1002,44 +1050,38 @@ Opomba: Poti datotek morajo biti relativne na osnovne imenike.
<source>Many thanks for localization:</source>
<target>Zahvale za lokalizacijo:</target>
-<source>Start synchronization</source>
-<target>Začni sinhronizacijo</target>
+<source>Save as Batch Job</source>
+<target>Shrani kot serijsko opravilo</target>
-<source>Comparison settings</source>
-<target>Nastavitve primerjanja</target>
+<source>Delete Items</source>
+<target>Izbriši elemente</target>
-<source>Synchronization settings</source>
-<target>Nastavitve sinhronizacije</target>
+<source>Global Settings</source>
+<target>Skupne nastavitve</target>
-<source>Delete</source>
-<target>Izbriši</target>
+<source>Select Time Span</source>
+<target>Izberi časovno obdobje</target>
-<source>Configure filter</source>
-<target>Konfiguriraj filter</target>
+<source>Folder Pairs</source>
+<target>Pari imenikov</target>
<source>Find</source>
<target>Najdi</target>
-<source>Select time span</source>
-<target>Izberite časovni okvir</target>
-
-<source>Folder pairs</source>
-<target>Pari map</target>
-
<source>Overview</source>
<target>Pregled</target>
<source>Configuration</source>
<target>Konfiguracija</target>
-<source>Main bar</source>
+<source>Main Bar</source>
<target>Glavna vrstica</target>
-<source>Filter files</source>
+<source>Filter Files</source>
<target>Filtriraj datoteke</target>
-<source>Select view</source>
-<target>Izberite pogled</target>
+<source>Select View</source>
+<target>Izberi pogled</target>
<source>Open...</source>
<target>Odpri...</target>
@@ -1050,16 +1092,14 @@ Opomba: Poti datotek morajo biti relativne na osnovne imenike.
<source>Compare both sides</source>
<target>Primerjaj obe strani</target>
-<source>
-<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
-<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
-</source>
-<target>
-<pluralform>Ali res želite izvesti ukaz %y za %x element?</pluralform>
-<pluralform>Ali res želite izvesti ukaz %y za %x elementa?</pluralform>
-<pluralform>Ali res želite izvesti ukaz %y za %x elemente?</pluralform>
-<pluralform>Ali res želite izvesti ukaz %y za %x elementov?</pluralform>
-</target>
+<source>Comparison settings</source>
+<target>Nastavitve primerjanja</target>
+
+<source>Synchronization settings</source>
+<target>Nastavitve sinhronizacije</target>
+
+<source>Start synchronization</source>
+<target>Začni sinhronizacijo</target>
<source>Confirm</source>
<target>Potrdi</target>
@@ -1103,12 +1143,6 @@ Opomba: Poti datotek morajo biti relativne na osnovne imenike.
<source>Set direction:</source>
<target>Nastavi smer:</target>
-<source>Exclude temporarily</source>
-<target>Začasno izključi</target>
-
-<source>Include temporarily</source>
-<target>Trenutno vključi</target>
-
<source>multiple selection</source>
<target>mnogokratna izbira</target>
@@ -1118,6 +1152,15 @@ Opomba: Poti datotek morajo biti relativne na osnovne imenike.
<source>Exclude via filter:</source>
<target>Izključi preko filtra:</target>
+<source>Exclude temporarily</source>
+<target>Začasno izključi</target>
+
+<source>Include temporarily</source>
+<target>Trenutno vključi</target>
+
+<source>Delete</source>
+<target>Izbriši</target>
+
<source>Include all</source>
<target>Vključi vse</target>
@@ -1160,11 +1203,14 @@ Opomba: Poti datotek morajo biti relativne na osnovne imenike.
<source>Do you want to save changes to %x?</source>
<target>Ali želite shraniti spremembe v %x?</target>
+<source>Never save &changes</source>
+<target>Nikoli ne shrani &sprememb</target>
+
<source>Do&n't save</source>
<target>Ne shra&ni</target>
-<source>Never save &changes</source>
-<target>Nikoli ne shrani &sprememb</target>
+<source>Filter</source>
+<target>Filter</target>
<source>Show files that exist on left side only</source>
<target>Prikaži datoteke, ki obstajajo samo na levi</target>
@@ -1211,12 +1257,18 @@ Opomba: Poti datotek morajo biti relativne na osnovne imenike.
<source>Set as default</source>
<target>Nastavi kot privzeto</target>
-<source>Operation aborted</source>
-<target>Operacija prekinjena</target>
-
<source>All folders are in sync</source>
<target>Vse mape so sinhronizirane</target>
+<source>Synchronization Settings</source>
+<target>Nastavitve sinhnorizacije</target>
+
+<source>Comparison Settings</source>
+<target>Nastavitve primerjave</target>
+
+<source>Cannot find %x</source>
+<target>Ne najdem %x</target>
+
<source>Comma-separated values</source>
<target>Vrednosti ločene z vejico</target>
@@ -1226,30 +1278,6 @@ Opomba: Poti datotek morajo biti relativne na osnovne imenike.
<source>Searching for program updates...</source>
<target>Iščem posodobitve programa...</target>
-<source>&Ignore subsequent errors</source>
-<target>&Ignoriraj nadaljnje napake</target>
-
-<source>&Ignore</source>
-<target>&Ignoriraj</target>
-
-<source>Fatal Error</source>
-<target>Usodna napaka</target>
-
-<source>&Don't show this warning again</source>
-<target>&Ne pokaži več tega opozorila</target>
-
-<source>&Switch</source>
-<target>&Preklopi</target>
-
-<source>Question</source>
-<target>Vprašanje</target>
-
-<source>&Yes</source>
-<target>&Da</target>
-
-<source>&No</source>
-<target>&Ne</target>
-
<source>Scanning...</source>
<target>Pregledujem...</target>
@@ -1259,14 +1287,17 @@ Opomba: Poti datotek morajo biti relativne na osnovne imenike.
<source>Info</source>
<target>Info</target>
+<source>Warning</source>
+<target>Pozor</target>
+
<source>Paused</source>
<target>Na premoru</target>
<source>Initializing...</source>
<target>Inicializiram...</target>
-<source>Aborted</source>
-<target>Prekinitev uspela</target>
+<source>Stopped</source>
+<target>Ustavljen</target>
<source>Completed</source>
<target>Zaključeno</target>
@@ -1277,12 +1308,6 @@ Opomba: Poti datotek morajo biti relativne na osnovne imenike.
<source>Log</source>
<target>Dnevnik</target>
-<source>Cannot find %x</source>
-<target>Ne najdem %x</target>
-
-<source>Inactive</source>
-<target>Neaktivno</target>
-
<source>Today</source>
<target>Danes</target>
@@ -1307,9 +1332,6 @@ Opomba: Poti datotek morajo biti relativne na osnovne imenike.
<source>MB</source>
<target>MB</target>
-<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>
@@ -1321,6 +1343,9 @@ Opomba: Poti datotek morajo biti relativne na osnovne imenike.
<pluralform>Ali res želite premakniti sledečih %x elementov v koš?</pluralform>
</target>
+<source>Move</source>
+<target>Premakni</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>
@@ -1332,6 +1357,9 @@ Opomba: Poti datotek morajo biti relativne na osnovne imenike.
<pluralform>Ali resnično želite izbrisati naslednjih %x elementov?</pluralform>
</target>
+<source>Exclude</source>
+<target>Izključi</target>
+
<source>Direct</source>
<target>Neposredno</target>
@@ -1356,8 +1384,8 @@ Opomba: Poti datotek morajo biti relativne na osnovne imenike.
<source>- Other side's counterpart to %item_folder%</source>
<target>- Na drugi strani nasprotno v %item_folder%</target>
-<source>Make hidden warnings and dialogs visible again?</source>
-<target>Ponovno prikažem vsa skrita obvestila in pogovore?</target>
+<source>Restore all hidden windows and warnings?</source>
+<target>Obnovim vsa skrita okna in opozorila?</target>
<source>Leave as unresolved conflict</source>
<target>Pusti kot nerešeni spor</target>
@@ -1488,14 +1516,14 @@ Opomba: Poti datotek morajo biti relativne na osnovne imenike.
<pluralform>%x dni</pluralform>
</target>
-<source>Failed to register to receive system messages.</source>
-<target>Neuspešna registracija za sprejem sistemskih sporočil.</target>
+<source>Unable to register to receive system messages.</source>
+<target>Ne morem se registriratiza prejem sistemskih sporočil.</target>
<source>Cannot set privilege %x.</source>
<target>Ne morem nastaviti privilegija %x.</target>
-<source>Failed to suspend system sleep mode.</source>
-<target>Način spanja ni uspelo prekiniti.</target>
+<source>Unable to suspend system sleep mode.</source>
+<target>Ne morem preprečiti mirovanja sistema.</target>
<source>Cannot change process I/O priorities.</source>
<target>Ne morem spremeniti V/I prioritet procesa.</target>
diff --git a/BUILD/Languages/spanish.lng b/BUILD/Languages/spanish.lng
index 507b977a..e5ae052c 100644
--- a/BUILD/Languages/spanish.lng
+++ b/BUILD/Languages/spanish.lng
@@ -2,11 +2,17 @@
<language>Español</language>
<translator>I.R.Maturana (irmlab.com)</translator>
<locale>es_ES</locale>
- <flag_image>flag_spain.png</flag_image>
- <plural_form_count>2</plural_form_count>
+ <image>flag_spain.png</image>
+ <plural_count>2</plural_count>
<plural_definition>n == 1 ? 0 : 1</plural_definition>
</header>
+<source>&Check</source>
+<target></target>
+
+<source>Retrying operation...</source>
+<target></target>
+
<source>Both sides have changed since last synchronization.</source>
<target>Ambos lados han cambiado desde la última sincronización.</target>
@@ -58,9 +64,6 @@
<source>Cannot open file %x.</source>
<target>No se puede abrir el archivo %x.</target>
-<source>Error</source>
-<target>Error</target>
-
<source>File %x does not contain a valid configuration.</source>
<target>El archivo %x no contiene una configuración válida.</target>
@@ -70,12 +73,12 @@
<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
<target>El archivo de configuración no debe incluir parámetros al nivel de un par de directorios cuando éstos se especifican desde la línea de comandos.</target>
-<source>Warning</source>
-<target>Atención</target>
-
<source>Directories cannot be set for more than one configuration file.</source>
<target>No se pueden definir directorios para más de un archivo de configuración.</target>
+<source>Command line</source>
+<target>Línea de comandos</target>
+
<source>Syntax:</source>
<target>Sintaxis:</target>
@@ -91,9 +94,6 @@
<source>Any number of alternative directories for at most one config file.</source>
<target>Cualquier número de directorios alternativos para un archivo de configuración como máximo.</target>
-<source>Command line</source>
-<target>Línea de comandos</target>
-
<source>A folder input field is empty.</source>
<target>Un campo de entrada de la carpeta está vacío.</target>
@@ -292,8 +292,8 @@
<source>/sec</source>
<target>/seg</target>
-<source>%x items</source>
-<target>%x elementos</target>
+<source>%x items/sec</source>
+<target>%x elementos/seg</target>
<source>Configuration file %x loaded partially only.</source>
<target>Archivo de configuración %x cargado sólo parcialmente.</target>
@@ -322,11 +322,11 @@
<source>Volume name %x is not part of file path %y.</source>
<target>El nombre de volumen %x no es parte de la ruta de archivo %y.</target>
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Anulación solicitada: esperando a que la operación actual finalice…</target>
+<source>Stop requested: Waiting for current operation to finish...</source>
+<target>Detención solicitada: esperando a que la operación actual finalice…</target>
-<source>Failure to create timestamp for versioning:</source>
-<target>Fallo al crear fecha y hora para el versionado:</target>
+<source>Unable to create timestamp for versioning:</source>
+<target>No es posible crear fecha y hora para la versión:</target>
<source>Cannot read the following XML elements:</source>
<target>No se pueden leer los siguientes elementos XML:</target>
@@ -343,8 +343,8 @@
<source>&Program</source>
<target>&Programa</target>
-<source>&Content</source>
-<target>&Contenido</target>
+<source>&View help</source>
+<target>&Ver ayuda</target>
<source>&About</source>
<target>&Acerca de</target>
@@ -362,13 +362,13 @@
<target>2. Introduzca una línea de comandos.</target>
<source>3. Press 'Start'.</source>
-<target>3. Presione ’Inicio’.</target>
+<target>3. Presione 'Inicio'.</target>
<source>To get started just import a .ffs_batch file.</source>
<target>Para comenzar, importe un archivo .ffs_batch.</target>
-<source>Folders to watch</source>
-<target>Carpetas para ver</target>
+<source>Folders to watch:</source>
+<target>Carpetas para examinar:</target>
<source>Add folder</source>
<target>Añadir carpeta</target>
@@ -382,12 +382,15 @@
<source>Select a folder</source>
<target>Seleccione una carpeta</target>
-<source>Idle time [seconds]</source>
-<target>Tiempo de espera [segundos]</target>
+<source>Idle time (in seconds):</source>
+<target>Tiempo de inactividad (en segundos):</target>
<source>Idle time between last detected change and execution of command</source>
<target>Tiempo ocioso entre el último cambio detectado y la ejecución del comando</target>
+<source>Command line:</source>
+<target>Línea de comandos:</target>
+
<source>
The command is triggered if:
- files or subfolders change
@@ -399,33 +402,30 @@ El comando es disparado si:
- aparecen nuevas carpetas (en una memoria USB, por ejemplo)
</target>
-<source>Start</source>
-<target>Iniciar</target>
-
-<source>&Retry</source>
-<target>&Reintentar</target>
-
-<source>Cancel</source>
-<target>Cancelar</target>
+<source>&Start</source>
+<target>&Iniciar</target>
-<source>RealtimeSync - Automated Synchronization</source>
-<target>RealtimeSync - Sincronización Automática</target>
+<source>About</source>
+<target>Acerca de</target>
<source>Build: %x</source>
<target>Completado: %x</target>
-<source>About</source>
-<target>Acerca de</target>
-
<source>All files</source>
<target>Todos los archivos</target>
+<source>Automated Synchronization</source>
+<target>Sincronización Automática</target>
+
<source>Directory monitoring active</source>
<target>Supervisión de directorios activada</target>
<source>Waiting until all directories are available...</source>
<target>Esperando que todos los directorios estén disponibles…</target>
+<source>Error</source>
+<target>Error</target>
+
<source>&Restore</source>
<target>&Restaurar</target>
@@ -435,8 +435,11 @@ El comando es disparado si:
<source>&Exit</source>
<target>&Salir</target>
-<source>Invalid command line:</source>
-<target>Línea de comandos errónea:</target>
+<source>Incorrect command line:</source>
+<target>Línea de comandos incorrecta:</target>
+
+<source>&Retry</source>
+<target>&Reintentar</target>
<source>File content</source>
<target>Contenido del archivo</target>
@@ -498,8 +501,8 @@ El comando es disparado si:
<source>Target folder input field must not be empty.</source>
<target>El campo de entrada de la carpeta de destino no debe estar vacío.</target>
-<source>Folder input field for versioning must not be empty.</source>
-<target>El campo de entrada de la carpeta para el control de versiones no debe estar vacío.</target>
+<source>Please enter a target folder for versioning.</source>
+<target>Indique una carpeta de destino para la versión.</target>
<source>Source folder %x not found.</source>
<target>El archivo de origen %x no ha sido encontrado.</target>
@@ -537,8 +540,8 @@ El comando es disparado si:
<source>job name</source>
<target>nombre de tarea</target>
-<source>Synchronization aborted</source>
-<target>Sincronización anulada</target>
+<source>Synchronization stopped</source>
+<target>Sincronización detenida</target>
<source>Synchronization completed with errors</source>
<target>Sincronización completada con errores</target>
@@ -555,14 +558,38 @@ El comando es disparado si:
<source>Saving log file %x...</source>
<target>Guardando registro %x…</target>
-<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
-<target>Presione "Cambiar" para resolver los problemas en el diálogo principal de FreeFileSync.</target>
+<source>You can switch to FreeFileSync's main window to resolve this issue.</source>
+<target>Puede cambiar a la ventana principal de FreeFileSync para resolver este problema.</target>
+
+<source>&Don't show this warning again</source>
+<target>&No volver a mostrar este aviso</target>
-<source>Switching to FreeFileSync main dialog</source>
-<target>Cambiando a la ventana principal de FreeFileSync</target>
+<source>&Ignore</source>
+<target>&Ignorar</target>
-<source>Retrying operation after error:</source>
-<target>Reintento de operación después de error:</target>
+<source>&Switch</source>
+<target>&Cambiar</target>
+
+<source>Switching to FreeFileSync's main window</source>
+<target>Cambiar a la ventana principal de FreeFileSync</target>
+
+<source>
+<pluralform>Automatic retry in 1 second...</pluralform>
+<pluralform>Automatic retry in %x seconds...</pluralform>
+</source>
+<target>
+<pluralform>Reintento automático en 1 segundo…</pluralform>
+<pluralform>Reintento automático en %x segundos…</pluralform>
+</target>
+
+<source>&Ignore subsequent errors</source>
+<target>&Ignorar errores posteriores</target>
+
+<source>Serious Error</source>
+<target>Error grave</target>
+
+<source>Check for Program Updates</source>
+<target>Buscar actualizaciones del programa</target>
<source>A new version of FreeFileSync is available:</source>
<target>Una nueva versión de FreeFileSync está disponible:</target>
@@ -570,18 +597,12 @@ El comando es disparado si:
<source>Download now?</source>
<target>¿Descargar ahora?</target>
-<source>New version found</source>
-<target>Se encontró una nueva versión</target>
-
<source>&Download</source>
<target>&Descargar</target>
<source>FreeFileSync is up to date.</source>
<target>FreeFileSync está actualizado.</target>
-<source>Information</source>
-<target>Información</target>
-
<source>Unable to connect to sourceforge.net.</source>
<target>No se puede conectar con sourceforge.net.</target>
@@ -639,23 +660,23 @@ El comando es disparado si:
<source>Hibernate</source>
<target>Hibernar</target>
-<source>Selected variant:</source>
-<target>Seleccionar variante:</target>
+<source>Alternate comparison settings</source>
+<target>Opciones avanzadas de comparación</target>
-<source>Select alternate comparison settings</source>
-<target>Seleccionar opciones alternativas de comparación</target>
+<source>Alternate synchronization settings</source>
+<target>Opciones avanzadas de sincronización</target>
-<source>Select alternate synchronization settings</source>
-<target>Seleccione opciones alternativas de sincronización</target>
+<source>Local filter</source>
+<target>Filtro local</target>
-<source>Filter is active</source>
-<target>Filtro activo</target>
+<source>Active</source>
+<target>Activa</target>
-<source>No filter selected</source>
-<target>Ningún filtro seleccionado</target>
+<source>None</source>
+<target>Ninguna</target>
<source>Remove alternate settings</source>
-<target>Eliminar opciones alternativas</target>
+<target>Eliminar opciones avanzadas</target>
<source>Clear filter settings</source>
<target>Limpiar opciones del filtrado</target>
@@ -666,6 +687,15 @@ El comando es disparado si:
<source>Paste</source>
<target>Pegar</target>
+<source>Alternate Comparison Settings</source>
+<target>Opciones avanzadas de comparación</target>
+
+<source>Alternate Synchronization Settings</source>
+<target>Opciones avanzadas de sincronización</target>
+
+<source>Local Filter</source>
+<target>Filtro local</target>
+
<source>&New</source>
<target>&Nuevo</target>
@@ -673,7 +703,7 @@ El comando es disparado si:
<target>&Guardar</target>
<source>Save as &batch job...</source>
-<target>Guardar como tarea &lote…</target>
+<target>Guardar como tarea por &lotes…</target>
<source>1. &Compare</source>
<target>1. &Comparar</target>
@@ -681,15 +711,18 @@ El comando es disparado si:
<source>2. &Synchronize</source>
<target>2. &Sincronizar</target>
+<source>&Global settings</source>
+<target>&Opciones globales</target>
+
<source>&Language</source>
<target>&Idioma</target>
+<source>&Find...</source>
+<target>&Buscar…</target>
+
<source>&Export file list...</source>
<target>&Exportar lista de archivos…</target>
-<source>&Global settings</source>
-<target>&Opciones globales</target>
-
<source>&Tools</source>
<target>Herramien&tas</target>
@@ -699,17 +732,14 @@ El comando es disparado si:
<source>Check &automatically once a week</source>
<target>Comprobar &automáticamente una vez por semana</target>
-<source>Check for new &version</source>
-<target>Comprobar si hay una nueva &versión</target>
+<source>&Check for new version</source>
+<target>&Comprobar si hay una nueva versión</target>
<source>Compare</source>
<target>Comparar</target>
-<source>Comparison settings</source>
-<target>Opciones de comparación</target>
-
-<source>Synchronization settings</source>
-<target>Opciones de sincronización</target>
+<source>Cancel</source>
+<target>Cancelar</target>
<source>Synchronize</source>
<target>Sincronizar</target>
@@ -723,8 +753,17 @@ El comando es disparado si:
<source>Swap sides</source>
<target>Intercambiar lados</target>
+<source>Close search bar</source>
+<target>Cerrar la barra de búsqueda</target>
+
+<source>Find:</source>
+<target>Find:</target>
+
+<source>Match case</source>
+<target>Distinción entre mayúsculas y minúsculas</target>
+
<source>Save as batch job</source>
-<target>Salvar como tarea lote</target>
+<target>Salvar como tarea por lotes</target>
<source>Hide excluded items</source>
<target>Ocultar elementos excluidos</target>
@@ -744,74 +783,20 @@ El comando es disparado si:
<source>Total bytes to copy</source>
<target>Total de bytes a copiar</target>
-<source>Items found:</source>
-<target>Elementos encontrados:</target>
-
-<source>Speed:</source>
-<target>Velocidad:</target>
-
-<source>Time remaining:</source>
-<target>Tiempo restante:</target>
-
-<source>Time elapsed:</source>
-<target>Tiempo transcurrido:</target>
-
-<source>Synchronizing...</source>
-<target>Sincronizando…</target>
-
-<source>Minimize to notification area</source>
-<target>Minimizar en el área de notificación</target>
-
-<source>On completion</source>
-<target>Al completar</target>
-
-<source>Close</source>
-<target>Cerrar</target>
-
-<source>&Pause</source>
-<target>&Pausa</target>
-
-<source>Variant</source>
-<target>Tipo</target>
-
-<source>Statistics</source>
-<target>Estadísticas</target>
-
-<source>&Don't show this dialog again</source>
-<target>&No volver a mostrar este diálogo</target>
-
-<source>Select a variant</source>
-<target>Seleccione una variante</target>
+<source>Select a variant:</source>
+<target>Seleccione una variante:</target>
-<source>
-Files are found equal if
- - last write time and date
- - file size
-are the same
-</source>
-<target>
-Los archivos serán considerados iguales si
- - última hora y fecha de escritura
- - tamaño del archivo
-son iguales
-</target>
+<source>Identify equal files by comparing modification time and size.</source>
+<target>Comparar archivos iguales por la hora de modificación y el tamaño.</target>
-<source>
-Files are found equal if
- - file content
-is the same
-</source>
-<target>
-Los archivos serán considerados iguales si
- - el contenido del archivo
-es el mismo
-</target>
+<source>Identify equal files by comparing the file content.</source>
+<target>Comparar archivos iguales por el contenido.</target>
-<source>Symbolic Link handling</source>
-<target>Gestión de vínculos simbólicos</target>
+<source>Symbolic links:</source>
+<target>Vínculos simbólicos:</target>
-<source>Help</source>
-<target>Ayuda</target>
+<source>More information</source>
+<target>Más información</target>
<source>OK</source>
<target>OK</target>
@@ -819,11 +804,11 @@ es el mismo
<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
<target>Identificar y propagar cambios en ambos lados. Eliminaciones, movimientos y conflictos serán detectados automáticamente usando una base de datos.</target>
-<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
-<target>Copia de seguridad en espejo de la carpeta izquierda. La carpeta derecha es modificada exactamente como la carpeta izquierda después de la sincronización.</target>
+<source>Create a mirror backup of the left folder which exactly matches the right folder after synchronization.</source>
+<target>Crear una copia de respaldo reflejo de la carpeta izquierda que corresponda exactamente a la carpeta derecha después de la sincronización.</target>
-<source>Copy new or updated files to right folder.</source>
-<target>Copiar archivos nuevos o actualizados a la carpeta de la derecha.</target>
+<source>Copy new and updated files to the right folder.</source>
+<target>Copiar archivos nuevos y actualizados a la carpeta de la derecha.</target>
<source>Configure your own synchronization rules.</source>
<target>Configuración de sus propias reglas de sincronización.</target>
@@ -834,23 +819,8 @@ es el mismo
<source>Requires database files. Not supported by all file systems.</source>
<target>Archivos de base de datos requeridos. No son compatibles en todos los sistemas de archivos.</target>
-<source>Error handling</source>
-<target>Gestión de errores</target>
-
-<source>Ignore</source>
-<target>Ignorar</target>
-
-<source>Hide all error and warning messages</source>
-<target>Ocultar todos los mensajes de error y aviso</target>
-
-<source>Pop-up</source>
-<target>Automático</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Mostrar ventana emergente de errores o avisos</target>
-
-<source>Deletion handling</source>
-<target>Gestión de borrado</target>
+<source>Delete files:</source>
+<target>Eliminar archivos:</target>
<source>Permanent</source>
<target>Permanente</target>
@@ -871,58 +841,91 @@ es el mismo
<target>Mover archivos a una carpeta del usuario</target>
<source>Naming convention:</source>
-<target>Convención de nomenclatura:</target>
+<target>Convención de nombrado:</target>
-<source>Batch job</source>
-<target>Tarea lote</target>
+<source>Show examples</source>
+<target>Mostrar ejemplos</target>
-<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
-<target>Crear archivo por lotes para sincronización desatendida. Para iniciar, haga doble clic en este archivo o prográmelo en el planificador de tareas : %x</target>
+<source>Handle errors:</source>
+<target>Tratar errores:</target>
-<source>Exit</source>
-<target>Salir</target>
+<source>Ignore</source>
+<target>Ignorar</target>
-<source>Abort synchronization on first error</source>
-<target>Anular la sincronización al primer error</target>
+<source>Hide all error and warning messages</source>
+<target>Ocultar todos los mensajes de error y aviso</target>
-<source>Show progress dialog</source>
-<target>Mostrar diálogo de progreso</target>
+<source>Pop-up</source>
+<target>Automático</target>
-<source>Save log</source>
-<target>Guardar registro</target>
+<source>Show pop-up on errors or warnings</source>
+<target>Mostrar ventana emergente de errores o avisos</target>
-<source>Select folder to save log files</source>
-<target>Seleccionar una carpeta para salvar archivos de registro</target>
+<source>On completion:</source>
+<target>Al completar:</target>
-<source>Limit</source>
-<target>Límite</target>
+<source>Start synchronization now?</source>
+<target>¿Iniciar la sincronización ahora?</target>
-<source>Limit maximum number of log files</source>
-<target>Limitar el número máximo de archivos de registro</target>
+<source>Variant:</source>
+<target>Variante:</target>
-<source>Source code written in C++ using:</source>
-<target>Código fuente original en C++ con apoyo de:</target>
+<source>Statistics</source>
+<target>Estadísticas</target>
-<source>If you like FreeFileSync</source>
-<target>¿Te gusta FreeFileSync? :</target>
+<source>&Don't show this dialog again</source>
+<target>&No volver a mostrar este diálogo</target>
-<source>Donate with PayPal</source>
-<target>Haz una donación por PayPal</target>
+<source>Items found:</source>
+<target>Elementos encontrados:</target>
-<source>Many thanks for localization:</source>
-<target>Agradecimientos por las traducciones a:</target>
+<source>Speed:</source>
+<target>Velocidad:</target>
-<source>Feedback and suggestions are welcome</source>
-<target>Comentarios y sugerencias bienvenidos :</target>
+<source>Time remaining:</source>
+<target>Tiempo restante:</target>
-<source>Homepage</source>
-<target>Página de inicio</target>
+<source>Time elapsed:</source>
+<target>Tiempo transcurrido:</target>
-<source>Email</source>
-<target>Correo electrónico</target>
+<source>Synchronizing...</source>
+<target>Sincronizando…</target>
-<source>Published under the GNU General Public License</source>
-<target>Publicado con derechos GNU General Public License :</target>
+<source>Minimize to notification area</source>
+<target>Minimizar en el área de notificación</target>
+
+<source>Close</source>
+<target>Cerrar</target>
+
+<source>&Pause</source>
+<target>&Pausa</target>
+
+<source>Stop</source>
+<target>Detener</target>
+
+<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>Crear tarea por lotes para sincronización desatendida. Para iniciar, haga doble clic en este archivo o prográmelo en el planificador de tareas : %x</target>
+
+<source>Stop synchronization at first error</source>
+<target>Detener la sincronización con el primer error</target>
+
+<source>Show progress dialog</source>
+<target>Mostrar diálogo de progreso</target>
+
+<source>Save log:</source>
+<target>Guardar registro:</target>
+
+<source>Limit:</source>
+<target>Limite:</target>
+
+<source>Limit maximum number of log files</source>
+<target>Limitar el número máximo de archivos de registro</target>
+
+<source>How can I schedule a batch job?</source>
+<target>Cómo puedo programar una tarea por lotes?</target>
+
+<source>&Recycle bin</source>
+<target>Papelera de &reciclaje</target>
<source>Delete on both sides</source>
<target>Borrar en ambos lados</target>
@@ -930,109 +933,139 @@ es el mismo
<source>Delete on both sides even if the file is selected on one side only</source>
<target>Borrar en ambos lados incluso si el archivo está seleccionado en un solo lado</target>
-<source>
-Files will only be synchronized if they pass all filter rules.
-Note: File paths must be relative to base directories.
-</source>
-<target>
-Sólo se sincronizarán los archivos que cumplan todos los filtros.
-Nota: las rutas de archivo deben ser relativas a los directorios base.
-</target>
+<source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source>
+<target>Seleccione reglas para excluir archivos durante la sincronización. Indique rutas relativas a la carpeta emparejada correspondiente.</target>
-<source>Include</source>
-<target>Incluir</target>
+<source>Include:</source>
+<target>Incluir:</target>
-<source>Exclude</source>
-<target>Excluir</target>
+<source>Exclude:</source>
+<target>Excluir:</target>
-<source>Time span</source>
-<target>Espacio de tiempo</target>
+<source>Time span:</source>
+<target>Espacio de tiempo:</target>
-<source>File size</source>
-<target>Tamaño de archivo</target>
+<source>File size:</source>
+<target>Tamaño de archivo:</target>
-<source>Minimum</source>
-<target>Mínimo</target>
+<source>Minimum:</source>
+<target>Mínimo:</target>
-<source>Maximum</source>
-<target>Máximo</target>
+<source>Maximum:</source>
+<target>Máximo:</target>
<source>&Clear</source>
<target>&Borrar</target>
-<source>Global settings</source>
-<target>Opciones globales</target>
+<source>The following settings are used for all synchronization jobs.</source>
+<target>Las opciones siguientes se utilizan para todas las tareas de sincronización.</target>
<source>Fail-safe file copy</source>
<target>Copia de archivo a prueba de fallos</target>
-<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
-<target>Escribir en archivo temporal (*.ffs_tmp) primero y después renombrarlo. Esto garantiza un estado consistente incluso en caso de error fatal.</target>
+<source>
+Copy to a temporary file (*.ffs_tmp) before overwriting target.
+This guarantees a consistent state even in case of a serious error.
+</source>
+<target>
+Copiar a archivo temporal (*.ffs_tmp) antes de sobrescribir en destino.
+Se garantiza un estado coherente incluso en caso de error grave.
+</target>
+
+<source>(recommended)</source>
+<target>(recomendado)</target>
<source>Copy locked files</source>
<target>Copiar archivos bloqueados</target>
-<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
-<target>Copiar archivos compartidos o bloqueados usando el servicio de Instantánea de volumen (requiere derechos de administrador)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service.</source>
+<target>Copiar archivos compartidos o bloqueados usando el servicio de Instantánea de volumen.</target>
+
+<source>(requires administrator rights)</source>
+<target>(requiere derechos de administrador)</target>
<source>Copy file access permissions</source>
<target>Copiar permisos de acceso al archivo</target>
-<source>Transfer file and folder permissions (requires administrator rights)</source>
-<target>Transferir permisos de archivo y carpeta (requiere derechos de administrador)</target>
+<source>Transfer file and folder permissions.</source>
+<target>Transferir permisos de archivos y carpetas.</target>
+
+<source>Automatic retry on error:</source>
+<target>Retardo automático en caso de error :</target>
+
+<source>Retry count:</source>
+<target>Cuenta de reintentos:</target>
-<source>Restore hidden dialogs</source>
-<target>Restaurar diálogos ocultos</target>
+<source>Delay (in seconds):</source>
+<target>Retardo (en segundos):</target>
-<source>External applications</source>
-<target>Aplicaciones externas</target>
+<source>Customize context menu:</source>
+<target>Personalizar menú contextual :</target>
<source>Description</source>
<target>Descripción</target>
+<source>Restore hidden windows</source>
+<target>Restaurar ventanas ocultas</target>
+
<source>&Default</source>
<target>&Configuración predeterminada</target>
-<source>Find what:</source>
-<target>Buscar:</target>
+<source>Source code written in C++ using:</source>
+<target>Código fuente original en C++ con apoyo de:</target>
-<source>Match case</source>
-<target>Distinción entre mayúsculas y minúsculas</target>
+<source>If you like FreeFileSync</source>
+<target>¿Te gusta FreeFileSync? :</target>
-<source>&Find next</source>
-<target>&Buscar siguiente</target>
+<source>Donate with PayPal</source>
+<target>Haz una donación por PayPal</target>
-<source>Start synchronization</source>
-<target>Iniciar sincronización</target>
+<source>Feedback and suggestions are welcome</source>
+<target>Comentarios y sugerencias bienvenidos :</target>
-<source>Delete</source>
-<target>Eliminar</target>
+<source>Homepage</source>
+<target>Página de inicio</target>
-<source>Configure filter</source>
-<target>Configurar filtro</target>
+<source>Email</source>
+<target>Correo electrónico</target>
-<source>Find</source>
-<target>Buscar</target>
+<source>Published under the GNU General Public License</source>
+<target>Publicado con derechos GNU General Public License :</target>
+
+<source>Many thanks for localization:</source>
+<target>Agradecimientos por las traducciones a:</target>
+
+<source>Save as Batch Job</source>
+<target>Guardar como tarea por lotes</target>
+
+<source>Delete Items</source>
+<target>Eliminar elementos</target>
+
+<source>Global Settings</source>
+<target>Opciones globales</target>
-<source>Select time span</source>
+<source>Select Time Span</source>
<target>Seleccionar duración</target>
-<source>Folder pairs</source>
+<source>Folder Pairs</source>
<target>Pares de carpetas</target>
+<source>Find</source>
+<target>Buscar</target>
+
<source>Overview</source>
<target>Visión global</target>
<source>Configuration</source>
<target>Configuración</target>
-<source>Main bar</source>
+<source>Main Bar</source>
<target>Barra principal</target>
-<source>Filter files</source>
+<source>Filter Files</source>
<target>Filtrar archivos</target>
-<source>Select view</source>
+<source>Select View</source>
<target>Seleccione vista</target>
<source>Open...</source>
@@ -1044,18 +1077,27 @@ Nota: las rutas de archivo deben ser relativas a los directorios base.
<source>Compare both sides</source>
<target>Comparar ambos lados</target>
+<source>Comparison settings</source>
+<target>Opciones de comparación</target>
+
+<source>Synchronization settings</source>
+<target>Opciones de sincronización</target>
+
+<source>Start synchronization</source>
+<target>Iniciar sincronización</target>
+
+<source>Confirm</source>
+<target>Confirmar</target>
+
<source>
-<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for one item?</pluralform>
<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
</source>
<target>
-<pluralform>¿Realmente desea ejecutar la orden %y para un elemento?</pluralform>
-<pluralform>¿Realmente desea ejecutar la orden %y para %x elementos?</pluralform>
+<pluralform>¿Realmente desea ejecutar el comando %y para un elemento?</pluralform>
+<pluralform>¿Realmente desea ejecutar el comando %y para %x elementos?</pluralform>
</target>
-<source>Confirm</source>
-<target>Confirmar</target>
-
<source>&Execute</source>
<target>&Ejecutar</target>
@@ -1089,12 +1131,6 @@ Nota: las rutas de archivo deben ser relativas a los directorios base.
<source>Set direction:</source>
<target>Indicar dirección:</target>
-<source>Exclude temporarily</source>
-<target>Excluir temporalmente</target>
-
-<source>Include temporarily</source>
-<target>Incluir temporalmente</target>
-
<source>multiple selection</source>
<target>selección múltiple</target>
@@ -1104,6 +1140,15 @@ Nota: las rutas de archivo deben ser relativas a los directorios base.
<source>Exclude via filter:</source>
<target>Excluir a través del filtro:</target>
+<source>Exclude temporarily</source>
+<target>Excluir temporalmente</target>
+
+<source>Include temporarily</source>
+<target>Incluir temporalmente</target>
+
+<source>Delete</source>
+<target>Eliminar</target>
+
<source>Include all</source>
<target>Incluir todo</target>
@@ -1141,16 +1186,19 @@ Nota: las rutas de archivo deben ser relativas a los directorios base.
<target>Configuración guardada</target>
<source>FreeFileSync batch</source>
-<target>Lote de FreeFileSync</target>
+<target>Tarea por lotes de FreeFileSync</target>
<source>Do you want to save changes to %x?</source>
<target>¿Quiere guardar los cambios de %x?</target>
+<source>Never save &changes</source>
+<target>Nunca guardar &cambios</target>
+
<source>Do&n't save</source>
<target>&No guardar</target>
-<source>Never save &changes</source>
-<target>Nunca guardar &cambios</target>
+<source>Filter</source>
+<target>Filtro</target>
<source>Show files that exist on left side only</source>
<target>Mostrar sólo archivos existentes en la izquierda</target>
@@ -1197,12 +1245,18 @@ Nota: las rutas de archivo deben ser relativas a los directorios base.
<source>Set as default</source>
<target>Predeterminado</target>
-<source>Operation aborted</source>
-<target>Operación anulada</target>
-
<source>All folders are in sync</source>
<target>Todas las carpetas están sincronizadas</target>
+<source>Synchronization Settings</source>
+<target>Opciones de sincronización</target>
+
+<source>Comparison Settings</source>
+<target>Opciones de comparación</target>
+
+<source>Cannot find %x</source>
+<target>No se puede encontrar %x</target>
+
<source>Comma-separated values</source>
<target>Valores separados por comas</target>
@@ -1212,30 +1266,6 @@ Nota: las rutas de archivo deben ser relativas a los directorios base.
<source>Searching for program updates...</source>
<target>Buscando actualizaciones del programa…</target>
-<source>&Ignore subsequent errors</source>
-<target>&Ignorar errores posteriores</target>
-
-<source>&Ignore</source>
-<target>&Ignorar</target>
-
-<source>Fatal Error</source>
-<target>Error fatal</target>
-
-<source>&Don't show this warning again</source>
-<target>&No volver a mostrar este aviso</target>
-
-<source>&Switch</source>
-<target>&Cambiar</target>
-
-<source>Question</source>
-<target>Pregunta</target>
-
-<source>&Yes</source>
-<target>&Si</target>
-
-<source>&No</source>
-<target>&No</target>
-
<source>Scanning...</source>
<target>Escaneando…</target>
@@ -1245,14 +1275,17 @@ Nota: las rutas de archivo deben ser relativas a los directorios base.
<source>Info</source>
<target>Info</target>
+<source>Warning</source>
+<target>Atención</target>
+
<source>Paused</source>
<target>Pausado</target>
<source>Initializing...</source>
<target>Inicializando…</target>
-<source>Aborted</source>
-<target>Anulado</target>
+<source>Stopped</source>
+<target>Detenido</target>
<source>Completed</source>
<target>Terminado</target>
@@ -1263,12 +1296,6 @@ Nota: las rutas de archivo deben ser relativas a los directorios base.
<source>Log</source>
<target>Registro</target>
-<source>Cannot find %x</source>
-<target>No se puede encontrar %x</target>
-
-<source>Inactive</source>
-<target>Inactivo</target>
-
<source>Today</source>
<target>Hoy</target>
@@ -1293,9 +1320,6 @@ Nota: las rutas de archivo deben ser relativas a los directorios base.
<source>MB</source>
<target>MB</target>
-<source>Filter</source>
-<target>Filtro</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>
@@ -1305,6 +1329,9 @@ Nota: las rutas de archivo deben ser relativas a los directorios base.
<pluralform>¿Realmente desea mover estos %x elementos a la papelera de reciclaje?</pluralform>
</target>
+<source>Move</source>
+<target>Mover</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>
@@ -1314,6 +1341,9 @@ Nota: las rutas de archivo deben ser relativas a los directorios base.
<pluralform>¿Realmente desea eliminar estos %x elementos?</pluralform>
</target>
+<source>Exclude</source>
+<target>Excluir</target>
+
<source>Direct</source>
<target>Enviar</target>
@@ -1338,8 +1368,8 @@ Nota: las rutas de archivo deben ser relativas a los directorios base.
<source>- Other side's counterpart to %item_folder%</source>
<target>- El otro lado de %item_folder%</target>
-<source>Make hidden warnings and dialogs visible again?</source>
-<target>¿Hacer visibles de nuevo los mensajes de alerta y diálogo?</target>
+<source>Restore all hidden windows and warnings?</source>
+<target>Restaurar todas las ventanas y mensajes de advertencia ocultados ?</target>
<source>Leave as unresolved conflict</source>
<target>Dejar como conflicto sin resolver</target>
@@ -1464,14 +1494,14 @@ Nota: las rutas de archivo deben ser relativas a los directorios base.
<pluralform>%x días</pluralform>
</target>
-<source>Failed to register to receive system messages.</source>
-<target>Fallo al registrar la recepción de mensajes sistema.</target>
+<source>Unable to register to receive system messages.</source>
+<target>No es posible registrar la recepción de mensajes sistema.</target>
<source>Cannot set privilege %x.</source>
<target>No se puede asignar el privilegio %x.</target>
-<source>Failed to suspend system sleep mode.</source>
-<target>Fallo al intentar suspender el sistema.</target>
+<source>Unable to suspend system sleep mode.</source>
+<target>No es posible suspender el sistema.</target>
<source>Cannot change process I/O priorities.</source>
<target>No se pudieron cambiar las prioridades de E/S del proceso.</target>
diff --git a/BUILD/Languages/swedish.lng b/BUILD/Languages/swedish.lng
index f6e3f52b..38c590ff 100644
--- a/BUILD/Languages/swedish.lng
+++ b/BUILD/Languages/swedish.lng
@@ -2,11 +2,28 @@
<language>Svenska</language>
<translator>Åke Engelbrektson</translator>
<locale>sv_SE</locale>
- <flag_image>flag_sweden.png</flag_image>
- <plural_form_count>2</plural_form_count>
+ <image>flag_sweden.png</image>
+ <plural_count>2</plural_count>
<plural_definition>n == 1 ? 0 : 1</plural_definition>
</header>
+<source>
+<pluralform>Do you really want to execute the command %y for one item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+</target>
+
+<source>Retrying operation</source>
+<target></target>
+
+<source>
+<pluralform>Automatic retry in 1 second...</pluralform>
+<pluralform>Automatic retry in %x seconds...</pluralform>
+</source>
+<target>
+</target>
+
<source>Both sides have changed since last synchronization.</source>
<target>Bägge sidor har ändrats sedan senaste synkroniseringen.</target>
@@ -292,8 +309,8 @@
<source>/sec</source>
<target>/s</target>
-<source>%x items</source>
-<target>%x objekt</target>
+<source>%x items/sec</source>
+<target>%x objekt/sek.</target>
<source>Configuration file %x loaded partially only.</source>
<target>Konfigurationsfilen %x lästes bara delvis in.</target>
@@ -322,11 +339,11 @@
<source>Volume name %x is not part of file path %y.</source>
<target>Volymnamnet %x är inte en del av sökvägen %y.</target>
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Avbryter: Väntar på att aktuell process skall slutföras...</target>
+<source>Stop requested: Waiting for current operation to finish...</source>
+<target>Stopp begärt: Väntar på att aktuell åtgärd skall slutföras...</target>
-<source>Failure to create timestamp for versioning:</source>
-<target>Kunde inte skapa tidsstämpel för versionshantering</target>
+<source>Unable to create timestamp for versioning:</source>
+<target>Kunde inte skapa tidsstämpel för versionshantering:</target>
<source>Cannot read the following XML elements:</source>
<target>Kan inte läsa följande XML-element:</target>
@@ -343,8 +360,8 @@
<source>&Program</source>
<target>&Program</target>
-<source>&Content</source>
-<target>&Innehåll</target>
+<source>&View help</source>
+<target>&Visa hjälpen</target>
<source>&About</source>
<target>&Om</target>
@@ -367,8 +384,8 @@
<source>To get started just import a .ffs_batch file.</source>
<target>Importera en .ffs_batch-fil för att komma igång</target>
-<source>Folders to watch</source>
-<target>Mappar att bevaka</target>
+<source>Folders to watch:</source>
+<target>Mappar att övervaka:</target>
<source>Add folder</source>
<target>Lägg till mapp</target>
@@ -380,14 +397,17 @@
<target>Bläddra</target>
<source>Select a folder</source>
-<target>Markera en mapp</target>
+<target>Välj en mapp</target>
-<source>Idle time [seconds]</source>
-<target>Inaktivitet [sekunder]</target>
+<source>Idle time (in seconds):</source>
+<target>Vilotid (i sekunder)</target>
<source>Idle time between last detected change and execution of command</source>
<target>Väntetid mellan senast upptäckta förändring och kommandoexekvering</target>
+<source>Command line:</source>
+<target>Kommandorad:</target>
+
<source>
The command is triggered if:
- files or subfolders change
@@ -399,8 +419,8 @@ Kommandot triggas om:
- nya mappar upptäcks (ex. USB-minne ansluts)
</target>
-<source>Start</source>
-<target>Start</target>
+<source>&Start</source>
+<target>&Start</target>
<source>&Retry</source>
<target>&Försök igen</target>
@@ -408,9 +428,6 @@ Kommandot triggas om:
<source>Cancel</source>
<target>Avbryt</target>
-<source>RealtimeSync - Automated Synchronization</source>
-<target>RealtimeSync - Automatiserad synkronisering</target>
-
<source>Build: %x</source>
<target>Bygge: %x</target>
@@ -420,6 +437,9 @@ Kommandot triggas om:
<source>All files</source>
<target>Alla filer</target>
+<source>Automated Synchronization</source>
+<target>Automatiserad synkronisering</target>
+
<source>Directory monitoring active</source>
<target>Mappövervakning aktiv</target>
@@ -435,8 +455,8 @@ Kommandot triggas om:
<source>&Exit</source>
<target>&Avsluta</target>
-<source>Invalid command line:</source>
-<target>Ogiltig kommandorad:</target>
+<source>Incorrect command line:</source>
+<target>Felaktig kommandorad:</target>
<source>File content</source>
<target>Filinnehåll</target>
@@ -498,8 +518,8 @@ Kommandot triggas om:
<source>Target folder input field must not be empty.</source>
<target>Indatafältet för målmapp får inte vara tomt.</target>
-<source>Folder input field for versioning must not be empty.</source>
-<target>Indatafältet för versionshantering får inte vara tomt.</target>
+<source>Please enter a target folder for versioning.</source>
+<target>Ange en målmapp för versionshantering.</target>
<source>Source folder %x not found.</source>
<target>Källmappen %x kan inte hittas.</target>
@@ -537,8 +557,8 @@ Kommandot triggas om:
<source>job name</source>
<target>åtgärdsnamn</target>
-<source>Synchronization aborted</source>
-<target>Synkronisering avbruten</target>
+<source>Synchronization stopped</source>
+<target>Synkroniseringen stoppad</target>
<source>Synchronization completed with errors</source>
<target>Synkronisering slutförd med fel</target>
@@ -555,14 +575,11 @@ Kommandot triggas om:
<source>Saving log file %x...</source>
<target>Sparar loggfil %x...</target>
-<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
-<target>Tryck "Växla" för att lösa problem i FreeFileSyncs huvudfönster</target>
-
-<source>Switching to FreeFileSync main dialog</source>
-<target>Växlar till FreeFileSyncs huvuddialog</target>
+<source>You can switch to FreeFileSync's main window to resolve this issue.</source>
+<target>Du kan växla till FreeFileSyncs programfönster för att lösa problemet.</target>
-<source>Retrying operation after error:</source>
-<target>Försöker utföra åtgärden igen, efter fel:</target>
+<source>Switching to FreeFileSync's main window</source>
+<target>Växla till FreeFileSyncs programfönster</target>
<source>A new version of FreeFileSync is available:</source>
<target>Det finns en ny version av FreeFileSync</target>
@@ -570,8 +587,8 @@ Kommandot triggas om:
<source>Download now?</source>
<target>Ladda ner nu?</target>
-<source>New version found</source>
-<target>Ny version hittad</target>
+<source>Check for Program Updates</source>
+<target>Sök efter programuppdateringar</target>
<source>&Download</source>
<target>&Ladda ner</target>
@@ -639,20 +656,20 @@ Kommandot triggas om:
<source>Hibernate</source>
<target>Viloläge</target>
-<source>Selected variant:</source>
-<target>Vald variant:</target>
+<source>Alternate comparison settings</source>
+<target>Alternativa jämförelseinställningar</target>
-<source>Select alternate comparison settings</source>
-<target>Välj alternativa jämförelseinställningar</target>
+<source>Alternate synchronization settings</source>
+<target>Alternativa synkroniseringsinställningar</target>
-<source>Select alternate synchronization settings</source>
-<target>Välj alternativa synkroniseringsinställningar</target>
+<source>Local filter</source>
+<target>Lokalt filter</target>
-<source>Filter is active</source>
-<target>Filter är aktiverat</target>
+<source>Active</source>
+<target>Aktiv</target>
-<source>No filter selected</source>
-<target>Inga filter aktiverade</target>
+<source>None</source>
+<target>Inget</target>
<source>Remove alternate settings</source>
<target>Ta bort alternativa inställningar</target>
@@ -666,6 +683,15 @@ Kommandot triggas om:
<source>Paste</source>
<target>Klistra in</target>
+<source>Alternate Comparison Settings</source>
+<target>Alternativa jämförelseinställningar</target>
+
+<source>Alternate Synchronization Settings</source>
+<target>Alternativa synkroniseringsinställningar</target>
+
+<source>Local Filter</source>
+<target>Lokalt filter</target>
+
<source>&New</source>
<target>&Nytt</target>
@@ -681,15 +707,18 @@ Kommandot triggas om:
<source>2. &Synchronize</source>
<target>2. &Synkronisera</target>
+<source>&Global settings</source>
+<target>&Allmäna inställningar</target>
+
<source>&Language</source>
<target>&Språk</target>
+<source>&Find...</source>
+<target>&Sök...</target>
+
<source>&Export file list...</source>
<target>&Exportera fillista...</target>
-<source>&Global settings</source>
-<target>&Allmäna inställningar</target>
-
<source>&Tools</source>
<target>&Verktyg</target>
@@ -699,18 +728,12 @@ Kommandot triggas om:
<source>Check &automatically once a week</source>
<target>Sök &automatiskt en gång per vecka</target>
-<source>Check for new &version</source>
-<target>Sök efter ny &version</target>
+<source>&Check for new version</source>
+<target>&Sök efter uppdateringar</target>
<source>Compare</source>
<target>Jämför</target>
-<source>Comparison settings</source>
-<target>Jämförelseinställningar</target>
-
-<source>Synchronization settings</source>
-<target>Synkroniseringsinställningar</target>
-
<source>Synchronize</source>
<target>Synkronisera</target>
@@ -723,6 +746,15 @@ Kommandot triggas om:
<source>Swap sides</source>
<target>Byt sida</target>
+<source>Close search bar</source>
+<target>Stäng sökfältet</target>
+
+<source>Find:</source>
+<target>Sök:</target>
+
+<source>Match case</source>
+<target>Matcha gemener/VERSALER</target>
+
<source>Save as batch job</source>
<target>Spara som batch-fil</target>
@@ -744,74 +776,20 @@ Kommandot triggas om:
<source>Total bytes to copy</source>
<target>Byte att kopiera</target>
-<source>Items found:</source>
-<target>Funna poster:</target>
-
-<source>Speed:</source>
-<target>Hastighet:</target>
-
-<source>Time remaining:</source>
-<target>Återstående tid:</target>
-
-<source>Time elapsed:</source>
-<target>Förfluten tid:</target>
-
-<source>Synchronizing...</source>
-<target>Synkroniserar...</target>
-
-<source>Minimize to notification area</source>
-<target>Minimera till meddelandefältet</target>
-
-<source>On completion</source>
-<target>Vid slutfört</target>
-
-<source>Close</source>
-<target>Stäng</target>
-
-<source>&Pause</source>
-<target>&Paus</target>
-
-<source>Variant</source>
-<target>Variant</target>
-
-<source>Statistics</source>
-<target>Statistik</target>
-
-<source>&Don't show this dialog again</source>
-<target>&Visa inte den här dialogen igen</target>
-
-<source>Select a variant</source>
-<target>Välj en variant</target>
+<source>Select a variant:</source>
+<target>Välj ett alternativ:</target>
-<source>
-Files are found equal if
- - last write time and date
- - file size
-are the same
-</source>
-<target>
-Filer betraktas som likvärdiga om
- - tidsstämpel för 'Senast ändrad'
- - filstorlek
-är samma.
-</target>
+<source>Identify equal files by comparing modification time and size.</source>
+<target>Identifiera likadana filer genom att jämföra tidsstämpling och filstorlek.</target>
-<source>
-Files are found equal if
- - file content
-is the same
-</source>
-<target>
-Filerna betecknas som lika om,
- - filinnehållet
-är lika
-</target>
+<source>Identify equal files by comparing the file content.</source>
+<target>Identifiera likadana filer genom att jämföra filinnehåll.</target>
-<source>Symbolic Link handling</source>
-<target>Hantering av Symboliska länkar</target>
+<source>Symbolic links:</source>
+<target>Symboliska länkar:</target>
-<source>Help</source>
-<target>Hjälp</target>
+<source>More information</source>
+<target>Mer information</target>
<source>OK</source>
<target>OK</target>
@@ -819,11 +797,11 @@ Filerna betecknas som lika om,
<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
<target>Identifierar och sprider förändringar på båda sidor. Borttagningar, förflyttningar och konflikter detekteras automatiskt med hjälp av en databas.</target>
-<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
-<target>Speglar säkerhetskopia av vänster mapp. Höger mapp ändras för att exakt matcha vänster efter synkroniseringen.</target>
+<source>Create a mirror backup of the left folder which exactly matches the right folder after synchronization.</source>
+<target>Skapar en speglad kopia av vänster mapp, som exakt matchas av höger mapp efter synkronisering.</target>
-<source>Copy new or updated files to right folder.</source>
-<target>Kopiera nya och uppdaterade filer till höger mapp.</target>
+<source>Copy new and updated files to the right folder.</source>
+<target>Kopierar nya och uppdaterade filer till höger mapp.</target>
<source>Configure your own synchronization rules.</source>
<target>Konfigurera dina egna synkroniseringsregler.</target>
@@ -834,23 +812,8 @@ Filerna betecknas som lika om,
<source>Requires database files. Not supported by all file systems.</source>
<target>Kräver databasfiler som inte stöds av alla filsystem</target>
-<source>Error handling</source>
-<target>Felhantering</target>
-
-<source>Ignore</source>
-<target>Ignorera</target>
-
-<source>Hide all error and warning messages</source>
-<target>Visa inte fel- och varningsmeddelanden</target>
-
-<source>Pop-up</source>
-<target>Popup</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Visa popup vid fel och varningar</target>
-
-<source>Deletion handling</source>
-<target>Borttagning</target>
+<source>Delete files:</source>
+<target>Ta bort filer:</target>
<source>Permanent</source>
<target>Permanent</target>
@@ -873,56 +836,89 @@ Filerna betecknas som lika om,
<source>Naming convention:</source>
<target>Regler för namngivning</target>
-<source>Batch job</source>
-<target>Batch-jobb</target>
+<source>Show examples</source>
+<target>Visa exempel</target>
-<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
-<target>Skapa en batch-fil för obevakad synkronisering. Dubbelklicka på filen för att starta den, eller schemalägg i en åtgärdshanterare: %x</target>
+<source>Handle errors:</source>
+<target>Felhantering:</target>
-<source>Exit</source>
-<target>Avsluta</target>
+<source>Ignore</source>
+<target>Ignorera</target>
-<source>Abort synchronization on first error</source>
-<target>Avbryt synkronisering vid första felet</target>
+<source>Hide all error and warning messages</source>
+<target>Visa inte fel- och varningsmeddelanden</target>
-<source>Show progress dialog</source>
-<target>Visa förloppsindikator</target>
+<source>Pop-up</source>
+<target>Popup</target>
-<source>Save log</source>
-<target>Spara logg</target>
+<source>Show pop-up on errors or warnings</source>
+<target>Visa popup vid fel och varningar</target>
-<source>Select folder to save log files</source>
-<target>Väl en mapp att spara loggfiler i</target>
+<source>On completion:</source>
+<target>Vid slutfört:</target>
-<source>Limit</source>
-<target>Begränsa</target>
+<source>Start synchronization now?</source>
+<target>Vill du starta synkroniseringen nu?</target>
-<source>Limit maximum number of log files</source>
-<target>Begränsa antalet loggfiler</target>
+<source>Variant:</source>
+<target>Alternativ:</target>
-<source>Source code written in C++ using:</source>
-<target>Källkod skriven i C++ med hjälp av:</target>
+<source>Statistics</source>
+<target>Statistik</target>
-<source>If you like FreeFileSync</source>
-<target>Om du gillar FreeFileSync</target>
+<source>&Don't show this dialog again</source>
+<target>&Visa inte den här dialogen igen</target>
-<source>Donate with PayPal</source>
-<target>Donera via PayPal</target>
+<source>Items found:</source>
+<target>Funna poster:</target>
-<source>Many thanks for localization:</source>
-<target>Tack för översättning:</target>
+<source>Speed:</source>
+<target>Hastighet:</target>
-<source>Feedback and suggestions are welcome</source>
-<target>Återkoppling och förslag är välkommna</target>
+<source>Time remaining:</source>
+<target>Återstående tid:</target>
-<source>Homepage</source>
-<target>Hemsida</target>
+<source>Time elapsed:</source>
+<target>Förfluten tid:</target>
-<source>Email</source>
-<target>E-post</target>
+<source>Synchronizing...</source>
+<target>Synkroniserar...</target>
-<source>Published under the GNU General Public License</source>
-<target>Publiserad under GNU General Public License</target>
+<source>Minimize to notification area</source>
+<target>Minimera till meddelandefältet</target>
+
+<source>Close</source>
+<target>Stäng</target>
+
+<source>&Pause</source>
+<target>&Paus</target>
+
+<source>Stop</source>
+<target>Stoppa</target>
+
+<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>Skapa en batch-fil för obevakad synkronisering. Dubbelklicka på filen för att starta den, eller schemalägg i en åtgärdshanterare: %x</target>
+
+<source>Stop synchronization at first error</source>
+<target>Stoppa synkroniseringen vid första fel som uppstår</target>
+
+<source>Show progress dialog</source>
+<target>Visa förloppsindikator</target>
+
+<source>Save log:</source>
+<target>Spara logg:</target>
+
+<source>Limit:</source>
+<target>Gräns:</target>
+
+<source>Limit maximum number of log files</source>
+<target>Begränsa antalet loggfiler</target>
+
+<source>How can I schedule a batch job?</source>
+<target>Hur schemalägger jag en batch-fil?</target>
+
+<source>&Recycle bin</source>
+<target>&Papperskorgen</target>
<source>Delete on both sides</source>
<target>Ta bort på båda sidor</target>
@@ -930,109 +926,139 @@ Filerna betecknas som lika om,
<source>Delete on both sides even if the file is selected on one side only</source>
<target>Ta bort på båda sidor, även om filen är markerad på endast en sida</target>
-<source>
-Files will only be synchronized if they pass all filter rules.
-Note: File paths must be relative to base directories.
-</source>
-<target>
-Filer synkroniseras endast om de klarar alla filterregler.
-OBS! Sökvägar måste vara relaterade till ursprungsmappar.
-</target>
+<source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source>
+<target>Skapa filtreringsregler för att undanta vissa filer från synkronisering. Sökvägar relateras till motsvarande mapp-par</target>
-<source>Include</source>
-<target>Inkludera</target>
+<source>Include:</source>
+<target>Inkludera:</target>
-<source>Exclude</source>
-<target>Undanta</target>
+<source>Exclude:</source>
+<target>Undanta:</target>
-<source>Time span</source>
-<target>Tidsintervall</target>
+<source>Time span:</source>
+<target>Tidsrymd:</target>
-<source>File size</source>
-<target>Filstorlek</target>
+<source>File size:</source>
+<target>Filstorlek:</target>
-<source>Minimum</source>
-<target>Minimum</target>
+<source>Minimum:</source>
+<target>Min:</target>
-<source>Maximum</source>
-<target>Maximum</target>
+<source>Maximum:</source>
+<target>Max:</target>
<source>&Clear</source>
<target>&Rensa</target>
-<source>Global settings</source>
-<target>Allmäna inställningar</target>
+<source>The following settings are used for all synchronization jobs.</source>
+<target>Följande inställningar används för all synkronisering</target>
<source>Fail-safe file copy</source>
<target>Felsäker filkopiering</target>
-<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
-<target>Kopiera till en temporär fil först (*.ffs_tmp), och byt sedan namn på den. Detta garanterar ett konsekvent tillstånd även vid allvarliga fel.</target>
+<source>
+Copy to a temporary file (*.ffs_tmp) before overwriting target.
+This guarantees a consistent state even in case of a serious error.
+</source>
+<target>
+Kopierar till en temporär fil (*.ffs_tmp), före överskrivning av målet.
+Detta garanterar ett konsekvent tillstånd även vid allvarliga fel.
+</target>
+
+<source>(recommended)</source>
+<target>(rekommenderas)</target>
<source>Copy locked files</source>
<target>Kopiera låsta filer</target>
-<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
-<target>Kopiera delade eller låsta filer med tjänsten 'Volume Shadow Copy' (kräver administratörsbehörighet)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service.</source>
+<target>Kopierar delade eller låsta filer med hjälp av tjänsten 'Volume Shadow Copy'</target>
+
+<source>(requires administrator rights)</source>
+<target>(kräver administratörsbehörighet)</target>
<source>Copy file access permissions</source>
<target>Kopiera filåtkomstbehörigheter</target>
-<source>Transfer file and folder permissions (requires administrator rights)</source>
-<target>Överför fil- och mappbehörigheter (kräver administratörsbehörighet)</target>
+<source>Transfer file and folder permissions.</source>
+<target>Överför behörighetsinställningar</target>
+
+<source>Automatic retry on error:</source>
+<target>Automatiska återförsök vid fel:</target>
-<source>Restore hidden dialogs</source>
-<target>Återställ dolda dialoger</target>
+<source>Retry count:</source>
+<target>Antal försök:</target>
-<source>External applications</source>
-<target>Externa program</target>
+<source>Delay (in seconds):</source>
+<target>Fördröjning (i sekunder)</target>
+
+<source>Customize context menu:</source>
+<target>Anpassad kontextmeny:</target>
<source>Description</source>
<target>Beskrivning</target>
+<source>Restore hidden windows</source>
+<target>Återställ dolda vyer</target>
+
<source>&Default</source>
<target>&Standard</target>
-<source>Find what:</source>
-<target>Sök efter:</target>
+<source>Source code written in C++ using:</source>
+<target>Källkod skriven i C++ med hjälp av:</target>
-<source>Match case</source>
-<target>Matcha gemener/VERSALER</target>
+<source>If you like FreeFileSync</source>
+<target>Om du gillar FreeFileSync</target>
-<source>&Find next</source>
-<target>&Sök nästa</target>
+<source>Donate with PayPal</source>
+<target>Donera via PayPal</target>
-<source>Start synchronization</source>
-<target>Starta synkronisering</target>
+<source>Feedback and suggestions are welcome</source>
+<target>Återkoppling och förslag är välkommna</target>
-<source>Delete</source>
-<target>Ta bort</target>
+<source>Homepage</source>
+<target>Hemsida</target>
-<source>Configure filter</source>
-<target>Filterinställningar</target>
+<source>Email</source>
+<target>E-post</target>
-<source>Find</source>
-<target>Sök</target>
+<source>Published under the GNU General Public License</source>
+<target>Publiserad under GNU General Public License</target>
+
+<source>Many thanks for localization:</source>
+<target>Tack för översättning:</target>
+
+<source>Save as Batch Job</source>
+<target>Spara som batch-fil</target>
+
+<source>Delete Items</source>
+<target>Ta bort objekt</target>
-<source>Select time span</source>
-<target>Välj tidsintervall</target>
+<source>Global Settings</source>
+<target>Globala inställningar</target>
-<source>Folder pairs</source>
+<source>Select Time Span</source>
+<target>Välj tidsrymd</target>
+
+<source>Folder Pairs</source>
<target>Mapp-par</target>
+<source>Find</source>
+<target>Sök</target>
+
<source>Overview</source>
<target>Översikt</target>
<source>Configuration</source>
<target>Inställningar</target>
-<source>Main bar</source>
-<target>Huvudfält</target>
+<source>Main Bar</source>
+<target>Primärt verktygsfält</target>
-<source>Filter files</source>
-<target>Undantag</target>
+<source>Filter Files</source>
+<target>Filtrera filer</target>
-<source>Select view</source>
+<source>Select View</source>
<target>Välj vy</target>
<source>Open...</source>
@@ -1044,14 +1070,14 @@ OBS! Sökvägar måste vara relaterade till ursprungsmappar.
<source>Compare both sides</source>
<target>Jämför båda sidor</target>
-<source>
-<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
-<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
-</source>
-<target>
-<pluralform>Vill du verkligen köra kommandot %y för 1 objekt?</pluralform>
-<pluralform>Vill du verkligen köra kommandot %y för %x objekt?</pluralform>
-</target>
+<source>Comparison settings</source>
+<target>Jämförelseinställningar</target>
+
+<source>Synchronization settings</source>
+<target>Synkroniseringsinställningar</target>
+
+<source>Start synchronization</source>
+<target>Starta synkronisering</target>
<source>Confirm</source>
<target>Bekräfta</target>
@@ -1089,12 +1115,6 @@ OBS! Sökvägar måste vara relaterade till ursprungsmappar.
<source>Set direction:</source>
<target>Ange riktning:</target>
-<source>Exclude temporarily</source>
-<target>Undanta tillfälligt</target>
-
-<source>Include temporarily</source>
-<target>Inkludera tillfälligt</target>
-
<source>multiple selection</source>
<target>flerval</target>
@@ -1104,6 +1124,15 @@ OBS! Sökvägar måste vara relaterade till ursprungsmappar.
<source>Exclude via filter:</source>
<target>Lägg till i undantag:</target>
+<source>Exclude temporarily</source>
+<target>Undanta tillfälligt</target>
+
+<source>Include temporarily</source>
+<target>Inkludera tillfälligt</target>
+
+<source>Delete</source>
+<target>Ta bort</target>
+
<source>Include all</source>
<target>Inkludera alla</target>
@@ -1152,6 +1181,9 @@ OBS! Sökvägar måste vara relaterade till ursprungsmappar.
<source>Never save &changes</source>
<target>Spara aldrig &ändringar</target>
+<source>Filter</source>
+<target>Filter</target>
+
<source>Show files that exist on left side only</source>
<target>Visa filer som endast finns till vänster</target>
@@ -1197,12 +1229,18 @@ OBS! Sökvägar måste vara relaterade till ursprungsmappar.
<source>Set as default</source>
<target>Ange som standard</target>
-<source>Operation aborted</source>
-<target>Processen avbruten</target>
-
<source>All folders are in sync</source>
<target>Alla mappar är synkroniserade</target>
+<source>Synchronization Settings</source>
+<target>Synkroniseringsinställningar</target>
+
+<source>Comparison Settings</source>
+<target>Jämförelseinställningar</target>
+
+<source>Cannot find %x</source>
+<target>Kan inte hitta %x</target>
+
<source>Comma-separated values</source>
<target>Kommaseparerade värden</target>
@@ -1218,7 +1256,7 @@ OBS! Sökvägar måste vara relaterade till ursprungsmappar.
<source>&Ignore</source>
<target>&Ignorera</target>
-<source>Fatal Error</source>
+<source>Serious Error</source>
<target>Allvarligt fel</target>
<source>&Don't show this warning again</source>
@@ -1227,9 +1265,6 @@ OBS! Sökvägar måste vara relaterade till ursprungsmappar.
<source>&Switch</source>
<target>&Växla</target>
-<source>Question</source>
-<target>Fråga</target>
-
<source>&Yes</source>
<target>&Ja</target>
@@ -1251,8 +1286,8 @@ OBS! Sökvägar måste vara relaterade till ursprungsmappar.
<source>Initializing...</source>
<target>Initierar...</target>
-<source>Aborted</source>
-<target>Användaren avbröt</target>
+<source>Stopped</source>
+<target>Stoppad</target>
<source>Completed</source>
<target>Slutförd</target>
@@ -1263,12 +1298,6 @@ OBS! Sökvägar måste vara relaterade till ursprungsmappar.
<source>Log</source>
<target>Logg</target>
-<source>Cannot find %x</source>
-<target>Kan inte hitta %x</target>
-
-<source>Inactive</source>
-<target>Inaktiv</target>
-
<source>Today</source>
<target>Idag</target>
@@ -1293,9 +1322,6 @@ OBS! Sökvägar måste vara relaterade till ursprungsmappar.
<source>MB</source>
<target>MB</target>
-<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>
@@ -1305,6 +1331,9 @@ OBS! Sökvägar måste vara relaterade till ursprungsmappar.
<pluralform>Vill du verkligen flytta följande %x objekt till papperskorgen?</pluralform>
</target>
+<source>Move</source>
+<target>Flytta</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>
@@ -1314,6 +1343,9 @@ OBS! Sökvägar måste vara relaterade till ursprungsmappar.
<pluralform>Vill du verkligen ta bort följande %x objekt?</pluralform>
</target>
+<source>Exclude</source>
+<target>Undanta</target>
+
<source>Direct</source>
<target>Direkt</target>
@@ -1338,8 +1370,8 @@ OBS! Sökvägar måste vara relaterade till ursprungsmappar.
<source>- Other side's counterpart to %item_folder%</source>
<target>- Andra sidans motsvarighet till %item_folder%</target>
-<source>Make hidden warnings and dialogs visible again?</source>
-<target>Vill du göra dolda varningar och dialoger, synliga igen?</target>
+<source>Restore all hidden windows and warnings?</source>
+<target>Vill du återställa alla dolda vyer och varningar</target>
<source>Leave as unresolved conflict</source>
<target>Ignorera konflikt</target>
@@ -1464,14 +1496,14 @@ OBS! Sökvägar måste vara relaterade till ursprungsmappar.
<pluralform>%x dagar</pluralform>
</target>
-<source>Failed to register to receive system messages.</source>
-<target>Kunde inte registrera att ta emot systemmeddelanden</target>
+<source>Unable to register to receive system messages.</source>
+<target>Det gick inte att registrera mottagning av systemmeddelanden</target>
<source>Cannot set privilege %x.</source>
<target>Kan inte att ange behörigheten %x.</target>
-<source>Failed to suspend system sleep mode.</source>
-<target>Kunde inte avbryta systemet vänteläge</target>
+<source>Unable to suspend system sleep mode.</source>
+<target>Det går inte att avbryta systemets viloläge</target>
<source>Cannot change process I/O priorities.</source>
<target>Kan inte ändra process I/O-prioritet</target>
diff --git a/BUILD/Languages/turkish.lng b/BUILD/Languages/turkish.lng
index 870eb214..7ab30b7f 100644
--- a/BUILD/Languages/turkish.lng
+++ b/BUILD/Languages/turkish.lng
@@ -2,11 +2,271 @@
<language>Türkçe</language>
<translator>Kaya Zeren</translator>
<locale>tr_TR</locale>
- <flag_image>flag_turkey.png</flag_image>
- <plural_form_count>2</plural_form_count>
+ <image>flag_turkey.png</image>
+ <plural_count>2</plural_count>
<plural_definition>n == 1 ? 0 : 1</plural_definition>
</header>
+<source>Unable to suspend system sleep mode.</source>
+<target></target>
+
+<source>Unable to register to receive system messages.</source>
+<target></target>
+
+<source>Restore all hidden windows and warnings?</source>
+<target></target>
+
+<source>Move</source>
+<target></target>
+
+<source>Stopped</source>
+<target></target>
+
+<source>Serious Error</source>
+<target></target>
+
+<source>Comparison Settings</source>
+<target></target>
+
+<source>Synchronization Settings</source>
+<target></target>
+
+<source>
+<pluralform>Do you really want to execute the command %y for one item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+</target>
+
+<source>Select View</source>
+<target></target>
+
+<source>Filter Files</source>
+<target></target>
+
+<source>Main Bar</source>
+<target></target>
+
+<source>Folder Pairs</source>
+<target></target>
+
+<source>Select Time Span</source>
+<target></target>
+
+<source>Global Settings</source>
+<target></target>
+
+<source>Delete Items</source>
+<target></target>
+
+<source>Save as Batch Job</source>
+<target></target>
+
+<source>Restore hidden windows</source>
+<target></target>
+
+<source>Customize context menu:</source>
+<target></target>
+
+<source>Delay (in seconds):</source>
+<target></target>
+
+<source>Retry count:</source>
+<target></target>
+
+<source>Automatic retry on error:</source>
+<target></target>
+
+<source>Transfer file and folder permissions.</source>
+<target></target>
+
+<source>(requires administrator rights)</source>
+<target></target>
+
+<source>Copy shared or locked files using the Volume Shadow Copy Service.</source>
+<target></target>
+
+<source>(recommended)</source>
+<target></target>
+
+<source>
+Copy to a temporary file (*.ffs_tmp) before overwriting target.
+This guarantees a consistent state even in case of a serious error.
+</source>
+<target></target>
+
+<source>The following settings are used for all synchronization jobs.</source>
+<target></target>
+
+<source>Maximum:</source>
+<target></target>
+
+<source>Minimum:</source>
+<target></target>
+
+<source>File size:</source>
+<target></target>
+
+<source>Time span:</source>
+<target></target>
+
+<source>Exclude:</source>
+<target></target>
+
+<source>Include:</source>
+<target></target>
+
+<source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source>
+<target></target>
+
+<source>&Recycle bin</source>
+<target></target>
+
+<source>How can I schedule a batch job?</source>
+<target></target>
+
+<source>Limit:</source>
+<target></target>
+
+<source>Save log:</source>
+<target></target>
+
+<source>Stop synchronization at first error</source>
+<target></target>
+
+<source>Stop</source>
+<target></target>
+
+<source>Variant:</source>
+<target></target>
+
+<source>Start synchronization now?</source>
+<target></target>
+
+<source>On completion:</source>
+<target></target>
+
+<source>Handle errors:</source>
+<target></target>
+
+<source>Show examples</source>
+<target></target>
+
+<source>Delete files:</source>
+<target></target>
+
+<source>Copy new and updated files to the right folder.</source>
+<target></target>
+
+<source>Create a mirror backup of the left folder which exactly matches the right folder after synchronization.</source>
+<target></target>
+
+<source>More information</source>
+<target></target>
+
+<source>Symbolic links:</source>
+<target></target>
+
+<source>Identify equal files by comparing the file content.</source>
+<target></target>
+
+<source>Identify equal files by comparing modification time and size.</source>
+<target></target>
+
+<source>Select a variant:</source>
+<target></target>
+
+<source>Find:</source>
+<target></target>
+
+<source>Close search bar</source>
+<target></target>
+
+<source>&Check for new version</source>
+<target></target>
+
+<source>&Find...</source>
+<target></target>
+
+<source>Local Filter</source>
+<target></target>
+
+<source>Alternate Synchronization Settings</source>
+<target></target>
+
+<source>Alternate Comparison Settings</source>
+<target></target>
+
+<source>None</source>
+<target></target>
+
+<source>Active</source>
+<target></target>
+
+<source>Local filter</source>
+<target></target>
+
+<source>Alternate synchronization settings</source>
+<target></target>
+
+<source>Alternate comparison settings</source>
+<target></target>
+
+<source>Check for Program Updates</source>
+<target></target>
+
+<source>Retrying operation</source>
+<target></target>
+
+<source>
+<pluralform>Automatic retry in 1 second...</pluralform>
+<pluralform>Automatic retry in %x seconds...</pluralform>
+</source>
+<target>
+</target>
+
+<source>Switching to FreeFileSync's main window</source>
+<target></target>
+
+<source>You can switch to FreeFileSync's main window to resolve this issue.</source>
+<target></target>
+
+<source>Synchronization stopped</source>
+<target></target>
+
+<source>Please enter a target folder for versioning.</source>
+<target></target>
+
+<source>Incorrect command line:</source>
+<target></target>
+
+<source>Automated Synchronization</source>
+<target></target>
+
+<source>&Start</source>
+<target></target>
+
+<source>Command line:</source>
+<target></target>
+
+<source>Idle time (in seconds):</source>
+<target></target>
+
+<source>Folders to watch:</source>
+<target></target>
+
+<source>&View help</source>
+<target></target>
+
+<source>Unable to create timestamp for versioning:</source>
+<target></target>
+
+<source>Stop requested: Waiting for current operation to finish...</source>
+<target></target>
+
+<source>%x items/sec</source>
+<target></target>
+
<source>Both sides have changed since last synchronization.</source>
<target>Son eşleştirmeden bu yana iki tarafın da içeriği değişmiş.</target>
@@ -292,9 +552,6 @@
<source>/sec</source>
<target>/saniye</target>
-<source>%x items</source>
-<target>%x öge</target>
-
<source>Configuration file %x loaded partially only.</source>
<target>%x ayarlar dosyası kısmen yüklendi.</target>
@@ -322,12 +579,6 @@
<source>Volume name %x is not part of file path %y.</source>
<target>%x birim adı %y dosya yolunun bir parçası değil.</target>
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Vazgeçildi: Yürürlükteki işlemin bitmesi bekleniyor...</target>
-
-<source>Failure to create timestamp for versioning:</source>
-<target>Eski sürüm için zaman damgası oluşturulamadı:</target>
-
<source>Cannot read the following XML elements:</source>
<target>Şu XML elemanları okunamadı:</target>
@@ -343,9 +594,6 @@
<source>&Program</source>
<target>&Dosya</target>
-<source>&Content</source>
-<target>İçe&rik</target>
-
<source>&About</source>
<target>H&akkında</target>
@@ -367,9 +615,6 @@
<source>To get started just import a .ffs_batch file.</source>
<target>.ffs_batch dosyasını yükleyerek başlayabilirsiniz.</target>
-<source>Folders to watch</source>
-<target>İzlenecek klasörler</target>
-
<source>Add folder</source>
<target>Klasör ekleyin</target>
@@ -382,9 +627,6 @@
<source>Select a folder</source>
<target>Bir klasör seçin</target>
-<source>Idle time [seconds]</source>
-<target>Boşta bekleme süresi {saniye]</target>
-
<source>Idle time between last detected change and execution of command</source>
<target>Son algılanan değişiklik ile komutun yürütülmesi arasında beklenecek süre</target>
@@ -399,18 +641,12 @@ Komut şu durumlarda yürütülür:
- yeni klasörler algılandığında (örneğin bir USB bellek takıldığında)
</target>
-<source>Start</source>
-<target>Başlayın</target>
-
<source>&Retry</source>
<target>&Yeniden deneyin</target>
<source>Cancel</source>
<target>İptal</target>
-<source>RealtimeSync - Automated Synchronization</source>
-<target>RealtimeSync - Kendiliğinden Eşleştirme</target>
-
<source>Build: %x</source>
<target>Yapım: %x</target>
@@ -435,9 +671,6 @@ Komut şu durumlarda yürütülür:
<source>&Exit</source>
<target>Çı&kın</target>
-<source>Invalid command line:</source>
-<target>Geçersiz komut satırı:</target>
-
<source>File content</source>
<target>İçeriğe göre</target>
@@ -498,9 +731,6 @@ Komut şu durumlarda yürütülür:
<source>Target folder input field must not be empty.</source>
<target>Hedef klasör giriş alanı boş olmamalı.</target>
-<source>Folder input field for versioning must not be empty.</source>
-<target>Sürüm için klasör giriş alanı boş olmamalı.</target>
-
<source>Source folder %x not found.</source>
<target>%x kaynak klasörü bulunamadı.</target>
@@ -537,9 +767,6 @@ Komut şu durumlarda yürütülür:
<source>job name</source>
<target>iş adı</target>
-<source>Synchronization aborted</source>
-<target>Eşleştirme durduruldu</target>
-
<source>Synchronization completed with errors</source>
<target>Eşleştirme bazı hatalarla tamamlandı</target>
@@ -555,24 +782,12 @@ Komut şu durumlarda yürütülür:
<source>Saving log file %x...</source>
<target>%x günlük dosyası kaydediliyor...</target>
-<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
-<target>FreeFileSync ana penceresindeki sorunları çözmek için "Değiştirin" düğmesine tıklayın.</target>
-
-<source>Switching to FreeFileSync main dialog</source>
-<target>FreeFileSync ana penceresine geçiliyor</target>
-
-<source>Retrying operation after error:</source>
-<target>Hatanın ardından işlem yeniden deneniyor:</target>
-
<source>A new version of FreeFileSync is available:</source>
<target>Yeni bir FreeFileSync sürümü yayınlanmış:</target>
<source>Download now?</source>
<target>İndirilsin mi?</target>
-<source>New version found</source>
-<target>Yeni bir sürüm yayınlanmış</target>
-
<source>&Download</source>
<target>İn&dirin</target>
@@ -639,21 +854,6 @@ Komut şu durumlarda yürütülür:
<source>Hibernate</source>
<target>Hazırda bekletilsin</target>
-<source>Selected variant:</source>
-<target>Seçilmiş çeşit:</target>
-
-<source>Select alternate comparison settings</source>
-<target>Alternatif karşılaştırma ayarlarını seçin</target>
-
-<source>Select alternate synchronization settings</source>
-<target>Alternatif eşleştirme ayarlarını seçin</target>
-
-<source>Filter is active</source>
-<target>Süzgeç etkin</target>
-
-<source>No filter selected</source>
-<target>Seçilmiş süzgeç yok</target>
-
<source>Remove alternate settings</source>
<target>Alternatif ayarları silin</target>
@@ -681,15 +881,15 @@ Komut şu durumlarda yürütülür:
<source>2. &Synchronize</source>
<target>2. &Eşleştirin</target>
+<source>&Global settings</source>
+<target>&Genel ayarlar</target>
+
<source>&Language</source>
<target>Di&l</target>
<source>&Export file list...</source>
<target>Dosya list&esini verin...</target>
-<source>&Global settings</source>
-<target>&Genel ayarlar</target>
-
<source>&Tools</source>
<target>A&raçlar</target>
@@ -699,18 +899,9 @@ Komut şu durumlarda yürütülür:
<source>Check &automatically once a week</source>
<target>&Haftada bir kendiliğinden denetlensin</target>
-<source>Check for new &version</source>
-<target>Yeni &sürümü denetleyin</target>
-
<source>Compare</source>
<target>Karşılaştırın</target>
-<source>Comparison settings</source>
-<target>Karşılaştırma ayarları</target>
-
-<source>Synchronization settings</source>
-<target>Eşleştirme ayarları</target>
-
<source>Synchronize</source>
<target>Eşleştirin</target>
@@ -723,6 +914,9 @@ Komut şu durumlarda yürütülür:
<source>Swap sides</source>
<target>Sağ ve sol tarafları değiştirin</target>
+<source>Match case</source>
+<target>Büyük/küçük harfe uyulsun</target>
+
<source>Save as batch job</source>
<target>Toplu iş olarak kaydedin</target>
@@ -744,87 +938,12 @@ Komut şu durumlarda yürütülür:
<source>Total bytes to copy</source>
<target>Toplam kopyalanacak bayt</target>
-<source>Items found:</source>
-<target>Bulunan öge:</target>
-
-<source>Speed:</source>
-<target>Hız:</target>
-
-<source>Time remaining:</source>
-<target>Kalan süre:</target>
-
-<source>Time elapsed:</source>
-<target>Geçen süre:</target>
-
-<source>Synchronizing...</source>
-<target>Eşleştiriliyor...</target>
-
-<source>Minimize to notification area</source>
-<target>Bildirim alanına küçültün</target>
-
-<source>On completion</source>
-<target>İşlem tamamlandığında:</target>
-
-<source>Close</source>
-<target>Kapatın</target>
-
-<source>&Pause</source>
-<target>&Duraklatılsın</target>
-
-<source>Variant</source>
-<target>İşlem tipi</target>
-
-<source>Statistics</source>
-<target>İstatistikler</target>
-
-<source>&Don't show this dialog again</source>
-<target>Bu &pencere bir daha görüntülenmesin</target>
-
-<source>Select a variant</source>
-<target>İşlem tipini seçin</target>
-
-<source>
-Files are found equal if
- - last write time and date
- - file size
-are the same
-</source>
-<target>
-Dosyaların aynı sayılması için;
- - son yazma tarih ve saatleri
- - ve dosya boyutları
-aynı olmalıdır
-</target>
-
-<source>
-Files are found equal if
- - file content
-is the same
-</source>
-<target>
-Dosyaların aynı sayılması için;
- - dosya içerikleri
-aynı olmalıdır
-</target>
-
-<source>Symbolic Link handling</source>
-<target>Sembolik bağlantılar:</target>
-
-<source>Help</source>
-<target>Yardım</target>
-
<source>OK</source>
<target>Tamam</target>
<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
<target>İki taraftaki değişiklikler belirlenir ve kopyalanır. Silme, taşıma ve çakışmalar, veritabanı kullanılarak kendiliğinden algılanır.</target>
-<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
-<target>Sol taraftaki klasör sağ tarafa yansıtılır. Eşleştirme sonrası sağ klasör, sol klasörün tamamen aynısı olur.</target>
-
-<source>Copy new or updated files to right folder.</source>
-<target>Sol taraftaki yeni ya da güncellenmiş dosyalar sağ tarafa kopyalanır.</target>
-
<source>Configure your own synchronization rules.</source>
<target>Eşleştirme kurallarını istediğiniz şekilde ayarlayabilirsiniz.</target>
@@ -834,24 +953,6 @@ aynı olmalıdır
<source>Requires database files. Not supported by all file systems.</source>
<target>Veritabanı dosyalarına gerek duyar. Tüm dosya sistemleri tarafından desteklenmez.</target>
-<source>Error handling</source>
-<target>Hata olursa:</target>
-
-<source>Ignore</source>
-<target>Yoksayılsın</target>
-
-<source>Hide all error and warning messages</source>
-<target>Tüm hata ve uyarı iletileri gizlenir</target>
-
-<source>Pop-up</source>
-<target>Görüntülensin</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Hata ya da uyarılar açılır pencerede görüntülenir</target>
-
-<source>Deletion handling</source>
-<target>Silinen dosyalar:</target>
-
<source>Permanent</source>
<target>Kalıcı olarak silinsin</target>
@@ -873,56 +974,56 @@ aynı olmalıdır
<source>Naming convention:</source>
<target>Adlandırma kuralı:</target>
-<source>Batch job</source>
-<target>Toplu iş</target>
+<source>Ignore</source>
+<target>Yoksayılsın</target>
-<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
-<target>Katılımsız eşleştirme için bir toplu iş dosyası oluşturun. İşlemi başlatmak için bu dosyaya çift tıklayın ya da görev zamanlayıcı ile programlayın: %x</target>
+<source>Hide all error and warning messages</source>
+<target>Tüm hata ve uyarı iletileri gizlenir</target>
-<source>Exit</source>
-<target>Çıkın</target>
+<source>Pop-up</source>
+<target>Görüntülensin</target>
-<source>Abort synchronization on first error</source>
-<target>Oluşacak ilk hatada eşleştirme durdurulur</target>
+<source>Show pop-up on errors or warnings</source>
+<target>Hata ya da uyarılar açılır pencerede görüntülenir</target>
-<source>Show progress dialog</source>
-<target>İşlem penceresi görüntülensin</target>
+<source>Statistics</source>
+<target>İstatistikler</target>
-<source>Save log</source>
-<target>Günlüğe kaydedilsin</target>
+<source>&Don't show this dialog again</source>
+<target>Bu &pencere bir daha görüntülenmesin</target>
-<source>Select folder to save log files</source>
-<target>Günlük dosyalarının kaydedileceği klasörü seçin</target>
+<source>Items found:</source>
+<target>Bulunan öge:</target>
-<source>Limit</source>
-<target>Sınırla</target>
+<source>Speed:</source>
+<target>Hız:</target>
-<source>Limit maximum number of log files</source>
-<target>Tutulacak en fazla günlük dosyası sayısı</target>
+<source>Time remaining:</source>
+<target>Kalan süre:</target>
-<source>Source code written in C++ using:</source>
-<target>Kaynak kodu C++ kullanılarak yazılmıştır:</target>
+<source>Time elapsed:</source>
+<target>Geçen süre:</target>
-<source>If you like FreeFileSync</source>
-<target>FreeFileSync’i beğendiyseniz</target>
+<source>Synchronizing...</source>
+<target>Eşleştiriliyor...</target>
-<source>Donate with PayPal</source>
-<target>PayPal üzerinden bağış yapın</target>
+<source>Minimize to notification area</source>
+<target>Bildirim alanına küçültün</target>
-<source>Many thanks for localization:</source>
-<target>Çeviriler için çok teşekkürler:</target>
+<source>Close</source>
+<target>Kapatın</target>
-<source>Feedback and suggestions are welcome</source>
-<target>Öneri ve geri bildirimlerinizi bekleriz</target>
+<source>&Pause</source>
+<target>&Duraklatılsın</target>
-<source>Homepage</source>
-<target>Web sitesi</target>
+<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>Katılımsız eşleştirme için bir toplu iş dosyası oluşturun. İşlemi başlatmak için bu dosyaya çift tıklayın ya da görev zamanlayıcı ile programlayın: %x</target>
-<source>Email</source>
-<target>E-posta</target>
+<source>Show progress dialog</source>
+<target>İşlem penceresi görüntülensin</target>
-<source>Published under the GNU General Public License</source>
-<target>GNU Genel Kamu Lisansı koşulları altında yayınlanmıştır</target>
+<source>Limit maximum number of log files</source>
+<target>Tutulacak en fazla günlük dosyası sayısı</target>
<source>Delete on both sides</source>
<target>Her iki taraftaki de silinsin</target>
@@ -930,95 +1031,50 @@ aynı olmalıdır
<source>Delete on both sides even if the file is selected on one side only</source>
<target>Dosya yalnız bir tarafta seçili olsa bile her iki taraftaki de silinir</target>
-<source>
-Files will only be synchronized if they pass all filter rules.
-Note: File paths must be relative to base directories.
-</source>
-<target>
-Yalnız tüm süzgeç kurallarına uyan dosyalar eşleştirilir.
-Not: Dosya yolları seçilmiş klasörlere göre yazılmalıdır.
-</target>
-
-<source>Include</source>
-<target>Katılacak ögeler:</target>
-
-<source>Exclude</source>
-<target>Katılmayacak ögeler</target>
-
-<source>Time span</source>
-<target>Zaman aralığı</target>
-
-<source>File size</source>
-<target>Dosya boyutu</target>
-
-<source>Minimum</source>
-<target>En küçük</target>
-
-<source>Maximum</source>
-<target>En büyük</target>
-
<source>&Clear</source>
<target>&Temizleyin</target>
-<source>Global settings</source>
-<target>Genel ayarlar</target>
-
<source>Fail-safe file copy</source>
<target>Dosyalar hatasız kopyalansın</target>
-<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
-<target>Dosyalar önce geçici dosyaya kopyalanıp (*.ffs_tmp) sonra yeniden adlandırılır. Bu yöntem, ciddi bir hata oluşması durumunda bile işlemin tutarlı yapılmasını sağlar.</target>
-
<source>Copy locked files</source>
<target>Kilitli dosyalar da kopyalansın</target>
-<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
-<target>Paylaşılan ya da kilitlenmiş dosyalar Birim Gölge Hizmetini kullanılarak kopyalanır (yönetici hakları gereklidir)</target>
-
<source>Copy file access permissions</source>
<target>Dosya erişim izinleri de kopyalansın</target>
-<source>Transfer file and folder permissions (requires administrator rights)</source>
-<target>Dosya ve klasör izinleri de aktarılır (yönetici hakları gereklidir)</target>
-
-<source>Restore hidden dialogs</source>
-<target>Gizlenmiş iletiler yeniden görüntülensin</target>
-
-<source>External applications</source>
-<target>Dış uygulamalar</target>
-
<source>Description</source>
<target>Açıklama</target>
<source>&Default</source>
<target>&Varsayılan</target>
-<source>Find what:</source>
-<target>Aranacak:</target>
+<source>Source code written in C++ using:</source>
+<target>Kaynak kodu C++ kullanılarak yazılmıştır:</target>
-<source>Match case</source>
-<target>Büyük/küçük harfe uyulsun</target>
+<source>If you like FreeFileSync</source>
+<target>FreeFileSync’i beğendiyseniz</target>
-<source>&Find next</source>
-<target>&Sonrakini bulun</target>
+<source>Donate with PayPal</source>
+<target>PayPal üzerinden bağış yapın</target>
-<source>Start synchronization</source>
-<target>Eşleştirmeyi başlatın</target>
+<source>Feedback and suggestions are welcome</source>
+<target>Öneri ve geri bildirimlerinizi bekleriz</target>
-<source>Delete</source>
-<target>Silin</target>
+<source>Homepage</source>
+<target>Web sitesi</target>
-<source>Configure filter</source>
-<target>Süzgeci ayarlayın</target>
+<source>Email</source>
+<target>E-posta</target>
-<source>Find</source>
-<target>Arayın</target>
+<source>Published under the GNU General Public License</source>
+<target>GNU Genel Kamu Lisansı koşulları altında yayınlanmıştır</target>
-<source>Select time span</source>
-<target>Zaman aralığı</target>
+<source>Many thanks for localization:</source>
+<target>Çeviriler için çok teşekkürler:</target>
-<source>Folder pairs</source>
-<target>Klasör çiftleri</target>
+<source>Find</source>
+<target>Arayın</target>
<source>Overview</source>
<target>Genel</target>
@@ -1026,15 +1082,6 @@ Not: Dosya yolları seçilmiş klasörlere göre yazılmalıdır.
<source>Configuration</source>
<target>İşlemler</target>
-<source>Main bar</source>
-<target>Ana çubuk</target>
-
-<source>Filter files</source>
-<target>Dosya süzgeci</target>
-
-<source>Select view</source>
-<target>Görünüm</target>
-
<source>Open...</source>
<target>Açın...</target>
@@ -1044,14 +1091,14 @@ Not: Dosya yolları seçilmiş klasörlere göre yazılmalıdır.
<source>Compare both sides</source>
<target>İki tarafı karşılaştırır</target>
-<source>
-<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
-<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
-</source>
-<target>
-<pluralform>1 öge için %y komutunu çalıştırmak istediğinize emin misiniz?</pluralform>
-<pluralform>%x öge için %y komutunu çalıştırmak istediğinize emin misiniz?</pluralform>
-</target>
+<source>Comparison settings</source>
+<target>Karşılaştırma ayarları</target>
+
+<source>Synchronization settings</source>
+<target>Eşleştirme ayarları</target>
+
+<source>Start synchronization</source>
+<target>Eşleştirmeyi başlatın</target>
<source>Confirm</source>
<target>Onaylayın</target>
@@ -1089,12 +1136,6 @@ Not: Dosya yolları seçilmiş klasörlere göre yazılmalıdır.
<source>Set direction:</source>
<target>Yönü seçin:</target>
-<source>Exclude temporarily</source>
-<target>Geçici olarak katılmasın</target>
-
-<source>Include temporarily</source>
-<target>Geçici olarak katılsın</target>
-
<source>multiple selection</source>
<target>çoklu seçim</target>
@@ -1104,6 +1145,15 @@ Not: Dosya yolları seçilmiş klasörlere göre yazılmalıdır.
<source>Exclude via filter:</source>
<target>Süzerek dışarda bırakılsın:</target>
+<source>Exclude temporarily</source>
+<target>Geçici olarak katılmasın</target>
+
+<source>Include temporarily</source>
+<target>Geçici olarak katılsın</target>
+
+<source>Delete</source>
+<target>Silin</target>
+
<source>Include all</source>
<target>Tümü katılsın</target>
@@ -1152,6 +1202,9 @@ Not: Dosya yolları seçilmiş klasörlere göre yazılmalıdır.
<source>Never save &changes</source>
<target>Değişiklikler asla &kaydedilmesin</target>
+<source>Filter</source>
+<target>Süzgeç</target>
+
<source>Show files that exist on left side only</source>
<target>Yalnız sol tarafta bulunan dosyaları görüntüler ya da gizler</target>
@@ -1197,12 +1250,12 @@ Not: Dosya yolları seçilmiş klasörlere göre yazılmalıdır.
<source>Set as default</source>
<target>Varsayılan olarak belirleyin</target>
-<source>Operation aborted</source>
-<target>İşlemden vazgeçildi</target>
-
<source>All folders are in sync</source>
<target>Tüm klasörler eşleştirildi</target>
+<source>Cannot find %x</source>
+<target>%x bulunamadı</target>
+
<source>Comma-separated values</source>
<target>Virgül ile ayrılmış değerler</target>
@@ -1218,18 +1271,12 @@ Not: Dosya yolları seçilmiş klasörlere göre yazılmalıdır.
<source>&Ignore</source>
<target>&Yoksayın</target>
-<source>Fatal Error</source>
-<target>Ölümcül Hata</target>
-
<source>&Don't show this warning again</source>
<target>Bu uyarı bir daha &görüntülenmesin</target>
<source>&Switch</source>
<target>&Değiştirin</target>
-<source>Question</source>
-<target>Soru</target>
-
<source>&Yes</source>
<target>&Evet</target>
@@ -1251,9 +1298,6 @@ Not: Dosya yolları seçilmiş klasörlere göre yazılmalıdır.
<source>Initializing...</source>
<target>Başlatılıyor...</target>
-<source>Aborted</source>
-<target>Vazgeçildi</target>
-
<source>Completed</source>
<target>Tamamlandı</target>
@@ -1263,12 +1307,6 @@ Not: Dosya yolları seçilmiş klasörlere göre yazılmalıdır.
<source>Log</source>
<target>Günlük</target>
-<source>Cannot find %x</source>
-<target>%x bulunamadı</target>
-
-<source>Inactive</source>
-<target>Kullanılmıyor</target>
-
<source>Today</source>
<target>Bugün</target>
@@ -1293,9 +1331,6 @@ Not: Dosya yolları seçilmiş klasörlere göre yazılmalıdır.
<source>MB</source>
<target>MB</target>
-<source>Filter</source>
-<target>Süzgeç</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>
@@ -1314,6 +1349,9 @@ Not: Dosya yolları seçilmiş klasörlere göre yazılmalıdır.
<pluralform>Aşağıdaki %x ögeyi silmek istediğinize emin misiniz?</pluralform>
</target>
+<source>Exclude</source>
+<target>Katılmayacak ögeler</target>
+
<source>Direct</source>
<target>Doğrudan katılsın</target>
@@ -1338,9 +1376,6 @@ Not: Dosya yolları seçilmiş klasörlere göre yazılmalıdır.
<source>- Other side's counterpart to %item_folder%</source>
<target>%item_folder% ögesinin diğer taraftaki karşılığı</target>
-<source>Make hidden warnings and dialogs visible again?</source>
-<target>Gizlenmiş iletiler yeniden görüntülensin mi?</target>
-
<source>Leave as unresolved conflict</source>
<target>Uyuşmazlık çözülmeden bırakılsın</target>
@@ -1464,15 +1499,9 @@ Not: Dosya yolları seçilmiş klasörlere göre yazılmalıdır.
<pluralform>%x gün</pluralform>
</target>
-<source>Failed to register to receive system messages.</source>
-<target>Sistem iletileri alınacak şekilde kayıt yapılamadı.</target>
-
<source>Cannot set privilege %x.</source>
<target>%x izni verilemedi.</target>
-<source>Failed to suspend system sleep mode.</source>
-<target>Sistem uyku kipine geçirilemedi.</target>
-
<source>Cannot change process I/O priorities.</source>
<target>Giriş/Çıkış işlemi öncelikleri değiştirilemedi</target>
diff --git a/BUILD/Languages/ukrainian.lng b/BUILD/Languages/ukrainian.lng
index 0b5406b7..539524e0 100644
--- a/BUILD/Languages/ukrainian.lng
+++ b/BUILD/Languages/ukrainian.lng
@@ -2,14 +2,31 @@
<language>Українська</language>
<translator>Roman Ardan</translator>
<locale>uk_UA</locale>
- <flag_image>flag_ukraine.png</flag_image>
- <plural_form_count>3</plural_form_count>
+ <image>flag_ukraine.png</image>
+ <plural_count>3</plural_count>
<plural_definition>n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2</plural_definition>
</header>
-<source>Close search bar</source>
+<source>
+<pluralform>Do you really want to execute the command %y for one item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+</target>
+
+<source>&Check</source>
+<target></target>
+
+<source>Retrying operation...</source>
<target></target>
+<source>
+<pluralform>Automatic retry in 1 second...</pluralform>
+<pluralform>Automatic retry in %x seconds...</pluralform>
+</source>
+<target>
+</target>
+
<source>Both sides have changed since last synchronization.</source>
<target>З моменту останньої синхронізації з обох сторін відбулися зміни.</target>
@@ -64,9 +81,6 @@
<source>Cannot open file %x.</source>
<target>Не вдається фідкрити файл %x.</target>
-<source>Error</source>
-<target>Помилка</target>
-
<source>File %x does not contain a valid configuration.</source>
<target>Файл %x не містить правильної конфігурації.</target>
@@ -76,12 +90,12 @@
<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
<target>Конфігураційний файл не повинен містити налаштувань на рівні пар каталогів, якщо каталоги задаються командним рядком.</target>
-<source>Warning</source>
-<target>Увага</target>
-
<source>Directories cannot be set for more than one configuration file.</source>
<target>Каталоги не можуть бути призначені більш ніж одному файлу конфігурації.</target>
+<source>Command line</source>
+<target>Командний рядок</target>
+
<source>Syntax:</source>
<target>Синтаксис:</target>
@@ -97,9 +111,6 @@
<source>Any number of alternative directories for at most one config file.</source>
<target>Будь-яка кількість альтернативних каталогів для щонайбільше одного конфігураційного файлу.</target>
-<source>Command line</source>
-<target>Командний рядок</target>
-
<source>A folder input field is empty.</source>
<target>Порожнє поле папки.</target>
@@ -301,8 +312,8 @@
<source>/sec</source>
<target>/сек</target>
-<source>%x items</source>
-<target>%x елементів</target>
+<source>%x items/sec</source>
+<target>%x елемента/сек</target>
<source>Configuration file %x loaded partially only.</source>
<target>Файл конфігурації %x завантажено лише частково.</target>
@@ -331,10 +342,10 @@
<source>Volume name %x is not part of file path %y.</source>
<target>Ім'я тому %x не є частиною файловго шляху %y.</target>
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Запит переривання: В очікуванні завершення поточної операції...</target>
+<source>Stop requested: Waiting for current operation to finish...</source>
+<target>Запит зупинки: очікування завершення поточної операції...</target>
-<source>Failure to create timestamp for versioning:</source>
+<source>Unable to create timestamp for versioning:</source>
<target>Не вдається створити часової мітки для версій:</target>
<source>Cannot read the following XML elements:</source>
@@ -352,8 +363,8 @@
<source>&Program</source>
<target>&Програма</target>
-<source>&Content</source>
-<target>&Зміст</target>
+<source>&View help</source>
+<target>&Перегляд довідки</target>
<source>&About</source>
<target>&Про програму</target>
@@ -376,8 +387,8 @@
<source>To get started just import a .ffs_batch file.</source>
<target>Щоб розпочати імпортуйте .ffs_batch файл.</target>
-<source>Folders to watch</source>
-<target>Папки для спостереження</target>
+<source>Folders to watch:</source>
+<target>Папки для спостеження</target>
<source>Add folder</source>
<target>Додати папку</target>
@@ -391,12 +402,15 @@
<source>Select a folder</source>
<target>Вибрати папку</target>
-<source>Idle time [seconds]</source>
-<target>Час простою [секунд]</target>
+<source>Idle time (in seconds):</source>
+<target>Час очікування (секунд):</target>
<source>Idle time between last detected change and execution of command</source>
<target>Час простою між виявленням останньої зміни та виконанням команди</target>
+<source>Command line:</source>
+<target>Командний рядок:</target>
+
<source>
The command is triggered if:
- files or subfolders change
@@ -408,33 +422,30 @@ The command is triggered if:
- появилися нові папки (наприклад, підключена USB-пам'ять)
</target>
-<source>Start</source>
-<target>Старт</target>
-
-<source>&Retry</source>
-<target>&Повторити</target>
-
-<source>Cancel</source>
-<target>Відмінити</target>
+<source>&Start</source>
+<target>&Старт</target>
-<source>RealtimeSync - Automated Synchronization</source>
-<target>RealtimeSync - Автоматична синхронізація</target>
+<source>About</source>
+<target>Про</target>
<source>Build: %x</source>
<target>компіляція %x</target>
-<source>About</source>
-<target>Про</target>
-
<source>All files</source>
<target>Всі файли</target>
+<source>Automated Synchronization</source>
+<target>Автоматична Синхронізація</target>
+
<source>Directory monitoring active</source>
<target>Моніторинг каталогів активний</target>
<source>Waiting until all directories are available...</source>
<target>Очікування доступності всіх каталогів...</target>
+<source>Error</source>
+<target>Помилка</target>
+
<source>&Restore</source>
<target>&Відновити</target>
@@ -444,9 +455,12 @@ The command is triggered if:
<source>&Exit</source>
<target>&Вихід</target>
-<source>Invalid command line:</source>
+<source>Incorrect command line:</source>
<target>Неправильний командний рядок:</target>
+<source>&Retry</source>
+<target>&Повторити</target>
+
<source>File content</source>
<target>Вміст файлу</target>
@@ -507,8 +521,8 @@ The command is triggered if:
<source>Target folder input field must not be empty.</source>
<target>Поле цільової папки не повинно бути порожнім.</target>
-<source>Folder input field for versioning must not be empty.</source>
-<target>Назва папки для версій файлів не повинна бути порожньою.</target>
+<source>Please enter a target folder for versioning.</source>
+<target>Будь ласка, введіть цільову папку для версій.</target>
<source>Source folder %x not found.</source>
<target>Вихідний каталог %x не знайдено.</target>
@@ -546,8 +560,8 @@ The command is triggered if:
<source>job name</source>
<target>назва завдання</target>
-<source>Synchronization aborted</source>
-<target>Синхронізація припинена</target>
+<source>Synchronization stopped</source>
+<target>Синхронізацію зупинено</target>
<source>Synchronization completed with errors</source>
<target>Синхронізація закінчилася з помилками</target>
@@ -564,14 +578,29 @@ The command is triggered if:
<source>Saving log file %x...</source>
<target>Збереження файла журналу %x...</target>
-<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
-<target>Натисніть "Змінити" для вирішення питань у головному вікні FreeFileSync.</target>
+<source>You can switch to FreeFileSync's main window to resolve this issue.</source>
+<target>Ви можете перейти до головного вікна FreeFileSync щоб вирішити це питання.</target>
-<source>Switching to FreeFileSync main dialog</source>
-<target>Перехід до головного діалогу FreeFileSync</target>
+<source>&Don't show this warning again</source>
+<target>&Надалі не показувати це попередження</target>
-<source>Retrying operation after error:</source>
-<target>Відновлення операції після помилки:</target>
+<source>&Ignore</source>
+<target>&Ігнорувати</target>
+
+<source>&Switch</source>
+<target>&Змінити</target>
+
+<source>Switching to FreeFileSync's main window</source>
+<target>Перехід до головного вікна FreeFileSync</target>
+
+<source>&Ignore subsequent errors</source>
+<target>&Ігнорувати наступні помилки</target>
+
+<source>Serious Error</source>
+<target>Серйозна помилка</target>
+
+<source>Check for Program Updates</source>
+<target>Перевірка Оновлень Програми</target>
<source>A new version of FreeFileSync is available:</source>
<target>Доступна нова версія FreeFileSync:</target>
@@ -579,24 +608,24 @@ The command is triggered if:
<source>Download now?</source>
<target>Завантажити зараз?</target>
-<source>New version found</source>
-<target>знайдено нову версію</target>
-
<source>&Download</source>
<target>&Завантажити</target>
<source>FreeFileSync is up to date.</source>
<target>У Вас найновіша версія FreeFileSync.</target>
-<source>Information</source>
-<target>Інформація</target>
-
<source>Unable to connect to sourceforge.net.</source>
<target>Не можна з’єднатися з sourceforge.net.</target>
<source>Cannot find current FreeFileSync version number online. Do you want to check manually?</source>
<target>Не вдається знайти номер поточної версії FreeFileSync онлайн. Бажаєте перевірити вручну?</target>
+<source>Last session</source>
+<target>Остання сесія</target>
+
+<source>Copy</source>
+<target>Копіювати</target>
+
<source>Symlink</source>
<target>Символьне посилання</target>
@@ -648,20 +677,20 @@ The command is triggered if:
<source>Hibernate</source>
<target>Гібернація</target>
-<source>Selected variant:</source>
-<target>Вибраний варіант:</target>
+<source>Alternate comparison settings</source>
+<target>Альтернативні налаштування порівняння</target>
-<source>Select alternate comparison settings</source>
-<target>Вибрати альтернативні налаштування порівняння</target>
+<source>Alternate synchronization settings</source>
+<target>Альтернативні налаштування синхронізації</target>
-<source>Select alternate synchronization settings</source>
-<target>Вибрати альтернативні налаштування синхронізації</target>
+<source>Local filter</source>
+<target>Локальний фільтр</target>
-<source>Filter is active</source>
-<target>Фільтр активний</target>
+<source>Active</source>
+<target>Активні</target>
-<source>No filter selected</source>
-<target>Не вибрано жодного фільтра</target>
+<source>None</source>
+<target>Відсутні</target>
<source>Remove alternate settings</source>
<target>Вилучити альтернативні налаштування</target>
@@ -669,12 +698,18 @@ The command is triggered if:
<source>Clear filter settings</source>
<target>Очистити налаштування фільтра</target>
-<source>Copy</source>
-<target>Копіювати</target>
-
<source>Paste</source>
<target>Вклеїти</target>
+<source>Alternate Comparison Settings</source>
+<target>Альтернативні Налаштування Порівняння</target>
+
+<source>Alternate Synchronization Settings</source>
+<target>Альтернативні Налаштування Синхронізації</target>
+
+<source>Local Filter</source>
+<target>Локальний Фільтр</target>
+
<source>&New</source>
<target>&Нова</target>
@@ -690,15 +725,18 @@ The command is triggered if:
<source>2. &Synchronize</source>
<target>2. &Синхронізувати</target>
+<source>&Global settings</source>
+<target>&Глобальні налаштування</target>
+
<source>&Language</source>
<target>&Мова</target>
+<source>&Find...</source>
+<target>&Знайти...</target>
+
<source>&Export file list...</source>
<target>&Експортувати список файлів...</target>
-<source>&Global settings</source>
-<target>&Глобальні налаштування</target>
-
<source>&Tools</source>
<target>&Інструменти</target>
@@ -708,12 +746,15 @@ The command is triggered if:
<source>Check &automatically once a week</source>
<target>Перевіряти &автоматично щотижня</target>
-<source>Check for new &version</source>
-<target>Перевірити наявність нової &версії</target>
+<source>&Check for new version</source>
+<target>&Перевірка наявності нової версії</target>
<source>Compare</source>
<target>Порівняти</target>
+<source>Cancel</source>
+<target>Відмінити</target>
+
<source>Synchronize</source>
<target>Синхронізувати</target>
@@ -726,7 +767,10 @@ The command is triggered if:
<source>Swap sides</source>
<target>Поміняти місцями</target>
-<source>Find what:</source>
+<source>Close search bar</source>
+<target>Закрити панель пошуку</target>
+
+<source>Find:</source>
<target>Знайти:</target>
<source>Match case</source>
@@ -753,70 +797,20 @@ The command is triggered if:
<source>Total bytes to copy</source>
<target>Всього зкопіювати байтів</target>
-<source>Items found:</source>
-<target>Елементів знайдено:</target>
+<source>Select a variant:</source>
+<target>Виберіть варіант:</target>
-<source>Speed:</source>
-<target>Швидкість:</target>
+<source>Identify equal files by comparing modification time and size.</source>
+<target>Визначити однакові файли порівнюючи час модифікації та розмір.</target>
-<source>Time remaining:</source>
-<target>Залишилось часу:</target>
+<source>Identify equal files by comparing the file content.</source>
+<target>Визначити однакові файли порівнюючи їх вміст.</target>
-<source>Time elapsed:</source>
-<target>Пройшло часу:</target>
+<source>Symbolic links:</source>
+<target>Символьні посилання:</target>
-<source>Synchronizing...</source>
-<target>Синхронізація...</target>
-
-<source>Minimize to notification area</source>
-<target>Згорнути в область повідомлень</target>
-
-<source>On completion</source>
-<target>Після завершення</target>
-
-<source>Close</source>
-<target>Замкнути</target>
-
-<source>&Pause</source>
-<target>&Пауза</target>
-
-<source>Variant</source>
-<target>Варіант</target>
-
-<source>Statistics</source>
-<target>Статистика</target>
-
-<source>&Don't show this dialog again</source>
-<target>Більше &не показувати цей діалог</target>
-
-<source>Select a variant</source>
-<target>Виберіть варіант</target>
-
-<source>
-Files are found equal if
- - last write time and date
- - file size
-are the same
-</source>
-<target>
-Файли вважаються однаковими якщо
- - дата і час останнього запису
- - розмір файлів
-співпадають
-</target>
-
-<source>
-Files are found equal if
- - file content
-is the same
-</source>
-<target>Файли вважаються рівними, якщо вміст файлів однаковий</target>
-
-<source>Symbolic Link handling</source>
-<target>Обробка символьного посилання</target>
-
-<source>Help</source>
-<target>Допомога</target>
+<source>More information</source>
+<target>Додаткова інформація</target>
<source>OK</source>
<target>OK</target>
@@ -824,11 +818,11 @@ is the same
<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
<target>Виявити та поширити зміни на обидві сторони. Видалення, перейменування та конфлікти визначаються автоматично використовуючи базу даних.</target>
-<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
-<target>Дзеркальна (резервна) копія лівої частини. В результаті синхронізації права папка змінюється до повної відповідності лівій.</target>
+<source>Create a mirror backup of the left folder which exactly matches the right folder after synchronization.</source>
+<target>Створити дзеркальну копію лівої частини, після синхронізації права папка повністю дорівнюватиме лівій.</target>
-<source>Copy new or updated files to right folder.</source>
-<target>Копіювати нові чи оновлювати файли з правої сторони.</target>
+<source>Copy new and updated files to the right folder.</source>
+<target>Скопіювати нові та оновлені файли в праву папку.</target>
<source>Configure your own synchronization rules.</source>
<target>Налаштувати власні правила синхронізації.</target>
@@ -839,23 +833,8 @@ is the same
<source>Requires database files. Not supported by all file systems.</source>
<target>Потрібні файли бази даних. Підтримується не всіма файловими системами.</target>
-<source>Error handling</source>
-<target>Обробка помилок</target>
-
-<source>Ignore</source>
-<target>Ігнорувати</target>
-
-<source>Hide all error and warning messages</source>
-<target>Приховати всі помилки і повідомлення з попередженнями</target>
-
-<source>Pop-up</source>
-<target>Виринаючі вікна</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Показувати виринаючі вікна при помилках та попередженнях</target>
-
-<source>Deletion handling</source>
-<target>Налаштування вилучення</target>
+<source>Delete files:</source>
+<target>Вилучити файли:</target>
<source>Permanent</source>
<target>Назавжди</target>
@@ -878,99 +857,171 @@ is the same
<source>Naming convention:</source>
<target>Метод іменування:</target>
-<source>Batch job</source>
-<target>Пакетне завдання</target>
+<source>Show examples</source>
+<target>Показати приклади</target>
+
+<source>Handle errors:</source>
+<target>Обробка помилок:</target>
+
+<source>Ignore</source>
+<target>Ігнорувати</target>
+
+<source>Hide all error and warning messages</source>
+<target>Приховати всі помилки і повідомлення з попередженнями</target>
+
+<source>Pop-up</source>
+<target>Виринаючі вікна</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Показувати виринаючі вікна при помилках та попередженнях</target>
+
+<source>On completion:</source>
+<target>Після завершення:</target>
+
+<source>Start synchronization now?</source>
+<target>Розпочати синхронізацію?</target>
+
+<source>Variant:</source>
+<target>Варіант:</target>
+
+<source>Statistics</source>
+<target>Статистика</target>
+
+<source>&Don't show this dialog again</source>
+<target>Більше &не показувати цей діалог</target>
+
+<source>Items found:</source>
+<target>Елементів знайдено:</target>
+
+<source>Speed:</source>
+<target>Швидкість:</target>
+
+<source>Time remaining:</source>
+<target>Залишилось часу:</target>
+
+<source>Time elapsed:</source>
+<target>Пройшло часу:</target>
+
+<source>Synchronizing...</source>
+<target>Синхронізація...</target>
+
+<source>Minimize to notification area</source>
+<target>Згорнути в область повідомлень</target>
+
+<source>Close</source>
+<target>Замкнути</target>
+
+<source>&Pause</source>
+<target>&Пауза</target>
+
+<source>Stop</source>
+<target>Зупинити</target>
<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
<target>Створити пакетний файл для автоматичної синхронізації. Щоб розпочати двічі клацніть цей файл або заплануйте в планувальнику завдань: %x</target>
-<source>Exit</source>
-<target>Вихід</target>
-
-<source>Abort synchronization on first error</source>
-<target>Перервати синхронізацію при першій помилці</target>
+<source>Stop synchronization at first error</source>
+<target>Зупинити синхронізацію при першій помилці</target>
<source>Show progress dialog</source>
<target>Показувати вікно прогресу</target>
-<source>Save log</source>
-<target>Зберегти журнал</target>
-
-<source>Select folder to save log files</source>
-<target>Виберіть папку для файлів журналу</target>
+<source>Save log:</source>
+<target>Зберегти журнал:</target>
-<source>Limit</source>
-<target>Межа</target>
+<source>Limit:</source>
+<target>Обмеження:</target>
<source>Limit maximum number of log files</source>
<target>Обмежити максимальну кількість файлів журналу</target>
+<source>How can I schedule a batch job?</source>
+<target>Як можна запланувати пакетне завдання?</target>
+
+<source>&Recycle bin</source>
+<target>&Корзина</target>
+
<source>Delete on both sides</source>
<target>Вилучити з обох сторін</target>
<source>Delete on both sides even if the file is selected on one side only</source>
<target>Вилучити з обох сторін, навіть якщо файл виділений тільки з однієї сторони</target>
-<source>
-Files will only be synchronized if they pass all filter rules.
-Note: File paths must be relative to base directories.
-</source>
-<target>
-Файли будуть синхронізовані тільки якщо вони задовільняють усім правилам фільтрації.
-Примітка: Шляхи до файлів повинні бути відносними до базових каталогів.
-</target>
+<source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source>
+<target>Виберіть правила фільтрації для виключення деяких файлів із синхронізації. Введіть шляхи файлів відносно відповідної пари папок.</target>
-<source>Include</source>
+<source>Include:</source>
<target>Включити</target>
-<source>Exclude</source>
+<source>Exclude:</source>
<target>Виключити</target>
-<source>Time span</source>
+<source>Time span:</source>
<target>Часовий інтервал</target>
-<source>File size</source>
-<target>Розмір файла</target>
+<source>File size:</source>
+<target>Розмір Файла</target>
-<source>Minimum</source>
-<target>Мінімум</target>
+<source>Minimum:</source>
+<target>Мінімум:</target>
-<source>Maximum</source>
-<target>Максимум</target>
+<source>Maximum:</source>
+<target>Максимум:</target>
<source>&Clear</source>
<target>&Очистити</target>
-<source>Global settings</source>
-<target>Глобальні налаштування</target>
+<source>The following settings are used for all synchronization jobs.</source>
+<target>Наступні налаштування використовуються для всіх завдань синхронізації.</target>
<source>Fail-safe file copy</source>
<target>Безпечне копіювання файлів</target>
-<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
-<target>Скопіюйте спочатку в тимчасовий файл (*.ffs_tmp), потім перейменуйте його. Це гарантує узгоджений стан навіть у разі виникнення фатальної помилки.</target>
+<source>
+Copy to a temporary file (*.ffs_tmp) before overwriting target.
+This guarantees a consistent state even in case of a serious error.
+</source>
+<target>
+Скопіювати в тимчасовий файл (*.ffs_tmp) перед перезаписом цілі.
+Це гарантує узгоджений стан навіть у випадку серйозної помилки.
+</target>
+
+<source>(recommended)</source>
+<target>(рекомендовано)</target>
<source>Copy locked files</source>
<target>Копіювати заблоковані файли</target>
-<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
-<target>Копіювати спільні та заблоковані файли за допомогою сервісу Тіньового Копіювання Тому (потрібні права адміністратора)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service.</source>
+<target>Копіювати спільні та заблоковані файли за допомогою сервісу Тіньового Копіювання Тому.</target>
+
+<source>(requires administrator rights)</source>
+<target>(потрібні права адміністратора)</target>
<source>Copy file access permissions</source>
<target>Копіювати права доступу до файлу</target>
-<source>Transfer file and folder permissions (requires administrator rights)</source>
-<target>Перенести права файлів і папок (потрібні права адміністратора)</target>
+<source>Transfer file and folder permissions.</source>
+<target>Перенести права файлів і папок.</target>
+
+<source>Automatic retry on error:</source>
+<target>Автоматичний повтор при помилці:</target>
-<source>Restore hidden dialogs</source>
-<target>Відновити сховані діалоги</target>
+<source>Retry count:</source>
+<target>Кількість спроб:</target>
-<source>External applications</source>
-<target>Зовнішні програми</target>
+<source>Delay (in seconds):</source>
+<target>Затримка (секунд):</target>
+
+<source>Customize context menu:</source>
+<target>Налаштування контекстного меню:</target>
<source>Description</source>
<target>Опис</target>
+<source>Restore hidden windows</source>
+<target>Відновити приховані вікна</target>
+
<source>&Default</source>
<target>&За замовчуванням</target>
@@ -998,26 +1049,20 @@ Note: File paths must be relative to base directories.
<source>Many thanks for localization:</source>
<target>Подяка за локалізацію:</target>
-<source>Start synchronization</source>
-<target>Розпочати синхронізацію</target>
+<source>Save as Batch Job</source>
+<target>Зберегти як пакетне завдання</target>
-<source>Comparison settings</source>
-<target>Налаштування порівнювання</target>
+<source>Delete Items</source>
+<target>Вилучити Елементи</target>
-<source>Synchronization settings</source>
-<target>Налаштування синхронізації</target>
+<source>Global Settings</source>
+<target>Глобальні Налаштування</target>
-<source>Delete</source>
-<target>Видалити</target>
+<source>Select Time Span</source>
+<target>Виберіть Інтервал Часу</target>
-<source>Configure filter</source>
-<target>Налаштування фільтра</target>
-
-<source>Select time span</source>
-<target>Виберіть часовий інтервал</target>
-
-<source>Folder pairs</source>
-<target>Пари папок</target>
+<source>Folder Pairs</source>
+<target>Пари Папок</target>
<source>Find</source>
<target>Знайти</target>
@@ -1028,14 +1073,14 @@ Note: File paths must be relative to base directories.
<source>Configuration</source>
<target>Налаштування</target>
-<source>Main bar</source>
+<source>Main Bar</source>
<target>Головна панель</target>
-<source>Filter files</source>
-<target>Фільтр файлів</target>
+<source>Filter Files</source>
+<target>Фільтрування файлів</target>
-<source>Select view</source>
-<target>Список файлів</target>
+<source>Select View</source>
+<target>Вибрати перегляд</target>
<source>Open...</source>
<target>Відкрити...</target>
@@ -1046,15 +1091,14 @@ Note: File paths must be relative to base directories.
<source>Compare both sides</source>
<target>Порівняти обидві сторони</target>
-<source>
-<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
-<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
-</source>
-<target>
-<pluralform>Ви дійсно хочете виконати команду %y для %x елемента?</pluralform>
-<pluralform>Ви дійсно хочете виконати команду %y для %x елементів?</pluralform>
-<pluralform>Ви дійсно хочете виконати команду %y для %x елементів?</pluralform>
-</target>
+<source>Comparison settings</source>
+<target>Налаштування порівнювання</target>
+
+<source>Synchronization settings</source>
+<target>Налаштування синхронізації</target>
+
+<source>Start synchronization</source>
+<target>Розпочати синхронізацію</target>
<source>Confirm</source>
<target>Підтвердити</target>
@@ -1110,6 +1154,9 @@ Note: File paths must be relative to base directories.
<source>Include temporarily</source>
<target>Включити</target>
+<source>Delete</source>
+<target>Видалити</target>
+
<source>Include all</source>
<target>Включити все</target>
@@ -1137,9 +1184,6 @@ Note: File paths must be relative to base directories.
<source>Show "%x"</source>
<target>Показати "%x"</target>
-<source>Last session</source>
-<target>Остання сесія</target>
-
<source>Folder Comparison and Synchronization</source>
<target>Порівнювання та Синхронізація папок</target>
@@ -1152,11 +1196,14 @@ Note: File paths must be relative to base directories.
<source>Do you want to save changes to %x?</source>
<target>Зберегти зміни в %x?</target>
+<source>Never save &changes</source>
+<target>Ніколи не зберігати &зміни</target>
+
<source>Do&n't save</source>
<target>&Не зберігати</target>
-<source>Never save &changes</source>
-<target>Ніколи не зберігати &зміни</target>
+<source>Filter</source>
+<target>Фільтр</target>
<source>Show files that exist on left side only</source>
<target>Показати файли, які є тільки ліворуч</target>
@@ -1203,12 +1250,15 @@ Note: File paths must be relative to base directories.
<source>Set as default</source>
<target>Встановити за замовчуванням</target>
-<source>Operation aborted</source>
-<target>Операція відмінена</target>
-
<source>All folders are in sync</source>
<target>Всі папки синхронізовано</target>
+<source>Synchronization Settings</source>
+<target>Налаштування Синхронізації</target>
+
+<source>Comparison Settings</source>
+<target>Параметри Порівняння</target>
+
<source>Cannot find %x</source>
<target>Не можна знайти %x</target>
@@ -1221,30 +1271,6 @@ Note: File paths must be relative to base directories.
<source>Searching for program updates...</source>
<target>Пошук оновлень програми ...</target>
-<source>&Ignore subsequent errors</source>
-<target>&Ігнорувати наступні помилки</target>
-
-<source>&Ignore</source>
-<target>&Ігнорувати</target>
-
-<source>Fatal Error</source>
-<target>Критична помилка</target>
-
-<source>&Don't show this warning again</source>
-<target>&Надалі не показувати це попередження</target>
-
-<source>&Switch</source>
-<target>&Змінити</target>
-
-<source>Question</source>
-<target>Питання</target>
-
-<source>&Yes</source>
-<target>&Так</target>
-
-<source>&No</source>
-<target>&Ні</target>
-
<source>Scanning...</source>
<target>Сканування...</target>
@@ -1254,14 +1280,17 @@ Note: File paths must be relative to base directories.
<source>Info</source>
<target>Інформація</target>
+<source>Warning</source>
+<target>Увага</target>
+
<source>Paused</source>
<target>Призупинено</target>
<source>Initializing...</source>
<target>Ініціалізація...</target>
-<source>Aborted</source>
-<target>Перервано</target>
+<source>Stopped</source>
+<target>Зупинено</target>
<source>Completed</source>
<target>Завершено</target>
@@ -1272,9 +1301,6 @@ Note: File paths must be relative to base directories.
<source>Log</source>
<target>Лог</target>
-<source>Inactive</source>
-<target>Неактивний</target>
-
<source>Today</source>
<target>Сьогодні</target>
@@ -1299,9 +1325,6 @@ Note: File paths must be relative to base directories.
<source>MB</source>
<target>МБ</target>
-<source>Filter</source>
-<target>Фільтр</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>
@@ -1312,6 +1335,9 @@ Note: File paths must be relative to base directories.
<pluralform>Ви дійсно хочете перемістити ці %x елементів у Корзину?</pluralform>
</target>
+<source>Move</source>
+<target>Перемістити</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>
@@ -1322,6 +1348,9 @@ Note: File paths must be relative to base directories.
<pluralform>Ви дійсно хочете вилучити ці %x елементів?</pluralform>
</target>
+<source>Exclude</source>
+<target>Виключити</target>
+
<source>Direct</source>
<target>Прямо</target>
@@ -1346,8 +1375,8 @@ Note: File paths must be relative to base directories.
<source>- Other side's counterpart to %item_folder%</source>
<target>- Елемент з протилежної сторони до %item_folder%</target>
-<source>Make hidden warnings and dialogs visible again?</source>
-<target>Зробити приховані попередження та діалоги ​​знову видимими?</target>
+<source>Restore all hidden windows and warnings?</source>
+<target>Відновити всі приховані вікна та попередження?</target>
<source>Leave as unresolved conflict</source>
<target>Залишити як невирішений конфлікт</target>
@@ -1475,14 +1504,14 @@ Note: File paths must be relative to base directories.
<pluralform>%x днів</pluralform>
</target>
-<source>Failed to register to receive system messages.</source>
-<target>Не вдалося зареєструватися для отримання системних повідомлень.</target>
+<source>Unable to register to receive system messages.</source>
+<target>Не вдається зареєструватися для отримання системних повідомлень.</target>
<source>Cannot set privilege %x.</source>
<target>Не вдається встановити привілеї %x.</target>
-<source>Failed to suspend system sleep mode.</source>
-<target>Не вдалося призупинити режим сну системи.</target>
+<source>Unable to suspend system sleep mode.</source>
+<target>Не вдається призупинbnb режим сну системи.</target>
<source>Cannot change process I/O priorities.</source>
<target>Не вдалося змінити пріоритетів Вх/Вих процесу.</target>
diff --git a/BUILD/Resources.zip b/BUILD/Resources.zip
index cf73407d..f5e1c651 100644
--- a/BUILD/Resources.zip
+++ b/BUILD/Resources.zip
Binary files differ
bgstack15